From 6ad1480dacc79df472235bc8709faf6e8d3c41f4 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 19 Jun 2020 17:13:25 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E3=80=90=E8=87=AA=E5=8A=A9=E5=85=A5?=
 =?UTF-8?q?=E5=8F=B8=E4=BC=98=E5=8C=96=E3=80=91=E6=8B=85=E4=BF=9D=E4=B9=A6?=
 =?UTF-8?q?-=E6=94=AF=E6=8C=81=E9=87=8D=E6=96=B0=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/agentEenter/Guarantee.vue    | 98 ++++++++++++---------
 src/views/ebiz/agentEenter/LetterOfKnow.vue |  5 ++
 src/views/ebiz/agentEenter/SignContract.vue |  5 +-
 3 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/src/views/ebiz/agentEenter/Guarantee.vue b/src/views/ebiz/agentEenter/Guarantee.vue
index a22baf498..c2d155dab 100644
--- a/src/views/ebiz/agentEenter/Guarantee.vue
+++ b/src/views/ebiz/agentEenter/Guarantee.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { Field, Icon, Button, Radio, CheckboxGroup, NoticeBar, Dialog, RadioGroup } from 'vant'
+import { Field, Icon, Button, Radio, NoticeBar, Dialog, RadioGroup } from 'vant'
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
 import config from '@/config'
 import { filtSignList, getAgreementNextPagePath } from './js/methods'
@@ -319,44 +319,58 @@ export default {
       window.location.href = this.$mainUrl + '/sign/index.html'
     },
     goNext() {
-      let that = this
-      // if (this.isSign && this.isReSign == '0') {
-      let data = {
-        // userModel: {
-        //   mobile: '13000000000'
-        // },
-        baseEncryp: that.code == '0' ? that.base64 : that.base64D,
-        // otherBaseEncryp: that.base64D,
-        // baseEncryp: '123456',
-        ebizAgreementDto: that.appntSign
-      }
-      console.log('baseEncryp', data.baseEncryp)
-      that.$toast.loading({
-        duration: 0, // 持续展示 toast
-        forbidClick: true, // 禁用背景点击
-        loadingType: 'spinner',
-        message: '加载中……'
-      })
-      signAgreement(data).then(res => {
-        that.$toast.clear()
-        if (res.result == '0') {
-          let path = !this.isWeixin
-            ? `/agentEenter/${that.nextPagePath}?code=${that.code}`
-            : `/agentEenter/signContract?token=${localStorage.token}&dialogFlag=1`
-          this.$jump({
-            flag: 'h5',
-            extra: {
-              url: location.origin + '/#' + path,
-              pullRefresh: that.nextPagePath == 'signContract' ? '1' : '0'
-            },
-            routerInfo: {
-              path: path
-            }
-          })
-        } else {
-          this.$toast(res.resultMessage)
+      if ((this.appntSign.signState == '1' && !this.base64) || (this.guaranteeSign.signState == '1' && !this.base64D)) {
+        this.$jump({
+          flag: 'goback',
+          extra: {
+            refresh: '1',
+            index: '-1'
+          },
+          routerInfo: {
+            type: 2,
+            index: -1,
+            path: `/agentEenter/signContract`
+          }
+        })
+      } else {
+        let data = {
+          // userModel: {
+          //   mobile: '13000000000'
+          // },
+          baseEncryp: this.code == '0' ? this.base64 : this.base64D,
+          // otherBaseEncryp: this.base64D,
+          // baseEncryp: '123456',
+          ebizAgreementDto: this.appntSign
         }
-      })
+        console.log('baseEncryp', data.baseEncryp)
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+        signAgreement(data).then(res => {
+          this.$toast.clear()
+          if (res.result == '0') {
+            let path = !this.isWeixin
+              ? `/agentEenter/${this.nextPagePath}?code=${this.code}`
+              : `/agentEenter/signContract?token=${localStorage.token}&dialogFlag=1`
+            this.$jump({
+              flag: 'h5',
+              extra: {
+                url: location.origin + '/#' + path,
+                pullRefresh: this.nextPagePath == 'signContract' ? '1' : '0'
+              },
+              routerInfo: {
+                path: path
+              }
+            })
+          } else {
+            this.$toast(res.resultMessage)
+          }
+        })
+      }
+
       // }
       // else {
       //   if (this.isReSign == '1') {
@@ -385,13 +399,15 @@ 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') {
+      if (val.isOver == true && val.radio != '') {
         that.isDisable = false
       } else {
         that.isDisable = true
       }
 
-      if (val.isOver == true && val.radio != '' && val.appntSign.signStateD !== '1') {
+      // if (val.isOver == true && val.radio != '' && val.appntSign.signStateD !== '1') {
+      if (val.isOver == true && val.radio != '') {
         that.isDisableD = false
       } else {
         that.isDisableD = true
@@ -424,10 +440,12 @@ export default {
       // } else {
       //   that.isDisabledComplite = true
       // }
+      /*
       if (val.appntSign.signState == '1' && val.appntSign.signStateD == '1') {
         that.isDisable = true
         that.isDisableD = true
       }
+      */
     }
   },
   beforeRouteLeave(to, from, next) {
diff --git a/src/views/ebiz/agentEenter/LetterOfKnow.vue b/src/views/ebiz/agentEenter/LetterOfKnow.vue
index 653c8f066..c8ae4cadb 100644
--- a/src/views/ebiz/agentEenter/LetterOfKnow.vue
+++ b/src/views/ebiz/agentEenter/LetterOfKnow.vue
@@ -176,6 +176,11 @@ export default {
           extra: {
             refresh: '1',
             index: '-1'
+          },
+          routerInfo: {
+            type: 2,
+            index: -1,
+            path: `/agentEenter/signContract`
           }
         })
       } else {
diff --git a/src/views/ebiz/agentEenter/SignContract.vue b/src/views/ebiz/agentEenter/SignContract.vue
index 3aaa8db25..0b615cc74 100644
--- a/src/views/ebiz/agentEenter/SignContract.vue
+++ b/src/views/ebiz/agentEenter/SignContract.vue
@@ -48,9 +48,10 @@
         点击【开始】或【分享】，进行相关操作<br /><span class="red">温馨提示：请尽量使用正楷文字进行签名</span>
       </div>
       <div v-if="!isInvalid" class="flex justify-content-a  mb60 mt20">
-        <van-button v-if="!isWeixin" @click="share" v-no-more-click="1000" :disabled="isguranteeSubmit" type="danger" size="normal" style="width:30%"
+        <van-button v-if="!isWeixin" @click="share" v-no-more-click="1000" type="danger" size="normal" style="width:30%">分享</van-button>
+        <!-- <van-button v-if="!isWeixin" @click="share" v-no-more-click="1000" :disabled="isguranteeSubmit" type="danger" size="normal" style="width:30%"
           >分享</van-button
-        >
+        > -->
         <van-button @click="faceAuth('1')" v-no-more-click="1000" :disabled="isguranteeSubmit" type="danger" size="normal" style="width:30%">开始</van-button>
       </div>
       <div v-else class="ml15">操作时间已失效，请联系销售人员！</div>