oa测试返回

abson
1 parent 6708cc76
Showing 10 changed files with 514 additions and 379 deletions
components/diy_goodsGroup/diy_goodsGroup.wxss
packageA/pages/quan_pro/quan_pro.wxml
packageA/pages/quan_pro/quan_pro.wxss
packageB/pages/zuhegou/index/index.js
pages/activity/seckill_list/seckill_list.js
pages/cart/cart/cart.wxml
pages/cart/cart/zh_calculate.js
pages/cart/cart2/zh_calculate.js
pages/giftpack/birthdaygift/birthdaygift.wxss
pages/goods/goodsInfo/goodsInfo.wxss
@@ -816,7 +816,7 @@ swiper {
   background-color: rgba(0, 0, 0, 0.5);
 }
-.t_red{ color:red;}
+.t_red{ color:red !important;}
 .sp .sp_top .s_img image.zs_t3_3l{
 	width: 56rpx;
@@ -26,7 +26,9 @@
                         <view class="fs28">满{{filters.toFix(q_data.condition,2)}}可用</view>
                     </view>
                 </view>
-                <text class="ellipsis-3 fs30">{{q_data.coupon_remark}}</text>
+                <view class="coupon_remark">
+                    <text class="ellipsis-2 fs26" style="height: 100%;">{{q_data.coupon_remark}}</text>
+                </view>
             </view>
             <block wx:if="{{ q_data}}">
@@ -27,3 +27,5 @@ page{background-color: #f8f8f8;}
 }
 .btn.gray{background-color: #dcdcdc; color: #adb3be;}
+.coupon_remark{padding: 20rpx 0; box-sizing: border-box; overflow: hidden;}
+
@@ -1966,6 +1966,7 @@ Page({
             //看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
             if (this.data.act.is_bz && no_in_arr.length >= this.data.act.zhbuyqty) {
                 var bz_num_ok=0; //超量倍增是否满足
+                var delete_num=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 ){
@@ -1975,62 +1976,83 @@ Page({
                         let new_arr=zhqty_bz.filter(ii=>{
                             return ii['num']==min_bz_num
                         })
-                        // var vv=new_arr[0];
+                        var vv=new_arr[0];
+                        // be=new_arr[0].zhqty;
                         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; //购买数量减去超量
+                        // if(num > 0){
                             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;
+                                    // be=be-bz_num_ok;
+                                    if(num % vv.zhqty == 0){
+                                        be=num/vv.zhqty;
+                                        bz_num_ok=num;
+                                    }else{
+                                        be = Math.floor(num/vv.zhqty)
+                                        bz_num_ok=num - (be * vv.zhqty);
+                                    }
+                            }
+                            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
+                                     })
+                                     if(index > -1){
+                                        delete_num++
+                                        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; //购买数量减去超量
+                            if(num > 0){
+                                bz_num_ok=bz_num-num;
+                                if(bz_num_ok <= 0){
+                                    //超量倍增满足,超量倍增就等于倍数
+                                    bz_num_ok=bz_num;
+                                }else{
+                                    //超量倍增不满足,倍数要减去多出得
+                                    // be=be-bz_num_ok;
+                                    if(num % vv.zhqty == 0){
+                                        be=num/vv.zhqty;
+                                        bz_num_ok=num;
+                                    }else{
+                                        be = Math.floor(num/vv.zhqty)
+                                        bz_num_ok=num - (be * vv.zhqty);
+                                    }
+                                }
+                                // be=vv.num;
+                                for(let j=0;j<bz_num_ok;j++){
+                                    let index= no_in_arr.findIndex(i=>{
+                                         return vv.goods_id===i.goods_id
+                                     })
+                                     if(index > -1){
+                                        delete_num++
+                                        no_in_arr.splice(index,1)
+                                     }
+                                }
+                            }else{
+                                zhqty_len=1;
                             }
-                            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(!zhqty_len){
                     //多个超量就不用pop了
                     aprice += be * aprice;
-                    let pop_num=be * this.data.act.zhbuyqty - bz_num_ok;
+                    let pop_num=be * this.data.act.zhbuyqty - delete_num;
                     for (var m = 0; m < pop_num; m++) {
                         no_in_arr.pop();
                     }
                 }
-                // var be = parseInt(no_in_arr.length / this.data.act.zhbuyqty);
-                // aprice += be * aprice;
-                // for (var m = 0; m < be * this.data.act.zhbuyqty; m++) {
-                //     no_in_arr.pop();
-                // }
             }
             //算一下剩余的钱
-var e = getApp(), i = e.request, a = e.globalData.setting,os=a,ut = require("../../../utils/util.js");
+var e = getApp(),
+  i = e.request,
+  a = e.globalData.setting,
+  os = a,
+  ut = require("../../../utils/util.js");
 var regeneratorRuntime = require('../../../utils/runtime.js');
 Page({
-    data: {
-        url: a.imghost,
-        killtime: null,
-        currentPage: 1,
-        goodlist: null,
-        type:1,
-        timer:null,
-        ismore:1,  //是否可以加载更多
-        isshow:0,
-		ad_data:null,
-		max_sw_height:200,
-    },
-
-    //------初始化加载----------
-    onLoad: function(t) {
-		wx.setNavigationBarTitle({ title: "商品秒杀",})
-        var  first_leader = t.first_leader;
-		var type=t.type;
-		if(type!=undefined){
-		    this.setData({type:type});
-        }
+  data: {
+    url: a.imghost,
+    killtime: null,
+    currentPage: 1,
+    goodlist: null,
+    type: 1,
+    timer: null,
+    ismore: 1, //是否可以加载更多
+    isshow: 0,
+    ad_data: null,
+    max_sw_height: 200,
+  },
+
+  //------初始化加载----------
+  onLoad: function (t) {
+    wx.setNavigationBarTitle({
+      title: "商品秒杀",
+    })
+    var first_leader = t.first_leader;
+    var type = t.type;
+    if (type != undefined) {
+      this.setData({
+        type: type
+      });
+    }
-		var th=this;
+    var th = this;
+    console.log("------------");
+    console.log(first_leader);
+    getApp().getConfig();
-        console.log("------------");
-        console.log(first_leader);		
-		getApp().getConfig();
+    if (first_leader) {
+      getApp().globalData.first_leader = first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+        if (res.data.code == 0) {
+          getApp().globalData.guide_id = res.data.data.id;
+        }
+      })
+    }
-        if (first_leader) {
-            getApp().globalData.first_leader = first_leader;
-            //调用接口判断是不是会员
-            getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
-                if (res.data.code == 0) {
-                    getApp().globalData.guide_id = res.data.data.id;
-                }
-            })
+    getApp().request.promiseGet("/api/weshop/ad/page?pid=701&store_id=" + os.stoid, {
+      data: {
+        enabled: 1
+      }
+    }).then(res => {
+      if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+        var a = res.data.data.pageData;
+        var narr = [];
+        for (var i in a) {
+          var tt = {
+            'ad_code': os.imghost + a[i].ad_code,
+            'media_link': '',
+            'ad_weapplink': a[i].ad_weapplink
+          };
+          narr.push(tt);
         }
-		
-		getApp().request.promiseGet("/api/weshop/ad/page?pid=701&store_id=" + os.stoid, {
-		  data: {
-		    enabled: 1
-		  }
-		}).then(res => {
-			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-				var a = res.data.data.pageData;
-				var narr=[];
-				for(var i in a){
-					var tt = {
-					  'ad_code': os.imghost + a[i].ad_code,
-					  'media_link': '',
-					  'ad_weapplink':a[i].ad_weapplink
-					};
-					narr.push(tt);
-				}
-				th.setData({ad_data:narr});				
-			}					 			
-		})
-		
-    },
-
-
-    onShow: function(t) {       
-       this.data.ismore=1;
-       this.data.is_timer=1;
-       this.data.currentPage=1;
-       var th=this;th.setData({goodlist:null,})
-       this.requestSalelist();
-       //设置全局定时器
-       th.data.timer=setInterval(function () {
-          th.countDown();
-       },1000);
-    },
-    onHide:function(){
-      //--清理定时器--
-      clearInterval(this.data.timer);
-      this.setData({isshow:0});
-    },
-   //---小于10的格式化函数----
-   timeFormat(param) {
-      return param < 10 ? '0' + param : param;
-   },
+        th.setData({
+          ad_data: narr
+        });
+      }
+    })
+    this.requestSalelist();
+  },
+
+
+  onShow: function (t) {
+    this.data.ismore = 1;
+    this.data.is_timer = 1;
+    this.data.currentPage = 1;
+    var th = this;
+    //设置全局定时器
+    th.data.timer = setInterval(function () {
+      th.countDown();
+    }, 1000);
+  },
+  onHide: function () {
+    //--清理定时器--
+    clearInterval(this.data.timer);
+    this.setData({
+      isshow: 0
+    });
+  },
+  //---小于10的格式化函数----
+  timeFormat(param) {
+    return param < 10 ? '0' + param : param;
+  },
   //----倒计时函数-----
-   countDown() {
-    if(!this.data.is_timer) return false;
-    var th=this;
+  countDown() {
+    if (!this.data.is_timer) return false;
+    var th = this;
     // 获取当前时间，同时得到活动结束时间数组
-    let newTime =ut.gettimestamp();
+    let newTime = ut.gettimestamp();
     var endTimeList = this.data.goodlist;
-    if(endTimeList==null) return null
+    if (endTimeList == null) return null
     // 对结束时间进行处理渲染到页面
-    for (var i = 0; i < endTimeList.length;i++){
-         var o = endTimeList[i];
-         var endTime = o.end_time;
-         if(th.data.type==0) endTime = o.start_time;
-         let obj = null;
-         // 如果活动未结束，对时间进行处理
-         if (endTime - newTime > 0){
-              let time = (endTime - newTime);
-              // 获取天、时、分、秒
-              let day = parseInt(time / (60 * 60 * 24));
-              let hou = parseInt(time % (60 * 60 * 24) / 3600);
-              let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
-              let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
-              obj = {
-                day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec), hide: 1
-              }
-          }else{
-             //活动已结束，全部设置为'00'
-           obj = { day: '00', hou: '00', min: '00', sec: '00' }
-          }
-          var txt ="goodlist["+i+"].djs";
-          th.setData({ [txt]: obj});
+    for (var i = 0; i < endTimeList.length; i++) {
+      var o = endTimeList[i];
+      var endTime = o.end_time;
+      if (th.data.type == 0) endTime = o.start_time;
+      let obj = null;
+      // 如果活动未结束，对时间进行处理
+      if (endTime - newTime > 0) {
+        let time = (endTime - newTime);
+        // 获取天、时、分、秒
+        let day = parseInt(time / (60 * 60 * 24));
+        let hou = parseInt(time % (60 * 60 * 24) / 3600);
+        let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+        let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+        obj = {
+          day: this.timeFormat(day),
+          hou: this.timeFormat(hou),
+          min: this.timeFormat(min),
+          sec: this.timeFormat(sec),
+          hide: 1
         }
-   },
-
-   async requestSalelist() {
-        //--没有更多就不调用--
-        if(!this.data.ismore) return false;
-        var e = this,th=e, i = "/api/ms/flash_sale/spikepage?page=" + e.data.currentPage;
-        var plist=null,alllist=th.data.goodlist;
-        if(!alllist) alllist=[];
-        var user_id=getApp().globalData.user_id;
-        if(!user_id) user_id=user_id;
-        var req={store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1,user_id:user_id};
-
-        await getApp().request.promiseGet(i,
-          {isShowLoading:1,data:req}
-        ).then(res=>{
-           if(ut.ajax_ok(res)) plist=res.data.data.pageData;
+      } else {
+        //活动已结束，全部设置为'00'
+        obj = {
+          day: '00',
+          hou: '00',
+          min: '00',
+          sec: '00'
+        }
+      }
+      var txt = "goodlist[" + i + "].djs";
+      th.setData({
+        [txt]: obj
+      });
+    }
+  },
-        });
+  async requestSalelist() {
+    //--没有更多就不调用--
+    if (!this.data.ismore) return false;
+    var e = this,
+      th = e,
+      i = "/api/ms/flash_sale/spikepage?page=" + e.data.currentPage;
+    var plist = [],
+      alllist = th.data.goodlist;
+    if (!alllist) alllist = [];
+    var user_id = getApp().globalData.user_id;
+    if (!user_id) user_id = user_id;
+    var req = {
+      store_id: os.stoid,
+      timetype: th.data.type,
+      is_end: 0,
+      is_show: 1,
+      user_id: user_id
+    };
-        if(plist.length<=0){
-
-          getApp().showWarning("没有更多数据");
-          th.data.ismore=0;
-          if(e.data.currentPage==1 && this.data.type==1){
-              setTimeout(function () {
-                  th.data.ismore=1;
-                  th.setData({type:0});
-                  th.requestSalelist();
-              },1000);
-          }
-          return false;
-        }
+    await getApp().request.promiseGet(i, {
+      isShowLoading: 1,
+      data: req
+    }).then(res => {
+      if (ut.ajax_ok(res)) plist = res.data.data.pageData;
-        //--循环读取接口---
-        for(var i=0;i<plist.length;i++) {
-
-          if( plist[i].user_price)  plist[i].price= plist[i].user_price;
-          var prom_id = plist[i].id;
-          await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-            os.stoid + "/1/" + prom_id, {}
-          ).then(res=>{
-             if(res.data.code==0){
-                plist[i].status=1;
-                if(res.data.data<=0) plist[i].status=3;
-             }
-          })
-          alllist.push(plist[i]);
-        }
-        e.data.currentPage++;
-        console.log("秒杀商品列表", alllist);
-        th.setData({goodlist:alllist,isshow:1});
-
-    },
-    onPullDownRefresh: function() {
-        this.reloadGoodList();
-    },
-    reloadGoodList: function() {
-       this.data.goodlist = null, this.data.currentPage = 1, this.requestSalelist();
-    },
-
-    onReachBottom: function() {
-      this.requestSalelist();
-    },
-
-    //点击tab事件
-    tip:function(e){
-       var a=e.currentTarget.dataset.ty,th=this;th.data.ismore=1;
-       this.setData({type:a,goodlist:null});
-       this.reloadGoodList();
-    },
-
-
-    //---------分享配置--------
-    onShareAppMessage: function (e) {
-        var curPage=this;
-        var pagePath = curPage.route; //当前页面url
-        if (pagePath.indexOf('/') != 0) {
-            pagePath = '/' + pagePath;
-        }
-        if(getApp().globalData.user_id){
+    });
-            if(pagePath.indexOf("?")>0){
-                pagePath+="&first_leader="+getApp().globalData.user_id;
-            }else{
-                pagePath+="?first_leader="+getApp().globalData.user_id;
-            }
-        }
+    if (plist.length <= 0) {
-        console.log("11"+pagePath);
-        return {
-            title: "限时秒杀",
-            path:pagePath,
+      getApp().showWarning("没有更多数据");
+      th.data.ismore = 0;
+      if (e.data.currentPage == 1 && this.data.type == 1) {
+        setTimeout(function () {
+          th.data.ismore = 1;
+          th.setData({
+            type: 0
+          });
+          th.requestSalelist();
+        }, 1000);
+      }
+      return false;
+    }
+
+    //--循环读取接口---
+    for (var i = 0; i < plist.length; i++) {
+
+      if (plist[i].user_price) plist[i].price = plist[i].user_price;
+      var prom_id = plist[i].id;
+      await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+        os.stoid + "/1/" + prom_id, {}
+      ).then(res => {
+        if (res.data.code == 0) {
+          plist[i].status = 1;
+          if (res.data.data <= 0) plist[i].status = 3;
         }
-    },
-
-    //图片失败，默认图片
-    bind_bnerr2: function (e) {
-       var _errImg = e.target.dataset.errorimg;
-       var val = e.target.dataset.val;
-       if(val!=undefined && val!=null && val!='null' ){
-          var _errObj = {};
-          _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
-          this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-       }
-    },
-		
-		onShareTimeline() {
-			var store_name=getApp().globalData.config?getApp().globalData.config.store_name:'';
-			if(!store_name)
-			   store_name=getApp().globalData.setting.appName;
-			return {
-				title: '秒杀活动-' + store_name,
-			}
-		},
-		
-		imageLoad:function(e){
-		  var imgwidth = e.detail.width;
-		  var imgheight = e.detail.height;
-		  //宽高比
-		  var ratio = imgwidth / imgheight;
-		  //计算的高度值
-		  var viewHeight = 750 / ratio;
-		  var hei=this.data.max_sw_height;
-		
-		  if (hei< viewHeight) {
-		      this.setData({ max_sw_height: viewHeight });
-		   }
-    },
-    go_url(e){
-      let url=e.currentTarget.dataset.url;
-      if(url){
-          getApp().goto(url);
+      })
+      alllist.push(plist[i]);
+    }
+    e.data.currentPage++;
+    console.log("秒杀商品列表", alllist);
+    th.setData({
+      goodlist: alllist,
+      isshow: 1
+    });
+
+
+
+  },
+  onPullDownRefresh: function () {
+    this.reloadGoodList();
+  },
+  reloadGoodList: function () {
+    this.data.goodlist = [], this.data.currentPage = 1, this.requestSalelist();
+  },
+
+  onReachBottom: function () {
+    this.requestSalelist();
+  },
+
+  //点击tab事件
+  tip: function (e) {
+    var a = e.currentTarget.dataset.ty,
+      th = this;
+    th.data.ismore = 1;
+    this.setData({
+      type: a,
+      goodlist: null
+    });
+    this.reloadGoodList();
+  },
+
+
+  //---------分享配置--------
+  onShareAppMessage: function (e) {
+    var curPage = this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+    if (getApp().globalData.user_id) {
+
+      if (pagePath.indexOf("?") > 0) {
+        pagePath += "&first_leader=" + getApp().globalData.user_id;
+      } else {
+        pagePath += "?first_leader=" + getApp().globalData.user_id;
       }
- },
+    }
+
+    console.log("11" + pagePath);
+    return {
+      title: "限时秒杀",
+      path: pagePath,
+    }
+  },
+
+  //图片失败，默认图片
+  bind_bnerr2: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var val = e.target.dataset.val;
+    if (val != undefined && val != null && val != 'null') {
+      var _errObj = {};
+      _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+
+  onShareTimeline() {
+    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+    if (!store_name)
+      store_name = getApp().globalData.setting.appName;
+    return {
+      title: '秒杀活动-' + store_name,
+    }
+  },
+
+  imageLoad: function (e) {
+    var imgwidth = e.detail.width;
+    var imgheight = e.detail.height;
+    //宽高比
+    var ratio = imgwidth / imgheight;
+    //计算的高度值
+    var viewHeight = 750 / ratio;
+    var hei = this.data.max_sw_height;
-});
+    if (hei < viewHeight) {
+      this.setData({
+        max_sw_height: viewHeight
+      });
+    }
+  },
+  go_url(e) {
+    let url = e.currentTarget.dataset.url;
+    if (url) {
+      getApp().goto(url);
+    }
+  },
+});
 \ No newline at end of file
@@ -39,9 +39,9 @@
   <!-- 购物车商品框架 -->
   <view class="login-in">
     <!-- 编辑 -->
-    <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 class="padding flex-vertical-between fs30 Storenum store" style="justify-content:space-between">
+      <view wx:if="{{freight_free}}" class="fs28 pdr20 pdl20 c-red2 flex jc_sb weight_free">
+        <text>全场满{{freight_free}}元可享包邮({{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>
@@ -232,62 +232,92 @@ module.exports = {
 				}
 				//看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
 				if (act.is_bz && no_in_arr.length >= act.zhbuyqty) {
-					var bz_num_ok=0; //超量倍增是否满
-					var zhqty_len=0; //几个超量倍增
-					var be = parseInt(no_in_arr.length / act.zhbuyqty);//看一下是几倍
+					var bz_num_ok = 0; //超量倍增是否满
+					var delete_num = 0;
+					var zhqty_len = 0; //几个超量倍增
+					var be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍
 					if (act.is_bzyh && zhqty_bz.length > 0) {
-						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
+						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;
+							var vv = new_arr[0];
+							// be=new_arr[0].zhqty;
+							var bz_num = be * new_arr[0].zhqty; //超量倍增
+							var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量
+							// if(num > 0){
+							bz_num_ok = bz_num - num;
+							if (bz_num_ok <= 0) {
+								//超量倍增满足,超量倍增就等于倍数
+								bz_num_ok = bz_num;
+							} else {
+								//超量倍增不满足,倍数要减去多出得
+								// be=be-bz_num_ok;
+								if (num % vv.zhqty == 0) {
+									be = num / vv.zhqty;
+									bz_num_ok = num;
+								} else {
+									be = Math.floor(num / vv.zhqty)
+									bz_num_ok = num - (be * vv.zhqty);
+								}
 							}
-							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)
-									 }
+							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
+									})
+									if (index > -1) {
+										delete_num++
+										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;
+						} else {
+							var vv = zhqty_bz[0];
+							var bz_num = be * vv.zhqty; //超量倍增
+							var num = vv['num'] - vv.zhqty; //购买数量减去超量
+							if (num > 0) {
+								bz_num_ok = bz_num - num;
+								if (bz_num_ok <= 0) {
+									//超量倍增满足,超量倍增就等于倍数
+									bz_num_ok = bz_num;
+								} else {
+									//超量倍增不满足,倍数要减去多出得
+									// be=be-bz_num_ok;
+									if (num % vv.zhqty == 0) {
+										be = num / vv.zhqty;
+										bz_num_ok = num;
+									} else {
+										be = Math.floor(num / vv.zhqty)
+										bz_num_ok = num - (be * vv.zhqty);
+									}
+								}
+								// be=vv.num;
+								for (let j = 0; j < bz_num_ok; j++) {
+									let index = no_in_arr.findIndex(i => {
+										return vv.goods_id === i.goods_id
+									})
+									if (index > -1) {
+										delete_num++
+										no_in_arr.splice(index, 1)
 									}
-									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)
-									 }
-						 }
+								}
+							} else {
+								zhqty_len = 1;
+							}
+						}
 					}
+
 					if (!zhqty_len) {
 						aprice += be * act.zhprice;
-						let pop_num=be * act.zhbuyqty - bz_num_ok;
+						let pop_num = be * act.zhbuyqty - delete_num;
 						for (var m = 0; m < pop_num; m++) {
 							no_in_arr.pop();
 						}
@@ -18,7 +18,7 @@ module.exports = {
             let act_item = zh_prom_goods[i];
             let act_goos = act_item.gdlist;
             let act = act_item.act;
-            if(!act) continue;
+            if (!act) continue;
             let all_num = 0; //商品数量之和
             let all_price0 = 0; //商品数量之和
@@ -42,7 +42,7 @@ module.exports = {
             for (let j in act_goos) {
                 let item = act_goos[j];
                 let item_j = goods.find(function (ele) {
-                    console.log('ele',ele);
+                    console.log('ele', ele);
                     return ele.goods_id == act_goos[j].goods_id;
                 })
                 //-- 如果有找到的话 --
@@ -132,6 +132,7 @@ module.exports = {
                         }
                     }
                 }
+
                 function sortData(a, b) {
                     return a.price - b.price
                 }
@@ -144,67 +145,97 @@ module.exports = {
                 }
                 //看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
                 if (act.is_bz && 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) {
-						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 bz_num_ok = 0; //超量倍增是否满足
+                    var zhqty_len = 0; //几个超量倍增
+                    var delete_num=0;
+                    let be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍
+                    if (act.is_bzyh && zhqty_bz.length > 0) {
+                        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){
+                            var vv = new_arr[0];
+                            // be=new_arr[0].zhqty;
+                            var bz_num = be * new_arr[0].zhqty; //超量倍增
+                            var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量
+                            // if(num > 0){
+                            bz_num_ok = bz_num - num;
+                            if (bz_num_ok <= 0) {
                                 //超量倍增满足,超量倍增就等于倍数
-                                bz_num_ok=bz_num;
-                            }else{
+                                bz_num_ok = bz_num;
+                            } else {
                                 //超量倍增不满足,倍数要减去多出得
-                                be=be-bz_num_ok;
-                                bz_num_ok=num;
+                                // be=be-bz_num_ok;
+                                if (num % vv.zhqty == 0) {
+                                    be = num / vv.zhqty;
+                                    bz_num_ok = num;
+                                } else {
+                                    be = Math.floor(num / vv.zhqty)
+                                    bz_num_ok = num - (be * vv.zhqty);
+                                }
                             }
-                            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)
-                                 }
+                            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
+                                    })
+                                    if(index > -1){
+                                        delete_num++
+                                        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){
+                        } else {
+                            var vv = zhqty_bz[0];
+                            var bz_num = be * vv.zhqty; //超量倍增
+                            var num = vv['num'] - vv.zhqty; //购买数量减去超量
+                            if (num > 0) {
+                                bz_num_ok = bz_num - num;
+                                if (bz_num_ok <= 0) {
                                     //超量倍增满足,超量倍增就等于倍数
-                                    bz_num_ok=bz_num;
-                                }else{
+                                    bz_num_ok = bz_num;
+                                } else {
                                     //超量倍增不满足,倍数要减去多出得
-                                    be=be-bz_num_ok;
-                                    bz_num_ok=num;
+                                    // be=be-bz_num_ok;
+                                    if (num % vv.zhqty == 0) {
+                                        be = num / vv.zhqty;
+                                        bz_num_ok = num;
+                                    } else {
+                                        be = Math.floor(num / vv.zhqty)
+                                        bz_num_ok = num - (be * vv.zhqty);
+                                    }
+                                }
+                                // be=vv.num;
+                                for (let j = 0; j < bz_num_ok; j++) {
+                                    let index = no_in_arr.findIndex(i => {
+                                        return vv.goods_id === i.goods_id
+                                    })
+                                    if(index > -1){
+                                        delete_num++
+                                        no_in_arr.splice(index, 1)
+                                    }
                                 }
-                                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 (!zhqty_len) {
+                            } else {
+                                zhqty_len = 1;
+                            }
+                        }
+                    }
+                    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();
-						}
-					}
-                    
+                        let pop_num = be * act.zhbuyqty - delete_num;
+                        for (var m = 0; m < pop_num; m++) {
+                            no_in_arr.pop();
+                        }
+                    }
+
                 }
                 let goods_map = {};
@@ -275,7 +275,7 @@
 }
 .button {
 	margin: 0 30rpx;
-	background:var(--bg-color);
+	background:#61d3dd;
 	border-radius: 50rpx;
 	line-height: 80rpx;
 	height: 80rpx;
@@ -301,14 +301,14 @@
 	text-align: center;
 	-webkit-box-pack: center;
 	-webkit-justify-content: center;
-	        justify-content: center;
+	justify-content: center;
 	position: fixed;
 	bottom: 0;
 	left: 0;
 	width: 100%;
 }
 .foot_button_buy {
-	background:var(--color);
+	background:#61d3dd;
 	color: #FFFFFF;
 	width: 400rpx;
 	height: 70rpx;
@@ -3930,3 +3930,7 @@ button.custom-service::after {
 	overflow: hidden;
 	flex-shrink: 0;
 }
+.avatar-container image {
+	width: 100%;
+	height: 100%;
+}