From 337f66858c0d94cb12a180f1d5495824a86b54e9 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 29 Mar 2022 10:54:08 +0800
Subject: [PATCH] 专享礼包显示门店

---
 pages/giftpack/giftpacklist/giftpacklist.js   | 13 +++++++++++++
 pages/giftpack/giftpacklist/giftpacklist.wxml | 16 ++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 848f1db..3736fbd 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -260,6 +260,19 @@ Page({
               break;
             }
           }
+
+          if(res.data.data.pickup_id){
+              getApp().request.get("/api/weshop/pickup/get/"+os.stoid+"/"+res.data.data.pickup_id,{
+                  success: function (res) {
+                      if(res.data.code==0){
+                          th.setData({pick_up:res.data.data});
+                      }
+                  }
+              });
+
+          }
+
+
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
           return false;
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index dde5f6a..07f7ad8 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -3,6 +3,11 @@
     <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
   </view>
   <view class="box_title data-v-3a5b7e36" >
+
+    <view class="flex ai_c fs28" style="margin-bottom: 20rpx"  wx:if="{{isBuy==0 && pick_up}}">
+      <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>{{pick_up.pickup_name}}
+    </view>
+
     <view class="top_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
@@ -95,19 +100,14 @@
             </text>
             </block>
           </view>
+
           <view class="box_ware_code data-v-3a5b7e36" wx:if="{{!flag}}">
             <!-- <block wx:if="{{c_state==0}}"> -->
+
               <block wx:if="{{isBuy==0&item.lbType==1}}">
                 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" data-codeId="{{item.Id}}" class="data-v-3a5b7e36"></image>
               </block>
-            <!-- </block> -->
-			<!--
-            <block wx:else>
-              <block wx:if="{{isBuy==0&item.lbType==1}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image>
-              </block>
-            </block>-->
-			
+
             <block wx:if="{{isBuy==0&item.lbType==2}}">
               <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>
             </block>
--
libgit2 0.21.4