Merge branch 'fix/policy_fix' into 'master'

Fix/policy fix

See merge request !56

src/views/Goods/Detail/CIIDetail.vue

@@ -319,14 +319,18 @@ export default {
       const res = await trail(_param);
       if (res) {
         price[0] = res.downPayPrice;
+        subPrice[1] = "元/月";
         subPrice[0] = res.regularPrice;
         this.goodActionInfo = {
           title: price,
-          sub: subPrice
+          sub: subPrice[0] ? subPrice : ""
         };
         this.goodBuyModalInfo = [
           { title: `${price[2]}保费`, value: `${price[0]}${price[1]}` },
-          { title: `${subPrice[2]}保费`, value: `${subPrice[0]}${subPrice[1]}${subPrice[3]}` }
+          {
+            title: `${subPrice[2]}保费`,
+            value: subPrice[0] ? `${subPrice[0]}${subPrice[1]}${subPrice[3]}` : ""
+          }
         ];
       }
     }

src/views/Goods/Detail/LIDetail.vue

@@ -271,6 +271,7 @@ export default {
       };
       const res = await trail(_param);
       if (res) {
+        price[1] = "元/年";
         price[0] = res.regularPrice;
         this.goodActionInfo = { title: price };
       }

src/views/Goods/Inform/index.vue

@@ -39,47 +39,50 @@ export default {
   },
   methods: {
     conform() {
-      this.$router.push(`/policy/detail/123`);
-      // this.generateFormData();
-      // this.generateOrder();
+      // this.$router.push(`/policy/detail/123`);
+      this.generateFormData();
+      this.generateOrder();
     },
     generateFormData() {
+      const subFromData = JSON.parse(JSON.stringify(this.formData));
       const {
-        productNo,
         userInfoSecId,
         name,
         idNo,
         relation,
-        // socialSecurity,
-        // selfSocialSecurity,
+        socialSecurity,
+        selfSocialSecurity,
         selfName,
         selfIdNo,
         selfPhone,
         selfSecId,
         payType,
         autoRenewPolicy
-      } = this.formData;
+      } = subFromData;
       this.subFromData = {
-        insuredUserInfo: {
-          userInfoSecId: userInfoSecId ?? null,
-          name,
-          idNo,
-          relation
-          // socialSecurity: socialSecurity ? !!Number(socialSecurity) : null
-        },
-        productNo,
+        productNo: this.goodId,
         holderUserInfo: {
           phoneNo: selfPhone,
-          userInfoSecId: selfSecId,
+          userInfoSecId: selfSecId ? selfSecId : null,
           name: selfName,
           idNo: selfIdNo
-          // socialSecurity: selfSocialSecurity ? !!Number(selfSocialSecurity) : null
         },
         productItem: {
-          payType: payType ? payType : null
+          payType
         },
         autoRenewPolicy: autoRenewPolicy
       };
+      if (relation === "1") {
+        this.subFromData.holderUserInfo.socialSecurity = !!Number(selfSocialSecurity);
+      } else {
+        this.subFromData.insuredUserInfo = {
+          userInfoSecId: userInfoSecId ? userInfoSecId : undefined,
+          name,
+          idNo,
+          relation,
+          socialSecurity: !!Number(socialSecurity)
+        };
+      }
     }
   }
 };

src/views/Goods/index.vue

@@ -8,7 +8,7 @@
         <cr-tabbar-item>少儿</cr-tabbar-item>
       </cr-tabbar>
     </cr-sticky>
-    <good-list :list="list" />
+    <good-list :list="list" :style="{ opacity: goodsList.length > 0 ? 1 : 0 }" />
     <ai-test-tip @click.native="showLayer = true" />
     <copyright :logo="true" />
     <tabbar></tabbar>

src/views/Policy/Add/index.vue

@@ -502,7 +502,7 @@ export default {
           policyPeriod: oldpolicyPeriod,
           payPeriod: oldpayPeriod,
           payType: oldpayType
-        } = val.productItem;
+        } = oldVal.productItem;
         let idNoWho = !relation || relation === "1" ? val.holderUserInfo.idNo : idNo;
         let oldidNoWho = !relation || relation === "1" ? oldVal.holderUserInfo.idNo : oldIdNo;
         if (
@@ -721,6 +721,7 @@ export default {
       };
       const res = await trail(_param);
       if (res) {
+        price[1] = "元/年";
         price[0] = res.downPayPrice;
         this.goodActionInfo = {
           title: price