1、测试返回的bug 4条修复

yvan.ni
1 parent 40a10548
Showing 10 changed files with 119 additions and 82 deletions
components/diy_advertising/diy_advertising.wxml
components/diy_advertising/diy_advertising.wxss
components/diy_searchbox/diy_searchbox.wxml
components/diy_store_select/diy_store_select.wxss
pages/cart/cart/cart.js
pages/goods/goodsInfo/goodsInfo.js
pages/index/index/index.wxss
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
utils/util.js
@@ -409,14 +409,14 @@
           style="height:{{max_sw_height}}rpx" >
     <block wx:for="{{object.data}}" wx:for-index="index" >
-        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
+        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
           <swiper-item>
                <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" />
                <view class="title" wx:if="{{title}}">{{item.title}}</view>
           </swiper-item>
         </navigator>
-        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url" wx:else>
           <swiper-item>
               <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" />
               <view class="title" wx:if="{{title}}">{{item.title}}</view>
@@ -315,8 +315,6 @@
 .swiper {
   height: auto;
   width: 100%; 
-  padding-bottom: 7rpx;
-  padding-top: 7rpx;
   /* background-color: palevioletred; */
 }
@@ -324,6 +322,8 @@
   height: auto;
   width: 100%;
   margin: 0;
+  padding: 0;
+  vertical-align: top;
 }
 .sw_con{
     position: relative;
@@ -19,10 +19,10 @@
 </block>
 <block wx:if="{{object.style==2}}">
-<view style='background-color:{{object.top_bgcolor}}' >
+<view style='background-color:{{object.top_bgcolor}}; display: flex; align-items: center; justify-content: space-around; height: 100rpx;' >
     <view class='s2_left'>
-        <navigator url="/pages/index/index/index" class="s1_gk_a1">
-        <image src='/public/static/images/model/nav.png'></image>
+        <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1">
+        <image src='/public/static/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
         </navigator>
     </view>
     <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
@@ -37,8 +37,8 @@
 		 </navigator>
     </view>
     <view class='s2_right'>
-        <navigator url="/pages/cart/cart/cart" class="s1_gk_a1">
-        <image src='/public/static/images/model/car.png'></image>
+        <navigator open-type="switchTab"  url="/pages/cart/cart/cart" class="s1_gk_a1">
+        <image src='/public/static/images/model/car.png' style="margin:0;;"></image>
         </navigator>
     </view>
 </view>
 .store_sele{width: 100%;z-index: 8; height: 88rpx; padding: 0 15rpx;position: fixed; color: white;
   top: 0; left: 0; background-color: #ff7295; font-size: 30rpx; }
-  .store_sele1{ height: 88rpx; padding: 0 15rpx; color: #666;background-color: #fff; font-size: 32rpx;}
+  .store_sele1{ height: 100rpx; padding: 0 15rpx; color: #666;background-color: #fff; font-size: 32rpx;}
 .logo_box{ width: 64rpx; height:64rpx;margin-right: 15rpx; }
@@ -77,12 +77,13 @@ Page({
 				      //未购买
 				      if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){
 				      	   is_open_offline=0;
-				      }
-					  //已经过期
-					  var item=res.data.data.pageData[0];
-					  if(item.end_time<ut.gettimestamp()){
-					  		is_open_offline=0;
-					  }
+				      }else{
+						 //已经过期
+						 var item=res.data.data.pageData[0];
+						 if(item.end_time<ut.gettimestamp()){
+						 		is_open_offline=0;
+						 } 
+					  }			  
 					  th.data.is_open_offline=is_open_offline;
         	          th.getCardList();
                   });
@@ -1681,12 +1681,14 @@ Page({
 		  //未购买
 		  if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){
 			 return false;  
+		  }else{
+			  //已经过期
+			  var item=res.data.data.pageData[0];
+			  if(item.end_time<ut.gettimestamp()){
+			  			   return false;  
+			  }
 		  }
-		  //已经过期
-		  var item=res.data.data.pageData[0];
-		  if(item.end_time<ut.gettimestamp()){
-			   return false;  
-		  }
+		  
 		  var cur_goods=this.data.sele_g;
 		  var cur_price=cur_goods.shop_price;
@@ -967,4 +967,4 @@ page {
 	z-index: 10000;
 }
-.dis_top{position: fixed; top: 0; left: 0;}
 \ No newline at end of file
+.dis_top{position: fixed; top: 0; left: 0; width: 100%;}
 \ No newline at end of file
@@ -41,12 +41,14 @@ Page({
 				   		  //未购买
 				   		  if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){
 				   			 is_open_offline=0; 
-				   		  }
-				   		  //已经过期
-				   		  var item=res.data.data.pageData[0];
-				   		  if(item.end_time<ut.gettimestamp()){
-				   			  is_open_offline=0;
-				   		  }
+				   		  }else{
+							 //已经过期
+							 var item=res.data.data.pageData[0];
+							 if(item.end_time<ut.gettimestamp()){
+							 	 is_open_offline=0;
+							 } 
+						  }
+				   		  
 				   		  th.data.is_open_offline=is_open_offline;
 				   })
@@ -374,6 +376,7 @@ Page({
 			//如果优惠促销和搭配购的时候
 			if((good.prom_type==3 || good.prom_type==5) && !good.is_collocation){
+				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){
@@ -383,21 +386,24 @@ Page({
 			                        title: '提示',
 			                        content: good.goods_name+'未找到活动'
 			                    });
+								p_ok=0;
 			                }
 			                if(!r_data.promGoodsLists && good.prom_type==3){
 			                    wx.showModal({
 			                        title: '提示',
 			                        content: good.goods_name+'未找到活动'
 			                    });
+								p_ok=0;
 			                }
 			        }else{
 			            wx.showModal({
 			                title: '提示',
 			                content: good.goods_name+'未找到活动'
 			            });
-			            return false;
+			            p_ok=0;
 			        }
-			    })					
+			    })	
+				if(!p_ok) return false;				
 			}
 			//商品的普通购买 ，不要进行判断
@@ -410,49 +416,67 @@ Page({
 					   return false;		   
 				   }
 			  }else{
-				  
-				  if((gg.prom_type==1 || gg.prom_type==6 || gg.prom_type==4) && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
-					  var prom=null;
-					  //---如果是活动的时候---
-					  var prom=null,th=this;
-					  if(gg.prom_type==1){	
-					  			  await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+gg.prom_id,{		  		
-					  			  }).then(res=>{
-					  				  if(res.data.code==0){
-					  					  prom=res.data.data;
-					  				  }
-					  			  })
-					  }	  
-					  if(gg.prom_type==6){
-					  			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{
-					  			}).then(res=>{
-					  				  if(res.data.code==0){
-					  					  prom=res.data.data;
-					  				  }
-					  			})	  
-					  }	 
-					  
-					  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){
-							  wx.showModal({
-							    title: '提示',
-							    content: gg.goods_name+'商品的活动发生了变化'
-							  });
-							  return false;	
-						  }
-					  } 				  
+				  if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
+				  				  var prom=null;
+				  				  //---如果是活动的时候---
+				  				  var prom=null,th=this;
+				  				  if(gg.prom_type==1){	
+				  				  			  await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+gg.prom_id,{		  		
+				  				  			  }).then(res=>{
+				  				  				  if(res.data.code==0){
+				  				  					  prom=res.data.data;
+				  				  				  }
+				  				  			  })
+				  				  }	  
+				  				  if(gg.prom_type==6){
+				  				  			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{
+				  				  			}).then(res=>{
+				  				  				  if(res.data.code==0){
+				  				  					  prom=res.data.data;
+				  				  				  }
+				  				  			})	  
+				  				  }	 
+				  				  
+				  				  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){
+				  						  wx.showModal({
+				  						    title: '提示',
+				  						    content: gg.goods_name+'商品的活动发生了变化'
+				  						  });
+				  						  return false;	
+				  					  }
+				  				  } 				  
 				  }
+				  else{
+						  var t_ok=1;
+						  await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {				 
+							  if(res.data.code==0){
+								   var r_data=res.data.data;
+								   //-- 参加了全局的优惠活动 --  
+								   if(r_data.promGoodsLists){
+									   wx.showModal({
+										   title: '提示',
+										   content: gg.goods_name+'商品的活动发生了变化'
+									   });
+									   t_ok=0;
+								   }
+							   }
+						  })
+						  if(!t_ok) return false;
+						  //-- 如果有参加线下取价 --		  
+						  if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+",";	
+				   }
 				  //赠品和搭配购不判断商品金额
 				  var isok=1;
 				  var card_field=th.data.card_field;
@@ -614,6 +638,7 @@ Page({
 					    title: '提示',
 					    content: good.goods_name + '商品的价格发生了变化'
 					 });
+					 return false;	
 				}
 			}	
@@ -109,12 +109,14 @@ Page({
 				   		  //未购买
 				   		  if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){
 				   			 is_open_offline=0; 
-				   		  }
-				   		  //已经过期
-				   		  var item=res.data.data.pageData[0];
-				   		  if(item.end_time<ut.gettimestamp()){
-				   			  is_open_offline=0;
-				   		  }
+				   		  }else{
+							  //已经过期
+							  var item=res.data.data.pageData[0];
+							  if(item.end_time<ut.gettimestamp()){
+							  	 is_open_offline=0;
+							  }
+						  }
+				   		  
 						  th.data.is_open_offline=is_open_offline;
 					})
 	  		}		  
@@ -494,8 +496,8 @@ Page({
 		//如果优惠促销和搭配购的时候
 		if(good.prom_type==3 || good.prom_type==5){
+			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){
@@ -503,21 +505,24 @@ Page({
 		                        title: '提示',
 		                        content: good.goods_name+'未找到活动'
 		                    });
+							p_ok=0;
 		                }
 		                if(!r_data.promGoodsLists && good.prom_type==3){
 		                    wx.showModal({
 		                        title: '提示',
 		                        content: good.goods_name+'未找到活动'
 		                    });
+							p_ok=0;
 		                }
 		        }else{
 		            wx.showModal({
 		                title: '提示',
 		                content: good.goods_name+'未找到活动'
 		            });
-		            return false;
+		            p_ok=0;
 		        }
-		    })					
+		    })	
+			if(!p_ok) return false;				
 		}
 		//商品的普通购买 ，不要进行判断
@@ -575,6 +580,7 @@ Page({
 				  } 				  
 			  }
 			  else{
+				  var t_ok=1;
 				  await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {				 
 				      if(res.data.code==0){
 						   var r_data=res.data.data;
@@ -584,9 +590,11 @@ Page({
 						           title: '提示',
 						           content: gg.goods_name+'商品的活动发生了变化'
 						       });
+							   t_ok=0;
 						   }
 				       }
 				  })
+				  if(!t_ok) return false;
 				  //-- 如果有参加线下取价 --		  
 				  if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+",";									
 			  } 			 
@@ -751,6 +759,7 @@ Page({
 				    title: '提示',
 				    content: good.goods_name + '商品的价格发生了变化'
 				 });
+				 return false;	
 			}
 		}	
@@ -463,7 +463,7 @@ function sha1(s) {
 function convert_arr_key(list,key){
 	let keyObs = {}
 	list.forEach(item => {
-	    keyObs[item.key] = item
+	    keyObs[item[key]] = item
 	})
 	return keyObs;
 }