Commit c93e77399a9bb2505bb782bf64a3f9054e2cae3c
1 parent
ad5e352d
大转盘礼包兑换跳转到对应的专享礼包详情页
Showing
2 changed files
with
31 additions
and
3 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
@@ -57,6 +57,10 @@ Page({ | @@ -57,6 +57,10 @@ Page({ | ||
57 | }, | 57 | }, |
58 | 58 | ||
59 | onLoad(options) { | 59 | onLoad(options) { |
60 | + // wx.showLoading(); | ||
61 | + // this.setData({ | ||
62 | + // showMask2: true, | ||
63 | + // }); | ||
60 | // console.log('imghost+++++', imghost); | 64 | // console.log('imghost+++++', imghost); |
61 | self = this; | 65 | self = this; |
62 | this.data.options = options; | 66 | this.data.options = options; |
@@ -125,11 +129,17 @@ Page({ | @@ -125,11 +129,17 @@ Page({ | ||
125 | }, | 129 | }, |
126 | }); | 130 | }); |
127 | } else { | 131 | } else { |
132 | + // wx.hideLoading(); | ||
128 | if(luckInfo && luckInfo.store_bannerUrl) { | 133 | if(luckInfo && luckInfo.store_bannerUrl) { |
129 | self.setData({ | 134 | self.setData({ |
130 | bannerUrl: imghost + luckInfo.store_bannerUrl, | 135 | bannerUrl: imghost + luckInfo.store_bannerUrl, |
131 | }); | 136 | }); |
132 | }; | 137 | }; |
138 | + | ||
139 | + // self.setData({ | ||
140 | + // showMask2: false, | ||
141 | + // hiddenCanvas: false, | ||
142 | + // }); | ||
133 | 143 | ||
134 | }; | 144 | }; |
135 | 145 | ||
@@ -174,12 +184,19 @@ Page({ | @@ -174,12 +184,19 @@ Page({ | ||
174 | luck_state: 1 | 184 | luck_state: 1 |
175 | }, | 185 | }, |
176 | success: function(res) { | 186 | success: function(res) { |
187 | + console.log('success~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'); | ||
177 | if(res.data.code == 0) { | 188 | if(res.data.code == 0) { |
189 | + console.log('sssss++++++++++++++++++++++++++'); | ||
178 | self.setData({ | 190 | self.setData({ |
179 | record: res.data.data.pageData, | 191 | record: res.data.data.pageData, |
180 | }); | 192 | }); |
193 | + } else { | ||
194 | + console.log('fail++++++++++++++++++++++++++'); | ||
181 | }; | 195 | }; |
182 | - }, | 196 | + }, |
197 | + fail: function(res) { | ||
198 | + console.log('fail~~~~~~~~~~~~~~~~~~', res); | ||
199 | + } | ||
183 | }); | 200 | }); |
184 | 201 | ||
185 | 202 | ||
@@ -843,6 +860,14 @@ Page({ | @@ -843,6 +860,14 @@ Page({ | ||
843 | goto(e) { | 860 | goto(e) { |
844 | let url = ''; | 861 | let url = ''; |
845 | let type = e.currentTarget.dataset.type; | 862 | let type = e.currentTarget.dataset.type; |
863 | + let ordersn = null; | ||
864 | + let buyreceive_id = null; | ||
865 | + if(e.currentTarget.dataset.ordersn) { | ||
866 | + ordersn = e.currentTarget.dataset.ordersn; | ||
867 | + }; | ||
868 | + if(e.currentTarget.dataset.buyreceiveid) { | ||
869 | + buyreceive_id = e.currentTarget.dataset.buyreceiveid; | ||
870 | + }; | ||
846 | switch(type) { | 871 | switch(type) { |
847 | case 1: { | 872 | case 1: { |
848 | url = '/pages/user/integral/integral'; | 873 | url = '/pages/user/integral/integral'; |
@@ -861,7 +886,7 @@ Page({ | @@ -861,7 +886,7 @@ Page({ | ||
861 | break; | 886 | break; |
862 | }; | 887 | }; |
863 | case 6: { | 888 | case 6: { |
864 | - url = '/packageA/pages/myGift/myGift?index=1'; | 889 | + url = `/pages/giftpack/giftpacklist/giftpacklist?orderSn=${ordersn}&lbId=${buyreceive_id}`; |
865 | break; | 890 | break; |
866 | }; | 891 | }; |
867 | }; | 892 | }; |
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -147,7 +147,8 @@ | @@ -147,7 +147,8 @@ | ||
147 | <view class="flex ai_c jc_fe fs26 xc-black3 "> | 147 | <view class="flex ai_c jc_fe fs26 xc-black3 "> |
148 | <!-- <view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态:{{item.state == 0 ? '未兑换':'已兑换'}}</view> --> | 148 | <!-- <view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态:{{item.state == 0 ? '未兑换':'已兑换'}}</view> --> |
149 | <!-- <view style="">兑换状态:{{item.state == 0 ? '未兑换':'已兑换'}}</view> --> | 149 | <!-- <view style="">兑换状态:{{item.state == 0 ? '未兑换':'已兑换'}}</view> --> |
150 | - <view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view> | 150 | + <!-- <view class="fs24 c-a">中奖时间:{{filter.format_time(item.luck_time, 1)}}</view> --> |
151 | + <view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}" data-ordersn="{{item.order_sn}}" data-buyreceiveid="{{item.buyreceive_id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view> | ||
151 | </view> | 152 | </view> |
152 | </view> | 153 | </view> |
153 | </view> | 154 | </view> |
@@ -192,5 +193,7 @@ | @@ -192,5 +193,7 @@ | ||
192 | 193 | ||
193 | <!-- 遮罩层 --> | 194 | <!-- 遮罩层 --> |
194 | <view class="mask" wx:if="{{showMask}}"></view> | 195 | <view class="mask" wx:if="{{showMask}}"></view> |
196 | +<!-- 进场遮罩层 --> | ||
197 | +<view class="mask2" wx:if="{{showMask2}}"></view> | ||
195 | 198 | ||
196 | <qrcode id="qrcode" bind:close="closeQr"></qrcode> | 199 | <qrcode id="qrcode" bind:close="closeQr"></qrcode> |
197 | \ No newline at end of file | 200 | \ No newline at end of file |