Merge branch 'fix/goods' into 'master'

fix: 微信H5支付safari问题修复

See merge request !141

src/service/pay.js

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

src/views/Policy/PayWaiting/index.vue

@@ -26,7 +26,7 @@ export default {
     this.isPayWait = true;
     this.orderInfo = this.$route.query;
     // 如果存在isXyqb，同时当前不是在信用钱包环境
-    if ((this.orderInfo.isfXyqb == 1 && !isXyqb) || this.orderInfo.third === "zhongan") {
+    if ((this.orderInfo.isXyqb == 1 && !isXyqb) || this.orderInfo.third == 1) {
       window.location.href = "xyqb://my";
       if (localStorage.get("mongoToken")) {
         this.$router.replace("/policy");