Commit e3335a055ec0bde4a03c7823e082ac74f73240d1
1 parent
ae684249
助力礼包详情提交
Showing
4 changed files
with
21 additions
and
43 deletions
pages/user/assistance/giftpacklist.js
| @@ -32,11 +32,7 @@ Page({ | @@ -32,11 +32,7 @@ Page({ | ||
| 32 | onLoad: function (options) { | 32 | onLoad: function (options) { |
| 33 | var th = this; | 33 | var th = this; |
| 34 | th.setData({ | 34 | th.setData({ |
| 35 | - isBuy: options.isBuy, | ||
| 36 | - getStorageID: a.stoid, | ||
| 37 | - getUserID: d.user_id, | ||
| 38 | getGiftID: options.lbId, | 35 | getGiftID: options.lbId, |
| 39 | - orderSn: options.orderSn | ||
| 40 | }) | 36 | }) |
| 41 | if (options.isBuy == 0) { | 37 | if (options.isBuy == 0) { |
| 42 | th.GetMyGiftList(); | 38 | th.GetMyGiftList(); |
pages/user/assistance/giftpacklist.json
| @@ -6,4 +6,4 @@ | @@ -6,4 +6,4 @@ | ||
| 6 | "qr_code": "/components/qr_code/qr_code", | 6 | "qr_code": "/components/qr_code/qr_code", |
| 7 | "nav_b": "/components/nav_b/nav_b" | 7 | "nav_b": "/components/nav_b/nav_b" |
| 8 | } | 8 | } |
| 9 | -} | ||
| 10 | \ No newline at end of file | 9 | \ No newline at end of file |
| 10 | +} | ||
| 11 | \ No newline at end of file | 11 | \ No newline at end of file |
pages/user/assistance/giftpacklist.wxml
| @@ -99,48 +99,30 @@ | @@ -99,48 +99,30 @@ | ||
| 99 | </view> | 99 | </view> |
| 100 | </view> | 100 | </view> |
| 101 | <view class="foot_empty data-v-3a5b7e36"></view> | 101 | <view class="foot_empty data-v-3a5b7e36"></view> |
| 102 | - <block wx:if="{{isBuy==1}}"> | ||
| 103 | - <view class="foot_button data-v-3a5b7e36"> | ||
| 104 | - <block wx:if="{{giftPrice>0&&giftIntegral>0}}"> | ||
| 105 | - <view class="foot_button_left data-v-3a5b7e36" data-id="{{lbId}}" bindtap="GetBuyPrice"> | ||
| 106 | - <text class="data-v-3a5b7e36">立即购买</text> | ||
| 107 | - </view> | ||
| 108 | - </block> | ||
| 109 | - <block wx:if="{{giftPrice>0 && giftIntegral>0}}"> | ||
| 110 | - <view class="foot_button_right data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}"> | ||
| 111 | - <text class="data-v-3a5b7e36">立即兑换</text> | ||
| 112 | - </view> | ||
| 113 | - </block> | ||
| 114 | - <block wx:if="{{giftPrice>0 && giftIntegral<=0}}"> | ||
| 115 | - <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetBuyPrice" data-id="{{lbId}}"> | ||
| 116 | - <text class="data-v-3a5b7e36">立即购买</text> | ||
| 117 | - </view> | ||
| 118 | - </block> | ||
| 119 | - <block wx:if="{{giftPrice<=0 && giftIntegral>0}}"> | ||
| 120 | - <view class="foot_button_intalge data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}"> | ||
| 121 | - <text class="data-v-3a5b7e36">立即兑换</text> | ||
| 122 | - </view> | ||
| 123 | - </block> | ||
| 124 | - </view> | ||
| 125 | - </block> | ||
| 126 | <block wx:if="{{isBuy==0}}"> | 102 | <block wx:if="{{isBuy==0}}"> |
| 127 | <view class="foot_button data-v-3a5b7e36"> | 103 | <view class="foot_button data-v-3a5b7e36"> |
| 128 | - <block wx:if="{{is_lb!=1}}"> | ||
| 129 | - <view class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 130 | - <text class="data-v-3a5b7e36">无核销商品</text> | 104 | + <block wx:if="{{true}}"> |
| 105 | + <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> | ||
| 106 | + <text class="data-v-3a5b7e36">一键领取</text> | ||
| 131 | </view> | 107 | </view> |
| 132 | </block> | 108 | </block> |
| 133 | <block wx:else> | 109 | <block wx:else> |
| 134 | - <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> | ||
| 135 | - <text class="data-v-3a5b7e36">立即使用</text> | ||
| 136 | - </view> | ||
| 137 | - <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 138 | - <text class="data-v-3a5b7e36">商品已核销</text> | ||
| 139 | - </view> | ||
| 140 | - <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 141 | - <text class="data-v-3a5b7e36">商品兑换时间已过</text> | ||
| 142 | - </view> | ||
| 143 | - | 110 | + <block wx:if="{{is_lb!=1}}"> |
| 111 | + <view class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 112 | + <text class="data-v-3a5b7e36">无核销商品</text> | ||
| 113 | + </view> | ||
| 114 | + </block> | ||
| 115 | + <block wx:else> | ||
| 116 | + <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> | ||
| 117 | + <text class="data-v-3a5b7e36">立即使用</text> | ||
| 118 | + </view> | ||
| 119 | + <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 120 | + <text class="data-v-3a5b7e36">商品已核销</text> | ||
| 121 | + </view> | ||
| 122 | + <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 123 | + <text class="data-v-3a5b7e36">商品兑换时间已过</text> | ||
| 124 | + </view> | ||
| 125 | + </block> | ||
| 144 | </block> | 126 | </block> |
| 145 | </view> | 127 | </view> |
| 146 | </block> | 128 | </block> |