From 0d4beedd8c25deab026ec4a121b2d0ccdc9ac9af Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Fri, 25 Sep 2020 13:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96vip=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/product-store/StoreDetail.vue | 61 ++++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/views/ebiz/product-store/StoreDetail.vue b/src/views/ebiz/product-store/StoreDetail.vue
index 190fb0fe6..5dad26111 100644
--- a/src/views/ebiz/product-store/StoreDetail.vue
+++ b/src/views/ebiz/product-store/StoreDetail.vue
@@ -48,7 +48,7 @@
     </div>
     <div v-else>
       <template v-if="redirectUrl">
-        <iframe style="width: 100vw; min-height: 100vh;" :src="redirectUrl" frameborder="0"></iframe>
+        <iframe v-show="thirdUrlReady" style="width: 100vw; min-height: 100vh;" :src="redirectUrl" frameborder="0"></iframe>
       </template>
       <template v-else>
         <img id="detailImg" v-if="detailImg" :src="$assetsUrl + detailImg" />
@@ -123,7 +123,8 @@ export default {
       loaded: false,
       detailImg: '',
       bottomBtnShow: false,
-      redirectUrl: ''
+      redirectUrl: '',
+      thirdUrlReady: false
     }
   },
   created() {
@@ -165,38 +166,48 @@ export default {
         const res = await getShopList(data)
         if (!res) return
         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
             forbidClick: true,
             icon: 'info-o',
-            message: `即将为您跳转至${thirdName}`
+            message: `3s后将为您跳转至${thirdName}`
           })
-          setTimeout(() => {
-            // 手动清除 Toast
-            toast.clear()
-            if (res.content.redirect) {
-              this.redirectUrl = res.content.linkUrl
+          let second = 3
+          let timer = setInterval(() => {
+            second--
+            if (second) {
+              toast.message = `${second}s后将为您跳转至${thirdName}`
             } else {
-              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
+              if (res.content.redirect) {
+                this.thirdUrlReady = true
+              } else {
+                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
+                }
+                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.detailImg = res.content.detailImgUrl
-              this.bottomBtnShow = res.content.bottomBtnShow
-              this.detail = res.content
-              this.pdfUrl = this.$assetsUrl + res.content.pdfUrl
-              this.isCanCheck2 = true
+              clearInterval(timer)
+              // 手动清除 Toast
+              toast.clear()
             }
-          }, 3000)
+          }, 1000)
           this.loaded = true
         } else {
           this.$toast(res.resultMessage)