chao 4 éve
szülő
commit
ee582b9bb3

+ 13 - 8
src/main/resources/static/css/base/base.h5.css

@@ -100,17 +100,22 @@
 .productItem .item img{width:45.4vw;height:45.4vw;display:block}
 .productItem .item .image .icon{position:absolute;right:2.4vw;top:2.4vw}
 .productItem .item .image .icon.hot:before,.productItem .item .image .icon.new:before{display:block;width:7.6vw;height:9vw}
-.productItem .item .image .icon.hot:before{background-position:10% 26%}
-.productItem .item .image .icon.new:before{background-position:-1% 26%}
+.productItem .item .image .icon.hot:before{background-position:-52vw -16.4vw}
+.productItem .item .image .icon.new:before{background-position:-43.5vw -16.4vw}
 .productItem .item .name{display:block;box-sizing:border-box;padding:2.6vw 3.5vw .4vw;height:10vw;line-height:5vw;text-align: left;}
 .productItem .item .name span{color:#93979F;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
 .productItem .item .name em{font-style: normal;color: #e15616;}
 .productItem .item .price{height:21vw;text-align:center}
-.productItem .item .price em{display:block;height:7vw;line-height:5vw;color:#4A4F58;font-style:normal;}
+.productItem .item .price em{display:block;height:7vw;line-height:7vw;color:#4A4F58;font-style:normal;}
 .productItem .item .price em.p{color:#F55C5C}
-.productItem .item .price .icon{display:inline-block;font-size:0;width:17vw;height:5vw;line-height:5vw;position:relative;vertical-align:top;margin-top:0}
-.productItem .item .price .icon.on{position:absolute;left:0;top:0;margin:0}
-.productItem .item .price .icon.on:before{background-position:49% 25.2%}
+.productItem .item .price .icon{display:inline-block;font-size:0;height:5vw;line-height:5vw;vertical-align:text-bottom;}
+.productItem .item .price .icon:before{width:11vw;height:5vw;}
+.productItem .item .price .icon.i0:before{background-position:0 -23.2vw}
+.productItem .item .price .icon.i1:before{background-position:0 -23.2vw}
+.productItem .item .price .icon.i2:before{background-position:0 -28.5vw}
+.productItem .item .price .icon.i3:before{background-position:0 -33.8vw}
+.productItem .item .price .icon.i4:before{background-position:0 -38.8vw}
+.productItem .item .price .icon.i5:before{background-position:0 -44vw}
 .productItem .item .btn{height:9vw;line-height:9vw}
 .productItem .item .btn{display:inline-block;width:35.8vw;height:9vw;text-align:center;overflow:hidden;color:#F94B4B;background:#FEF6F3;border-radius:2px}
 .productItem .item .btn.add{background:#FEF6F3;color:#E15616;}
@@ -126,8 +131,8 @@
 #scrollTop .item>span{box-sizing:border-box;display:block;padding:1.5vw;line-height:3.4vw;}
 #scrollTop .item .phone,#scrollTop .item .toTop{width:100%;height:100%;}
 #scrollTop .item .phone:before,#scrollTop .item .toTop:before{display:block;margin:0 auto;width:5.8vw;height:5.8vw;}
-#scrollTop .item .phone:before{background-position:31.5% 26%;}
-#scrollTop .item .toTop:before{background-position:21.5% 26%;}
+#scrollTop .item .phone:before{background-position:-58.8vw -9vw}
+#scrollTop .item .toTop:before{background-position:-66.8vw -9vw}
 #scrollTop .phoneHover{display:none;background-color:rgba(74,79,88,.7);z-index:999;}
 #scrollTop .phoneHover>div{box-sizing:border-box;width:74.6vw;height:107.3vw;padding-top:32vw;background:url(/img/common/hotline_m.jpg) no-repeat left top;background-size:100% 100%;border-radius:1.6vw;position:relative;top:50%;margin:-60vw auto 0 auto;line-height:9.6vw;font-size:4.2vw}
 #scrollTop .phoneHover i{font-style:normal;color:#FFF}

+ 12 - 20
src/main/resources/static/css/base/base.pc.css

@@ -182,13 +182,17 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .productItem .name span{color:#93979F;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
 .productItem .name em{font-style: normal;color: #e15616;}
 .productItem .price{height:48px;border-top: 1px solid #E15616}
-.productItem .price em{height:48px;line-height:48px;color:#4A4F58;font-style:normal;margin-left: 15px;font-weight: bold;
-    font-size: 14px}
+.productItem .price em{height:48px;line-height:48px;color:#4A4F58;font-style:normal;margin-left:15px;font-weight:bold;font-size:14px}
 .productItem .price em.p{color:#333333}
-.productItem .price .icon{display:inline-block;font-size:0;width:24px;height:24px;line-height:24px;position:relative;vertical-align:top;margin-top:12px}
-.productItem .price .icon.on{position:absolute;left:0;top:0;margin:0}
-/*.productItem .price .icon:before{width:24px;height:24px;background-position:-146px -251px}*/
-.productItem .price .icon.on:before{background-position:-116px -251px}
+.productItem .price .moneyicon{font-weight:bold;}
+.productItem .price .icon{display:inline-block;font-size:0;height:24px;line-height:24px;vertical-align:text-bottom;}
+.productItem .price .icon:before{width:80px;height:24px;}
+.productItem .price .icon.i0:before{background-position:-295px -140px}
+.productItem .price .icon.i1:before{background-position:-295px -140px}
+.productItem .price .icon.i2:before{background-position:-295px -174px}
+.productItem .price .icon.i3:before{background-position:-295px -208px}
+.productItem .price .icon.i4:before{background-position:-295px -242px}
+.productItem .price .icon.i5:before{background-position:-295px -276px}
 .productItem .btnBox{display:none;position:absolute;width:284px;height:55px;background:#E15616;text-align:center;bottom:0;left:0}
 .productItem .item:hover .btnBox{display:block}
 .productItem .item:hover .name span{color: #e15616;}
@@ -228,12 +232,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 #scrollTop .item .phoneHover a:hover{text-decoration:underline}
 #scrollTop .item:hover .phoneHover{display:block}
 
-/**/
-.mIcon.one{background-image: url(/img/base/Grade1.png)}
-    .mIcon.two{background-image: url(/img/base/Grade2.png)}
-    .mIcon.three{background-image: url(/img/base/Grade3.png)}
-    .mIcon.four{background-image: url(/img/base/Grade4.png)}
-    .mIcon.five{background-image: url(/img/base/Grade5.png)}
+
      a.pricebox{color: #fff;width: 100%;height: 100%;position: absolute;left: 0;line-height: 55px;font-size: 14px}
     .login-btn{float:right;
     margin:10px 10px 0 0;
@@ -244,14 +243,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
     height: 24px;
     line-height: 24px;
     }
-    .productItem .price .icon{
-    width: 80px;
-    height: 24px;
-    margin-top: 5px;
-    }
-    .moneyicon{
-     font-weight: bold;
-    }
+
     .activity{
     text-align: center;
     display: inline-block;

+ 8 - 8
src/main/resources/static/css/index/index.h5.css

@@ -22,14 +22,14 @@ li{list-style:none;}
 .mNavBox .first .nav{display:block;padding:2.2vw 0;text-align:center;color:#4A4F58;font-size:3.4vw;line-height:6.4vw;white-space:nowrap}
 .mNavBox .first .nav span{display:inline-block;border-bottom:1px solid transparent}
 .mNavBox .first .nav:before{display:block;width:10.8vw;height:10.8vw;margin:0 auto}
-.mNavBox .first:nth-of-type(1) .nav:before{background-position:-2% 4%}
-.mNavBox .first:nth-of-type(2) .nav:before{background-position:13% 4%}
-.mNavBox .first:nth-of-type(3) .nav:before{background-position:28% 4%}
-.mNavBox .first:nth-of-type(4) .nav:before{background-position:43% 4%}
-.mNavBox .first:nth-of-type(5) .nav:before{background-position:57% 4%}
-.mNavBox .first:nth-of-type(6) .nav:before{background-position:72% 4%}
-.mNavBox .first:nth-of-type(7) .nav:before{background-position:87% 4%}
-.mNavBox .first:nth-of-type(8) .nav:before{background-position:102% 4%}
+.mNavBox .first:nth-of-type(1) .nav:before{background-position:-43vw -27vw}
+.mNavBox .first:nth-of-type(2) .nav:before{background-position:-54vw -27vw}
+.mNavBox .first:nth-of-type(3) .nav:before{background-position:-64vw -27vw}
+.mNavBox .first:nth-of-type(4) .nav:before{background-position:-75vw -27vw}
+.mNavBox .first:nth-of-type(5) .nav:before{background-position:-85vw -27vw}
+.mNavBox .first:nth-of-type(6) .nav:before{background-position:-12vw -27vw}
+.mNavBox .first:nth-of-type(7) .nav:before{background-position:-22vw -27vw}
+.mNavBox .first:nth-of-type(8) .nav:before{background-position:-32.5vw -27vw}
 .mNavBox .first.on .nav{color:#E15621}
 .mNavBox .first.on .nav span{border-color:#E15621}
 .mNavBox .first.on .nav:before{border-radius:5.4vw;background-color:#FFE6DC}

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

@@ -86,13 +86,7 @@
                                                 <em class="p" v-if="p.supplierId==shopID" v-text="'¥'+parseFloat(p.price).toFixed(2)"></em>
                                                 <em v-else>
                                                     <span class="moneyicon">¥</span>
-                                                    <i class="icon mIcon">
-                                                        <i v-if="p.priceGrade==1" class="icon mIcon one"></i>
-                                                        <i v-if="p.priceGrade==2" class="icon mIcon two"></i>
-                                                        <i v-if="p.priceGrade==3" class="icon mIcon three"></i>
-                                                        <i v-if="p.priceGrade==4" class="icon mIcon four"></i>
-                                                        <i v-if="p.priceGrade==5" class="icon mIcon five"></i>
-                                                    </i>
+                                                    <i :class="'icon mIcon i'+p.priceGrade"></i>
                                                  </em>
                                             </template>
                                         </template>
@@ -101,13 +95,7 @@
                                     <template v-else>
                                        <em >
                                              <span class="moneyicon">¥</span>
-                                             <i class="icon mIcon">
-                                                <i v-if="p.priceGrade==1" class="icon mIcon one"></i>
-                                                <i v-if="p.priceGrade==2" class="icon mIcon two"></i>
-                                                <i v-if="p.priceGrade==3" class="icon mIcon three"></i>
-                                                <i v-if="p.priceGrade==4" class="icon mIcon four"></i>
-                                                <i v-if="p.priceGrade==5" class="icon mIcon five"></i>
-                                             </i>
+                                             <i :class="'icon mIcon i'+p.priceGrade"></i>
                                         </em>
                                         <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
                                         <div class="btnBox">

+ 1 - 7
src/main/resources/templates/product/detail.html

@@ -62,13 +62,7 @@
                     <template v-else>
                         <em class="price">
                         <span class="priceicon">¥</span>
-                            <i class="icon mIcon">
-                                <i th:if="*{priceGrade}==1" class="icon mIcon one"></i>
-                                <i th:if="*{priceGrade}==2" class="icon mIcon two"></i>
-                                <i th:if="*{priceGrade}==3" class="icon mIcon three"></i>
-                                <i th:if="*{priceGrade}==4" class="icon mIcon four"></i>
-                                <i th:if="*{priceGrade}==5" class="icon mIcon five"></i>
-                            </i>
+                            <i :class="'icon mIcon i'+p.priceGrade"></i>
                         </em>
                     </template>
                     </p>

+ 3 - 15
src/main/resources/templates/product/list.html

@@ -131,27 +131,15 @@
                                     <em class="p" v-if="p.supplierId==shopID" v-text="'¥'+parseFloat(p.price).toFixed(2)"></em>
                                     <em v-else>
                                         <span class="moneyicon">¥</span>
-                                        <i class="icon mIcon">
-                                            <i v-if="p.priceGrade==1" class="icon mIcon one"></i>
-                                            <i v-if="p.priceGrade==2" class="icon mIcon two"></i>
-                                            <i v-if="p.priceGrade==3" class="icon mIcon three"></i>
-                                            <i v-if="p.priceGrade==4" class="icon mIcon four"></i>
-                                            <i v-if="p.priceGrade==5" class="icon mIcon five"></i>
-                                        </i>
-                                     </em>
+                                        <i :class="'icon mIcon i'+p.priceGrade"></i>
+                                    </em>
                                 </template>
                             </template>
                         </template>
                         <template v-else>
                             <em>
                                 <span class="moneyicon">¥</span>
-                            <i class="icon mIcon">
-                                <i v-if="p.priceGrade==1" class="icon mIcon one"></i>
-                                <i v-if="p.priceGrade==2" class="icon mIcon two"></i>
-                                <i v-if="p.priceGrade==3" class="icon mIcon three"></i>
-                                <i v-if="p.priceGrade==4" class="icon mIcon four"></i>
-                                <i v-if="p.priceGrade==5" class="icon mIcon five"></i>
-                            </i>
+                                <i :class="'icon mIcon i'+p.priceGrade"></i>
                             </em>
                              <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
                             <div class="btnBox">

+ 1 - 3
src/main/resources/templates/supplier/index.html

@@ -107,9 +107,7 @@
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em>价格:<i class="icon mIcon" v-for="i in 5">
-                                                <i v-if="i==1||p.priceGrade>=i" class="icon mIcon on"></i>
-                                        </i></em>
+                                        <em><span class="moneyicon">¥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                         <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">加入购物车</a></div>
                                     </template>
                                 </div>