Parcourir la source

Merge remote-tracking branch 'origin/developer' into developer

zhengjinyi il y a 3 ans
Parent
commit
35af2e2bb0
1 fichiers modifiés avec 12 ajouts et 12 suppressions
  1. 12 12
      src/main/resources/templates/activity/beautyTopic.html

+ 12 - 12
src/main/resources/templates/activity/beautyTopic.html

@@ -70,7 +70,7 @@
                             <div class="swiper-container" :id="'swiper-template-' + index" data-swiper-type="1-6-2-2">
                                 <div class="swiper-wrapper">
                                     <div class="swiper-slide" v-for="(pros , index) in floorData.floorImageList">
-                                        <a target="_blank" :href="reallink(pros.link)">
+                                        <a :target="pros.link ? '_blank' : ''" :href="reallink(pros.link)">
                                             <div class="cm-product-item hover-class bg-white">
                                                 <div class="aspect">
                                                     <img width="100%" height="100%" src="/img/activity/placeholder.png"
@@ -204,7 +204,7 @@
                                 >
                                     <div class="aspect"
                                          :data-scalc="getProductScalcMap(floorData.floorContent.templateType).scalc[index]">
-                                        <a target="_blank"
+                                        <a :target="floorData.floorContent['adsLink' + (index + 1)] ? '_blank' : ''"
                                            :href="reallink(floorData.floorContent['adsLink' + (index + 1)])">
                                             <img
                                                     width="100%"
@@ -227,7 +227,7 @@
                             <!-- banner END -->
                             <div class="cm-col-md-10 cm-col-xs-30" v-for="(pros , index) in makeList(floorData,index)">
                                 <div class="cm-p-a-4">
-                                    <a target="_blank" :href="pros.link">
+                                    <a :target="pros.link ? '_blank' : ''" :href="pros.link">
                                         <div class="cm-product-item hover-class bg-white">
                                             <div class="aspect">
                                                 <img width="100%" height="100%" src="/img/activity/placeholder.png"
@@ -347,7 +347,7 @@
                                 >
                                     <div class="aspect"
                                          :data-scalc="getProductScalcMap(floorData.floorContent.templateType).scalc[index]">
-                                        <a target="_blank"
+                                        <a :target="floorData.floorContent['adsLink' + (index + 1)] ? '_blank' : ''"
                                            :href="reallink(floorData.floorContent['adsLink' + (index + 1)])">
                                             <img
                                                     width="100%"
@@ -400,7 +400,7 @@
                                 <div class="swiper-wrapper">
                                     <div class="swiper-slide" v-for="(item, item_index) in floorData.floorImageList"
                                          :key="item_index">
-                                        <a target="_blank" :href="reallink(item.link)">
+                                        <a :target="item.link ? '_blank' : ''" :href="reallink(item.link)">
                                             <!-- 模板3 -->
                                             <div
                                                     class="cm-article-item h200 bg-white cm-p-a-8 cm-flex-j-between"
@@ -463,7 +463,7 @@
                                     v-for="(item, item_index) in makeList(floorData,index)"
                                     :key="item_index"
                             >
-                                <a target="_blank" :href="reallink(item.link)">
+                                <a :target="item.link ? '_blank' : ''" :href="reallink(item.link)">
                                     <div class="cm-p-a-4">
                                         <!-- 3 -->
                                         <div
@@ -524,7 +524,7 @@
                             <div class="cm-scroll-container">
                                 <div class="cm-scroll-item" v-for="(item, item_index) in floorData.floorImageList"
                                      :key="item_index">
-                                    <a target="_blank" :href="reallink(item.link)">
+                                    <a :target="item.link ? '_blank' : ''" :href="reallink(item.link)">
                                         <div class="cm-article-item bg-white">
                                             <div class="cm-article-cover aspect"
                                                  :data-scalc="getArticleScalcMap(floorData.floorContent.templateType).scalc">
@@ -573,7 +573,7 @@
                                                 class="bg-white hover-class aspect cm-relative"
                                                 :data-scalc="getImageScalcMap(floorData.floorContent.templateType).scalc"
                                         >
-                                            <a target="_blank" :href="reallink(item.link)">
+                                            <a :target="item.link ? '_blank' : ''" :href="reallink(item.link)">
                                                 <img width="100%" height="100%" :src="item.appletsImage" alt=""
                                                      v-if="isMobile"/>
                                                 <img width="100%" height="100%" :src="item.image" alt="" v-else/>
@@ -601,7 +601,7 @@
                                      :key="item_index">
                                     <div class="bg-white aspect"
                                          :data-scalc="getImageScalcMap(floorData.floorContent.templateType).scalc">
-                                        <a target="_blank" :href="reallink(item.link)">
+                                        <a :target="item.link ? '_blank' : ''" :href="reallink(item.link)">
                                             <img width="100%" height="100%" :src="item.appletsImage" alt=""
                                                  v-if="isMobile"/>
                                             <img width="100%" height="100%" :src="item.image" alt="" v-else/>
@@ -629,7 +629,7 @@
                                      :key="item_index">
                                     <div class="bg-white aspect cm-relative"
                                          :data-scalc="getImageScalcMap(floorData.floorContent.templateType).scalc">
-                                        <a target="_blank" :href="reallink(item.link)">
+                                        <a :target="item.link ? '_blank' : ''" :href="reallink(item.link)">
                                             <img width="100%" height="100%" :src="item.appletsImage" alt=""
                                                  v-if="isMobile"/>
                                             <img width="100%" height="100%" :src="item.image" alt="" v-else/>
@@ -668,7 +668,7 @@
                                                             class="bg-white aspect cm-relative"
                                                             :data-scalc="getVideoScalcMap(floorData.floorContent.templateType).scalc"
                                                     >
-                                                        <a target="_blank" :href="reallink(item.link)">
+                                                        <a :target="item.link ? '_blank' : ''" :href="reallink(item.link)">
 																<span
                                                                         class="cm-cover-tag color1 cm-absolute cm-top-right"
                                                                         v-if="makeVideoStatus(floorData,i_index + 1) === 2"
@@ -715,7 +715,7 @@
                                                 class="bg-white aspect cm-relative cm-radius-4"
                                                 :data-scalc="getVideoScalcMap(floorData.floorContent.templateType).scalc"
                                         >
-                                            <a target="_blank" :href="reallink(item.link)">
+                                            <a :target="item.link ? '_blank' : ''" :href="reallink(item.link)">
                                                 <span class="cm-cover-tag color2 cm-absolute cm-top-right">已开始</span>
                                                 <img width="100%" height="100%" :src="item.appletsImage" alt=""
                                                      v-if="isMobile"/>