图标2

src/main/resources/static/css/base/base.pc.css

@@ -184,7 +184,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .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.p{color:#333333}
-.productItem .price .moneyicon{font-weight:bold;}
+.productItem .price .rmb{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}

src/main/resources/static/css/product/detail.h5.css

@@ -21,7 +21,6 @@ li{list-style:none}
 .productBox .detailBox .price{height:21vw}
 .productBox .detailBox .price .icon{display:inline-block;font-size:0;width:17vw;height:5vw;line-height:5vw;position:absolute;vertical-align:text-top;margin-top:.2vw}
 .productBox .detailBox .price .icon.on{position:absolute;left:0;top:0;margin:0}
-/*.productBox .detailBox .price .icon:before{width:4vw;height:4vw;background-position:55% 25.2%}*/
 .productBox .detailBox .price .icon.on:before{background-position:49% 25.2%}
 .productBox .detailBox .number{display:inline-block;width:26.6vw;line-height:6.4vw;height:6.4vw;box-sizing:border-box;border:1px solid #FFE6DC;border-radius:2px;font-size:0;white-space:nowrap;text-align:center;overflow:hidden;vertical-align:top}
 .productBox .detailBox .number>em{display:inline-block;width:6.4vw;height:6.4vw;background:#FFE6DC;font-size:4vw;line-height:6vw;vertical-align:top}

src/main/resources/static/css/product/detail.pc.css

@@ -30,13 +30,18 @@ li{list-style:none;}
 .productBox .detailBox .row .l:after{content:'';display:inline-block;width:100%}
 .productBox .detailBox .row>i{font-style:normal;}
 .productBox .detailBox .row em{font-style:normal;color:#333333;margin-left: 15px}
-.productBox .detailBox .row em.ser{color:#93979F;display:inline-block;margin-right:20px;background-image: url(/img/base/fuwu.png)}
-.productBox .detailBox .row em.ser:before{content:'\2713';display:inline-block;width:12px;height:12px;text-align:center;line-height:12px;font-size:12px;background:#E15616;border-radius:6px;color:#FFF;margin-right:5px;}
+.productBox .detailBox .row em.ser{color:#93979F;display:inline-block;margin-right:20px;}
+.productBox .detailBox .row em.ser:before{width:20px;height:20px;margin-right:5px;background-position:-60px 0;vertical-align:text-top;}
 .productBox .detailBox .price{height:24px}
-.productBox .detailBox .price .icon{display:inline-block;font-size:0;width:80px;height:24px;line-height:24px;position:relative;vertical-align:top}
-.productBox .detailBox .price .icon.on{position:absolute;left:0;top:0;margin:0}
-/*.productBox .detailBox .price .icon:before{width:24px;height:24px;background-position:-146px -251px}*/
-.productBox .detailBox .price .icon.on:before{background-position:-116px -251px}
+.productBox .detailBox .price .rmb{font-weight:bold;}
+.productBox .detailBox .price .icon{display:inline-block;font-size:0;height:24px;line-height:24px;vertical-align:text-top;}
+.productBox .detailBox .price .icon:before{width:80px;height:24px;}
+.productBox .detailBox .price .icon.i0:before{background-position:-295px -140px}
+.productBox .detailBox .price .icon.i1:before{background-position:-295px -140px}
+.productBox .detailBox .price .icon.i2:before{background-position:-295px -174px}
+.productBox .detailBox .price .icon.i3:before{background-position:-295px -208px}
+.productBox .detailBox .price .icon.i4:before{background-position:-295px -242px}
+.productBox .detailBox .price .icon.i5:before{background-position:-295px -276px}
 .productBox .detailBox .number{display:inline-block;width:96px;line-height:24px;height:24px;box-sizing:border-box;border:1px solid #FFE6DC;border-radius:2px;font-size:0;white-space:nowrap;text-align:center;overflow:hidden;vertical-align:top;}
 .productBox .detailBox .number>em{display:inline-block;width:24px;height:22px;background:#FFE6DC;font-size:20px;line-height:20px;vertical-align:top;cursor:pointer;margin: 0}
 .productBox .detailBox .number input{width:48px;border:none;line-height:22px;font-size:14px;vertical-align:top;text-align:center;color:#E15616;}

src/main/resources/static/css/supplier/index.css

@@ -70,7 +70,7 @@ li{list-style:none}
 .supplierTit .search{width:93.4vw;height:9.6vw;margin:2vw auto 0 auto;border:1px solid #FFE6DC;border-radius:2px;position:relative;overflow:hidden}
 .supplierTit .search input{border:none;outline:none;width:100%;height:9.6vw;line-height:9.2vw;font-size:3.7vw;color:#4A4F58;text-indent:2.6vw}
 .supplierTit .searchBtn{position:absolute;right:1.2vw;top:0}
-.supplierTit .searchBtn:before{content:'';display:block;width:9.6vw;height:9.6vw;background-position:33% -1%}
+.supplierTit .searchBtn:before{content:'';display:block;width:9.6vw;height:9.6vw;background-position:-24vw 1.5vw}
 .supplierInfo{margin-bottom: 2.7vw;}
 .supplierInfo .tabTit{padding:1.5vw 3.3vw;background:#FFF;position:relative;}
 .supplierInfo .tabTit span{display:inline-block;height:7.5vw;line-height:7.5vw;border-bottom:2px solid transparent;color:#93979F;font-size:3.4vw;margin-left:8vw;}

src/main/resources/static/js/base.js

@@ -168,7 +168,7 @@ $(function(){
     });
     // 顶部搜索框
     $('#topSearch').on("click", '.searchBtn', function(){
-        var type = $('#topSearch').find('[data-select]').attr("data-select")*1;
+        var type = isPC ? $('#topSearch').find('[data-select]').attr("data-select")*1 : $('#topSearch').find('select').val()*1;
         var keyword = $.trim($('#topSearch').find('.keyword').val());
         if (keyword.length < 2) {
             $.confirm({

src/main/resources/templates/index.html

@@ -85,7 +85,7 @@
                                             <template  v-else-if="p.userIdentity==3">
                                                 <em class="p" v-if="p.supplierId==shopID" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                                 <em v-else>
-                                                    <span class="moneyicon">￥</span>
+                                                    <span class="rmb">￥</span>
                                                     <i :class="'icon mIcon i'+p.priceGrade"></i>
                                                  </em>
                                             </template>
@@ -94,7 +94,7 @@
                                     </template>
                                     <template v-else>
                                        <em >
-                                             <span class="moneyicon">￥</span>
+                                             <span class="rmb">￥</span>
                                              <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>

src/main/resources/templates/product/detail.html

@@ -62,7 +62,7 @@
                     <template v-else>
                         <em class="price">
                         <span class="priceicon">￥</span>
-                            <i :class="'icon mIcon i'+p.priceGrade"></i>
+                            <i th:class="'icon mIcon i'+*{priceGrade}"></i>
                         </em>
                     </template>
                     </p>
@@ -228,9 +228,9 @@
                     </p>
                     <hr>
                     <p class="row"><span class="l">服务</span><i>：</i>
-                           <img src="/img/base/fuwu.png" alt="selected"><span class="fuwu">无忧退货</span>
-                           <img src="/img/base/fuwu.png" alt="selected"><span class="fuwu">快速退款</span>
-                           <img src="/img/base/fuwu.png" alt="selected"><span class="fuwu">正品保证</span>
+                        <em class="ser icon mIcon">无忧退货</em>
+                        <em class="ser icon mIcon">快速退款</em>
+                        <em class="ser icon mIcon">正品保证</em>
                     </p>
                     <span class="icon mIcon flag"></span>
                 </div>

src/main/resources/templates/product/list.html

@@ -130,7 +130,7 @@
                                  <template  v-else-if="p.userIdentity==3">
                                     <em class="p" v-if="p.supplierId==shopID" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                     <em v-else>
-                                        <span class="moneyicon">￥</span>
+                                        <span class="rmb">￥</span>
                                         <i :class="'icon mIcon i'+p.priceGrade"></i>
                                     </em>
                                 </template>
@@ -138,7 +138,7 @@
                         </template>
                         <template v-else>
                             <em>
-                                <span class="moneyicon">￥</span>
+                                <span class="rmb">￥</span>
                                 <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>

src/main/resources/templates/supplier/index.html

@@ -75,7 +75,7 @@
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em><span class="moneyicon">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <em><span class="rmb">￥</span><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">
                                             <a href="javascript:void(0);" class="pricebox"  @click="toLogin">登录查看价格</a>
@@ -118,9 +118,9 @@
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em><span class="moneyicon">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <em><span class="rmb">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                         <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">加入购物车</a></div>
-                                        <em><span class="moneyicon">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <em><span class="rmb">￥</span><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">
                                             <a href="javascript:void(0);" class="pricebox" @click="toLogin">登录查看价格</a>