Merge branch 'fix/goods' into 'master'

fix: 第三方支付兼容处理

See merge request !123

src/views/Policy/PayWaiting/index.vue

@@ -4,7 +4,7 @@
 
 <script>
 import detailPayMixin from "@/views/Goods/Detail/modules/detailPay.mixin";
-import qs from "qs";
+// import qs from "qs";
 import { isXyqb } from "@/service/validation";
 export default {
   name: "PayWaiting",
@@ -15,15 +15,15 @@ export default {
     };
   },
   mounted() {
-    if (document.referrer.length > 0) {
-      window.location.href =
-        window.location.origin +
-        "/payWaiting" +
-        qs.stringify(this.$route.query, { encode: true, addQueryPrefix: true });
-    }
+    // if (document.referrer.length > 0) {
+    //   window.location.href =
+    //     window.location.origin +
+    //     "/payWaiting" +
+    //     qs.stringify(this.$route.query, { encode: true, addQueryPrefix: true });
+    // }
     this.setIsPayWait(true);
     this.orderInfo = this.$route.query;
-    if (this.orderInfo.isXyqb == 1 && !isXyqb) {
+    if (this.orderInfo.isXyqb == 1 && (!isXyqb || this.orderInfo.third)) {
       window.location.href = "xyqb://my";
       return;
     }