Commit fdccae65428d794f6a26a1043226ecf98eda1dbb
1 parent
c78b7584
专享礼包的优化
Showing
2 changed files
with
3 additions
and
3 deletions
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
@@ -165,8 +165,8 @@ | @@ -165,8 +165,8 @@ | ||
165 | <view class="foot_button_intalge data-v-3a5b7e36 {{m_filter.lb_type_color(record_list.lbstate)}} " > | 165 | <view class="foot_button_intalge data-v-3a5b7e36 {{m_filter.lb_type_color(record_list.lbstate)}} " > |
166 | <text wx:if="{{record_list.lbstate==1}}" class="data-v-3a5b7e36">未领取</text> | 166 | <text wx:if="{{record_list.lbstate==1}}" class="data-v-3a5b7e36">未领取</text> |
167 | <text wx:if="{{record_list.lbstate==2}}" class="data-v-3a5b7e36">未核销</text> | 167 | <text wx:if="{{record_list.lbstate==2}}" class="data-v-3a5b7e36">未核销</text> |
168 | - <text wx:if="{{record_list.lbstate==3}}" class="data-v-3a5b7e36">已过期</text> | ||
169 | - <text wx:if="{{record_list.lbstate==4}}" class="data-v-3a5b7e36">部分核销</text> | 168 | + <text wx:if="{{record_list.lbstate==3}}" class="data-v-3a5b7e36">部分核销</text> |
169 | + <text wx:if="{{record_list.lbstate==4}}" class="data-v-3a5b7e36">已过期</text> | ||
170 | <text wx:if="{{record_list.lbstate==5}}" class="data-v-3a5b7e36">已全部核销</text> | 170 | <text wx:if="{{record_list.lbstate==5}}" class="data-v-3a5b7e36">已全部核销</text> |
171 | </view> | 171 | </view> |
172 | </view> | 172 | </view> |
packageE/pages/user/monthgiftbag/monthgiftbag.wxml
@@ -136,7 +136,7 @@ | @@ -136,7 +136,7 @@ | ||
136 | <button class="overdue">已领取</button> | 136 | <button class="overdue">已领取</button> |
137 | </block> | 137 | </block> |
138 | <!-- 未领取的 --> | 138 | <!-- 未领取的 --> |
139 | - <block wx:else> | 139 | + <block wx:elif="{{item.cur_giftid}}"> |
140 | <button catchtap="getGift" data-index="{{index}}" data-record_list_id="{{item.record_list_id}}" data-id="{{item.lbId}}" >立即领取</button> | 140 | <button catchtap="getGift" data-index="{{index}}" data-record_list_id="{{item.record_list_id}}" data-id="{{item.lbId}}" >立即领取</button> |
141 | </block> | 141 | </block> |
142 | 142 |