Commit d0c02c8220fe99d1bad0827f9bc3e7a2e7abc33a
Merge branch 'dev_oa_lu9' into dev
Showing
3 changed files
with
14 additions
and
4 deletions
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
| @@ -65,7 +65,7 @@ | @@ -65,7 +65,7 @@ | ||
| 65 | </view> | 65 | </view> |
| 66 | <view class="content_box_button"> | 66 | <view class="content_box_button"> |
| 67 | <view class="box_button_remark" > | 67 | <view class="box_button_remark" > |
| 68 | - <text wx:if="{{ items.starTime1 < now}}">{{"已售:"+(items.giftQty+items.virtualSales)+"件"}}</text> | 68 | + <text wx:if="{{ items.is_showbuynum==1 && items.starTime1 < now}}">{{"已售:"+(items.giftQty+items.virtualSales)+"件"}}</text> |
| 69 | </view> | 69 | </view> |
| 70 | <block wx:if="{{now > items.starTime1}}"> | 70 | <block wx:if="{{now > items.starTime1}}"> |
| 71 | <view class="flex-vertical"> | 71 | <view class="flex-vertical"> |
packageE/pages/user/monthgiftbag/monthgiftbag.js
| @@ -174,7 +174,16 @@ Page({ | @@ -174,7 +174,16 @@ Page({ | ||
| 174 | navigateTo: function (e) { | 174 | navigateTo: function (e) { |
| 175 | var th = this; | 175 | var th = this; |
| 176 | var url = e.currentTarget.dataset.url; | 176 | var url = e.currentTarget.dataset.url; |
| 177 | - getApp().goto(url); | 177 | + let is_back = e.currentTarget.dataset.is_back |
| 178 | + if (is_back==1) { | ||
| 179 | + wx.showToast({ | ||
| 180 | + title: '该礼包已退款', | ||
| 181 | + icon: 'none', | ||
| 182 | + duration: 2000 | ||
| 183 | + }) | ||
| 184 | + }else{ | ||
| 185 | + getApp().goto(url); | ||
| 186 | + } | ||
| 178 | }, | 187 | }, |
| 179 | //下拉事件 | 188 | //下拉事件 |
| 180 | onReachBottom: function () { | 189 | onReachBottom: function () { |
packageE/pages/user/monthgiftbag/monthgiftbag.wxml
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | </view> | 23 | </view> |
| 24 | <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index"> | 24 | <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index"> |
| 25 | <view class="content_box"> | 25 | <view class="content_box"> |
| 26 | - <view class="content_box_ware" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}"> | 26 | + <view class="content_box_ware" bindtap="navigateTo" data-is_back="{{item.is_back}}" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}"> |
| 27 | <view class="content_box_img"> | 27 | <view class="content_box_img"> |
| 28 | <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> --> | 28 | <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> --> |
| 29 | <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].cover_img"></image> | 29 | <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].cover_img"></image> |
| @@ -93,10 +93,11 @@ | @@ -93,10 +93,11 @@ | ||
| 93 | 93 | ||
| 94 | </view> | 94 | </view> |
| 95 | </view> | 95 | </view> |
| 96 | - <view class="content_box_button" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}"> | 96 | + <view wx:if="{{item.is_back !=1}}" class="content_box_button" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}"> |
| 97 | <button wx:if="{{item.receive_ordersn}}">立即使用</button> | 97 | <button wx:if="{{item.receive_ordersn}}">立即使用</button> |
| 98 | <button wx:else>立即领取</button> | 98 | <button wx:else>立即领取</button> |
| 99 | </view> | 99 | </view> |
| 100 | + <view class="content_box_button" style="color:#b9b5b5;" wx:else>已退款</view> | ||
| 100 | </view> | 101 | </view> |
| 101 | </block> | 102 | </block> |
| 102 | <block wx:if="{{is_read && wareCard.length<1 && is_get}}"> | 103 | <block wx:if="{{is_read && wareCard.length<1 && is_get}}"> |