Merge branch 'fix/goods' into 'master'

fix: 顾问支付问题

See merge request !115

src/views/Consultant/index.vue

@@ -68,7 +68,7 @@ export default {
       const res = await getCulOrder();
       if (res) {
         this.orderInfo = res;
-        if (checkPayState && res.state < 3) {
+        if (checkPayState && res[0] && res[0].state < 3) {
           this.getPayState();
         } else {
           this.setIsPayWait(false);

src/views/Goods/Detail/AIDetail.vue

@@ -153,11 +153,13 @@ export default {
       deep: true,
       immediate: true,
       handler(val) {
+        const { amountInsured } = this.formData;
         const { price } = val;
         const _price = JSON.parse(JSON.stringify(price));
         _price[1] = "元/年起";
         this.goodActionInfo = { title: _price };
         this.goodBuyModalInfo = [{ title: `每年保费`, value: `${price[0]}元` }];
+        this.noticeCellInfo[amountInsured][2].value = `${price[0] + price[1]}`;
       }
     },
     formDataCpu: {

src/views/Goods/Detail/CIIDetail.vue

@@ -152,6 +152,7 @@ export default {
       immediate: true,
       handler(val) {
         const { price, subPrice } = val;
+        const { amountInsured } = this.formData;
         this.goodActionInfo = {
           title: price,
           sub: subPrice
@@ -160,6 +161,11 @@ export default {
           { title: `${price[2]}保费`, value: `${price[0]}${price[1]}` },
           { title: `${subPrice[2]}保费`, value: `${subPrice[0]}${subPrice[1]}${subPrice[3]}` }
         ];
+        this.noticeCellInfo[
+          amountInsured
+        ][3].value.tpl = `保费与保额、被保人年龄有关<br />${price[2] + price[0] + price[1]}，${
+          subPrice[0] ? subPrice[2] + subPrice[0] + subPrice[1] : ""
+        }`;
       }
     },
     formDataCpu: {

src/views/Goods/Detail/MIDetail.vue

@@ -163,6 +163,9 @@ export default {
             value: `${subPrice[0]}${subPrice[1]}${subPrice[3]}`
           }
         ];
+        this.noticeCellInfo[3].value.tpl = `保费与被保人年龄、有无社保有关<br />${price[2] +
+          price[0] +
+          price[1]}，${subPrice[0] ? subPrice[2] + subPrice[0] + subPrice[1] : ""}`;
       }
     },
     formDataCpu: {

src/views/Goods/Detail/index.vue

@@ -38,7 +38,7 @@ export default {
     };
   },
   beforeRouteLeave(to, from, next) {
-    const blackList = ["Goods", "Home", "Detail", "ConsultantPlan"];
+    const blackList = ["Goods", "Home", "Detail", "ConsultantPlan", "User"];
     if (isXyqb && this.showAuthXyqb == 2) {
       next(false);
       return;

yarn.lock

@@ -5334,6 +5334,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash-es@^4.17.15:
+  version "4.17.15"
+  resolved "http://npmprivate.quantgroups.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
+  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
+
 lodash.defaultsdeep@^4.6.1:
   version "4.6.1"
   resolved "http://npmprivate.quantgroups.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"