商品组合购的店铺优惠的计算优化

yvan.ni
1 parent 02bfb03f
Showing 4 changed files with 31 additions and 13 deletions
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/cart/cart/g_filter.wxs
pages/cart/cart/zh_calculate.js
@@ -619,7 +619,7 @@ Page({
         var wlist="";
         for(var i in list.goods){
             //如果商品有促销活动
-            if(list.goods[i].prom_type>0 || list.goods[i].prom_type==7 ) continue;
+            if(list.goods[i].prom_type>0 && list.goods[i].prom_type!=7) continue;
             wlist+= encodeURIComponent(list.goods[i].erpwareid)+",";
         }
         wlist=ut.sub_last(wlist);
@@ -644,7 +644,7 @@ Page({
     set_cart_offline_price:function(data,glist)
     {
         for(var i in glist) {
-            if(glist[i].erpwareid==data.WareId && glist[i].prom_type==0){
+            if(glist[i].erpwareid==data.WareId && (glist[i].prom_type==0 || glist[i].prom_type==7)){
                 if(glist[i].goods_price>=data.WarePrice){
                     glist[i].is_offline=1;
                     glist[i].offline_price=data.WarePrice;
@@ -1243,6 +1243,15 @@ Page({
                         [txt1]: offline_price.toFixed(2),
                         [txt2]: offline_num,
                     });
+                }else{
+                   if(car[a].offline_price>0){
+                       var txt1= "requestData[" + a + "].offline_price";
+                       var txt2= "requestData[" + a + "].offline_num";
+                       th.setData({
+                           [txt1]: 0,
+                           [txt2]: 0
+                       });
+                   }
                 }
  
             }
@@ -122,7 +122,7 @@
                 <view class="fs20">￥</view>
                 <view class="fs28">{{items.goods_price}}</view>
  
-                <view wx:if="{{items.is_offline}}" class="quan_color flex ai-center"><text>券后 ￥{{items.offline_price}}</text></view>
+                <view wx:if="{{items.is_offline}}" class="quan_color flex ai-center"><text>券后 ￥{{g_filter.toFix(items.offline_price,2)}}</text></view>
  
               </view>
               <view class="count">
@@ -20,10 +20,19 @@ var g_filters = {
             var tnow=getDate();
             if(t1>=tnow) return 1;
             return 0;
-	}
+	},
+
+	toFix: function (val, count) {
+    		if(!val){
+    			return parseFloat(0).toFixed(count);
+    		}
+    		val = parseFloat(val);
+    		return val.toFixed(count)
+    }
 }
 module.exports = {
 	has_char: g_filters.has_char,
 	beg_time: g_filters.beg_time,
 	end_time: g_filters.end_time,
+	toFix: g_filters.toFix,
 }
 \ No newline at end of file
@@ -217,7 +217,7 @@ module.exports = {
                             }
                             aprice += item.price;
                             if (item.offline_price) {
-                                offline_price += item.goods_price - item.offline_price;
+                                offline_price += gitem.goods_price - gitem.offline_price;
                                 offline_num += 1;
                             }
                         }
@@ -237,8 +237,8 @@ module.exports = {
                                 gitem.need_downlow_num+=item.num;
                             }
                             aprice += item.price*item.num;
-                            if (item.offline_price) {
-                                offline_price += (item.goods_price - item.offline_price)*item.num;
+                            if (item.offline_price && th.data.sales_rules==2) {
+                                offline_price += (gitem.goods_price - gitem.offline_price)*item.num;
                                 offline_num += item.num;
                             }
  
@@ -264,13 +264,13 @@ module.exports = {
 				for (var ii in goods) {
 					var item = goods[ii];
                     var gitem=get_num2(item);
-                    if(gitem) {
-                        gitem.need_downlow_num = item.num;
+                    if(gitem && gitem.selected) {
+
+                        gitem.need_downlow_num = gitem.goods_num;
  
-                        if (item.offline_price) {
-                            offline_price += (item[ii].goods_price - item[ii].offline_price) * item[ii]
-                                    .goods_num;
-                            offline_num += item[ii].goods_num;
+                        if (item.offline_price && th.data.sales_rules==2) {
+                            offline_price += (item.goods_price - item.offline_price) * gitem.goods_num;
+                            offline_num += gitem.goods_num;
                         }
                     }
 				}