Merge branch 'test' into 'qa'

Test See merge request !374

Merge branch 'test' into 'qa'
Test See merge request !374
后端研发-苏明海
2 parents dfd2f311 a44c102a
Showing 9 changed files with 35 additions and 14 deletions
app.js
pages/cart/cart/cart.js
pages/giftpack/birthdaygift/birthdaygift.js
pages/giftpack/evaluategift/evaluategift.js
pages/giftpack/festival/festival.js
pages/giftpack/newvipgift/newvipgift.js
pages/goods/goodsInfo/goodsInfo.js
pages/team/team_show/team_show.wxml
pages/team/team_success/team_success.wxml
@@ -13,7 +13,7 @@ App({
         config2: null,  //门店配置
         code: null,
         heigth:0,
-        user_id: null,// 4379287,//  null,// 5682068,
+        user_id:null,// 3674923,// 4379287,//  null,// 5682068,
         buy_now:null,
         picklist:null,    //门店列表
         wuliuprice: null, //物流价格表
@@ -408,7 +408,10 @@ App({
 					clearInterval(page.data[key]);
 					func();
 				}				
-				if(n>15) clearInterval(page.data[key]);
+				if(n>15){
+                    clearInterval(page.data[key]);
+                    func();
+                }
 			},1000);
 		}
 	}
@@ -122,16 +122,27 @@ Page({
         store_id: oo.stoid,
         pageSize: 600
       },
-      success: function(su) {
+      success:async function(su) {
         //按门店分类的数组
         var arr = new Array(),
           carr = su.data.data.pageData;
         var all_num = 0;
         for (var i = 0; i < carr.length; i++) {
-			
-		
           var item = carr[i];
+          var good=null;
+          await getApp().request.promiseGet("/api/weshop/goods/get/"+os.stoid+"/"+item.goods_id,{}).then(res=>{
+              good=res.data.data;
+          })
+          var tt=ut.gettimestamp();
+          if((good.down_time>0 && good.down_time<tt) || good.is_on_sale==0 ){
+              var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+              a.delete(url, {
+                  success: function(t) { }
+              });
+              //商品已经下架
+              continue;
+          }
           all_num += item.goods_num;
           item.original_img = oo.imghost + item.original_img;
           item.selected = 0;
@@ -140,7 +140,8 @@ Page({
         "actType": 4, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
-        "userId": d.user_id //用户ID
+        "userId": d.user_id, //用户ID
+        "buyFrom": 2
       };
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
@@ -157,7 +157,8 @@ Page({
         "orderNumber": th.data.orderNumber,
         "orderType": th.data.orderType,
         "orderGoodsId": th.data.orderGoodsId,
-        "giftBagId": th.data.giftBagId
+        "giftBagId": th.data.giftBagId,
+        "buyFrom": 2
       };
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
@@ -147,7 +147,8 @@ Page({
         "actType": 3, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
-        "userId": d.user_id //用户ID
+        "userId": d.user_id, //用户ID
+        "buyFrom": 2
       }
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
@@ -139,7 +139,8 @@ Page({
         "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
-        "userId": d.user_id //用户ID
+        "userId": d.user_id, //用户ID
+        "buyFrom": 2
       };
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
@@ -341,7 +341,10 @@ Page({
     //获取用户的默认门店
     getApp().get_user_store(function(ee) {
-      if(!ee) return false;
+      if(!ee) {
+        th.data.fir_def_store={};
+        return false;
+      }
 	  var appd=getApp().globalData;
       var w_time = setInterval(function() {
         if (that.data.is_get_local_ok == 0) return false;
@@ -631,7 +634,7 @@ Page({
 			  if(that.data.sales_rules==2 && that.data.is_newsales_rules){						  
 				      //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存
 				      getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){						  
-						    if(th.data.fir_def_store){
+						    if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){
 								var lock=0,plist=null;
 								//先读取门店的lock,采用链式写法，少用await
 								getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
@@ -1851,7 +1854,7 @@ Page({
 										   o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;														 
 										   new_list.push(o_plist[kk]);  
 										   //如果找到默认门店
-										   if(n_item.StorageNo==th.data.fir_def_store.pickup_no){	
+										   if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no){
 											   th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num;												   
 											   if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id)
 											        th.setData({def_pick_store:th.data.fir_def_store})											   
@@ -24,7 +24,7 @@
            </view>
            <view class="xc-wc fs24">
             <view>
-              <view class="">已拼{{teamlist.buy_num}}份</view>
+              <view class="">已拼{{teamlist.buy_num}}件</view>
               <view class="flex xc-valframe t-c"> 
                 <view class="xc-frame-img"> 
                 <image class="picture"src="{{imageurl}}/miniapp/images/bai-ren.png"></image>
@@ -23,7 +23,7 @@
         </view>
         <view class="xc-wc fs24">
           <view>
-            <view class="">已拼{{teamlist.buy_num}}份</view>
+            <view class="">已拼{{teamlist.buy_num}}件</view>
             <view class="flex xc-valframe t-c">
               <view class="xc-frame-img">
                 <image class="picture" src="{{iurl}}/miniapp/images/bai-ren.png"></image>