diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index e40136ac9..24eb381f6 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -191,15 +191,27 @@ service.interceptors.response.use( Toast.clear() if (res.code != 0) { if (res.code == 10001 || res.code == 10002) { - Dialog.confirm({ - confirmButtonText: '重新登录', - message: '你已被登出,可以取消继续留在该页面,或者重新登录' - }).then(() => { - //eslint-disable-next-line - EWebBridge.webCallAppInJs('bridge', { - flag: 'login' + let isWeixin = this.$utils.device().isWeixin //判断环境 + if (isWeixin) { + Dialog.alert({ + title: '提示', + confirmButtonText: '退出', + message: '当前链接已失效,请您联系业务员获取(重新分享)。', + }).then(() => { + window.close(); + WeixinJSBridge.call('closeWindow'); + }); + } else { + Dialog.confirm({ + confirmButtonText: '重新登录', + message: '你已被登出,可以取消继续留在该页面,或者重新登录' + }).then(() => { + //eslint-disable-next-line + EWebBridge.webCallAppInJs('bridge', { + flag: 'login' + }) }) - }) + } } else { //Toast.fail(res.msg) } diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue index 8fff591df..b7169c100 100644 --- a/src/views/ebiz/cardList/Pay.vue +++ b/src/views/ebiz/cardList/Pay.vue @@ -258,8 +258,7 @@ export default { if (this.isWeixin) { this.radio = '3' let token = this.$route.query.token - let orderNo = this.$route.query.orderNo - let shareToken = this.$route.query.shareToken + let orderNo = this.$route.query.orderNo localStorage.token = token localStorage.orderNo = orderNo this.isLoading = true @@ -490,17 +489,8 @@ export default { // if (this.isWeixin) { // this.pay() // } - - - } else if (res.result === '1') { - Dialog.alert({ - title: '提示', - confirmButtonText: '退出', - message: '当前链接已失效,请您联系业务员获取(重新分享)。', - }).then(() => { - window.close(); - WeixinJSBridge.call('closeWindow'); - }); + + } else { this.underWriteData = { accountName: '', @@ -742,10 +732,9 @@ export default { localStorage.bankName = this.underWriteData.bankName localStorage.bankCode = this.underWriteData.bankCode localStorage.bankListName = this.bankListName - console.log(this.underWriteData.bankName, this.underWriteData.bankCode, this.bankListName, this.underWriteData.name) - let url = location.origin + '/#/cardList/pay?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token - let res = await getShareParam({ shareType: 'card_pay' }) - localStorage.token = res.content + console.log(this.underWriteData.bankName, this.underWriteData.bankCode, this.bankListName, this.underWriteData.name) + let res = await getShareParam({ shareType: 'card_pay' }) + let url = location.origin + '/#/cardList/pay?orderNo=' + localStorage.orderNo + '&token=' + res.content if (res.result == '0') { EWebBridge.webCallAppInJs('bridge', { flag: 'share',