Merge branch 'dev' into 'test'

Dev See merge request !357

Merge branch 'dev' into 'test'
Dev See merge request !357
后端研发-苏明海
2 parents f68cd82f 0a9961c8
Showing 4 changed files with 18 additions and 11 deletions
pages/cart/cart2/cart2.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/index/index/index.js
@@ -376,7 +376,7 @@
                       <block>{{item.Sum}}元优惠券</block>
                     </view>
                     <view class="coupon-time">
-                    {{filters.replace_time2(item.BeginDate)}}至{{filters.replace_time2(item.BillDate)}}</view>
+                    {{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view>
                    </view>
                </view>
                    <!-- <view wx:if="{{item.Obtain>0}}" class="code-img" bindtap="show_quan" data-ind="{{index}}"  data-now="{{filter.format_time(now)}}">
@@ -946,7 +946,7 @@ Page({
 	  //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
 	  if(o.prom_type!=1 && o.prom_type!=6){
 	  		   var conf=th.data.bconfig;
-	  		   if(conf.switch_list){
+      if (conf.switch_list && getApp().globalData.userInfo['card_field']){
 	  			   var s_list=JSON.parse(conf.switch_list);
 				   var now=ut.gettimestamp();				   
 				   var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
@@ -1695,7 +1695,8 @@ Page({
 	  }
 	  for(var i in e.data.data.pageData){
 		  var item=e.data.data.pageData[i];
-		  pkno.push(item.pickup_no);
+		  if(pkno.indexOf(item.pickup_no)<0)
+		       pkno.push(item.pickup_no);
 	  }	  
 	  var pkno_str=pkno.join(",");
 	  var o_plist=e.data.data.pageData;
@@ -1718,7 +1719,8 @@ Page({
 	  }).then(res=>{	
 			  if(res.data.code==0){				   
 				   if(res.data.data.pageData){
-						var plist=res.data.data.pageData;						
+						var plist=res.data.data.pageData;	
+						var def_pick_store=th.data.def_pick_store;				
 						//以原来的数组为外循环，保证距离的顺序
 						for(var kk in o_plist){
 							   for(var ii in plist){
@@ -1733,11 +1735,13 @@ Page({
 										   o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num														 
 										   new_list.push(o_plist[kk]);  
 										   //如果找到默认门店
-										   if(th.data.def_pick_store && n_item.StorageNo==th.data.def_pick_store.pickup_no){
-											   th.data.def_pick_store.CanOutQty=n_item.CanOutQty;	
-											   is_find_def_store=1;
+										   if(def_pick_store && n_item.StorageNo==def_pick_store.pickup_no){										   
+											   def_pick_store.CanOutQty=n_item.CanOutQty;												   
+											   th.setData({def_pick_store:def_pick_store})											   
+											   is_find_def_store=1;											  
 										   }
 										}
+										break;
 								   }
 							}
 						}		
@@ -3445,6 +3449,7 @@ Page({
 	  var goodsinfo=th.data.sele_g;
 	  var erpwareid=goodsinfo.erpwareid;
 	  var plist=null;
+    var lock=0;
 	  //---如果是活动的时候---
 	  if(th.data.prom_type==1 || th.data.prom_type==6){	 
@@ -3484,7 +3489,7 @@ Page({
 		  })	  
 		  if(plist && plist.CanOutQty-lock>0){
-		  		 func()  
+		  	 func()  
 				 return false;
 		  }
 		  getApp().my_warnning(item.pickup_name+"库存不足！", 0, th);		
@@ -868,7 +868,8 @@
           <block wx:if="{{prom_type==0}}">
           <view class="flex">
             <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-            <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
+            <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
+            <view class="spec-goods-stock" wx:else>可售：{{sele_g.store_count}}</view>
             </view>
           </block>
@@ -149,7 +149,8 @@ Page({
       data: {
         store_id: os.stoid,
         pageSize: 5,
-        is_show: 1
+        is_show: 1,
+        level:1
       }
     }).then(res => {
       if (res.data.data) {
@@ -181,7 +182,7 @@ Page({
     //读取全局是否有弄自定义模板
     await api.get_template_fir(o.stoid).then(res => {
       var data = res.data.data;
-      if (data.length > 0) {
+      if (data && data.length > 0) {
         var temp_data = data[0];
         var t_arr = JSON.parse(temp_data.json_str);
         th.setData({