diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 8aa4e0c99..999af92c8 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -684,12 +684,52 @@ export default {
     {
       shortName: '重疾险',
       name: '国富人寿八桂无忧重大疾病保险（B款）',
-      code: 'GFRSPRO_M0001'
+      code: 'GFRS_M0001'
     },
     {
       shortName: '年金险',
       name: '国富人寿国富民鑫年金保险',
-      code: 'GFRSPRO_M0002'
+      code: 'GFRS_M0002'
+    },
+    {
+      shortName: '年金险',
+      name: '国富人寿金管家养老年金保险产品（万能型）',
+      code: 'GFRS_M0003'
+    },
+    {
+      shortName: '年金险',
+      name: '国富人寿瑞利年金保险',
+      code: 'GFRS_M0004'
+    },
+    {
+      shortName: '医疗险',
+      name: '国富人寿国富民惠医疗保险',
+      code: 'GFRS_M0005'
+    },
+    {
+      shortName: '年金险',
+      name: '国富人寿福宝宝教育年金保险',
+      code: 'GFRS_M0006'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿国富民安重大疾病保险',
+      code: 'GFRS_M0007'
+    },
+    {
+      shortName: '意外险',
+      name: '国富人寿综合意外伤害保险',
+      code: 'GFRS_M0008'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿国富民康重大疾病保险',
+      code: 'GFRS_M0009'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿八桂无忧重大疾病保险',
+      code: 'GFRS_M0010'
     }
   ],
   // 职级
@@ -753,79 +793,289 @@ export default {
   ],
   // 民族
   nationType: [
-    { id: '01', text: '汉族' },
-    { id: '02', text: '蒙古族' },
-    { id: '03', text: '回族' },
-    { id: '04', text: '藏族' },
-    { id: '05', text: '维吾尔族' },
-    { id: '06', text: '苗族' },
-    { id: '07', text: '彝族' },
-    { id: '08', text: '壮族' },
-    { id: '09', text: '布依族' },
-    { id: '10', text: '朝鲜族' },
-    { id: '11', text: '满族' },
-    { id: '12', text: '侗族' },
-    { id: '13', text: '瑶族' },
-    { id: '14', text: '白族' },
-    { id: '15', text: '土家族' },
-    { id: '16', text: '哈尼族' },
-    { id: '17', text: '哈萨克族' },
-    { id: '18', text: '傣族' },
-    { id: '19', text: '黎族' },
-    { id: '20', text: '傈僳族' },
-    { id: '21', text: '佤族' },
-    { id: '22', text: '畲族' },
-    { id: '23', text: '高山族' },
-    { id: '24', text: '拉祜族' },
-    { id: '25', text: '水族' },
-    { id: '26', text: '东乡族' },
-    { id: '27', text: '纳西族' },
-    { id: '28', text: '景颇族' },
-    { id: '代码', text: '民族' },
-    { id: '29', text: '柯尔克孜族' },
-    { id: '30', text: '土族' },
-    { id: '31', text: '达斡尔族' },
-    { id: '32', text: '仫佬族' },
-    { id: '33', text: '羌族' },
-    { id: '34', text: '布朗族' },
-    { id: '35', text: '撒拉族' },
-    { id: '36', text: '毛难族' },
-    { id: '37', text: '仡佬族' },
-    { id: '38', text: '锡伯族' },
-    { id: '39', text: '阿昌族' },
-    { id: '40', text: '普米族' },
-    { id: '41', text: '塔吉克族' },
-    { id: '42', text: '怒族' },
-    { id: '43', text: '乌孜别克族' },
-    { id: '44', text: '俄罗斯族' },
-    { id: '45', text: '鄂温克族' },
-    { id: '46', text: '崩龙族' },
-    { id: '47', text: '保安族' },
-    { id: '48', text: '裕固族' },
-    { id: '49', text: '京族' },
-    { id: '50', text: '塔塔尔族' },
-    { id: '51', text: '独龙族' },
-    { id: '52', text: '鄂伦春族' },
-    { id: '53', text: '赫哲族' },
-    { id: '54', text: '门巴族' },
-    { id: '55', text: '珞巴族' },
-    { id: '56', text: '基诺族' },
-    { id: '97', text: '其他' },
-    { id: '98', text: '外国血统' }
+    {
+      id: '01',
+      text: '汉族'
+    },
+    {
+      id: '02',
+      text: '蒙古族'
+    },
+    {
+      id: '03',
+      text: '回族'
+    },
+    {
+      id: '04',
+      text: '藏族'
+    },
+    {
+      id: '05',
+      text: '维吾尔族'
+    },
+    {
+      id: '06',
+      text: '苗族'
+    },
+    {
+      id: '07',
+      text: '彝族'
+    },
+    {
+      id: '08',
+      text: '壮族'
+    },
+    {
+      id: '09',
+      text: '布依族'
+    },
+    {
+      id: '10',
+      text: '朝鲜族'
+    },
+    {
+      id: '11',
+      text: '满族'
+    },
+    {
+      id: '12',
+      text: '侗族'
+    },
+    {
+      id: '13',
+      text: '瑶族'
+    },
+    {
+      id: '14',
+      text: '白族'
+    },
+    {
+      id: '15',
+      text: '土家族'
+    },
+    {
+      id: '16',
+      text: '哈尼族'
+    },
+    {
+      id: '17',
+      text: '哈萨克族'
+    },
+    {
+      id: '18',
+      text: '傣族'
+    },
+    {
+      id: '19',
+      text: '黎族'
+    },
+    {
+      id: '20',
+      text: '傈僳族'
+    },
+    {
+      id: '21',
+      text: '佤族'
+    },
+    {
+      id: '22',
+      text: '畲族'
+    },
+    {
+      id: '23',
+      text: '高山族'
+    },
+    {
+      id: '24',
+      text: '拉祜族'
+    },
+    {
+      id: '25',
+      text: '水族'
+    },
+    {
+      id: '26',
+      text: '东乡族'
+    },
+    {
+      id: '27',
+      text: '纳西族'
+    },
+    {
+      id: '28',
+      text: '景颇族'
+    },
+    {
+      id: '代码',
+      text: '民族'
+    },
+    {
+      id: '29',
+      text: '柯尔克孜族'
+    },
+    {
+      id: '30',
+      text: '土族'
+    },
+    {
+      id: '31',
+      text: '达斡尔族'
+    },
+    {
+      id: '32',
+      text: '仫佬族'
+    },
+    {
+      id: '33',
+      text: '羌族'
+    },
+    {
+      id: '34',
+      text: '布朗族'
+    },
+    {
+      id: '35',
+      text: '撒拉族'
+    },
+    {
+      id: '36',
+      text: '毛难族'
+    },
+    {
+      id: '37',
+      text: '仡佬族'
+    },
+    {
+      id: '38',
+      text: '锡伯族'
+    },
+    {
+      id: '39',
+      text: '阿昌族'
+    },
+    {
+      id: '40',
+      text: '普米族'
+    },
+    {
+      id: '41',
+      text: '塔吉克族'
+    },
+    {
+      id: '42',
+      text: '怒族'
+    },
+    {
+      id: '43',
+      text: '乌孜别克族'
+    },
+    {
+      id: '44',
+      text: '俄罗斯族'
+    },
+    {
+      id: '45',
+      text: '鄂温克族'
+    },
+    {
+      id: '46',
+      text: '崩龙族'
+    },
+    {
+      id: '47',
+      text: '保安族'
+    },
+    {
+      id: '48',
+      text: '裕固族'
+    },
+    {
+      id: '49',
+      text: '京族'
+    },
+    {
+      id: '50',
+      text: '塔塔尔族'
+    },
+    {
+      id: '51',
+      text: '独龙族'
+    },
+    {
+      id: '52',
+      text: '鄂伦春族'
+    },
+    {
+      id: '53',
+      text: '赫哲族'
+    },
+    {
+      id: '54',
+      text: '门巴族'
+    },
+    {
+      id: '55',
+      text: '珞巴族'
+    },
+    {
+      id: '56',
+      text: '基诺族'
+    },
+    {
+      id: '97',
+      text: '其他'
+    },
+    {
+      id: '98',
+      text: '外国血统'
+    }
   ],
   //政治面貌
   politicsStatus: [
-    { id: '01', text: '中共党员' },
-    { id: '02', text: '中共预备党员' },
-    { id: '04', text: '民革党员' },
-    { id: '05', text: '民盟盟员' },
-    { id: '06', text: '民建会员' },
-    { id: '07', text: '民进会员' },
-    { id: '08', text: '农工党党员' },
-    { id: '09', text: '致公党党员' },
-    { id: '10', text: '九三学社社员' },
-    { id: '11', text: '台盟盟员' },
-    { id: '12', text: '无党派人士' }
+    {
+      id: '01',
+      text: '中共党员'
+    },
+    {
+      id: '02',
+      text: '中共预备党员'
+    },
+    {
+      id: '04',
+      text: '民革党员'
+    },
+    {
+      id: '05',
+      text: '民盟盟员'
+    },
+    {
+      id: '06',
+      text: '民建会员'
+    },
+    {
+      id: '07',
+      text: '民进会员'
+    },
+    {
+      id: '08',
+      text: '农工党党员'
+    },
+    {
+      id: '09',
+      text: '致公党党员'
+    },
+    {
+      id: '10',
+      text: '九三学社社员'
+    },
+    {
+      id: '11',
+      text: '台盟盟员'
+    },
+    {
+      id: '12',
+      text: '无党派人士'
+    }
   ],
   rsIdType: [
     {
diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js
index 8f532603d..e8da7f9ba 100644
--- a/src/assets/js/utils/validator.js
+++ b/src/assets/js/utils/validator.js
@@ -1,5 +1,7 @@
 import Vue from 'vue'
-import VeeValidate, { Validator } from 'vee-validate'
+import VeeValidate, {
+  Validator
+} from 'vee-validate'
 import zh_CN from 'vee-validate/dist/locale/zh_CN'
 import idNoCheck from './idNoCheck'
 
@@ -58,11 +60,11 @@ Validator.extend('age', {
     return value > 17 && /^\d{1,3}$/.test(value)
   }
 })
-//被保人年龄（不得小于16周岁）
+//被保人年龄（不得小于18周岁）
 Validator.extend('appntAge', {
-  getMessage: () => '年龄不得小于16周岁',
+  getMessage: () => '年龄不得小于18周岁',
   validate: value => {
-    return value > 15 && /^\d{1,3}$/.test(value)
+    return value > 17 && /^\d{1,3}$/.test(value)
   }
 })
 
@@ -85,7 +87,7 @@ Validator.extend('bankCard', {
     return field + '格式不正确，请您填写正确的格式'
   },
   validate: value => {
-    return /^(\d{16}|\d{19})$/.test(value)
+    return /^(\d{16}|\d{18}|\d{19})$/.test(value)
   }
 })
 
@@ -136,4 +138,4 @@ Validator.extend('avoirdupois', {
   validate: value => {
     return /^[0-9]+([.]{1}[0-9]{1})?$/.test(value) && value > 0.1
   }
-})
+})
\ No newline at end of file
diff --git a/src/components/ebiz/sale/UploadImageFile.vue b/src/components/ebiz/sale/UploadImageFile.vue
index 3150764f0..7bd52baec 100644
--- a/src/components/ebiz/sale/UploadImageFile.vue
+++ b/src/components/ebiz/sale/UploadImageFile.vue
@@ -35,7 +35,8 @@ export default {
     return {
       file: '',
       imgName: '',
-      fileListIdFront: []
+      fileListIdFront: [],
+      isSuccess: false
     }
   },
   components: {
@@ -71,12 +72,11 @@ export default {
         return function(e) {
           let result = this.result
           console.info(this.result)
+
           // 上传图片
           uploadImg(formdata).then(res => {
-            let data = { imgData: res.path, realName: that.realName, idno: that.idno }
-            recognition(data).then(res => {
-              that.$emit('sendimage', res)
-            })
+            let num = 0
+            that.recognition(res, num)
           })
         }
       })(e.target.files[0])
@@ -84,6 +84,29 @@ export default {
 
       let formdata = new FormData()
       formdata.append('imgPath', that.file)
+    },
+    recognition(val, num) {
+      let data = {}
+      num++
+      console.log(num)
+      if (window.localStorage.failedNumber == '0') {
+        // 第一次人脸失败传180
+        data = { imgData: val.path, realName: this.realName, idno: this.idno, isFly: '270', num: num }
+      } else {
+        data = { imgData: val.path, realName: this.realName, idno: this.idno, isFly: '90', num: num }
+      }
+      recognition(data).then(res => {
+        if (res.result == '0' && res.content.result == '1') {
+          window.localStorage.failedNumber = ''
+          this.isSuccess = true
+        } else if (res.result == '0' && res.content.result == '2') {
+          window.localStorage.failedNumber = '0'
+          this.recognition(val, num)
+        } else {
+          this.$toast(res.resultMessage)
+        }
+        this.$emit('sendimage', this.isSuccess)
+      })
     }
   }
 }
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index fd6f15ae8..293f327ea 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -50,6 +50,43 @@
               @click="toSelect(index, riskFactorIndex, riskFactor.columns)"
             />
           </div>
+          <div class="border-bottom" v-if="riskFactor.type == 3">
+            <div class="pv12 border-bd">{{ riskFactor.name }}</div>
+            <div class="duty">
+              <div class="flex justify-content-s border-bd pv10 align-items-c" v-for="(dutyItem, dutyItemIndex) in riskFactor.rules" :key="dutyItemIndex">
+                <span class="fs14 w100">{{ dutyItem.dutyName }}({{ dutyItem.suffix }})</span>
+                <div class="flex">
+                  <van-stepper
+                    v-model="dutyItem.defaultDutyAmt"
+                    :min="dutyItem.minDutyAmt"
+                    :max="dutyItem.maxDutyAmt"
+                    class="ml10 mr10"
+                    @focus="focusStep"
+                    @blur="blurStep"
+                    @change="
+                      dutyStepperChange(
+                        item.calFactorLst[riskFactorIndex].rules[dutyItemIndex].defaultDutyAmt,
+                        index,
+                        riskFactorIndex,
+                        dutyItemIndex,
+                        dutyItem.necess,
+                        dutyItem.minDutyAmt,
+                        dutyItem.maxDutyAmt
+                      )
+                    "
+                    input-width="100"
+                    :integer="true"
+                  />
+                  <van-checkbox
+                    v-model="dutyItem.necess"
+                    :disabled="dutyItem.defaultValue == '0'"
+                    shape="square"
+                    @change="changeChecked(index, riskFactorIndex, dutyItemIndex)"
+                  ></van-checkbox>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
       <!-- 豁免险条件 -->
@@ -69,7 +106,7 @@
         <van-field v-model="policyNo" clearable label="关联保单号" name="关联保单号" maxlength="20" placeholder="请输入保单号" />
       </div>
       <div class="flex justify-content-s pv10 border-bottom prem">
-        <span style="font-weight:bold" v-if="trialList.length > 0 && trialList[index].trialType == 0">
+        <span style="font-weight:bold" v-if="trialList.length > 0 && trialList[index].trialType == 0 || trialList.length>0 && trialList[index].trialType == 2">
           首期保费(元）：
         </span>
         <span style="font-weight:bold" v-else>
@@ -78,7 +115,9 @@
         <span class="fee red" v-if="trialList && trialList.length > 0">{{ trialList[index].prem.toFixed(2) | moneyFormat }}</span>
       </div>
     </div>
-    <van-button type="danger" class="bottom-btn" @click="nextStep" :disabled="nextStepFlag" v-no-more-click="1000">完成</van-button>
+    <div class="bottom-btn bg-white">
+      <van-button type="danger" size="large" @click="nextStep" :disabled="nextStepFlag" v-no-more-click="1000">完成</van-button>
+    </div>
     <van-action-sheet v-model="show" cancel-text="取消" :actions="policyInfo" @select="openDocument" />
 
     <!-- 字段选择 -->
@@ -88,7 +127,7 @@
   </div>
 </template>
 <script>
-import { Tag, Icon, Dialog, ActionSheet, Popup, Picker, Stepper, Field } from 'vant'
+import { Tag, Icon, Dialog, ActionSheet, Popup, Picker, Stepper, Field, Checkbox } from 'vant'
 import { trial } from '@/api/ebiz/common/common'
 import { saveOrUpdateOrderInfo } from '@/api/ebiz/sale/sale'
 import { saveProposal } from '@/api/ebiz/proposal/proposal.js'
@@ -101,7 +140,8 @@ export default {
     [Popup.name]: Popup,
     [Picker.name]: Picker,
     [Stepper.name]: Stepper,
-    [Field.name]: Field
+    [Field.name]: Field,
+    [Checkbox.name]: Checkbox
   },
   data() {
     return {
@@ -169,10 +209,35 @@ export default {
           this.influenceAddRiskCodes.push(item.productCode)
         })
       }
+
       this.mainRiskInfluenceAddRisk()
       //初始化数据试算
       this.getTrial()
     },
+    // 责任保额份数变化
+    dutyStepperChange(value, productIndex, calFactorIndex, dutyItemIndex, isChecked, min, max) {
+      if (value < min || value > max) {
+        this.nextStepFlag = true
+        this.changeFlag = false
+      } else {
+        this.changeFlag = true
+      }
+      if (isChecked) {
+        ;[this.productIndex, this.calFactorIndex] = [productIndex, calFactorIndex]
+        let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules
+        currentEle.forEach(item => {
+          item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit)
+        })
+        this.mainRiskInfluenceAddRisk()
+        this.getTrial()
+      } else {
+        ;[this.productIndex, this.calFactorIndex] = [productIndex, calFactorIndex]
+        let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules
+        currentEle.forEach(item => {
+          item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit)
+        })
+      }
+    },
     //弹框选择
     toSelect(index, index1, columns) {
       ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, index, index1]
@@ -217,6 +282,27 @@ export default {
 
       this.popupShow = false
     },
+    // 交通责任险复选框变化
+    changeChecked(productIndex, calFactorIndex, dutyItemIndex) {
+      let isChecked = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules.some(item => {
+        return item.necess == true
+      })
+      if (!isChecked) {
+        this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules[dutyItemIndex]['necess'] = !this.chooseProducts[productIndex].calFactorLst[
+          calFactorIndex
+        ].rules[dutyItemIndex]['necess']
+        return false
+      }
+      this.mainRiskInfluenceAddRisk()
+      this.getTrial()
+    },
+    // 计步器聚焦
+    focusStep() {
+      this.nextStepFlag = true
+    },
+    blurStep() {
+      this.nextStepFlag = false
+    },
     /********start 通用规则、特殊规则处理 start******/
     //通用规则1：交费方式为一次交情，无交费期限
     hiddenPayEndYear(currentEle) {
@@ -363,6 +449,7 @@ export default {
     setRemitRisk() {
       //1、一次性交清和交费期间单位为A时，删除豁免险
       let mainRiskInfo = this.getMainRiskInfo()
+      console.log(mainRiskInfo)
       let mainRiskPayIntv = mainRiskInfo.payIntv.payIntv
       let mainRiskPayEndYearFlag = mainRiskInfo.payEndYear.payEndYearFlag
       if (mainRiskPayIntv == 0 || mainRiskPayEndYearFlag == 'A') {
@@ -514,7 +601,7 @@ export default {
       this.chooseProducts.forEach(item => {
         let trialInfo = {}
         item.calFactorLst.forEach(factor => {
-          //type 类型 0为picker 1计步器 2
+          //type 类型 0为picker 1计步器 2职业等级
           if (factor.type == 0) {
             if (factor.hasFlag == '1') {
               trialInfo[factor.code] = factor[factor.code]
@@ -529,7 +616,20 @@ export default {
               trialInfo['amt'] = Number(factor.defaultValue) * Number(factor.moneyUnit)
             }
           } else if (factor.type == 2) {
-            trialInfo[factor.extra] = this.saleInsuredPersonInfo[factor.code]
+            trialInfo.jobLevel = this.saleInsuredPersonInfo[factor.code]
+          } else if (factor.type == 3) {
+            let result = []
+            factor.rules.forEach(dutyItem => {
+              if (dutyItem.necess) {
+                console.log(dutyItem.defaultDutyAmt)
+                trialInfo['amt'] = Number(dutyItem.defaultDutyAmt) * Number(dutyItem.moneyUnit)
+                result.push({
+                  amt: Number(dutyItem.defaultDutyAmt) * Number(dutyItem.moneyUnit),
+                  dutyCode: dutyItem.duty
+                })
+              }
+            })
+            trialInfo.duty = result
           }
         })
         //通用规则1：交费方式为一次交情，无交费期限
@@ -538,9 +638,9 @@ export default {
           trialInfo['payEndYearFlag'] = 'Y'
         }
         //责任险参数构建
-        if (trialInfo.duty) {
-          trialInfo.duty = [{ dutyCode: trialInfo.duty }]
-        }
+        // if (trialInfo.duty) {
+        //   trialInfo.duty = [{ dutyCode: trialInfo.duty }]
+        // }
         //获取投被保生日、性别
         let birthday, sex
         if (item.isRemit == '0' && item.remitType == '0') {
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 1b301a35d..1eb3a64fc 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -97,6 +97,13 @@ export default {
       let resultData = await calculatePremium({ productCodes: [riskProductCode], platform: 'app', type: '1' })
       if (resultData.result == 0) {
         resultData = resultData.trialDTOS[0]
+        if (resultData.productTrialInfoDTO.dutyGroup != null) {
+          resultData.productTrialInfoDTO.dutyGroup.map(item => {
+            if (item.dutyName == '意外身故/伤残保险金') {
+              item.defaultDutyAmt = '50'
+            }
+          })
+        }
 
         /********start 主险选择限制 start******/
 
@@ -114,10 +121,18 @@ export default {
         if (riskRules.lifeGradeLimit(resultData, this)) {
           return
         }
+        if (resultData.productCode == 'GFRS_M0006') {
+          if (riskRules.lifeGradeLimitForBaby(resultData, this)) {
+            return
+          }
+        }
         /********end 主险选择限制 end******/
 
         //保存附加险
         localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst)
+        // console.log('resultData', resultData)
+        localStorage.isAutoPay = resultData.isAutoPay
+        localStorage.isRenew = resultData.isRenew
         let calFactorLst = this.getFactorList(resultData)
         let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false
         let currentProductInfo = {
@@ -152,7 +167,10 @@ export default {
     //构建险种因子列表
     getFactorList(resultData) {
       let productTrialInfoDTO = resultData.productTrialInfoDTO
+      console.log(productTrialInfoDTO, 'wode')
       let calFactorLst = resultData.productTrialInfoDTO.calFactorLst
+      console.log('calFactorLst', calFactorLst)
+
       calFactorLst.forEach(item => {
         item['isMainRisk'] = 0
         item.columns = []
@@ -185,6 +203,14 @@ export default {
         //规则储存
         item['rules'] = productTrialInfoDTO[item.code]
       })
+      // // 用于意外险初始化保额
+      // calFactorLst.map(item => {
+      //   if (item.code == '"dutyGroup"') {
+      //     item.rules.map(factor => {
+      //       factor[0].defaultDutyAmt = 50
+      //     })
+      //   }
+      // })
       return calFactorLst
     },
     //页面跳转
diff --git a/src/views/ebiz/common/risk-rules.js b/src/views/ebiz/common/risk-rules.js
index 7ec3873c0..d0b68a99b 100644
--- a/src/views/ebiz/common/risk-rules.js
+++ b/src/views/ebiz/common/risk-rules.js
@@ -10,8 +10,8 @@ export default {
       tips = '被保人年龄不适合此款险种，请选择其他险种！'
     }
     let minAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.minAge
-    let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge
-    ;[age, minAge, maxAge] = [Number(age), Number(minAge), Number(maxAge)]
+    let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge;
+    [age, minAge, maxAge] = [Number(age), Number(minAge), Number(maxAge)]
     if (age > maxAge || age < minAge) {
       vm.$toast(tips)
       return true
@@ -35,7 +35,7 @@ export default {
     let healthGrade = resultData.productInsuredDTO.healthGrade
     if (healthGrade == 0) return false
     if (Number(cuttentHealthGrade) > Number(healthGrade)) {
-      vm.$toast('健康等级不适合此款险种，请选择其他险种！')
+      vm.$toast('健康职业等级不适合此款险种，请选择其他险种！')
       return true
     }
     return false
@@ -46,7 +46,18 @@ export default {
     let lifeGrade = resultData.productInsuredDTO.lifeGrade
     if (lifeGrade == 0) return false
     if (Number(cuttentLifeGrade) > Number(lifeGrade)) {
-      vm.$toast('寿险等级不适合此款险种，请选择其他险种！')
+      vm.$toast('寿险职业等级不适合此款险种，请选择其他险种！')
+      return true
+    }
+    return false
+  },
+  // 福宝宝产品寿险等级对主险影响
+  lifeGradeLimitForBaby(resultData, vm) {
+    let cuttentLifeGrade = this.getSaleInsuredInfo().lifeGrade
+    let lifeGrade = resultData.productInsuredDTO.lifeGrade
+    if (lifeGrade == 0) return false
+    if (Number(cuttentLifeGrade) > Number(lifeGrade)) {
+      vm.$toast('投保人寿险职业等级不适合此款险种，请选择其他险种！')
       return true
     }
     return false
@@ -59,4 +70,4 @@ export default {
   getSaleInsuredInfo() {
     return localStorage.saleInsuredInfo && JSON.parse(localStorage.saleInsuredInfo)
   }
-}
+}
\ No newline at end of file
diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue
index 64bd3ef9f..f9d5d0152 100644
--- a/src/views/ebiz/proposal/Appnt.vue
+++ b/src/views/ebiz/proposal/Appnt.vue
@@ -202,7 +202,7 @@ export default {
       this.appntDTO.age = String(this.appntDTO.age)
       this.$validator.validate().then(valid => {
         if (true === valid) {
-          //进行投保人年龄校验（大于16周岁）
+          //进行投保人年龄校验（大于18周岁）
           let params = {
             orderDTO: {
               appntDTO: this.appntDTO,
diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue
index b2c0f7290..472a96110 100644
--- a/src/views/ebiz/proposal/Exhibition.vue
+++ b/src/views/ebiz/proposal/Exhibition.vue
@@ -253,6 +253,7 @@ export default {
         //在app端
         params.proposalInfoDTO.proposalNo = localStorage.orderNo
         getDemo(params).then(res => {
+         
           this.formatLocal(res)
         })
       }
@@ -332,9 +333,16 @@ export default {
     },
     //获取微信分享的标题
     getWXTitle(insuredDTOs) {
+      
       dataDictionary.riskType.forEach(dataRisk => {
         //根据数字字典来找到 险种简称
+        // console.log(insuredDTOs)
+        // console.log(insuredDTOs[0].mainRisk[0].riskCode)
+          // console.log(dataRisk.code)
+      
         if (insuredDTOs[0].mainRisk[0].riskCode == dataRisk.code) {
+          
+        
           this.wxTitle = dataRisk.shortName + '计划书'
         }
       })
diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue
index dc96f4415..c5ac4687c 100644
--- a/src/views/ebiz/sale/AccountInformation.vue
+++ b/src/views/ebiz/sale/AccountInformation.vue
@@ -25,7 +25,7 @@
           <van-button type="danger" size="small" class="bankCard mr10 w110 h20" @click="cardScanning('0')" v-no-more-click="1000">银行卡扫描</van-button>
         </van-cell-group>
 
-        <van-cell-group class="flex align-items-c">
+        <van-cell-group class="flex align-items-c" v-if="isAutoPay == '0'">
           <van-switch-cell v-model="checked" title="是否自动垫交" active-color="#E9332E" inactive-color="#fff" class="ml15 pr30" />
           <van-icon
             name="question-o"
@@ -39,6 +39,9 @@
             "
           />
         </van-cell-group>
+        <van-cell-group class="flex align-items-c" v-if="isRenew == '0'">
+          <van-switch-cell v-model="isChecked" title="自动续保" active-color="#E9332E" inactive-color="#fff" class="ml15 pr30" />
+        </van-cell-group>
         <div class="fs12 mt10 ml20 w250 h15">
           <span>温馨提示：该账户将用于首期、续期保费缴费</span>
         </div>
@@ -109,7 +112,9 @@ export default {
       // 开户银行
       bank: '',
       // 是否自动垫付
-      checked: true,
+      checked: false,
+      // 自动续保
+      isChecked: false,
       // 投被保人是否同一个
       relationToAppnt: '',
       // 银行卡号
@@ -131,7 +136,11 @@ export default {
       // 银行卡扫描是否显示
       isScan: false,
       //是否清空
-      isClear: false
+      isClear: false,
+      // 是否显示自动垫交
+      isAutoPay: '',
+      // 是否显示自动续保
+      isRenew: ''
     }
   },
   methods: {
@@ -231,40 +240,86 @@ export default {
           let data = {}
 
           if (that.checked == true) {
-            data = {
-              orderType: 'ACCOUNT_ORDER',
+            if (this.isChecked == true) {
+              data = {
+                orderType: 'ACCOUNT_ORDER',
 
-              orderDTO: {
-                orderInfoDTO: {
-                  orderNo: window.localStorage.getItem('orderNo')
-                },
-                orderAccountDTO: {
-                  accountType: that.radio,
-                  accountName: that.name,
-                  bankName: that.bank,
-                  bankCode: that.bankCode,
-                  cardBookType: '1',
-                  cardBookCode: that.bankId,
-                  isAutoPay: '0'
+                orderDTO: {
+                  orderInfoDTO: {
+                    orderNo: window.localStorage.getItem('orderNo')
+                  },
+                  orderAccountDTO: {
+                    accountType: that.radio,
+                    accountName: that.name,
+                    bankName: that.bank,
+                    bankCode: that.bankCode,
+                    cardBookType: '1',
+                    cardBookCode: that.bankId,
+                    isAutoPay: '0',
+                    isAutoRenewal: '0'
+                  }
+                }
+              }
+            } else {
+              data = {
+                orderType: 'ACCOUNT_ORDER',
+
+                orderDTO: {
+                  orderInfoDTO: {
+                    orderNo: window.localStorage.getItem('orderNo')
+                  },
+                  orderAccountDTO: {
+                    accountType: that.radio,
+                    accountName: that.name,
+                    bankName: that.bank,
+                    bankCode: that.bankCode,
+                    cardBookType: '1',
+                    cardBookCode: that.bankId,
+                    isAutoPay: '0',
+                    isAutoRenewal: '1'
+                  }
                 }
               }
             }
           } else {
-            data = {
-              orderType: 'ACCOUNT_ORDER',
+            if (this.isChecked == true) {
+              data = {
+                orderType: 'ACCOUNT_ORDER',
 
-              orderDTO: {
-                orderInfoDTO: {
-                  orderNo: window.localStorage.getItem('orderNo')
-                },
-                orderAccountDTO: {
-                  accountType: that.radio,
-                  accountName: that.name,
-                  bankName: that.bank,
-                  bankCode: that.bankCode,
-                  cardBookType: '1',
-                  cardBookCode: that.bankId,
-                  isAutoPay: '1'
+                orderDTO: {
+                  orderInfoDTO: {
+                    orderNo: window.localStorage.getItem('orderNo')
+                  },
+                  orderAccountDTO: {
+                    accountType: that.radio,
+                    accountName: that.name,
+                    bankName: that.bank,
+                    bankCode: that.bankCode,
+                    cardBookType: '1',
+                    cardBookCode: that.bankId,
+                    isAutoPay: '1',
+                    isAutoRenewal: '0'
+                  }
+                }
+              }
+            } else {
+              data = {
+                orderType: 'ACCOUNT_ORDER',
+
+                orderDTO: {
+                  orderInfoDTO: {
+                    orderNo: window.localStorage.getItem('orderNo')
+                  },
+                  orderAccountDTO: {
+                    accountType: that.radio,
+                    accountName: that.name,
+                    bankName: that.bank,
+                    bankCode: that.bankCode,
+                    cardBookType: '1',
+                    cardBookCode: that.bankId,
+                    isAutoPay: '1',
+                    isAutoRenewal: '1'
+                  }
                 }
               }
             }
@@ -319,7 +374,10 @@ export default {
     that.getBankList()
     // 默认是投保人名字
     that.name = this.saleInsuredInfo.name
-    //
+    // 是否显示自动垫交
+    this.isAutoPay = localStorage.isAutoPay
+    // 是否显示自动续保
+    this.isRenew = localStorage.isRenew
   },
   mounted() {
     document.body.style.backgroundColor = '#F5F5F5'
diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
index 00c94570a..4bad1ec85 100644
--- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue
+++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
@@ -5,6 +5,7 @@
       <van-field
         v-model="relationToAppnt"
         readonly
+        required
         label="是被保人的"
         name="是被保人的"
         right-icon="arrow"
@@ -17,6 +18,7 @@
         v-validate="'required|name'"
         name="姓名"
         label="姓名"
+        required
         :value.sync="userInfo.name"
         :parentShowPicker.sync="customerShowPicker"
         @nameChange="nameChange"
@@ -27,6 +29,7 @@
         :value="userInfo.idType | idToText('idType')"
         v-validate="'required'"
         readonly
+        required
         label="证件类型"
         name="证件类型"
         right-icon="arrow"
@@ -38,6 +41,7 @@
         v-model="userInfo.idNo"
         label="证件号码"
         name="证件号码"
+        required
         placeholder="请输入"
         maxlength="18"
         clearable
@@ -50,6 +54,7 @@
         v-validate="'required'"
         label="出生日期"
         name="出生日期"
+        required
         :value.sync="userInfo.birthday"
         type="date"
         :flag="true"
@@ -61,6 +66,7 @@
         v-validate="'required'"
         label="证件起始日期"
         name="证件起始日期"
+        required
         :value.sync="userInfo.certificateValidate"
         type="date"
         :defaultDate="new Date()"
@@ -73,6 +79,7 @@
         :v-validate="{ required: certiexpiredateRequired }"
         label="证件截止日期"
         name="证件截止日期"
+        required
         :defaultDate="new Date()"
         :value.sync="userInfo.certiexpiredate"
         type="date"
@@ -85,12 +92,13 @@
         <van-checkbox v-model="userInfo.effectiveDateType" class="fr" :disabled="effectiveDateTypeAble" @change="effectiveDataTypeChange">长期</van-checkbox>
       </div>
       <!-- <van-field v-model="userInfo.name" label="姓名" name="姓名" placeholder="请输入" v-validate="'required|name'" :readonly="isInsured" /> -->
-      <select-radio :radios="sexRadio" :required="false" label="性别" :value.sync="userInfo.sex" :disabled="isInsured"></select-radio>
+      <select-radio :radios="sexRadio" required label="性别" :value.sync="userInfo.sex" :disabled="isInsured"></select-radio>
       <van-field
         :value="userInfo.nativeplace | idToText('nativeplace')"
         readonly
         label="国家/地区"
         name="国家/地区"
+        required
         v-validate="'required'"
         right-icon="arrow"
         placeholder="请选择"
@@ -101,6 +109,7 @@
         clearable
         label="联系电话"
         name="联系电话"
+        required
         placeholder="请输入"
         v-validate="'required|mobile'"
         maxlength="11"
@@ -111,6 +120,7 @@
         readonly
         label="联系地址"
         name="联系地址"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -129,7 +139,7 @@
       <div class="relative border-bt fs14 p10 flex align-center">
         <van-checkbox v-model="userInfo.asAppntAddress" @change="asAppntAddress" :disabled="isInsured">同投保人</van-checkbox>
       </div>
-      <van-field v-model="userInfo.email" label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isInsured" />
+      <van-field v-model="userInfo.email" required label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isInsured" />
       <occupation-picker
         :value.sync="userInfo.occupationCode"
         :chooseName.sync="userInfo.occupationName"
@@ -138,18 +148,20 @@
         clearable
         label="职业类别"
         name="职业类别"
+        required
         v-validate="'required'"
         placeholder="请选择"
         :parentShowPicker.sync="occupationShowPicker"
         @on-click="selectClick('2')"
         @on-choose="chooseOccupation"
       />
-      <van-field v-model="userInfo.bnfOrder" readonly label="受益顺序" name="受益顺序" placeholder="请输入" v-validate="'required|onlyNumber'" maxlength="1" />
+      <van-field v-model="userInfo.bnfOrder" required readonly label="受益顺序" name="受益顺序" placeholder="请输入" v-validate="'required|onlyNumber'" maxlength="1" />
       <van-field
         v-model="userInfo.bnfLot"
         label="受益比例(%)"
         name="受益比例"
         placeholder="请输入"
+        required
         v-validate="'required|onlyNumber'"
         maxlength="3"
         clearable
diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue
index 076449aee..431cb9698 100644
--- a/src/views/ebiz/sale/AttachmentManagement.vue
+++ b/src/views/ebiz/sale/AttachmentManagement.vue
@@ -747,27 +747,6 @@ export default {
 
             let imageInfoType = ''
 
-            // if (that.type == 'fileListIdFrontInsured' && that.id == '1') {
-            //   imageInfoType = '1'
-            // } else if (that.type == 'fileListIdBackInsured' && that.id == '1') {
-            //   imageInfoType = '2'
-            // } else if (that.type == 'fileListBankInsured') {
-            //   imageInfoType = '3'
-            // } else if (that.type == 'fileListIdFrontInsured' && that.id == '2') {
-            //   imageInfoType = '5'
-            // } else if (that.type == 'fileListIdBackInsured' && that.id == '2') {
-            //   imageInfoType = '6'
-            // } else if (that.type == 'fileLIstImgInsured' && that.id == '3') {
-            //   imageInfoType = '7'
-            // } else if (that.type == 'fileLIstImgInsured' && that.id == '4') {
-            //   imageInfoType = '8'
-            // } else if (that.type == 'fileLIstImgInsured' && that.id == '5') {
-            //   imageInfoType = '9'
-            // } else if (that.type == 'fileLIstImgInsured' && that.id == '6') {
-            //   imageInfoType = '10'
-            // } else if (that.type == 'saleInsuredPersonInfoOther' && that.id == '7') {
-            //   imageInfoType = '11'
-            // }
             if (that.type == 'fileListIdFrontInsured' && that.id == '1') {
               imageInfoType = '1'
             } else if (that.type == 'fileListIdBackInsured' && that.id == '1') {
@@ -810,8 +789,6 @@ export default {
               fileName: that.imgName
             }
 
-            // window.localStorage.setItem('obj', JSON.stringify(obj))
-            // that.list.push(JSON.parse(window.localStorage.getItem('obj')))
             that.list.push(obj)
           } else if (that.type == 'fileListOther') {
             // 是其他
@@ -825,8 +802,7 @@ export default {
               subBusinessNo: '',
               fileName: that.imgName
             }
-            // window.localStorage.setItem('obj', JSON.stringify(obj))
-            // that.list.push(JSON.parse(window.localStorage.getItem('obj')))
+
             that.list.push(obj)
           } else if (that.type == 'fileListtypebeneficiary') {
             // 是受益人
@@ -842,7 +818,7 @@ export default {
             }
             that.list.push(obj)
           }
-          // })
+          
         } else {
           switch (that.type) {
             case 'fileListIdFront':
@@ -933,7 +909,7 @@ export default {
         },
         orderType: 'MEDIA_ORDER'
       }
-      // console.log(that.list)
+      
 
       saveInformation(data).then(res => {
         if (res.result == '0') {
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 3ab5c75d4..3694cf47a 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -8,6 +8,7 @@
         v-validate="'required|name'"
         name="姓名"
         label="姓名"
+        required
         :parentShowPicker.sync="customerShowPicker"
         :value.sync="userInfo.name"
         @nameChange="nameChange"
@@ -17,6 +18,7 @@
         :value="userInfo.idType | idToText('insuredIdType')"
         v-validate="'required'"
         readonly
+        required
         label="证件类型"
         name="证件类型"
         right-icon="arrow"
@@ -24,13 +26,14 @@
         @click="toSelect('2')"
       />
       <!-- <van-field v-model="userInfo.idNo" v-validate="'required|idNo'" maxlength="18" label="证件号码" name="证件号码" placeholder="请输入" clearable> -->
-      <van-field v-model="userInfo.idNo" maxlength="18" label="证件号码" name="证件号码" placeholder="请输入" clearable @blur="getRelatedData(userInfo.idNo)">
+      <van-field v-model="userInfo.idNo" maxlength="18" required label="证件号码" v-validate="'required'" name="证件号码" placeholder="请输入" clearable @blur="getRelatedData(userInfo.idNo)">
         <van-button v-if="userInfo.idType == 1" slot="button" size="small" type="danger" round @click="selectClick('3')">证件扫描</van-button>
       </van-field>
       <FieldDatePicter
         v-validate="'required'"
         label="证件起始日期"
         name="证件起始日期"
+        required
         :value.sync="userInfo.certificateValidate"
         type="date"
         @confirm="onDateConfirm($event, '0')"
@@ -41,6 +44,7 @@
         :v-validate="{ required: certiexpiredateRequired }"
         label="证件截止日期"
         name="证件截止日期"
+        required
         :value.sync="userInfo.certiexpiredate"
         type="date"
         @confirm="onDateConfirm($event, '1')"
@@ -50,10 +54,11 @@
       <div class="border-bt relative fs14 p10 flex align-center">
         <van-checkbox v-model="userInfo.effectiveDateType" :disabled="effectiveDateTypeAble" @change="effectiveDataTypeChange">长期</van-checkbox>
       </div>
-      <select-radio :radios="sexRadio" label="性别" name="性别" v-validate="'required'" :required="false" :value.sync="userInfo.sex"></select-radio>
+      <select-radio required :radios="sexRadio" label="性别" name="性别" v-validate="'required'" :value.sync="userInfo.sex"></select-radio>
       <van-field
         :value="userInfo.nativeplace | idToText('nativeplace')"
         readonly
+        required
         label="国家/地区"
         name="国家/地区"
         v-validate="'required'"
@@ -61,11 +66,12 @@
         placeholder="请选择"
         @click="toSelect('1')"
       />
-      <van-field :value="census" readonly label="户籍" name="户籍" v-validate="'required'" right-icon="arrow" placeholder="请选择" @click="censusShow = true" />
+      <van-field :value="census" required readonly label="户籍" name="户籍" v-validate="'required'" right-icon="arrow" placeholder="请选择" @click="censusShow = true" />
       <FieldDatePicter
         v-validate="'required'"
         label="出生日期"
         name="出生日期"
+        required
         :value.sync="userInfo.birthday"
         type="date"
         :flag="true"
@@ -74,17 +80,18 @@
         :maxDate="maxDate"
       ></FieldDatePicter>
 
-      <van-field v-model="userInfo.mobile" clearable label="移动电话" name="移动电话" placeholder="请输入" v-validate="'required|mobile'" maxlength="11" />
-      <van-field v-model="userInfo.authCode" center clearable label name="短信验证码" placeholder="请输入短信验证码" v-validate="'required'" maxlength="6">
+      <van-field required v-model="userInfo.mobile" clearable label="移动电话" name="移动电话" placeholder="请输入" v-validate="'required|mobile'" maxlength="11" />
+      <van-field  v-model="userInfo.authCode" center clearable label name="短信验证码" placeholder="请输入短信验证码" v-validate="'required'" maxlength="6">
         <van-button slot="button" size="small" type="danger" @click="getCode" :disabled="codeDisabled" v-no-more-click="1000">
           {{ codeDisabled ? `${countDown}s后重新获取` : '发送验证码' }}
         </van-button>
       </van-field>
-      <van-field v-model="userInfo.email" label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable />
+      <van-field v-model="userInfo.email" required label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable />
       <van-field
         v-model="userInfo.stature"
         label="身高(cm)"
         name="身高"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber|stature'"
         clearable
@@ -95,6 +102,7 @@
         v-model="userInfo.avoirdupois"
         label="体重(kg)"
         name="体重"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber|avoirdupois'"
         clearable
@@ -117,6 +125,7 @@
           readonly
           label="文化程度"
           name="文化程度"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
@@ -125,9 +134,9 @@
         <select-radio
           :radios="medicalRadio"
           v-validate="'required'"
-          :required="false"
           label="有无社保"
           name="有无社保"
+          required
           :value.sync="userInfo.medical"
         ></select-radio>
         <van-field
@@ -135,6 +144,7 @@
           readonly
           label="税收居民身份"
           name="税收居民身份"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
@@ -149,6 +159,7 @@
           clearable
           label="职业类别"
           name="职业类别"
+          required
           v-validate="'required'"
           placeholder="请选择"
           :parentShowPicker.sync="occupationShowPicker"
@@ -160,6 +171,7 @@
           readonly
           label="收入来源"
           name="收入来源"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
@@ -169,6 +181,7 @@
           v-show="isShowOthenSalarySource"
           v-model="userInfo.otherSalarySource"
           label
+          required
           name="其他来源"
           placeholder="请输入其它收入来源"
           clearable
@@ -178,12 +191,13 @@
           v-model="userInfo.averageAnnualIncome"
           label="平均年收入（万元）"
           name="平均年收入"
+          required
           placeholder="请输入"
           v-validate="'required|onlyNumber'"
           clearable
           maxlength="5"
         />
-        <van-field v-model="userInfo.liabilitiesMoney" name="负债金额" placeholder="请输入" v-validate="'required|onlyNumber'" clearable maxlength="5">
+        <van-field v-model="userInfo.liabilitiesMoney" required name="负债金额" placeholder="请输入" v-validate="'required|onlyNumber'" clearable maxlength="5">
           <div slot="label" class="flex flex-wrap">
             <span>负债金额</span>
             <span>（万元）</span>
@@ -192,6 +206,7 @@
         <van-field
           :value="userInfo.jobStatus | idToText('workCondition')"
           readonly
+          required
           label="在职情况"
           name="在职情况"
           placeholder="请选择"
@@ -199,23 +214,24 @@
           right-icon="arrow"
           @click="toSelect('7')"
         />
-        <van-field v-model="userInfo.workcompany" label="工作单位" name="工作单位" placeholder="请输入" v-validate="'required'" maxlength="50" clearable />
+        <van-field v-model="userInfo.workcompany" required label="工作单位" name="工作单位" placeholder="请输入" v-validate="'required'" maxlength="50" clearable />
         <van-field
           v-model="areaName"
           readonly
           label="单位地址"
           name="单位地址"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
           @click="areaShow = true"
         />
-        <van-field v-model="userInfo.companyAddress" label name="详细地址" placeholder="请输入详细地址" v-validate="'required'" clearable maxlength="30" />
+        <van-field v-model="userInfo.companyAddress"  label name="详细地址" placeholder="请输入详细地址" v-validate="'required'" clearable maxlength="30" />
         <div class="border-bt relative fs14 p10 flex align-center">
           <!-- <van-checkbox v-model="companyDefault" :disabled="homeDefault" class="fr" @change="setAddress">设为联系地址</van-checkbox> -->
           <van-radio name="0">设为联系地址</van-radio>
         </div>
-        <van-field v-model="userInfo.companyZip" label="邮编" name="邮编" placeholder="请输入" v-validate="'required|zipCode'" maxlength="6" clearable />
+        <van-field v-model="userInfo.companyZip" required label="邮编" name="邮编" placeholder="请输入" v-validate="'required|zipCode'" maxlength="6" clearable />
         <van-field v-model="userInfo.companyPhone" label="单位电话" name="单位电话" placeholder="非必填" maxlength="13" clearable />
       </van-cell-group>
       <!-- 家庭信息 -->
@@ -224,6 +240,7 @@
         <van-field
           :value="userInfo.marriage | idToText('marriage')"
           readonly
+          required
           label="婚姻状况"
           name="婚姻状况"
           right-icon="arrow"
@@ -235,6 +252,7 @@
           v-model="userInfo.familyAnnualIncome"
           label="家庭年收入（万元）"
           name="家庭年收入"
+          required
           placeholder="请输入"
           v-validate="'required|onlyNumber'"
           clearable
@@ -245,17 +263,18 @@
           readonly
           label="家庭地址"
           name="家庭地址"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
           @click="homeShow = true"
         />
-        <van-field v-model="userInfo.homeAddress" label name="详细地址" placeholder="请输入详细地址" v-validate="'required'" clearable maxlength="30" />
+        <van-field v-model="userInfo.homeAddress"  label name="详细地址" placeholder="请输入详细地址" v-validate="'required'" clearable maxlength="30" />
         <div class="border-bt relative fs14 p10 flex align-center">
           <!-- <van-checkbox v-model="homeDefault" :disabled="companyDefault" class="fr" @change="setAddress">设为联系地址</van-checkbox> -->
           <van-radio name="1">设为联系地址</van-radio>
         </div>
-        <van-field v-model="userInfo.homeZip" label="邮编" name="邮编" placeholder="请输入" v-validate="'required|zipCode'" maxlength="6" clearable />
+        <van-field v-model="userInfo.homeZip" required label="邮编" name="邮编" placeholder="请输入" v-validate="'required|zipCode'" maxlength="6" clearable />
         <van-field v-model="userInfo.homePhone" label="家庭电话" name="家庭电话" placeholder="非必填" maxlength="13" clearable />
       </van-cell-group>
     </van-radio-group>
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index ea81b6e8f..a59d2bb90 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -6,6 +6,7 @@
       <van-field
         :value="userInfo.relationToAppnt | idToText('relationToAppnt')"
         readonly
+        required
         label="是投保人的"
         name="是投保人的"
         right-icon="arrow"
@@ -18,6 +19,7 @@
         v-validate="'required|name'"
         name="姓名"
         label="姓名"
+        required
         :value.sync="userInfo.name"
         :parentShowPicker.sync="customerShowPicker"
         @nameChange="nameChange"
@@ -28,6 +30,7 @@
         :value="userInfo.idType | idToText('idType')"
         v-validate="'required'"
         readonly
+        required
         label="证件类型"
         name="证件类型"
         right-icon="arrow"
@@ -40,6 +43,7 @@
         maxlength="18"
         label="证件号码"
         name="证件号码"
+        required
         placeholder="请输入"
         clearable
         :readonly="isAppnt"
@@ -55,6 +59,7 @@
         name="出生日期"
         :value.sync="userInfo.birthday"
         type="date"
+        required
         :flag="true"
         @confirm="onDateConfirm($event, '2')"
         ref="birthday"
@@ -65,6 +70,7 @@
         v-validate="'required'"
         label="证件起始日期"
         name="证件起始日期"
+        required
         :defaultDate="new Date()"
         :value.sync="userInfo.certificateValidate"
         type="date"
@@ -77,6 +83,7 @@
         :v-validate="{ required: certiexpiredateRequired }"
         label="证件截止日期"
         name="证件截止日期"
+        required
         :defaultDate="new Date()"
         :value.sync="userInfo.certiexpiredate"
         type="date"
@@ -93,6 +100,7 @@
         :required="false"
         label="性别"
         name="性别"
+        required
         v-validate="'required'"
         :value.sync="userInfo.sex"
         :disabled="isAppnt"
@@ -102,18 +110,20 @@
         readonly
         label="国家/地区"
         name="国家/地区"
+        required
         v-validate="'required'"
         right-icon="arrow"
         placeholder="请选择"
         @click="toSelect('1')"
       />
-      <van-field :value="census" readonly label="户籍" name="户籍" v-validate="'required'" right-icon="arrow" placeholder="请选择" @click="areaChoose('1')" />
+      <van-field :value="census" required readonly label="户籍" name="户籍" v-validate="'required'" right-icon="arrow" placeholder="请选择" @click="areaChoose('1')" />
 
       <van-field
         v-model="userInfo.mobile"
         clearable
         label="移动电话"
         name="移动电话"
+        required
         placeholder="请输入"
         v-validate="'required|mobile'"
         maxlength="11"
@@ -134,11 +144,12 @@
           codeDisabled ? `${countDown}s后重新获取` : '发送验证码'
         }}</van-button>
       </van-field>
-      <van-field v-model="userInfo.email" label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isAppnt" />
+      <van-field v-model="userInfo.email" required label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isAppnt" />
       <van-field
         v-model="userInfo.stature"
         label="身高(cm)"
         name="身高"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber|stature'"
         clearable
@@ -150,6 +161,7 @@
         v-model="userInfo.avoirdupois"
         label="体重(kg)"
         name="体重"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber'"
         clearable
@@ -165,6 +177,7 @@
         readonly
         label="文化程度"
         name="文化程度"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -176,6 +189,7 @@
         label="有无社保"
         name="有无社保"
         v-validate="'required'"
+        required
         :value.sync="userInfo.medical"
         :disabled="isAppnt"
       ></select-radio>
@@ -184,6 +198,7 @@
         readonly
         label="税收居民身份"
         name="税收居民身份"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -198,6 +213,7 @@
         clearable
         label="职业类别"
         name="职业类别"
+        required
         v-validate="'required'"
         placeholder="请选择"
         :parentShowPicker.sync="occupationShowPicker"
@@ -209,6 +225,7 @@
         readonly
         label="收入来源"
         name="收入来源"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -219,6 +236,7 @@
         v-model="userInfo.otherSalarySource"
         label
         name="其他来源"
+        required
         placeholder="请输入其它收入来源"
         clearable
         maxlength="30"
@@ -228,6 +246,7 @@
         label="平均年收入（万元）"
         name="平均年收入"
         placeholder="请输入"
+        required
         v-validate="'required|onlyNumber'"
         clearable
         maxlength="5"
@@ -237,6 +256,7 @@
         v-model="userInfo.liabilitiesMoney"
         name="负债金额"
         placeholder="请输入"
+        required
         v-validate="'required|onlyNumber'"
         clearable
         maxlength="5"
@@ -249,6 +269,7 @@
         readonly
         label="在职情况"
         name="在职情况"
+        required
         placeholder="请选择"
         v-validate="'required'"
         right-icon="arrow"
@@ -258,6 +279,7 @@
         v-model="userInfo.workcompany"
         label="工作单位"
         name="工作单位"
+        required
         placeholder="请输入"
         v-validate="'required'"
         maxlength="50"
@@ -269,6 +291,7 @@
         readonly
         label="单位地址"
         name="单位地址"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -289,6 +312,7 @@
         label="邮编"
         name="邮编"
         placeholder="请输入"
+        required
         v-validate="'required|zipCode'"
         maxlength="6"
         clearable
@@ -302,6 +326,7 @@
       <van-field
         :value="userInfo.marriage | idToText('marriage')"
         readonly
+        required
         label="婚姻状况"
         name="婚姻状况"
         right-icon="arrow"
@@ -313,6 +338,7 @@
         v-model="userInfo.familyAnnualIncome"
         label="家庭年收入（万元）"
         name="家庭年收入"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber'"
         clearable
@@ -324,6 +350,7 @@
         readonly
         label="家庭地址"
         name="家庭地址"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -343,6 +370,7 @@
         v-model="userInfo.homeZip"
         label="邮编"
         name="邮编"
+        required
         placeholder="请输入"
         v-validate="'required|zipCode'"
         maxlength="6"
@@ -619,10 +647,10 @@ export default {
       })
     }
   },
-  // mounted() {
-  //   window.appCallBack = this.appCallBack
+  mounted() {
+    window.appCallBack = this.appCallBack
   //   // document.body.style.backgroundColor = '#F5F5F5'
-  // },
+  },
   methods: {
     //监听名字变化
     nameChange(name) {
diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue
index d1aafc7ce..30cdf5ef4 100644
--- a/src/views/ebiz/sale/NotifyingMessage.vue
+++ b/src/views/ebiz/sale/NotifyingMessage.vue
@@ -12,9 +12,11 @@
           <van-collapse v-model="activeNames">
             <van-collapse-item :name="indx + 1">
               <div slot="title" class="flex align-items-c justify-content-s">
-                <!--投保人 0 2  被保人 1 3 -->
+                <!--投保人 0 2 4 6  被保人 1 3 5 7 -->
                 {{ impartTypeNumber[im.impartType] }}
-                <span class="ml145">{{ im.impartType == 0 || im.impartType == 2 ? saleInsuredInfo.name : saleInsuredPersonInfo.name }}</span>
+                <span class="ml145">{{
+                  im.impartType == 0 || im.impartType == 2 || im.impartType == 4 || im.impartType == 6 ? saleInsuredInfo.name : saleInsuredPersonInfo.name
+                }}</span>
 
                 <img :src="$assetsUrl + 'images/avatar.png'" class="w20 ml15" />
               </div>
@@ -103,7 +105,11 @@ export default {
         '0': '投保人健康告知',
         '2': '投保人财务告知',
         '1': '被保人健康告知',
-        '3': '被保人财务告知'
+        '3': '被保人财务告知',
+        '4': '投保人健康告知',
+        '5': '被保人健康告知',
+        '6': '投保人财务告知',
+        '7': '被保人财务告知'
       }
     }
   },
@@ -148,7 +154,7 @@ export default {
     isShowList() {
       let that = this
       that.impartDTOS.map(item => {
-        if (item.impartType == 0) {
+        if (item.impartType == 0 || item.impartType == 4) {
           item.impartItemDTOS.map((items, index, array) => {
             if (items.extra3) {
               let obj = JSON.parse(items.extra3)
@@ -164,7 +170,7 @@ export default {
             }
           })
         }
-        if (item.impartType == 1) {
+        if (item.impartType == 1 || item.impartType == 5) {
           item.impartItemDTOS.map((items, index, array) => {
             if (items.extra3) {
               let obj = JSON.parse(items.extra3)
@@ -185,7 +191,7 @@ export default {
       })
       //去除数组里面的空字符串
       that.impartDTOS.map(item => {
-        if (item.impartType == 0) {
+        if (item.impartType == 0 || item.impartType == 4) {
           let array = item.impartItemDTOS
           for (var i = 0; i < array.length; i++) {
             if (array[i] == '' || array[i] == null || typeof array[i] == undefined) {
@@ -194,7 +200,7 @@ export default {
             }
           }
         }
-        if (item.impartType == 1) {
+        if (item.impartType == 1 || item.impartType == 5) {
           let array = item.impartItemDTOS
           for (var i = 0; i < array.length; i++) {
             if (array[i] == '' || array[i] == null || typeof array[i] == undefined) {
@@ -281,12 +287,12 @@ export default {
               })
             } else {
               res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
-                if (item.impartType == '1') {
+                if (item.impartType == '1' || item.impartType == '5') {
                   array.splice(index, 1)
                 }
               })
               res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
-                if (item.impartType == '3') {
+                if (item.impartType == '3' || item.impartType == '7') {
                   array.splice(index, 1)
                 }
               })
@@ -317,14 +323,14 @@ export default {
           // let arr = []
           that.impartDTOS.map(item => {
             // 投保人健康告知
-            if (item.impartType == '0') {
+            if (item.impartType == '0' || item.impartType == '4') {
               item.impartItemDTOS.map(i => {
                 delete i.extra2
                 delete i.show
               })
               obj = item
               return obj
-            } else if (item.impartType == '2') {
+            } else if (item.impartType == '2' || item.impartType == '6') {
               // 投保人财富
               item.impartItemDTOS.map(i => {
                 delete i.extra2
@@ -333,7 +339,7 @@ export default {
               // console.log(item.impartType)
               financeImpartDTO = item
               return financeImpartDTO
-            } else if (item.impartType == '1') {
+            } else if (item.impartType == '1' || item.impartType == '5') {
               // 被保人健康
               item.impartItemDTOS.map(i => {
                 delete i.extra2
@@ -346,7 +352,7 @@ export default {
               })
               objInsured = item
               return objInsured
-            } else if (item.impartType == '3') {
+            } else if (item.impartType == '3' || item.impartType == '7') {
               // 被保人财富
               item.impartItemDTOS.map(i => {
                 delete i.extra2
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 839bbffa5..97f707ab6 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -4,10 +4,10 @@
       <div v-if="isWeixin" class="bg-white mt10 p20 fs14 tips">
         <p>
           尊敬的
-          <span class="red">{{ tipsName }}</span
+          <span>{{ tipsName }}</span
           >先生/女士，您好！
         </p>
-        <p>该保单由国富人寿保险有限责任公司进行承保，具体确认信息如下：</p>
+        <p>该保单由国富人寿保险股份有限公司进行承保，具体确认信息如下：</p>
       </div>
       <van-cell-group class="mt10">
         <van-cell title="销售人员工号" :value="recmd.agentCode" />
@@ -18,6 +18,7 @@
       </van-cell-group>
       <div v-if="!isWeixin">
         <!--  不再微信 -->
+
         <van-collapse v-model="activeNames" class="mt10">
           <van-collapse-item name="1">
             <div slot="title">
@@ -25,6 +26,7 @@
               <span class="ml20">{{ appnt.name }}</span>
             </div>
             <p class="mb20">以下内容需要您按照顺序阅读并签字确认:</p>
+
             <div v-for="(item, index) in appntSign" :key="index">
               <p>{{ item.documentCode == '1' ? '需阅读' : '需签署' }}</p>
               <p class="mb20">
@@ -60,6 +62,7 @@
             <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
           </van-collapse-item>
         </van-collapse>
+
         <div v-if="relationToAppnt != '1'" class="mt10">
           <van-collapse v-model="activeNames" v-for="(item, index) in insured" :key="index">
             <van-collapse-item :name="index + 2">
@@ -208,7 +211,7 @@
 <script>
 import UploadImageFile from '@/components/ebiz/sale/UploadImageFile'
 import { Cell, CellGroup, Collapse, CollapseItem, Dialog } from 'vant'
-import { underWrite, getOrderDetail, getToken, getSignInvalid, checkSignInvalid } from '@/api/ebiz/sale/sale'
+import { underWrite, getOrderDetail, getSignInvalid, checkSignInvalid } from '@/api/ebiz/sale/sale'
 import { weixinShare } from '@/assets/js/utils/wxShare.js'
 // import axios from 'axios'
 // import device from '@/assets/js/commons.js'
@@ -299,17 +302,26 @@ export default {
         this.relationToAppnt = this.$route.query.relationToAppnt
         this.isShow = false
         this.getOrderDetail().then(() => {
-          console.log('this.appntSignStatus', this.appntSignStatus)
-          console.log('this.appntSignStatus', this.appntSignStatus)
-          if (this.appntSignStatus == '3' || this.insuredSignStatus == '3') {
+          // console.log('this.appntSignStatus', this.appntSignStatus)
+          // console.log('this.appntSignStatus', this.appntSignStatus)
+          console.log('this.appntSignStatus',this.appntSignStatus )
+          console.log('this.shareCode',this.shareCode)
+          if (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '0' || this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '2') {
             // this.$toast('签名成功，请联系业务员进行后续流程！')
             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
+          } else if (this.insuredSignStatus == '3' && this.shareCode == '1') {
+            Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
           }
         })
-        if (this.shareCode == '1') {
-          this.tipsName = this.saleInsuredPersonInfo.name
+        if (sessionStorage.shareCode == '1') {
+          console.log('进来被保人')
+          this.tipsName = JSON.parse(localStorage.saleInsuredPersonInfo).name
         } else {
-          this.tipsName = this.saleInsuredInfo.name
+          console.log('进来投保人')
+          this.tipsName = JSON.parse(localStorage.saleInsuredInfo).name
+          // console.log('localStorage.saleInsuredInfo', localStorage.saleInsuredInfo)
+          // console.log('localStorage.saleInsuredInfo.name', localStorage.saleInsuredInfo.name)
+          // console.log('this.tipName', this.tipsName)
         }
         weixinShare({
           title: '国富人寿计划书',
@@ -725,7 +737,7 @@ export default {
     // 微信人脸验证后 返回值 操作
     sendimage(e) {
       // let that = this
-      if (e.result == '0') {
+      if (e) {
         //  this.$toast.clear()
         // this.$toast('人脸检测成功')
         // 1 为被保人
@@ -734,8 +746,6 @@ export default {
         } else {
           this.goUrl()
         }
-      } else {
-        this.$toast(e.resultMessage)
       }
     }
   },
diff --git a/src/views/ebiz/sale/SignatureConfirmationOld.vue b/src/views/ebiz/sale/SignatureConfirmationOld.vue
index 52d13d262..d671a8e4e 100644
--- a/src/views/ebiz/sale/SignatureConfirmationOld.vue
+++ b/src/views/ebiz/sale/SignatureConfirmationOld.vue
@@ -7,7 +7,7 @@
           <span class="red">{{ tipsName }}</span
           >先生/女士，您好！
         </p>
-        <p>该保单由国富人寿保险有限责任公司进行承保，具体确认信息如下：</p>
+        <p>该保单由国富人寿保险股份有限公司进行承保，具体确认信息如下：</p>
       </div>
       <van-cell-group class="mt10">
         <van-cell title="销售人员工号" :value="recmd.agentCode" />
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 54a9a79dc..4cd9b2a51 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -4,15 +4,19 @@
       <!-- config.imgDomain + `/returnDirectStream?imgPath=${window.localStorage.getItem('insurance-policyUrl')}` -->
 
       <iframe :src="src + pdfUrl" class="iframe"></iframe>
-
+      <van-radio-group v-model="radioSure" class="pb10 pt20 pl5 fs14">
+        <van-radio name="1">
+          我已充分了解上述提示内容，并同意通过电子方式签收
+        </van-radio>
+      </van-radio-group>
       <!--       <div id="pdf"></div>-->
       <!--       <img :src="'data:image/jpeg;base64,' + url" /> -->
-
+      <!-- 我已充分了解上述提示内容，并同意通过电子方式签收 -->
       <div class="pt30 pl30 flex align-items-c">
         <span class="mr10">投保人签名 :</span>
         <div>
           <!-- <van-button type="danger" size="small" @click="chaolu('0')" v-no-more-click="1000">超录</van-button> -->
-          <van-button type="danger" size="small" @click="sign('0')" v-no-more-click="1000">{{ isSign ? '签名' : '已签名' }}</van-button>
+          <van-button type="danger" size="small" @click="sign('0')" :disabled="isSure" v-no-more-click="1000">{{ isSign ? '签名' : '已签名' }}</van-button>
         </div>
       </div>
     </div>
@@ -93,6 +97,8 @@ export default {
       // policyUrl: '',
       src: location.origin + '/pdfjs/web/viewer.html?file=',
       radio: '',
+      // 回执签收的radio
+      radioSure: '',
       // 倒计时时间
       number: '',
       // // 定时器时间
@@ -135,7 +141,9 @@ export default {
       // 是否从详情跳过来 如果为1 是
       detailJump: '',
       // 是否是万能险
-      isComment: false
+      isComment: false,
+      // 判断回执里面签名是否可以点击
+      isSure: true
     }
   },
   components: {
@@ -172,7 +180,11 @@ export default {
           if (res.result == '0') {
             res.orderDTO.ebizSignDTOS.map(item => {
               if (item.documentCode == '2') {
-                this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${item.policyUrl}`)
+                if (this.detailJump != '1') {
+                  this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${item.policyUrl}`)
+                } else {
+                  this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${localStorage.getItem('insurance-policyUrl')}`)
+                }
                 if (item.signType == '0') {
                   that.appntSign = item
                   // this.policyUrl = item.policyUrl
@@ -417,12 +429,17 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
+      // 投保人
       if (val == '0') {
+        // 投保人且不是回执签收
         if (this.detailJump != '1') {
+          // 投保人不是回执签收且投被同人
           if (this.relationToAppnt == '1') {
+            // 投保人不是回执签收且投被同人且在微信
             if (this.isWeixin) {
-              this.toAirSign('1', '申请日期', this.caOffset, '4')
+              this.toAirSign('0', '申请日期', this.caOffset, '4')
             } else {
+              // 投保人不是回执签收且投被同人且不在微信
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
                 number: this.saleInsuredInfo.idNo,
@@ -447,9 +464,11 @@ export default {
               })
             }
           } else {
+            // 微信投保人不是回执签收且投被不同人
             if (this.isWeixin) {
               this.toAirSign('0', '法定监护人', this.caOffset, '4')
             } else {
+              // 不在微信投保人不是回执签收且投被不同人
               console.log('投保人签名')
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -505,9 +524,11 @@ export default {
               that.saleInsuredInfo.idType = '9'
               break
           }
+          // 微信投保人且是回执签收
           if (this.isWeixin) {
-            this.toAirSign('1', '投保人签字', '-150', '4')
+            this.toAirSign('0', '投保人签字', '0', '4')
           } else {
+            // 不是微信投保人且是回执签收
             EWebBridge.webCallAppInJs('ca_sign', {
               //身份证号码
               number: that.saleInsuredInfo.idNo,
@@ -533,9 +554,11 @@ export default {
           }
         }
       } else {
+        // 在微信被保人
         if (this.isWeixin) {
           this.toAirSign('1', '法定监护人', '10', '4')
         } else {
+          // 不在微信被保人
           console.log('被保人签名')
           EWebBridge.webCallAppInJs('ca_sign', {
             //身份证号码
@@ -578,29 +601,9 @@ export default {
     },
     // 超录
     chaolu() {
-      // localStorage.setItem(
-      //   'signInfo',
-      //   JSON.stringify({
-      //     idNo: this.saleInsuredInfo.idNo,
-      //     name: this.saleInsuredInfo.name,
-      //     type: this.saleInsuredInfo.idType,
-      //     originStatus: '2',
-      //     keyword: '申请日期',
-      //     status: '2',
-      //     offset: '0',
-      //     originUrl: location.href,
-      //     commentKeyword: '认真', // 批注关键字
-      //     commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
-      //     commentOffset: '28', // 批注偏移量
-      //     commentPos: '2', // 签字图片和关键字位置关系：等于1时，签字图片和关键字矩形重心重合
-      //     // *                           等于2时，签字图片位于关键字正下方，中心线对齐；等于3时，签字图片位于关键字正右方，中心线对齐；
-      //     // *                            等于4时，签字图片左上角和关键字右下角重合，可能额外附加偏移量，详见构造函数的offset参数
-      //     caType: '1', // 是否是批注
-      //     pageNo: '1', // PDF起始页
-      //     KWIndex: '1' // 第几个关键字
-      //   })
-      // )
+      // 再微信
       if (this.isWeixin) {
+        // 在微信且投被不同人
         if (this.relationToAppnt != '1') {
           localStorage.setItem(
             'signInfo',
@@ -626,6 +629,7 @@ export default {
           )
           window.location.href = this.$mainUrl + '/chaolu/index.html'
         } else {
+          // 在微信且投被同人
           localStorage.setItem(
             'signInfo',
             JSON.stringify({
@@ -651,6 +655,7 @@ export default {
           window.location.href = this.$mainUrl + '/chaolu/index.html'
         }
       } else {
+        // 不在微信且投被不同人
         if (this.relationToAppnt != '1') {
           EWebBridge.webCallAppInJs('ca_sign', {
             //身份证号码
@@ -680,6 +685,7 @@ export default {
             }
           })
         } else {
+          // 不在微信且投被同人
           EWebBridge.webCallAppInJs('ca_sign', {
             //身份证号码
             number: this.saleInsuredInfo.idNo,
@@ -718,82 +724,118 @@ export default {
     that.signVal = window.localStorage.getItem('sign-val')
     // 判断是不是万能险
     let comment = window.localStorage.getItem('productCode')
-    // comment.map(item => {
-    //   if (item.productCode == 'GFRS_M0003') {
-    //     this.isComment = true
-    //   }
-    // })
+
     if (comment == 'GFRS_M0003') {
       this.isComment = true
     }
 
     // 获取投保人信息
     that.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo'))
+    // 在微信
     if (this.isWeixin) {
-      that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt
-    }
-
-    if (this.detailJump != '1') {
-      // 投被保人是否同人
-      that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt
-      // 获取被保人信息
-      that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo'))
-    }
-    // if (this.detailJump != '1') {
-    //   this.getOrderDetail()
-    // }
-    // let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
-    //  console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data)
-    if (this.isWeixin) {
-      let imgBase64Data = sessionStorage.getItem('imgBase64Data')
-      let wxSigned = sessionStorage.getItem('wxSigned')
-      let signInfo = JSON.parse(localStorage.getItem('signInfo'))
-      console.log('`````````````````````````````````')
-      console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data)
-      console.log('wxSigned: ' + wxSigned)
-      if (wxSigned) {
-        console.log('第二次进入电子保单!')
-        console.log('that222222222222', that)
-        this.getOrderDetail().then(() => {
-          this.Time = true
-          this.isOver = true
-          this.radio = '1'
-          this.base64 = imgBase64Data
-          this.isDisabledComplite = false
-          console.log('signInfo.status:' + signInfo.status)
-          if (signInfo.status == '0') {
-            // this.appntSign.documentStatus = '3'
-            console.log('``````````````````')
-            this.$set(this.appntSign, 'documentStatus', '3')
-            console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
-            this.isSign = false
+      // 在微信且不是回执签收
+      if (this.detailJump != '1') {
+        that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt
+        let imgBase64Data = sessionStorage.getItem('imgBase64Data')
+        let wxSigned = sessionStorage.getItem('wxSigned')
+        let signInfo = JSON.parse(localStorage.getItem('signInfo'))
+        console.log('`````````````````````````````````')
+        console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data)
+        console.log('wxSigned: ' + wxSigned)
+        if (wxSigned) {
+          console.log('第二次进入电子保单!')
+          console.log('that222222222222', that)
+          this.getOrderDetail().then(() => {
+            this.Time = true
+            this.isOver = true
+            this.radio = '1'
+            this.base64 = imgBase64Data
             this.isDisabledComplite = false
-            // this.isDisable = false
-          } else {
-            this.$set(this.insuredSign, 'documentStatus', '3')
-            // this.insuredSign.documentStatus = '3'
-            this.isDisabledComplite = false
-            this.isSign = false
-          }
-        })
+            console.log('signInfo.status:' + signInfo.status)
+            if (signInfo.status == '0') {
+              // this.appntSign.documentStatus = '3'
+              console.log('``````````````````')
+              this.$set(this.appntSign, 'documentStatus', '3')
+              console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
+              this.isSign = false
+              this.isDisabledComplite = false
+              // this.isDisable = false
+            } else {
+              this.$set(this.insuredSign, 'documentStatus', '3')
+              // this.insuredSign.documentStatus = '3'
+              this.isDisabledComplite = false
+              this.isSign = false
+            }
+          })
+        } else {
+          console.log('````````````````````````')
+          console.log('第一次进入电子保单')
+          this.timeOut()
+          this.getOrderDetail()
+        }
       } else {
-        console.log('````````````````````````')
-        console.log('第一次进入电子保单')
-        this.timeOut()
-        this.getOrderDetail()
+        // 在微信而且是回执签收
+        document.title = '保险合同签收回执电子确认书签名'
+        let imgBase64Data = sessionStorage.getItem('imgBase64Data')
+        let wxSigned = sessionStorage.getItem('wxSigned')
+        let signInfo = JSON.parse(localStorage.getItem('signInfo'))
+        console.log('`````````````````````````````````')
+        console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data)
+        console.log('wxSigned: ' + wxSigned)
+        if (wxSigned) {
+          console.log('第二次进入电子保单!')
+          console.log('that222222222222', that)
+          this.getOrderDetail().then(() => {
+            this.Time = true
+            this.isOver = true
+            this.radio = '1'
+            this.base64 = imgBase64Data
+            this.isDisabledComplite = false
+            console.log('signInfo.status:' + signInfo.status)
+            if (signInfo.status == '0') {
+              // this.appntSign.documentStatus = '3'
+              console.log('``````````````````')
+              this.$set(this.appntSign, 'documentStatus', '3')
+              console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
+              this.isSign = false
+              this.isDisabledComplite = false
+              this.isSubmit = false
+            } else {
+              this.$set(this.insuredSign, 'documentStatus', '3')
+              // this.insuredSign.documentStatus = '3'
+              this.isDisabledComplite = false
+              this.isSign = false
+            }
+          })
+        } else {
+          console.log('````````````````````````')
+          console.log('第一次进入电子保单')
+          this.timeOut()
+          this.getOrderDetail()
+        }
       }
     } else {
-      this.timeOut()
-      this.getOrderDetail()
+      // 不在微信且不是回执签收
+
       if (this.detailJump != '1') {
+        // 投被保人是否同人
+        that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt
+        // 获取被保人信息
+        that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo'))
+        this.timeOut()
+        this.getOrderDetail()
+      } else {
+        //  不在微信但是在回执签收
+        document.title = '保险合同签收回执电子确认书签名'
+        this.timeOut()
         this.getOrderDetail()
       }
     }
   },
   computed: {
     listenChange() {
-      const { isOver, radio, appntSign, insuredSign } = this
-      return { isOver, radio, appntSign, insuredSign }
+      const { isOver, radio, appntSign, insuredSign, radioSure } = this
+      return { isOver, radio, appntSign, insuredSign, radioSure }
     }
   },
   watch: {
@@ -824,6 +866,9 @@ export default {
         if (val.insuredSign.documentStatus == '3') {
           that.isDisableInsured = true
         }
+        if (val.radioSure != '') {
+          this.isSure = false
+        }
       } else {
         if (that.signVal == '0' || that.signVal == '2') {
           if (val.isOver == true && val.radio != '') {
diff --git a/src/views/ebiz/sale/test.vue b/src/views/ebiz/sale/test.vue
index cceec74a1..02a81d9b2 100644
--- a/src/views/ebiz/sale/test.vue
+++ b/src/views/ebiz/sale/test.vue
@@ -72,6 +72,7 @@ export default {
   },
 
   methods: {
+    click() {}
     // btnwxtoface() {
     //   console.log(this.$refs.wxFace.submit())
     // },
@@ -100,64 +101,64 @@ export default {
     //   // localStorage.setItem('token',this.$router.query.token)
     //   this.$router.back(-1)
     // },
-    click() {
-      let that = this
-      EWebBridge.webCallAppInJs('ca_sign', {
-        //身份证号码
-        number: '1232132132132132131',
-        // number: '2313123123213',
-        //姓名
-        name: '你啊',
-        type: '1',
-        keyword: '申请日期',
-        pageNo: '1',
-        index: '1',
-        offset: '-170',
-        pos: '3',
-        commentKeyword: '在下方表格中',
-        commentText: '已签名',
-        commentOffset: '16',
-        commentPos: '2',
-        caType: '1'
-      }).then(data => {
-        // console.log(JSON.parse(data))
-        console.log(JSON.parse(data).sign)
-        that.base64 = JSON.parse(data).sign
+    // click() {
+    //   let that = this
+    //   EWebBridge.webCallAppInJs('ca_sign', {
+    //     //身份证号码
+    //     number: '1232132132132132131',
+    //     // number: '2313123123213',
+    //     //姓名
+    //     name: '你啊',
+    //     type: '1',
+    //     keyword: '申请日期',
+    //     pageNo: '1',
+    //     index: '1',
+    //     offset: '-170',
+    //     pos: '3',
+    //     commentKeyword: '在下方表格中',
+    //     commentText: '已签名',
+    //     commentOffset: '16',
+    //     commentPos: '2',
+    //     caType: '1'
+    //   }).then(data => {
+    //     // console.log(JSON.parse(data))
+    //     console.log(JSON.parse(data).sign)
+    //     that.base64 = JSON.parse(data).sign
 
-        // that.appntSign.signStatus = '1'
+    //     // that.appntSign.signStatus = '1'
 
-        // that.isDisabledComplite = false
-      })
-    },
-    saveInformation() {
-      console.log('调用了')
-      let that = this
-      let da = {
-        orderType: 'SIGN_ORDER',
-        orderDTO: {
-          orderInfoDTO: {
-            // orderNo: window.localStorage.getItem('orderNo')
-            orderNo: '8186270000001237'
-          },
-          ebizSignDTOS: [
-            {
-              signOrRead: 'sign',
-              // signId: that.appntSign.signId,
-              signId: '245',
-              // orderNo: window.localStorage.getItem('orderNo'),
-              orderNo: '8186270000001237',
-              documentStatus: '3',
-              signType: '1',
-              baseEncryp: that.base64,
-              documentType: '1'
-            }
-          ]
-        }
-      }
-      saveInformation(da).then(res => {
-        console.log(res)
-      })
-    }
+    //     // that.isDisabledComplite = false
+    //   })
+    // },
+    // saveInformation() {
+    //   console.log('调用了')
+    //   let that = this
+    //   let da = {
+    //     orderType: 'SIGN_ORDER',
+    //     orderDTO: {
+    //       orderInfoDTO: {
+    //         // orderNo: window.localStorage.getItem('orderNo')
+    //         orderNo: '8186270000001237'
+    //       },
+    //       ebizSignDTOS: [
+    //         {
+    //           signOrRead: 'sign',
+    //           // signId: that.appntSign.signId,
+    //           signId: '245',
+    //           // orderNo: window.localStorage.getItem('orderNo'),
+    //           orderNo: '8186270000001237',
+    //           documentStatus: '3',
+    //           signType: '1',
+    //           baseEncryp: that.base64,
+    //           documentType: '1'
+    //         }
+    //       ]
+    //     }
+    //   }
+    //   saveInformation(da).then(res => {
+    //     console.log(res)
+    //   })
+    // }
 
     // next() {
     //   let that = this
diff --git a/src/views/ebiz/serve/AirSign.vue b/src/views/ebiz/serve/AirSign.vue
index e5f997ec6..d00a53fb4 100644
--- a/src/views/ebiz/serve/AirSign.vue
+++ b/src/views/ebiz/serve/AirSign.vue
@@ -30,6 +30,7 @@ import { formatAllRisk } from '@/assets/js/utils/formatRiskList'
 
 export default {
   data() {
+    let isWeixin = this.$utils.device().isWeixin //判断环境
     return {
       appntImg: '',
       idcardData: {
@@ -46,14 +47,23 @@ export default {
       insuredDTOs: [],
       // 保单号
       contNo: '',
+      // 是否在微信
+      isWeixin,
 
       list: []
     }
   },
   created() {
-    // 获取保单详情
-    this.getPolicyDetail()
-    this.disabled = false
+    if (this.isWeixin) {
+      window.localStorage.setItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
+      window.localStorage.setItem('token', this.$route.query.token)
+      window.localStorage.setItem('policyNo', this.$route.query.policyNo)
+      this.idcardData.idcardName = JSON.parse(this.$route.query.saleInsuredInfo).name
+      this.idcardData.idcardNumber = JSON.parse(this.$route.query.saleInsuredInfo).idNo
+      this.getPolicyDetail()
+    } else {
+      // 获取保单详情
+    }
   },
   components: {
     [Button.name]: Button,
@@ -70,11 +80,17 @@ export default {
     sendimage(e) {
       console.log('微信人脸验证', e)
       let that = this
-      if (e.result == '0') {
+      if (e) {
         that.disabled = false
-      } else {
-        that.$toast(e.resultMessage)
       }
+      // if (e.result == '0') {
+      //   that.disabled = false
+      //   window.localStorage.failedNumber = ''
+      // } else if (e.result == '2') {
+      //   window.localStorage.failedNumber = '0'
+      // } else {
+      //   that.$toast(e.resultMessage)
+      // }
     },
     //根据数据字典 将后端返回的数据渲染到页面中
     filterData(dictionary, key, pageData) {
@@ -180,7 +196,8 @@ export default {
             flag: 'h5',
             extra: {
               url: location.origin + '/#/sale/signatureOfElectronic',
-              forbidSwipeBack: '1'
+              forbidSwipeBack: '1',
+              title: '保险合同签收回执电子确认书签名'
             },
             routerInfo: {
               path: '/sale/signatureOfElectronic'
@@ -191,26 +208,26 @@ export default {
         }
       })
     },
-    deleteImg(file) {},
-    uploadImg() {
-      let that = this
-      this.$toast.loading({
-        duration: 0, // 持续展示 toast
-        forbidClick: true, // 禁用背景点击
-        loadingType: 'spinner',
-        message: '加载中……'
-      })
-      let formdata = new FormData()
-      console.log('file-----------------', that.file)
-      console.log('name-----------------', that.imgName)
-      formdata.append('imgPath', that.dataURLtoFile(that.file, that.imgName))
-      uploadImg(formdata).then(res => {
-        //  console.log(res)
-        if (res.result == '0') {
-          this.$toast.clear()
-        }
-      })
-    },
+    // deleteImg(file) {},
+    // uploadImg() {
+    //   let that = this
+    //   this.$toast.loading({
+    //     duration: 0, // 持续展示 toast
+    //     forbidClick: true, // 禁用背景点击
+    //     loadingType: 'spinner',
+    //     message: '加载中……'
+    //   })
+    //   let formdata = new FormData()
+    //   console.log('file-----------------', that.file)
+    //   console.log('name-----------------', that.imgName)
+    //   formdata.append('imgPath', that.dataURLtoFile(that.file, that.imgName))
+    //   uploadImg(formdata).then(res => {
+    //     //  console.log(res)
+    //     if (res.result == '0') {
+    //       this.$toast.clear()
+    //     }
+    //   })
+    // },
     afterRead(file) {
       let that = this
       // console.log(type)
diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index fafdad99e..5117b5d98 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -134,6 +134,7 @@ export default {
       let data = {
         policyNo: window.localStorage.getItem('policyNo')
       }
+
       getPolicyDetail(data).then(res => {
         if (res.result == '0') {
           let appntDTO = res.content.appntDTO
@@ -146,11 +147,14 @@ export default {
           } else {
             orderInfoDTO.orderStatusText = ''
           }
+          // 测试用
+          // orderInfoDTO.orderStatus = '0'
           that.OrderInfoDTO = orderInfoDTO
           // 投保人信息
           this.filterData(dataDictionary.sex, 'sex', appntDTO)
           this.filterData(dataDictionary.idType, 'idType', appntDTO)
           that.appntDTO = appntDTO
+          window.localStorage.setItem('saleInsuredInfo', JSON.stringify(appntDTO))
           // 被保人信息
           res.content.insuredDTOs.map(insured => {
             insured.riskDTOLst.map(risk => {
@@ -207,13 +211,20 @@ export default {
     },
     appCallBack(data) {
       if (data.trigger == 'right_button_click') {
+        console.log(localStorage.saleInsuredInfo)
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
           extra: {
             title: this.wxTitle,
             content: '国富人寿保单回执签收',
-            url: location.origin + '/#/serve/airSign?policyNo=' + localStorage.policyNo + '&token=' + localStorage.token+
-            '&saleInsuredInfo=' + JSON.stringify(this.appntDTO),
+            url:
+              location.origin +
+              '/#/serve/airSign?policyNo=' +
+              localStorage.policyNo +
+              '&token=' +
+              localStorage.token +
+              '&saleInsuredInfo=' +
+              encodeURI(localStorage.saleInsuredInfo),
             // url: 'http://47.96.143.111/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token,
             img: this.$assetsUrl + 'images/logo.png'
           }
@@ -257,7 +268,8 @@ export default {
                 flag: 'h5',
                 extra: {
                   url: location.origin + '/#/sale/signatureOfElectronic',
-                  forbidSwipeBack: '1'
+                  forbidSwipeBack: '1',
+                  title: '保险合同签收回执电子确认书签名'
                 },
                 routerInfo: {
                   path: '/sale/signatureOfElectronic'