Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents f5370a6b 5356a473
Showing 3 changed files with 104 additions and 57 deletions
pages/cart/cart/cart.js
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -89,23 +89,44 @@ Page({
                   });
         },1)
-
-        //--获取是否又秒杀活动--
-        getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
-            data: {
-                store_id: oo.stoid,
-                timetype: 2,
-                is_end: 0,
-                is_show: 1,
-                pageSize: 1
-            },
-        }).then(res => {
-            if (res.data.code == 0 && res.data.data && res.data.data.pageData.length > 0) {
-                th.setData({
-                    is_has_flash: 1
-                })
-            }
-        });
+			
+		//-- 判断有没有自定义的广告图片 --
+		getApp().request.promiseGet("/api/weshop/ad/page?pid=1101&store_id=" + os.stoid, {
+		  data: {
+		    enabled: 1
+		  }
+		}).then(res => {
+			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+				var a = res.data.data.pageData;
+				var tt = {
+				  'ad_code': os.imghost + a[0].ad_code,
+				  'media_link': '',
+				  'ad_weapplink':a[0].ad_weapplink
+				};
+				th.setData({ad_data:tt});				
+			}else{
+				//--获取是否又秒杀活动--
+				getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
+				    data: {
+				        store_id: oo.stoid,
+				        timetype: 2,
+				        is_end: 0,
+				        is_show: 1,
+				        pageSize: 1
+				    },
+				}).then(res => {
+				    if (res.data.code == 0 && res.data.data && res.data.data.pageData.length > 0) {
+				        th.setData({
+				            is_has_flash: 1
+				        })
+				    }
+				});
+			}					 			
+		})
+		
+		
+
+        
     },
@@ -584,7 +605,11 @@ Page({
         e.setData({
             [txt]: Number(!sele),
         });
-        await e.check_prom_activity(pitems);
+		
+		 await e.check_prom_activity(pitems);		
+		 for(var i in e.data.requestData){
+		   if(i!=pitems) await e.check_prom_activity(i);
+		 }
         this.doCheckAll();
     },
@@ -630,8 +655,12 @@ Page({
             });
             if(a.prom_type==3){
+				
+				await e.check_prom_activity(pitems);	
                 //判断商品是不是优惠活动
-                await e.check_prom_activity(pitems);
+				for(var i in e.data.requestData){
+                   if(i!=pitems)  await e.check_prom_activity(i);
+				}
             }
             this.doCheckAll();
@@ -953,9 +982,11 @@ Page({
                 e.setData({
                     [txt]: t.goods_num,
                 });
-                //for(var i in e.data.requestData){
-                await e.check_prom_activity(pitem)
-                //}
+				
+				await e.check_prom_activity(pitem)		
+                for(var i in e.data.requestData){
+                  if(i!=pitem) await e.check_prom_activity(i)
+                }
                 e.doCheckAll();
                 getApp().requestCardNum(e);
             }
@@ -1321,10 +1352,19 @@ Page({
         var map=new Map();
         var list= JSON.parse(JSON.stringify(this.data.requestData[cindex]));
         //循环处理活动，看活动商品的数量，用map来出来存储，key为活动id，值是数量
-
-        for(var i=0;i<list.goods.length;i++){
-            var item=list.goods[i];
+		
+		//-- 所有的购物车的数据，要用拷贝的赖进行计算 --
+		var alllist= JSON.parse(JSON.stringify(this.data.requestData));
+		var list2=alllist[cindex];
+		var no_gift_arr=[];
+       
+	    //主要判断有没有促销活动
+		var is_sele_prom=0;
+		var is_gift_del=0;
+		for(var i=0;i<list.goods.length;i++){
+            var item=list.goods[i];	
             if(item.prom_type==3 && item.selected && !item.is_gift){
+				is_sele_prom=1;
                 if(map.has(item.prom_id+"")){
                     var ob=map.get(item.prom_id+"");
                     ob.num+=item.goods_num;
@@ -1342,10 +1382,20 @@ Page({
                 var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
                 //getApp().request.delete(url, {});
                 await getApp().request.promiseDelete(url, {})  // 要用同步让赠品删除
-                list.goods.splice(i--,1);
+				list2.goods.splice(i,1);
+				list.goods.splice(i--,1);     
+				is_gift_del=1;
             }
         }
-
+		//--如果没有选中的促销活动的，直接退出 --
+		if(!is_sele_prom){
+			//如果有赠品，要重新更新购物车的前台渲染--
+			if(is_gift_del){		
+				var rq_text="requestData["+cindex+"]";
+				this.setData({[rq_text]:list});
+			}	
+			return false;
+		} 
         /*--
        var map2=new Map();
        //请那些是赠品，但是优惠活动并没有被选中的商品要删除，同时满足条件的要放到map2，
@@ -1365,7 +1415,6 @@ Page({
        }--*/
         var t_prom_list=new Array();
-
         for(let p_item of map.entries()){
             var prom=null;
             await getApp().request.promiseGet("/api/weshop/promgoods/get/"+os.stoid+"/"+p_item[0],{}).then(res=> {
@@ -1387,7 +1436,6 @@ Page({
             }
             t_prom_list.push(prom);
-
             //---读取打折的详情---
             var ob=p_item[1];var discount=null;
             await  getApp().request.promiseGet("/api/weshop/goods/getDiscount",{
@@ -1403,7 +1451,9 @@ Page({
             })
             //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量---
-            if(discount && discount['goods_id'] && discount.limit_num>=discount.bs  && discount.gift_storecount>=discount.bs){
+            if(discount && discount['goods_id'] && discount.limit_num>=discount.bs  && discount.gift_storecount>=discount.bs){		
+				//如果这礼品超了情况下
+				if(no_gift_arr.indexOf(discount.gift_id)!=-1) continue;				
                 var o=discount.goodsinfo;
                 var newd = {
                     goods_id: o.goods_id,
@@ -1424,28 +1474,27 @@ Page({
                     original_img:th.data.imgUrl+o.original_img
                 };
-
-                /*---
-                if(map2.has(p_item[0]+"")){
-                  var index=map2.get(p_item[0]+"");
-                  if( list.goods[index].goods_num!=discount.bs){
-                      list.goods[index].goods_num=discount.bs;
-                      getApp().request.put("/api/weshop/cart/update", {
-                      data: {
-                        id: list.goods[index].id,
-                        selected: 1,
-                        store_id: oo.stoid,
-                        goods_num:discount.bs
-                      },
-                      success: function(ee) {
-                        console.log(ee);
-                      }
-                    });
-                  }
-
-                }else{---*/
+               				
+				list2.goods.push(newd);		
+				var all_num=0;	
+				for(var i in alllist){
+					 var list_item=alllist[i];
+					 for(var j in list_item.goods){
+						  //如果赠品的ID一样，要进行统计数量
+						  if(list_item.goods[j].is_gift==1 && list_item.goods[j].gift_id==newd.gift_id){
+							  all_num+= list_item.goods[j].goods_num;
+						  }					  
+					 }
+				}					
+				//-- 赠品的数量超出,这里是保证所有的赠品部会超出 --
+				if(discount.gift_storecount<all_num){
+					no_gift_arr.push(discount.gift_id);									
+					//--进入下一个循环 --
+					continue;
+				}
+																							
                 var url="/api/weshop/cart/delGift?store_id="+newd.store_id+"&user_id="
-                    +newd.user_id+"&goods_id="+newd.goods_id+"&is_gift=1&pick_id="+newd.pick_id;
+                    +newd.user_id+"&goods_id="+newd.goods_id+"&is_gift=1&pick_id="+newd.pick_id+"&prom_id="+newd.prom_id
                 await getApp().request.promiseDelete(url, {})
                 var add_data=null;
@@ -1457,8 +1506,7 @@ Page({
                 if(add_data){
                     newd.id=add_data.id;
                     list.goods.push(newd);
-                }
-                //}
+                }        
             }
         }
@@ -378,10 +378,9 @@ Page({
 			}
 			//如果优惠促销和搭配购的时候
-			if((good.prom_type==3 || good.prom_type==5) && !good.is_collocation){
+			if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
 				var p_ok=1;
 			    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
-			    }).then(res=>{
 			        if(res.data.code==0){
 			                var r_data=res.data.data;
 			                if(!r_data.collocationPromList && good.prom_type==5){
@@ -886,7 +885,7 @@ Page({
 			  }
 			  //如果商品的配送方式和门店不匹配
-		      if(good['distr_type']>0 && pick_up['distr_type']>0 && good['distr_type']!=pick_up['distr_type'] ){
+		      if(good['distr_type']>0 && pickup['distr_type']>0 && good['distr_type']!=pickup['distr_type'] ){
 			     err_text+= good['goods_name']+"配送方式不一致\n";
 			     continue;
 		      }
@@ -495,7 +495,7 @@ Page({
 		}
 		//如果优惠促销和搭配购的时候
-		if(good.prom_type==3 || good.prom_type==5){
+		if((good.prom_type==3 || good.prom_type==5) && good.is_gift!=1 && good.is_collocation!=1){
 			var p_ok=1;
 		    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
 		        if(res.data.code==0){