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

season
2 parents 14528c08 0dc48a94
Showing 5 changed files with 21 additions and 11 deletions
packageE/pages/cart/cart2/zh_calculate.js
packageF/pages/free_delivery/free_delivery.js
pages/cart/cart/zh_calculate.js
pages/goods/goodsInfo/goodsInfo.js
utils/more_cx.js
@@ -156,9 +156,9 @@ module.exports = {
                     //看一下是几倍
                     let be = parseInt(no_in_arr.length / act.zhbuyqty);
-                    //如果有总数控制的时候
+                    //如果有总数控制的时候,看还能买几组
                     if(act.zh_num){
-                        var be1=act.zh_num-act.zh_buy_num-1;
+                        var be1= parseInt((act.zh_num-act.zh_buy_num)/ act.zhbuyqty)-1;
                         if(be1<be) be=be1;
                     }
@@ -207,8 +207,8 @@ module.exports = {
                         }
                         if (!zhqty_len) {
-                            aprice += be1 * act.zhprice;
-                            let pop_num = be1 * act.zhbuyqty - delete_num;
+                            aprice += be * act.zhprice;
+                            let pop_num = be * act.zhbuyqty - delete_num;
                             for (var m = 0; m < pop_num; m++) {
                                 no_in_arr.pop();
                             }
@@ -74,10 +74,15 @@ Page({
       userInfo
     })
     if (userInfo) {
-      this.setData({
-        login_title:userInfo.mobile,
-        login_name:'领取会员'
-      })
+      if (userInfo.mobile) {
+        this.setData({
+          login_title:userInfo.mobile,
+          login_name:'领取会员'
+        })
+      }else{
+        getApp().globalData.userInfo=null
+        wx.setStorageSync("userinfo", null);
+      }
     }
   },
@@ -240,9 +240,9 @@ module.exports = {
 					var zhqty_len = 0; //几个超量倍增
 					var be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍
-					//如果有总数控制的时候
+					//如果有总数控制的时候,看还能买几组
 					if(act.zh_num){
-						var be1=act.zh_num-act.zh_buy_num-1;
+						var be1= parseInt((act.zh_num-act.zh_buy_num)/ act.zhbuyqty)-1;
 						if(be1<be) be=be1;
 					}
@@ -8492,11 +8492,12 @@ Page({
                                       openSpecModal_flash_normal: 1
                                     });
                                   } else {
-                                    th.get_sto(1);
+
                                     th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () {
                                       th.setData({
                                         openSpecModal_flash_normal: 1
                                       });
+                                      th.get_sto(1);
                                     });
                                   }
                                   if (!this.data.data.whsle_id) this.check_is_youhui(th.data.gid, 1);
@@ -46,6 +46,7 @@ module.exports = {
         let no_in_arr = []; //剩余的未加入组合购
         let out_arr = []; //超出活动限购的商品放入
+        let zhqty_bz = []; //超量
         //-- 判断组合购的总数量是不是到了 --
         if(act.zh_num>0){
@@ -135,6 +136,9 @@ module.exports = {
                 all_num += item.num;
                 //当有起购数的控制的时候
                 if (item.zhqty) {
+
+                    zhqty_bz.push(item);
+
                     all_zhqty += item.zhqty;
                     if (item.num < item.zhqty) {
                         need_to_buy += item.zhqty - item.num;