Merge branch 'feature/vip专区' into dev

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

View File

@@ -168,7 +168,6 @@ export default {
if (res.result == '0') {
if (res.content.redirect) {
this.redirectUrl = res.content.linkUrl
}
let thirdName = res.content.tip
const toast = Toast.loading({
duration: 0, // 持续展示 toast
@@ -176,6 +175,7 @@ export default {
icon: 'info-o',
message: `3s后将为您跳转至${thirdName}`
})
let second = 3
let timer = setInterval(() => {
second--
@@ -184,6 +184,12 @@ export default {
} else {
if (res.content.redirect) {
this.thirdUrlReady = true
}
clearInterval(timer)
// 手动清除 Toast
toast.clear()
}
}, 1000)
} else {
if (res.content.rightBtnShow && !this.isWeixin) {
// eslint-disable-next-line no-undef
@@ -203,11 +209,6 @@ export default {
this.pdfUrl = this.$assetsUrl + res.content.pdfUrl
this.isCanCheck2 = true
}
clearInterval(timer)
// 手动清除 Toast
toast.clear()
}
}, 1000)
this.loaded = true
} else {
this.$toast(res.resultMessage)