提交 bae79d75 authored 作者: lihuihui's avatar lihuihui

update

上级 f304b850
...@@ -161,9 +161,9 @@ export default { ...@@ -161,9 +161,9 @@ export default {
} }
}, },
created() { created() {
if (this.$route.query.qr !== undefined) { // if (this.$route.query.qr !== undefined) {
this.payDetail = JSON.parse(window.localStorage.payDetail) // this.payDetail = JSON.parse(window.localStorage.payDetail)
} // }
}, },
mounted() { mounted() {
if (this.isPc()) { if (this.isPc()) {
...@@ -264,12 +264,12 @@ export default { ...@@ -264,12 +264,12 @@ export default {
} }
if (/AlipayClient/.test(window.navigator.userAgent)) { if (/AlipayClient/.test(window.navigator.userAgent)) {
params.pay_type = '12' params.pay_type = '12'
const url = // const url =
window.location.href.indexOf('?') === -1 // window.location.href.indexOf('?') === -1
? `${encodeURIComponent(window.location.href)}?qr=1` // ? `${encodeURIComponent(window.location.href)}?qr=1`
: `${encodeURIComponent(window.location.href)}&qr=1` // : `${encodeURIComponent(window.location.href)}&qr=1`
params.redirect_url = // params.redirect_url =
window.location.href.indexOf('qr') !== -1 ? encodeURIComponent(window.location.href) : url // window.location.href.indexOf('qr') !== -1 ? encodeURIComponent(window.location.href) : url
} }
// 获取支付二维码 订单id // 获取支付二维码 订单id
getPayInfo(params).then(res => { getPayInfo(params).then(res => {
...@@ -279,7 +279,7 @@ export default { ...@@ -279,7 +279,7 @@ export default {
this.payDetail.order_id = res.data.order_id this.payDetail.order_id = res.data.order_id
window.localStorage.payDetail = JSON.stringify(this.payDetail) window.localStorage.payDetail = JSON.stringify(this.payDetail)
if (/AlipayClient/.test(window.navigator.userAgent)) { if (/AlipayClient/.test(window.navigator.userAgent)) {
window.localStorage.payUrl = res.data.url // window.localStorage.payUrl = res.data.url
window.location.href = res.data.url window.location.href = res.data.url
} }
this.isQrPageShow = true this.isQrPageShow = true
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<div class="main"> <div class="main">
<commonheader :title="title" /> <commonheader :title="title" />
<div class="main_content"> <div class="main_content">
<div class="main_content_desc" v-if="$route.query.qr">{{ data.payMode != 1 ? '支付宝支付' : '微信扫码支付' }}</div> <div class="main_content_desc" v-if="isAlipay">{{ data.payMode != 1 ? '支付宝支付' : '微信扫码支付' }}</div>
<div class="main_content_desc" v-else>{{ data.payMode != 1 ? '打开支付宝扫码二维码支付,或长按保存二维码打开支付宝支付。' : '微信扫码支付' }}</div> <div class="main_content_desc" v-else>{{ data.payMode != 1 ? '打开支付宝扫码二维码支付,或长按保存二维码打开支付宝支付。' : '微信扫码支付' }}</div>
<div class="main_content_qdCode" v-if="!$route.query.qr"> <div class="main_content_qdCode" v-if="!isAlipay">
<qrcode-vue :value="payDetail.url" size="180" ref="qrcode" /> <qrcode-vue :value="payDetail.url" size="180" ref="qrcode" />
</div> </div>
<div class="main_btn"> <div class="main_btn">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<van-button round class="main_btn_home" @click="$router.go(0)" v-if="!isLastStep && status == 1" <van-button round class="main_btn_home" @click="$router.go(0)" v-if="!isLastStep && status == 1"
>继续报名</van-button >继续报名</van-button
> >
<van-button round class="main_btn_order" @click="repayments" v-if="status != 1">重新支付</van-button> <!-- <van-button round class="main_btn_order" @click="repayments" v-if="$route.query.qr && status != 1">重新支付</van-button> -->
<van-button round class="main_btn_order" @click="$router.push('/MyOrder')">我的订单</van-button> <van-button round class="main_btn_order" @click="$router.push('/MyOrder')">我的订单</van-button>
</div> </div>
<div id="value">{{ payDetail.url }}</div> <div id="value">{{ payDetail.url }}</div>
...@@ -55,6 +55,9 @@ export default { ...@@ -55,6 +55,9 @@ export default {
} }
}, },
computed: { computed: {
isAlipay() {
return /AlipayClient/.test(window.navigator.userAgent)
},
payDetail() { payDetail() {
return this.data.qrData return this.data.qrData
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论