Commit 337f66858c0d94cb12a180f1d5495824a86b54e9
1 parent
5c18e516
专享礼包显示门店
Showing
2 changed files
with
21 additions
and
8 deletions
pages/giftpack/giftpacklist/giftpacklist.js
@@ -260,6 +260,19 @@ Page({ | @@ -260,6 +260,19 @@ Page({ | ||
260 | break; | 260 | break; |
261 | } | 261 | } |
262 | } | 262 | } |
263 | + | ||
264 | + if(res.data.data.pickup_id){ | ||
265 | + getApp().request.get("/api/weshop/pickup/get/"+os.stoid+"/"+res.data.data.pickup_id,{ | ||
266 | + success: function (res) { | ||
267 | + if(res.data.code==0){ | ||
268 | + th.setData({pick_up:res.data.data}); | ||
269 | + } | ||
270 | + } | ||
271 | + }); | ||
272 | + | ||
273 | + } | ||
274 | + | ||
275 | + | ||
263 | } else { | 276 | } else { |
264 | getApp().my_warnning(res.data.msg, 0, th); | 277 | getApp().my_warnning(res.data.msg, 0, th); |
265 | return false; | 278 | return false; |
pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -3,6 +3,11 @@ | @@ -3,6 +3,11 @@ | ||
3 | <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image> | 3 | <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image> |
4 | </view> | 4 | </view> |
5 | <view class="box_title data-v-3a5b7e36" > | 5 | <view class="box_title data-v-3a5b7e36" > |
6 | + | ||
7 | + <view class="flex ai_c fs28" style="margin-bottom: 20rpx" wx:if="{{isBuy==0 && pick_up}}"> | ||
8 | + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>{{pick_up.pickup_name}} | ||
9 | + </view> | ||
10 | + | ||
6 | <view class="top_title data-v-3a5b7e36"> | 11 | <view class="top_title data-v-3a5b7e36"> |
7 | <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text> | 12 | <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text> |
8 | </view> | 13 | </view> |
@@ -95,19 +100,14 @@ | @@ -95,19 +100,14 @@ | ||
95 | </text> | 100 | </text> |
96 | </block> | 101 | </block> |
97 | </view> | 102 | </view> |
103 | + | ||
98 | <view class="box_ware_code data-v-3a5b7e36" wx:if="{{!flag}}"> | 104 | <view class="box_ware_code data-v-3a5b7e36" wx:if="{{!flag}}"> |
99 | <!-- <block wx:if="{{c_state==0}}"> --> | 105 | <!-- <block wx:if="{{c_state==0}}"> --> |
106 | + | ||
100 | <block wx:if="{{isBuy==0&item.lbType==1}}"> | 107 | <block wx:if="{{isBuy==0&item.lbType==1}}"> |
101 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" data-codeId="{{item.Id}}" class="data-v-3a5b7e36"></image> | 108 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" data-codeId="{{item.Id}}" class="data-v-3a5b7e36"></image> |
102 | </block> | 109 | </block> |
103 | - <!-- </block> --> | ||
104 | - <!-- | ||
105 | - <block wx:else> | ||
106 | - <block wx:if="{{isBuy==0&item.lbType==1}}"> | ||
107 | - <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image> | ||
108 | - </block> | ||
109 | - </block>--> | ||
110 | - | 110 | + |
111 | <block wx:if="{{isBuy==0&item.lbType==2}}"> | 111 | <block wx:if="{{isBuy==0&item.lbType==2}}"> |
112 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/packageD/pages/user/coupons/coupons" bindtap="goto"></image> | 112 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/packageD/pages/user/coupons/coupons" bindtap="goto"></image> |
113 | </block> | 113 | </block> |