Pārlūkot izejas kodu

updated:信息中心&美博会快捷运营小需求更新

xiebaomin 1 gadu atpakaļ
vecāks
revīzija
fca3c6d8db

+ 67 - 65
src/main/resources/templates/article/components/article-sidebar.html

@@ -1,84 +1,86 @@
 <html xmlns:th="http://www.w3isRossShow.org/1999/xhtml">
-<div class="other" id="articleSide" v-cloak th:if="${isSelectInfo}">
-    <!--    &lt;!&ndash;侧边栏Ross广告图&ndash;&gt;-->
-    <!--    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">-->
-    <!--        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>-->
-    <!--    </div>-->
-    <div v-if="isPC && recommend.list && recommend.list.length > 0" class="recommend">
-        <p class="classify readerSify">
-            热门推荐
-            <span class="nextPreBtn">
+<div class="other">
+    <div class="other" id="articleSide" v-cloak th:if="${isSelectInfo}">
+        <!--    &lt;!&ndash;侧边栏Ross广告图&ndash;&gt;-->
+        <!--    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">-->
+        <!--        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>-->
+        <!--    </div>-->
+        <div v-if="isPC && recommend.list && recommend.list.length > 0" class="recommend">
+            <p class="classify readerSify">
+                热门推荐
+                <span class="nextPreBtn">
                 <span v-if="recommend.nextPage" class="next" @click="getRecommend(typeId, recommend.nextPage)"></span>
                 <span v-if="recommend.prePage" class="pre" @click="getRecommend(typeId, recommend.prePage)"></span>
             </span>
-        </p>
-        <div class="row" v-for="item in recommend.list">
-            <div class="new-img xiao">
-                <a :href="'/info/detail-'+item.id+'-1.html'" target="_blank">
-                    <img :src="item.image"/>
-                </a>
-            </div>
-            <div class="new-blurb xiao">
-                <a :href="'/info/detail-'+item.id+'-1.html'" target="_blank">
-                    <p class="shuoming" v-html="item.title"></p>
-                </a>
+            </p>
+            <div class="row" v-for="item in recommend.list">
+                <div class="new-img xiao">
+                    <a :href="'/info/detail-'+item.id+'-1.html'" target="_blank">
+                        <img :src="item.image"/>
+                    </a>
+                </div>
+                <div class="new-blurb xiao">
+                    <a :href="'/info/detail-'+item.id+'-1.html'" target="_blank">
+                        <p class="shuoming" v-html="item.title"></p>
+                    </a>
+                </div>
             </div>
         </div>
-    </div>
-    <div v-if="isPC" class="recommend" th:if="${#arrays.length(productSellNumbers)} > 0">
-        <p class="classify readerSify">
-            你可能感兴趣的商品
-            <span class="more-product">
+        <div v-if="isPC" class="recommend" th:if="${#arrays.length(productSellNumbers)} > 0">
+            <p class="classify readerSify">
+                你可能感兴趣的商品
+                <span class="more-product">
 <!--                <span v-if="recommend.nextPage" class="next" @click="getRecommend(typeId, recommend.nextPage)"></span>-->
-                <!--                <span v-if="recommend.prePage" class="pre" @click="getRecommend(typeId, recommend.prePage)"></span>-->
+                    <!--                <span v-if="recommend.prePage" class="pre" @click="getRecommend(typeId, recommend.prePage)"></span>-->
                 <a href="/product/list.html">更多 ></a>
             </span>
-        </p>
-        <div class="row" th:each="product: ${productSellNumbers}" >
-            <div class="new-img xiao">
-                <a th:href="'/product-'+${product.id}+'.html'" target="_blank">
-                    <img th:src="${product.image}"/>
-                </a>
-            </div>
-            <div class="new-blurb xiao">
-                <a th:href="'/product-'+${product.id}+'.html'" target="_blank">
-                    <p class="shuoming" th:text="${product.name}"></p>
-                </a>
+            </p>
+            <div class="row" th:each="product: ${productSellNumbers}" >
+                <div class="new-img xiao">
+                    <a th:href="'/product-'+${product.id}+'.html'" target="_blank">
+                        <img th:src="${product.image}"/>
+                    </a>
+                </div>
+                <div class="new-blurb xiao">
+                    <a th:href="'/product-'+${product.id}+'.html'" target="_blank">
+                        <p class="shuoming" th:text="${product.name}"></p>
+                    </a>
+                </div>
             </div>
         </div>
-    </div>
-    <div v-if="isPC" class="recommend" th:if="${#arrays.length(archiveFiles)} > 0">
-        <p class="classify readerSify">
-            您可能感兴趣的美业资料
-            <span class="more-product">
+        <div v-if="isPC" class="recommend" th:if="${#arrays.length(archiveFiles)} > 0">
+            <p class="classify readerSify">
+                您可能感兴趣的美业资料
+                <span class="more-product">
 <!--                <span v-if="recommend.nextPage" class="next" @click="getRecommend(typeId, recommend.nextPage)"></span>-->
-                <!--                <span v-if="recommend.prePage" class="pre" @click="getRecommend(typeId, recommend.prePage)"></span>-->
+                    <!--                <span v-if="recommend.prePage" class="pre" @click="getRecommend(typeId, recommend.prePage)"></span>-->
                 <a href="/info/articlerecommendation-0-1.html?isDocument">更多 ></a>
             </span>
-        </p>
-        <div class="row" th:each="file: ${archiveFiles}">
-            <div class="new-img xiao">
-                <a href="javascript:void(0);" th:onclick="handleFileUrl([[${file.productId}]])" target="_blank">
-                    <img src="/img/article/PC--pdf.png" th:if="${#strings.containsIgnoreCase(file.fileName, 'pdf')}">
-                    <img src="/img/info/PC-doc.png" th:if="${#strings.containsIgnoreCase(file.fileName, 'doc')}">
-                    <img src="/img/info/PC-ppt.png" th:if="${#strings.containsIgnoreCase(file.fileName, 'ppt')}">
-                </a>
-            </div>
-            <div class="new-blurb xiao">
-                <a target="_blank" href="javascript:void(0);" th:onclick="handleFileUrl([[${file.productId}]])">
-                    <p class="shuoming" th:text="${file.fileName}"></p>
-                </a>
+            </p>
+            <div class="row" th:each="file: ${archiveFiles}">
+                <div class="new-img xiao">
+                    <a href="javascript:void(0);" th:onclick="handleFileUrl([[${file.productId}]])" target="_blank">
+                        <img src="/img/article/PC--pdf.png" th:if="${#strings.containsIgnoreCase(file.fileName, 'pdf')}">
+                        <img src="/img/info/PC-doc.png" th:if="${#strings.containsIgnoreCase(file.fileName, 'doc')}">
+                        <img src="/img/info/PC-ppt.png" th:if="${#strings.containsIgnoreCase(file.fileName, 'ppt')}">
+                    </a>
+                </div>
+                <div class="new-blurb xiao">
+                    <a target="_blank" href="javascript:void(0);" th:onclick="handleFileUrl([[${file.productId}]])">
+                        <p class="shuoming" th:text="${file.fileName}"></p>
+                    </a>
+                </div>
             </div>
         </div>
     </div>
-</div>
-<div v-if="isPC" class="other" th:if="${isSelectInfo}">
-    <el-carousel :autoplay="true" :height="isPC ? '343px' : '61.6vw'" :interval="3000">
-        <el-carousel-item th:each="ad : ${ads}" class="tui-img">
-            <a class="tui-img" th:href="${ad.link}" @click="clickAD(ad.id,ad.link)" target="_blank">
-                <img th:src="${ad.image}" th:alt="${ad.title}" th:onclick="handleAdvHits([[${ad}]])"/>
-            </a>
-        </el-carousel-item>
-    </el-carousel>
+    <div v-if="isPC" class="other" th:if="${isSelectInfo}">
+        <el-carousel :autoplay="true" :height="isPC ? '343px' : '61.6vw'" :interval="3000">
+            <el-carousel-item th:each="ad : ${ads}" class="tui-img">
+                <a class="tui-img" th:href="${ad.link}" @click="clickAD(ad.id,ad.link)" target="_blank">
+                    <img th:src="${ad.image}" th:alt="${ad.title}" th:onclick="handleAdvHits([[${ad}]])"/>
+                </a>
+            </el-carousel-item>
+        </el-carousel>
+    </div>
 </div>
 </html>

+ 21 - 21
src/main/resources/templates/quickOperation/index.html

@@ -85,18 +85,18 @@
                             <span class="cm-tag color1" v-if="pros.listType == 2">{{ pros.label }}</span>
                           </div>
                           <div class="cm-product-title cm-text-ellipsis-2 h44">
-                                                        <span class="cm-meibohui-tag"
-                                                              v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>
+                            <span class="cm-meibohui-tag"
+                                  v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>
                             {{pros.name}}
                           </div>
                           <div class="cm-tags cm-p-t-2 cm-p-b-2 h20">
-                            <!--                                                        <span class="cm-tag color2" v-if="pros.product.couponsLogo">优惠券</span>-->
+                            <!-- <span class="cm-tag color2" v-if="pros.product.couponsLogo">优惠券</span>-->
                             <span class="cm-tag color3" v-if="pros.listType == 2">{{ pros.label }}</span>
                             <template v-if="(pros.product.productCategory == 1 && params.userId>0) || GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                                                            <span class="cm-tag color3" v-if="pros.product.actStatus==1">
-                                                              {{pros.product.promotions.name}}
-                                                              <span class="red" v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
-                                                            </span>
+                                <span class="cm-tag color3" v-if="pros.product.actStatus==1">
+                                  {{pros.product.promotions.name}}
+                                  <span class="red" v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
+                                </span>
                             </template>
                           </div>
                           <div class="cm-prodcut-price h24">
@@ -114,10 +114,10 @@
                                       <div class="price-tag cm-left"></div>
                                       <div class="price cm-left"
                                            :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                                <span class="red">
-                                                                                  ¥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
-                                                                                  : pros.product.price) | NumFormat }}
-                                                                                </span>
+                                          <span class="red">
+                                            ¥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                            : pros.product.price) | NumFormat }}
+                                          </span>
                                       </div>
                                     </template>
                                     <!-- 样式3 -->
@@ -222,18 +222,18 @@
                           <span class="cm-tag color1" v-if="pros.listType == 2">{{ pros.label }}</span>
                         </div>
                         <div class="cm-product-title cm-text-ellipsis-2 h44">
-                                                    <span class="cm-meibohui-tag"
-                                                          v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>
+                          <span class="cm-meibohui-tag"
+                                v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>
                           {{pros.name}}
                         </div>
                         <div class="cm-tags cm-p-t-2 cm-p-b-2 h20">
                           <!--                                                     <span class="cm-tag color3" v-if="pros.product.couponsLogo">优惠券</span>-->
                           <span class="cm-tag color2" v-if="pros.listType == 2">{{ pros.label }}</span>
                           <template v-if="(pros.product.productCategory == 1 && params.userId>0) || GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                                                        <span class="cm-tag color3" v-if="pros.product.actStatus==1">
-                                                          {{pros.product.promotions.name}}
-                                                          <span class="red" v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
-                                                        </span>
+                              <span class="cm-tag color3" v-if="pros.product.actStatus==1">
+                                {{pros.product.promotions.name}}
+                                <span class="red" v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
+                              </span>
                           </template>
                         </div>
                         <div class="cm-prodcut-price h24">
@@ -250,10 +250,10 @@
                                   <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                     <div class="price-tag  cm-left"></div>
                                     <div class="price  cm-left" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                                <span class="red">
-                                                                                  ¥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
-                                                                                  : pros.product.price) | NumFormat }}
-                                                                                </span>
+                                        <span class="red">
+                                          ¥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                          : pros.product.price) | NumFormat }}
+                                        </span>
                                     </div>
                                   </template>
                                   <!-- 样式3 -->