Merge branch 'hotfix/bug_GFRS【与卡单一起上线】建议书-投保人页-年龄及校验问题' into dev

src/assets/js/utils/validator.js

@@ -99,9 +99,9 @@ Validator.extend('maxAge', {
 })
 //被保险人年龄（不得小于18周岁）
 Validator.extend('appntAge', {
-  getMessage: () => '年龄不得小于18周岁',
+  getMessage: () => '年龄不得小于16周岁',
   validate: value => {
-    return value > 17 && /^\d{1,3}$/.test(value)
+    return value > 15 && /^\d{1,3}$/.test(value)
   }
 })
 

src/views/ebiz/proposal/Appnt.vue

@@ -43,7 +43,8 @@
         placeholder="投保人职业"
       />
       <div class="border-bottom">
-        <van-field :border="false" v-model="appntDTO.age" clearable label="年龄" v-validate="'appntAge'" placeholder="投保人年龄" />
+        <van-field :border="false" v-model="appntDTO.age" clearable label="年龄" v-validate="'appntAge'" placeholder="投保人年龄" :readonly="ageFlag" />
+        <!-- <van-field :border="false" v-model="appntDTO.age" clearable label="年龄" v-validate="'appntAge'" placeholder="投保人年龄" readonly /> -->
       </div>
       <van-field :border="false" v-model="appntDTO.mobile" clearable label="手机号码" name="手机号码" placeholder="投保人手机号码" v-validate="'mobile'" />
       <van-button type="danger" @click="nextStep" class="bottom-btn fs16">下一步</van-button>
@@ -87,7 +88,8 @@ export default {
       },
       customerShowPicker: false,
       occupationShowPicker: false,
-      currentPopupIndex: ''
+      currentPopupIndex: '',
+      ageFlag: false //年龄输入框是否只读 false-可输入  true-只读
     }
   },
   components: {
@@ -170,9 +172,10 @@ export default {
       this.appntDTO.name = data
     },
     dateConfirm(data) {
+      console.log(11)
       let age = getAge.getAge(data, new Date())
-
       this.appntDTO.age = age
+      this.ageFlag = true
     },
     //从客户列表选择客户
     chooseCustomer(data) {
@@ -191,12 +194,13 @@ export default {
         sex: String(customerSex),
         name: customerName,
         occupationName,
-        age: age ? age : '',
+        age: age ? age : getAge.getAge(birthday, new Date()),
         occupationCode,
         lifeGrade,
         healthGrade,
         socialSecurity
       }
+      this.ageFlag = true
     },
 
     nextStep() {

src/views/ebiz/proposal/ProposalInfo.vue

@@ -222,7 +222,7 @@
           </div>
         </div>
         <div class="div_14"></div>
-        <div v-show="!isWeixin" class="fixed div_13">
+        <div class="fixed div_13">
           <van-button class="img_11" @click="goToCompanyProfile" v-no-more-click="1000"></van-button>
           <van-button class="img_12" @click="goPDF" v-no-more-click="1000"></van-button>
         </div>
@@ -350,7 +350,7 @@ export default {
       },
       agent: {},
       mainRiskCodes: [],
-      time: 10
+      time: 5
     }
   },
   filters: {

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -933,7 +933,6 @@ export default {
             ) {
               // const message = res.orderDTO.productDTO.special.content
               // Dialog({ message })
-              
               let content =  res.orderDTO.productDTO.special.content
                 // {
                 //   title: '标题', 
@@ -945,7 +944,6 @@ export default {
                 // message  内容，\n换行
                 // confirmButtonText：确认按钮的文字
                 // messageAlign： 对齐方式，固定左对齐，为'left'
-              
               try {
                 const config = JSON.parse(content);
                 config.message = '  ' + config.message
@@ -965,7 +963,6 @@ export default {
                   messageAlign: 'left'
                 })
               }
-              
               // const message = '  ' + res.orderDTO.productDTO.special.content
               // Dialog({
               //   message: message.split('\\n').join('\n  '),