Commit 3210b7d4be3039d799867392ff56c8b9448c4abc
1 parent
e8461dd3
每月礼包优化
Showing
2 changed files
with
12 additions
and
7 deletions
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
| @@ -157,11 +157,16 @@ Page({ | @@ -157,11 +157,16 @@ Page({ | ||
| 157 | if (this.data.flag == 1) { | 157 | if (this.data.flag == 1) { |
| 158 | this.getZxlbDetails(); | 158 | this.getZxlbDetails(); |
| 159 | } else { | 159 | } else { |
| 160 | - if (this.data.isBuy == 0) { | ||
| 161 | - this.GetMyGiftList(); | ||
| 162 | - } else if (this.data.isBuy == 1) { | ||
| 163 | - this.GetBuyGiftList(); | 160 | + if(this.data.orderSn){ |
| 161 | + this.GetMyGiftList(); | ||
| 162 | + }else{ | ||
| 163 | + this.GetBuyGiftList(); | ||
| 164 | } | 164 | } |
| 165 | + // if (this.data.isBuy == 0) { | ||
| 166 | + // this.GetMyGiftList(); | ||
| 167 | + // } else if (this.data.isBuy == 1) { | ||
| 168 | + // this.GetBuyGiftList(); | ||
| 169 | + // } | ||
| 165 | 170 | ||
| 166 | } | 171 | } |
| 167 | 172 |
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
| @@ -150,7 +150,7 @@ | @@ -150,7 +150,7 @@ | ||
| 150 | <view class="foot_empty data-v-3a5b7e36"></view> | 150 | <view class="foot_empty data-v-3a5b7e36"></view> |
| 151 | 151 | ||
| 152 | <block wx:if="{{flag != 1}}"> | 152 | <block wx:if="{{flag != 1}}"> |
| 153 | - <block wx:if="{{isBuy==1 && giftTitle}}"> | 153 | + <block wx:if="{{isBuy==0 && giftTitle}}"> |
| 154 | <block wx:if="{{isStart==1}}"> | 154 | <block wx:if="{{isStart==1}}"> |
| 155 | <view class="foot_button data-v-3a5b7e36"> | 155 | <view class="foot_button data-v-3a5b7e36"> |
| 156 | <!-- <block wx:if="{{giftPrice>0 && giftIntegral>0}}"> | 156 | <!-- <block wx:if="{{giftPrice>0 && giftIntegral>0}}"> |
| @@ -181,13 +181,13 @@ | @@ -181,13 +181,13 @@ | ||
| 181 | </block> | 181 | </block> |
| 182 | </view> | 182 | </view> |
| 183 | </block> | 183 | </block> |
| 184 | - <block wx:else> | 184 | + <!-- <block wx:else> |
| 185 | <view class="foot_button data-v-3a5b7e36"> | 185 | <view class="foot_button data-v-3a5b7e36"> |
| 186 | <view class="foot_button_intalge data-v-3a5b7e36 gray "> | 186 | <view class="foot_button_intalge data-v-3a5b7e36 gray "> |
| 187 | <text class="data-v-3a5b7e36">活动还未开始</text> | 187 | <text class="data-v-3a5b7e36">活动还未开始</text> |
| 188 | </view> | 188 | </view> |
| 189 | </view> | 189 | </view> |
| 190 | - </block> | 190 | + </block> --> |
| 191 | 191 | ||
| 192 | </block> | 192 | </block> |
| 193 | <block wx:if="{{false && isBuy==0}}"> | 193 | <block wx:if="{{false && isBuy==0}}"> |