Merge branch 'developerB' of git.caimei365.com:chao/caimei-caimei365-www into developerB

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

@@ -513,7 +513,7 @@ function verifyCheack(ele) {
 }
 
 // 公共信息提示弹框
-function alertInfo(txt) {
+function alertInfo(txt,callback) {
     $.confirm({
         useBootstrap: false,
         boxWidth: (isPC?'300px':'70%'),
@@ -526,7 +526,10 @@ function alertInfo(txt) {
         buttons: {
             close: {
                 text: '确定',
-                btnClass: 'btn-confirm'
+                btnClass: 'btn-confirm',
+                action: function () {
+                    callback()
+                }
             }
         }
     });

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

@@ -164,6 +164,12 @@ var shoppingCart = new Vue({
                 });
             });
         },
+        deleteCart: function(cartId){
+            alertInfo("确定要删除该商品？",function(){
+                // 删除逻辑
+                alert("test")
+            })
+        },
 
     },
     created: function () {

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

@@ -77,8 +77,11 @@
                             </template>
                             <!-- 促销活动 -->
                             <span v-if="cart.actStatus==1 && cart.promotions" class="priceTag">
-                                <i v-if="cart.promotions.type==1 && cart.promotions.mode==1" class="tag" v-text="cart.promotions.name+'：¥'+toFloat(cart.price)"></i>
+                                <i v-if="cart.promotions.type==1 && cart.promotions.mode==1" class="tag icon mIcon" v-text="cart.promotions.name+'：¥'+toFloat(cart.price)"></i>
                                 <i v-else class="tag icon mIcon" v-text="cart.promotions?cart.promotions.name:''"></i>
+                                <span class="promotion mFixed">
+
+                                </span>
                             </span>
                             <!-- 阶梯价 -->
                             <span v-else-if="cart.ladderFlag" class="priceTag">
@@ -104,7 +107,7 @@
                         </span>
                         <input type="hidden" :value="cart.step"></div>
                         <div v-if="isPC" class="c6"><span v-text="'¥'+toFloat(cart.price*cart.number)"></span></div>
-                        <div v-if="isPC" class="c7"><span class="del">×<em class="tips">删除</em></span></div>
+                        <div v-if="isPC" class="c7"><span class="del" @click="deleteCart(cart.id)">×<em class="tips">删除</em></span></div>
                 </div>
                 <div class="supplierBtn">
                     <span>合计：<em v-text="'¥'+toFloat(supplier.totalPrice)"></em></span>