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

taiyuan
2 parents c76ead9d 2f148450
Showing 6 changed files with 19 additions and 10 deletions
components/diy_service/diy_service.js
packageA/pages/prom_list/prom_list.js
packageA/pages/quan_list/quan_list.js
packageA/pages/quan_pro/quan_pro.js
pages/cart/cart/cart.js
utils/auth.js
@@ -32,7 +32,7 @@ Component({
 	//-- 跳到绑定注册会员 --
 	go_user:function(){
-	    getApp().goto('/pages/getphone/getphone');
+	    getApp().goto('/pages/togoin/togoin');
 	   	return false;
 	},
@@ -627,7 +627,7 @@ Page({
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
       wx.navigateTo({
-        url: '/pages/getphone/getphone',
+        url: '/pages/togoin/togoin',
       })
       return false;
     }
@@ -85,7 +85,7 @@ Page({
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
       wx.navigateTo({
-        url: '/pages/getphone/getphone',
+        url: '/pages/togoin/togoin',
       })
       return false;
     }
@@ -80,7 +80,7 @@ Page({
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
       wx.navigateTo({
-        url: '/pages/getphone/getphone',
+        url: '/pages/togoin/togoin',
       })
       return false;
     }
@@ -1477,22 +1477,30 @@ Page({
 				list2.goods.push(newd);		
 				var all_num=0;	
+				var all_limit_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(list_item.goods[j].is_gift==1 && list_item.goods[j].gift_id==newd.gift_id && list_item.goods[j].prom_id==p_item[0]){
+						  	  all_limit_num+= list_item.goods[j].goods_num;
+						  }					
+										
 					 }
-				}					
-				//-- 赠品的数量超出,这里是保证所有的赠品部会超出 --
-				if(discount.gift_storecount<all_num){
+				}	
+								
+				//-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 --
+				if(discount.gift_storecount<all_num || discount.limit_num<all_limit_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+"&prom_id="+newd.prom_id
                 await getApp().request.promiseDelete(url, {})
@@ -105,7 +105,7 @@ module.exports = {
                       app.globalData.getu = r;
                       wx.navigateTo({
-                         url: '/pages/getphone/getphone',
+                         url: '/pages/togoin/togoin',
                       })
                   }else{
                     app.globalData.user_id = e.data.data.user_id;
@@ -128,6 +128,7 @@ module.exports = {
     get_u(t){
       var app_d = this.app().globalData, oo = app_d.setting;
       var ab = this.app().request;
+	  if(!app_d.user_id) return false;  
       ab.get("/api/weshop/users/get/" + oo.stoid + "/" + app_d.user_id, {
 		data:{r:Math.random()},	
         success: function (e) {