Merge branch 'fix/goods' into 'master'

fix: 顾问计划保险显示问题修复

See merge request !126

src/views/Consultant/Buy/index.vue

@@ -82,7 +82,7 @@
 <script>
 import localStorage from "@/service/localStorage";
 import { payByWay } from "@/service/pay";
-import { isXyqb } from "@/service/validation";
+import { isXyqb, isWeixinBrower } from "@/service/validation";
 import { mapActions, mapState } from "vuex";
 import { create, goPay, getRemainNum } from "@/api/consultant";
 import Card from "@/components/Card";
@@ -110,7 +110,7 @@ export default {
       price: [0.99, 199],
       consultantOrderNo: "",
       openId: localStorage.get("openId"),
-      tradeType: isXyqb ? "MWEB" : "JSAPI",
+      tradeType: isXyqb ? "MWEB" : isWeixinBrower ? "JSAPI" : "MWEB",
       serviceList: [
         { icon: "team", title: "资深", sub: "保险精算团队" },
         { icon: "card", title: "专属", sub: "保险顾问" },

src/views/Consultant/Plan/index.vue

@@ -129,13 +129,14 @@ export default {
         case "TKYLX001":
           _type = "医疗险";
           break;
+        case "BNZJX001":
         case "HTDQZJX001":
           _type = "重疾险";
           break;
         case "ZAYWX001":
           _type = "意外险";
           break;
-        case "BNZJX001":
+        case "HGSX001":
           _type = "人寿险";
           break;
         default:
@@ -150,13 +151,14 @@ export default {
         case "TKYLX001":
           _type = "warning";
           break;
+        case "BNZJX001":
         case "HTDQZJX001":
           _type = "danger";
           break;
         case "ZAYWX001":
           _type = "primary";
           break;
-        case "BNZJX001":
+        case "HGSX001":
           _type = "";
           break;
         default:

src/views/Goods/Detail/MIDetail.vue

@@ -263,6 +263,7 @@ export default {
         "relativeName",
         "relativeIdNo"
       ];
+      console.log(errorInfo);
       setTimeout(() => {
         this.$refs.navTab.showNavBar = false;
       }, 0);

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

@@ -35,7 +35,7 @@
         />
         <cr-field
           name="selfPhone"
-          v-model="formData.selfPhone"
+          v-model="selfPhone"
           type="tel"
           placeholder="请输入您的手机号码"
           label="手机号码"
@@ -201,6 +201,7 @@ export default {
       familyList: [],
       showCount: false,
       count: "",
+      selfPhone: "",
       timer: null,
       autoSaveKey: AUTO_SAVE_KEY,
       mongoToken: localStorage.get("mongoToken"),

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

@@ -93,8 +93,6 @@ export default {
             this.getPayResult();
           }, 3000);
         } else {
-          this.setIsPayWait(false);
-          this.setIsLoading(false);
           // 保单详情页支付需重新调用保单接口
           if (this.$route.name === "PolicyDetail") {
             this.getPolicy();
@@ -109,6 +107,8 @@ export default {
           this.$router.replace({
             path: "/policy/detail/" + orderNo + "?isWxH5=" + this.orderInfo.isWxH5 || ""
           });
+          this.setIsPayWait(false);
+          this.setIsLoading(false);
         }
       });
     },