Merge remote-tracking branch 'remotes/origin/developerC' into developerA

src/main/resources/static/css/shopping/shopping.css

@@ -308,13 +308,16 @@ li{list-style:none}
     .couponWrap .coupon-list-cell{background: url("/img/account/icon-coupon-uesb@h52x.png") no-repeat;background-size: cover;}
 
     /* 底部结算 */
-    .summaryWrap{width:100%;background:#FFF;margin:1.4vw 0}
+    .listWrap{padding-bottom: 24vw;}
+    .summaryWrap{width:100%;background:#FFF;position: fixed;bottom: 0;left: 0;}
     .summaryWrap .summary{width:93vw;margin:0 auto;font-size:3.4vw;padding:1.5vw 0}
     .summaryWrap .summary em{font-style:normal}
     .summaryWrap .summary .left{height:9.4vw;line-height:9.4vw}
     .summaryWrap .summary .right{height:11.2vw;line-height:11.2vw}
+    .summaryWrap .summary .right .item{float: left;}
     .summaryWrap .summary .item.priceTotal{float: left;margin-left: 11vw;}
-    .summaryWrap .summary .item p.priceTotal-t{height: 6.6vw;font-size: 3.4vw;display: inline-block;width: 100%;float: left;text-align: left;line-height:6.6vw;}
+    .summaryWrap .summary .item p.priceTotal-t{height:11.2vw;line-height:11.2vw;font-size: 3.4vw;display: inline-block;width: 100%;float: left;text-align: left;}
+    .summaryWrap .summary .item.priceTotal p.priceTotal-t{height: 6.6vw;line-height: 6.6vw;}
     .summaryWrap .summary .item p.priceTotal-b{height: 4.6vw;font-size: 3vw;display: inline-block;width: 100%;float: left;text-align: left;line-height: 4.6vw;}
     .summaryWrap .summary .check{width:3.5vw;height:3.5vw;line-height:3.5vw;vertical-align:top;margin:3vw 3vw 0 3.3vw}
     .summaryWrap .summary .delete{width:12vw;height:6vw;line-height:6vw;display:inline-block;text-align:center;color:#f55c5c}

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

@@ -103,9 +103,9 @@ var globalHead = new Vue({
         // 头部购物车数据
         getHeadCart: function(userId) {
             var _self = this;
-            $.getJSON(coreServer+"/order/club/cart/head",{ userId: userId }).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    var data = r.data;
+            ShoppingApi.getHeaderCartList({userId: userId},function(response){
+                if (response.code === 0 && response.data) {
+                    var data = response.data;
                     _self.headCart.cartList = data.list;
                     _self.headCart.cartCount = data.list.length;
                     _self.headCart.productCount = 0;
@@ -118,9 +118,7 @@ var globalHead = new Vue({
                     CAIMEI.Storage.clear();
                     location.href = "/login.html";
                 }
-            }).fail(function(){
-                return callback();
-            })
+            });
         },
         goCartsLinkFn:function(){
             var _self = this;

src/main/resources/static/js/common/serviceapi/shopping.service.js

@@ -36,6 +36,22 @@ var ShoppingApi = {
                 callback(res);
             });
         },
+        /**
+         * @购物车-头部购物车
+         * @param:userId 用户userId
+         */
+        getHeaderCartList: function (params, callback) {
+            Http.AjaxService({
+                url:'/order/club/cart/head',
+                type:'GET',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
         /**
          * @购物车-删除商品
          * @param:userId 用户userId