diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 9ba930a..5a9da7d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -149,6 +149,7 @@ Page({
 
         //商品的活动类型 0普通  1秒杀 2团购 3优惠  4 积分购  6拼单
         prom_type: 0,
+        f_prom_type: 0,  //前端判断要不要显示券
         prom_time_text: "",
         prom_price: null,
         f_prom_price: null,  //秒杀使用
@@ -434,9 +435,15 @@ Page({
             }
           })
 
-          if (!getApp().globalData.user_id) {
-            ut.new_user_go(os.stoid, first_leader);
-          }
+
+
+          //先查看一下是不是系统会员
+          getApp().waitfor_login(()=>{
+              if (!getApp().globalData.user_id) {
+                ut.new_user_go(os.stoid, first_leader);
+              }
+          })
+
         }
 
         //-- 如果有房间号 --
@@ -3412,7 +3419,6 @@ Page({
               if(this.data.sp_seleing){
                 return false;
               }
-
               this.setData({sp_seleing:1,more_flash:null})
 
               var that = this;
@@ -4762,6 +4768,7 @@ Page({
                               ee.setData({
                                 prom_price: t.data.data.price,
                                 prom_type: 2,
+                                f_prom_type: 2,
                                 prom_id: prom_id,
                                 prom_buy_limit: t.data.data.buy_limit,
                                 prom_act: t.data.data,
@@ -4860,7 +4867,9 @@ Page({
                                 prom_price: t.data.data.user_price,
                                 f_prom_price: t.data.data.user_price,
                                 prom_type: 1,
+                                f_prom_type: 1,
                                 prom_id: prom_id,
+                                f_prom_id: prom_id,
                                 prom_buy_limit: t.data.data.buy_limit,
                                 prom_act: t.data.data,
                                 f_prom_act: t.data.data,
@@ -4997,6 +5006,7 @@ Page({
                             prom_price: parseFloat(inte_data.addmoney),
                             prom_integral: parseFloat(inte_data.integral),
                             prom_type: 4,
+                            f_prom_type: 4,
                             prom_id: inte_data.id,
                             prom_buy_limit: inte_data.limitvipqty,
                             prom_act: inte_data,
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 5f6f567..595dd8b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -675,8 +675,8 @@
         </view>
 
 
-        <!-- 许程 7.24暂时注释 -->
-        <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && front_g.is_xz_yh !=1 && fir_quan.length>0 }}">
+        <!-- 许程 7.24暂时注释，秒杀，团购，积分，拼团的详情页面不显示券的领取 -->
+        <view class="bdt16" wx:if="{{ f_prom_type!=1 &&  f_prom_type!=2 &&  f_prom_type!=4 &&  f_prom_type!=6 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && front_g.is_xz_yh !=1 && fir_quan.length>0 }}">
           <view data-coupon="1" bindtap="switchCoupon" class="cx-frame flex" style="position: relative">
             <view class="cx-sizs fs30">领券</view>
             <view class="flex ai_c f1 pdh20">
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index b30e22c..4ad2ac7 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -68,9 +68,13 @@ Page({
                     getApp().globalData.guide_pick_id= res.data.data.pickup_id
                 }
             })
-           if(!getApp().globalData.user_id){
-               ut.new_user_go(oo.stoid,first_leader);
-           }
+
+            //先查看一下是不是系统会员
+            getApp().waitfor_login(()=> {
+               if (!getApp().globalData.user_id) {
+                   ut.new_user_go(oo.stoid, first_leader);
+               }
+            })
         }
 
 	  var th=this;
@@ -302,12 +306,18 @@ Page({
                 })
              }
              //--送赠品--
-            if(parseInt(content.is_gift)) {
+            if(parseInt(content.is_gift) && content.zp_mode==0) {
                 //-- 获取 --
                 await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+content.gift+"&store_id="+oo.stoid, {
                 }).then(res => {
                     if(ut.ajax_ok(res))
+
                         arr[i].content.gift_name=res.data.data.pageData[0].goods_name;
+                        if(!content.zpname_type) content.zpname_type='';
+
+                        if(parseInt(content.zpname_type)>0){
+                            arr[i].content.gift_name=res.data.data.pageData[0].title;
+                        }
                 })
             }
 
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 43adb06..1c5ed6f 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -133,6 +133,7 @@ Page({
     // console.error(getApp().globalData.groupchat_id);
     // console.error('群id------------------------------------------2222222222222222222222');
     // getApp().globalData.groupchat_id=1
+
     console.log("first_leader:" + first_leader, "onload");
 
 
@@ -224,6 +225,7 @@ Page({
     getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, {
       data: {}
     }).then(function (data) {
+
       let code = data.data.code;
       let resdata = data.data.data;
       if (code == 0 && resdata.is_index) {
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index bfaaf4e..a37ffea 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -103,9 +103,12 @@ Page({
                 }
             })
 
-            if(!getApp().globalData.user_id){
-                ut.new_user_go(os.stoid,first_leader);
-            }
+			//先查看一下是不是系统会员
+			getApp().waitfor_login(()=> {
+				if (!getApp().globalData.user_id) {
+					ut.new_user_go(os.stoid, first_leader);
+				}
+			})
 
 		}else{
           //  app.getUserFir();