From 55d2589f51f0ff00565f4335b355ef69597125fd Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Mon, 18 May 2020 09:42:19 +0800
Subject: [PATCH] =?UTF-8?q?[IMP]=E3=80=90=E8=87=AA=E5=8A=A9=E5=85=A5?=
 =?UTF-8?q?=E5=8F=B8=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96=E3=80=91=E7=AD=BE?=
 =?UTF-8?q?=E7=BD=B2=E8=BF=87=E7=9A=84=E5=8D=8F=E8=AE=AE=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/agentEenter/Guarantee.vue      |  25 +-
 src/views/ebiz/agentEenter/HealthNotice.vue   |  18 +-
 .../agentEenter/IllegalLetterOfCommitment.vue |  22 +-
 .../ebiz/agentEenter/LetterCommitment.vue     |  29 +-
 src/views/ebiz/agentEenter/LetterOfKnow.vue   |  28 +-
 .../agentEenter/MessageLetterOfCommitment.vue |  30 +-
 src/views/ebiz/agentEenter/Paction.vue        |  27 +-
 src/views/ebiz/agentEenter/SignContract.vue   | 426 +++++++++++++-----
 src/views/ebiz/agentEenter/js/methods.js      |  84 ++--
 9 files changed, 497 insertions(+), 192 deletions(-)

diff --git a/src/views/ebiz/agentEenter/Guarantee.vue b/src/views/ebiz/agentEenter/Guarantee.vue
index 28136c8bf..d9866aa18 100644
--- a/src/views/ebiz/agentEenter/Guarantee.vue
+++ b/src/views/ebiz/agentEenter/Guarantee.vue
@@ -12,11 +12,15 @@
       </van-radio-group>
       <div class="pl30 pb15">
         担保人签字：
-        <van-button type="danger" size="small" @click="signD" :disabled="isDisableD" v-no-more-click="1000">{{ appntSign.signStateD == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="signD" :disabled="isDisableD" v-no-more-click="1000">{{
+          appntSign.signStateD == '0' ? '签名' : '已签名'
+        }}</van-button>
       </div>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{
+          appntSign.signState == '0' ? '签名' : '已签名'
+        }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
@@ -27,6 +31,8 @@
 import { Field, Icon, Button, Radio, CheckboxGroup, NoticeBar, Dialog, RadioGroup } from 'vant'
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
 import config from '@/config'
+import { filtSignList, getAgreementNextPagePath } from './js/methods'
+
 export default {
   data() {
     return {
@@ -101,22 +107,23 @@ export default {
             console.log(item)
             if (item.type == '12') {
               that.appntSign = item
-              if(item.signState == '0'){
+              if (item.signState == '0') {
                 this.isDisable = false
                 this.isDisableD = false
                 that.appntSign.signStateD = '0'
                 that.appntSign.signState = '0'
                 this.isReSign = '0'
-              }else{
+              } else {
                 this.isDisable = true
                 this.isDisableD = true
                 that.appntSign.signStateD = '1'
                 that.appntSign.signState = '1'
                 this.isReSign = '1'
-
               }
             }
           })
+          filtSignList(that, that.signList)
+          that.nextPagePath = getAgreementNextPagePath(that.signList, that.code, that.appntSign)
           that.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${that.appntSign.rgssUrl}`)
         } else {
           this.$toast(res.resultMessage)
@@ -213,7 +220,7 @@ export default {
             this.isSignD = true
           } else {
             this.isDisabledComplite = true
-            this.isSignD= false
+            this.isSignD = false
           }
         }
       })
@@ -253,7 +260,7 @@ export default {
           }
         })
       } else {
-        if(this.isReSign == '1'){
+        if (this.isReSign == '1') {
           // 您已签名
           this.$toast('您已签名')
         }
@@ -281,10 +288,10 @@ export default {
       let that = this
       if (val.isOver == true && val.radio != '' && val.appntSign.signState !== '1') {
         that.isDisable = false
-      }else{
+      } else {
         that.isDisable = true
       }
-      
+
       if (val.isOver == true && val.radio != '' && val.appntSign.signStateD !== '1') {
         that.isDisableD = false
       } else {
diff --git a/src/views/ebiz/agentEenter/HealthNotice.vue b/src/views/ebiz/agentEenter/HealthNotice.vue
index 93bd0c6f6..2ad56cef7 100644
--- a/src/views/ebiz/agentEenter/HealthNotice.vue
+++ b/src/views/ebiz/agentEenter/HealthNotice.vue
@@ -24,7 +24,7 @@
 <script>
 import { Field, Icon, Button, Radio, CheckboxGroup, NoticeBar, Dialog, RadioGroup } from 'vant'
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
-import { getAgreementNextPagePath } from './js/methods'
+import { filtSignList, getAgreementNextPagePath } from './js/methods'
 import config from '@/config'
 export default {
   data() {
@@ -51,6 +51,8 @@ export default {
       signList: [],
       //当前页面协议签署后下一页路由
       nextPagePath: '',
+      //签署人 0-申请人 1-担保人
+      code: '',
       // 推荐人签名信息
       appntSign: {
         signState: '0'
@@ -74,16 +76,13 @@ export default {
       this.timeOut()
     }
     this.agreementQuery()
+    this.code = this.$route.query.code
   },
   methods: {
     //获取签署协议人信息
     agreementQuery() {
       let that = this
-      let data = {
-        // userModel: { //线上去掉
-        //   mobile: '13000000000'
-        // }
-      }
+      let data = {}
       that.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
@@ -94,13 +93,14 @@ export default {
         that.$toast.clear()
         if (res.result == '0') {
           that.signList = res.content.ebizAgreementDtoList
-          getAgreementNextPagePath(that)
           res.content.ebizAgreementDtoList.map(item => {
             console.log(item)
             if (item.type == '7') {
               that.appntSign = item
             }
           })
+          filtSignList(that, that.signList)
+          that.nextPagePath = getAgreementNextPagePath(that.signList, that.code, that.appntSign)
           that.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${that.appntSign.rgssUrl}`)
         } else {
           this.$toast(res.resultMessage)
@@ -184,11 +184,11 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/agentEenter/${that.nextPagePath}`,
+              url: location.origin + `/#/agentEenter/${that.nextPagePath}?code=${that.code}`,
               forbidSwipeBack: '1'
             },
             routerInfo: {
-              path: `/agentEenter/${that.nextPagePath}`
+              path: `/agentEenter/${that.nextPagePath}?code=${that.code}`
             }
           })
         } else {
diff --git a/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue b/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue
index ffe40e028..355c1b572 100644
--- a/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue
+++ b/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue
@@ -12,7 +12,9 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{
+          appntSign.signState == '0' ? '签名' : '已签名'
+        }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
@@ -23,6 +25,8 @@
 import { Field, Icon, Button, Radio, CheckboxGroup, NoticeBar, Dialog, RadioGroup } from 'vant'
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
 import config from '@/config'
+import { filtSignList, getAgreementNextPagePath } from './js/methods'
+
 export default {
   data() {
     return {
@@ -42,6 +46,12 @@ export default {
       isDisabledComplite: true,
       // 是否签名 true 签名 false 未签名
       isSign: false,
+      //协议list
+      signList: [],
+      //当前页面协议签署后下一页路由
+      nextPagePath: '',
+      //签署人 0-申请人 1-担保人
+      code: '',
       //推荐人信息
       agentInfo: {},
       // 推荐人签名信息
@@ -67,6 +77,7 @@ export default {
       this.timeOut()
     }
     this.agreementQuery()
+    this.code = this.$route.query.code
   },
   methods: {
     //获取签署协议人信息
@@ -87,12 +98,15 @@ export default {
         console.log(res)
         if (res.result == '0') {
           this.$toast.clear()
+          that.signList = res.content.ebizAgreementDtoList
           res.content.ebizAgreementDtoList.map(item => {
             console.log(item)
             if (item.type == '15') {
               that.appntSign = item
             }
           })
+          filtSignList(that, that.signList)
+          that.nextPagePath = getAgreementNextPagePath(that.signList, that.code, that.appntSign)
           that.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${that.appntSign.rgssUrl}`)
         } else {
           this.$toast(res.resultMessage)
@@ -176,10 +190,12 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/agentEenter/Guarantee`
+              // url: location.origin + `/#/agentEenter/Guarantee`
+              url: location.origin + `/#/agentEenter/${that.nextPagePath}?code=${that.code}`
             },
             routerInfo: {
-              path: `/agentEenter/Guarantee`
+              // path: `/agentEenter/Guarantee`
+              path: `/agentEenter/${that.nextPagePath}?code=${that.code}`
             }
           })
         } else {
diff --git a/src/views/ebiz/agentEenter/LetterCommitment.vue b/src/views/ebiz/agentEenter/LetterCommitment.vue
index 6d691cb79..6d216ca3a 100644
--- a/src/views/ebiz/agentEenter/LetterCommitment.vue
+++ b/src/views/ebiz/agentEenter/LetterCommitment.vue
@@ -12,7 +12,9 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{
+          appntSign.signState == '0' ? '签名' : '已签名'
+        }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" v-no-more-click="1000" @click="goNext" size="large">下一步</van-button>
     </div>
@@ -23,6 +25,8 @@
 import { Field, Icon, Button, Radio, CheckboxGroup, NoticeBar, Dialog, RadioGroup } from 'vant'
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
 import config from '@/config'
+import { filtSignList, getAgreementNextPagePath } from './js/methods'
+
 export default {
   data() {
     return {
@@ -44,6 +48,12 @@ export default {
       isSign: false,
       //推荐人信息
       agentInfo: {},
+      //协议list
+      signList: [],
+      //当前页面协议签署后下一页路由
+      nextPagePath: '',
+      //签署人 0-申请人 1-担保人
+      code: '',
       // 推荐人签名信息
       appntSign: {
         signState: '0'
@@ -67,6 +77,7 @@ export default {
       this.timeOut()
     }
     this.agreementQuery()
+    this.code = this.$route.query.code
   },
   methods: {
     //获取签署协议人信息
@@ -77,7 +88,7 @@ export default {
         //   mobile: '13000000000'
         // }
       }
-       that.$toast.loading({
+      that.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
         loadingType: 'spinner',
@@ -87,12 +98,15 @@ export default {
         console.log(res)
         if (res.result == '0') {
           this.$toast.clear()
+          that.signList = res.content.ebizAgreementDtoList
           res.content.ebizAgreementDtoList.map(item => {
             console.log(item)
             if (item.type == '10') {
               that.appntSign = item
             }
           })
+          filtSignList(that, that.signList)
+          that.nextPagePath = getAgreementNextPagePath(that.signList, that.code, that.appntSign)
           that.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${that.appntSign.rgssUrl}`)
         } else {
           this.$toast(res.resultMessage)
@@ -163,7 +177,7 @@ export default {
         // baseEncryp: '123456',
         ebizAgreementDto: that.appntSign
       }
-       that.$toast.loading({
+      that.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
         loadingType: 'spinner',
@@ -176,10 +190,12 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/agentEenter/MessageLetterOfCommitment`
+              // url: location.origin + `/#/agentEenter/MessageLetterOfCommitment`
+              url: location.origin + `/#/agentEenter/${that.nextPagePath}?code=${that.code}`
             },
             routerInfo: {
-              path: `/agentEenter/MessageLetterOfCommitment`
+              // path: `/agentEenter/MessageLetterOfCommitment`
+              path: `/agentEenter/${that.nextPagePath}?code=${that.code}`
             }
           })
         } else {
@@ -213,7 +229,8 @@ export default {
         that.isDisable = true
       }
 
-      if (that.radio == '1' && val.appntSign.signState == '1') { //线上改为1
+      if (that.radio == '1' && val.appntSign.signState == '1') {
+        //线上改为1
         that.isDisabledComplite = false
       } else {
         that.isDisabledComplite = true
diff --git a/src/views/ebiz/agentEenter/LetterOfKnow.vue b/src/views/ebiz/agentEenter/LetterOfKnow.vue
index 1426edbd5..5000bf3c8 100644
--- a/src/views/ebiz/agentEenter/LetterOfKnow.vue
+++ b/src/views/ebiz/agentEenter/LetterOfKnow.vue
@@ -12,7 +12,9 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{
+          appntSign.signState == '0' ? '签名' : '已签名'
+        }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
@@ -24,6 +26,8 @@ import { Field, Icon, Button, CheckboxGroup, NoticeBar, Dialog, Radio, RadioGrou
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
 import config from '@/config'
 import dateUtils from '@/assets/js/utils/date-utils'
+import { filtSignList, getAgreementNextPagePath } from './js/methods'
+
 export default {
   data() {
     return {
@@ -43,6 +47,12 @@ export default {
       isDisabledComplite: true,
       // 是否签名 true 签名 false 未签名
       isSign: false,
+      //协议list
+      signList: [],
+      //当前页面协议签署后下一页路由
+      nextPagePath: '',
+      //签署人 0-申请人 1-担保人
+      code: '',
       //推荐人信息
       agentInfo: {},
       // 推荐人签名信息
@@ -68,6 +78,7 @@ export default {
       this.timeOut()
     }
     this.agreementQuery()
+    this.code = this.$route.query.code
   },
   methods: {
     //获取签署协议人信息
@@ -88,12 +99,15 @@ export default {
         console.log(res)
         if (res.result == '0') {
           this.$toast.clear()
+          that.signList = res.content.ebizAgreementDtoList
           res.content.ebizAgreementDtoList.map(item => {
             console.log(item)
             if (item.type == '11') {
               that.appntSign = item
             }
           })
+          filtSignList(that, that.signList)
+          that.nextPagePath = getAgreementNextPagePath(that.signList, that.code, that.appntSign)
           that.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${that.appntSign.rgssUrl}`)
         } else {
           this.$toast(res.resultMessage)
@@ -132,11 +146,11 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-      console.log('签名', localStorage.idNo,localStorage.name)
+      console.log('签名', localStorage.idNo, localStorage.name)
       EWebBridge.webCallAppInJs('ca_sign', {
         //身份证号码
         number: localStorage.idNo,
-        //姓名  
+        //姓名
         name: localStorage.idName,
         //身份证号码id
         type: '1',
@@ -165,7 +179,7 @@ export default {
         // baseEncryp: '123456',
         ebizAgreementDto: that.appntSign
       }
-       that.$toast.loading({
+      that.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
         loadingType: 'spinner',
@@ -178,10 +192,12 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/agentEenter/paction`
+              // url: location.origin + `/#/agentEenter/paction`
+              url: location.origin + `/#/agentEenter/${that.nextPagePath}?code=${that.code}`
             },
             routerInfo: {
-              path: `/agentEenter/paction`
+              // path: `/agentEenter/paction`
+              path: `/agentEenter/${that.nextPagePath}?code=${that.code}`
             }
           })
         } else {
diff --git a/src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue b/src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue
index b2d11f8de..94b12d40c 100644
--- a/src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue
+++ b/src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue
@@ -12,7 +12,9 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{
+          appntSign.signState == '0' ? '签名' : '已签名'
+        }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
@@ -23,6 +25,8 @@
 import { Field, Icon, Button, Radio, CheckboxGroup, NoticeBar, Dialog, RadioGroup } from 'vant'
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
 import config from '@/config'
+import { filtSignList, getAgreementNextPagePath } from './js/methods'
+
 export default {
   data() {
     return {
@@ -42,6 +46,13 @@ export default {
       isDisabledComplite: true,
       // 是否签名 true 签名 false 未签名
       isSign: false,
+      //协议list
+      signList: [],
+      //当前页面协议签署后下一页路由
+      nextPagePath: '',
+      //签署人 0-申请人 1-担保人
+      code: '',
+
       //推荐人信息
       agentInfo: {},
       // 推荐人签名信息
@@ -67,6 +78,7 @@ export default {
       this.timeOut()
     }
     this.agreementQuery()
+    this.code = this.$route.query.code
   },
   methods: {
     //获取签署协议人信息
@@ -77,7 +89,7 @@ export default {
         //   mobile: '13000000000'
         // }
       }
-       that.$toast.loading({
+      that.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
         loadingType: 'spinner',
@@ -87,12 +99,15 @@ export default {
         console.log(res)
         if (res.result == '0') {
           this.$toast.clear()
+          that.signList = res.content.ebizAgreementDtoList
           res.content.ebizAgreementDtoList.map(item => {
             console.log(item)
             if (item.type == '16') {
               that.appntSign = item
             }
           })
+          filtSignList(that, that.signList)
+          that.nextPagePath = getAgreementNextPagePath(that.signList, that.code, that.appntSign)
           that.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${that.appntSign.rgssUrl}`)
         } else {
           this.$toast(res.resultMessage)
@@ -163,7 +178,7 @@ export default {
         // baseEncryp: '123456',
         ebizAgreementDto: that.appntSign
       }
-       that.$toast.loading({
+      that.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
         loadingType: 'spinner',
@@ -176,10 +191,12 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/agentEenter/IllegalLetterOfCommitment`
+              // url: location.origin + `/#/agentEenter/IllegalLetterOfCommitment`
+              url: location.origin + `/#/agentEenter/${that.nextPagePath}?code=${that.code}`
             },
             routerInfo: {
-              path: `/agentEenter/IllegalLetterOfCommitment`
+              // path: `/agentEenter/IllegalLetterOfCommitment`
+              path: `/agentEenter/${that.nextPagePath}?code=${that.code}`
             }
           })
         } else {
@@ -213,7 +230,8 @@ export default {
         that.isDisable = true
       }
 
-      if (that.radio == '1' && val.appntSign.signState == '1') { //线上改为1
+      if (that.radio == '1' && val.appntSign.signState == '1') {
+        //线上改为1
         that.isDisabledComplite = false
       } else {
         that.isDisabledComplite = true
diff --git a/src/views/ebiz/agentEenter/Paction.vue b/src/views/ebiz/agentEenter/Paction.vue
index e1728e631..ac921a4b4 100644
--- a/src/views/ebiz/agentEenter/Paction.vue
+++ b/src/views/ebiz/agentEenter/Paction.vue
@@ -12,7 +12,9 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{
+          appntSign.signState == '0' ? '签名' : '已签名'
+        }}</van-button>
       </div>
       <van-button type="danger" size="large" :disabled="isDisabledComplite" v-no-more-click="1000" @click="finish">完成</van-button>
     </div>
@@ -23,6 +25,8 @@
 import { Field, Icon, Button, Radio, RadioGroup, NoticeBar, Dialog } from 'vant'
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
 import config from '@/config'
+import { filtSignList, getAgreementNextPagePath } from './js/methods'
+
 export default {
   data() {
     return {
@@ -42,6 +46,13 @@ export default {
       isDisabledComplite: true,
       // 是否签名 true 签名 false 未签名
       isSign: false,
+      //协议list
+      signList: [],
+      //当前页面协议签署后下一页路由
+      nextPagePath: '',
+      //签署人 0-申请人 1-担保人
+      code: '',
+
       //推荐人信息
       agentInfo: {},
       // 推荐人签名信息
@@ -67,6 +78,7 @@ export default {
       this.timeOut()
     }
     this.agreementQuery()
+    this.code = this.$route.query.code
   },
   methods: {
     //获取签署协议人信息
@@ -87,12 +99,15 @@ export default {
         console.log(res)
         if (res.result == '0') {
           this.$toast.clear()
+          that.signList = res.content.ebizAgreementDtoList
           res.content.ebizAgreementDtoList.map(item => {
             console.log(item)
             if (item.type == '14') {
               that.appntSign = item
             }
           })
+          filtSignList(that, that.signList)
+          that.nextPagePath = getAgreementNextPagePath(that.signList, that.code, that.appntSign)
           that.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${that.appntSign.rgssUrl}`)
         } else {
           this.$toast(res.resultMessage)
@@ -176,12 +191,14 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/agentEenter/signContract`,
+              // url: location.origin + `/#/agentEenter/signContract`,
+              url: location.origin + `/#/agentEenter/${that.nextPagePath}?code=${that.code}`,
               forbidSwipeBack: '1',
-              backToFirst: '1'    
+              backToFirst: '1'
             },
             routerInfo: {
-              path: `/agentEenter/signContract`
+              // path: `/agentEenter/signContract`
+              path: `/agentEenter/${that.nextPagePath}?code=${that.code}`
             }
           })
         } else {
@@ -206,7 +223,7 @@ export default {
       }
 
       if (that.radio == '1' && val.appntSign.signState == '1') {
-        that.isDisabledComplite = false         
+        that.isDisabledComplite = false
       } else {
         that.isDisabledComplite = true
       }
diff --git a/src/views/ebiz/agentEenter/SignContract.vue b/src/views/ebiz/agentEenter/SignContract.vue
index 35ba90b6e..18e321a25 100644
--- a/src/views/ebiz/agentEenter/SignContract.vue
+++ b/src/views/ebiz/agentEenter/SignContract.vue
@@ -5,22 +5,24 @@
     <van-field readonly label-width="120px" label="入司申请时间" v-model="agentInfo.createdDate" />
     <van-field readonly label-width="120px" label="所属分公司" v-model="referrerInfo.manageName" />
     <van-field readonly label-width="120px" label="所属团队" v-model="referrerInfo.orgLabel" />
-    <p class="p15 line-height">
-      恭喜您的入司资料已经通过公司审核，<br />
-      以下内容需要您按照顺序阅读并签字确认：
-    </p>
-    <div class="p15 line-height">
-      需签署：
-      <ul>
-        <li class="flex" v-for="(sign, index) in signList" :key="index">
-          <div class="w260 blue">{{ sign.name }}</div>
-          <van-icon v-if="sign.signState === '1'" color="green" name="checked" />
-        </li>
-      </ul>
-      点击【开始】按钮，进行相关操作
-    </div>
-    <div class="text-center mt20">
-      <van-button @click="faceAuth" v-no-more-click="1000" :disabled="isSubmit" type="danger" size="normal" style="width:30%">开始</van-button>
+    <div v-if="!isWeixin" class="mb10">
+      <p class="p15 line-height">
+        恭喜您的入司资料已经通过公司审核，<br />
+        以下内容需要您按照顺序阅读并签字确认：
+      </p>
+      <div class="p15 line-height">
+        需签署：
+        <ul>
+          <li class="flex" v-for="(sign, index) in agentSignList" :key="index">
+            <div class="w260 blue">{{ sign.name }}</div>
+            <van-icon v-if="sign.signState === '1'" color="green" name="checked" />
+          </li>
+        </ul>
+        点击【开始】按钮，进行相关操作
+      </div>
+      <div class="text-center mt20">
+        <van-button @click="faceAuth('0')" v-no-more-click="1000" :disabled="isAgentSubmit" type="danger" size="normal" style="width:30%">开始</van-button>
+      </div>
     </div>
     <div class="ebizGuarantor">
       <van-field readonly label-width="120px" label="担保人" v-model="ebizGuarantor.name"></van-field>
@@ -30,36 +32,171 @@
       <div class="p15 line-height">
         需签署：
         <ul>
-          <li class="flex" v-for="(sign, index) in signList" :key="index">
+          <li class="flex" v-for="(sign, index) in guaranteeSignList" :key="index">
             <div class="w260 blue">{{ sign.name }}</div>
             <van-icon v-if="sign.signState === '1'" color="green" name="checked" />
           </li>
         </ul>
         点击【开始】或【分享】，进行相关操作
       </div>
-      <div class="flex justify-content-a  mb60 mt20">
-        <van-button v-if="!isWeixin" @click="faceAuth" v-no-more-click="1000" :disabled="isSubmit" type="danger" size="normal" style="width:30%"
+      <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
         >
-        <van-button @click="faceAuth" v-no-more-click="1000" :disabled="isSubmit" 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>
     </div>
 
-    <van-button v-if="isSubmit" class="fixed bottom0" type="danger" v-no-more-click="1000" @click="clickSubmit" size="large">提交</van-button>
+    <van-button
+      v-if="isAgentSubmit && isguranteeSubmit && !isWeixin"
+      class="fixed bottom0"
+      type="danger"
+      v-no-more-click="1000"
+      @click="clickSubmit"
+      size="large"
+      >提交</van-button
+    >
   </div>
 </template>
 
 <script>
 import { Field, Icon, Button } from 'vant'
 import { agreementQuery, signAgreement } from '@/api/ebiz/agentEenter/agentEenter.js'
-import { weixinShare } from '@/assets/js/utils/wxShare.js'
-
+// import { weixinShare } from '@/assets/js/utils/wxShare.js'
+import { checkSignInvalid, getSignInvalid } from '@/api/ebiz/sale/sale'
+import { filtSignList } from './js/methods'
+let devList = [
+  //调试专用
+  {
+    baseId: 25,
+    createdDate: '2019-12-03T10:06:07.000+0000',
+    documentType: '0',
+    id: 131,
+    imgState: '3',
+    isDelete: 0,
+    modifiedDate: '2019-12-03T11:27:47.000+0000',
+    name: '《个险营销员健康告知书》',
+    order: 1,
+    rgssUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MMJWxZmb0WpZD%0D%0AulNt4BhQ8csB7meSbA2DHPBrgbwsjpyVGLphInLPv0HGtHpZ3OhD',
+    signDate: '2019-12-03T11:12:40.000+0000',
+    signState: '0',
+    thirdUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MMJWxZmb0WpZD%0D%0AulNt4BhQ8bIABSerclzLkpZ7EfTo6fvUqooFPNUZSjGoZts28jTW',
+    type: '13'
+  },
+  {
+    baseId: 25,
+    createdDate: '2019-12-03T11:06:56.000+0000',
+    createdUser: '您猜',
+    documentType: '0',
+    id: 132,
+    imgState: '3',
+    isDelete: 0,
+    modifiedDate: '2019-12-03T11:27:47.000+0000',
+    name: '《代理人基本福利保障知晓函》',
+    order: 6,
+    rgssUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MSV3lH4t%2BZLOW%0D%0A%2Bvh3PMDFGhUp%2B%2BNak9FtguN1IiRXXlOVGLphInLPv0HGtHpZ3OhD',
+    signDate: '2019-12-03T11:15:27.000+0000',
+    signState: '0',
+    thirdUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MSV3lH4t%2BZLOW%0D%0A%2Bvh3PMDFGswBB9cueD%2BA0k1xQSPsVULUqooFPNUZSjGoZts28jTW',
+    type: '11'
+  },
+  {
+    baseId: 25,
+    createdDate: '2019-12-03T11:06:56.000+0000',
+    createdUser: '您猜',
+    documentType: '1',
+    id: 133,
+    imgState: '3',
+    isDelete: 0,
+    modifiedDate: '2019-12-03T11:27:47.000+0000',
+    name: '《担保书》',
+    order: 5,
+    rgssUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MvoM%2Bavw%2FHfcz%0D%0AbfDMyeVE1kaPZwJDrY%2FlR1IwDlrQe6KVGLphInLPv0HGtHpZ3OhD',
+    signDate: '2019-12-03T11:14:38.000+0000',
+    signState: '0',
+    thirdUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MvoM%2Bavw%2FHfcz%0D%0AbfDMyeVE1le4Yn85HeThhEgS3gEDBK7UqooFPNUZSjGoZts28jTW',
+    type: '12'
+  },
+  {
+    baseId: 25,
+    createdDate: '2019-12-03T11:06:56.000+0000',
+    createdUser: '您猜',
+    documentType: '0',
+    id: 134,
+    imgState: '3',
+    isDelete: 0,
+    modifiedDate: '2019-12-03T11:27:47.000+0000',
+    name: '《保险代理合同》',
+    order: 7,
+    rgssUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MEIikc%2FuBT5F3%0D%0AQSMZgyPFhfwM90EhMrUVYKzpUzovEqSVGLphInLPv0HGtHpZ3OhD',
+    signDate: '2019-12-03T11:15:45.000+0000',
+    signState: '1',
+    thirdUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MEIikc%2FuBT5F3%0D%0AQSMZgyPFhXRMc7sfWxHjWLq72jbia%2BbUqooFPNUZSjGoZts28jTW',
+    type: '14'
+  },
+  {
+    baseId: 25,
+    createdDate: '2019-12-03T11:06:56.000+0000',
+    createdUser: '您猜',
+    documentType: '0',
+    id: 135,
+    imgState: '3',
+    isDelete: 0,
+    modifiedDate: '2019-12-03T11:27:47.000+0000',
+    name: '《销售从业人员拒绝非法集资、非法放贷、金融诈骗承诺书》',
+    order: 4,
+    rgssUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MMkpxdFEhYfK%2B%0D%0Abwvndj%2FYzvVUdk3WnyEL89pneUR3egCVGLphInLPv0HGtHpZ3OhD',
+    signDate: '2019-12-03T11:13:39.000+0000',
+    signState: '1',
+    thirdUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7MMkpxdFEhYfK%2B%0D%0Abwvndj%2FYzuYCdy1qc3s6W6LR%2B8qHblbUqooFPNUZSjGoZts28jTW',
+    type: '15'
+  },
+  {
+    baseId: 25,
+    createdDate: '2019-12-03T11:06:56.000+0000',
+    createdUser: '您猜',
+    documentType: '0',
+    id: 136,
+    imgState: '3',
+    isDelete: 0,
+    modifiedDate: '2019-12-03T11:27:47.000+0000',
+    name: '《广西保险销售从业人员信息公开承诺书》',
+    order: 3,
+    rgssUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7M1Hy3YFswSMOJ%0D%0ACupujVjbOqtXdlQngjvfOgmQvLgdSxSVGLphInLPv0HGtHpZ3OhD',
+    signDate: '2019-12-03T11:13:22.000+0000',
+    signState: '1',
+    thirdUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7M1Hy3YFswSMOJ%0D%0ACupujVjbOuBhK0%2BNowNiEPFIM9yLXzvUqooFPNUZSjGoZts28jTW',
+    type: '16'
+  },
+  {
+    baseId: 25,
+    createdDate: '2019-12-03T11:06:56.000+0000',
+    createdUser: '您猜',
+    documentType: '0',
+    id: 137,
+    imgState: '3',
+    isDelete: 0,
+    modifiedDate: '2019-12-03T11:27:47.000+0000',
+    name: '《承诺书》',
+    order: 2,
+    rgssUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7M8RnQ86uoTRid%0D%0AjQKoadYQNoc9CWLNt%2BDRygNGLUuonZuVGLphInLPv0HGtHpZ3OhD',
+    signDate: '2019-12-03T11:13:04.000+0000',
+    signState: '1',
+    thirdUrl: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoNhmz6pJzLpaFL1klLxAn7M8RnQ86uoTRid%0D%0AjQKoadYQNkVwQwzyltxrtR%2FT7NhB%2F%2FHUqooFPNUZSjGoZts28jTW',
+    type: '10'
+  }
+]
 export default {
   data() {
     let isWeixin = this.$utils.device().isWeixin //判断环境
     return {
       // 是否在微信
       isWeixin,
+      // 微信分享链接是否失效 false 为未失效 true为已失效
+      isInvalid: false,
+      // 微信分享校验值
+      signInvalid: '',
       agentInfo: {
         name: '皮伟',
         idNo: '422801199210070412',
@@ -68,26 +205,18 @@ export default {
       referrerInfo: {
         orgLabel: ''
       },
-      signList: [
-        // { name: '《个险营销员履历表》', signState: '1' }, //0未签字，1签字
-        // { name: '《个险营销员营销告知书》', signState: '0' },
-        // { name: '《个险销售人员代理合同》', signState: '1' }
-      ],
-      isSubmit: false,
+      signList: [],
+      agentSignList: [], //申请人所需阅读签署文档集合
+      guaranteeSignList: [], //担保人所需阅读签署文档集合
+      isAgentSubmit: false,
+      isguranteeSubmit: false,
       ebizGuarantor: {} //担保人信息
     }
   },
   created() {
-    this.agreementQuery()
+    this.init()
   },
   mounted() {
-    //查看是否全部签署完成
-    if (this.signList.length > 0) {
-      this.isSubmit = this.signList.every(item => {
-        console.log('item', item)
-        return item.signState == '1'
-      })
-    }
     document.body.style.backgroundColor = '#fff'
   },
   beforeRouteLeave(to, from, next) {
@@ -95,6 +224,27 @@ export default {
     next()
   },
   methods: {
+    //初始化信息
+    async init() {
+      if (this.isWeixin) {
+        window.localStorage.setItem('token', this.$route.query.token)
+        if (this.$route.query.signInvalid) {
+          sessionStorage.setItem('signInvalid', this.$route.query.signInvalid)
+        }
+        let signInvalid = sessionStorage.getItem('signInvalid')
+        await this.agreementQuery()
+        let rs = await this.checkSignInvalid(signInvalid)
+        if (rs == '1') {
+          this.isInvalid = false
+        } else {
+          this.isInvalid = true
+        }
+      } else {
+        await this.agreementQuery()
+        this.getSignInvalid()
+      }
+    },
+
     //获取签署协议人信息
     agreementQuery() {
       let data = {
@@ -106,103 +256,143 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-      agreementQuery(data).then(res => {
-        console.log(res)
-        if (res.result == '0') {
-          this.$toast.clear()
-          this.agentInfo = res.content.ebizEnterCustomerDto
-          this.referrerInfo = res.content.ebizReferrerDto
-          this.signList = res.content.ebizAgreementDtoList
-          this.ebizGuarantor = res.content.ebizGuarantorDto
-          localStorage.idNoD = this.ebizGuarantor.idNo
-          localStorage.idNameD = this.ebizGuarantor.name
-          this.agentInfo.createdDate = this.agentInfo.createdDate.substring(0, 10)
-          this.signList.map(item => {
-            this.addKey(item)
-          })
-          this.signList.sort(function(a, b) {
-            return a.key - b.key
-          })
-          this.isSubmit = this.signList.every(item => {
-            return item.signState == '1'
-          })
-        } else {
-          this.$toast(res.resultMessage)
+      return new Promise(resolve => {
+        agreementQuery(data).then(res => {
+          if (res.result == '0') {
+            this.$toast.clear()
+            this.agentInfo = res.content.ebizEnterCustomerDto
+            this.referrerInfo = res.content.ebizReferrerDto
+            this.signList = res.content.ebizAgreementDtoList
+            this.ebizGuarantor = res.content.ebizGuarantorDto
+            localStorage.idNoD = this.ebizGuarantor.idNo
+            localStorage.idNameD = this.ebizGuarantor.name
+            this.agentInfo.createdDate = this.agentInfo.createdDate.substring(0, 10)
+            this.signList = devList //调试专用
+            this.agentSignList = filtSignList(this, this.signList).agentSignList
+            this.guaranteeSignList = filtSignList(this, this.signList).guaranteeSignList
+            this.isAgentSubmit = this.agentSignList.every(item => {
+              return item.signState == '1'
+            })
+            this.isguranteeSubmit = this.guaranteeSignList.every(item => {
+              return item.signState == '1'
+            })
+            resolve()
+          } else {
+            this.$toast(res.resultMessage)
+          }
+        })
+      })
+    },
+
+    //担保人分享到微信空签
+    share() {
+      EWebBridge.webCallAppInJs('bridge', {
+        flag: 'share',
+        extra: {
+          title: '国富人寿入司申请（担保人签字）',
+          content: '签字进行',
+          url: location.origin + '/#/agentEenter/signContract?token=' + localStorage.token + '&signInvalid=' + this.signInvalid,
+          img: this.$assetsUrl + 'images/logo.png'
         }
       })
     },
-    faceAuth() {
-      // /*
-      let that = this
-      localStorage.idNo = this.agentInfo.idNo
-      localStorage.idName = this.agentInfo.name
-      if (that.agentInfo.idType == '1') {
-        this.$toast.loading({
-          duration: 0, // 持续展示 toast
-          forbidClick: true, // 禁用背景点击
-          loadingType: 'spinner',
-          message: '加载中……'
-        })
-        EWebBridge.webCallAppInJs('face_auth', {
-          number: that.agentInfo.idNo, //身份证号码
-          name: that.agentInfo.name //姓名
-        }).then(data => {
-          console.log(data)
+
+    getSignInvalid() {
+      // let that = this
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+
+        forbidClick: true, // 禁用背景点击
+
+        loadingType: 'spinner',
+
+        message: '加载中……'
+      })
+      let data = {}
+      getSignInvalid(data).then(res => {
+        if (res.result == '0') {
           this.$toast.clear()
-          if (JSON.parse(data).state == '1') {
-            that.goUrl()
+          this.signInvalid = res.content.sign
+        }
+      })
+    },
+
+    //判断微信分享链接是否失效
+    async checkSignInvalid(signInvalid) {
+      let that = this
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+
+        forbidClick: true, // 禁用背景点击
+
+        loadingType: 'spinner',
+
+        message: '加载中……'
+      })
+      let data = {
+        sign: signInvalid
+      }
+      return new Promise((resolve, reject) => {
+        checkSignInvalid(data).then(res => {
+          if (res.result == '0') {
+            that.$toast.clear()
+            let status = res.content.status
+            resolve(status)
           }
         })
+      })
+    },
+    faceAuth(code) {
+      localStorage.idNo = this.agentInfo.idNo
+      localStorage.idName = this.agentInfo.name
+      /*
+      if (code == '0') {
+        if (that.agentInfo.idType == '1') {
+          this.$toast.loading({
+            duration: 0, // 持续展示 toast
+            forbidClick: true, // 禁用背景点击
+            loadingType: 'spinner',
+            message: '加载中……'
+          })
+          EWebBridge.webCallAppInJs('face_auth', {
+            number: that.agentInfo.idNo, //身份证号码
+            name: that.agentInfo.name //姓名
+          }).then(data => {
+            console.log(data)
+            this.$toast.clear()
+            if (JSON.parse(data).state == '1') {
+              that.goUrl(code)
+            }
+          })
+        } else {
+          that.goUrl(code)
+        }
       } else {
-        that.goUrl()
+        that.goUrl(code)
       }
-      // */
-      // this.goUrl()//调试专用
+      */
+      this.goUrl(code) //调试专用
     },
-    //自定义key值排序用
-    addKey(item) {
-      //13保险代理申请人健康声明 10承诺书 16广西保险销售从业人员信息公开承诺书
-      //15销售从业人员拒绝非法集资、非法放贷、金融诈骗承诺书  12担保书  11代理人基本福利保障知晓函 14个险销售人员代理合同
-      if (item.type == '13') {
-        item.key = 1
-      } else if (item.type == '10') {
-        item.key = 2
-      } else if (item.type == '16') {
-        item.key = 3
-      } else if (item.type == '15') {
-        item.key = 4
-      } else if (item.type == '12') {
-        item.key = 5
-      } else if (item.type == '11') {
-        item.key = 6
-      } else if (item.type == '14') {
-        item.key = 7
-      }
-    },
-    goUrl() {
+    goUrl(code) {
       let path = ''
-      if (this.signList[0].signState == 0) {
-        path = 'healthNotice'
-      } else if (this.signList[1].signState == 0) {
-        path = 'LetterOfCommitment'
-      } else if (this.signList[2].signState == 0) {
-        path = 'MessageLetterOfCommitment'
-      } else if (this.signList[3].signState == 0) {
-        path = 'IllegalLetterOfCommitment'
-      } else if (this.signList[4].signState == 0) {
-        path = 'Guarantee'
-      } else if (this.signList[5].signState == 0) {
-        path = 'LetterOfKnow'
-      } else if (this.signList[6].signState == 0) {
-        path = 'paction'
+      if (code == '0') {
+        path = this.agentSignList.filter(v => {
+          return v.signState == '0'
+        })[0].path
+      } else if (code == '1') {
+        path = this.guaranteeSignList.filter(v => {
+          return v.signState == '0'
+        })[0].path
       }
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/agentEenter/` + path
+          // url: location.origin + `/#/agentEenter/` + path
+          url: `${location.origin}/#/agentEenter/${path}?code=${code}`
         },
         routerInfo: {
-          path: `/agentEenter/` + path
+          // path: `/agentEenter/` + path
+          path: `/agentEenter/${path}?code=${code}`
         }
       })
     },
diff --git a/src/views/ebiz/agentEenter/js/methods.js b/src/views/ebiz/agentEenter/js/methods.js
index 14c01d675..d2c7499e0 100644
--- a/src/views/ebiz/agentEenter/js/methods.js
+++ b/src/views/ebiz/agentEenter/js/methods.js
@@ -964,68 +964,92 @@ export function effectiveDataTypeChange(that, val) {
   }
 }
 
-//筛选未签署协议,获取签署当前页面协议后，跳转路径
 /**
  * @param {*} that 上下文
- * @param {*} signList 协议list
+ * @param {*} signList 所有协议list
+ * @param {*} code 未签署协议类型 0-申请人 1-担保人
+ * @param {*} appntSign 当前签署页 签署状态信息
  */
-export function getAgreementNextPagePath(that, signList) {
-  let unsignedList = [],
-    nextPagePath = ''
-  that.signList.map(item => {
+//筛选申请人、担保人所需阅读签署文档list
+export function filtSignList(that, signList) {
+  let agentSignList = [], //申请人所需签署协议list
+    guaranteeSignList = [] //担保人所需签署协议list
+  //documentType：签名类型  0代理人 1 担保人  order：显示顺序
+  signList.sort(function(a, b) {
+    return a.order - b.order
+  })
+  signList.forEach(item => {
     addKey(item)
-    filtUnsigned(item)
+    if (item.documentType == '0') {
+      agentSignList.push(item)
+    } else if (item.documentType == '1') {
+      guaranteeSignList.push(item)
+    }
   })
-  that.signList.sort(function(a, b) {
-    return a.key - b.key
-  })
-  if (unsignedList.length > 1) {
-    nextPagePath = unsignedList[1].path
-  } else {
-    nextPagePath = 'signContract'
-  }
-  //自定义key值排序用
+  return { agentSignList, guaranteeSignList }
+  //增加路径跳转path用
   function addKey(item) {
     //13保险代理申请人健康声明 10承诺书 16广西保险销售从业人员信息公开承诺书
     //15销售从业人员拒绝非法集资、非法放贷、金融诈骗承诺书  12担保书  11代理人基本福利保障知晓函 14个险销售人员代理合同
     switch (item.type) {
       case '13':
-        item.key = 1
+        // item.key = 1
         item.path = 'healthNotice'
         break
       case '10':
-        item.key = 2
+        // item.key = 2
         item.path = 'LetterOfCommitment'
         break
       case '16':
-        item.key = 3
+        // item.key = 3
         item.path = 'MessageLetterOfCommitment'
         break
       case '15':
-        item.key = 4
+        // item.key = 4
         item.path = 'IllegalLetterOfCommitment'
         break
       case '12':
-        item.key = 5
+        // item.key = 5
         item.path = 'Guarantee'
         break
       case '11':
-        item.key = 6
+        // item.key = 6
         item.path = 'LetterOfKnow'
         break
       case '14':
-        item.key = 7
+        // item.key = 7
         item.path = 'paction'
         break
     }
   }
-
-  //筛选未签名协议
-  function filtUnsigned(item) {
-    //signState 0-未签名  1-已签名
-    if (item.signState == '0') {
-      unsignedList.push(item)
+}
+//筛选未签名协议并获取到当前协议签署完成后下一页跳转路径
+export function getAgreementNextPagePath(signList, code, appntSign) {
+  //signState 0-未签名  1-已签名
+  let unAgentSignList = [],
+    unGuaranteeSignList = [],
+    nextPagePath = ''
+  signList.forEach(item => {
+    if (item.signState == '0' && item.documentType == '0') {
+      unAgentSignList.push(item)
+    } else if (item.signState == '0' && item.documentType == '1') {
+      unGuaranteeSignList.push(item)
+    }
+  })
+  console.log('unAgentSignList==', unAgentSignList)
+  // console.log('unGuaranteeSignList==', unGuaranteeSignList)
+  if (code == '0') {
+    go(unAgentSignList)
+  } else if (code == '1') {
+    go(unGuaranteeSignList)
+  }
+  return nextPagePath
+  function go(list) {
+    //此方法内剔除当前页面是否签署
+    if (appntSign.signState == '0') {
+      nextPagePath = list.length > 1 ? list[1].path : 'signContract'
+    } else {
+      nextPagePath = list.length > 0 ? list[0].path : 'signContract'
     }
   }
-  that.nextPagePath = nextPagePath
 }