Merge branch 'dev' into 'test'

Dev See merge request !773

Merge branch 'dev' into 'test'
Dev See merge request !773
后端研发-苏明海
2 parents f0b740b3 9767aa7c
Showing 11 changed files with 224 additions and 61 deletions
pages/cart/cart/cart.js
pages/cart/cart/zh_calculate.js
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
pages/cart/cart2/cart2.wxss
pages/cart/cart2/zh_calculate.js
pages/goods/categoryList/categoryList.wxml
pages/goods/categoryList/categoryList.wxss
pages/index/index/index.wxml
pages/index/index/index.wxss
pages/user/order_detail/order_detail.js
@@ -36,7 +36,8 @@ Page({
         zhhe_prom:[],  //组合活动需要显示差多少件
         zuhe_map:{},
-        zuhe_map_good:{}
+        zuhe_map_good:{},
+        in_zhact_gdmap:{}, //不同门店参与同一活动的限购
     },
     onLoad: function() {
         var a = this,ee=a;
@@ -59,6 +60,8 @@ Page({
     },
     onShow: function() {
+        //每次显示都清空
+        this.data.in_zhact_gdmap={};
         if (typeof this.getTabBar === 'function' && this.getTabBar()) {
             var index=getApp().getPageIndex(this);
@@ -199,6 +202,7 @@ Page({
 	//-----真的获取购物车--------
     get_cart: function() {
         var th = this;
+        th.data.in_zhact_gdmap={};
         var rd = Math.random().toString(36).substr(2, 15);
         var user_id=getApp().globalData.userInfo.user_id;
         getApp().request.get("/api/weshop/cart/list", {
@@ -884,6 +888,7 @@ Page({
         var offline_price=0;
         var offline_num=0;
+        th.data.in_zhact_gdmap={};
         if(dda && dda.length>0){
@@ -902,7 +907,8 @@ Page({
 					var obj=JSON.parse(JSON.stringify(item[j]));
 					//计算之前先移除
-					zh_calc.remove_zhprom(dda,i,obj);
+                    if(obj.prom_type==7)
+					   zh_calc.remove_zhprom(dda,i,obj);
                     if (fir == 0) {
@@ -917,7 +923,8 @@ Page({
                     var txt = "requestData[" + i + "].goods[" + j + "].selected";
 					if(e.data.checkAllToggle) obj.goods_num=0;
-					zh_calc.add_zhprom(dda,i,obj);					
+                    if(obj.prom_type==7)
+				    	zh_calc.add_zhprom(dda,i,obj);
 					e.setData({
                         [txt]: !e.data.checkAllToggle,
@@ -1265,6 +1272,7 @@ Page({
         //-- 购物车 --
         if(car && car.length>0){
+            th.data.in_zhact_gdmap={};
             for (var a = 0; a < car.length; a++) {
                 var item = car[a].goods,
                     is_s_sele = 1;
@@ -1300,6 +1308,7 @@ Page({
                         offline_num+=item[c].goods_num;
                     }
                 }
+
                 //总的价格,把组合商品的价格拿出来
                 var zh_calc_res=zh_calc.calculate_zh(car,a,th);
                 tfeel+=zh_calc_res.tfeel;
@@ -130,7 +130,14 @@ module.exports = {
                 item.cart_num =cart_num;
                 //-- 当商品有购买的时候,以及有限购的时候 --
                 if(item.buyqty>0){
+
+                       console.log(111,th.data.in_zhact_gdmap);
+
                        var cbuy=item.buyqty-zh_b_num;
+                       var key=item.goods_id+""+act.id;
+					   if(th.data.in_zhact_gdmap[key]){
+                           var cbuy=item.buyqty-zh_b_num-th.data.in_zhact_gdmap[key];
+					   }
                        //当可买的数量为0
                        if(cbuy<=0){
                            item.num=0;
@@ -158,7 +165,6 @@ module.exports = {
 				}
 				if (item.num) {
 					all_num += item.num;
-
 					//当有起购数的控制的时候
 					if (item.zhqty) {
 						all_zhqty += item.zhqty;
@@ -189,6 +195,22 @@ module.exports = {
 			//当满足组合的要求：总数要满足，起购数要满足
 			if (all_num >= act.zhbuyqty && !need_to_buy) {
+                //商品的列表
+                for (var u in goods) {
+                   var ite=goods[u];
+                   if(ite.buyqty>0 && ite.num>0){
+
+                       console.log(222,th.data.in_zhact_gdmap);
+
+                   	   var key=ite.goods_id+""+act.id;
+                   	   if(th.data.in_zhact_gdmap[key]){
+                           th.data.in_zhact_gdmap[key]+=ite.num;
+					   }else{
+                           th.data.in_zhact_gdmap[key]=ite.num;
+					   }
+				   }
+				}
+
                 function sortData(a, b) {
                     return a.price - b.price
                 }
@@ -120,6 +120,10 @@ Page({
         tabs: ['门店自提', '快递邮寄'],
         currentTabIndex: 1,
+
+        in_zhact_gdmap:{}, //不同门店参与同一活动的限购
+        hid_inp:1,
+        user_note:{},
     },
     onLoad: function (t) {
         wx.setNavigationBarTitle({title: "填写订单",})
@@ -413,6 +417,7 @@ Page({
                 var arr = new Array();
                 var carr = su.data.data.pageData;
                 th.data.cartlist_y = carr;  //存储原始购物车列表
+                th.data.in_zhact_gdmap={};
                 //---是不是购买等级卡成功的返回---等级卡显示的判断---
                 var is_card_back = getApp().globalData.is_card_back;
@@ -651,6 +656,7 @@ Page({
                     }
                 }
+
                 //每一个门店内的组合购要进行拆分,
                 //还得把组合商品的多余商品的线下价格算一算
                 for (let var1 in arr) {
@@ -1009,8 +1015,11 @@ Page({
         });
     },
     keyUpChangeNum: function (t) {
+        var index = t.currentTarget.dataset.index;
+        var txt="user_note."+index;
         this.setData({
-            maxWord: t.detail.value.length
+            maxWord: t.detail.value.length,
+            [txt]: t.detail.value
         });
     },
@@ -3786,5 +3795,17 @@ Page({
         });
     },
+    set_hid_inp:function (e) {
+        var index = e.currentTarget.dataset.index;
+        var txt = "cartlist[" + index + "].focus";
+        this.setData({[txt]:1})
+    },
+
+    clear_hid_inp:function (e) {
+        var index = e.currentTarget.dataset.index;
+        var txt = "cartlist[" + index + "].focus";
+        this.setData({[txt]:0})
+    }
+
 });
@@ -76,7 +76,7 @@
 					<!-- <view>门店：{{item.pname}}</view> -->
 					<view>{{item.pname}}</view>
 				</view>
-				<view class="order-detail" wx:if="{{items.goods_num>0}}" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
+				<view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
 					<!----商品图片----->
 					<view class="goods-img" style="position: relative">
 						<image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
@@ -104,7 +104,6 @@
 							<view class="goods-num">x{{items.goods_num}}</view>
 						</view>
 					</navigator>
-
 				</view>
 				<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
@@ -208,9 +207,14 @@
 				<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_{{item.pickup_id}}"></input>
+						<input hidden="{{!item.focus}}" bindinput="keyUpChangeNum" disabled="{{disabled}}"
+						  data-index="{{index}}" bindblur="clear_hid_inp" focus="{{item.focus}}" value="{{user_note[index]}}"
+						  class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}" />
+                        <view class="{{user_note[index]?'':'c-a'}}"  style="width: 80%;font-size: 26rpx" data-index="{{index}}"
+							 bindtap="set_hid_inp" wx:if="{{!item.focus}}">
+							 {{user_note[index]?user_note[index]:'给商家留言，最多100字'}}
+						</view>
 					</view>
 				</view>
@@ -249,7 +249,10 @@ margin:auto; */
     position: relative;
     font-size: 24rpx;
     margin-left: 20rpx;
-		flex-grow: 1;
+	  display: flex;
+    align-items: center;
+    height: 50rpx;
+    width: 500rpx;
 }
 .word-box {
@@ -2,7 +2,7 @@ var regeneratorRuntime = require(&#39;../../../utils/runtime.js&#39;);
 module.exports = {
     //主要的作用，就是把组合购多余的商品进行拆分，
     //如果没有达成组合购的要求，所有的商品都打回原价购买
-    fir_set_arr: function (c_item) {
+    fir_set_arr: function (c_item,th) {
         //组合活动，以及组合活动从表的商品
         let zh_prom_goods = c_item.zh_prom_goods;
         let goods = c_item.goods;  //一个门店中所有的商品
@@ -47,7 +47,14 @@ module.exports = {
                     var cart_num=item.cart_num =item_j.goods_num;
                     var zh_b_num=item_j.promgoodsbuynum;
                     if(item.buyqty>0){
+
+                        var key=item.goods_id+""+act.id;
                         var cbuy=item.buyqty-zh_b_num;
+                        if(th.data.in_zhact_gdmap[key]){
+                            var cbuy=item.buyqty-zh_b_num-th.data.in_zhact_gdmap[key];
+                        }
+
+
                         //当可买的数量为0
                         if(cbuy<=0){
                             item.num=0;
@@ -97,6 +104,21 @@ module.exports = {
             //当满足组合的要求：总数要满足，起购数要满足
             if (all_num >= act.zhbuyqty && !need_to_buy) {
+
+                //商品的列表
+                for (var u in act_goos) {
+                    var ite=act_goos[u];
+                    if(ite.buyqty>0 && ite.num>0){
+                        var key=ite.goods_id+""+act.id;
+                        if(th.data.in_zhact_gdmap[key]){
+                            th.data.in_zhact_gdmap[key]+=ite.num;
+                        }else{
+                            th.data.in_zhact_gdmap[key]=ite.num;
+                        }
+                    }
+                }
+
+
                 function sortData(a, b) {
                     return a.price - b.price
                 }
@@ -122,9 +122,9 @@
           <!-- 分类项目内容  22 -->
-          <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx; height: auto;"  id="two_type">
+          <view class="flex project_height" style="height:100%;box-sizing:border-box;padding-bottom:100rpx;"  id="two_type">
                <!-- 分类项目的类型 -->
-           <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;">
+           <view class="project_type" style="background-color:#eee;<!-- height:88%; -->overflow-y:auto;position:fixed;left:0;z-index:99;top:120rpx;">
            <view class="project_type-frame" style="margin-bottom:120rpx;">
            <view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
            <!-- <view  style="{{status_show == 1?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
@@ -159,7 +159,7 @@
         </view>
                <!-- 分类项目的内容 -->
-                <view class="classify_content" style="margin-left:27%;margin-top:130rpx">
+                <view class="classify_content" style="padding-left:196rpx;">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
         <view class="classify_name fs28 flex-space-between">
@@ -209,7 +209,7 @@
         <!-- 品类-->
         <block  wx:if="{{is_show_pl}}">
         <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
-             <view>
+             <view class="my-container">
                  <view class="classify_name fs28 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
             <view class="classify_title ellipsis-1">{{classify_name}}</view>
               <view class="flex select_more" >
@@ -220,7 +220,7 @@
              <!-- 显示2级列表 -->
              <view class="classify_content-frame flex-wrap">
                  <block wx:if="{{goodslist && goodslist.length>0}}">
-                     <block  wx:for="{{goodslist}}" wx:for-item="goods"wx:for-index="indx">
+                     <block  wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="indx">
                         <view  class="type_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
                           <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
                             <view class="brand_img_name fs24 ellipsis-1">{{goods.items.name}}</view>
@@ -297,7 +297,7 @@
           <!-- 分类项目内容 -->
           <view class="flex project_height" style="margin-left:-10rpx;">
             <!-- 分类项目的类型 -->
-            <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;" id="thress_type3">
+            <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:120rpx;" id="thress_type3">
               <view class="project_type-frame" style="margin-bottom:120rpx;">
                 <view wx:if="{{is_show_gb}}">
                   <view  bindtap="click_classify"  class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}"  data-current="223" data-index="223" data-name="国家" wx:if="{{is_country}}">
@@ -345,7 +345,7 @@
             </view>
              </view>
             <!-- 分类项目的内容 -->
-            <view class="classify_content" style="margin-left:27%;margin-top:130rpx">
+            <view class="classify_content" style="margin-left:27%;margin-top:120rpx">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
         <view class="classify_name fs28 flex-space-between">
 /*---nyf 2018-9-7---*/
-page{height: 100%; background: #fff;}
+page{height: 100%; background: #fff;padding-top:120rpx;box-sizing: border-box;}
 .top_view{ width: 100%;background: #fff;}
 .swiper-tab{
@@ -103,7 +103,7 @@ line-height: 50rpx;
 /*--国家--*/
 .nation_box{ position: absolute;width: 260rpx; height: 160rpx;  background-size: 100% 100%; background-repeat: no-repeat;
- top:110rpx;left: 50%; margin-left: -130rpx;z-index: 8; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAACACAYAAACLIbwOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MkVDREM1NjhCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MkVDREM1NjlCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyRUNEQzU2NkIwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDoyRUNEQzU2N0IwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PlO56qEAAAFJSURBVHja7NfRCYAgFIbRDMd0Doe4a9ietxWUIjDOeZYefvhIS2aOA/jcaQIQH4gPEB+IDxAfiA8QH2ynzhyKiGYqWNN7vx7HN/MhYO2H5doJ3nwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EJ8JQHwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EB8gPhAfID4QHyA+EB8gPhAfID4QHyA+EB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPEB+ID8QHiA/EB4gPxAeID8QHiA/EB4gPxAeID8QH4gPEB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPxAeID8QHiA/EB4gPxAeID8QHiA/EB4gPxgfgA8YH4APGB+ADxgfgA8YH4APGB+ADxgfhAfID4QHyA+OB/6uzBiGjmgveUzBxmANdOEB8gPhAfID4QHyA+2MotwAD/ZBI/EDK5cgAAAABJRU5ErkJggg==");}
+ top:110rpx;left: 50%; /* margin-left: -130rpx; */z-index: 8; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAACACAYAAACLIbwOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MkVDREM1NjhCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MkVDREM1NjlCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyRUNEQzU2NkIwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDoyRUNEQzU2N0IwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PlO56qEAAAFJSURBVHja7NfRCYAgFIbRDMd0Doe4a9ietxWUIjDOeZYefvhIS2aOA/jcaQIQH4gPEB+IDxAfiA8QH2ynzhyKiGYqWNN7vx7HN/MhYO2H5doJ3nwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EJ8JQHwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EB8gPhAfID4QHyA+EB8gPhAfID4QHyA+EB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPEB+ID8QHiA/EB4gPxAeID8QHiA/EB4gPxAeID8QH4gPEB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPxAeID8QHiA/EB4gPxAeID8QHiA/EB4gPxgfgA8YH4APGB+ADxgfgA8YH4APGB+ADxgfhAfID4QHyA+OB/6uzBiGjmgveUzBxmANdOEB8gPhAfID4QHyA+2MotwAD/ZBI/EDK5cgAAAABJRU5ErkJggg==");}
  .n_img{width: 100%; height: 375rpx;}
  .nt_1{height:82rpx; line-height: 100rpx;}
@@ -177,7 +177,7 @@ line-height: 50rpx;
     height: 120rpx;
     z-index: 10;
 		background: #fff;
-    border-top: 4rpx solid #eee;
+    /* border-top: 4rpx solid #eee; */
     border-bottom: 1rpx solid #eee;
 }
@@ -212,13 +212,14 @@ margin-top: 8rpx;
 }
 .project_type{
+	box-sizing: border-box;
   width: 26%;
   height: 100%;
+	padding-bottom: 100rpx;
   border-right: 1rpx solid #eee;
   white-space: nowrap;
-overflow: hidden;
-overflow-y: scroll;
-
+	overflow: hidden;
+	overflow-y: scroll;
 }
 .share_type{
   margin: auto;
@@ -301,20 +302,16 @@ width: 60%;
  }
  .classify_content{
-   width: 72%
+   width: 100%
  }
- .classify_content-frame{
- width: 90%;
- margin: auto;
- flex-wrap:wrap;
- max-height: 90%;
- overflow-y:scroll;
- overflow: hidden scroll;
- /* padding-bottom: 65rpx; */
-
-
- }
+	.classify_content-frame{
+		box-sizing: border-box;
+		width: 100%;
+		padding: 0 20rpx;
+		flex-wrap:wrap;
+		overflow-y:scroll;
+	}
  .country_img-frame{
    width: 48%;
    height: 140rpx;
@@ -331,12 +328,12 @@ width: 60%;
  }
  .nation_box.box{
-   top: 16%;
-width:80%;
-height:70%;
-left: 70.5%;
-overflow: hidden;
-
+		width:80%;
+		height:70%;
+		top: 50%;
+		left: 50%;
+		overflow: hidden;
+		transform: translate(-50%, -50%);
  }
  .nt_1.line-height{
    line-height: 65rpx;
@@ -363,10 +360,10 @@ line-height: 65rpx;
    font-size: 24rpx;
  }
  .brand_img_frame{
-   width: 45%;
+   width: 50%;
    margin-top: 18rpx;
-   margin-right: 15rpx;
-    height: 160rpx;
+   /* margin-right: 15rpx; */
+   height: 160rpx;
  }
  .brand_img{
    width:220rpx;
@@ -375,13 +372,12 @@ line-height: 65rpx;
    margin-top: 10rpx;
  }
-  .type_img_frame{
-   width: 30%;
+  .type_img_frame {
+   width: calc(100% / 3);
    height: 140rpx;
-   margin-top: 18rpx;
-   margin-right: 15rpx;
-
-
+   margin-top: 20rpx;
+	 margin-bottom: 20rpx;
+   /* margin-right: 15rpx; */
  }
@@ -504,7 +500,8 @@ margin: auto;
   border-left: 8rpx solid #E41F19;
   height: 50rpx;
   left: 0;
-  top:26rpx;
+  top:50%;
+	transform: translateY(-50%);
 } 
@@ -517,11 +514,29 @@ margin: auto;
   height: 110rpx;
   }
+	
+	
+	.classify_content > view:last-of-type .classify_content-frame {
+		padding-bottom: 100rpx;
+	}
+	
+	.classify_content > view:only-child .classify_content-frame {
+		padding-bottom: 0;
+	}
+	
+	.classify_content > .classify_content-frame {
+		padding-bottom: 118rpx;
+	}
+
   page {
-    overflow-x: hidden;
-    padding-bottom: 40rpx;
+    /* overflow-x: hidden; */
+    /* padding-bottom: 40rpx; */
   }
+	
+	/* .my-container {
+		padding-bottom: 118rpx;
+	} */
 /* 风格三商品列表样式引入 */
 @import "../goodsList/goodsList.wxss";
 \ No newline at end of file
@@ -392,10 +392,7 @@
       <!--商品分组-->
       <block wx:if="{{item.ename=='goodsGroup'}}">
         <goodsGroup object="{{item.content}}"></goodsGroup>
-				<!-- 技术支持 -->
-				<view class="logo-container t-c">
-					<view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
-				</view>
+				
       </block>
       <!--通知-->
       <block wx:if="{{item.ename=='notice'}}">
@@ -449,6 +446,10 @@
   </block>
+	<!-- 技术支持 -->
+	<view class="logo-container t-c">
+		<view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
+	</view>
 </view>
 </block>
@@ -1076,7 +1076,7 @@ page {
 	width: 100%;
 	height: 100%;
 	background-position: center;
-	background-size: 100% 100%;
+	background-size:cover;
 	background-repeat: no-repeat;
 }
@@ -377,8 +377,74 @@ Page({
 			  th.toast(content);
 			  return false;
 			}
-			
-			//如果优惠促销和搭配购的时候
+
+            //当是组合优惠的时候
+            if(good.prom_type==7){
+                //如果有组合购
+                var isok = 1;
+                var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id;
+                await getApp().request.promiseGet(url, {}).then(res => {
+                    if(res.data.code==0 && res.data.data){
+                        if(res.data.data.is_show!=1){
+                            isok=0;
+                        }
+                        //如果活动已经结束
+                        if(res.data.data.is_end==1){
+                            isok=0;
+                        }
+                        //已经结束
+                        if(ut.gettimestamp()>res.data.data.end_time){
+                            isok=0;
+                        }
+                        //还未开始
+                        if(ut.gettimestamp()<res.data.data.start_time){
+                            isok=0;
+                        }
+
+                    }else{
+                        //未找到商品的活动
+                        isok = 0;
+                    }
+
+                })
+                if (!isok){
+                    var  content=gg.goods_name+'活动已经结束,请取消订单';
+                    th.toast(content);
+                    return false;
+                }
+
+                var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                var req_data = {
+                    page: 1,
+                    pageSize: 1,
+                    store_id: os.stoid,
+                    zh_id: good.prom_id,
+                    goods_id:good.goods_id
+                }
+                await getApp().request.promiseGet(url1, {
+                    data: req_data
+                }).then(res => {
+                    if (ut.ajax_ok(res)) {
+                        var gdlist = res.data.data.pageData[0];
+                        good.buyqty=gdlist.buyqty;
+                    }
+                })
+
+                var num=good['buyqty'];
+                console.log(1111);
+                console.log(num);
+                //---- 要计算商品的限购 -----
+                if(good['buyqty']>0){
+                    if(good.goods_num+promgoodsbuynum>good['buyqty']){
+
+                        var  content= good['goods_name']+"超出活动限购\n";
+                        th.toast(content);
+                        return false;
+                    }
+                }
+            }
+
+            //如果优惠促销和搭配购的时候
 			if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
 				var p_ok=1;
 			    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {