购物车的优化

yvan.ni
1 parent c468d000
Showing 5 changed files with 30 additions and 16 deletions
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
packageE/pages/cart/cart2/zh_calculate.js
pages/cart/cart/cart.wxml
pages/cart/cart/cart.wxss
@@ -1153,7 +1153,8 @@ Page({
       var c_item = arr[k];
       if(!is_change){
         //-- 要进行归类一下活动 --
-        await m_cx.cart_cx_group(th,arr[k].goods,c_item,0,1,(show_can_cx)=>{
+        await m_cx.cart_cx_group(th,arr[k].goods,c_item,0,0,(show_can_cx)=>{
+
           arr[k].show_can_cx=show_can_cx;
         })
       }else{
@@ -1189,12 +1190,13 @@ Page({
             }
           }
           //-- 如果组合购的总数量不足的处理 --
-          if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
-            item1.prom_type = 0;
-            item1.prom_type1 = 0;
-            item1.prom_id = 0;
-            item1.prom_id1 = 0
-          }
+          // if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
+          //   item1.prom_type = 0;
+          //   item1.prom_type1 = 0;
+          //   item1.prom_id = 0;
+          //   item1.prom_id1 = 0
+          // }
+
           //要把组合购的东西拿出来算一下,同时组合购的总数量要有存在
           if (item1.prom_type == 7) {
             if (!th.data.zuhe_map_good[item1.prom_id]) {
@@ -1219,10 +1221,10 @@ Page({
                     store_count_ok = 0;
                     no_zh_num[item1.prom_id]=1;
                     //-- 清理一下活动的状态 --
-                    item1.prom_type = 0;
-                    item1.prom_type1 = 0;
-                    item1.prom_id = 0;
-                    item1.prom_id1 = 0
+                    // item1.prom_type = 0;
+                    // item1.prom_type1 = 0;
+                    // item1.prom_id = 0;
+                    // item1.prom_id1 = 0
  
                   }else{
                     th.data.zhhe_act_map[item1.prom_id] = res.data.data;
@@ -7703,6 +7705,12 @@ Page({
     var cx_prom_group=this.data.cartlist[idx].show_can_cx[gd_key].act_arr;
     var pk=this.data.cartlist[idx].pickup_id;
  
+    th.setData({
+      send_lb:{},
+      month_lb:{}
+    })
+
+
     var fir_sele=0;
     for(var dx=0;dx<cx_prom_group.length;dx++){
       if(cx_prom_group[dx].sele) fir_sele=dx;
@@ -116,7 +116,6 @@
             </view>
             <!-- 验证活动是不是多个，要不要显示切换 -->
             <!-- 新增促销多活动的排版 -->
-
              <block  wx:if="{{(util.is_more_act(items,item.show_can_cx) && item.show_can_cx[items.goods_id] && item.show_can_cx[items.goods_id].act_arr.length>1)}}">
                <view class="bdb16" wx:if="{{util.check_show(items,item.show_can_cx[items.goods_id].sele_prom_type)}}">
                  <view bindtap="switch_cx_group"
@@ -305,6 +305,9 @@ module.exports = {
  
  
             } else {
+
+                goods[goods.length-1].is_act_last=1;
+
                 for (let ii in goods) {
                     let item = goods[ii];
                     if (item.prom_type != 7) continue;
@@ -141,10 +141,10 @@
                         <view class="cx-sizs fs30">可参促销</view>
                         <view class="flex ai_c f1 pdh20">
                             <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
-                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view>
-                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view>
-                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view>
-                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word">阶梯促销</view>
+                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }}">优惠促销</view>
+                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }}">阶梯促销</view>
                             </view>
                         </view>
                         <view class="cx-obtain-coupon wsize">
@@ -435,9 +435,13 @@ page {
   /* margin:0 auto; */
   color: #fff;
   padding: 6rpx 20rpx;
+}
  
+.xc-coupon-fram .xc-coupon.gray{
+  background-color: #bbb;
 }
  
+
 .xc-coupon-fram .xc-circular {
   width: 16rpx;
   height: 16rpx;