Merge branch 'fix/goods' into 'master'

fix: 众安支付

See merge request !119

src/views/Goods/Detail/modules/InsurePersonForm.vue

@@ -445,6 +445,9 @@ export default {
               } else {
                 this.formData.relation = "1";
               }
+              if (this.mongoToken && !this.formData.selfPhone) {
+                this.formData.selfPhone = this.userInfo.phoneNoMask;
+              }
               if (!this.formData.selfName) {
                 const selfInfo = this.familyList.find(item => item.relation === 1);
                 this.selfInfoReadonly = !!selfInfo;

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

@@ -61,7 +61,7 @@ export default {
               state: 1
             }
           };
-        } else if (tradeType === "JSAPI" && !res.payInfo.payUrl) {
+        } else if (tradeType === "JSAPI" && !res.payInfo.payUrl && !res.payUrl) {
           payInfo = res.payInfo;
         } else {
           payInfo = {

src/views/Policy/PayWaiting/index.vue

@@ -15,7 +15,7 @@ export default {
     };
   },
   mounted() {
-    if (document.referrer.indexOf("tenpay") > -1) {
+    if (document.referrer.length > 0) {
       window.location.href =
         window.location.origin +
         "/payWaiting" +