zhengjinyi преди 4 години
родител
ревизия
2e2b7a5d51
променени са 3 файла, в които са добавени 30 реда и са изтрити 4 реда
  1. 1 1
      src/main/resources/static/css/base/base.pc.css
  2. 1 1
      src/main/resources/static/js/index.js
  3. 28 2
      src/main/resources/templates/index.html

+ 1 - 1
src/main/resources/static/css/base/base.pc.css

@@ -75,7 +75,7 @@ iframe{width:320px !important;height: 280px !important}
 
 /* 购物车 */
 .baseHeadTop li.headCart{position:relative;}
-.baseHeadTop li.headCart .addBtn{display:inline-block;width:100%;height:44px;line-height:44px;box-sizing:border-box;position:relative;color:#333;font-size:14px;text-align:center;white-space:nowrap}
+.baseHeadTop li.headCart .addBtn{display:inline-block;width:100%;height:40px;line-height:40px;box-sizing:border-box;position:relative;color:#333;font-size:14px;text-align:center;white-space:nowrap}
 .baseHeadTop li.headCart .addBtn:before{display:inline-block;width:20px;height:20px;vertical-align:middle;background-position:-30px -1px;margin-right:2px}
 .baseHeadTop li.headCart .addBtn em{color:#E15616;font-style:normal;margin-left:4px;}
 .baseHeadTop .cartData{display:none;position:absolute;right:0;top:40px;width:360px;box-sizing:border-box;background:#FFF;z-index:999;box-shadow:0px 3px 6px rgba(45,48,54,0.2);border-radius:2px}

+ 1 - 1
src/main/resources/static/js/index.js

@@ -179,7 +179,7 @@ var homeData = new Vue({
                         titCell:".swiper-pagination span",
                         effect: "leftLoop",
                         interTime: 3000,
-                        loop:true,
+                        // loop:true,
                         autoPlay: true,
                         scroll:5,
                         vis:5

+ 28 - 2
src/main/resources/templates/index.html

@@ -150,6 +150,9 @@
                                                     </div>
                                                 </template>
                                                 <template v-else>
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                    </div>
                                                     <div class="main_price_none">
                                                         <em class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
                                                         <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -231,6 +234,9 @@
                                                     </div>
                                                 </template>
                                                 <template v-else>
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                    </div>
                                                     <div class="main_price_none">
                                                         <em class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
                                                         <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -312,6 +318,9 @@
                                                     </div>
                                                 </template>
                                                 <template v-else>
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                    </div>
                                                     <div class="main_price_none">
                                                         <em class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
                                                         <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -397,6 +406,9 @@
                                                     </div>
                                                 </template>
                                                 <template v-else>
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                    </div>
                                                     <div class="main_price_none">
                                                         <em class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
                                                         <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -474,6 +486,9 @@
                                                     </div>
                                                 </template>
                                                 <template v-else>
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                    </div>
                                                     <div class="main_price_none">
                                                         <em class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
                                                         <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -547,6 +562,9 @@
                                                     </div>
                                                 </template>
                                                 <template v-else>
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                    </div>
                                                     <div class="main_price_none">
                                                         <em class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
                                                         <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -621,6 +639,9 @@
                                                     </div>
                                                 </template>
                                                 <template v-else>
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                    </div>
                                                     <div class="main_price_none">
                                                         <em class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
                                                         <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -684,8 +705,13 @@
                                                             <div class="main_price_unde">¥会员可见</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_none">
+                                                                <em class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
                                                         </template>
                                                     </template>
                                                 </template>