diff --git a/components/store_popup/store_popup.wxml b/components/store_popup/store_popup.wxml index ce8d633..94f2aab 100644 --- a/components/store_popup/store_popup.wxml +++ b/components/store_popup/store_popup.wxml @@ -28,7 +28,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -133,7 +133,7 @@ - + {{item.name}} diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index 58b8cd1..c5c6dc2 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -228,8 +228,7 @@ Page({ imghost: imghost, num: 3, canStart: false, - - + // store:1, prizes: [], defaultConfig: { offsetDegree: 22.5, @@ -1134,7 +1133,47 @@ Page({ }, - + //门店回调 + async callback(e){ + let item = e.detail; + console.log('门店信息'); + console.log(item); + if (item && item.pickup_no) { + // let qr_code_object=this.data.qr_code_object + // let data={ + // store_id:os.stoid,//商家编号 + // user_id:getApp().globalData.user_id, //会员编号 + // storageId:item.keyid, + // writeOffCode:qr_code_object.WriteOffCode,//核销码 + // } + // let res = await getApp().request.promisePut("/api/weshop/users/grade/storage/update", { + // data: data + // }); + // if (res && res.data && res.data.code==0) { + // let text='qr_code_object.StorageID' + // this.setData({ + // [text]:item.keyid + // }) + // }else{ + // wx.showToast({ + // title: '门店选择失败', + // icon: 'none', + // duration: 2000 + // }) + // } + }else{ + wx.showToast({ + title: '门店选择失败', + icon: 'none', + duration: 2000 + }) + } + }, + select_product(){ + this.setData({ + store:1 + }) + }, showPopup() { this.setData({ list: null, diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.json b/packageB/pages/luckactivity/luckinfo/luckinfo.json index 27a7638..4b755f6 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.json +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.json @@ -2,7 +2,8 @@ "usingComponents": { "lucky-wheel":"/packageB/miniprogram_npm/mini-luck-draw/lucky-wheel/index", "qrcode": "/components/my-qrcode/my-qrcode", - "nodata": "/components/nodata/nodata", + "nodata": "/components/nodata/nodata", + "store_popup":"/components/store_popup/store_popup", "painter": "/packageB/components/painter/painter" }, "enablePullDownRefresh": false, diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index 7b8e08f..44eb844 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -179,7 +179,7 @@ - 立即兑换 + 立即兑换 @@ -201,5 +201,7 @@ + + \ No newline at end of file