From 14eda3fd10d90d1ad46c1558f4687522da821200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Sat, 9 Nov 2019 13:54:40 +0800
Subject: [PATCH 01/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuredPerson.vue         | 1 +
 src/views/ebiz/sale/SignatureConfirmation.vue | 8 ++++----
 src/views/ebiz/sale/SignatureOfElectronic.vue | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index d4d59c0c2..3a4c3a5f7 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -1396,6 +1396,7 @@ export default {
       }
     },
     getRelatedData(val) {
+      // debugger
       if (this.userInfo.idType != '1') {
         return
       }
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 375db94b5..50059c8d1 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -344,8 +344,8 @@ export default {
             that.insuredUrl()
           } else {
             this.idcardData.typeface = !this.idcardData.typeface
-            this.idcardData.idcardName = JSON.parse(this.$route.query.saleInsuredInfo).name
-            this.idcardData.idcardNumber = JSON.parse(this.$route.query.saleInsuredInfo).idNo
+            this.idcardData.idcardName = JSON.parse(this.$route.query.saleInsuredPersonInfo).name
+            this.idcardData.idcardNumber = JSON.parse(this.$route.query.saleInsuredPersonInfo).idNo
           }
         }
       } else {
@@ -375,8 +375,8 @@ export default {
           } else {
             // 调原生人脸识别
             EWebBridge.webCallAppInJs('face_auth', {
-              number: that.saleInsuredInfo.idNo, //身份证号码
-              name: that.saleInsuredInfo.name //姓名
+              number: that.saleInsuredPersonInfo.idNo, //身份证号码
+              name: that.saleInsuredPersonInfo.name //姓名
             }).then(data => {
               if (JSON.parse(data).state == '1') {
                 that.insuredUrl()
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 4427a86a7..475a6e524 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -421,7 +421,7 @@ export default {
         if (this.detailJump != '1') {
           if (this.relationToAppnt == '1') {
             if (this.isWeixin) {
-              this.toAirSign('1', '申请日期', this.caOffset, '2')
+              this.toAirSign('1', '申请日期', this.caOffset, '4')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -448,7 +448,7 @@ export default {
             }
           } else {
             if (this.isWeixin) {
-              this.toAirSign('1', '法定监护人', this.caOffset, '2')
+              this.toAirSign('1', '法定监护人', this.caOffset, '4')
             } else {
               console.log('投保人签名')
               EWebBridge.webCallAppInJs('ca_sign', {
@@ -506,7 +506,7 @@ export default {
               break
           }
           if (this.isWeixin) {
-            this.toAirSign('1', '投保人签字', '-150', '2')
+            this.toAirSign('1', '投保人签字', '-150', '4')
           } else {
             EWebBridge.webCallAppInJs('ca_sign', {
               //身份证号码
@@ -534,7 +534,7 @@ export default {
         }
       } else {
         if (this.isWeixin) {
-          this.toAirSign('2', '法定监护人', '0', '2')
+          this.toAirSign('2', '法定监护人', '0', '4')
         } else {
           console.log('被保人签名')
           EWebBridge.webCallAppInJs('ca_sign', {

From 2eae98e9d954b67ebd271ffbf8cdb86d428fd29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Sat, 9 Nov 2019 15:12:53 +0800
Subject: [PATCH 02/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=80=A7=E5=88=AB?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AddBeneficiaryInfo.vue |  2 ++
 src/views/ebiz/sale/InsuredInfo.vue        | 14 ++++++++++++++
 src/views/ebiz/sale/InsuredPerson.vue      | 16 ++++++++++------
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
index f455c9764..00c94570a 100644
--- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue
+++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
@@ -586,6 +586,8 @@ export default {
       this.effectiveDateTypeAble = age <= 45
       //数据是否从客户列表拉取
       this.fromCustomer = true
+
+      this.getRelatedData(this.userInfo.idNo)
     },
     nextStep() {
       // 计算年龄
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 4022cef48..3ab5c75d4 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -699,6 +699,8 @@ export default {
       let age = utilsAge.getAge(this.userInfo.birthday, new Date())
       // 长期按钮是否禁用
       this.effectiveDateTypeAble = age <= 45
+
+      this.getRelatedData(this.userInfo.idNo)
     },
     nextStep() {
      
@@ -1097,6 +1099,18 @@ export default {
     this.countDown = 60
     this.codeDisabled = false
   }
+  // watch: {
+  //    'userInfo.idNo': {
+  //     handler(newName, oldName) {
+  //       // console.log('obj.a changed');
+  //       if(newName != oldName) {
+  //         this.getRelatedData(this.userInfo.idNo)
+  //       }
+  //     },
+  //     immediate: true,
+  //     deep: true
+  //   }
+  // }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index 3a4c3a5f7..ea81b6e8f 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -1016,6 +1016,7 @@ export default {
       this.effectiveDateTypeAble = age <= 45
       //数据是否从客户列表拉取
       this.fromCustomer = true
+      this.getRelatedData(this.userInfo.idNo)
     },
     //下一步
     nextStep() {
@@ -1448,12 +1449,15 @@ export default {
     this.codeDisabled = false
   }
   // watch: {
-  //   'userInfo.effectiveDateType'(newVal, oldVal) {
-  //     console.log(newVal)
-  //     if (newVal == 'true' || newVal == true) {
-  //       this.userInfo.certiexpiredate = ''
-  //       this.$refs.certiexpiredate.date = ''
-  //     }
+  //    'userInfo.idNo': {
+  //     handler(newName, oldName) {
+  //       // console.log('obj.a changed');
+  //       if(newName != oldName) {
+  //         this.getRelatedData(this.userInfo.idNo)
+  //       }
+  //     },
+  //     immediate: true,
+  //     deep: true
   //   }
   // }
 }

From 0ef998b9c957ac1d33a92060a517b3e461cd61a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Mon, 11 Nov 2019 14:28:13 +0800
Subject: [PATCH 03/39] =?UTF-8?q?=E5=91=8A=E7=9F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/NotifyingMessage.vue | 48 ++++++++++++++++++------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue
index 0c88eb04e..bfcf0246b 100644
--- a/src/views/ebiz/sale/NotifyingMessage.vue
+++ b/src/views/ebiz/sale/NotifyingMessage.vue
@@ -91,6 +91,8 @@ export default {
       saleInsuredPersonInfo: {},
       // 投被保人是否同人 1为同一个人
       relationToAppnt: '',
+      // 产品编码
+      productCodes: '',
       // 是否可以点击
       isDisabled: false,
       saleInsuredAge: '',
@@ -127,7 +129,7 @@ export default {
       }
     })
     // this.relationToAppnt = `1`
-
+    this.productCodes = JSON.parse(localStorage.chooseProductCodes)
     this.information()
   },
   methods: {
@@ -255,17 +257,41 @@ export default {
               }
             })
           })
+          // 如果是国富民心展示被保人
+          if (this.productCodes == 'GFRS_M0002' || this.productCodes == 'GFRS_M0003' || this.productCodes == 'GFRS_M0004') {
+            res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
+              if (item.impartType == '0') {
+                array.splice(index, 1)
+              }
+              if (item.impartType == '2') {
+                array.splice(index, 1)
+              }
+            })
+          }
           if (this.relationToAppnt == '1') {
-            res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
-              if (item.impartType == '1') {
-                array.splice(index, 1)
-              }
-            })
-            res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
-              if (item.impartType == '3') {
-                array.splice(index, 1)
-              }
-            })
+            // 如果是国富民心展示被保人
+            if (this.productCodes == 'GFRS_M0002' || this.productCodes == 'GFRS_M0003' || this.productCodes == 'GFRS_M0004') {
+              res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
+                if (item.impartType == '0') {
+                  array.splice(index, 1)
+                }
+                if (item.impartType == '2') {
+                  array.splice(index, 1)
+                }
+              })
+            } else {
+              res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
+                if (item.impartType == '1') {
+                  array.splice(index, 1)
+                }
+              })
+              res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
+                if (item.impartType == '3') {
+                  array.splice(index, 1)
+                }
+              })
+            }
+
             that.impartDTOS = res.productImpartLstDTO.impartDTOS
             that.isShowList()
             //投被同人时候判断

From 168424dac1735feab5c530ddffaf7ca1501b9e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Mon, 11 Nov 2019 17:30:42 +0800
Subject: [PATCH 04/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/NotifyingMessage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue
index bfcf0246b..d1aafc7ce 100644
--- a/src/views/ebiz/sale/NotifyingMessage.vue
+++ b/src/views/ebiz/sale/NotifyingMessage.vue
@@ -231,7 +231,7 @@ export default {
         })
       }
     },
-    // 获取告知消息
+    // 获取告知消息,
     information() {
       let that = this
       let data = {

From 53bf8d7f8d6308278b6a1dd0551f0de04d961dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Tue, 12 Nov 2019 09:31:29 +0800
Subject: [PATCH 05/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=A9=BA=E7=AD=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuranceTip.vue | 12 ++++++------
 src/views/ebiz/sale/productTip.vue   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/ebiz/sale/InsuranceTip.vue b/src/views/ebiz/sale/InsuranceTip.vue
index 739a3b458..73beab8f5 100644
--- a/src/views/ebiz/sale/InsuranceTip.vue
+++ b/src/views/ebiz/sale/InsuranceTip.vue
@@ -99,12 +99,12 @@ export default {
       this.getOrderDetail()
     }
     if (this.isWeixin) {
-      let imgBase64Data = sessionStorage.getItem('oneimgBase64Data')
-      let wxSigned = sessionStorage.getItem('onewxSigned')
+      let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
+      let wxSigned = sessionStorage.getItem('twowxSigned')
       let signInfo = JSON.parse(localStorage.getItem('signInfo'))
       console.log('`````````````````````````````````')
 
-      console.log('imgBase64Data: oneimgBase64Data:' + imgBase64Data)
+      console.log('imgBase64Data: twoimgBase64Data:' + imgBase64Data)
       console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
         console.log('第二次进入电子保单')
@@ -221,7 +221,7 @@ export default {
         if (this.detailJump != '1') {
           if (this.relationToAppnt == '1') {
             if (this.isWeixin) {
-              this.toAirSign('1', '签字日期', '-150', '1')
+              this.toAirSign('1', '签字日期', '-150', '2')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -245,7 +245,7 @@ export default {
             }
           } else {
             if (this.isWeixin) {
-              this.toAirSign('1', '签字日期', '-150', '1')
+              this.toAirSign('1', '签字日期', '-150', '2')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -300,7 +300,7 @@ export default {
               break
           }
           if (this.isWeixin) {
-            this.toAirSign('1', '签字日期', '-150', '1')
+            this.toAirSign('1', '签字日期', '-150', '2')
           } else {
             EWebBridge.webCallAppInJs('ca_sign', {
               //身份证号码
diff --git a/src/views/ebiz/sale/productTip.vue b/src/views/ebiz/sale/productTip.vue
index 527233914..0b51502a6 100644
--- a/src/views/ebiz/sale/productTip.vue
+++ b/src/views/ebiz/sale/productTip.vue
@@ -392,8 +392,8 @@ export default {
             if (res.result == '0') {
               this.$toast.clear()
               window.localStorage.setItem('detailJump', '')
-              window.sessionStorage.onewxSigned = false
-              window.sessionStorage.oneimgBase64Data = ''
+              // window.sessionStorage.onewxSigned = false
+              // window.sessionStorage.oneimgBase64Data = ''
               this.$jump({
                 flag: 'h5',
                 extra: {
@@ -445,8 +445,8 @@ export default {
             if (res.result == '0') {
               this.$toast.clear()
               window.localStorage.setItem('detailJump', '')
-              window.sessionStorage.onewxSigned = false
-              window.sessionStorage.oneimgBase64Data = ''
+              // window.sessionStorage.onewxSigned = false
+              // window.sessionStorage.oneimgBase64Data = ''
               this.$jump({
                 flag: 'h5',
                 extra: {

From 2e32bbb4cd9a49035be40877668479ca5a3b9523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Tue, 12 Nov 2019 10:13:15 +0800
Subject: [PATCH 06/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8A=84=E5=BD=95?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuranceTip.vue          | 5 +++--
 src/views/ebiz/sale/SignatureOfElectronic.vue | 4 ++--
 src/views/ebiz/sale/productTip.vue            | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/ebiz/sale/InsuranceTip.vue b/src/views/ebiz/sale/InsuranceTip.vue
index 73beab8f5..cc637b50b 100644
--- a/src/views/ebiz/sale/InsuranceTip.vue
+++ b/src/views/ebiz/sale/InsuranceTip.vue
@@ -118,7 +118,7 @@ export default {
           this.isDisabledComplite = false
           console.log('signInfo.status:' + signInfo.status)
           if (signInfo.status == '1') {
-            this.appntSign.documentStatus = '3'
+            // this.appntSign.documentStatus = '3'
             console.log('``````````````````')
             this.$set(this.appntSign, 'documentStatus', '3')
             console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
@@ -126,7 +126,8 @@ export default {
             this.isDisabledComplite = false
             // this.isDisable = false
           } else {
-            this.insuredSign.documentStatus = '3'
+            this.$set(this.insuredSign, 'documentStatus', '3')
+            // this.insuredSign.documentStatus = '3'
             this.isDisabledComplite = false
             this.isSign = false
           }
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 475a6e524..28fe709d5 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -609,7 +609,7 @@ export default {
               name: this.saleInsuredInfo.name,
               type: this.saleInsuredInfo.idType,
               originStatus: '4',
-              keyword: '投保人签字',
+              keyword: '投保人签名',
               status: '1',
               offset: '10',
               originUrl: location.href,
@@ -633,7 +633,7 @@ export default {
               name: this.saleInsuredInfo.name,
               type: this.saleInsuredInfo.idType,
               originStatus: '4',
-              keyword: '申请日期',
+              keyword: '投保人',
               status: '2',
               offset: '0',
               originUrl: location.href,
diff --git a/src/views/ebiz/sale/productTip.vue b/src/views/ebiz/sale/productTip.vue
index 0b51502a6..48cf4cc6a 100644
--- a/src/views/ebiz/sale/productTip.vue
+++ b/src/views/ebiz/sale/productTip.vue
@@ -116,7 +116,7 @@ export default {
           this.isDisabledComplite = false
           console.log('signInfo.status:' + signInfo.status)
           if (signInfo.status == '1') {
-            this.appntSign.documentStatus = '3'
+            // this.appntSign.documentStatus = '3'
             console.log('``````````````````')
             this.$set(this.appntSign, 'documentStatus', '3')
             console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
@@ -124,7 +124,8 @@ export default {
             this.isDisabledComplite = false
             // this.isDisable = false
           } else {
-            this.insuredSign.documentStatus = '3'
+            this.$set(this.insuredSign, 'documentStatus', '3')
+            // this.insuredSign.documentStatus = '3'
             this.isDisabledComplite = false
             this.isSign = false
           }

From f29f94bb47e7773f0efe838e156e35dee1c4ed1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Tue, 12 Nov 2019 11:04:44 +0800
Subject: [PATCH 07/39] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8A=84=E5=BD=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuranceTip.vue          |  8 ++++----
 src/views/ebiz/sale/SignatureOfElectronic.vue | 11 ++++++-----
 src/views/ebiz/sale/productTip.vue            |  8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/ebiz/sale/InsuranceTip.vue b/src/views/ebiz/sale/InsuranceTip.vue
index cc637b50b..bcd6cfdb5 100644
--- a/src/views/ebiz/sale/InsuranceTip.vue
+++ b/src/views/ebiz/sale/InsuranceTip.vue
@@ -117,7 +117,7 @@ export default {
           this.base64 = imgBase64Data
           this.isDisabledComplite = false
           console.log('signInfo.status:' + signInfo.status)
-          if (signInfo.status == '1') {
+          if (signInfo.status == '0') {
             // this.appntSign.documentStatus = '3'
             console.log('``````````````````')
             this.$set(this.appntSign, 'documentStatus', '3')
@@ -222,7 +222,7 @@ export default {
         if (this.detailJump != '1') {
           if (this.relationToAppnt == '1') {
             if (this.isWeixin) {
-              this.toAirSign('1', '签字日期', '-150', '2')
+              this.toAirSign('0', '签字日期', '-150', '2')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -246,7 +246,7 @@ export default {
             }
           } else {
             if (this.isWeixin) {
-              this.toAirSign('1', '签字日期', '-150', '2')
+              this.toAirSign('0', '签字日期', '-150', '2')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -301,7 +301,7 @@ export default {
               break
           }
           if (this.isWeixin) {
-            this.toAirSign('1', '签字日期', '-150', '2')
+            this.toAirSign('0', '签字日期', '-150', '2')
           } else {
             EWebBridge.webCallAppInJs('ca_sign', {
               //身份证号码
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 28fe709d5..4b6e1fec0 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -610,7 +610,7 @@ export default {
               type: this.saleInsuredInfo.idType,
               originStatus: '4',
               keyword: '投保人签名',
-              status: '1',
+              status: '0',
               offset: '10',
               originUrl: location.href,
               commentKeyword: '认真', // 批注关键字
@@ -634,7 +634,7 @@ export default {
               type: this.saleInsuredInfo.idType,
               originStatus: '4',
               keyword: '投保人',
-              status: '2',
+              status: '0',
               offset: '0',
               originUrl: location.href,
               commentKeyword: '认真', // 批注关键字
@@ -763,8 +763,8 @@ export default {
           this.base64 = imgBase64Data
           this.isDisabledComplite = false
           console.log('signInfo.status:' + signInfo.status)
-          if (signInfo.status == '1') {
-            this.appntSign.documentStatus = '3'
+          if (signInfo.status == '0') {
+            // this.appntSign.documentStatus = '3'
             console.log('``````````````````')
             this.$set(this.appntSign, 'documentStatus', '3')
             console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
@@ -772,7 +772,8 @@ export default {
             this.isDisabledComplite = false
             // this.isDisable = false
           } else {
-            this.insuredSign.documentStatus = '3'
+            this.$set(this.insuredSign, 'documentStatus', '3')
+            // this.insuredSign.documentStatus = '3'
             this.isDisabledComplite = false
             this.isSign = false
           }
diff --git a/src/views/ebiz/sale/productTip.vue b/src/views/ebiz/sale/productTip.vue
index 48cf4cc6a..0a7c951e5 100644
--- a/src/views/ebiz/sale/productTip.vue
+++ b/src/views/ebiz/sale/productTip.vue
@@ -115,7 +115,7 @@ export default {
           this.base64 = imgBase64Data
           this.isDisabledComplite = false
           console.log('signInfo.status:' + signInfo.status)
-          if (signInfo.status == '1') {
+          if (signInfo.status == '0') {
             // this.appntSign.documentStatus = '3'
             console.log('``````````````````')
             this.$set(this.appntSign, 'documentStatus', '3')
@@ -216,7 +216,7 @@ export default {
         if (this.detailJump != '1') {
           if (this.relationToAppnt == '1') {
             if (this.isWeixin) {
-              this.toAirSign('1', '投保人签名', '5', '1')
+              this.toAirSign('0', '投保人签名', '5', '1')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -240,7 +240,7 @@ export default {
             }
           } else {
             if (this.isWeixin) {
-              this.toAirSign('1', '投保人签名', '5', '1')
+              this.toAirSign('0', '投保人签名', '5', '1')
             } else {
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -295,7 +295,7 @@ export default {
               break
           }
           if (this.isWeixin) {
-            this.toAirSign('1', '投保人签名', '5', '1')
+            this.toAirSign('0', '投保人签名', '5', '1')
           } else {
             EWebBridge.webCallAppInJs('ca_sign', {
               //身份证号码

From ce4c0043af0f4b9a3997b48014af087458fcc574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Tue, 12 Nov 2019 11:35:11 +0800
Subject: [PATCH 08/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureOfElectronic.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 4b6e1fec0..2691ab5dc 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -609,9 +609,9 @@ export default {
               name: this.saleInsuredInfo.name,
               type: this.saleInsuredInfo.idType,
               originStatus: '4',
-              keyword: '投保人签名',
+              keyword: '申请日期',
               status: '0',
-              offset: '10',
+              offset: '-120',
               originUrl: location.href,
               commentKeyword: '认真', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
@@ -633,9 +633,9 @@ export default {
               name: this.saleInsuredInfo.name,
               type: this.saleInsuredInfo.idType,
               originStatus: '4',
-              keyword: '投保人',
+              keyword: '申请日期',
               status: '0',
-              offset: '0',
+              offset: '-120',
               originUrl: location.href,
               commentKeyword: '认真', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字

From ca00a004b7269731a3bf1f26c4231c5038a6d9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Wed, 13 Nov 2019 14:38:13 +0800
Subject: [PATCH 09/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureOfElectronic.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 2691ab5dc..fb6518e8a 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -613,9 +613,9 @@ export default {
               status: '0',
               offset: '-120',
               originUrl: location.href,
-              commentKeyword: '认真', // 批注关键字
+              commentKeyword: '万能或', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
-              commentOffset: '28', // 批注偏移量
+              commentOffset: '30', // 批注偏移量
               commentPos: '2', // 签字图片和关键字位置关系：等于1时，签字图片和关键字矩形重心重合
               // *                           等于2时，签字图片位于关键字正下方，中心线对齐；等于3时，签字图片位于关键字正右方，中心线对齐；
               // *                            等于4时，签字图片左上角和关键字右下角重合，可能额外附加偏移量，详见构造函数的offset参数
@@ -637,9 +637,9 @@ export default {
               status: '0',
               offset: '-120',
               originUrl: location.href,
-              commentKeyword: '认真', // 批注关键字
+              commentKeyword: '万能或', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
-              commentOffset: '28', // 批注偏移量
+              commentOffset: '30', // 批注偏移量
               commentPos: '2', // 签字图片和关键字位置关系：等于1时，签字图片和关键字矩形重心重合
               // *                           等于2时，签字图片位于关键字正下方，中心线对齐；等于3时，签字图片位于关键字正右方，中心线对齐；
               // *                            等于4时，签字图片左上角和关键字右下角重合，可能额外附加偏移量，详见构造函数的offset参数

From 3d9d187286076d0f555ad2995115396851a9dc77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 14 Nov 2019 09:49:58 +0800
Subject: [PATCH 10/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=B6=85=E5=BD=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuranceTip.vue          |  3 ++-
 src/views/ebiz/sale/SignatureOfElectronic.vue |  4 ++--
 src/views/ebiz/sale/productTip.vue            |  4 ++--
 src/views/ebiz/serve/AirSign.vue              | 18 ++++++++++++++----
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/views/ebiz/sale/InsuranceTip.vue b/src/views/ebiz/sale/InsuranceTip.vue
index bcd6cfdb5..db2b99d39 100644
--- a/src/views/ebiz/sale/InsuranceTip.vue
+++ b/src/views/ebiz/sale/InsuranceTip.vue
@@ -387,7 +387,7 @@ export default {
               this.$toast.clear()
               // console.log(res)
               window.localStorage.setItem('detailJump', '')
-
+              sessionStorage.twowxSigned = false
               // let url = config.imgDomain + `/app/returnStream?imgPath=${res.signDTO.policyUrl}`
               // axios.get(url).then(res => {
               //   console.log(res)
@@ -445,6 +445,7 @@ export default {
               this.$toast.clear()
               // window.localStorage.setItem('insurance-url', res.signDTO.policyUrl)
               window.localStorage.setItem('detailJump', '')
+              sessionStorage.twowxSigned = false
               // let url = config.imgDomain + `/app/returnStream?imgPath=${res.signDTO.policyUrl}`
               // axios.get(url).then(res => {
               //   console.log(res)
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index fb6518e8a..ed3b56a9c 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -613,7 +613,7 @@ export default {
               status: '0',
               offset: '-120',
               originUrl: location.href,
-              commentKeyword: '万能或', // 批注关键字
+              commentKeyword: '认真', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
               commentOffset: '30', // 批注偏移量
               commentPos: '2', // 签字图片和关键字位置关系：等于1时，签字图片和关键字矩形重心重合
@@ -637,7 +637,7 @@ export default {
               status: '0',
               offset: '-120',
               originUrl: location.href,
-              commentKeyword: '万能或', // 批注关键字
+              commentKeyword: '认真', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
               commentOffset: '30', // 批注偏移量
               commentPos: '2', // 签字图片和关键字位置关系：等于1时，签字图片和关键字矩形重心重合
diff --git a/src/views/ebiz/sale/productTip.vue b/src/views/ebiz/sale/productTip.vue
index 0a7c951e5..f8abb4f9c 100644
--- a/src/views/ebiz/sale/productTip.vue
+++ b/src/views/ebiz/sale/productTip.vue
@@ -393,7 +393,7 @@ export default {
             if (res.result == '0') {
               this.$toast.clear()
               window.localStorage.setItem('detailJump', '')
-              // window.sessionStorage.onewxSigned = false
+              window.sessionStorage.onewxSigned = false
               // window.sessionStorage.oneimgBase64Data = ''
               this.$jump({
                 flag: 'h5',
@@ -446,7 +446,7 @@ export default {
             if (res.result == '0') {
               this.$toast.clear()
               window.localStorage.setItem('detailJump', '')
-              // window.sessionStorage.onewxSigned = false
+              window.sessionStorage.onewxSigned = false
               // window.sessionStorage.oneimgBase64Data = ''
               this.$jump({
                 flag: 'h5',
diff --git a/src/views/ebiz/serve/AirSign.vue b/src/views/ebiz/serve/AirSign.vue
index 5f9aa0d9b..625dc9dae 100644
--- a/src/views/ebiz/serve/AirSign.vue
+++ b/src/views/ebiz/serve/AirSign.vue
@@ -15,7 +15,7 @@
       <van-button type="danger" @click="uploadComparison" size="large">上传照片与证件照对比</van-button>
     </div>
     <div class="bottom-btn bg-white">
-      <van-button type="danger" :disabled = "disabled" @click="next" size="large">确定</van-button>
+      <van-button type="danger" :disabled="disabled" @click="next" size="large">确定</van-button>
     </div>
   </div>
 </template>
@@ -38,7 +38,7 @@ export default {
         idcardNumber: ''
       },
       disabled: true,
-       // 保单基本信息
+      // 保单基本信息
       OrderInfoDTO: {},
       // 投保人信息
       appntDTO: {},
@@ -68,9 +68,19 @@ export default {
     },
     // 微信人脸验证后 返回值 操作
     sendimage(e) {
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+
+        forbidClick: true, // 禁用背景点击
+
+        loadingType: 'spinner',
+
+        message: '加载中……'
+      })
       console.log('微信人脸验证', e)
       let that = this
       if (e.result == '0') {
+        this.$toast.clear()
         that.$toast('人脸检测成功')
         that.disabled = false
       } else {
@@ -165,11 +175,11 @@ export default {
     // 回执签收
     next() {
       let params = {
-        contNo:  this.$route.query.policyNo
+        contNo: this.$route.query.policyNo
       }
       getReceiptSign(params).then(res => {
         if (res.result == '0') {
-          console.log('res',res)
+          console.log('res', res)
           this.$toast.clear()
           window.localStorage.setItem('insurance-policyUrl', res.signUrl)
           window.localStorage.setItem('detailJump', '1')

From 7b38e2c89059d17aa67966ce3b1911b89799cc75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 14 Nov 2019 15:22:52 +0800
Subject: [PATCH 11/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/sale/UploadImageFile.vue  | 10 +++++++++
 src/views/ebiz/sale/InsuranceTip.vue          | 13 +++++------
 src/views/ebiz/sale/SignatureConfirmation.vue |  7 ++++++
 src/views/ebiz/sale/SignatureOfElectronic.vue | 22 ++++++++++---------
 src/views/ebiz/sale/productTip.vue            | 14 ++++++------
 src/views/ebiz/serve/AirSign.vue              | 11 ----------
 6 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/src/components/ebiz/sale/UploadImageFile.vue b/src/components/ebiz/sale/UploadImageFile.vue
index 3150764f0..f11c53180 100644
--- a/src/components/ebiz/sale/UploadImageFile.vue
+++ b/src/components/ebiz/sale/UploadImageFile.vue
@@ -73,8 +73,18 @@ export default {
           console.info(this.result)
           // 上传图片
           uploadImg(formdata).then(res => {
+            this.$toast.loading({
+              duration: 0, // 持续展示 toast
+
+              forbidClick: true, // 禁用背景点击
+
+              loadingType: 'spinner',
+
+              message: '加载中……'
+            })
             let data = { imgData: res.path, realName: that.realName, idno: that.idno }
             recognition(data).then(res => {
+              this.$toast.clear()
               that.$emit('sendimage', res)
             })
           })
diff --git a/src/views/ebiz/sale/InsuranceTip.vue b/src/views/ebiz/sale/InsuranceTip.vue
index db2b99d39..54b9cdfdd 100644
--- a/src/views/ebiz/sale/InsuranceTip.vue
+++ b/src/views/ebiz/sale/InsuranceTip.vue
@@ -95,9 +95,9 @@ export default {
       // 获取被保人信息
       // that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo'))
     }
-    if (this.detailJump != '1') {
-      this.getOrderDetail()
-    }
+    // if (this.detailJump != '1') {
+    //   this.getOrderDetail()
+    // }
     if (this.isWeixin) {
       let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
       let wxSigned = sessionStorage.getItem('twowxSigned')
@@ -109,8 +109,7 @@ export default {
       if (wxSigned) {
         console.log('第二次进入电子保单')
         console.log('````````````````````````````````')
-        let rs = await this.getOrderDetail()
-        if (rs === 'success') {
+        this.getOrderDetail().then(() => {
           this.Time = true
           this.isOver = true
           this.radio = '1'
@@ -131,7 +130,7 @@ export default {
             this.isDisabledComplite = false
             this.isSign = false
           }
-        }
+        })
       } else {
         console.log('第一次进入电子保单')
         this.timeOut()
@@ -164,7 +163,7 @@ export default {
       }, 1000)
     },
     // 获取签名状态
-    async getOrderDetail() {
+    getOrderDetail() {
       let that = this
       let data = {
         orderNo: window.localStorage.getItem('orderNo')
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 50059c8d1..978de1b87 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -269,6 +269,9 @@ export default {
     // 初始化
     async init() {
       if (this.isWeixin) {
+        if (localStorage.weixinTip == '1') {
+          this.$toast('签名成功，请联系业务员进行后续流程！')
+        }
         if (this.$route.query.airSign) {
           sessionStorage.setItem('airSign', this.$route.query.airSign)
         }
@@ -717,12 +720,16 @@ export default {
     sendimage(e) {
       // let that = this
       if (e.result == '0') {
+        //  this.$toast.clear()
+        // this.$toast('人脸检测成功')
         // 1 为被保人
         if (window.sessionStorage.shareCode == '1') {
           this.insuredUrl()
         } else {
           this.goUrl()
         }
+      } else {
+        this.$toast(e.resultMessage)
       }
     }
   },
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index ed3b56a9c..1e48c6af2 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -162,7 +162,7 @@ export default {
       }, 1000)
     },
     // 获取签名状态
-    async getOrderDetail() {
+     getOrderDetail() {
       let that = this
       let data = {
         orderNo: window.localStorage.getItem('orderNo')
@@ -292,6 +292,8 @@ export default {
             window.localStorage.setItem('jumpFromSign', '1')
             if (this.isWeixin) {
               localStorage.removeItem('signInfo')
+              // 跳回微信签名确认页是否提示签名完成
+              localStorage.setItem('weixinTip', '1')
               this.$jump({
                 flag: 'h5',
                 extra: {
@@ -361,6 +363,8 @@ export default {
             this.$toast.clear()
             window.localStorage.setItem('jumpFromSign', '1')
             if (this.isWeixin) {
+               // 跳回微信签名确认页是否提示签名完成
+              localStorage.setItem('weixinTip', '1')
               localStorage.removeItem('signInfo')
               this.$jump({
                 flag: 'h5',
@@ -611,7 +615,7 @@ export default {
               originStatus: '4',
               keyword: '申请日期',
               status: '0',
-              offset: '-120',
+              offset: '-130',
               originUrl: location.href,
               commentKeyword: '认真', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
@@ -635,7 +639,7 @@ export default {
               originStatus: '4',
               keyword: '申请日期',
               status: '0',
-              offset: '-120',
+              offset: '-130',
               originUrl: location.href,
               commentKeyword: '认真', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
@@ -739,9 +743,9 @@ export default {
       // 获取被保人信息
       that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo'))
     }
-    if (this.detailJump != '1') {
-      this.getOrderDetail()
-    }
+    // if (this.detailJump != '1') {
+    //   this.getOrderDetail()
+    // }
     // let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
     //  console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data)
     if (this.isWeixin) {
@@ -754,9 +758,7 @@ export default {
       if (wxSigned) {
         console.log('第二次进入电子保单!')
         console.log('that222222222222', that)
-        let rs = await that.getOrderDetail()
-        console.log('rs', rs, 'this33333333333', that)
-        if (rs === 'success') {
+         this.getOrderDetail().then(() => {
           this.Time = true
           this.isOver = true
           this.radio = '1'
@@ -777,7 +779,7 @@ export default {
             this.isDisabledComplite = false
             this.isSign = false
           }
-        }
+        })
       } else {
         console.log('````````````````````````')
         console.log('第一次进入电子保单')
diff --git a/src/views/ebiz/sale/productTip.vue b/src/views/ebiz/sale/productTip.vue
index f8abb4f9c..68f743994 100644
--- a/src/views/ebiz/sale/productTip.vue
+++ b/src/views/ebiz/sale/productTip.vue
@@ -92,9 +92,9 @@ export default {
       // 获取被保人信息
       that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo'))
     }
-    if (this.detailJump != '1') {
-      this.getOrderDetail()
-    }
+    // if (this.detailJump != '1') {
+    //   this.getOrderDetail()
+    // }
 
     if (this.isWeixin) {
       let imgBase64Data = sessionStorage.getItem('oneimgBase64Data')
@@ -107,8 +107,7 @@ export default {
       if (wxSigned) {
         console.log('第二次进入电子保单')
         console.log('````````````````````````````````')
-        let rs = await this.getOrderDetail()
-        if (rs === 'success') {
+        this.getOrderDetail().then(() => {
           this.Time = true
           this.isOver = true
           this.radio = '1'
@@ -129,7 +128,7 @@ export default {
             this.isDisabledComplite = false
             this.isSign = false
           }
-        }
+        })
       } else {
         console.log('````````````````````````')
         console.log('第一次进入电子保单')
@@ -162,7 +161,7 @@ export default {
       }, 1000)
     },
     // 获取签名状态
-    async getOrderDetail() {
+    getOrderDetail() {
       let that = this
       let data = {
         orderNo: window.localStorage.getItem('orderNo')
@@ -174,6 +173,7 @@ export default {
               if (item.signType == '0' || item.signType == '2') {
                 if (item.documentCode == '3') {
                   that.appntSign = item
+                  console.log('that.appntSign', that.appntSign)
                 }
               }
             })
diff --git a/src/views/ebiz/serve/AirSign.vue b/src/views/ebiz/serve/AirSign.vue
index 625dc9dae..e5f997ec6 100644
--- a/src/views/ebiz/serve/AirSign.vue
+++ b/src/views/ebiz/serve/AirSign.vue
@@ -68,20 +68,9 @@ export default {
     },
     // 微信人脸验证后 返回值 操作
     sendimage(e) {
-      this.$toast.loading({
-        duration: 0, // 持续展示 toast
-
-        forbidClick: true, // 禁用背景点击
-
-        loadingType: 'spinner',
-
-        message: '加载中……'
-      })
       console.log('微信人脸验证', e)
       let that = this
       if (e.result == '0') {
-        this.$toast.clear()
-        that.$toast('人脸检测成功')
         that.disabled = false
       } else {
         that.$toast(e.resultMessage)

From 63d46d3f907f38fa572b0d75f7351fa1acb14284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 14 Nov 2019 16:46:17 +0800
Subject: [PATCH 12/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=A9=BA=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/sale/UploadImageFile.vue | 10 ----------
 src/views/ebiz/common/CalculatePremium.vue   |  3 ++-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/components/ebiz/sale/UploadImageFile.vue b/src/components/ebiz/sale/UploadImageFile.vue
index f11c53180..3150764f0 100644
--- a/src/components/ebiz/sale/UploadImageFile.vue
+++ b/src/components/ebiz/sale/UploadImageFile.vue
@@ -73,18 +73,8 @@ export default {
           console.info(this.result)
           // 上传图片
           uploadImg(formdata).then(res => {
-            this.$toast.loading({
-              duration: 0, // 持续展示 toast
-
-              forbidClick: true, // 禁用背景点击
-
-              loadingType: 'spinner',
-
-              message: '加载中……'
-            })
             let data = { imgData: res.path, realName: that.realName, idno: that.idno }
             recognition(data).then(res => {
-              this.$toast.clear()
               that.$emit('sendimage', res)
             })
           })
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 81ae1bc0d..fd6f15ae8 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -552,7 +552,8 @@ export default {
           birthday,
           sex,
           platformType: 'app',
-          productCode: item.productCode
+          productCode: item.productCode,
+          medical: JSON.parse(localStorage.getItem('saleInsuredPersonInfo')).medical
         })
         params.trialInfos.push(trialInfo)
       })

From 03d26d4f9691a97bd06fc4405a770656f7fe7e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 14 Nov 2019 17:22:41 +0800
Subject: [PATCH 13/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4bug=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuranceInformation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/sale/InsuranceInformation.vue b/src/views/ebiz/sale/InsuranceInformation.vue
index 911589562..23483fca6 100644
--- a/src/views/ebiz/sale/InsuranceInformation.vue
+++ b/src/views/ebiz/sale/InsuranceInformation.vue
@@ -290,7 +290,7 @@ export default {
             if (res.result == '0') {
               this.$toast.clear()
               console.log('````````````')
-              console.log('接口拉去成功：' + res.signDTO.policyUrl)
+              // console.log('接口拉去成功：' + res.signDTO.policyUrl)
               // window.localStorage.setItem('tips-PolicyUrl', res.signDTO.tipsPolicyUrl)
               // window.localStorage.setItem('insurance-policyUrl', res.signDTO.policyUrl)
               window.localStorage.setItem('detailJump', '')

From be09694a95bff13d45260c37aec81181dbd1fa1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 14 Nov 2019 17:37:41 +0800
Subject: [PATCH 14/39] =?UTF-8?q?=E7=94=B5=E6=8A=95=E7=A9=BA=E7=AD=BE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureOfElectronic.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 1e48c6af2..80f3925ca 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -162,7 +162,7 @@ export default {
       }, 1000)
     },
     // 获取签名状态
-     getOrderDetail() {
+    getOrderDetail() {
       let that = this
       let data = {
         orderNo: window.localStorage.getItem('orderNo')
@@ -363,7 +363,7 @@ export default {
             this.$toast.clear()
             window.localStorage.setItem('jumpFromSign', '1')
             if (this.isWeixin) {
-               // 跳回微信签名确认页是否提示签名完成
+              // 跳回微信签名确认页是否提示签名完成
               localStorage.setItem('weixinTip', '1')
               localStorage.removeItem('signInfo')
               this.$jump({
@@ -538,7 +538,7 @@ export default {
         }
       } else {
         if (this.isWeixin) {
-          this.toAirSign('2', '法定监护人', '0', '4')
+          this.toAirSign('2', '法定监护人', '10', '4')
         } else {
           console.log('被保人签名')
           EWebBridge.webCallAppInJs('ca_sign', {
@@ -613,9 +613,9 @@ export default {
               name: this.saleInsuredInfo.name,
               type: this.saleInsuredInfo.idType,
               originStatus: '4',
-              keyword: '申请日期',
+              keyword: '投保人签名',
               status: '0',
-              offset: '-130',
+              offset: '10',
               originUrl: location.href,
               commentKeyword: '认真', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
@@ -639,7 +639,7 @@ export default {
               originStatus: '4',
               keyword: '申请日期',
               status: '0',
-              offset: '-130',
+              offset: '-140',
               originUrl: location.href,
               commentKeyword: '认真', // 批注关键字
               commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字
@@ -758,7 +758,7 @@ export default {
       if (wxSigned) {
         console.log('第二次进入电子保单!')
         console.log('that222222222222', that)
-         this.getOrderDetail().then(() => {
+        this.getOrderDetail().then(() => {
           this.Time = true
           this.isOver = true
           this.radio = '1'

From 9681c3e577fdd4a164184042a5e55faba856f2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 11:22:46 +0800
Subject: [PATCH 15/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E5=8A=A8=20=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8D=E8=A6=81=E5=BC=B9=E6=A1=86=20?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=A9=BA=E7=AD=BE=E5=AE=8C=E6=88=90=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AttachmentManagement.vue  | 2 +-
 src/views/ebiz/sale/SignatureConfirmation.vue | 3 ++-
 src/views/ebiz/sale/SignatureOfElectronic.vue | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue
index 5a6a527f4..8dc8115ba 100644
--- a/src/views/ebiz/sale/AttachmentManagement.vue
+++ b/src/views/ebiz/sale/AttachmentManagement.vue
@@ -485,7 +485,7 @@ export default {
     //   that.fileListBankInsured = []
     // }
     // 保费超过20万的提示
-    Dialog.alert({ title: '提示', message: '趸交保费≥20万元或期交保费*总期数≥20万元时，须上传指定受益人证件正反面' })
+    // Dialog.alert({ title: '提示', message: '趸交保费≥20万元或期交保费*总期数≥20万元时，须上传指定受益人证件正反面' })
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 978de1b87..3eaee6d99 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -270,7 +270,8 @@ export default {
     async init() {
       if (this.isWeixin) {
         if (localStorage.weixinTip == '1') {
-          this.$toast('签名成功，请联系业务员进行后续流程！')
+          // this.$toast('签名成功，请联系业务员进行后续流程！')
+          Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
         }
         if (this.$route.query.airSign) {
           sessionStorage.setItem('airSign', this.$route.query.airSign)
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 80f3925ca..9dfb0b866 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -452,7 +452,7 @@ export default {
             }
           } else {
             if (this.isWeixin) {
-              this.toAirSign('1', '法定监护人', this.caOffset, '4')
+              this.toAirSign('0', '法定监护人', this.caOffset, '4')
             } else {
               console.log('投保人签名')
               EWebBridge.webCallAppInJs('ca_sign', {
@@ -538,7 +538,7 @@ export default {
         }
       } else {
         if (this.isWeixin) {
-          this.toAirSign('2', '法定监护人', '10', '4')
+          this.toAirSign('1', '法定监护人', '10', '4')
         } else {
           console.log('被保人签名')
           EWebBridge.webCallAppInJs('ca_sign', {
@@ -788,6 +788,7 @@ export default {
       }
     } else {
       this.timeOut()
+      this.getOrderDetail()
       if (this.detailJump != '1') {
         this.getOrderDetail()
       }

From 470dbeef02df09eb4a0e36c694c21382d1d6e376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 11:47:09 +0800
Subject: [PATCH 16/39] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=9E=E6=89=A7?=
 =?UTF-8?q?=E7=A9=BA=E7=AD=BE=E6=8B=8D=E7=85=A7=E9=97=AE=E9=A2=98=E5=92=8C?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E5=AE=8C=E6=88=90=E6=8F=90=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureConfirmation.vue | 2 +-
 src/views/ebiz/sale/SignatureOfElectronic.vue | 4 ----
 src/views/ebiz/serve/Detail.vue               | 3 ++-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 3eaee6d99..13b92621a 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -269,7 +269,7 @@ export default {
     // 初始化
     async init() {
       if (this.isWeixin) {
-        if (localStorage.weixinTip == '1') {
+        if (this.appntSignStatus == '3' || this.insuredSignStatus == '3') {
           // this.$toast('签名成功，请联系业务员进行后续流程！')
           Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
         }
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 9dfb0b866..54a9a79dc 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -292,8 +292,6 @@ export default {
             window.localStorage.setItem('jumpFromSign', '1')
             if (this.isWeixin) {
               localStorage.removeItem('signInfo')
-              // 跳回微信签名确认页是否提示签名完成
-              localStorage.setItem('weixinTip', '1')
               this.$jump({
                 flag: 'h5',
                 extra: {
@@ -363,8 +361,6 @@ export default {
             this.$toast.clear()
             window.localStorage.setItem('jumpFromSign', '1')
             if (this.isWeixin) {
-              // 跳回微信签名确认页是否提示签名完成
-              localStorage.setItem('weixinTip', '1')
               localStorage.removeItem('signInfo')
               this.$jump({
                 flag: 'h5',
diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index 96fbe6a0e..fafdad99e 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -212,7 +212,8 @@ export default {
           extra: {
             title: this.wxTitle,
             content: '国富人寿保单回执签收',
-            url: location.origin + '/#/serve/airSign?policyNo=' + localStorage.policyNo + '&token=' + localStorage.token,
+            url: location.origin + '/#/serve/airSign?policyNo=' + localStorage.policyNo + '&token=' + localStorage.token+
+            '&saleInsuredInfo=' + JSON.stringify(this.appntDTO),
             // url: 'http://47.96.143.111/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token,
             img: this.$assetsUrl + 'images/logo.png'
           }

From 3cfa066f73bc9ff3d27a44a97fb764823dfcf2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 12:25:16 +0800
Subject: [PATCH 17/39] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureConfirmation.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 13b92621a..1a4efc650 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -269,14 +269,9 @@ export default {
     // 初始化
     async init() {
       if (this.isWeixin) {
-        if (this.appntSignStatus == '3' || this.insuredSignStatus == '3') {
-          // this.$toast('签名成功，请联系业务员进行后续流程！')
-          Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
-        }
         if (this.$route.query.airSign) {
           sessionStorage.setItem('airSign', this.$route.query.airSign)
         }
-
         window.localStorage.setItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
         window.localStorage.setItem('saleInsuredPersonInfo', this.$route.query.saleInsuredPersonInfo)
         window.localStorage.setItem('token', this.$route.query.token)
@@ -303,7 +298,14 @@ export default {
         this.shareCode = sessionStorage.getItem('shareCode')
         this.relationToAppnt = this.$route.query.relationToAppnt
         this.isShow = false
-        await this.getOrderDetail()
+        this.getOrderDetail().then(()=> {
+          console.log('this.appntSignStatus',this.appntSignStatus)
+          console.log('this.appntSignStatus',this.appntSignStatus)
+          if (this.appntSignStatus == '3' || this.insuredSignStatus == '3') {
+            // this.$toast('签名成功，请联系业务员进行后续流程！')
+            Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
+          }
+        })
         if (this.shareCode == '1') {
           this.tipsName = this.saleInsuredPersonInfo.name
         } else {
@@ -651,6 +653,7 @@ export default {
           that.appntSign.map(item => {
             if (item.documentCode == '2') {
               that.appntSignStatus = item.documentStatus
+              
             }
           })
           that.insuredSign.map(item => {

From 92a5045bbeecabf71cd72af8d88cffeeeebaf054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 12:30:54 +0800
Subject: [PATCH 18/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AttachmentManagement.vue  |   2 +-
 src/views/ebiz/sale/SignatureConfirmation.vue | 104 +++++++++---------
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue
index 8dc8115ba..076449aee 100644
--- a/src/views/ebiz/sale/AttachmentManagement.vue
+++ b/src/views/ebiz/sale/AttachmentManagement.vue
@@ -274,7 +274,7 @@
 <script>
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import { Cell, CellGroup, Field, Uploader, RadioGroup, Radio, Dialog, Picker, Popup } from 'vant'
-import { uploadImg, saveInformation, getOrderDetail, check } from '@/api/ebiz/sale/sale'
+import { uploadImg, saveInformation, getOrderDetail } from '@/api/ebiz/sale/sale'
 import config from '@/config'
 export default {
   data() {
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 1a4efc650..839bbffa5 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -298,9 +298,9 @@ export default {
         this.shareCode = sessionStorage.getItem('shareCode')
         this.relationToAppnt = this.$route.query.relationToAppnt
         this.isShow = false
-        this.getOrderDetail().then(()=> {
-          console.log('this.appntSignStatus',this.appntSignStatus)
-          console.log('this.appntSignStatus',this.appntSignStatus)
+        this.getOrderDetail().then(() => {
+          console.log('this.appntSignStatus', this.appntSignStatus)
+          console.log('this.appntSignStatus', this.appntSignStatus)
           if (this.appntSignStatus == '3' || this.insuredSignStatus == '3') {
             // this.$toast('签名成功，请联系业务员进行后续流程！')
             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
@@ -612,56 +612,58 @@ export default {
       let data = {
         orderNo: window.localStorage.getItem('orderNo')
       }
-      getOrderDetail(data).then(res => {
-        if (res.result == '0') {
-          this.$toast.clear()
-          this.$utils.intLocalStorage(res)
-          // 获取被保人信息recmd
-          this.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo'))
-          // 获取投保人信息
-          this.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo'))
-          this.relationToAppnt = this.saleInsuredPersonInfo.relationToAppnt //将缓存中的与被保人关系赋值给页面
-          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)
-          // nsuredDTOs[0].riskDTOLst
-          if (this.relationToAppnt != '1') {
-            this.activeNames.push(res.orderDTO.insuredDTOs.length + 1)
-          } else {
-            this.activeNames.push('1')
-          }
-          that.appnt = res.orderDTO.appntDTO
-          that.date = res.orderDTO.orderInfoDTO.appntDateLabel
-          res.orderDTO.ebizSignDTOS.map(item => {
-            if (item.signType == '0') {
-              that.appntSign.push(item) //投保
-              that.addKey(item)
-            } else if (item.signType == '1') {
-              that.insuredSign.push(item) //被保
+      return new Promise((resolve, reject) => {
+        getOrderDetail(data).then(res => {
+          if (res.result == '0') {
+            this.$toast.clear()
+            this.$utils.intLocalStorage(res)
+            // 获取被保人信息recmd
+            this.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo'))
+            // 获取投保人信息
+            this.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo'))
+            this.relationToAppnt = this.saleInsuredPersonInfo.relationToAppnt //将缓存中的与被保人关系赋值给页面
+            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)
+            // nsuredDTOs[0].riskDTOLst
+            if (this.relationToAppnt != '1') {
+              this.activeNames.push(res.orderDTO.insuredDTOs.length + 1)
             } else {
-              that.appntSign.push(item) //本人
-              that.addKey(item)
+              this.activeNames.push('1')
             }
-          })
-          //将投保人数组排序
-          that.appntSign.sort(function(a, b) {
-            return a.key - b.key
-          })
-          //获取投保和被保人电子投保单签字状态
-          that.appntSign.map(item => {
-            if (item.documentCode == '2') {
-              that.appntSignStatus = item.documentStatus
-              
-            }
-          })
-          that.insuredSign.map(item => {
-            if (item.documentCode == '2') {
-              that.insuredSignStatus = item.documentStatus
-            }
-          })
-        }
+            that.appnt = res.orderDTO.appntDTO
+            that.date = res.orderDTO.orderInfoDTO.appntDateLabel
+            res.orderDTO.ebizSignDTOS.map(item => {
+              if (item.signType == '0') {
+                that.appntSign.push(item) //投保
+                that.addKey(item)
+              } else if (item.signType == '1') {
+                that.insuredSign.push(item) //被保
+              } else {
+                that.appntSign.push(item) //本人
+                that.addKey(item)
+              }
+            })
+            //将投保人数组排序
+            that.appntSign.sort(function(a, b) {
+              return a.key - b.key
+            })
+            //获取投保和被保人电子投保单签字状态
+            that.appntSign.map(item => {
+              if (item.documentCode == '2') {
+                that.appntSignStatus = item.documentStatus
+              }
+            })
+            that.insuredSign.map(item => {
+              if (item.documentCode == '2') {
+                that.insuredSignStatus = item.documentStatus
+              }
+            })
+            resolve('success')
+          }
+        })
       })
     },
     //自定义key值排序用

From 0dc7aaf85c744daee66043fe84d238420dab8356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 13:55:08 +0800
Subject: [PATCH 19/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E9=A1=B5=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureConfirmation.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 839bbffa5..031c653e1 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -301,9 +301,11 @@ export default {
         this.getOrderDetail().then(() => {
           console.log('this.appntSignStatus', this.appntSignStatus)
           console.log('this.appntSignStatus', this.appntSignStatus)
-          if (this.appntSignStatus == '3' || this.insuredSignStatus == '3') {
+          if (this.appntSignStatus == '3' && this.shareCode == '0') {
             // this.$toast('签名成功，请联系业务员进行后续流程！')
             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
+          } else if (this.insuredSignStatus == '3' && this.shareCode == '1') {
+             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
           }
         })
         if (this.shareCode == '1') {

From e50b14a8df7409e781e236ccda4d466d60ab8a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 14:06:51 +0800
Subject: [PATCH 20/39] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/serve/Detail.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index fafdad99e..b1823ae26 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -151,6 +151,7 @@ export default {
           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 => {
@@ -212,8 +213,14 @@ export default {
           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=' +
+               localStorage.saleInsuredInfo,
             // url: 'http://47.96.143.111/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token,
             img: this.$assetsUrl + 'images/logo.png'
           }

From 1ac73b43fa59f90920a261b5fa12bfc2f20801b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 14:23:17 +0800
Subject: [PATCH 21/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/serve/Detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index b1823ae26..521252990 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -220,7 +220,7 @@ export default {
               '&token=' +
               localStorage.token +
               '&saleInsuredInfo=' +
-               localStorage.saleInsuredInfo,
+              encodeURI(localStorage.saleInsuredInfo),
             // url: 'http://47.96.143.111/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token,
             img: this.$assetsUrl + 'images/logo.png'
           }

From bd0701fda30d0ffec73117bd54d57b13f1d26fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 14:37:17 +0800
Subject: [PATCH 22/39] =?UTF-8?q?=E5=9B=9E=E6=89=A7=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/serve/Detail.vue | 145 +++++++++++++++++---------------
 1 file changed, 75 insertions(+), 70 deletions(-)

diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index 521252990..a7599c51d 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -116,9 +116,11 @@ export default {
         ]
       })
     }, 1000)
-    window['appCallBack'] = this.appCallBack
+
     // 获取保单详情
-    this.getPolicyDetail()
+    this.getPolicyDetail().then(() => {
+      window['appCallBack'] = this.appCallBack
+    })
   },
   components: {
     [Collapse.name]: Collapse,
@@ -134,80 +136,83 @@ export default {
       let data = {
         policyNo: window.localStorage.getItem('policyNo')
       }
-      getPolicyDetail(data).then(res => {
-        if (res.result == '0') {
-          let appntDTO = res.content.appntDTO
-          let orderInfoDTO = res.content.orderInfoDTO
-          // 保单信息
-          if (orderInfoDTO.orderStatus == '0') {
-            orderInfoDTO.orderStatusText = '未签收'
-          } else if (orderInfoDTO.orderStatus == '1') {
-            orderInfoDTO.orderStatusText = '已签收'
-          } else {
-            orderInfoDTO.orderStatusText = ''
-          }
-          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 => {
-              Number(risk.payIntv)
-              switch (risk.payIntv) {
-                case -1:
-                  risk.payIntv = '不定期交'
-                  break
-                case 0:
-                  risk.payIntv = '一次交清'
-                  break
-                case 1:
-                  risk.payIntv = '月交'
-                  break
-                case 3:
-                  risk.payIntv = '季交'
-                  break
-                case 6:
-                  risk.payIntv = '半年交'
-                  break
-                case 12:
-                  risk.payIntv = '年交'
-                  break
-              }
-              if (risk.insuYear == '70') {
-                risk.insuYear = '至70周岁'
-              } else if (risk.insuYear == '75') {
-                risk.insuYear = '至75周岁'
-              } else if (risk.insuYear == '80') {
-                risk.insuYear = '至80周岁'
-              } else if (risk.insuYear == '106') {
-                risk.insuYear = '终身'
-              } else {
-                risk.insuYear = `${risk.insuYear}年`
-              }
+      return new Promise((resolve, reject) => {
+        getPolicyDetail(data).then(res => {
+          if (res.result == '0') {
+            let appntDTO = res.content.appntDTO
+            let orderInfoDTO = res.content.orderInfoDTO
+            // 保单信息
+            if (orderInfoDTO.orderStatus == '0') {
+              orderInfoDTO.orderStatusText = '未签收'
+            } else if (orderInfoDTO.orderStatus == '1') {
+              orderInfoDTO.orderStatusText = '已签收'
+            } else {
+              orderInfoDTO.orderStatusText = ''
+            }
+            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 => {
+                Number(risk.payIntv)
+                switch (risk.payIntv) {
+                  case -1:
+                    risk.payIntv = '不定期交'
+                    break
+                  case 0:
+                    risk.payIntv = '一次交清'
+                    break
+                  case 1:
+                    risk.payIntv = '月交'
+                    break
+                  case 3:
+                    risk.payIntv = '季交'
+                    break
+                  case 6:
+                    risk.payIntv = '半年交'
+                    break
+                  case 12:
+                    risk.payIntv = '年交'
+                    break
+                }
+                if (risk.insuYear == '70') {
+                  risk.insuYear = '至70周岁'
+                } else if (risk.insuYear == '75') {
+                  risk.insuYear = '至75周岁'
+                } else if (risk.insuYear == '80') {
+                  risk.insuYear = '至80周岁'
+                } else if (risk.insuYear == '106') {
+                  risk.insuYear = '终身'
+                } else {
+                  risk.insuYear = `${risk.insuYear}年`
+                }
+              })
+              this.filterData(dataDictionary.sex, 'sex', insured)
+              this.filterData(dataDictionary.idType, 'idType', insured)
+              this.filterData(dataDictionary.relationToAppnt, 'relation', insured)
+              insured.bnfDTOs.map(bnf => {
+                this.filterData(dataDictionary.bnfType, 'bnfType', bnf)
+                this.filterData(dataDictionary.sex, 'sex', bnf)
+                this.filterData(dataDictionary.idType, 'idType', bnf)
+                this.filterData(dataDictionary.relationToAppnt, 'relation', bnf)
+              })
             })
-            this.filterData(dataDictionary.sex, 'sex', insured)
-            this.filterData(dataDictionary.idType, 'idType', insured)
-            this.filterData(dataDictionary.relationToAppnt, 'relation', insured)
-            insured.bnfDTOs.map(bnf => {
-              this.filterData(dataDictionary.bnfType, 'bnfType', bnf)
-              this.filterData(dataDictionary.sex, 'sex', bnf)
-              this.filterData(dataDictionary.idType, 'idType', bnf)
-              this.filterData(dataDictionary.relationToAppnt, 'relation', bnf)
-            })
-          })
 
-          that.insuredDTOs = res.content.insuredDTOs
-          this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst)
-        } else {
-          this.$toast(res.resultMessage)
-        }
+            that.insuredDTOs = res.content.insuredDTOs
+            this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst)
+          } else {
+            this.$toast(res.resultMessage)
+          }
+        })
       })
     },
     appCallBack(data) {
       if (data.trigger == 'right_button_click') {
+        console.log(localStorage.saleInsuredInfo)
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
           extra: {

From a806f546ae09530e4fbc64e539d0000bba227364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 14:42:33 +0800
Subject: [PATCH 23/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/serve/Detail.vue | 143 ++++++++++++++++----------------
 1 file changed, 70 insertions(+), 73 deletions(-)

diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index a7599c51d..dc690ca14 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -116,11 +116,9 @@ export default {
         ]
       })
     }, 1000)
-
+    window['appCallBack'] = this.appCallBack
     // 获取保单详情
-    this.getPolicyDetail().then(() => {
-      window['appCallBack'] = this.appCallBack
-    })
+    this.getPolicyDetail()
   },
   components: {
     [Collapse.name]: Collapse,
@@ -136,78 +134,77 @@ export default {
       let data = {
         policyNo: window.localStorage.getItem('policyNo')
       }
-      return new Promise((resolve, reject) => {
-        getPolicyDetail(data).then(res => {
-          if (res.result == '0') {
-            let appntDTO = res.content.appntDTO
-            let orderInfoDTO = res.content.orderInfoDTO
-            // 保单信息
-            if (orderInfoDTO.orderStatus == '0') {
-              orderInfoDTO.orderStatusText = '未签收'
-            } else if (orderInfoDTO.orderStatus == '1') {
-              orderInfoDTO.orderStatusText = '已签收'
-            } else {
-              orderInfoDTO.orderStatusText = ''
-            }
-            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 => {
-                Number(risk.payIntv)
-                switch (risk.payIntv) {
-                  case -1:
-                    risk.payIntv = '不定期交'
-                    break
-                  case 0:
-                    risk.payIntv = '一次交清'
-                    break
-                  case 1:
-                    risk.payIntv = '月交'
-                    break
-                  case 3:
-                    risk.payIntv = '季交'
-                    break
-                  case 6:
-                    risk.payIntv = '半年交'
-                    break
-                  case 12:
-                    risk.payIntv = '年交'
-                    break
-                }
-                if (risk.insuYear == '70') {
-                  risk.insuYear = '至70周岁'
-                } else if (risk.insuYear == '75') {
-                  risk.insuYear = '至75周岁'
-                } else if (risk.insuYear == '80') {
-                  risk.insuYear = '至80周岁'
-                } else if (risk.insuYear == '106') {
-                  risk.insuYear = '终身'
-                } else {
-                  risk.insuYear = `${risk.insuYear}年`
-                }
-              })
-              this.filterData(dataDictionary.sex, 'sex', insured)
-              this.filterData(dataDictionary.idType, 'idType', insured)
-              this.filterData(dataDictionary.relationToAppnt, 'relation', insured)
-              insured.bnfDTOs.map(bnf => {
-                this.filterData(dataDictionary.bnfType, 'bnfType', bnf)
-                this.filterData(dataDictionary.sex, 'sex', bnf)
-                this.filterData(dataDictionary.idType, 'idType', bnf)
-                this.filterData(dataDictionary.relationToAppnt, 'relation', bnf)
-              })
-            })
 
-            that.insuredDTOs = res.content.insuredDTOs
-            this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst)
+      getPolicyDetail(data).then(res => {
+        if (res.result == '0') {
+          let appntDTO = res.content.appntDTO
+          let orderInfoDTO = res.content.orderInfoDTO
+          // 保单信息
+          if (orderInfoDTO.orderStatus == '0') {
+            orderInfoDTO.orderStatusText = '未签收'
+          } else if (orderInfoDTO.orderStatus == '1') {
+            orderInfoDTO.orderStatusText = '已签收'
           } else {
-            this.$toast(res.resultMessage)
+            orderInfoDTO.orderStatusText = ''
           }
-        })
+          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 => {
+              Number(risk.payIntv)
+              switch (risk.payIntv) {
+                case -1:
+                  risk.payIntv = '不定期交'
+                  break
+                case 0:
+                  risk.payIntv = '一次交清'
+                  break
+                case 1:
+                  risk.payIntv = '月交'
+                  break
+                case 3:
+                  risk.payIntv = '季交'
+                  break
+                case 6:
+                  risk.payIntv = '半年交'
+                  break
+                case 12:
+                  risk.payIntv = '年交'
+                  break
+              }
+              if (risk.insuYear == '70') {
+                risk.insuYear = '至70周岁'
+              } else if (risk.insuYear == '75') {
+                risk.insuYear = '至75周岁'
+              } else if (risk.insuYear == '80') {
+                risk.insuYear = '至80周岁'
+              } else if (risk.insuYear == '106') {
+                risk.insuYear = '终身'
+              } else {
+                risk.insuYear = `${risk.insuYear}年`
+              }
+            })
+            this.filterData(dataDictionary.sex, 'sex', insured)
+            this.filterData(dataDictionary.idType, 'idType', insured)
+            this.filterData(dataDictionary.relationToAppnt, 'relation', insured)
+            insured.bnfDTOs.map(bnf => {
+              this.filterData(dataDictionary.bnfType, 'bnfType', bnf)
+              this.filterData(dataDictionary.sex, 'sex', bnf)
+              this.filterData(dataDictionary.idType, 'idType', bnf)
+              this.filterData(dataDictionary.relationToAppnt, 'relation', bnf)
+            })
+          })
+
+          that.insuredDTOs = res.content.insuredDTOs
+          this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst)
+        } else {
+          this.$toast(res.resultMessage)
+        }
       })
     },
     appCallBack(data) {

From 8fb4c921d78638cc68ec9426577b44265d606899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 15:00:47 +0800
Subject: [PATCH 24/39] =?UTF-8?q?=E5=9B=9E=E6=89=A7=E7=A9=BA=E7=AD=BE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/serve/AirSign.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/ebiz/serve/AirSign.vue b/src/views/ebiz/serve/AirSign.vue
index e5f997ec6..d0e9f0872 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,

From b6d3142ef535db5b754d38f4afbff2d98eba14e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 17:19:04 +0800
Subject: [PATCH 25/39] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=9E=E6=89=A7?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6pdf=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureOfElectronic.vue | 152 +++++++++++-------
 1 file changed, 95 insertions(+), 57 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 54a9a79dc..d401b9519 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -172,7 +172,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
@@ -718,74 +722,108 @@ 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')).relationToAppnts
+        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()
+        // 在微信而且是回执签收
+        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.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 {
-      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 {
+        //  不在微信但是在回执签收
+        this.timeOut()
         this.getOrderDetail()
       }
     }

From d4d775b8b044325156f566c8a1db46c176653c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 17:40:11 +0800
Subject: [PATCH 26/39] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureOfElectronic.vue | 44 ++++++++-----------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index d401b9519..3aa6b48df 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -421,12 +421,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,
@@ -451,9 +456,11 @@ export default {
               })
             }
           } else {
+            // 微信投保人不是回执签收且投被不同人
             if (this.isWeixin) {
               this.toAirSign('0', '法定监护人', this.caOffset, '4')
             } else {
+              // 不在微信投保人不是回执签收且投被不同人
               console.log('投保人签名')
               EWebBridge.webCallAppInJs('ca_sign', {
                 //身份证号码
@@ -509,9 +516,11 @@ export default {
               that.saleInsuredInfo.idType = '9'
               break
           }
+          // 微信投保人且是回执签收
           if (this.isWeixin) {
             this.toAirSign('1', '投保人签字', '-150', '4')
           } else {
+            // 不是微信投保人且是回执签收
             EWebBridge.webCallAppInJs('ca_sign', {
               //身份证号码
               number: that.saleInsuredInfo.idNo,
@@ -537,9 +546,11 @@ export default {
           }
         }
       } else {
+        // 在微信被保人
         if (this.isWeixin) {
           this.toAirSign('1', '法定监护人', '10', '4')
         } else {
+          // 不在微信被保人
           console.log('被保人签名')
           EWebBridge.webCallAppInJs('ca_sign', {
             //身份证号码
@@ -582,29 +593,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',
@@ -630,6 +621,7 @@ export default {
           )
           window.location.href = this.$mainUrl + '/chaolu/index.html'
         } else {
+          // 在微信且投被同人
           localStorage.setItem(
             'signInfo',
             JSON.stringify({
@@ -655,6 +647,7 @@ export default {
           window.location.href = this.$mainUrl + '/chaolu/index.html'
         }
       } else {
+        // 不在微信且投被不同人
         if (this.relationToAppnt != '1') {
           EWebBridge.webCallAppInJs('ca_sign', {
             //身份证号码
@@ -684,6 +677,7 @@ export default {
             }
           })
         } else {
+          // 不在微信且投被同人
           EWebBridge.webCallAppInJs('ca_sign', {
             //身份证号码
             number: this.saleInsuredInfo.idNo,
@@ -733,7 +727,7 @@ export default {
     if (this.isWeixin) {
       // 在微信且不是回执签收
       if (this.detailJump != '1') {
-        that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnts
+        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'))
@@ -796,7 +790,7 @@ export default {
               console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
               this.isSign = false
               this.isDisabledComplite = false
-              // this.isDisable = false
+              this.isSubmit = false
             } else {
               this.$set(this.insuredSign, 'documentStatus', '3')
               // this.insuredSign.documentStatus = '3'

From 1ebb8e4c2c51f0a0d60913be8e34065db934c441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 17:48:27 +0800
Subject: [PATCH 27/39] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=9E=E6=89=A7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureOfElectronic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 3aa6b48df..f72c0a5b7 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -518,7 +518,7 @@ export default {
           }
           // 微信投保人且是回执签收
           if (this.isWeixin) {
-            this.toAirSign('1', '投保人签字', '-150', '4')
+            this.toAirSign('0', '投保人签字', '-150', '4')
           } else {
             // 不是微信投保人且是回执签收
             EWebBridge.webCallAppInJs('ca_sign', {

From cee2f85afb3aeecb6e883ed90e9f32b548223903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Fri, 15 Nov 2019 17:56:32 +0800
Subject: [PATCH 28/39] =?UTF-8?q?=E5=9B=9E=E6=89=A7=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureOfElectronic.vue | 2 +-
 src/views/ebiz/serve/Detail.vue               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index f72c0a5b7..1f3343061 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -518,7 +518,7 @@ export default {
           }
           // 微信投保人且是回执签收
           if (this.isWeixin) {
-            this.toAirSign('0', '投保人签字', '-150', '4')
+            this.toAirSign('0', '投保人签字', '0', '4')
           } else {
             // 不是微信投保人且是回执签收
             EWebBridge.webCallAppInJs('ca_sign', {
diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index dc690ca14..771b3a513 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -147,6 +147,8 @@ export default {
           } else {
             orderInfoDTO.orderStatusText = ''
           }
+          // 测试用
+          orderInfoDTO.orderStatus = '0'
           that.OrderInfoDTO = orderInfoDTO
           // 投保人信息
           this.filterData(dataDictionary.sex, 'sex', appntDTO)

From db820d3c7456f28ce96a6a33c475a2ba71a37aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Mon, 18 Nov 2019 10:29:54 +0800
Subject: [PATCH 29/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9B=9E=E6=89=A7title?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/serve/AirSign.vue | 3 ++-
 src/views/ebiz/serve/Detail.vue  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/serve/AirSign.vue b/src/views/ebiz/serve/AirSign.vue
index d0e9f0872..c13cc2857 100644
--- a/src/views/ebiz/serve/AirSign.vue
+++ b/src/views/ebiz/serve/AirSign.vue
@@ -190,7 +190,8 @@ export default {
             flag: 'h5',
             extra: {
               url: location.origin + '/#/sale/signatureOfElectronic',
-              forbidSwipeBack: '1'
+              forbidSwipeBack: '1',
+              title: '保险合同签收回执电子确认书签名'
             },
             routerInfo: {
               path: '/sale/signatureOfElectronic'
diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index 771b3a513..48e346cb0 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -268,7 +268,8 @@ export default {
                 flag: 'h5',
                 extra: {
                   url: location.origin + '/#/sale/signatureOfElectronic',
-                  forbidSwipeBack: '1'
+                  forbidSwipeBack: '1',
+                  title: '保险合同签收回执电子确认书签名'
                 },
                 routerInfo: {
                   path: '/sale/signatureOfElectronic'

From e5b62168b92a88652e2c1b09de5f376ff997cc0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Mon, 18 Nov 2019 10:46:12 +0800
Subject: [PATCH 30/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4title=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureOfElectronic.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 1f3343061..06555f17b 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -767,6 +767,7 @@ export default {
         }
       } else {
         // 在微信而且是回执签收
+        document.title = '保险合同签收回执电子确认书签名'
         let imgBase64Data = sessionStorage.getItem('imgBase64Data')
         let wxSigned = sessionStorage.getItem('wxSigned')
         let signInfo = JSON.parse(localStorage.getItem('signInfo'))
@@ -817,6 +818,7 @@ export default {
         this.getOrderDetail()
       } else {
         //  不在微信但是在回执签收
+        document.title = '保险合同签收回执电子确认书签名'
         this.timeOut()
         this.getOrderDetail()
       }

From 783e516a51efc813d89d87d8bd2b89966b74900b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Mon, 18 Nov 2019 16:04:09 +0800
Subject: [PATCH 31/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=A6=8F=E5=AE=9D?=
 =?UTF-8?q?=E5=AE=9D=E4=BA=A7=E5=93=81=E6=A0=A1=E9=AA=8C=E8=81=8C=E4=B8=9A?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=92=8C=E9=99=A9=E7=A7=8D=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue |  2 +-
 src/views/ebiz/common/MainRiskList.vue     |  5 +++++
 src/views/ebiz/common/risk-rules.js        | 21 ++++++++++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index fd6f15ae8..822e60039 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -514,7 +514,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]
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 1b301a35d..7ab6a6665 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -114,6 +114,11 @@ export default {
         if (riskRules.lifeGradeLimit(resultData, this)) {
           return
         }
+        if (resultData.productCode == 'GFRS_M0006') {
+          if (riskRules.lifeGradeLimitForBaby(resultData, this)) {
+            return
+          }
+        }
         /********end 主险选择限制 end******/
 
         //保存附加险
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

From 64be726754cbf34a5cec893da7e479d2dad49a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Mon, 18 Nov 2019 17:06:41 +0800
Subject: [PATCH 32/39] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6=E5=B9=B4?=
 =?UTF-8?q?=E9=BE=84=E6=8F=90=E7=A4=BA=E6=A0=A1=E9=AA=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E5=B0=8F=E4=BA=8E18=E5=B2=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/validator.js  | 6 +++---
 src/views/ebiz/proposal/Appnt.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js
index 8f532603d..ad172ca7f 100644
--- a/src/assets/js/utils/validator.js
+++ b/src/assets/js/utils/validator.js
@@ -58,11 +58,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)
   }
 })
 
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,

From 9e551243b119a950c1e45e52a05f8f2e79827ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Tue, 19 Nov 2019 09:56:06 +0800
Subject: [PATCH 33/39] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AttachmentManagement.vue | 30 ++------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

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') {

From ad3b90b79f4dbf6e5caafc68cb98c1db4e91fa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Tue, 19 Nov 2019 16:42:54 +0800
Subject: [PATCH 34/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E6=98=9F=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AddBeneficiaryInfo.vue | 18 +++++++--
 src/views/ebiz/sale/InsuredInfo.vue        | 44 ++++++++++++++++------
 src/views/ebiz/sale/InsuredPerson.vue      | 38 ++++++++++++++++---
 3 files changed, 80 insertions(+), 20 deletions(-)

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/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 3ab5c75d4..f79d61333 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="证件号码" 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'"
@@ -128,6 +137,7 @@
           :required="false"
           label="有无社保"
           name="有无社保"
+          required
           :value.sync="userInfo.medical"
         ></select-radio>
         <van-field
@@ -135,6 +145,7 @@
           readonly
           label="税收居民身份"
           name="税收居民身份"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
@@ -149,6 +160,7 @@
           clearable
           label="职业类别"
           name="职业类别"
+          required
           v-validate="'required'"
           placeholder="请选择"
           :parentShowPicker.sync="occupationShowPicker"
@@ -160,6 +172,7 @@
           readonly
           label="收入来源"
           name="收入来源"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
@@ -169,6 +182,7 @@
           v-show="isShowOthenSalarySource"
           v-model="userInfo.otherSalarySource"
           label
+          required
           name="其他来源"
           placeholder="请输入其它收入来源"
           clearable
@@ -178,12 +192,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 +207,7 @@
         <van-field
           :value="userInfo.jobStatus | idToText('workCondition')"
           readonly
+          required
           label="在职情况"
           name="在职情况"
           placeholder="请选择"
@@ -199,23 +215,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 +241,7 @@
         <van-field
           :value="userInfo.marriage | idToText('marriage')"
           readonly
+          required
           label="婚姻状况"
           name="婚姻状况"
           right-icon="arrow"
@@ -235,6 +253,7 @@
           v-model="userInfo.familyAnnualIncome"
           label="家庭年收入（万元）"
           name="家庭年收入"
+          required
           placeholder="请输入"
           v-validate="'required|onlyNumber'"
           clearable
@@ -245,17 +264,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) {

From 84be1b2dbc3caa6e38b5121660d174a3f187b729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 21 Nov 2019 10:01:51 +0800
Subject: [PATCH 35/39] =?UTF-8?q?=E6=9B=B4=E6=94=B9dev=E7=8E=AF=E5=A2=83bu?=
 =?UTF-8?q?g=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/validator.js              |  8 ++++---
 src/views/ebiz/sale/SignatureConfirmation.vue | 13 +++++++----
 src/views/ebiz/sale/SignatureOfElectronic.vue | 23 ++++++++++++++-----
 src/views/ebiz/serve/Detail.vue               |  2 +-
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js
index ad172ca7f..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'
 
@@ -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/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 031c653e1..258513cd1 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.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" />
@@ -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'
@@ -305,13 +308,13 @@ export default {
             // this.$toast('签名成功，请联系业务员进行后续流程！')
             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
           } else if (this.insuredSignStatus == '3' && this.shareCode == '1') {
-             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
+            Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
           }
         })
         if (this.shareCode == '1') {
-          this.tipsName = this.saleInsuredPersonInfo.name
+          this.tipsName = localStorage.saleInsuredPersonInfo.name
         } else {
-          this.tipsName = this.saleInsuredInfo.name
+          this.tipsName = localStorage.saleInsuredInfo.name
         }
         weixinShare({
           title: '国富人寿计划书',
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 06555f17b..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: {
@@ -826,8 +834,8 @@ export default {
   },
   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: {
@@ -858,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/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index 48e346cb0..5117b5d98 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -148,7 +148,7 @@ export default {
             orderInfoDTO.orderStatusText = ''
           }
           // 测试用
-          orderInfoDTO.orderStatus = '0'
+          // orderInfoDTO.orderStatus = '0'
           that.OrderInfoDTO = orderInfoDTO
           // 投保人信息
           this.filterData(dataDictionary.sex, 'sex', appntDTO)

From b4c69e36ebba8acb834042ec2c23c42329811a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 21 Nov 2019 10:57:00 +0800
Subject: [PATCH 36/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js        | 394 ++++++++++++++----
 src/views/ebiz/proposal/Exhibition.vue        |   8 +
 src/views/ebiz/sale/InsuredInfo.vue           |   2 +-
 src/views/ebiz/sale/SignatureConfirmation.vue |   6 +-
 4 files changed, 335 insertions(+), 75 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index a7997fe6d..13714bfea 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'
     }
   ],
   // 收入来源
@@ -745,79 +785,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/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/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index f79d61333..612884255 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -26,7 +26,7 @@
         @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" required 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
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 258513cd1..d7bf544a2 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -298,7 +298,7 @@ export default {
           this.isInvalid = true
         }
         this.airSign = sessionStorage.getItem('airSign')
-        this.shareCode = sessionStorage.getItem('shareCode')
+        // this.shareCode = sessionStorage.getItem('shareCode')
         this.relationToAppnt = this.$route.query.relationToAppnt
         this.isShow = false
         this.getOrderDetail().then(() => {
@@ -311,9 +311,11 @@ export default {
             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
           }
         })
-        if (this.shareCode == '1') {
+        if (sessionStorage.shareCode == '1') {
+          console.log('进来投保人')
           this.tipsName = localStorage.saleInsuredPersonInfo.name
         } else {
+          console.log('进来被保人')
           this.tipsName = localStorage.saleInsuredInfo.name
         }
         weixinShare({

From 33c682b93add6acccd598311ec3fc22d1b9a5ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 21 Nov 2019 11:08:21 +0800
Subject: [PATCH 37/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureConfirmation.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index d7bf544a2..c7a0613c7 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -4,7 +4,7 @@
       <div v-if="isWeixin" class="bg-white mt10 p20 fs14 tips">
         <p>
           尊敬的
-          <span class="red">{{ tipsName }}</span
+          <span>{{ tipsName }}</span
           >先生/女士，您好！
         </p>
         <p>该保单由国富人寿保险股份有限公司进行承保，具体确认信息如下：</p>
@@ -312,11 +312,12 @@ export default {
           }
         })
         if (sessionStorage.shareCode == '1') {
-          console.log('进来投保人')
+          console.log('进来被保人')
           this.tipsName = localStorage.saleInsuredPersonInfo.name
         } else {
-          console.log('进来被保人')
+          console.log('进来投保人')
           this.tipsName = localStorage.saleInsuredInfo.name
+          console.log('this.tipName',this.tipsName)
         }
         weixinShare({
           title: '国富人寿计划书',

From 7488e72c86782b4d30ef0a00e2a00d10ad11fea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 21 Nov 2019 11:16:26 +0800
Subject: [PATCH 38/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureConfirmation.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index c7a0613c7..02f484ecf 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -62,7 +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">
@@ -302,8 +302,8 @@ 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)
+          // console.log('this.appntSignStatus', this.appntSignStatus)
+          // console.log('this.appntSignStatus', this.appntSignStatus)
           if (this.appntSignStatus == '3' && this.shareCode == '0') {
             // this.$toast('签名成功，请联系业务员进行后续流程！')
             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
@@ -317,7 +317,9 @@ export default {
         } else {
           console.log('进来投保人')
           this.tipsName = localStorage.saleInsuredInfo.name
-          console.log('this.tipName',this.tipsName)
+          console.log('localStorage.saleInsuredInfo', localStorage.saleInsuredInfo)
+          console.log('localStorage.saleInsuredInfo.name', localStorage.saleInsuredInfo.name)
+          console.log('this.tipName', this.tipsName)
         }
         weixinShare({
           title: '国富人寿计划书',

From f13fbd9b7d6f3eecc979717f3395029940425886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 21 Nov 2019 11:21:34 +0800
Subject: [PATCH 39/39] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E7=A1=AE=E8=AE=A4=E9=A1=B5=E5=90=8D=E5=AD=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureConfirmation.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 02f484ecf..3e3bf6eef 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -313,13 +313,13 @@ export default {
         })
         if (sessionStorage.shareCode == '1') {
           console.log('进来被保人')
-          this.tipsName = localStorage.saleInsuredPersonInfo.name
+          this.tipsName = JSON.parse(localStorage.saleInsuredPersonInfo).name
         } else {
           console.log('进来投保人')
-          this.tipsName = localStorage.saleInsuredInfo.name
-          console.log('localStorage.saleInsuredInfo', localStorage.saleInsuredInfo)
-          console.log('localStorage.saleInsuredInfo.name', localStorage.saleInsuredInfo.name)
-          console.log('this.tipName', this.tipsName)
+          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: '国富人寿计划书',