1. 再来一单的优化

2. 分类的样式的修复

1. 再来一单的优化
2. 分类的样式的修复
yvan.ni
1 parent f23e5534
Showing 3 changed files with 19 additions and 7 deletions
pages/cart/cart/cart.js
pages/cart/cart2_pt/cart2_pt.js
pages/goods/categoryList/categoryList.wxss
@@ -830,13 +830,21 @@ Page({
     var g_arr = new Array(); //已选的商品列表
     var user_id = getApp().globalData.user_id;
     var th = this;
-
+	//用于判断是不是积分购的普通购买
+	var normal_arr={};
     var ab = 0; //选中
     wx.showLoading(); 
     for (var i = 0; i < this.data.requestData.length; i++) {
       var i_arr = this.data.requestData[i].goods;
+	  
+	 
       for (var j = 0; j < i_arr.length; j++) {
         if (i_arr[j].selected && i_arr[j].is_gift!=1) {
+						
+		  if(i_arr[j].is_pd_normal)	{
+			  normal_arr[i_arr[j].goods_id]=1;
+		  }
+			
           //map 的key是不会重复，会覆盖，，
           var ie = {
             goods_id: i_arr[j].goods_id,
@@ -981,13 +989,13 @@ Page({
 				  }
 			  }
-              if (num > val.redisnum && val.redisnum) {
+              if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) {
                 isok = 0;
                 gname = val.goods_name;
                 throw "超出活动库存";
                 return false;
               }
-              if (num > val.goods_num - val.buy_num && val.goods_num) {
+              if (num > val.goods_num - val.buy_num && val.goods_num && !normal_arr[val.goods_id]) {
                 isok = 0;
                 gname = val.goods_name;
                 throw "超出活动库存";
@@ -1002,7 +1010,7 @@ Page({
                 return false;
               }
-              if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0) {
+              if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0 && !normal_arr[val.goods_id]) {
                 isok = 0;
                 gname = val.goods_name;
                 throw "超出活动限购";
@@ -1015,7 +1023,7 @@ Page({
                 if (g_arr[i].goods_id == val.goods_id) {
 				  //如果会员是等级会员,商品有等级价,且不是活动商品
-				  if(card_field && val[card_field]>0 && (val.prom_type==0 || val.prom_type==3 || val.prom_type==4 || val.prom_type==5) ){
+				  if(card_field && val[card_field]>0 && (val.prom_type==0 || val.prom_type==3 || val.prom_type==4 || val.prom_type==5 || normal_arr[val.goods_id])  ){
 					    if (g_arr[i].goods_price != val[card_field]){
 							  isok = 0;
 					          gname = val.goods_name;
@@ -494,6 +494,8 @@ Page({
        if(!th.data.bn_goods.is_normal){
            item.is_zsorder=th.data.kt_type+1;         //开团类型
        }
+	   
+	   
        if(th.data.qh!='')
        {
@@ -533,7 +535,9 @@ Page({
             item.room_ids=gg.room_id;
             goods.room_id=gg.room_id;
         }
-
+		
+	   if(th.data.bn_goods.is_normal){goods.is_pd_normal=1;}
+		
         item.order_goods.push(goods);
        pdata.push(item);
@@ -311,7 +311,7 @@ width: 60%;
  max-height: 90%;
  overflow-y:scroll;
  overflow: hidden scroll;
- padding-bottom: 25rpx;
+ padding-bottom: 65rpx;
  }