From d6491980f5c6dc769ba90ee6091d311a5cce86fd Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Fri, 5 May 2023 14:07:57 +0800
Subject: [PATCH] 每月礼包分享盆友圈优化

---
 packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js   | 20 ++++++++++++++++++++
 packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
index a99af16..31a3d2e 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
@@ -262,6 +262,26 @@ Page({
                 sele_g: monthgiftbag,
               })
               th.init()
+            }else{
+              wx.showModal({
+                title: '提示',
+                content:'活动对象未符合，不能参与',
+                showCancel:false,
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    wx.reLaunch({
+                      url: '/pages/index/index/index'
+                    })
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                  }
+                }
+              })
+              
+              // th.setData({
+              //   qx_msg:'活动对象未符合，不能参与'
+              // })
             }
           } else {
             getApp().my_warnning("获取活动失败", 0, th);
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
index b42b0a7..364008e 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
@@ -193,8 +193,10 @@
 		<block wx:if="{{isBuy==0}}">
 		  <view class="foot_button data-v-3a5b7e36">
 		    <block wx:if="{{is_lb!=1}}">
-		      <view class="foot_button_buy data-v-3a5b7e36 overdue">
+		      <view class="foot_button_buy data-v-3a5b7e36 overdue"  wx:if="{{!getUserID && scene==1154}}">
 		        <text class="data-v-3a5b7e36">请先登录</text>
+            <!-- <text class="data-v-3a5b7e36" wx:if="{{!getUserID}}">请先登录</text> -->
+		        <!-- <text class="data-v-3a5b7e36">请先登录</text> -->
 		      </view>
 		    </block>
 		    <block wx:else>
--
libgit2 0.21.4