1. 订单列表，订单详情

yvan.ni
1 parent 2552da6b
Showing 2 changed files with 180 additions and 92 deletions
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -18,7 +18,23 @@ Page({
         var r = void 0 !== e.isGoup && e.isGoup;
  
         getApp().getConfig2(function (e) {
-            th.setData({conf:e});
+            th.setData({conf: e,sales_rules:e.sales_rules });
+            //--- 看后台是不是有开通等级卡 ---
+            if(e.switch_list){
+            	    var s_list=JSON.parse(e.switch_list);
+                    var user=getApp().globalData.userInfo;
+                   //如果后台有开启等级价的功能
+            	   if(parseInt(s_list.rank_switch)==2 && user['card_expiredate']){
+            		   var str = user['card_expiredate'].replace(/-/g, '/');
+            		   var end = new Date(str);
+            		   end = Date.parse(end) / 1000;
+            		   var now = ut.gettimestamp();					   							  
+            		   //--- 判断是等级会员，且在有效期范围内 ---
+            		   if(user.card_field && now<end){
+            			   th.setData({card_field:user.card_field})
+            		   }	   
+            	   }
+            }	
         })
  
         this.setData({
@@ -285,10 +301,11 @@ Page({
 		var order=this.data.order;
 		var order_goods=order.order_goods;   
  
-		for(var i in order_goods){
+		
+		for(var i in order_goods){		
 			var good=order_goods[i];
 			//如果不是小程序有的功能，直接提示要去3.0处理
-			if(good.prom_type==2  || good.prom_type==4){
+			if(good.prom_type==2 ){
 				wx.showModal({
 				  title: '提示',
 				  content: '小程序还未有该活动，请到3.0公众号支付'
@@ -329,8 +346,9 @@ Page({
 			  });
 			  return false;
 			}
-
-            if((good.prom_type==1 || good.prom_type==6  || good.prom_type==5 ) && !good.is_gift && !good.is_collocation){
+			
+			//商品的普通购买 ，不要进行判断
+			  if((good.prom_type==1 || good.prom_type==6  || good.prom_type==5 || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){
 				   if(gg.prom_type!=good.prom_type)	{
 					   wx.showModal({
 					     title: '提示',
@@ -338,36 +356,35 @@ Page({
 					   });
 					   return false;		   
 				   }
-                if(good.prom_type==3  || good.prom_type==5){
-                    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){
-                                wx.showModal({
-                                    title: '提示',
-                                    content: good.goods_name+'未找到活动'
-                                });
-                            }
-                            if(!r_data.promGoodsLists && good.prom_type==3){
-                                wx.showModal({
-                                    title: '提示',
-                                    content: good.goods_name+'未找到活动'
-                                });
-                            }
-                        }else{
-                            wx.showModal({
-                                title: '提示',
-                                content: good.goods_name+'未找到活动'
-                            });
-                            return false;
-                        }
-                    })
-                }
-					
+				   if(good.prom_type==3  || good.prom_type==5){
+		               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){
+		                               wx.showModal({
+		                                   title: '提示',
+		                                   content: good.goods_name+'未找到活动'
+		                               });
+		                           }
+		                           if(!r_data.promGoodsLists && good.prom_type==3){
+		                               wx.showModal({
+		                                   title: '提示',
+		                                   content: good.goods_name+'未找到活动'
+		                               });
+		                           }
+		                   }else{
+		                       wx.showModal({
+		                           title: '提示',
+		                           content: good.goods_name+'未找到活动'
+		                       });
+		                       return false;
+		                   }
+		               })
+		           }
+		
 			  }else{
-				  
-				  if(gg.prom_type==1 || gg.prom_type==6){
+				  if((gg.prom_type==1 || gg.prom_type==6 || gg.prom_type==4) && !good.is_integral_normal && !good.is_pd_normal) {
 					  var prom=null;
 					  //---如果是活动的时候---
 					  var prom=null,th=this;
@@ -387,7 +404,17 @@ Page({
 					  				  }
 					  			})	  
 					  }	 
-										
+					  
+					  if(gg.prom_type==4){
+					  			await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
+									data:{store_id:os.stoid,goods_id:gg.goods_id}
+					  			}).then(res=>{
+					  				  if(res.data.code==0 && res.data.data && res.data.data.pageData){
+					  					  prom=res.data.data.pageData[0];
+					  				  }
+					  			})	  
+					  }	
+					  								
 					  if(prom){
 						  var t_now=ut.gettimestamp();
 						  if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
@@ -399,25 +426,26 @@ Page({
 						  }
 					  } 				  
 				  }
-
-                if(!good.is_gift && !good.is_collocation) {
-                    var isok = 1;
-                    var card_field = th.data.card_field;
-                    //如果会员是等级会员,商品有等级价,且不是活动商品
-                    if (card_field && gg[card_field] > 0) {
-                        if (good.goods_price != gg[card_field]) isok = 0;
-                    } else {
-                        if (good.goods_price != gg.shop_price) isok = 0;
-
-                    }
-                    if (!isok) {
-                        wx.showModal({
-                            title: '提示',
-                            content: gg.goods_name + '商品的价格发生了变化'
-                        });
-                        return false;
-                    }
-                }
+				  //赠品和搭配购不判断商品金额
+				  var isok=1;
+				  var card_field=th.data.card_field;
+				  //如果会员是等级会员,商品有等级价,且不是活动商品
+		          if(!good.is_gift && !good.is_collocation) {
+		              if (card_field && gg[card_field] > 0) {
+		                  if (good.goods_price != gg[card_field]) isok = 0;
+		              } else {
+		                  if (good.goods_price != gg.shop_price) isok = 0;
+		
+		              }
+		              var is_h=0;
+		              if (!isok) {
+		                  wx.showModal({
+		                      title: '提示',
+		                      content: gg.goods_name + '商品的价格发生了变化'
+		                  });
+		                  return false;
+		              }
+		          }
  
 				  //--如果是线下库存的时候--		
 				  if(th.data.conf.sales_rules==2){
@@ -444,6 +472,8 @@ Page({
  
 				  }			  
 			  }
+			  
+			  console.log("------------------------------------");
  
 			  var prom=null;
 			  //---如果是活动的时候---
@@ -456,14 +486,26 @@ Page({
 					  }
 				  })
 			  }	  
-			  if(goodsinfo.prom_type==6){
+			  if(goodsinfo.prom_type==6 && !good.is_pd_normal){
 				await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
 				}).then(res=>{
 					  if(res.data.code==0){
 						  prom=res.data.data;
 					  }
 				})	  
-			  }	  
+			  }
+					
+		     if(goodsinfo.prom_type==4 && !good.is_integral_normal){
+				 await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
+				 	data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
+				 }).then(res=>{
+				 	  if(res.data.code==0 && res.data.data && res.data.data.pageData){
+				 		  prom=res.data.data.pageData[0];
+				 	  }
+				 })	  
+			 }		
+					
+					
 			  //----------如果有活动，并且在进行中，就不计算线下库存---------------	 
 			  if(prom){
 				  var now=ut.gettimestamp();
@@ -484,24 +526,35 @@ Page({
 				    return false;
 				  }
  
-				  var redis_num = 0;
-				  //------判断活动是否抢光-----
-				  await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-				    os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, {
-				    }).then(res => {
-				      redis_num = res.data.data;
-				  });
-				  
-				  if (good.goods_num > redis_num) {
-				    wx.showModal({
-				       title: gg.goods_name+'超出商品活动库存',
-				    });
-				    return false;
-				  }	
-			  }			  
-			  		
+				  if(goodsinfo.prom_type==4){
+					  if (good.goods_num > prom.limitqty-prom.buy_num) {
+					    wx.showModal({
+					      title: '提示',
+					      content: goodsinfo.goods_name+'购买数量超出商品活动库存'
+					    });
+					    return false;
+					  }				  
+				  }else{
+					  var redis_num = 0;
+					  //------判断活动是否抢光-----
+					  await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+					    os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, {
+					    }).then(res => {
+					      redis_num = res.data.data;
+					  });
+					  
+					  if (good.goods_num > redis_num) {
+					    wx.showModal({
+					       title: gg.goods_name+'超出商品活动库存',
+					    });
+					    return false;
+					  }	
+				  }
+			  }
+			  
 		}
-	  	
+		
+		
 		o.jumpToCart4({
             order_sn: this.data.order.order_sn,
             order_amount: this.data.order.order_amount
@@ -414,7 +414,7 @@ Page({
 	for(var i in order_goods){		
 		var good=order_goods[i];
 		//如果不是小程序有的功能，直接提示要去3.0处理
-		if(good.prom_type==2  || good.prom_type==4 ){
+		if(good.prom_type==2 ){
 			wx.showModal({
 			  title: '提示',
 			  content: '小程序还未有该活动，请到3.0公众号支付'
@@ -456,7 +456,8 @@ Page({
 		  return false;
 		}
  
-		  if((good.prom_type==1 || good.prom_type==6  || good.prom_type==5 ) && !good.is_gift && !good.is_collocation){
+		//商品的普通购买 ，不要进行判断
+		  if((good.prom_type==1 || good.prom_type==6  || good.prom_type==5 || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){
 			   if(gg.prom_type!=good.prom_type)	{
 				   wx.showModal({
 				     title: '提示',
@@ -492,7 +493,7 @@ Page({
                }
  
 		  }else{
-			  if(gg.prom_type==1 || gg.prom_type==6){
+			  if((gg.prom_type==1 || gg.prom_type==6 || gg.prom_type==4) && !good.is_integral_normal && !good.is_pd_normal) {
 				  var prom=null;
 				  //---如果是活动的时候---
 				  var prom=null,th=this;
@@ -512,7 +513,17 @@ Page({
 				  				  }
 				  			})	  
 				  }	 
-									
+				  
+				  if(gg.prom_type==4){
+				  			await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
+								data:{store_id:os.stoid,goods_id:gg.goods_id}
+				  			}).then(res=>{
+				  				  if(res.data.code==0 && res.data.data && res.data.data.pageData){
+				  					  prom=res.data.data.pageData[0];
+				  				  }
+				  			})	  
+				  }	
+				  								
 				  if(prom){
 					  var t_now=ut.gettimestamp();
 					  if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
@@ -584,14 +595,26 @@ Page({
 				  }
 			  })
 		  }	  
-		  if(goodsinfo.prom_type==6){
+		  if(goodsinfo.prom_type==6 && !good.is_pd_normal){
 			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
 			}).then(res=>{
 				  if(res.data.code==0){
 					  prom=res.data.data;
 				  }
 			})	  
-		  }	  
+		  }
+				
+	     if(goodsinfo.prom_type==4 && !good.is_integral_normal){
+			 await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
+			 	data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
+			 }).then(res=>{
+			 	  if(res.data.code==0 && res.data.data && res.data.data.pageData){
+			 		  prom=res.data.data.pageData[0];
+			 	  }
+			 })	  
+		 }		
+				
+				
 		  //----------如果有活动，并且在进行中，就不计算线下库存---------------	 
 		  if(prom){
 			  var now=ut.gettimestamp();
@@ -612,20 +635,32 @@ Page({
 			    return false;
 			  }
  
-			  var redis_num = 0;
-			  //------判断活动是否抢光-----
-			  await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-			    os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, {
-			    }).then(res => {
-			      redis_num = res.data.data;
-			  });
+			  if(goodsinfo.prom_type==4){
+				  if (good.goods_num > prom.limitqty-prom.buy_num) {
+				    wx.showModal({
+				      title: '提示',
+				      content: goodsinfo.goods_name+'购买数量超出商品活动库存'
+				    });
+				    return false;
+				  }				  
+			  }else{
+				  var redis_num = 0;
+				  //------判断活动是否抢光-----
+				  await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+				    os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, {
+				    }).then(res => {
+				      redis_num = res.data.data;
+				  });
+				  
+				  if (good.goods_num > redis_num) {
+				    wx.showModal({
+				       title: gg.goods_name+'超出商品活动库存',
+				    });
+				    return false;
+				  }	
+			  }
+			  
  
-			  if (good.goods_num > redis_num) {
-			    wx.showModal({
-			       title: gg.goods_name+'超出商品活动库存',
-			    });
-			    return false;
-			  }	
 		  }