修复bug

src/pages/buy/index.vue

@@ -215,7 +215,7 @@ export default {
         }
       } else if (payType === '4') {
         // 微信外微信h5支付和支付宝网页支付
-        window.location.href = res.payment_url + '&redirect_url=' + encodeURIComponent(window.location.href)
+        window.location.href = res.payment_url + '&redirect_url=' + encodeURIComponent(this.order_details_url)
       } else if (payType === '12') {
         // 支付宝网页支付
         window.location.href = res.payment_url

src/pages/order/index.vue

@@ -248,13 +248,15 @@ export default {
     },
     placeOrderCallback(res) {
       const payType = this.payment_method
+      window.localStorage.setItem('payment_order_id', res.payment_order_id)
+      window.localStorage.setItem('order_detail_id', res.order_detail_id)
       if (payType === '3') {
         // 微信内支付
         if (typeof res.payment_more_info === 'string') {
           const payInfo = JSON.parse(res.payment_more_info)
           if (payInfo.appId) {
             WeixinJSBridge.invoke('getBrandWCPayRequest', payInfo, (res) => {
-              console.log(res)
+              window.location.href = this.order_details_url
             })
           } else {
             console.log('下单失败')
@@ -262,13 +264,9 @@ export default {
         }
       } else if (payType === '4') {
         // 微信外微信h5支付
-        window.localStorage.setItem('payment_order_id', res.payment_order_id)
-        window.localStorage.setItem('order_detail_id', res.order_detail_id)
         window.location.href = res.payment_url + '&redirect_url=' + encodeURIComponent(this.order_details_url)
       } else if (payType === '12') {
         // 支付宝网页支付
-        window.localStorage.setItem('payment_order_id', res.payment_order_id)
-        window.localStorage.setItem('order_detail_id', res.order_detail_id)
         window.location.href = res.payment_url
       }
     }

src/pages/order/order-details.vue

@@ -175,13 +175,15 @@ export default {
     },
     placeOrderCallback(res) {
       const payType = this.payment_method
+      window.localStorage.setItem('payment_order_id', res.payment_order_id)
+      window.localStorage.setItem('order_detail_id', res.order_detail_id)
       if (payType === '3') {
         // 微信内支付
         if (typeof res.payment_more_info === 'string') {
           const payInfo = JSON.parse(res.payment_more_info)
           if (payInfo.appId) {
             WeixinJSBridge.invoke('getBrandWCPayRequest', payInfo, (res) => {
-              console.log(res)
+              window.location.reload()
             })
           } else {
             console.log('下单失败')
@@ -189,13 +191,9 @@ export default {
         }
       } else if (payType === '4') {
         // 微信外微信h5支付
-        window.localStorage.setItem('payment_order_id', res.payment_order_id)
-        window.localStorage.setItem('order_detail_id', res.order_detail_id)
         window.location.href = res.payment_url + '&redirect_url=' + encodeURIComponent(this.order_details_url)
       } else if (payType === '12') {
         // 支付宝网页支付
-        window.localStorage.setItem('payment_order_id', res.payment_order_id)
-        window.localStorage.setItem('order_detail_id', res.order_detail_id)
         window.location.href = res.payment_url
       }
     }