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 @@ + + + {{pick_up.pickup_name}} + + {{giftTitle}} @@ -95,19 +100,14 @@ + + - - - +