Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/views/ebiz/sale/InsuranceTip.vue

@@ -117,10 +117,8 @@ export default {
   },
   async created() {
     let that = this
-
     that.detailJump = window.localStorage.getItem('detailJump')
     that.signVal = window.localStorage.getItem('sign-val')
-
     // 获取投保人信息
     that.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo'))
     if (this.isWeixin) {
@@ -137,16 +135,16 @@ export default {
       this.getOrderDetail()
     }
     if (this.isWeixin) {
-      let imgBase64Data = sessionStorage.getItem('imgBase64Data')
+      let imgBase64Data = sessionStorage.getItem('oneimgBase64Data')
-      let wxSigned = sessionStorage.getItem('wxSigned')
+      let wxSigned = sessionStorage.getItem('onewxSigned')
       let signInfo = JSON.parse(localStorage.getItem('signInfo'))
       console.log('`````````````````````````````````')
-      console.log('imgBase64Data: ' + imgBase64Data)
+
+      console.log('imgBase64Data: oneimgBase64Data:' + imgBase64Data)
       console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
         console.log('第二次进入电子保单')
         console.log('````````````````````````````````')
-
         let rs = await this.getOrderDetail()
         if (rs === 'success') {
           this.Time = true
@@ -392,13 +390,14 @@ export default {
       localStorage.setItem(
         'signInfo',
         JSON.stringify({
+          originStatus: '1',
           idNo: this.saleInsuredInfo.idNo,
           name: this.saleInsuredInfo.name,
           type: this.saleInsuredInfo.idType,
           keyword: keyword,
           status: status,
           offset: offset,
-          originUrl: location.origin
+          originUrl: location.href
         })
       )
       window.location.href = this.$mainUrl + '/sign/index.html'
@@ -411,7 +410,7 @@ export default {
         this.$toast.loading({
           duration: 0, // 持续展示 toast
 
-          forbidClick: true, // 禁用背景点击
+          forbidClick: true, // 禁用背景点击ase
 
           loadingType: 'spinner',
 

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -307,6 +307,11 @@ export default {
   methods: {
     // 初始化
     async init() {
+     
+     
+        window.localStorage.setItem('saleInsuredInfozzzzzz', location.href)
+        
+        console.log( window.localStorage.getItem('saleInsuredInfozzzzzz'))
       if (this.isWeixin) {
         if (this.$route.query.airSign) {
           sessionStorage.setItem('airSign', this.$route.query.airSign)

src/views/ebiz/sale/SignatureOfElectronic.vue

@@ -397,7 +397,7 @@ export default {
         if (this.detailJump != '1') {
           if (this.relationToAppnt == '1') {
             if (this.isWeixin) {
-              this.toAirSign('1', '申请日期', this.caOffset)
+              this.toAirSign('1', '申请日期', this.caOffset, '2')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -424,7 +424,7 @@ export default {
             }
           } else {
             if (this.isWeixin) {
-              this.toAirSign('1', '法定监护人', this.caOffset)
+              this.toAirSign('1', '法定监护人', this.caOffset, '2')
             } else {
               console.log('投保人签名')
               EWebBridge.webCallAppInJs('ca_sign', {
@@ -482,7 +482,7 @@ export default {
               break
           }
           if (this.isWeixin) {
-            this.toAirSign('1', '投保人签字', '-150')
+            this.toAirSign('1', '投保人签字', '-150', '2')
           } else {
             EWebBridge.webCallAppInJs('ca_sign', {
               //身份证号码
@@ -510,7 +510,7 @@ export default {
         }
       } else {
         if (this.isWeixin) {
-          this.toAirSign('2', '法定监护人', '0')
+          this.toAirSign('2', '法定监护人', '0', '2')
         } else {
           console.log('被保人签名')
           EWebBridge.webCallAppInJs('ca_sign', {
@@ -536,17 +536,18 @@ export default {
         }
       }
     },
-    toAirSign(status, keyword, offset) {
+    toAirSign(status, keyword, offset, originStatus) {
       localStorage.setItem(
         'signInfo',
         JSON.stringify({
+          originStatus: originStatus,
           idNo: this.saleInsuredInfo.idNo,
           name: this.saleInsuredInfo.name,
           type: this.saleInsuredInfo.idType,
           keyword: keyword,
           status: status,
           offset: offset,
-          originUrl: location.origin
+          originUrl: location.href
         })
       )
       window.location.href = this.$mainUrl + '/sign/index.html'
@@ -590,11 +591,11 @@ export default {
       this.getOrderDetail()
     }
     if (this.isWeixin) {
-      let imgBase64Data = sessionStorage.getItem('imgBase64Data')
+      let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
-      let wxSigned = sessionStorage.getItem('wxSigned')
+      let wxSigned = sessionStorage.getItem('twowxSigned')
       let signInfo = JSON.parse(localStorage.getItem('signInfo'))
       console.log('`````````````````````````````````')
-      console.log('imgBase64Data: ' + imgBase64Data)
+      console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data)
       console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
         console.log('第二次进入电子保单')

src/views/ebiz/sale/SignatureOfNotice.vue

@@ -392,7 +392,7 @@ export default {
             }
           } else {
             if (this.isWeixin) {
-              this.toAirSign('1', '法定监护人', '-170', '3')
+              this.toAirSign('1', '法定监护人', '-170', '2')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -578,11 +578,11 @@ export default {
       this.getOrderDetail()
     }
     if (this.isWeixin) {
-      let imgBase64Data = sessionStorage.getItem('imgBase64Data')
+      let imgBase64Data = sessionStorage.getItem('threeimgBase64Data')
-      let wxSigned = sessionStorage.getItem('wxSigned')
+      let wxSigned = sessionStorage.getItem('threewxSigned')
       let signInfo = localStorage.getItem('signInfo')
       console.log('`````````````````````````````````')
-      console.log('imgBase64Data: ' + imgBase64Data)
+      console.log('imgBase64Data:threeimgBase64Data ' + imgBase64Data)
       console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
         console.log('第二次进入电子保单')