Merge branch 'feature/vip专区' into dev

This commit is contained in:
mengxiaolong
2020-09-25 13:31:17 +08:00

View File

@@ -168,46 +168,47 @@ export default {
if (res.result == '0') { if (res.result == '0') {
if (res.content.redirect) { if (res.content.redirect) {
this.redirectUrl = res.content.linkUrl this.redirectUrl = res.content.linkUrl
} let thirdName = res.content.tip
let thirdName = res.content.tip const toast = Toast.loading({
const toast = Toast.loading({ duration: 0, // 持续展示 toast
duration: 0, // 持续展示 toast forbidClick: true,
forbidClick: true, icon: 'info-o',
icon: 'info-o', message: `3s后将为您跳转至${thirdName}`
message: `3s后将为您跳转至${thirdName}` })
})
let second = 3 let second = 3
let timer = setInterval(() => { let timer = setInterval(() => {
second-- second--
if (second) { if (second) {
toast.message = `${second}s后将为您跳转至${thirdName}` toast.message = `${second}s后将为您跳转至${thirdName}`
} else {
if (res.content.redirect) {
this.thirdUrlReady = true
} else { } else {
if (res.content.rightBtnShow && !this.isWeixin) { if (res.content.redirect) {
// eslint-disable-next-line no-undef this.thirdUrlReady = true
window.EWebBridge.webCallAppInJs('webview_right_button', {
btns: [
{
img: icon,
route: { flag: '', extra: {} }
}
]
})
window['appCallBack'] = this.appCallBack
} }
this.detailImg = res.content.detailImgUrl clearInterval(timer)
this.bottomBtnShow = res.content.bottomBtnShow // 手动清除 Toast
this.detail = res.content toast.clear()
this.pdfUrl = this.$assetsUrl + res.content.pdfUrl
this.isCanCheck2 = true
} }
clearInterval(timer) }, 1000)
// 手动清除 Toast } else {
toast.clear() if (res.content.rightBtnShow && !this.isWeixin) {
// eslint-disable-next-line no-undef
window.EWebBridge.webCallAppInJs('webview_right_button', {
btns: [
{
img: icon,
route: { flag: '', extra: {} }
}
]
})
window['appCallBack'] = this.appCallBack
} }
}, 1000) this.detailImg = res.content.detailImgUrl
this.bottomBtnShow = res.content.bottomBtnShow
this.detail = res.content
this.pdfUrl = this.$assetsUrl + res.content.pdfUrl
this.isCanCheck2 = true
}
this.loaded = true this.loaded = true
} else { } else {
this.$toast(res.resultMessage) this.$toast(res.resultMessage)