Merge branch 'devRs' into dev

# Conflicts:
#	src/views/ebiz/agentEenter/Guarantee.vue

src/views/ebiz/agentEenter/AgentEnterGuarantor.vue

@@ -73,15 +73,15 @@ export default {
       pickerType: '',
       columns: [],
       userInfo: {
-          relation: '',
-          type: '',
-          name: '',
-          sex: '',
-          idNo: '',
-          company: '',
-          homeAdress: '',
-          mobile: ''
-        },
+        relation: '',
+        type: '',
+        name: '',
+        sex: '',
+        idNo: '',
+        company: '',
+        homeAdress: '',
+        mobile: ''
+      },
       sexRadio: [
         {
           label: '男',
@@ -132,6 +132,8 @@ export default {
       agentAll(data).then(res => {
         that.$toast.clear()
         that.userInfo = res.content.ebizGuarantorDto
+        localStorage.idNoD = res.content.ebizGuarantorDto.idNo
+        localStorage.idNameD = res.content.ebizGuarantorDto.name
       })
     },
     toSelect(pickerType, index, valueKey) {
@@ -183,6 +185,9 @@ export default {
       saveOrUpdateInfo(params).then(res => {
         that.$toast.clear()
         if (res.result == '0') {
+          console.log('res', res)
+          localStorage.idNoD = this.userInfo.idNo
+          localStorage.idNameD = this.userInfo.name
           this.$jump({
             flag: 'h5',
             extra: {

src/views/ebiz/agentEenter/Guarantee.vue

@@ -10,6 +10,10 @@
           <span class="blue">《担保书》</span>
         </van-radio>
       </van-radio-group>
+      <div class="pl30 pb15">
+        担保人签字：
+        <van-button type="danger" @click="signD" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signStateD == '0' ? '签名' : '已签名' }}</van-button>
+      </div>
       <div class="pl30 pb15">
         本人签字：
         <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
@@ -46,10 +50,13 @@ export default {
       agentInfo: {},
       // 推荐人签名信息
       appntSign: {
-        signState: '0'
+        signState: '0',
+        signStateD:'0'
       },
       //原生返回的加密包
-      base64: ''
+      base64: '',
+      //担保人原生返回的加密包
+      base64D:''
     }
   },
   components: {
@@ -137,7 +144,7 @@ export default {
         name: localStorage.idName,
         //身份证号码id
         type: '1',
-        keyword: '担保人签名',
+        keyword: '被担保人（保险代理人）签名',
         pageNo: '1',
         index: '1',
         offset: '5',
@@ -152,6 +159,37 @@ export default {
         }
       })
     },
+    //担保人签名
+    signD() {
+      // let that = this
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
+      EWebBridge.webCallAppInJs('ca_sign', {
+        //身份证号码
+        number: localStorage.idNoD,
+        //姓名
+        name: localStorage.idNameD,
+        //身份证号码id
+        type: '1',
+        keyword: '担保人签名',
+        pageNo: '1',
+        index: '1',
+        offset: '5',
+        pos: '3'
+      }).then(data => {
+        this.$toast.clear()
+        if (JSON.parse(data).state == '1') {
+          this.base64D = decodeURI(JSON.parse(data).sign)
+          this.appntSign.signStateD = '1'
+          this.isDisabledComplite = false
+          this.isSign = false
+        }
+      })
+    },
     goNext() {
       let that = this
       let data = {
@@ -159,6 +197,7 @@ export default {
         //   mobile: '13000000000'
         // },
         baseEncryp: that.base64,
+        otherBaseEncryp: that.base64D,
         // baseEncryp: '123456',
         ebizAgreementDto: that.appntSign
       }
@@ -205,20 +244,20 @@ export default {
   watch: {
     listenChange(val) {
       let that = this
-      if (val.isOver == true && val.radio != '' && val.appntSign.signState !== '1') {
+      if (val.isOver == true && val.radio != '' && val.appntSign.signState !== '1' && val.appntSign.signStateD !== '1') {
         that.isDisable = false
       } else {
         that.isDisable = true
       }
 
-      if (that.radio == '1' && val.appntSign.signState == '1') {
+      if (that.radio == '1' && val.appntSign.signState == '1' && val.appntSign.signStateD == '1') {
         //线上改为1
         that.isDisabledComplite = false
       } else {
         that.isDisabledComplite = true
       }
 
-      if (val.appntSign.signState == '1') {
+      if (val.appntSign.signState == '1' && val.appntSign.signStateD == '1') {
         that.isDisable = true
       }
     }

src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue

@@ -199,7 +199,7 @@ export default {
         that.isDisable = true
       }
 
-      if (that.radio == '1' && val.appntSign.signState == '0') { //线上改为1
+      if (that.radio == '1' && val.appntSign.signState == '1') { //线上改为1
         that.isDisabledComplite = false
       } else {
         that.isDisabledComplite = true