kevin_zhangl před 3 roky
rodič
revize
1771658974

+ 4 - 4
backendEle/src/views/ad/edit.vue

@@ -54,8 +54,8 @@ export default {
         this.form.type = response.oneData.TYPE
 
         this.imageAd = response.oneData.IMAGE;
-        this.form.image = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + response.oneData.IMAGE;
-        this.defaultImageUrl = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + response.oneData.IMAGE;
+        this.form.image = response.oneData.IMAGE.indexOf('http') > -1 ? response.oneData.IMAGE : SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + response.oneData.IMAGE;
+        this.defaultImageUrl = response.oneData.IMAGE.indexOf('http') > -1 ? response.oneData.IMAGE : SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + response.oneData.IMAGE;
 
         this.form.content = response.oneData.CONTENT
         if (response.oneData.TYPE === '1') {
@@ -121,8 +121,8 @@ export default {
     },
     handleSuccess (imageUrl) {
       this.imageAd = imageUrl
-      this.form.image = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
-      this.defaultImageUrl = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
+      this.form.image = imageUrl.indexOf('http') > -1 ? imageUrl : SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
+      this.defaultImageUrl = imageUrl.indexOf('http') > -1 ? imageUrl : SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
     },
   },
   watch: {

+ 2 - 2
backendEle/src/views/ad/list.vue

@@ -199,14 +199,14 @@ export default {
       })
     },
     getImage(imageUrl) {
-      return SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
+      return imageUrl.indexOf('http') > -1 ? imageUrl : SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
     },
     getContent(aid) {
       let titles = this.allArticle.filter(article => article.ID === aid).map(article => article.TITLE);
       return titles.length > 0 ? titles[0] : aid;
     },
     getHref(link) {
-        return link.indexOf('http') > 0 ? link : 'http://' + link;
+        return link.indexOf('http') > -1 ? link : 'http://' + link;
     },
   }
 }

+ 7 - 5
frontendEle/src/views/dashboard/index.vue

@@ -33,12 +33,14 @@
     <el-carousel trigger="click" :height="bannerHeight+'px'">
       <el-carousel-item v-for="(item,key) in slides" :key="key">
         <template v-if="item.TYPE==='1'">
-          <a :href="item.CONTENT" target="_blank" class="islide">
-            <img ref="bannerHeight" :src="item.IMAGE" alt="" @load="imgLoad">
-          </a>
+          <router-link :to="`/shop/index`" target="_self" class="islide">
+            <img ref="bannerHeight" :src="imageArticle(item.IMAGE)" alt="" @load="imgLoad">
+          </router-link>
         </template>
         <template v-else>
-          <router-link :to="`/article/detail/${item.CONTENT}`" target="_blank" class="islide"><img ref="bannerHeight" :src="imageArticle(item.IMAGE)" alt="" @load="imgLoad"></router-link>
+          <router-link :to="`/article/detail/${item.CONTENT}`" target="_blank" class="islide">
+            <img ref="bannerHeight" :src="imageArticle(item.IMAGE)" alt="" @load="imgLoad">
+          </router-link>
         </template>
       </el-carousel-item>
     </el-carousel>
@@ -154,7 +156,7 @@
         }
       },
       imageArticle(imageUrl) {
-        return SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
+        return imageUrl.indexOf('http') > -1 ? imageUrl : SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
       },
     }
   }