SKU

src/main/resources/static/css/pay/caimei-pay.css

@@ -54,9 +54,10 @@
     .pay-goods .good-main .list-title .t-li:nth-child(1){width: 8%;}
     .pay-goods .good-main .list-title .t-li:nth-child(2){width: 15%;}
     .pay-goods .good-main .list-title .t-li:nth-child(3){width: 27%;}
-    .pay-goods .good-main .list-title .t-li:nth-child(4){width: 15%;}
+    .pay-goods .good-main .list-title .t-li:nth-child(4){width: 10%;}
     .pay-goods .good-main .list-title .t-li:nth-child(5){width: 15%;}
-    .pay-goods .good-main .list-title .t-li:nth-child(6){width: 20%;}
+    .pay-goods .good-main .list-title .t-li:nth-child(6){width: 10%;}
+    .pay-goods .good-main .list-title .t-li:nth-child(7){width: 15%;}
 
     .pay-goods .good-main .list-container{width: 100%;height: auto;background: #ffffff;padding: 10px 20px;float: left;border-bottom: 1px solid #F7F7F7;opacity: 1;box-sizing: border-box;}
     .pay-goods .good-main .list-container.active{height: 0;opacity: 0;}
@@ -66,9 +67,10 @@
     .pay-goods .good-main .list-container .list-main .t-li:nth-child(1){width: 8%;}
     .pay-goods .good-main .list-container .list-main .t-li:nth-child(2){width: 15%;}
     .pay-goods .good-main .list-container .list-main .t-li:nth-child(3){width: 27%;text-align: justify;text-overflow:ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;}
-    .pay-goods .good-main .list-container .list-main .t-li:nth-child(4){width: 15%;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(4){width: 10%;}
     .pay-goods .good-main .list-container .list-main .t-li:nth-child(5){width: 15%;}
-    .pay-goods .good-main .list-container .list-main .t-li:nth-child(6){width: 20%;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(6){width: 10%;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(7){width: 15%;}
     .pay-goods .good-main .list-container .list-main .t-li img{width: 30px;height: 30px;border-radius: 5px;background-color: #f7f7f7;margin-top: 9px;}
     .pay-goods .good-main .list-container .list-main .t-li .tag{display: block; position: absolute;z-index: 10;left: 50%;top: 33px;transform: translateX(-50%);width: 40px;font-size: 12px;background: #FF2A2A;color: #fff;line-height: 18px;text-align: center;border-radius: 0 0 4px 4px}
     .pay-goods .good-main .ws-list-container .list-main {height: 60px !important;}

src/main/resources/static/css/pay/caimei-paylist.css

@@ -13,9 +13,9 @@
     .pay-list-title{width: 100%;height: 56px;background-color: #FFFFFF;padding: 0 16px;box-sizing: border-box;margin-bottom: 10px;}
     .pay-list-title .pay-list-view{float: left;line-height: 56px;font-size: 14px;color: #627386;text-align: left;}
     .pay-list-title .pay-list-view.t1{width: 40%;}
-    .pay-list-title .pay-list-view.t2{width: 30%;}
+    .pay-list-title .pay-list-view.t2{width: 20%;}
     .pay-list-title .pay-list-view.t3{width: 15%;}
-    .pay-list-title .pay-list-view.t4{width: 15%;}
+    .pay-list-title .pay-list-view.t4{width: 10%;}
     .pay-list-cell{width: 100%;height: auto;box-sizing: border-box;padding: 0 16px 20px 16px;background-color: #FFFFFF;margin-bottom: 10px;}
     .pay-list-cell .list-cell-title{width: 100%;height:60px;box-sizing: border-box;padding:10px 0;border-bottom: 1px solid #E1E1E1;}
     .pay-list-cell .list-cell-title .list-cell-logo{width: 40px;height: 40px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;float: left;}
@@ -24,9 +24,9 @@
     .pay-list-cell .list-cell-content{width: 100%;height: 134px;box-sizing: border-box;padding: 17px 0;}
     .pay-list-cell .list-cell-pros{float: left;}
     .pay-list-cell .list-cell-pros.p1{width: 40%;}
-    .pay-list-cell .list-cell-pros.p2{width: 30%;}
+    .pay-list-cell .list-cell-pros.p2{width: 20%;}
     .pay-list-cell .list-cell-pros.p3{width: 15%;}
-    .pay-list-cell .list-cell-pros.p4{width: 15%;}
+    .pay-list-cell .list-cell-pros.p4{width: 10%;}
     .pay-list-cell .list-cell-pros.p1 .cell-pros-image{width: 100px;height: 100px;float: left;margin-right: 16px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;}
     .pay-list-cell .list-cell-pros.p1 .cell-pros-image img{width: 100%;height: 100%;display: block;}
     .pay-list-cell .list-cell-pros.p1 .cell-pros-name{width: 300px;float: left;height: 100px;box-sizing: border-box;padding:30px 0;}

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

@@ -121,6 +121,12 @@ li{list-style:none;}
 .product-supporting-list .tr-3 .sku-popup-viw .sku-image img{width: 100%;height: 100%;display: block}
 .product-supporting-list .tr-3 .sku-popup-viw .sku-price{width: 200px;height: 80px;float: left;box-sizing: border-box;padding-left: 16px;padding-top: 16px;text-align: left;color: #F94B4B;}
 .product-supporting-list .tr-3 .sku-popup-viw .sku-price .price_grade{float: left;width: 100%;margin-bottom: 10px;}
+.product-supporting-list .tr-3 .sku-popup-viw .sku-price .icon:before{width:63px;height: 22px;}
+.product-supporting-list .tr-3 .sku-popup-viw .sku-price .icon.i1:before{background-position:-2px -715px}
+.product-supporting-list .tr-3 .sku-popup-viw .sku-price .icon.i2:before{background-position:-2px -745px}
+.product-supporting-list .tr-3 .sku-popup-viw .sku-price .icon.i3:before{background-position:-2px -775px}
+.product-supporting-list .tr-3 .sku-popup-viw .sku-price .icon.i4:before{background-position:-2px -805px}
+.product-supporting-list .tr-3 .sku-popup-viw .sku-price .icon.i5:before{background-position:-2px -835px}
 .product-supporting-list .tr-3 .sku-popup-viw .sku-price .main_price_show{float: left;width: 100%;margin-bottom: 10px;color: #F94B4B;text-align: left;}
 .product-supporting-list .tr-3 .sku-popup-viw .sku-price .price_text_tag{float: left;}
 .product-supporting-list .tr-3 .sku-popup-viw .sku-price .couponTag{float: left;margin-right: 5px;}
@@ -149,11 +155,11 @@ li{list-style:none;}
 
 .product-supporting-list .tr-4{width:20%;box-sizing: border-box;padding: 16px 0 0 44px;text-align: left;}
 .product-supporting-list .tr-4 .price .icon:before{width:63px;height: 22px;}
-.product-supporting-list .tr-4 .price .icon.i5:before{background-position:-2px -835px}
 .product-supporting-list .tr-4 .price .icon.i1:before{background-position:-2px -715px}
 .product-supporting-list .tr-4 .price .icon.i2:before{background-position:-2px -745px}
 .product-supporting-list .tr-4 .price .icon.i3:before{background-position:-2px -775px}
 .product-supporting-list .tr-4 .price .icon.i4:before{background-position:-2px -805px}
+.product-supporting-list .tr-4 .price .icon.i5:before{background-position:-2px -835px}
 .product-supporting-list .tr-4 .price .price_text_tag .svip-tag{-webkit-transform: translateX(4px);-ms-transform: translateX(4px);transform: translateX(4px);}
 .product-supporting-list .tr-4 .price .price_text_tag .listTag{-webkit-transform: translateX(4px);-ms-transform: translateX(4px);transform: translateX(4px);margin: 0;float: left;}
 .product-supporting-list .tr-4 .price .svip-tag{width:100%;height:22px;letter-spacing:0}

src/main/resources/static/css/product/product-supporting.h5.css

@@ -37,8 +37,13 @@
     .supporting-list .list-unit .sku-popup-viw .sku-price .price_text_tag{float: left;line-height: 22px;}
     .supporting-list .list-unit .sku-popup-viw .sku-price .couponTag{float: left;margin-right: 5px;}
     .supporting-list .list-unit .sku-popup-viw .sku-price .icon{float: left;}
-    .supporting-list .list-unit .sku-popup-viw .sku-price .icon:before {width: 15.8vw;height: 5vw;}
-    .supporting-list .list-unit .sku-popup-viw .sku-price .icon:before {background-position: -84vw -90.7vw;}
+    .supporting-list .list-unit .sku-popup-viw .sku-price .mIcon:before {width: 15.8vw;height: 5vw;}
+    .supporting-list .list-unit .sku-popup-viw .sku-price .mIcon:before {background-position: -84vw -90.7vw;}
+    .supporting-list .list-unit .sku-popup-viw .sku-price .mIcon.i5:before {background-position: -84vw -97.5vw;}
+    .supporting-list .list-unit .sku-popup-viw .sku-price .mIcon.i1:before {background-position: -84vw -69.5vw;}
+    .supporting-list .list-unit .sku-popup-viw .sku-price .mIcon.i2:before {background-position: -84vw -76.5vw;}
+    .supporting-list .list-unit .sku-popup-viw .sku-price .mIcon.i3:before {background-position: -84vw -83.7vw;}
+    .supporting-list .list-unit .sku-popup-viw .sku-price .mIcon.i4:before {background-position: -84vw -90.7vw;}
     .supporting-list .list-unit .sku-popup-viw .sku-price .svip-tag{height:22px;letter-spacing:0;float: left;}
     .supporting-list .list-unit .sku-popup-viw .sku-price .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:4.8vw;text-align:center;line-height:4.8vw;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333;}
     .supporting-list .list-unit .sku-popup-viw .sku-price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}

src/main/resources/static/js/product/detail.js

@@ -181,6 +181,7 @@ var productDetail = new Vue({
                     _self.pcActType = product.pcActType;
                     _self.productStock = product.stock;
                     _self.addParams.skuId = product.skus[0].skuId;
+                    _self.ladderList = product.skus[0].ladderPriceList ? product.skus[0].ladderPriceList : [];
                     _self.beautyActFlag = product.beautyActFlag;
                     _self.productTypeName = product.typeName;
                     _self.recommendType = product.recommendType ? product.recommendType : 0;

src/main/resources/static/js/product/mixins/productMixins.js

@@ -83,6 +83,7 @@ var productMixins = function () {
             handleChoisSku(sku,index){
                 this.skuIndex = index;
                 this.priceObj.originalPrice = sku.originalPrice;
+                this.priceObj.normalPrice = sku.normalPrice;
                 this.priceObj.price = sku.price;
                 this.addParams.skuId = sku.skuId;
                 this.number = this.priceObj.minBuyNumber = sku.minBuyNumber;

src/main/resources/static/js/product/mixins/supportMixins.js

@@ -8,7 +8,8 @@ var supportMixins = function () {
                 skuSupportingIndex:0,
                 isbtnDisable:false,
                 handldSku:{},
-                handlePros:{}
+                handlePros:{},
+                suppPriceGrade:0
             }
         },
         mounted: function() {
@@ -36,6 +37,8 @@ var supportMixins = function () {
                 this.handlePros.price = sku.price
                 this.handlePros.originalPrice = sku.originalPrice
                 this.isbtnDisable = sku.stock === 0;
+                pros.priceGrade  = sku.priceGrade
+                console.log('priceGrade',pros.priceGrade)
             },
             handleSupportingSubmit (type) {
                 var _self = this;

src/main/resources/static/js/shopping/cart.js

@@ -471,9 +471,9 @@ var shoppingCart = new Vue({
                  }
             )
         },
-        deleteCart: function(productIds){
+        deleteCart: function(skuIds){
             var _self = this;
-            ShoppingApi.DeleteCartProducts({userId:_self.userId,productIds:productIds},function(response){
+            ShoppingApi.DeleteCartProducts({userId:_self.userId,skuIds:skuIds},function(response){
                 if(response.code === 0){
                     CAIMEI.dialog('删除成功',true,function () {
                         _self.getCartLists();
@@ -487,22 +487,22 @@ var shoppingCart = new Vue({
             var _self = this;
             var delGoodsList='';
             _self.invalidData.forEach(function(item){
-                delGoodsList+= item.productId+','
+                delGoodsList+= item.skuId+','
             });
             CAIMEI.Modal('确定清空全部失效商品吗？','取消','确定',function(){
                 _self.deleteCart(delGoodsList)
             });
         },
-        deleteCartOne:function(productIds){
+        deleteCartOne:function(skuId){
             var _self = this;
             CAIMEI.Modal('确定删除该商品吗？','取消','确定',function(){
-                _self.deleteCart(productIds);
+                _self.deleteCart(skuId);
             });
         },
         deleteSelected: function(){
             var _self = this;
             var skuIds = _self.submitIds.join(",");
-            if(skuIds == ''){
+            if(skuIds === ''){
                 CAIMEI.dialog('请选择要删除的商品~');
                 return false;
             }
@@ -513,7 +513,7 @@ var shoppingCart = new Vue({
         queryPopupCoupons:function(){// 获取弹窗优惠券列表
             var  _self = this;
             ShoppingApi.ShoppingCartGetCoupon(_self.couponParam, function (response) {
-                if(response.code == 0){
+                if(response.code === 0){
                     var data = response.data;
                     if(data.couponList && data.couponList.length >0){
                         _self.productCouponList = data.couponList;

src/main/resources/templates/pay/caimei-pay.html

@@ -109,6 +109,7 @@
                             <div class="t-li"><p>序号</p></div>
                             <div class="t-li"><p>商品图片</p></div>
                             <div class="t-li"><p>商品名称</p></div>
+                            <div class="t-li"><p>规格</p></div>
                             <div class="t-li"><p>单价</p></div>
                             <div class="t-li"><p>数量</p></div>
                             <div class="t-li"><p>总价</p></div>
@@ -120,6 +121,7 @@
                                     <img :src="item.image" :alt="item.name">
                                 </div>
                                 <div class="t-li"><p>{{item.name}}</p></div>
+                                <div class="t-li"><p>{{item.productUnit}}</p></div>
                                 <div class="t-li"><p>￥{{item.price | NumFormat}}</p></div>
                                 <div class="t-li"><p>{{item.num}}</p></div>
                                 <div class="t-li"><p>￥{{item.totalFee | NumFormat}}</p></div>

src/main/resources/templates/pay/caimei-paylist.html

@@ -27,6 +27,7 @@
             <div class="pay-list-title" v-if="isPC">
                 <div class="pay-list-view t1">商品信息</div>
                 <div class="pay-list-view t2">单价(元)</div>
+                <div class="pay-list-view t3">规格</div>
                 <div class="pay-list-view t3">数量</div>
                 <div class="pay-list-view t4">小计(元)</div>
             </div>
@@ -50,6 +51,10 @@
                         <span v-if="!isPC">单价:</span>
                         <p>￥{{pros.price  | NumFormat}}</p>
                     </div>
+                    <div class="list-cell-pros p3">
+                        <span v-if="!isPC">规格:</span>
+                        <p>{{ pros.productUnit }}</p>
+                    </div>
                     <div class="list-cell-pros p3">
                         <span v-if="!isPC">数量:</span>
                         <p>{{ pros.num }}</p>

src/main/resources/templates/shopping/cart.html

@@ -236,7 +236,7 @@
                         </div>
                         <div v-if="isPC" class="c6"><span>¥{{ (cart.price*cart.number) | NumFormat}}</span></div>
                     </template>
-                    <div v-if="isPC" class="c7"><span class="del" @click="deleteCartOne(cart.productId)">×<em class="tips">删除</em></span></div>
+                    <div v-if="isPC" class="c7"><span class="del" @click="deleteCartOne(cart.skuId)">×<em class="tips">删除</em></span></div>
                 </div>
                 <div class="supplierBtn">
                     <span :class="supplier.reducedPrice>0?'priceTotal':'item'">合计：<em>¥{{ supplier.totalPrice | NumFormat}}</em>