Merge branch 'fix/policy_fix' into 'master'

fix: 华贵relation修改；#MANGO-31；#MANGO-26；#MANGO-40；#MANGO-35

See merge request !50

src/api/detail.huagui.shouxian.js

@@ -4,7 +4,7 @@
  * @Description: 华贵大麦2020定期寿险
  * @Date: 2020-07-27 15:46:37
  * @LastEditors: gzw
- * @LastEditTime: 2020-08-19 11:20:24
+ * @LastEditTime: 2020-08-19 14:07:08
  */
 
 import goodsBg from "@/assets/images/goods/detail/shouxian/bg.png";
@@ -81,8 +81,8 @@ export default {
   ],
   insuredOptions: [
     { label: "本人", value: "1" },
-    { label: "配偶", value: "2" },
-    { label: "父母", value: "3" },
+    { label: "父母", value: "2" },
+    { label: "配偶", value: "3" },
     { label: "子女", value: "4" }
   ],
   medicalOptions: [

src/components/PopupAreaPicker.vue

 <template>
   <div class="picker-wrap">
-    <div
-      class="picker-wrap-txt"
-      :class="{ placeholder: !String(pickerValShow) }"
-      @click="show = true"
-    >
-      <span>{{ pickerValShow || placeholder }}</span>
+    <div class="picker-wrap-txt" @click="show = true">
+      <input type="text" disabled :value="pickerValShow" :placeholder="placeholder" />
+      <!-- <span>{{ pickerValShow || placeholder }}</span> -->
       <svg-icon icon-class="triangle-right" slot="button" />
     </div>
     <cr-popup v-model="show" position="bottom" get-container="body">
@@ -85,8 +82,11 @@ export default {
     height: 16px;
     width: 16px;
   }
-  .placeholder {
-    color: #ccc;
+  input {
+    width: 90%;
+    &:disabled {
+      background-color: transparent;
+    }
   }
 }
 </style>

src/components/PopupCascade.vue

 <template>
   <div class="jobs-wrap">
-    <div class="jobs-wrap-txt" :class="{ placeholder: !selectedTexts[2] }" @click="show = true">
-      <span>{{ selectedTexts[2] || placeholder }}</span>
+    <div class="jobs-wrap-txt" @click="show = true">
+      <input type="text" disabled :value="selectedTexts[2]" :placeholder="placeholder" />
       <svg-icon icon-class="triangle-right" slot="button" />
     </div>
     <cr-popup v-model="show" get-container="body" round closeable position="bottom" class="jobs">
@@ -285,6 +285,12 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      input {
+        width: 90%;
+        &:disabled {
+          background-color: transparent;
+        }
+      }
     }
   }
   &-head {
@@ -353,7 +359,4 @@ export default {
     }
   }
 }
-.placeholder {
-  color: #ccc;
-}
 </style>

src/components/PopupDatePicker.vue

 <template>
   <div class="picker-wrap">
-    <div
-      class="picker-wrap-txt"
-      :class="{ placeholder: !String(pickerValShow) }"
-      @click="show = true"
-    >
-      <span>{{ pickerValShow || placeholder }}</span>
+    <div class="picker-wrap-txt" @click="show = true">
+      <input type="text" disabled :value="pickerValShow" :placeholder="placeholder" />
       <svg-icon icon-class="triangle-right" slot="button" />
     </div>
-    <cr-popup v-model="show" position="bottom" class="aaaa">
+    <cr-popup v-model="show" position="bottom" get-container="body">
       <cr-date-picker
         ref="datepicker"
         :before="before"
@@ -90,12 +86,15 @@ export default {
     justify-content: space-between;
     align-items: center;
   }
+  input {
+    width: 90%;
+    &:disabled {
+      background-color: transparent;
+    }
+  }
   .svg-icon {
     height: 16px;
     width: 16px;
   }
-  .placeholder {
-    color: #ccc;
-  }
 }
 </style>

src/components/PopupPicker.vue

 <template>
   <div class="picker-wrap">
-    <div
-      class="picker-wrap-txt"
-      :class="{ placeholder: !String(pickerValShow) }"
-      @click="show = true"
-    >
-      <span>{{ pickerValShow || placeholder }}</span>
+    <div class="picker-wrap-txt" @click="show = true">
+      <input type="text" disabled :value="pickerValShow" :placeholder="placeholder" />
       <svg-icon icon-class="triangle-right" slot="button" />
     </div>
     <cr-popup v-model="show" position="bottom" get-container="body">
@@ -52,12 +48,15 @@ export default {
     justify-content: space-between;
     align-items: center;
   }
+  input {
+    width: 90%;
+    &:disabled {
+      background-color: transparent;
+    }
+  }
   .svg-icon {
     height: 16px;
     width: 16px;
   }
-  .placeholder {
-    color: #ccc;
-  }
 }
 </style>

src/views/Goods/Detail/AIDetail.vue

@@ -228,9 +228,20 @@ export default {
     },
     onFailed(errorInfo) {
       const { errors } = errorInfo;
+      const noMsgArr = [
+        "selfName",
+        "selfIdNo",
+        "selfPhone",
+        "selfCode",
+        "relativeName",
+        "relativeIdNo"
+      ];
       setTimeout(() => {
         this.$refs.navTab.showNavBar = false;
       }, 0);
+      if (!noMsgArr.includes(errors[0].name)) {
+        this.$notify({ type: "warning", message: errors[0].message });
+      }
       this.$notify({ type: "warning", message: errors[0].message });
     },
     nextStep() {

src/views/Goods/Detail/CIIDetail.vue

@@ -234,9 +234,20 @@ export default {
     },
     onFailed(errorInfo) {
       const { errors } = errorInfo;
+      const noMsgArr = [
+        "selfName",
+        "selfIdNo",
+        "selfPhone",
+        "selfCode",
+        "relativeName",
+        "relativeIdNo"
+      ];
       setTimeout(() => {
         this.$refs.navTab.showNavBar = false;
       }, 0);
+      if (!noMsgArr.includes(errors[0].name)) {
+        this.$notify({ type: "warning", message: errors[0].message });
+      }
       this.$notify({ type: "warning", message: errors[0].message });
     },
     nextStep() {

src/views/Goods/Detail/MIDetail.vue

@@ -216,16 +216,27 @@ export default {
     },
     onFailed(errorInfo) {
       const { errors } = errorInfo;
+      const noMsgArr = [
+        "selfName",
+        "selfIdNo",
+        "selfPhone",
+        "selfCode",
+        "relativeName",
+        "relativeIdNo"
+      ];
       setTimeout(() => {
         this.$refs.navTab.showNavBar = false;
       }, 0);
+      if (!noMsgArr.includes(errors[0].name)) {
         this.$notify({ type: "warning", message: errors[0].message });
+      }
     },
     nextStep() {
       this.generateFormData();
       this.generateOrder();
     },
     generateFormData() {
+      const subFromData = JSON.parse(JSON.stringify(this.formData));
       const {
         userInfoSecId,
         name,
@@ -239,7 +250,7 @@ export default {
         selfSecId,
         payType,
         autoRenewPolicy
-      } = this.formData;
+      } = subFromData;
       this.subFromData = {
         productNo: this.goodId,
         holderUserInfo: {

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

@@ -70,28 +70,43 @@
           label="身份证号"
           :rules="[{ required: true, message: '请输入身份证号' }]"
         />
-        <cr-cell class="insure-form-item_nobg" v-if="radioOptions.medicalOptions">
-          <template slot="title">
-            <span>有无医保</span>
+        <cr-field
+          class="insure-form-item_nobg"
+          v-if="radioOptions.medicalOptions"
+          v-model="formData.socialSecurity"
+          name="socialSecurity"
+          label="有无医保"
+          :rules="[{ required: true, message: '请选择医保状态' }]"
+        >
+          <template #input>
             <svg-icon
               icon-class="doubt"
               @click.native="question = true"
               class-name="Ffr-title-svg"
             />
-          </template>
             <cr-radio-btn
               name="socialSecurity"
               v-model="formData.socialSecurity"
               :radio-data="radioOptions.medicalOptions"
             />
-        </cr-cell>
-        <cr-cell title="缴费方式" class="insure-form-item_nobg" v-if="radioOptions.paywayOptions">
+          </template>
+        </cr-field>
+        <cr-field
+          class="insure-form-item_nobg"
+          v-if="radioOptions.paywayOptions"
+          v-model="formData.payType"
+          name="payType"
+          label="缴费方式"
+          :rules="[{ required: true, message: '请选择缴费方式' }]"
+        >
+          <template #input>
             <cr-radio-btn
-            name="type"
+              name="payType"
               v-model="formData.payType"
               :radio-data="radioOptions.paywayOptions"
             />
-        </cr-cell>
+          </template>
+        </cr-field>
       </cr-cell-group>
     </card>
     <Modal
@@ -170,6 +185,7 @@ export default {
       handler(val) {
         this.formData.selfPhone =
           val.phoneNoMask && val.phoneNoMask !== "点击登录" ? val.phoneNoMask : "";
+        this.$forceUpdate();
       }
     },
     formData: {
@@ -351,7 +367,7 @@ export default {
     }
   }
   &-item_nobg {
-    background-color: @white !important;
+    background-color: transparent !important;
     padding: 10px 0;
     overflow: initial;
     align-items: baseline !important;
@@ -370,6 +386,10 @@ export default {
         overflow: initial;
       }
     }
+    @{deep} .cr-field--control {
+      display: block;
+      position: relative;
+    }
   }
 }
 .insured {
@@ -384,6 +404,8 @@ export default {
   }
 }
 .Ffr-title-svg {
-  margin-left: 5px;
+  position: absolute;
+  top: 10px;
+  left: -35px;
 }
 </style>