Merge branch 'fix/goods' into 'master'

Fix/goods

See merge request !124

src/service/pay.js

@@ -2,7 +2,7 @@
  * @Description: 支付微信h5, jsapi, 第三方收银台，跳转）
  * @Date: 2020-07-28 15:03:52
  * @LastEditors: gzw
- * @LastEditTime: 2020-08-28 21:19:45
+ * @LastEditTime: 2020-08-28 22:07:04
  */
 
 import qs from "qs";
@@ -57,6 +57,7 @@ function payByWeixinJsapi(info = {}, callback) {
 function payByWeixinH5(info) {
   if (!info.url) return;
   info.params.isXyqb = isXyqb ? 1 : 0;
+  info.params.isWxH5 = 1;
   const currentPath = encodeURIComponent(
     window.location.origin +
       "/payWaiting" +

src/views/Goods/Detail/modules/detailPay.mixin.js

@@ -34,7 +34,6 @@ export default {
     },
     async goPay() {
       this.setIsLoading(false);
-      // let isThird = false;
       const { tradeType, orderInfo, openId } = this;
       const { payOrderNo, payType } = orderInfo;
       if (!payOrderNo) {
@@ -73,13 +72,7 @@ export default {
               state: 1
             }
           };
-          // isThird = true;
         }
-        // if (isThird && isWeixinBrower) {
-        //   this.setIsPayWait(false);
-        //   this.setIsShowOpenBrower(true);
-        //   return;
-        // }
         payByWay(tradeType, payInfo)
           .then(() => {
             this.getPayResult();
@@ -113,8 +106,9 @@ export default {
             this.$router.replace(`/policy/success/${orderNo}`);
             return;
           }
-
-          this.$router.replace({ path: "/policy/detail/" + orderNo });
+          this.$router.replace({
+            path: "/policy/detail/" + orderNo + "?isWxH5=" + this.orderInfo.isWxH5 || ""
+          });
         }
       });
     },

src/views/Policy/PayWaiting/index.vue

@@ -23,10 +23,12 @@ export default {
     // }
     this.setIsPayWait(true);
     this.orderInfo = this.$route.query;
+    // 如果存在isXyqb，同时当前不是在信用钱包环境，或众安第三方支付
     if (this.orderInfo.isXyqb == 1 && (!isXyqb || this.orderInfo.third)) {
       window.location.href = "xyqb://my";
       return;
     }
+    // 没有订单信息的情况
     if (!this.orderInfo.payOrderNo) {
       this.$notify({ type: "warning", message: "正在跳转..." });
       setTimeout(() => {