接口加密

src/api/ebiz/sale/sale.js

@@ -372,3 +372,12 @@ export function checkAppointBnf(data) {
     data
   })
 }
+
+
+export function appntIsAgent(data) {
+  return request({
+    url: getUrl('/sale/insure/appntIsAgent', 1),
+    method: 'post',
+    data
+  })
+}

src/assets/js/utils/countCredentialValidity.js

@@ -21,7 +21,7 @@ export default {
           return startDate = thisyear + '-02-28'
         }
       }else{
-        return startDate = String(Number(endDate.slice(0, 4)) - 5) + startDate.slice(4, 11)
+        return startDate = String(Number(endDate.slice(0, 4)) - 5) + endDate.slice(4, 11)
       }
     }
     /**

src/assets/js/utils/data-dictionary.js

@@ -1773,7 +1773,7 @@ export default {
     },
     {
       id: '07',
-      text: '公司谢绝'
+      text: '核保失败'
     },
     {
       id: '08',

src/config/index.js

@@ -29,29 +29,29 @@ function getSearchString (key) {
   }
   return obj[key]
 }
-let apiVersion = 'v1'
-// var ua = window.navigator.userAgent.toLowerCase()
-// //通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
-// if (localStorage.getItem('apiVersion')) {
-//   apiVersion = localStorage.getItem('apiVersion')
-// } else {
-//   if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-//     //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
-//     if (window.location.href.indexOf('apiVersion') > 0) {
-//       apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
-//     } else {
-//       apiVersion = 'v3'
-//     }
-//   } else {
-//     // 在app
-//     if (navigator.userAgent.indexOf('JZG_') > 0) {
-//       apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
-//     }
-//   }
-//   window.localStorage.setItem('apiVersion', apiVersion)
-// }
-// // 可以多个接口域名，按需添加
-// console.log('环境：', process.env.VUE_APP_FLAG)
+let apiVersion = 'v2'
+var ua = window.navigator.userAgent.toLowerCase()
+//通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
+if (localStorage.getItem('apiVersion')) {
+  apiVersion = localStorage.getItem('apiVersion')
+} else {
+  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+    //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
+    if (window.location.href.indexOf('apiVersion') > 0) {
+      apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
+    } else {
+      apiVersion = 'v3'
+    }
+  } else {
+    // 在app
+    if (navigator.userAgent.indexOf('JZG_') > 0) {
+      apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
+    }
+  }
+  window.localStorage.setItem('apiVersion', apiVersion)
+}
+// 可以多个接口域名，按需添加
+console.log('环境：', process.env.VUE_APP_FLAG)
 switch (process.env.VUE_APP_FLAG) {
   case 'dev':
     apiDomain = 'https://iagentsales-test2.e-guofu.com:5200/api/' + apiVersion // 国富api ///api/v1

src/router/ebiz/goodStart.js

@@ -23,7 +23,7 @@ export default [
     name: 'Prefecture',
     component: PerformanceReport,
     meta: {
-      title: '开门红业绩查询'
+      title: '一月业绩查询'
     }
   },
   {
@@ -31,7 +31,7 @@ export default [
     name: 'Prefecture',
     component: Prefecture,
     meta: {
-      title: '开门红专区'
+      title: '一月专区'
     }
   },
   {
@@ -53,7 +53,7 @@ export default [
     name: 'GoodStartScheme',
     component: GoodStartScheme,
     meta: {
-      title: '开门红方案'
+      title: '一月方案'
     }
   },
   {
@@ -61,7 +61,7 @@ export default [
     name: 'businessMap',
     component: businessMap,
     meta: {
-      title: '开门红业务地图'
+      title: '一月业务地图'
     }
   },
   {
@@ -77,7 +77,7 @@ export default [
     name: 'newsPaper',
     component: newsPaper,
     meta: {
-      title: '开门红实时贺报'
+      title: '一月实时贺报'
     }
   }
 ]

src/views/ebiz/billingDetail/billingDetail.vue

@@ -173,6 +173,19 @@ export default {
       }
     }
   },
+  created() {
+
+  },
+  mounted() {
+    let date = new Date()
+    let month = date.getMonth() + 1
+    if (month <= 9) {
+      month = '0' + month
+    }
+    //默认展示当天数据
+    this.postDate = date.getFullYear() + '-' + month + '-' + date.getDate()
+    this.initData()
+  },
   methods: {
     //切换当月、当天
     switchDayOrMonth(index) {
@@ -218,7 +231,14 @@ export default {
        * 查询机构下拉列表
        * manageCode, manageLv传空查全国所有二级机构
        **/
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       let resData = await getBranchByUser({})
+      this.$toast.clear()
       if (resData.result != '0') return this.$toast(resData.resultMessage)
       this.manageLv = resData.content.level
       //当前token查不出机构时,展示敬请期待
@@ -275,6 +295,12 @@ export default {
     },
     // 查询列表数据
     queryOutOrderListFunc() {
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       queryOutOrderList({
         dateFlag: this.dateFlag,
         appntDate: this.postDate,
@@ -284,6 +310,7 @@ export default {
         pageNum: this.pageNum,
         pageSize: this.pageSize
       }).then(res => {
+        this.$toast.clear()
         if (res.result == 0) {
           if (res.content) {
             this.pageNum++
@@ -388,16 +415,6 @@ export default {
       this.queryOutOrderListFunc()
     }
   },
-  created() {
-    let date = new Date()
-    let month = date.getMonth() + 1
-    if (month <= 9) {
-      month = '0' + month
-    }
-    //默认展示当天数据
-    this.postDate = date.getFullYear() + '-' + month + '-' + date.getDate()
-    this.initData()
-  }
 }
 </script>
 

src/views/ebiz/cardList/GroupAttachmentManagement.vue

@@ -133,7 +133,7 @@
         class="attachmentManagement-next"
         size="large"
         :disabled="isDisabled"
-        @click="next"
+        @click="appntIsAgent"
         @touchstart="beforeNext(isDisabled)"
         v-no-more-click="1000"
         >立即投保</van-button
@@ -148,7 +148,7 @@ import { Cell, CellGroup, Field, Uploader, RadioGroup, Radio, Dialog, Picker, Po
 import { cardOrderDetail,saveOrUpdateGroupCard } from '@/api/ebiz/cardList/cardList.js'
 import config from '@/config'
 import utils from '../../../assets/js/business-common'
-import { underWrite } from '@/api/ebiz/sale/sale'
+import { underWrite, appntIsAgent } from '@/api/ebiz/sale/sale'
 import { uploadImg, IDCardOCR } from '@/api/ebiz/sale/sale'
 
 
@@ -1037,6 +1037,35 @@ export default {
         }
       });
     },
+    appntIsAgent(){
+      let params = {
+        orderNo: this.cardOrderNo
+      }
+      appntIsAgent(params).then(res=>{
+        if(res.result == '0') {
+          if(res.content.isAgengFlag == '0') {
+            this.$dialog.confirm({
+              className: 'dialog-delete',
+              title: '提示',
+              message: '投保人/法人同时为代理人，此代理人费用为0。（虚拟账号的提示虚拟代理人费用为0。）请确认提交审核或者退回修改！',
+              cancelButtonColor: '#E9332E',
+              confirmButtonColor: '#FFFFFF',
+              cancelButtonText: '退回'
+            })
+            .then(() => {
+              this.next()
+            })
+            .catch(() => {
+              return
+            })
+          } else {
+            this.next()
+          }
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
 
     // 点击下一步
     next() {

src/views/ebiz/cardList/information.vue

@@ -579,7 +579,7 @@ import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/areaForSale'
 import { getProductInfo,saveOrUpdateCard,insureTrial } from '@/api/ebiz/cardList/cardList.js'
-import { underWrite } from '@/api/ebiz/sale/sale'
+import { underWrite, appntIsAgent } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
 import getAreaName from '@/assets/js/utils/getAreaNameForSale'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
@@ -1097,6 +1097,35 @@ export default {
         this.areaCode = this.insuredInfo.homeArea
       }
     },
+    appntIsAgent(orderNo){
+      let params = {
+        orderNo: orderNo
+      }
+      appntIsAgent(params).then(res=>{
+        if(res.result == '0') {
+          if(res.content.isAgengFlag == '0') {
+            this.$dialog.confirm({
+              className: 'dialog-delete',
+              title: '提示',
+              message: '投保人/法人同时为代理人，此代理人费用为0。（虚拟账号的提示虚拟代理人费用为0。）请确认提交审核或者退回修改！',
+              cancelButtonColor: '#E9332E',
+              confirmButtonColor: '#FFFFFF',
+              cancelButtonText: '退回'
+            })
+            .then(() => {
+              this.underWrite(orderNo)
+            })
+            .catch(() => {
+              return
+            })
+          } else {
+            this.underWrite(orderNo)
+          }
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
     underWrite(orderNo) {
       let data = {
         platform: 'app',
@@ -2401,8 +2430,8 @@ export default {
         // console.log(this.userInfo)
 
         let orderNo = (localStorage.orderNo = resultData.content.object)
-
-        this.underWrite(orderNo)
+        this.appntIsAgent(orderNo)
+        // this.underWrite(orderNo)
       } else {
         console.error(resultData.resultMessage)
         this.$toast(resultData.resultMessage)

src/views/ebiz/common/CalculatePremium.vue

@@ -320,7 +320,7 @@
                 placeholder="请录入保单号或者投保单号,如果关联多个保单，请用\隔开"
         />
       </div>
-      <div class="flex justify-content-s pv10 border-bottom prem" v-if="item.productCode != 'GFRS_M0080' && item.productCode != 'GFRS_M0083'">
+      <div class="flex justify-content-s pv10 border-bottom prem" v-if="item.productCode != 'GFRS_M0080' && item.productCode != 'GFRS_M0083' && item.productCode != 'GFRS_M0085'">
         <!-- trialType 0-保额算保费，1-保费算保额 -->
         <!-- isTrial是否需存在特殊配置(规则) 0-是 1-否-->
         <span
@@ -789,7 +789,7 @@
               this.isEnterAddtionRiskListFunc()
             }
           }
-          if (item.mainRiskCode == 'GFRS_M0083' && this.isFrom == 'proposal') {
+          if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') {
             item.calFactorLst.forEach((i) => {
               if (i.code == "inputPrem") {
                 i.minPrem = 0.01
@@ -2019,13 +2019,13 @@
         let thisproductInfo = JSON.parse(window.localStorage.getItem('chooseProducts'))
         if(thisproductInfo && thisproductInfo.length != 0) {
           thisproductInfo.forEach(item => {
-            if(item.productCode == 'GFRS_M0083') {
+            if(item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0085') {
               productCode = item.productCode
             }
           })
         }
         if(this.isFrom != 'proposal'){
-          if(productCode == 'GFRS_M0083'){
+          if(productCode == 'GFRS_M0083' || productCode == 'GFRS_M0085'){
             if(!that.policyNo){
               that.chooseProducts.forEach(item=>{
                 item.calFactorLst.forEach(ii=>{
@@ -2364,7 +2364,7 @@
               this.saleInsuredInfo.sex,
               this.saleInsuredInfo.occupationCode,
               this.saleInsuredInfo.occupationName,
-              this.saleInsuredPersonInfo.insuredAge
+              this.saleInsuredInfo.age?this.saleInsuredInfo.age:this.saleInsuredInfo.insuredAge
             ]
           } else {
             ;[birthday, sex, occupationCode, occupationName, age] = [
@@ -2699,7 +2699,7 @@
             }
           }
         }
-        else if (productCode == 'GFRS_M0083') {
+        else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0085') {
           if(this.isFrom != 'proposal'){
             if(!this.policyNo && defalutValue < 5) {
               this.$toast('单独投保，保费为大于等于50000元')

src/views/ebiz/goodStart/Organization.vue

@@ -64,9 +64,9 @@ export default {
       needGettingKey: ['name', 'ysbb', 'ysjs', 'bzbf', 'cbjs'],
       tableColumns: [
         { name: '机构', key: 'name' },
-        { name: '预收标保(万元)', key: 'ysbb' },
+        { name: '预收期交(万元)', key: 'ysbb' },
         { name: '预收件数(件)', key: 'ysjs' },
-        { name: '承保标保(万元)', key: 'bzbf' },
+        { name: '承保期交(万元)', key: 'bzbf' },
         { name: '承保件数(件)', key: 'cbjs' }
       ],
       values: [],

src/views/ebiz/goodStart/PerformanceReport.vue

@@ -5,7 +5,7 @@
         <div class="header-left">
           <van-button>
             <img :src="point" />
-            <span class="ml5 mr5">标保</span>
+            <span class="ml5 mr5">期交</span>
           </van-button>
         </div>
         <div class="header-center">

src/views/ebiz/goodStart/Prefecture.vue

@@ -36,7 +36,7 @@ export default {
           const res =await getServiceConfig({})
           if (res.sections) {
               res.sections.forEach(e=>{
-                  if(e.name.indexOf('开门红专区')!=-1){
+                  if(e.name.indexOf('一月专区')!=-1){
                       this.menuList =e.items;
                   }
               })

src/views/ebiz/institutionalPerform/Organization.vue

@@ -94,30 +94,30 @@ export default {
         [
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '预收标保(万元)', key: 'ysbb' },
+            { isInt: false, name: '预收期交(万元)', key: 'ysbb' },
             { isInt: true, name: '预收件数(件)', key: 'ysjs' },
-            { isInt: false, name: '承保标保(万元)', key: 'bzbf' },
+            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
             { isInt: true, name: '承保件数(件)', key: 'cbjs' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '预收标保(万元)', key: 'ysbb' },
+            { isInt: false, name: '预收期交(万元)', key: 'ysbb' },
             { isInt: true, name: '预收件数(件)', key: 'ysjs' },
-            { isInt: false, name: '承保标保(万元)', key: 'bzbf' },
+            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
             { isInt: true, name: '承保件数(件)', key: 'cbjs' },
             { isInt: false, name: '承保同比', key: 'cbtb' },
             { isInt: false, name: '承保环比', key: 'cbhb' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '承保标保(万元)', key: 'bzbf' },
-            { isInt: false, name: '标保目标', key: 'bbmb' },
-            { isInt: false, name: '标保目标达成率', key: 'bbmbdcl' },
+            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
+            { isInt: false, name: '期交目标', key: 'bbmb' },
+            { isInt: false, name: '期交目标达成率', key: 'bbmbdcl' },
             { isInt: false, name: '差距', key: 'cj' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '承保标保(万元)', key: 'bzbf' }
+            { isInt: false, name: '承保期交(万元)', key: 'bzbf' }
           ]
         ],
         [
@@ -131,7 +131,7 @@ export default {
         ],
         [
           { isInt: false, name: '产品', key: 'productName' },
-          { isInt: false, name: '承保标保(万元)', key: 'cbbb' },
+          { isInt: false, name: '承保期交(万元)', key: 'cbbb' },
           { isInt: true, name: '承保件数(件)', key: 'cbItems' },
           { isInt: false, name: '保费占比(%)', key: 'percent' }
         ]

src/views/ebiz/institutionalPerform/Summarizing.vue

@@ -11,7 +11,7 @@
             <th>达成</th>
           </tr>
           <tr>
-            <td class="bleft bright">预收标保</td>
+            <td class="bleft bright">预收期交</td>
             <td class="bright">{{ performance.ysbb | unitFilter(1) | blankFilter }}</td>
           </tr>
           <tr>
@@ -19,7 +19,7 @@
             <td class="bright">{{ performance.ysjs | unitFilter(2) | blankFilter }}</td>
           </tr>
           <tr>
-            <td class="bleft bright">承保标保</td>
+            <td class="bleft bright">承保期交</td>
             <td class="bright">{{ performance.bzbf | unitFilter(1) | blankFilter }}</td>
           </tr>
           <tr>
@@ -29,43 +29,43 @@
         </table>
       </div>
     </div>
-    <div class="data-section">
-      <span ref="manpower" class="title">
-        人力
-      </span>
-      <div class="table-wrapper">
-        <table class="myTable" cellspacing="0" cellpadding="0">
-          <tr>
-            <th style="width: 50%;">人力指标</th>
-            <th>达成(人)</th>
-          </tr>
-          <tr>
-            <td class="bleft bright">活动人力</td>
-            <td class="bright">{{ manpower.hdrl | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">合格人力</td>
-            <td class="bright">{{ manpower.hgrl | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">桂冠人力</td>
-            <td class="bright">{{ manpower.ggrl | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">桂冠正式会员</td>
-            <td class="bright">{{ manpower.gghy | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">双冠人力</td>
-            <td class="bright">{{ manpower.sgrl | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">新增人力</td>
-            <td class="bright">{{ manpower.xzrl | blankFilter }}</td>
-          </tr>
-        </table>
-      </div>
-    </div>
+<!--    <div class="data-section">-->
+<!--      <span ref="manpower" class="title">-->
+<!--        人力-->
+<!--      </span>-->
+<!--      <div class="table-wrapper">-->
+<!--        <table class="myTable" cellspacing="0" cellpadding="0">-->
+<!--          <tr>-->
+<!--            <th style="width: 50%;">人力指标</th>-->
+<!--            <th>达成(人)</th>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">活动人力</td>-->
+<!--            <td class="bright">{{ manpower.hdrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">合格人力</td>-->
+<!--            <td class="bright">{{ manpower.hgrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">桂冠人力</td>-->
+<!--            <td class="bright">{{ manpower.ggrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">桂冠正式会员</td>-->
+<!--            <td class="bright">{{ manpower.gghy | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">双冠人力</td>-->
+<!--            <td class="bright">{{ manpower.sgrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">新增人力</td>-->
+<!--            <td class="bright">{{ manpower.xzrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--        </table>-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="data-section">
       <span ref="production" class="title">
         产品
@@ -77,7 +77,7 @@
         <table class="myTable" style="min-width: 140vw;" cellspacing="0" cellpadding="0">
           <tr>
             <th class="sticky">产品名称</th>
-            <th>承保标保(万元)</th>
+            <th>承保期交(万元)</th>
             <th>承保件数(件)</th>
             <th>保费占比(%)</th>
           </tr>

src/views/ebiz/institutionalPerform/UnderOffice.vue

@@ -125,7 +125,7 @@ export default {
       dayTimeCondition: currentDate,
       // 0: 标保, 1: 人力, 2: 产品
       typeIndex: 0,
-      dataTypes: ['标保', '人力指标', '产品'],
+      dataTypes: ['期交', '人力指标', '产品'],
       active: 0,
       // 侧边栏是否显示
       isSideBarShow: false,

src/views/ebiz/product/HomeProduct.vue

@@ -2,7 +2,7 @@
   <div ref="product" class="home-product-container pb20">
     <!-- 非个险 -->
     <template v-if="!isPersonalInsu">
-      <div class="home-product-content">
+      <div class="home-product-content" v-if="branchType != '12'">
         <!-- 产品中心 -->
         <div class="pcenter-title flex pt10 mr20 mb10 ml15 justify-content-s  align-items-c" style="height: 30px;">
           <h3 class="center-title fs15 pl10" style="border-left: 4px solid red;">知识社区</h3>
@@ -61,7 +61,7 @@
     </template>
     <!-- 个险 -->
     <template v-if="isPersonalInsu">
-      <div class="home-product-content">
+      <div class="home-product-content" v-if="branchType != '12'">
         <!-- 机构排名/业绩排名 -->
         <div class="pcenter-title flex pt10 pb10 mr15 justify-content-s align-items-c" style="height: 50px;">
           <img v-if="isInner" class="title-img" :src="organizationImgUrl" />
@@ -157,8 +157,8 @@ export default {
       isGoodStart: '0',    // 是否开门红 0-默认
       isPersonalInsu: true, // 是否个险渠道
       isInner: false,
-      organizationTheads: ['排名', '机构', '当日预收(标保)', '月预收标保', '日承保标保', '月承保标保'],
-      performanceTheads: ['排名', '姓名', '营销服务部', '预收规保', '承保标保'],
+      organizationTheads: ['排名', '机构', '当日预收(期交)', '月预收期交', '日承保期交', '月承保期交'],
+      performanceTheads: ['排名', '姓名', '营销服务部', '预收标保', '承保标保'],
       organizationData: [],
       performanceData: [],
       organizationImgUrl: '',    // 机构排名图片

src/views/ebiz/proposal/ProposalInfo.vue

@@ -51,14 +51,14 @@
                 <div class="fs12 div_4">
                   <div class="risk_head flex text-center line-height table fs12 bg_DBEFFE">
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7">投保险种</div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border" v-if="mainRiskCodes[0] != 'GFRS_M0080' && mainRiskCodes[0] != 'GFRS_M0083'">保额(元）</div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border" v-if="ispremshow">保额(元）</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">保险期间</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">交费期间</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">首年保费(元)</div>
                   </div>
                   <div class="risk_body flex text-center table bg_f7fbff" v-for="(riskItem, index) in pageShowInfo.showInsuredDTO.riskDTOLst" :key="index">
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7">{{ riskItem.riskName }}</div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border" v-if="mainRiskCodes[0] != 'GFRS_M0080' && mainRiskCodes[0] != 'GFRS_M0083'">{{ riskItem.amt ? riskItem.amt : '--' }}</div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border" v-if="ispremshow">{{ riskItem.amt ? riskItem.amt : '--' }}</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.insureName }}</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.payName }}</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.showPrem ? riskItem.showPrem : '--' }}</div>
@@ -386,7 +386,8 @@ export default {
       mainRiskCodes: [],
       time: 5,
       proposalNo:'',
-      mainRiskName: ''
+      mainRiskName: '',
+      ispremshow: true, // 是否展示保额
     }
   },
   filters: {
@@ -729,6 +730,9 @@ export default {
         that.pageShowInfo.insuredDTOs.forEach(item => {
           item.riskDTOLst.forEach(item01 => {
             if (item01.isMainRisk == '0') {
+              if(item01.mainRiskCode == 'GFRS_M0080' || item01.mainRiskCode == 'GFRS_M0083' || item01.mainRiskCode == 'GFRS_M0085') {
+                that.ispremshow = false
+              }
               mainRiskNameList.push(item01.riskName)
             }
           })

src/views/ebiz/proposal/js/exhibitionMethod.js

@@ -150,7 +150,7 @@ export function relevanceByInsure(insured, insuredLabelResult, insuredResult, in
         let defaulValue = 'M' //档位默认值
         let radios = []
         if(currentInsuredInfo.L){
-          if(risk.mainRiskCode == 'GFRS_M0083') {
+          if(risk.mainRiskCode == 'GFRS_M0083' || risk.mainRiskCode == 'GFRS_M0085') {
             radios.push({
               label: '保证' + currentInsuredInfo.L,
               value: 'L'
@@ -163,7 +163,7 @@ export function relevanceByInsure(insured, insuredLabelResult, insuredResult, in
           }
         }
         if(currentInsuredInfo.M){
-          if(risk.mainRiskCode == 'GFRS_M0083') {
+          if(risk.mainRiskCode == 'GFRS_M0083' || risk.mainRiskCode == 'GFRS_M0085') {
             radios.push({
               label: '演示' + currentInsuredInfo.M,
               value: 'M'

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -88,7 +88,7 @@
         @confirm="onDateConfirm($event, '1')"
         ref="certiexpiredate"
         :flag="certiexpiredateShow"
-        :readonly="isInsured || idLimit"
+        :readonly="isInsured"
       ></FieldDatePicter>
       <div class="border-bt relative fs14 p10 flex align-center">
         <van-checkbox v-model="userInfo.effectiveDateType" class="fr" :disabled="effectiveDateTypeAble" @change="effectiveDataTypeChange">长期</van-checkbox>
@@ -1299,35 +1299,53 @@ export default {
       }
       this.userInfo.effectiveDateType = false
       this.effectiveDateTypeAble = idToData(val).age <= 45
-      this.userInfo.birthday = idToData(val).birthday
-      //受益人证件类型如果是户口本时，证件截止日期证件截止日期应为第16周岁的生日日期。
-      if(this.userInfo.idType == '2' && idToData(this.userInfo.idNo).age <16){
-        // 获取出生日期年份＋16
-        let year = Number(this.userInfo.birthday.substr(0,4)) + 16
-        if(this.userInfo.birthday.substr(5,5) == '02-29'){
-          // 获取某年某月一共多少天
-          let date = new Date(year, 2, 1)
-          let dayEnd = new Date(date.getTime() - 864e5).getDate()
-          this.userInfo.certiexpiredate = year +'-02-'+ dayEnd
-        }else{
-          this.userInfo.certiexpiredate = year +'-'+ this.userInfo.birthday.substr(5,5)
-        }
-      }  
-      this.userInfo.sex = idToData(val).sex
-      if (idToData(val).age > 45) {
-        if (from) {
-          this.userInfo.effectiveDateType = true
-        }
-        this.effectiveDateTypeAble = false
-      }
-      //如果选择户口本
-      if (this.userInfo.idType == '2') {
-        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
+      if(this.userInfo.idType == '2' && idToData(this.userInfo.idNo).age <16) {
+        this.userInfo.birthday = idToData(val).birthday
+        this.userInfo.sex = idToData(val).sex
         this.userInfo.certificateValidate = this.userInfo.birthday
-        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
-        this.idLimit = true
-        //如果选择出生证明
+        let date2_29 = this.userInfo.certificateValidate.slice(5, 11)
+        if(date2_29 == '02-29'){
+          let thisyear = Number(this.userInfo.certificateValidate.slice(0, 4)) + 16
+          if (thisyear % 4 == 0 && thisyear % 100 != 0 || thisyear % 400 == 0){
+            return this.userInfo.certiexpiredate = thisyear + '-02-29'
+          } else {
+            return this.userInfo.certiexpiredate = thisyear + '-02-28'
+          }
+        }else{
+          this.userInfo.certiexpiredate = String(Number(this.userInfo.certificateValidate.slice(0, 4)) + 16) + this.userInfo.certificateValidate.slice(4, 11)
+        }
       }
+
+      //受益人证件类型如果是户口本时，证件截止日期证件截止日期应为第16周岁的生日日期。
+      // if(this.userInfo.idType == '2' && idToData(this.userInfo.idNo).age <16){
+      //   // 获取出生日期年份＋16
+      //   let year = Number(this.userInfo.birthday.substr(0,4)) + 16
+      //   if(this.userInfo.birthday.substr(5,5) == '02-29'){
+      //     // 获取某年某月一共多少天
+      //     let date = new Date(year, 2, 1)
+      //     let dayEnd = new Date(date.getTime() - 864e5).getDate()
+      //     this.userInfo.certiexpiredate = year +'-02-'+ dayEnd
+      //     // this.userInfo.certiexpiredate = String(Number(this.userInfo.certificateValidate.slice(0, 4)) + 16) + this.userInfo.certificateValidate.slice(4, 11)
+      //   }else{
+      //     // this.userInfo.certiexpiredate = year +'-'+ this.userInfo.birthday.substr(5,5)
+      //     this.userInfo.certiexpiredate = String(Number(this.userInfo.certificateValidate.slice(0, 4)) + 16) + this.userInfo.certificateValidate.slice(4, 11)
+      //   }
+      // }
+      // this.userInfo.sex = idToData(val).sex
+      // if (idToData(val).age > 45) {
+      //   if (from) {
+      //     this.userInfo.effectiveDateType = true
+      //   }
+      //   this.effectiveDateTypeAble = false
+      // }
+      // //如果选择户口本
+      // if (this.userInfo.idType == '2') {
+      //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
+      //   this.userInfo.certificateValidate = this.userInfo.birthday
+      //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+      //   this.idLimit = true
+      //   //如果选择出生证明
+      // }
     }
   },
   filters: {

src/views/ebiz/sale/InsuranceInformation.vue

@@ -146,7 +146,7 @@
         // 倒计时时间
         number: '',
         // 定时器时间
-        time: '2',
+        time: '10',
         // 定时器名称
         timer: null,
         isOver: false,

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -1766,16 +1766,22 @@ export default {
           this.goUrl()
         }
       } else {
-        this.faceAuthCount.weixin++
-        console.log('腾讯人脸识别失败', this.faceAuthCount.weixin, typeof this.faceAuthCount.weixin)
-        if (this.faceAuthCount.weixin >= this.smsAuthNum) {
-          if (window.sessionStorage.shareCode == '1') {
-            this.operaFlag = 'insured'
-          } else {
-            this.operaFlag = 'appnt'
-          }
-          this.realPeopelCheck()
+        // this.faceAuthCount.weixin++
+        // console.log('腾讯人脸识别失败', this.faceAuthCount.weixin, typeof this.faceAuthCount.weixin)
+        // if (this.faceAuthCount.weixin >= this.smsAuthNum) {
+        //   if (window.sessionStorage.shareCode == '1') {
+        //     this.operaFlag = 'insured'
+        //   } else {
+        //     this.operaFlag = 'appnt'
+        //   }
+        //   this.realPeopelCheck()
+        // }
+        if (window.sessionStorage.shareCode == '1') {
+          this.operaFlag = 'insured'
+        } else {
+          this.operaFlag = 'appnt'
         }
+        this.realPeopelCheck()
       }
     },
     async recognition() {

src/views/ebiz/sale/SignatureOfElectronic.vue

@@ -1087,7 +1087,7 @@
       that.signVal = window.localStorage.getItem('sign-val')
       // 判断是不是万能险
       let comment = window.localStorage.getItem('productCode')
-      if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015' || comment == 'GFRS_M0017' || comment == 'GFRS_M0075' || comment == 'GFRS_M0080' || comment == 'GFRS_M0082' || comment == 'GFRS_M0083') {
+      if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015' || comment == 'GFRS_M0017' || comment == 'GFRS_M0075' || comment == 'GFRS_M0080' || comment == 'GFRS_M0082' || comment == 'GFRS_M0083' || comment == 'GFRS_M0085') {
         this.isComment = true
       }
       // 获取投保人信息

src/views/ebiz/sale/apointValidDoc.vue

@@ -5,9 +5,9 @@
       <div>
         <!-- <h2 v-if="activeType=='KMH'" style="text-align:center" class="mb20">指定保单生效日说明</h2> -->
         <!-- <h2 v-if="activeType=='SQY'" style="text-align:center" class="mb20">指定保险合同生效日说明</h2> -->
-        <h2 style="text-align:center" class="mb20">指定保险合同生效日说明</h2>
+        <h2 style="text-align:center" class="mb20">预录投保单承保生效说明</h2>
         <p style="text-indent:2rem;" :class="[activeType=='SQY' ? 'fontb' : '']">
-          尊敬的客户，您好！以下为指定保险合同生效日重要说明，请您务必仔细阅读和确认。
+          尊敬的客户，您好！以下为预录投保单承保生效重要说明，请您务必仔细阅读和确认。
         </p>
         <p style="text-indent:2rem;">
           <!-- 如您于{{ activeType=='KMH' ? '2020年12月31日':activeType=='SQY'? '2021年5月31日':'' }}(包含当日）之前申请投保并交费成功、且国富人寿保险股份有限公司（以下简称国富人寿）
@@ -17,16 +17,17 @@
           <span>{{ cvalidateStrToFormat }}</span>零时起生效；您交费成功日或签发保单日如在<span>{{ cvalidateStrToFormat }}</span>
           （包含当日）之后，保险合同于国富人寿收取首期保险费并签发保险单次日零时起生效。 -->
 
-          如您于<span>{{ cvalidateStrOneDayOff }}</span>(包含当日）前申请投保且支付保险费，经国富人寿保险股份有限公司（以下简称国富人寿）同意并签发保单，
-          <span>{{ cvalidateStrOneDayOff }}</span>(包含当日）前签发保单，保险合同自{{ cvalidateStrToFormat }}零时起生效；{{ cvalidateStrToFormat }}(包含当日）后签发保单，
-          保险合同自签发保险单次日零时起生效。国富人寿将通过您投保时预留的银行账户转账扣除保险费，为顺利承保，请您充足银行账户余额。
+<!--          如您于<span>{{ cvalidateStrOneDayOff }}</span>(包含当日）前申请投保且支付保险费，经国富人寿保险股份有限公司（以下简称国富人寿）同意并签发保单，-->
+<!--          <span>{{ cvalidateStrOneDayOff }}</span>(包含当日）前签发保单，保险合同自{{ cvalidateStrToFormat }}零时起生效；{{ cvalidateStrToFormat }}(包含当日）后签发保单，-->
+<!--          保险合同自签发保险单次日零时起生效。国富人寿将通过您投保时预留的银行账户转账扣除保险费，为顺利承保，请您充足银行账户余额。-->
 
+          本次投保为预录投保申请，国富人寿保险股份有限公司（以下简称国富人寿）将通过您投保时预留的银行账户转账扣除保险费，为顺利承保，请您充足银行账户余额。如您于{{ cvalidateStrOneDayOff }}(包含当日）前提交投保申请且完成转账支付，经国富人寿同意于{{ cvalidateStrOneDayOff }}(包含当日）前签发保单，保险合同自{{ cvalidateStrToFormat }}零时起生效；如您于{{ cvalidateStrOneDayOff }}(包含当日）前提交投保申请，于{{ cvalidateStrToFormat }}后(包含当日）完成转账支付，经国富人寿同意于{{ cvalidateStrToFormat }}(包含当日）后签发保单，保险合同自签发保险单次日零时起生效。
         </p>
         <p style="text-indent:2rem;">
           国富人寿承担的保险责任从保险合同生效日零时开始。签发保险单后，国富人寿将电子保单发送至您的电子邮箱。
         </p>
         <p style="text-indent:2rem;">
-          请您务必仔细阅读保险条款中的犹豫期、保险责任、责任免除等各项重要内容和提示。
+          请您务必仔细阅读保险条款中的犹豫期、保险责任、责任免除等各项重要容和提示。
         </p>
       </div>
     </div>
@@ -34,7 +35,7 @@
     <div class="bg-white bottom-btn">
       <van-radio-group v-model="radio" class="pb10 pb20 pl30">
         <van-radio name="1" @click="click" class="fs14">
-          <span>本人已详细阅读并同意上述指定保单生效日说明 </span>
+          <span>本人已详细阅读并同意上述预录投保单承保生效说明 </span>
         </van-radio>
       </van-radio-group>
       <van-button type="danger" size="large" :disabled="isDisable" @click="goNext" v-no-more-click="1000">我已阅读并知晓</van-button>
@@ -112,7 +113,7 @@ export default {
     let that = this
     // {{switchFlag.Time?pageVariable.msg:pageVariable.number}}
     that.timeOut()
-    document.title = '指定保单生效日说明'
+    document.title = '预录投保单承保生效说明'
     that.activeType = window.localStorage.getItem('activeType')
     // Notify({
     //   type: 'warning',