Ver Fonte

购物车

chao há 4 anos atrás
pai
commit
70b2e04e27

+ 1 - 1
src/main/resources/static/css/shopping/cart.css

@@ -43,7 +43,7 @@ li{list-style:none}
     .listWrap .supplierInfo .c2{text-align:left;width:800px}
     .listWrap .check{width:14px;height:14px;line-height:14px;vertical-align:middle}
     .listWrap .image{display:block;width:100px;height:100px;border:1px solid #F7F7F7}
-    .listWrap .name{line-height:20px;display:inline-block;max-height:100px;overflow:hidden;vertical-align:middle}
+    .listWrap .name, .listWrap .unit{line-height:20px;display:inline-block;max-height:100px;overflow:hidden;vertical-align:middle}
     .listWrap .cartItem .name{padding-left:14px}
     .listWrap .cartItem .name .tag{display: inline-block;background:#f94b4b;color:#FFF;font-size:12px;padding:0 6px;height:20px;line-height:20px;border-radius:2px;font-style:normal;margin-right:5px}
     .listWrap .c7 em,.listWrap .c10 em{color:#f94b4b;font-style:normal}

+ 1 - 1
src/main/resources/static/css/supplier/index.css

@@ -45,7 +45,7 @@ li{list-style:none}
 .supplierInfo .productBox{box-sizing:border-box;width:100%;overflow:hidden;}
 .supplierInfo .productList{width:1200px;margin-left:-8px;margin-bottom:18px;}
 .supplierInfo .productBox .title{color:#4A4F58;font-size:20px;height:54px;line-height:54px}
-
+.supplierInfo .productItem {margin-bottom: 16px;}
 
 
 }

+ 2 - 3
src/main/resources/static/js/article/list.js

@@ -199,10 +199,9 @@ var articleList = new Vue({
                     var totalPage = Math.ceil(_self.listRecord / _self.params.size)?Math.ceil(_self.listRecord / _self.params.size):1;
                     var next = _self.params.num+1;
                     if(next <= totalPage){
-                        _self.params.num = next;
-                        requestParams.pageNum = next;
                         if (_self.requestFlag){
-                            console.log(_self.params);
+                            _self.params.num = next;
+                            requestParams.pageNum = next;
                             // 获取列表数据
                             _self.getArticleList(requestUrl, requestParams);
                         }

+ 1 - 2
src/main/resources/static/js/equipment/list.js

@@ -109,9 +109,8 @@ var equipmentList = new Vue({
                     var totalPage = Math.ceil(_self.listRecord / _self.params.size)?Math.ceil(_self.listRecord / _self.params.size):1;
                     var next = _self.params.num+1;
                     if(next <= totalPage){
-                        _self.params.num = next;
                         if (_self.requestFlag){
-                            console.log(_self.params);
+                            _self.params.num = next;
                             // 获取列表数据
                             _self.getListByKeyword();
                         }

+ 1 - 2
src/main/resources/static/js/product/list.js

@@ -216,9 +216,8 @@ var productList = new Vue({
                     var totalPage = Math.ceil(_self.listRecord / _self.params.size)?Math.ceil(_self.listRecord / _self.params.size):1;
                     var next = _self.params.num+1;
                     if(next <= totalPage){
-                        _self.params.num = next;
                         if (_self.requestFlag){
-                            console.log(_self.params);
+                            _self.params.num = next;
                             if (_self.searchFlag) {
                                 // 获取列表数据
                                 _self.getListByKeyword();

+ 1 - 1
src/main/resources/static/js/single-page/promotions.js

@@ -92,8 +92,8 @@ var promotionsList = new Vue({
                     var totalPage = Math.ceil(_self.listRecord / _self.params.size)?Math.ceil(_self.listRecord / _self.params.size):1;
                     var next = _self.params.num+1;
                     if(next <= totalPage){
-                        _self.params.num = next;
                         if (_self.requestFlag){
+                            _self.params.num = next;
                             // 获取列表数据
                             _self.gePromotionsList();
                         }

+ 1 - 2
src/main/resources/static/js/supplier/list.js

@@ -115,9 +115,8 @@ var supplierList = new Vue({
                     var totalPage = Math.ceil(_self.listRecord / _self.params.size)?Math.ceil(_self.listRecord / _self.params.size):1;
                     var next = _self.params.num+1;
                     if(next <= totalPage){
-                        _self.params.num = next;
                         if (_self.requestFlag){
-                            console.log(_self.params);
+                            _self.params.num = next;
                             // 获取列表数据
                             _self.getListByKeyword();
                         }

+ 1 - 1
src/main/resources/templates/shopping/cart.html

@@ -63,7 +63,7 @@
                             <span v-text="cart.name"></span>
                         </a>
                     </div>
-                    <div class="c3"><span v-if="!isPC">包装规格:</span><span v-text="cart.unit"></span></div>
+                    <div class="c3"><span v-if="!isPC">包装规格:</span><span class="unit" v-text="cart.unit"></span></div>
                     <div class="c4">
                         <span class="price">
                             <em v-text="'¥'+toFloat(cart.price)"></em>

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

@@ -81,6 +81,7 @@
                     </ul>
                 </div>
                 <div class="part">
+                    <div class="title">供应商产品</div>
                     <!--主推商品列表-->
                     <ul class="productList clear mfw">
                         <li class="productItem mfc" v-for="p in productLists">