wxd / MShopWeApp

Commit d0c02c8220fe99d1bad0827f9bc3e7a2e7abc33a

Authored by WXD-SEASON\season
2 parents 8bb194ea 85ae8387

Merge branch 'dev_oa_lu9' into dev

Inline Side-by-side
Showing 3 changed files with 14 additions and 4 deletions
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
  View file @d0c02c8
... ... @@ -65,7 +65,7 @@
65 65 </view>
66 66 <view class="content_box_button">
67 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 69 </view>
70 70 <block wx:if="{{now > items.starTime1}}">
71 71 <view class="flex-vertical">
... ...
packageE/pages/user/monthgiftbag/monthgiftbag.js
  View file @d0c02c8
... ... @@ -174,7 +174,16 @@ Page({
174 174 navigateTo: function (e) {
175 175 var th = this;
176 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 189 onReachBottom: function () {
... ...
packageE/pages/user/monthgiftbag/monthgiftbag.wxml
  View file @d0c02c8
... ... @@ -23,7 +23,7 @@
23 23 </view>
24 24 <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
25 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 27 <view class="content_box_img">
28 28 <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
29 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 93  
94 94 </view>
95 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 97 <button wx:if="{{item.receive_ordersn}}">立即使用</button>
98 98 <button wx:else>立即领取</button>
99 99 </view>
  100 + <view class="content_box_button" style="color:#b9b5b5;" wx:else>已退款</view>
100 101 </view>
101 102 </block>
102 103 <block wx:if="{{is_read && wareCard.length<1 && is_get}}">
... ...