|
@@ -127,8 +127,7 @@
|
|
|
:key="'b' + index">{{ str }}</span>
|
|
|
</p>
|
|
|
<!--支付宝、微信环境不显示-->
|
|
|
- <div class="payment-type"
|
|
|
- v-if="!(platform.isWeixin || platform.isAlipay)">
|
|
|
+ <div class="payment-type">
|
|
|
<p :class="{'active': order_pay_type === 2}"
|
|
|
@click="order_pay_type = 2">
|
|
|
<img
|
|
@@ -281,7 +280,7 @@ export default {
|
|
|
},
|
|
|
handleShowPopup (place, week) {
|
|
|
if (!(this.phone && this.token)) {
|
|
|
- this.$router.push({ name: 'login' })
|
|
|
+ this.$router.push({ name: 'Login' })
|
|
|
return
|
|
|
}
|
|
|
// 座位被定完了
|
|
@@ -323,14 +322,20 @@ export default {
|
|
|
const officialOrderNumber = data.official_order_number
|
|
|
// 支付宝支付
|
|
|
if (this.order_pay_type === 2) {
|
|
|
- const div = document.createElement('div')
|
|
|
- div.innerHTML = officialOrderNumber
|
|
|
- document.body.appendChild(div)
|
|
|
- document.forms[0].submit()
|
|
|
+ if (platform.isWeixin) {
|
|
|
+ this.$router.push({ name: 'PayBridge', query: { alipayForm: decodeURIComponent(officialOrderNumber) } })
|
|
|
+ } else {
|
|
|
+ const div = document.createElement('div')
|
|
|
+ div.innerHTML = officialOrderNumber
|
|
|
+ document.body.appendChild(div)
|
|
|
+ document.forms[0].submit()
|
|
|
+ }
|
|
|
} else {
|
|
|
// 微信支付
|
|
|
- if (platform.isWeixin) {
|
|
|
+ if (platform.isWeixin) { // 微信内
|
|
|
this.weixinPay()
|
|
|
+ } else if (platform.isAlipay) { // 支付宝内
|
|
|
+ this.$router.push({ name: 'PayBridge', query: { wxpayHref: '' } })
|
|
|
} else {
|
|
|
// window.location.replace()
|
|
|
}
|