Merge branch 'fix/policy_fix' into 'master'

Fix/policy fix

See merge request !46

src/api/detail.huagui.shouxian.js

@@ -4,7 +4,7 @@
  * @Description: 华贵大麦2020定期寿险
  * @Date: 2020-07-27 15:46:37
  * @LastEditors: gzw
- * @LastEditTime: 2020-08-18 20:47:53
+ * @LastEditTime: 2020-08-18 22:42:18
  */
 
 import goodsBg from "@/assets/images/goods/detail/shouxian/bg.png";
@@ -56,6 +56,17 @@ export default {
     { title: "保障期限", value: "保10年/20年/30年" },
     { title: " ", value: "保至60岁/65岁/70岁" }
   ],
+  bankInfo: [
+      {title: "工商银行", value: "101"},
+      {title: "农业银行", value: "102"},
+      {title: "中国银行", value: "103"},
+      {title: "建设银行", value: "104"},
+      {title: "招商银行", value: "115"},
+      {title: "贵州银行", value: "105"},
+      {title: "兴业银行", value: "116"},
+      {title: "民生银行", value: "112"},
+      {title: "邮政储蓄", value: "128"}
+  ],
   planTipOptions: ["最高350万", "高风险职业可保", "免体检"],
   noticeCellInfo: [
     { title: "投保年龄", value: `18~60周岁` },

src/components/PopupPicker.vue

@@ -12,6 +12,7 @@
       <cr-picker
         ref="picker"
         :columns="pickerData"
+        value-key="title"
         show-toolbar
         @cancel="onCancel"
         @confirm="onConfirm"
@@ -28,8 +29,8 @@ export default {
   mixins: [popupPickerMixin],
   methods: {
     handleResult(res) {
-      this.pickerValShow = res[0];
-      this.pickerVal = res[1];
+      this.pickerValShow = res[0].title;
+      this.pickerVal = res[0].value;
     },
     setDefaultVal() {
       setTimeout(() => {

src/config/dev.config.js

 export default {
-  basicHost: "http://yapi.quantgroups.com/mock/329/",
-  // basicHost: "http://192.168.29.100:8964",
+  // basicHost: "http://yapi.quantgroups.com/mock/329/",
+  basicHost: "http://192.168.29.211:8964/",
   wxAppId: "wx514de17b23d53a20"
 };

src/views/Goods/Detail/AIDetail.vue

@@ -168,7 +168,7 @@ export default {
         if (idNo === oldNo) return;
         this.calTimer = setTimeout(() => {
           this.calFee();
-        }, 600);
+        }, 1200);
       }
     }
   },

src/views/Goods/Detail/CIIDetail.vue

@@ -178,7 +178,7 @@ export default {
         if (idNo === oldNo) return;
         this.calTimer = setTimeout(() => {
           this.calFee();
-        }, 600);
+        }, 1200);
       }
     }
   },

src/views/Goods/Detail/LIDetail.vue

@@ -174,7 +174,7 @@ export default {
         if (read !== oldread) return;
         this.calTimer = setTimeout(() => {
           this.calFee();
-        }, 600);
+        }, 1200);
       }
     }
   },

src/views/Goods/Detail/MIDetail.vue

@@ -171,7 +171,7 @@ export default {
         }
         this.calTimer = setTimeout(() => {
           this.calFee();
-        }, 600);
+        }, 1200);
       }
     }
   },

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

@@ -260,7 +260,12 @@ export default {
           name,
           idNo,
           userInfoSecId,
-          socialSecurity
+          socialSecurity:
+            socialSecurity === "" || typeof socialSecurity === "undefined"
+              ? ""
+              : socialSecurity
+              ? "1"
+              : "0"
         }
       };
     },

src/views/Policy/Add/index.vue

@@ -303,6 +303,37 @@
         <cr-field :value="formData.effectiveDate" name="effectiveDate" readonly label="生效日期" />
         <cr-field value="法定" name="beneficiaryUser" disabled label="受益人" />
       </cr-cell-group>
+      <cr-cell-group title="续费银行账户">
+        <cr-field
+          v-model="formData.holderUserInfo.bankCardName"
+          name="insuredUserInfo_bankCardName"
+          label="持卡人"
+          placeholder="请输入持卡人姓名"
+          :rules="[{ required: true, message: '请输入持卡人姓名' }]"
+        />
+        <cr-field
+          v-model="formData.holderUserInfo.bankCardCode"
+          name="insuredUserInfo_bankCardCode"
+          label="开户行"
+          :rules="[{ required: true, message: '请选择开户行' }]"
+        >
+          <template #input>
+            <popup-picker
+              v-model="formData.holderUserInfo.bankCardCode"
+              :picker-data="bankInfo"
+              placeholder="请选择开户行"
+            />
+          </template>
+        </cr-field>
+        <cr-field
+          v-model="formData.holderUserInfo.bankCardNo"
+          name="insuredUserInfo_bankCardNo"
+          label="银行卡号"
+          type="digit"
+          placeholder="请输入银行卡号"
+          :rules="[{ required: true, message: '请输入银行卡号' }]"
+        />
+      </cr-cell-group>
       <good-action @leftClick="goInsureState = true" :content="goodActionInfo" />
     </cr-form>
     <go-insure-dialog
@@ -343,6 +374,7 @@
 import GoodAction from "@/components/GoodAction";
 import CrRadioBtn from "@/components/CrRadioBtn";
 import PopupAreaPicker from "@/components/PopupAreaPicker";
+import PopupPicker from "@/components/PopupPicker";
 import PopupDatePicker from "@/components/PopupDatePicker";
 import PopupWithIframe from "@/components/PopupWithIframe";
 import PopupCascade from "@/components/PopupCascade";
@@ -369,7 +401,8 @@ const {
   benefitOptions,
   insuredOptions,
   idCardInvaildOptions,
-  socialSecOptions
+  socialSecOptions,
+  bankInfo
 } = Detail;
 export default {
   name: "AddPolicy",
@@ -381,6 +414,7 @@ export default {
     PopupAreaPicker,
     PopupDatePicker,
     PopupWithIframe,
+    PopupPicker,
     PopupCascade,
     Stepper
   },
@@ -407,7 +441,8 @@ export default {
         productItem: {
           amountInsured: "500000"
         },
-        payPeriod: "1"
+        payPeriod: "1",
+        autoRenewPolicy: true
       },
       subFromData: {},
       familyList: [],
@@ -419,6 +454,7 @@ export default {
       paywayOptions,
       benefitOptions,
       insuredAmountOptions,
+      bankInfo,
       selfInfoReadonly: false,
       infoReadonly: false
     };
@@ -454,7 +490,7 @@ export default {
         }
         this.calTimer = setTimeout(() => {
           this.calFee();
-        }, 600);
+        }, 1200);
       }
     },
     showAuthXyqb: {
@@ -512,11 +548,16 @@ export default {
     },
     nextStep() {
       this.subFromData = JSON.parse(JSON.stringify(this.formData));
-      const { socialSecurity, longTerm } = this.subFromData.insuredUserInfo;
-      const { longTerm: holderLongTerm } = this.subFromData.holderUserInfo;
+      const { socialSecurity, longTerm, relation } = this.subFromData.insuredUserInfo;
       this.subFromData.insuredUserInfo.socialSecurity = socialSecurity === "1" ? true : false;
       this.subFromData.insuredUserInfo.longTerm = longTerm === "2" ? true : false;
-      this.subFromData.holderUserInfo.longTerm = holderLongTerm === "2" ? true : false;
+      if (relation === "1") {
+        this.subFromData.holderUserInfo = {
+          ...this.subFromData.holderUserInfo,
+          ...this.subFromData.insuredUserInfo
+        };
+        delete this.subFromData.insuredUserInfo;
+      }
       this.generateOrder();
     },
     relationChange(relation = this.formData.insuredUserInfo.relation) {