diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
index 7ffa588..14eed01 100644
--- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
+++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
@@ -271,7 +271,8 @@ Page({
         user_id: th.data.getUserID, //用户ID
         page: th.data.curpage,
         pageSize: th.data.pageSize,
-        is_end:0
+        is_end:0,
+        timetype:1
       },
       success: function (res) {
         if (res.data.code == 0) {
diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
index 86b7119..41534e1 100644
--- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
@@ -49,12 +49,14 @@
 					<view class="content_ware_price no_line_c">
 						<text class="ellipsis-1">{{"零售价：￥"+items.giftPosPrice}}</text>
 					</view>
-					<view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time">
-						<text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
-					</view>
-					<view wx:else class="content_ware_time">
-						<text class="ellipsis-1">{{"活动结束时间："+items.endTime}}</text>
-					</view>
+          <block wx:if="{{items.is_show}}">
+              <view wx:if="{{ now < items.starTime1 }}" class="content_ware_time">
+              <text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
+            </view>
+            <view wx:else class="content_ware_time">
+              <text class="ellipsis-1">{{"活动结束时间："+items.endTime}}</text>
+            </view>
+          </block>
 				</view>
 			</view>
 			<view class="content_box_button">
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 7b68ac4..dc1ecae 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -2143,19 +2143,26 @@ Page({
       }
     })        
     let user_pre_buynum = await this.getUserBuyPromNum_pre(a.prom_id)
-    let action_num=user_pre_buynum+1;
-    arr_pro.map(item=>{
-      item.goods.map(ite=>{
-        if(ite.prom_type==3 && ite.prom_id==a.prom_id && !ite.is_gift && ite.selected){
-          action_num+=1;
-        }
-      })
-    })
-    if (prom && action_num>prom.limit_num) {
-      return true
-    }else{
+    
+    if(user_pre_buynum>=prom.limit_num){
       return false
+    }else{
+      let action_num=user_pre_buynum+1;
+      arr_pro.map(item=>{
+        item.goods.map(ite=>{
+          if(ite.prom_type==3 && ite.prom_id==a.prom_id && !ite.is_gift && ite.selected){
+            action_num+=1;
+          }
+        })
+      })
+      if (prom && action_num>prom.limit_num) {
+        return true
+      }else{
+        return false
+      }
     }
+
+
   },
 
 
@@ -3426,25 +3433,46 @@ Page({
       
       //多门店优惠促销次数控制
       if (this.data.requestData.length>1) {
-        let checkarr3=Object.keys(checkObj3)
-         if (checkarr3 && checkarr3.length>0) {
-           for (let x = 0; x < checkarr3.length; x++) {
-            let prom=null
-            let key=checkarr3[x]
-            await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + key, {}).then(res => {
-              if (res.data.code == 0) {
-                prom = res.data.data;
-              }
-            })           
-            if (prom && prom.limit_num) {          
-              let user_pre_buynum = await this.getUserBuyPromNum_pre(key)
-              user_pre_buynum += checkObj3[key]
-              if (user_pre_buynum>prom.limit_num) {
-                checkObj3_off=true
+        let pro_stord_id=''
+        let pro_stord_off=false
+        this.data.requestData.map(ritem=>{
+          ritem.goods.map(gitem=>{
+            if (gitem.selected && gitem.prom_type==3) {
+              if (pro_stord_id) {
+                if (gitem.pick_id !=pro_stord_id) {
+                  pro_stord_off=true
+                }
+              }else{
+                pro_stord_id=gitem.pick_id
               }
             }
+          })
+        })
+        if(pro_stord_off){
+          let checkarr3=Object.keys(checkObj3)
+           if (checkarr3 && checkarr3.length>0) {
+             for (let x = 0; x < checkarr3.length; x++) {
+              let prom=null
+              let key=checkarr3[x]
+              await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + key, {}).then(res => {
+                if (res.data.code == 0) {
+                  prom = res.data.data;
+                }
+              })
+                         
+              if (prom && prom.limit_num) {          
+                let user_pre_buynum = await this.getUserBuyPromNum_pre(key)           
+                if(user_pre_buynum < prom.limit_num ){
+                  user_pre_buynum += checkObj3[key]
+                  if (user_pre_buynum>prom.limit_num) {
+                    checkObj3_off=true
+                  }
+                }
+  
+              }
+             }
            }
-         }
+        }
       }
       if (checkObj3_off) {
         t.my_warnning("已超出优惠促销次数", 0, th);
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index f5da6b3..2122e22 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -776,8 +776,11 @@ Page({
 
 	//跳转到链接
 	goto: function (e) {
-		var url = e.currentTarget.dataset.url;
-		getApp().goto(url);
+    console.log(e);
+    console.log('跳转');
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({ url: url }) 
+		// getApp().goto(url);
 	},
 
 	//---------联系客服------------