Merge branch 'feature/商品商城优化' into dev

src/views/ebiz/product-store/StoreDetail.vue

@@ -47,7 +47,12 @@
       </div>
     </div>
     <div v-else>
+      <template v-if="redirectUrl">
+        <iframe style="width: 100vw; min-height: 100vh;" :src="redirectUrl" frameborder="0"></iframe>
+      </template>
+      <template v-else>
         <img id="detailImg" v-if="detailImg" :src="$assetsUrl + detailImg" />
+      </template>
     </div>
     <van-button class="bottom-btn" :disabled="!isCanCheck1 || !isCanCheck2" v-if="isWeixin && bottomBtnShow" type="danger" @click="check" v-no-more-click="1000"
       >查看</van-button
@@ -117,7 +122,8 @@ export default {
       },
       loaded: false,
       detailImg: '',
-      bottomBtnShow: false
+      bottomBtnShow: false,
+      redirectUrl: ''
     }
   },
   created() {
@@ -156,8 +162,7 @@ export default {
         if (!res) return
         if (res.result == '0') {
           if (res.content.redirect) {
-            console.log('redirect...')
-            window.location.href = res.content.linkUrl
+            this.redirectUrl = res.content.linkUrl
           } else {
             if (res.content.rightBtnShow && !this.isWeixin) {
               // eslint-disable-next-line no-undef
@@ -175,9 +180,9 @@ export default {
             this.bottomBtnShow = res.content.bottomBtnShow
             this.detail = res.content
             this.pdfUrl = this.$assetsUrl + res.content.pdfUrl
-            this.loaded = true
             this.isCanCheck2 = true
           }
+          this.loaded = true
         } else {
           this.$toast(res.resultMessage)
         }