Merge branch 'hotfix/投被同人无法填写手机号' into dev

# Conflicts:
#	src/router/ebiz/index.js
#	src/views/ebiz/sale/InsuredInfo.vue

src/router/ebiz/index.js

@@ -19,7 +19,6 @@ import manpower from './manpower'
 import cardList from './cardList'
 import renewalManage from './renewalManage'
 import preserve from './preserve'
-import exercising from './exercising'
 import productStore from './product-store'
 // 机构业绩
 import institutionalPerform from './institutionalPerform'
@@ -44,12 +43,11 @@ export default [
   ...survey,
   ...manpower,
   ...institutionalPerform,
-  ...claims,
   ...productStore,
-  ...question,
   ...preserve,
-  ...performance,
   ...attendance,
   ...congratulation,
-  ...renewalManage
+  ...performance,
+  ...renewalManage,
+  ...question
 ] //根据需要进行删减

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -93,7 +93,15 @@
       <div class="border-bt relative fs14 p10 flex align-center">
         <van-checkbox v-model="userInfo.effectiveDateType" class="fr" :disabled="effectiveDateTypeAble" @change="effectiveDataTypeChange">长期</van-checkbox>
       </div>
-      <select-radio :radios="sexRadio" required label="性别" :value.sync="userInfo.sex" :disabled="isInsured"></select-radio>
+      <select-radio
+        :radios="sexRadio"
+        required
+        label="性别"
+        :value.sync="userInfo.sex"
+        :disabled="isInsured"
+        v-validate="'required'"
+        name="性别"
+      ></select-radio>
       <van-field
         :value="userInfo.marriageStatus"
         readonly
@@ -628,7 +636,7 @@ export default {
       })
       this.userInfo.name = data.customerName //用户名
       if (data.dacustomerSex == null) {
-        this.userInfo.sex = ''
+        this.userInfo.sex = null
       } else {
         this.userInfo.sex = String(data.customerSex) //性别
       }
@@ -636,7 +644,7 @@ export default {
       this.userInfo.birthday = data.birthday //出生日期
       this.userInfo.idType = data.customerIdType //证件类型
       this.userInfo.idNo = data.customerIdNumber //证件号码
-      this.userInfo.marriageStatus = data.marryStatus === '1' ? '已婚' : '单身'
+      this.userInfo.marriageStatus = data.marryStatus === '1' ? '已婚' : data.marryStatus === '2' ? '单身' : null
       this.userInfo.marriage = data.marryStatus
       this.userInfo.village = data.homeAddress
       this.userInfo.mobile = data.customerPhone
@@ -962,6 +970,7 @@ export default {
         this.userInfo.certificateValidate = insuredDetail.certificateValidate //证件起始日期
         this.userInfo.certiexpiredate = insuredDetail.certiexpiredate == '9999-01-01' ? '' : insuredDetail.certiexpiredate //证件截止日期
         this.userInfo.effectiveDateType = insuredDetail.certiexpiredate == '9999-01-01' //是否长期
+        this.userInfo.mobile = insuredDetail.mobile
         let age = utilsAge.getAge(insuredDetail.birthday, new Date())
         this.effectiveDateTypeAble = age <= 45
         if (age > 45) {

src/views/ebiz/sale/AttachmentManagement.vue

@@ -395,6 +395,7 @@ export default {
   },
   mounted() {
     setTimeout(() => {
+      // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('webview_left_button', {
         img: this.$assetsUrl + 'images/del-close-btn@3x.png',
         intercept: '1' //是否拦截原生返回事件 1是 其他否

src/views/ebiz/sale/Detail.vue

@@ -134,11 +134,9 @@ export default {
   methods: {
     // 获取保单详情
     async getPolicyDetail() {
-      let that = this
       let data = {
         orderNo: window.localStorage.getItem('orderNo'),
         desensitizType: this.$route.query.type ? 0 : 1
-        // orderNo: '8186270000000806'
       }
       let params = {
         type: 3,
@@ -160,8 +158,8 @@ export default {
           } else if (res.orderDTO.orderInfoDTO.bnfFlag == '0') {
             res.orderDTO.orderInfoDTO.bnfFlag = '法定受益人'
           }
-          that.OrderInfoDTO = res.orderDTO.orderInfoDTO
-          that.appntDTO = res.orderDTO.appntDTO
+          this.OrderInfoDTO = res.orderDTO.orderInfoDTO
+          this.appntDTO = res.orderDTO.appntDTO
           this.reason = res.orderDTO.reason
 
           // 投保人信息

src/views/ebiz/sale/InsuredInfo.vue

@@ -1111,7 +1111,6 @@ export default {
         // }
         let workcompany = this.userInfo.workcompany
         if (!workcompany || (workcompany.length < 6 && workcompany.trim() != '无')) {
-          // await this.asyncToast('亲，您填写的工作单位过于简短哦~')
           this.userInfo.workcompany = '无'
         }