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

后端研发-苏泰源
2 parents 9e8470a4 c2f9aaf0
Showing 11 changed files with 318 additions and 197 deletions
packageB/pages/zuhegou/index/index.js
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/cart/cart/cart.wxss
pages/cart/cart/zh_calculate.js
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
pages/cart/cart2/ladder_calculate.js
pages/cart/cart2/zh_calculate.js
pages/togoin/togoin.js
pages/user/order_detail/order_detail.js
@@ -1965,29 +1965,63 @@ Page({
             //看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
             if (this.data.act.is_bz && no_in_arr.length >= this.data.act.zhbuyqty) {
-                let zhqty_map=new map();
-                 //看一下是几倍
-                var be = parseInt(no_in_arr.length / this.data.act.zhbuyqty);
+                var bz_num_ok=0; //超量倍增是否满足
+                var zhqty_len=0; //几个超量倍增
+                var be = parseInt(no_in_arr.length / this.data.act.zhbuyqty); //看一下是几倍
                 if(this.data.act.is_bzyh && zhqty_bz.length > 0 ){
-                    for(let i=0;i<zhqty_bz.length;i++){
-                        let vv=zhqty_bz[i];
-                        let num=0;
-                        let bz_num=be*vv.zhqty;
-                        for(let j=0;j<no_in_arr.length;j++){
-                            let ii=no_in_arr[j];
-                            if(vv.goods_id===ii.goods_id){
-                                num++;
-                                zhqty_map.set('num',num);
-                                zhqty_map.set('price',ii.price);
-                            }
-                            
+                    if(zhqty_bz.length>1){
+                        zhqty_len=1;
+                        let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']}));
+                        let new_arr=zhqty_bz.filter(ii=>{
+                            return ii['num']==min_bz_num
+                        })
+                        // var vv=new_arr[0];
+                        var bz_num=be*new_arr[0].zhqty; //超量倍增
+                        var num=min_bz_num-new_arr[0].zhqty; //购买数量减去超量
+                        bz_num_ok=bz_num-num;
+                        if(bz_num_ok <= 0){
+                            //超量倍增满足,超量倍增就等于倍数
+                            bz_num_ok=bz_num;
+                        }else{
+                            //超量倍增不满足,倍数要减去多出得
+                            be=be-bz_num_ok;
+                            bz_num_ok=num;
                         }
-                    }
+                        for(let i=0;i<zhqty_bz.length;i++){
+                            var vv=zhqty_bz[i];
+                            for(let j=0;j<bz_num_ok;j++){
+                                let index= no_in_arr.findIndex(i=>{
+                                     return vv.goods_id===i.goods_id
+                                 })
+                                 no_in_arr.splice(index,1)
+                             }
+                        }
+                        aprice += be * aprice;
+                       }else{
+                            var vv=zhqty_bz[0];
+                            var bz_num=be*vv.zhqty; //超量倍增
+                            var num=vv['num']-vv.zhqty; //购买数量减去超量
+                            bz_num_ok=bz_num-num;
+                            if(bz_num_ok <= 0){
+                                //超量倍增满足,超量倍增就等于倍数
+                                bz_num_ok=bz_num;
+                            }else{
+                                //超量倍增不满足,倍数要减去多出得
+                                be=be-bz_num_ok;
+                                bz_num_ok=num;
+                            }
+                            for(let j=0;j<bz_num_ok;j++){
+                                let index= no_in_arr.findIndex(i=>{
+                                     return vv.goods_id===i.goods_id
+                                 })
+                                 no_in_arr.splice(index,1)
+                             }
+                       }
                 }
-                if(bz_num <= num){
+                if(!zhqty_len){
+                    //多个超量就不用pop了
                     aprice += be * aprice;
-                    let pop_num=(be * this.data.act.zhbuyqty)-bz_num;
-                    console.log(pop_num);
+                    let pop_num=be * this.data.act.zhbuyqty - bz_num_ok;
                     for (var m = 0; m < pop_num; m++) {
                         no_in_arr.pop();
                     }
@@ -2546,7 +2546,12 @@ Page({
                     [rq_text]: list
                 });
             }
-            return false;
+
+            var rq_text2 = "requestData[" + cindex + "].make_up_arr";
+            this.setData({
+                [rq_text2]:null,
+            })
+
         }
         /*--
        var map2=new Map();
@@ -2794,13 +2799,13 @@ Page({
                     var item=res.data.data[0];
                     switch (item.prom_type){
                         case 9:
-                            good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.prom_id;
+                            good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.act_id;
                             break;
                         case 8:
-                            good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id
+                            good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id
                             break;
                         default:
-                            good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id+"&prom_type=1";
+                            good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id+"&prom_type=1";
                             break
                     }
                 }
@@ -39,11 +39,9 @@
   <!-- 购物车商品框架 -->
   <view class="login-in">
     <!-- 编辑 -->
-    <view class="padding flex-vertical-between fs30 Storenum store">
-      <view class="flex">
-        <view>总数量:</view>
-        <view class="goods_num">{{all_num}}</view>
-        <view wx:if="{{total_fee > 0 && freight_free - total_fee > 0}}" class="co-red weight_free">再买{{freight_free - total_fee}}元可享包邮({{weight_free}}kg内)；</view>
+    <view class="padding flex-vertical-between fs30 Storenum store" style="{{total_fee > 0 && freight_free - total_fee > 0 ? 'justify-content:space-between':'justify-content: flex-end;'}}">
+      <view wx:if="{{total_fee > 0 && freight_free - total_fee > 0}}" class="fs28 pdr20 pdl20 c-red2 flex jc_sb weight_free">
+        <text>再买{{freight_free - total_fee}}元可享全场包邮({{weight_free}}kg内)</text>
       </view>
       <view wx:if="{{is_edit==0}}" bindtap="edit_cart" data-type="1">编辑</view>
       <view wx:else bindtap="edit_cart" data-type="0">完成</view>
@@ -140,7 +138,8 @@
       </view>
         <!--- 去凑单 -->
        <view  style="margin-top: 20rpx; padding: 0 30rpx">
-              <view class="flex jc_sb fs28" wx:for="{{item.make_up_arr}}" style="margin-bottom: 20rpx" >
+          <block wx:if="{{item.make_up_arr}}">
+            <view class="flex jc_sb fs28" wx:for="{{item.make_up_arr}}" style="margin-bottom: 20rpx" >
               <view class="ellipsis-1" style="width: 80%">再买<text class="co-red">{{item.diff}}<text wx:if="{{item.diff_type==0}}">元</text>
                           <text wx:if="{{item.diff_type==1}}">件</text>
                    </text>，
@@ -153,26 +152,36 @@
                   <text wx:if="{{item.content.is_libao==1}}">送礼包|</text>
                   <text></text>
               </view>
-              <view class="co-red" data-prom_id="{{item.prom_id}}" bindtap="go_cou_dang">去凑单></view>
+                <view class="co-red" data-prom_id="{{item.prom_id}}" bindtap="go_cou_dang">去凑单></view>
               </view>
-         </view>
-
+          </block>
+        </view>
           <!-- 还差多少件立即享受组合购 -->
           <block wx:if="{{item.need_list && item.need_list.length>0 && !is_edit}}">
-               <view class="fs28 pdr20 pdl20 pdb20 c-red2 flex jc_sb" wx:for="{{item.need_list}}">
+            <view class="fs28 pdr20 pdl20 pdb20 c-red2 flex jc_sb" wx:for="{{item.need_list}}">
 			       <text>{{item.title}}</text>
-			       <text data-url="/packageB/pages/zuhegou/index/index?id={{item.id}}" bindtap="go_url">去凑单</text>
-			   </view>
+			       <text data-url="/packageB/pages/zuhegou/index/index?id={{item.id}}" bindtap="go_url">去凑单></text>
+			      </view>
           </block>
           <!-- 阶梯促销提示多少件的优惠 -->
           <block wx:if="{{item.l_need_list && item.l_need_list.length>0 && !is_edit}}">
-
               <view class="fs28 pdr20 pdl20 pdb20 c-red2 flex jc_sb" wx:for="{{item.l_need_list}}">
                   <text>{{item.title}}</text>
-                  <text data-url="/pages/goods/goodsList/goodsList?ladder_id={{item.id}}" bindtap="go_url">去凑单</text>
+                  <text data-url="/pages/goods/goodsList/goodsList?ladder_id={{item.id}}" bindtap="go_url">去凑单></text>
               </view>
           </block>
+           
+          <!-- <block wx:if="{{item.make_up_arr}}">
+            <view wx:if="{{total_fee > 0 && freight_free - total_fee > 0}}" class="fs28 pdr20 pdl20 c-red2 flex jc_sb weight_free">
+                <text>再买{{freight_free - total_fee}}元可享全场包邮({{weight_free}}kg内)</text>
+            </view>
+          </block>
+          <block wx:else="">
+              <view wx:if="{{total_fee > 0 && freight_free - total_fee > 0}}" class="fs28 pdr20 pdl20 c-red2 flex jc_sb weight_free">
+                <text>再买{{freight_free - total_fee}}元可享全场包邮({{weight_free}}kg内)</text>
+            </view>
+          </block> -->
       <!-- 线下取价 -->
@@ -224,6 +224,9 @@ radio {
 .store {
   border-bottom: 7rpx solid rgb(245, 245, 245);
 }
+.login-in {
+  position: relative;
+}
 .login-in .Storenum {
   height: 80rpx;
@@ -235,9 +238,11 @@ radio {
 }
 .login-in .weight_free {
+  /* position: absolute;
+  top: 20rpx; */
   font-size: 26rpx;
+  /* margin-left: 20rpx;  */
   line-height: 48rpx;
-  margin-left: 30rpx;
 }
 .allradio {
@@ -232,25 +232,63 @@ module.exports = {
 				}
 				//看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
 				if (act.is_bz && no_in_arr.length >= act.zhbuyqty) {
-					//看一下是几倍
-					let num = 0;
-					let bz_num = 0;
-					var be = parseInt(no_in_arr.length / act.zhbuyqty);
+					var bz_num_ok=0; //超量倍增是否满
+					var zhqty_len=0; //几个超量倍增
+					var be = parseInt(no_in_arr.length / act.zhbuyqty);//看一下是几倍
 					if (act.is_bzyh && zhqty_bz.length > 0) {
-						for (let i = 0; i < zhqty_bz.length; i++) {
-							let item = zhqty_bz[i];
-							bz_num = be * item.zhqty;
-							for (let j = 0; j < no_in_arr.length; j++) {
-								let i = no_in_arr[j];
-								if (item.goods_id === i.goods_id) {
-									num++
-								}
+						if(zhqty_bz.length>1){
+							zhqty_len=1;
+							let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']}));
+							let new_arr=zhqty_bz.filter(ii=>{
+									return ii['num']==min_bz_num
+							})
+							// var vv=new_arr[0];
+							var bz_num=be*new_arr[0].zhqty; //超量倍增
+							var num=min_bz_num-new_arr[0].zhqty; //购买数量减去超量
+							bz_num_ok=bz_num-num;
+							if(bz_num_ok <= 0){
+									//超量倍增满足,超量倍增就等于倍数
+									bz_num_ok=bz_num;
+							}else{
+									//超量倍增不满足,倍数要减去多出得
+									be=be-bz_num_ok;
+									bz_num_ok=num;
 							}
-						}
+							for(let i=0;i<zhqty_bz.length;i++){
+									var vv=zhqty_bz[i];
+									for(let j=0;j<bz_num_ok;j++){
+											let index= no_in_arr.findIndex(i=>{
+													 return vv.goods_id===i.goods_id
+											 })
+											 no_in_arr.splice(index,1)
+									 }
+							}
+							aprice += be * aprice;
+						 }else{
+									var vv=zhqty_bz[0];
+									var bz_num=be*vv.zhqty; //超量倍增
+									var num=vv['num']-vv.zhqty; //购买数量减去超量
+									bz_num_ok=bz_num-num;
+									if(bz_num_ok <= 0){
+											//超量倍增满足,超量倍增就等于倍数
+											bz_num_ok=bz_num;
+									}else{
+											//超量倍增不满足,倍数要减去多出得
+											be=be-bz_num_ok;
+											bz_num_ok=num;
+									}
+									for(let j=0;j<bz_num_ok;j++){
+											let index= no_in_arr.findIndex(i=>{
+													 return vv.goods_id===i.goods_id
+											 })
+											 no_in_arr.splice(index,1)
+									 }
+						 }
 					}
-					if (bz_num <= num) {
+					if (!zhqty_len) {
 						aprice += be * act.zhprice;
-						for (var m = 0; m < be * act.zhbuyqty; m++) {
+						let pop_num=be * act.zhbuyqty - bz_num_ok;
+						for (var m = 0; m < pop_num; m++) {
 							no_in_arr.pop();
 						}
 					}
@@ -24,7 +24,7 @@ Page({
         firstEnter: !0,
         //页面获取的参数
         param: null,
-        //提交订单的格式 
+        //提交订单的格式
         formData: {
             order_amount: 0,//支付金额
             total_amount: 0,//总价
@@ -87,7 +87,7 @@ Page({
         is_express: 0,       //选中物流的属性
         expres_name: "",     //点击选定
         isopen: 0,           //券的说明
-        is_coupon: null,     //选择券的控制属性
+        is_coupon: 1,     //选择券的控制属性
         is_shipping_code: "",//插入用户默认地址
         wu_arr_txt: "",      //要更新的物流的字段
@@ -125,7 +125,7 @@ Page({
         in_zhact_gdmap:{}, //不同门店参与同一活动的限购
         hid_inp:1,
-        user_note:{},
+        user_note:"",
         zhhe_act_map:{},    //组合活动的map表
         zuhe_map_good:{},  //组合购的map表
         ladder_map:{},  //阶梯促销的map表
@@ -175,10 +175,7 @@ Page({
     //----------子页返回父页触发----------
     onShow: function () {
         var th = this;
-        th.setData({
-            show_submit: 0,
-            
-        }); //让提交先掩藏
+        th.setData({show_submit: 0}); //让提交先掩藏
         th.data.g_cart_q_time = null;
         if (th.data.isclose == 0) {
@@ -331,7 +328,6 @@ Page({
             typeof func == "function" && func();
         })
     },
-
     //------获取会员信息-----先获取用户信息，在进行下一步---
     get_info: function (func) {
         var user_id = t.globalData.user_id;
@@ -529,7 +525,7 @@ Page({
                         }
                         else
                         {
-                            item1.act = th.data.zhhe_act_map[item1.prom_id];
+                            item1.act = th.data.zhhe_act_map[item1.prom_id]; 
                         }
                     }
                     if(item1.prom_type==10){
@@ -565,7 +561,7 @@ Page({
                                 }
                             })
                             if (!isok){
-                                var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id;
+                                var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
                                 getApp().request.delete(url, {});
                                 th.data.ladder_map[item1.prom_id]=-1;
                                 continue;
@@ -629,9 +625,7 @@ Page({
                     if (arr.length > 0) {
                         for (var j = 0; j < arr.length; j++) {
                             if (arr[j].pickup_id == pcid) {
-
-                                //赠品的配送方式要和优惠的主商品一样
-                                if(item.is_gift!=1){
+                                //if(item.is_gift!=1){
                                 //确定配送方式
                                 if (arr[j].distr_t == 0) {
                                     arr[j].distr_t = car_item.distr_type;
@@ -652,8 +646,7 @@ Page({
                                 arr[j].exp_type = e_t;
                                 if (e_t == 0) th.setData({is_all_zt: 0});
                                 else if(e_t==1) th.setData({is_all_zt: 1});
-                                }
-
+                                //}
                                 //-- 把等级卡会优惠多少钱装进去 --
                                 if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1;
@@ -696,7 +689,6 @@ Page({
                         }
                         //如果是物流的话，全部自提的控制要弄成0
                         if (e_t == 0) th.setData({is_all_zt: 0});
-                        else if (e_t == 1) th.setData({is_all_zt: 1});
                         var narr = new Array();
                         narr.push(car_item);
@@ -835,8 +827,6 @@ Page({
     get_buy_goods: function (e) {
         var th = this;
         var gg = to.get_b_now();
-
-        
         //--------如果goods_id一样，就是要立即购买-----
         if (e == gg.goods_id) {
             a.get("/api/weshop/goods/get/" + oo.stoid + "/" + e, {
@@ -984,11 +974,6 @@ Page({
                             } else {
                                 //--看是不是搭配促销--
                                 if (gg.prom_type == 5) {
-
-                                        th.setData({
-                                            'is_coupon': gg.is_coupon
-                                        });
-
                                     t.data.data.prom_id = gg.prom_id;
                                     t.data.data.prom_type = 5;
                                     if (gg.room_id) {
@@ -1389,8 +1374,7 @@ Page({
                             by_qc = res.data.data[0];
                         }
                     })
-                }
-                ;
+                };
                 var c_arr = JSON.parse(JSON.stringify(th.data.old_cartlist));
                 if (th.data.cartlist && th.data.cartlist.length > 0) {
@@ -1478,7 +1462,7 @@ Page({
                         {
                             is_no_zh=1;
                         }
-                        //组合购的商品，且有订单优惠的叠加,is_orderyh就是优惠叠加
+                        //阶梯购的商品，且有订单优惠的叠加,is_orderyh就是优惠叠加
                         if(item[j].prom_type==10 && ladder_prom_goods && ladder_prom_goods[item[j].prom_id]
                             && th.data.ladder_map[item[j].prom_id].is_useorderyh )
                         {
@@ -1490,8 +1474,8 @@ Page({
                         }
                         o_price += item[j].goods_price * item[j].goods_num;
-                        //判断是否有设置限制重量包邮
-                        if(weight_free){
+                        //判断是否有设置限制重量包邮,先看商品有没有包邮
+                        if(item[j]['is_past']!==1 && weight_free){
                             if( item[j]['exp_sum_type']==2 ){
                                 if (goods_weight < 0) goods_weight = 0;
                                     //累积商品重量 每种商品的重量 * 数量
@@ -1740,19 +1724,16 @@ Page({
                     }).then(res => {
                         if (res.data.code == 0) {
                             var ord_prom = res.data.data;
-                            //如果订单没有勾选使用优惠券不参与此活动，或者没有用优惠券
-                            if(!ord_prom.is_xz_yh || quan_price<=0) {
-                                order_prom_id = ord_prom['id'];
-                                switch (ord_prom['type']) {
-                                    case 0:
-                                        order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                        order_prom_amount = (o_condition - order_m).toFixed(2);
-                                        break;
-                                    case 1:
-                                        //order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                        order_prom_amount = ord_prom['expression'];
-                                        break;
-                                }
+                            order_prom_id = ord_prom['id'];
+                            switch (ord_prom['type']) {
+                                case 0:
+                                    order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+                                    order_prom_amount = (o_condition - order_m).toFixed(2);
+                                    break;
+                                case 1:
+                                    //order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                    order_prom_amount = ord_prom['expression'];
+                                    break;
                             }
                         }
                     })
@@ -2098,27 +2079,25 @@ Page({
                         var order_prom_id = 0;
                         if (th.data.order_prom[th.data.bn_pick]) {
                             var ord_prom = th.data.order_prom[th.data.bn_pick];
-                            //如果订单没有勾选使用优惠券不参与此活动
-                            if(!ord_prom.is_xz_yh || quan_price<=0) {
-
-                                order_prom_id = ord_prom['id'];
-                                switch (ord_prom['type']) {
-                                    case 0:
-                                        order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                        order_prom_amount = (o_condition - order_m).toFixed(2);
-                                        break;
-                                    case 1:
-                                        order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                        order_prom_amount = ord_prom['expression'];
-                                        break;
-                                }
+                            order_prom_id = ord_prom['id'];
+                            switch (ord_prom['type']) {
+                                case 0:
+                                    order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+                                    order_prom_amount = (o_condition - order_m).toFixed(2);
+                                    break;
+                                case 1:
+                                    order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                    order_prom_amount = ord_prom['expression'];
+                                    break;
                             }
                         }
                         //--订单优惠的显示--
+                        var order_prom_txt1 = "formData.order_prom_id";
+                        var order_prom_txt2 = "formData.order_prom_amount";
                         if (order_prom_id > 0) {
-                            var order_prom_txt1 = "formData.order_prom_id";
-                            var order_prom_txt2 = "formData.order_prom_amount";
                             th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
+                        }else{
+                            th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0})
                         }
                         total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
@@ -2261,7 +2240,6 @@ Page({
         var ff = true;
         //------------立即购买-------------
         if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
-
             if (th.data.bn_exp_type == 0 && th.data.user_addr == null) {
                 ff = false;
                 getApp().my_warnning("请选择收货地址", 0, th);
@@ -2298,7 +2276,7 @@ Page({
                 'user_money': th.data.formData.user_money,         //使用余额
                 'total_amount': th.data.formData.total_amount,     //订单总价
                 'order_amount': th.data.formData.order_amount,     //应付
-                'user_note': th.data.user_note,             //用户备注
+                'user_note': th.data.user_note['0']?th.data.user_note['0']:0,             //用户备注
                 'store_id': oo.stoid,                //商家
                 'pickup_id': th.data.bn_pick,       //门店
                 'exp_type': th.data.bn_exp_type,    //配送方式
@@ -2481,11 +2459,21 @@ Page({
                     'gift_id': gift_gg.gift_id,
                     'prom_id': gift_gg.prom_id,
                 };
+                //-- 把导购的信息填入--
+                if (gg.guide_id) {
+                    g_goods.guide_id = gg.guide_id;
+                    g_goods.guide_type = gg.guide_type;
+                    //调用接口判断是不是会员
+                    await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(res => {
+                        if (res.data.code == 0) {
+                            g_goods.guide_name = is_vip.salesman;
+                            g_goods.guide_sn = is_vip.salesman_no;
+                        }
+                    })
+                }
                 item.order_goods.push(g_goods);
             }
             pdata.push(item);
-
-            console.log(pdata);
         } else {
             //---------购物车的结算---------
             if (th.data.is_all_zt == 0 && th.data.user_addr == null) {
@@ -2547,7 +2535,6 @@ Page({
                 if (t_item.coupon_price) {
                     item.coupon_price = t_item.coupon_price;
                     item.coupon_no = th.data.using_quan[t_item.pickup_id].coupon_no;
-                    t_item.quan_no=item.coupon_no;
                 } else if (t_item.quan_no) {
                     item.coupon_no = t_item.quan_no;
                     item.coupon_price = 0;
@@ -2616,16 +2603,15 @@ Page({
                 //房间号的ids
                 var room_ids = "";
-                //-- 把券的钱，写入从表 ---
-                if (t_item.quan_youhui_list && t_item.coupon_price) {
+                 //-- 把券的钱，写入从表 ---
+                 if (t_item.quan_youhui_list && t_item.coupon_price) {
                     for (var kk in t_item.quan_youhui_list) {
                         var you_item = t_item.quan_youhui_list[kk];
                         //-- 对券的价格进行平摊 --
                         await th.split_set_goods_quanprice(you_item,t_item);
                     }
                 }
-
                 //-------------让商品添加到商品列表--------------------
                 for (var k = 0; k < t_item.goods.length; k++) {
                     var g_item = t_item.goods[k];
@@ -2648,7 +2634,6 @@ Page({
                         goods.offline_cut = (g_item.goods_price - g_item.offline_price).toFixed(2);
                         goods.pricing_type = g_item.pricing_type;
                     }
-
                     if(g_item.quan_num){
                         goods.quan_num=g_item.quan_num;
                         goods.quan_no=g_item.quan_no;
@@ -2742,7 +2727,6 @@ Page({
         if (pdata.length == 0) return;
         var str = JSON.stringify(pdata);
-
         wx.showLoading({title: "加载中"});
         wx.request({
             url: oo.url + '/api/weshop/order/createWxdOrder',
@@ -2752,8 +2736,6 @@ Page({
                 'content-type': 'application/json'
             },// 设置请求的 header
             success: function (res) {
-
-
                 wx.hideLoading();
                 if (res.statusCode == 200) {
                     var data = res.data;
@@ -3602,7 +3584,6 @@ Page({
                 if (th.data.is_b_now == 1) {
                     th.setData({index: m_wind, is_express: m_wind});
                 } else {
-                    clearInterval(ui);
                     var ui = setInterval(function () {
                         if (th.data.cartlist) {
                             var c_arr = th.data.cartlist;
@@ -3639,7 +3620,9 @@ Page({
             //就要把相应的值，写入cartlist数组中--
             var ckeck_quan_price = 0,
                 check_quan_price_list = '',
-                check_quan_ware_list = '';
+                check_quan_ware_list = '',
+                check_quan_price_list_arr=[],
+                check_quan_ware_list_arr=[];
             for (var i in goodlist) {
                 var gd = goodlist[i];
@@ -3678,47 +3661,75 @@ Page({
                     th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele = 1;
                 }
                 is_xz_yh = 0;
-                var item_price = gd.goods_price * gd.goods_num;
+
+                var  item_price = gd.goods_price * gd.goods_num;
+                var item_price2=item_price;
+
                 //-- 如果有平摊下去，有实收价格的时候，就要用account来计算价格 --
                 if (gd.account_fir != null && gd.account_fir != undefined) {
-                    //item_price = gd.account_fir * gd.goods_num;
+                    item_price2 = gd.account_fir * gd.goods_num;
                 }
-                ckeck_quan_price += item_price;
-                //--组装价格list--
-                if (check_quan_price_list) {
-                    check_quan_price_list += "," + item_price;
-                } else {
-                    check_quan_price_list = item_price;
+                if(gd.ld_account){
+                    item_price2 = gd.ld_account * gd.goods_num;
                 }
-                //--组装商品的线下erpwareid--
-                if (check_quan_ware_list) {
-                    check_quan_ware_list += "," + encodeURIComponent(gd['erpwareid']);
-                } else {
-                    check_quan_ware_list = encodeURIComponent(gd['erpwareid']);
+
+                ckeck_quan_price += item_price;
+                //如果商品有重复的过滤，一般是组合购和阶梯购的情况下
+                var idx=check_quan_ware_list_arr.findIndex(function(ele){
+                    return ele== encodeURIComponent(gd['erpwareid']);
+                })
+
+                if(idx>-1){
+                    check_quan_price_list_arr[idx]+=item_price2;
+                }else{
+                    check_quan_ware_list_arr.push(encodeURIComponent(gd['erpwareid']));
+                    check_quan_price_list_arr.push(item_price2);
                 }
+                 //--组装价格list--
+                    /*--
+                    if (check_quan_price_list) {
+                        check_quan_price_list += "," + item_price;
+                    } else {
+                        check_quan_price_list = item_price;
+                    }
+                    //--组装商品的线下erpwareid--
+                    if (check_quan_ware_list) {
+                        check_quan_ware_list += "," + encodeURIComponent(gd['erpwareid']);
+                    } else {
+                        check_quan_ware_list = encodeURIComponent(gd['erpwareid']);
+                    }---*/
             }
-
             //优惠券优惠的金额要控制到优惠券的选择条件
             var cut_price = 0;
             for (var i in th.data.prom_goods_map[pickup_id]) {
                 var obj = th.data.prom_goods_map[pickup_id][i];
-                if (obj.coupon_sele && obj.prom_price) {
+                if (obj.coupon_sele) {
                     cut_price += obj.price - obj.prom_price;
                 }
             }
-            //阶梯优惠使用券
             var  prom_pt_json= ep.prom_pt_json;
             if(prom_pt_json){
                 for(let oj in prom_pt_json){
                     let item_j=prom_pt_json[oj];
+
+                    //要对一下阶梯优惠促销的功能
                     if(item_j.ladder_prom_id){
+
+                        //看一下要不要限制使用优惠券
+                        if (th.data.ladder_map[item_j.ladder_prom_id] && th.data.ladder_map[item_j.ladder_prom_id].is_usecoupon){
+                            continue;
+                        }
+
                         cut_price += parseFloat(item_j.dis);
                     }
                 }
             }
+            if(check_quan_price_list_arr.length) check_quan_price_list=check_quan_price_list_arr.join(',');
+            if(check_quan_ware_list_arr.length) check_quan_ware_list=check_quan_ware_list_arr.join(',')
+
             arr[ind].ckeck_quan_price = ckeck_quan_price - (cut_price?cut_price:0);
             arr[ind].check_quan_ware_list = check_quan_ware_list;
             arr[ind].check_quan_price_list = check_quan_price_list;
@@ -3732,7 +3743,7 @@ Page({
                     data: {
                         storeId: oo.stoid,
                         userId: app.globalData.user_id,
-                        BuySum: parseFloat(arr[ind].ckeck_quan_price?arr[ind].ckeck_quan_price:0).toFixed(2),
+                        BuySum: arr[ind].ckeck_quan_price,
                         WareIds: check_quan_ware_list,
                         pageSize: 100
                     }
@@ -3781,7 +3792,7 @@ Page({
                     data: {
                         storeId: oo.stoid,
                         userId: app.globalData.user_id,
-                        BuySum: parseFloat(th.data.ckeck_quan_price?th.data.ckeck_quan_price:0).toFixed(2),
+                        BuySum: th.data.ckeck_quan_price,
                         WareIds: encodeURIComponent(th.data.check_quan_ware_list),
                         pageSize: 100
                     },
@@ -3959,6 +3970,7 @@ Page({
         var goods_weight = -1, goods_piece = -1;
         var gift_shipping_price = 0;
         var th = this;
+        var out_of_weight=null;
         switch (good['exp_sum_type']) {
             case 1:
                 //统一运费
@@ -3970,8 +3982,9 @@ Page({
                 //累积商品重量 每种商品的重量 * 数量
                 goods_weight += good['weight'] * good['buynum'];
                 if (goods_weight1 > 0) {
+                    out_of_weight = gift_weight_free - goods_weight; 
+                    //不能调换位置 下面goods_weight会变大
                     goods_weight += goods_weight1;
-                    out_of_weight = (gift_weight_free*1000) - goods_weight;
                 }
                 break;
             case 3:
@@ -4139,9 +4152,8 @@ Page({
         getApp().goto(url);
     },
-    //进行对商品的平摊g_item是单个商品，you_item是这个商品分多少优惠券的钱，goods是商品列表
-    split_set_goods_quanprice:async function (you_item,t_item) {
-
+     //进行对商品的平摊g_item是单个商品，you_item是这个商品分多少优惠券的钱，goods是商品列表
+     split_set_goods_quanprice:async function (you_item,t_item) {
         var coupon_price=you_item.WareCashSum;
         var goods=t_item.goods;
         var arr=[];
@@ -375,13 +375,13 @@
 				</view>
 			</view>
 			<!-- 留言 -->
-<!--			<view class="coupon-mes flex-vertical">-->
-<!--				<view>留言</view>-->
-<!--				<view class="leave-word">-->
-<!--					<input placeholder-class="fs28" placeholder='给商家留言，最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}"-->
-<!--					 class="word-box" maxlength="100" name="user_note"></input>-->
-<!--				</view>-->
-<!--			</view>-->
+			<view class="coupon-mes flex-vertical">
+				<view>留言</view>
+				<view class="leave-word">
+					<input placeholder-class="fs28" placeholder='给商家留言，最多100字' data-index="{{index}}" bindinput="keyUpChangeNum"
+					 class="word-box" maxlength="100" name="user_note"></input>
+				</view>
+			</view>
 			<!-- 是否参与店铺优惠 -->
 			<view class="coupon-mes flex-vertical" bindtap="bn_pop_offline" wx:if="{{bn_goods.offline_price}}">
@@ -69,6 +69,7 @@ module.exports = {
                 new_g.goods_num = 1;
                 //如果有平摊到单品的时候，account要显示
                 if(!th.data.ispt_goods) new_g.account = account.toFixed(2);
+                new_g.ld_account = account.toFixed(2);
                 new_g.discount = item_j.discount;
                 new_g.goods_price =new_price;
                 new_g.ladder_list_id =item_j.id;
@@ -144,25 +144,63 @@ module.exports = {
                 }
                 //看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
                 if (act.is_bz && no_in_arr.length >= act.zhbuyqty) {
-                    //看一下是几倍
-                    let num = 0;
-					let bz_num = 0;
-					let be = parseInt(no_in_arr.length / act.zhbuyqty);
+                    var bz_num_ok=0; //超量倍增是否满足
+					var zhqty_len=0; //几个超量倍增
+					let be = parseInt(no_in_arr.length / act.zhbuyqty);//看一下是几倍
 					if (act.is_bzyh && zhqty_bz.length > 0) {
-						for (let i = 0; i < zhqty_bz.length; i++) {
-							let item = zhqty_bz[i];
-							bz_num = be * item.zhqty;
-							for (let j = 0; j < no_in_arr.length; j++) {
-								let i = no_in_arr[j];
-								if (item.goods_id === i.goods_id) {
-									num++
-								}
-							}
-						}
+						if(zhqty_bz.length>1){
+                            zhqty_len=1;
+                            let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']}));
+                            let new_arr=zhqty_bz.filter(ii=>{
+                                return ii['num']==min_bz_num
+                            })
+                            // var vv=new_arr[0];
+                            var bz_num=be*new_arr[0].zhqty; //超量倍增
+                            var num=min_bz_num-new_arr[0].zhqty; //购买数量减去超量
+                            bz_num_ok=bz_num-num;
+                            if(bz_num_ok <= 0){
+                                //超量倍增满足,超量倍增就等于倍数
+                                bz_num_ok=bz_num;
+                            }else{
+                                //超量倍增不满足,倍数要减去多出得
+                                be=be-bz_num_ok;
+                                bz_num_ok=num;
+                            }
+                            for(let i=0;i<zhqty_bz.length;i++){
+                                var vv=zhqty_bz[i];
+                                for(let j=0;j<bz_num_ok;j++){
+                                    let index= no_in_arr.findIndex(i=>{
+                                         return vv.goods_id===i.goods_id
+                                     })
+                                     no_in_arr.splice(index,1)
+                                 }
+                            }
+                            aprice += be * aprice;
+                           }else{
+                                var vv=zhqty_bz[0];
+                                var bz_num=be*vv.zhqty; //超量倍增
+                                var num=vv['num']-vv.zhqty; //购买数量减去超量
+                                bz_num_ok=bz_num-num;
+                                if(bz_num_ok <= 0){
+                                    //超量倍增满足,超量倍增就等于倍数
+                                    bz_num_ok=bz_num;
+                                }else{
+                                    //超量倍增不满足,倍数要减去多出得
+                                    be=be-bz_num_ok;
+                                    bz_num_ok=num;
+                                }
+                                for(let j=0;j<bz_num_ok;j++){
+                                    let index= no_in_arr.findIndex(i=>{
+                                         return vv.goods_id===i.goods_id
+                                     })
+                                     no_in_arr.splice(index,1)
+                                 }
+                           }
 					}
-					if (bz_num <= num) {
-						aprice += be * act.zhprice;
-						for (var m = 0; m < be * act.zhbuyqty; m++) {
+					if (!zhqty_len) {
+                        aprice += be * act.zhprice;
+                        let pop_num=be * act.zhbuyqty - bz_num_ok;
+						for (var m = 0; m < pop_num; m++) {
 							no_in_arr.pop();
 						}
 					}
@@ -68,33 +68,12 @@ Page({
 		 return app.my_warnning("登录需要授权手机号码！", 0, this);
 	     return false;
 	}
-    var th=this;
     var sessionKey = getApp().globalData.sessionKey;
     var openid = getApp().globalData.openid;
-	var r=getApp().globalData.getu;
-
-	if(e){
-		wx.showModal({
-			title: '授权通知',
-			content:'是否接受注册成功通知',
-			success(res){
-				if(res.confirm){
-					th.sendsm(function (){
-						th.save_the_data(r,e,sessionKey,openid)
-					})
-				}else if(res.cancel){
-					th.save_the_data(r,e,sessionKey,openid)
-				}
-			}
-
-		})
-	}
-
-
+		var r=getApp().globalData.getu;
+		this.save_the_data(r,e,sessionKey,openid)
   },
-	requestSubscribe(){
-	},
   //-- 会员授权 --
   bindGetUserInfo: function(ee) {
@@ -186,6 +165,7 @@ Page({
 	  })
   },
+	
   save_the_data: async function (r,e,sessionKey,openid) {
     var app=getApp(),a=app,th=this;
     var dd = {
@@ -1604,7 +1604,6 @@ Page({
     //跳转到商品
     go_gd:function (e) {
-
 	    var user_id=getApp().globalData.user_id;
 	    if(!user_id) user_id=0;
@@ -1621,13 +1620,13 @@ Page({
                     var item=res.data.data[0];
                     switch (item.prom_type){
                      	case 9:
-                            good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.prom_id;
+                            good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.act_id;
                      		break;
                      	case 8:
-                            good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id
+                            good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id
                      		break;
                      	default:
-                            good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id+"&prom_type=1";
+                            good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id+"&prom_type=1";
                      	 	break
                      }
                 }