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

taiyuan
2 parents be6b9a12 bf754c0a
Showing 6 changed files with 28 additions and 18 deletions
packageB/pages/zuhegou/index/index.js
pages/cart/cart/zh_calculate.js
pages/cart/cart2/zh_calculate.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart2_pt/cart2_pt.wxml
pages/goods/categoryList/categoryList.wxml
@@ -1599,12 +1599,12 @@ Page({
                     }
                     if (item.num > item.zhqty) {
                         for (var i = 0; i < item.num - item.zhqty; i++) {
-                            no_in_arr.push({price: item.current_price})
+                            no_in_arr.push({price: item.current_price,goods_id:item.goods_id});
                         }
                     }
                 } else {
                     for (var j = 0; j < item.num; j++) {
-                        no_in_arr.push({price: item.current_price})
+                        no_in_arr.push({price: item.current_price,goods_id:item.goods_id});
                     }
                 }
             } else {
@@ -1615,7 +1615,7 @@ Page({
         //当满足组合的要求：总数要满足，起购数要满足
         if (all_num >= this.data.act.zhbuyqty && !need_to_buy) {
             function sortData(a, b) {
-                return a.price - b.price
+                return b.price - a.price
             }
             no_in_arr.sort(sortData);
@@ -87,8 +87,8 @@ module.exports = {
 			var goods = zh_prom_goods[act.id];
 			//寻找一下
 			function get_num(ite) {
-				for (let v1 in car_item.goods) {
-					var vh = car_item.goods[v1];
+				for (let v1 in bitem.goods) {
+					var vh = bitem.goods[v1];
 					if (vh.goods_id == ite.goods_id) {
 						return vh;
 					}
@@ -96,6 +96,17 @@ module.exports = {
 				return 0;
 			}
+            //寻找一下
+            function get_num2(ite) {
+                for (let v2 in car_item.goods) {
+                    var vh = car_item.goods[v2];
+                    if (vh.goods_id == ite.goods_id) {
+                        return vh;
+                    }
+                }
+                return 0;
+            }
+
 			for (var i in goods) {
 				var item = goods[i];
 				item.num = get_num(item).goods_num;
@@ -114,14 +125,14 @@ module.exports = {
 						if (item.num > item.zhqty) {
 							for (var i = 0; i < item.num - item.zhqty; i++) {
 								no_in_arr.push({
-									price: item.goods_price,offline_price:item.offline_price
+									price: item.goods_price,offline_price:item.offline_price,goods_id:item.goods_id
 								})
 							}
 						}
 					} else {
 						for (var j = 0; j < item.num; j++) {
 							no_in_arr.push({
-								price: item.goods_price,offline_price:item.offline_price
+								price: item.goods_price,offline_price:item.offline_price,goods_id:item.goods_id
 							})
 						}
 					}
@@ -136,7 +147,7 @@ module.exports = {
 			//当满足组合的要求：总数要满足，起购数要满足
 			if (all_num >= act.zhbuyqty && !need_to_buy) {
 				function sortData(a, b) {
-					return a.price - b.price
+					return b.price - a.price
 				}
 				no_in_arr.sort(sortData);
@@ -159,7 +170,7 @@ module.exports = {
 				if (no_in_arr.length) {
 					for (var ii in no_in_arr) {
 						var item = no_in_arr[ii];
-                        var gitem=get_num(item);
+                        var gitem=get_num2(item);
                         if(gitem) {
                             if (!gitem.need_downlow_num) {
                                 gitem.need_downlow_num = 1;
@@ -190,9 +201,7 @@ module.exports = {
 			} else {
 				for (var ii in goods) {
 					var item = goods[ii];
-
-
-                    var gitem=get_num(item);
+                    var gitem=get_num2(item);
                     if(gitem) {
                         gitem.need_downlow_num = item.num;
@@ -65,7 +65,7 @@ module.exports = {
             //当满足组合的要求：总数要满足，起购数要满足
             if (all_num >= act.zhbuyqty && !need_to_buy) {
                 function sortData(a, b) {
-                    return a.price - b.price
+                    return b.price - a.price
                 }
                 no_in_arr.sort(sortData);
                 aprice = act.zhprice;
@@ -153,6 +153,7 @@ Page({
 							if (su.data.code == 0) {
 								var yuer = parseFloat(th.data.userinfo.user_money -
 									(th.data.userinfo.frozen_money>0?th.data.userinfo.frozen_money:0) - su.data.data.summoney).toFixed(2);
+								if(yuer<0) yuer=0;
 								th.setData({ txmon: su.data.data.summoney, yuer: yuer });
 							}
 						}
@@ -451,13 +452,13 @@ Page({
                   var txt = "formData.user_money";
                   var txt2 = "formData.order_amount";
                   //--------------如果使用余额---------------------
-                  if (th.data.bn_use_money == 1) {
+                  if (th.data.bn_use_money == 1 && th.data.yuer>0) {
                       if ( parseFloat(th.data.yuer) > total_m) {
                           th.setData({ [txt]: total_m, [txt2]:0 })
                       }else{
                           order_m = parseFloat(order_m) - parseFloat(th.data.yuer);
                           order_m = order_m.toFixed(2);
-                          th.setData({ [txt]: th.data.userinfo.yuer, [txt2]: order_m })
+                          th.setData({ [txt]: th.data.yuer, [txt2]: order_m })
                       }
                   }else{
                     th.setData({ [txt]: 0, [txt2]: order_m })
@@ -125,7 +125,7 @@
          <view class="information bdr14">
 						 <!-----使用余额------>
-						 <view class="set-mes" wx:if="{{userinfo.user_money>0}}">
+						 <view class="set-mes" wx:if="{{userinfo.user_money>0 && yuer>0}}">
 							 <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;">
 								<icon  color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
 								<view class="yu_er">使用余额 :￥{{yuer}} </view>
@@ -196,7 +196,7 @@
          <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
          <view class="brand_img_frame" wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
-            <view class="brand_img t-c">
+            <view class="t-c">
               <image class="brand_img" src="{{user.logo}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
               <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
            </view>
@@ -381,7 +381,7 @@
          <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
          <view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
-            <view class="brand_img t-c">
+            <view class="t-c">
                <image class=" brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
                 <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
            </view>