From fdccae65428d794f6a26a1043226ecf98eda1dbb Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 28 May 2024 17:04:17 +0800
Subject: [PATCH] 专享礼包的优化

---
 packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml | 4 ++--
 packageE/pages/user/monthgiftbag/monthgiftbag.wxml              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
index 2304d2e..d4e7ae9 100644
--- a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
@@ -165,8 +165,8 @@
             <view class="foot_button_intalge data-v-3a5b7e36 {{m_filter.lb_type_color(record_list.lbstate)}} " >
 		            <text wx:if="{{record_list.lbstate==1}}" class="data-v-3a5b7e36">未领取</text>
 		            <text wx:if="{{record_list.lbstate==2}}" class="data-v-3a5b7e36">未核销</text>
-		            <text wx:if="{{record_list.lbstate==3}}" class="data-v-3a5b7e36">已过期</text>
-		            <text wx:if="{{record_list.lbstate==4}}" class="data-v-3a5b7e36">部分核销</text>
+		            <text wx:if="{{record_list.lbstate==3}}" class="data-v-3a5b7e36">部分核销</text>
+		            <text wx:if="{{record_list.lbstate==4}}" class="data-v-3a5b7e36">已过期</text>
 		            <text wx:if="{{record_list.lbstate==5}}" class="data-v-3a5b7e36">已全部核销</text>
 		        </view>
           </view>  
diff --git a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
index efc83f3..774833b 100644
--- a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
+++ b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
@@ -136,7 +136,7 @@
             <button class="overdue">已领取</button>
           </block>
           <!-- 未领取的 -->
-          <block wx:else>
+          <block wx:elif="{{item.cur_giftid}}">
             <button catchtap="getGift"  data-index="{{index}}"  data-record_list_id="{{item.record_list_id}}"  data-id="{{item.lbId}}" >立即领取</button>
           </block>
 
--
libgit2 0.21.4