Merge branch 'hotfix/签名bug修改' into release/1012

src/api/ebiz/sale/sale.js

@@ -1,4 +1,5 @@
 import request from '@/assets/js/utils/request'
+import request1 from '@/assets/js/utils/request1'
 import getUrl from '@/assets/js/utils/get-url'
 // 保费计算
 export function saveOrUpdateOrderInfo(data) {
@@ -59,7 +60,13 @@ export function getOrderDetail(data) {
     data
   })
 }
-
+export function getOrderDetail1(data) {
+  return request1({
+    url: getUrl('/sale/order/orderDetail', 1),
+    method: 'post',
+    data
+  })
+}
 // 获取验证码
 export function getAuthCode(data) {
   return request({

src/assets/js/utils/request.js

@@ -78,6 +78,7 @@ let productStore = [
   '/customer/shop/getShopList', //获取商城列表/详情
   '/customer/shop/getShareList' //查询分享轨迹(转发记录)
 ]
+
 // 卡单
 let cardList = []
 
@@ -131,6 +132,7 @@ service.interceptors.request.use(
 service.interceptors.response.use(
   response => {
     const res = response.data
+    console.log(res, 'res')
     Toast.clear()
     if (res.code != 0) {
       if (res.code == 10001 || res.code == 10002) {

src/views/ebiz/sale/InsuranceTip.vue

@@ -25,6 +25,7 @@
 <script>
 import { RadioGroup, Radio, Dialog, NoticeBar } from 'vant'
 import { saveInformation, getOrderDetail } from '@/api/ebiz/sale/sale'
+
 import config from '@/config'
 // import axios from 'axios'
 export default {
@@ -210,7 +211,17 @@ export default {
     },
     // 点击签名
     sign(val) {
-      console.log('签名参数',this.saleInsuredInfo.idNo,this.saleInsuredInfo.name,this.saleInsuredInfo.idType,'keyword'+':'+ '签字日期','pageNo'+':'+ '1','index'+':'+ '1','offset'+':'+ '-150','pos'+':'+ '3')
+      console.log(
+        '签名参数',
+        this.saleInsuredInfo.idNo,
+        this.saleInsuredInfo.name,
+        this.saleInsuredInfo.idType,
+        'keyword' + ':' + '签字日期',
+        'pageNo' + ':' + '1',
+        'index' + ':' + '1',
+        'offset' + ':' + '-150',
+        'pos' + ':' + '3'
+      )
       let that = this
       this.$toast.loading({
         duration: 0, // 持续展示 toast

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -304,7 +304,7 @@ export default {
       isShow: true,
       // 调微信人脸的token
       tokenInweixin: '',
-      // 投保人被保险人是否同一个人
+      // 投保人被保险人是否同一个人,1代表是同一个人
       relationToAppnt: '',
       // 微信分享校验值
       signInvalid: '',
@@ -569,6 +569,8 @@ export default {
     start_ocr(val) {
       // val  0投保人 1被保险人 2本人
       /////
+      console.log(this.isWeixin, 'this.isWeixin')
+      console.log(val, 'val')
       let that = this
       if (this.isWeixin) {
         window.localStorage.setItem('sign-val', val)
@@ -621,6 +623,9 @@ export default {
           } else {
             if (this.faceAuthCount.appnt < this.smsAuthNum) {
               // 原人脸识别
+              console.log(this.faceAuthCount, 'faceAuthCount')
+              console.log(this.smsAuthNum, 'smsAuthNum')
+              console.log('this.faceAuthCount.appnt < this.smsAuthNum', this.faceAuthCount.appnt < this.smsAuthNum)
               EWebBridge.webCallAppInJs('face_auth', {
                 businessSource: '1', //业务来源:1-电投，2-入司，3-理赔，4-保全
                 number: that.saleInsuredInfo.idNo, //身份证号码
@@ -729,6 +734,7 @@ export default {
       let that = this
       let path = ''
       if (that.insuredSign[0].documentStatus == 0) {
+        debugger
         path = 'insuranceInformation'
       } else {
         path = 'SignatureOfElectronic'
@@ -1043,13 +1049,26 @@ export default {
             // 获取投保人信息
             this.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo'))
             this.relationToAppnt = this.saleInsuredPersonInfo.relationToAppnt //将缓存中的与被保险人关系赋值给页面
-            this.riskName = res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName
-            localStorage.riskName = this.riskName
+
             that.recmd = res.orderDTO.recmdDTO
             that.orderInfo = res.orderDTO.orderInfoDTO
             that.insured = res.orderDTO.insuredDTOs
             //存code区分万能型产品
-            localStorage.setItem('productCode', that.insured[0].riskDTOLst[0].mainRiskCode)
+            let productCode, riskName
+            console.log('isDoubleMailRisk', that.orderInfo.isDoubleMailRisk)
+            let isDoubleMailRisk = that.orderInfo.isDoubleMailRisk
+            if (isDoubleMailRisk == '1') {
+              productCode = 'GFRS_M0017'
+              riskName = res.orderDTO.insuredDTOs[0].riskDTOLst[1].riskName
+            } else {
+              productCode = that.insured[0].riskDTOLst[0].mainRiskCode
+              riskName = res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName
+            }
+            localStorage.setItem('productCode', productCode)
+            this.riskName = riskName
+            localStorage.setItem('riskName', riskName)
+
+            console.log('riskName', that.orderInfo.isDoubleMailRisk)
             // nsuredDTOs[0].riskDTOLst
             if (this.relationToAppnt != '1') {
               this.activeNames.push(res.orderDTO.insuredDTOs.length + 1)

src/views/ebiz/sale/productTip.vue

@@ -23,7 +23,8 @@
 </template>
 <script>
 import { RadioGroup, Radio, Dialog, NoticeBar } from 'vant'
-import { saveInformation, getOrderDetail } from '@/api/ebiz/sale/sale'
+import { saveInformation, getOrderDetail1 } from '@/api/ebiz/sale/sale'
+import { openLoading, closeLoading } from '@/assets/js/utils/toastLoading.js'
 import config from '@/config'
 // import axios from 'axios'
 export default {
@@ -73,8 +74,12 @@ export default {
   },
   mounted() {
     let that = this
-    that.timeOut()
+
     document.body.style.backgroundColor = '#fff'
+    setTimeout(function() {
+      closeLoading()
+      that.timeOut()
+    }, 5000)
   },
   async created() {
     let that = this
@@ -134,11 +139,18 @@ export default {
       } else {
         console.log('````````````````````````')
         console.log('第一次进入电子保单')
+        setTimeout(function() {
+          closeLoading()
           this.timeOut()
+        }, 5000)
+
         this.getOrderDetail()
       }
     } else {
+      setTimeout(function() {
+        closeLoading()
         this.timeOut()
+      }, 5000)
       if (this.detailJump != '1') {
         this.getOrderDetail()
       }
@@ -164,12 +176,13 @@ export default {
     },
     // 获取签名状态
     getOrderDetail() {
+      openLoading()
       let that = this
       let data = {
         orderNo: window.localStorage.getItem('orderNo')
       }
       return new Promise((resolve, reject) => {
-        getOrderDetail(data).then(res => {
+        getOrderDetail1(data).then(res => {
           if (res.result == '0') {
             res.orderDTO.ebizSignDTOS.map(item => {
               if (item.signType == '0' || item.signType == '2') {
@@ -538,5 +551,6 @@ img {
 .iframe {
   width: 100vw;
   height: 70vh;
+  border: none;
 }
 </style>