fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by htoooth
Commit 3a6b88fb18ff5dd5b7535620c3ab5f77ae7db102 1 parent 3bd667f7

fix

Inline Side-by-side
Showing 4 changed files with 12 additions and 87 deletions
  1 +
1 <view class="bottom-action" > 2 <view class="bottom-action" >
2 <slot></slot> 3 <slot></slot>
3 </view> 4 </view>
1 .bottom-action { 1 .bottom-action {
2 -  
3 position: fixed; 2 position: fixed;
4 bottom: 0; 3 bottom: 0;
5 left: 0; 4 left: 0;
@@ -9,5 +8,6 @@ @@ -9,5 +8,6 @@
9 text-align: center; 8 text-align: center;
10 padding-left: 30rpx; 9 padding-left: 30rpx;
11 padding-right: 30rpx; 10 padding-right: 30rpx;
  11 + border-top: 1rpx solid #E0E0E0
12 } 12 }
13 13
@@ -483,7 +483,7 @@ Page(Object.assign({ @@ -483,7 +483,7 @@ Page(Object.assign({
483 if ((this.data.avatarList.length + 1) === this.data.assistLimit) { 483 if ((this.data.avatarList.length + 1) === this.data.assistLimit) {
484 detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode); 484 detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
485 } 485 }
486 - } else if (result.code === 401) { 486 + } else if (result.code === 9001) {
487 this.setData({ 487 this.setData({
488 assistSuccess: ASSIST_SUCCESS.REPEAT 488 assistSuccess: ASSIST_SUCCESS.REPEAT
489 }); 489 });
@@ -536,7 +536,7 @@ Page(Object.assign({ @@ -536,7 +536,7 @@ Page(Object.assign({
536 queueSuccess: QUEUE_SUCCESS.OK, 536 queueSuccess: QUEUE_SUCCESS.OK,
537 queueStatus: QUEUE_STATUS.QUEUE_HELP 537 queueStatus: QUEUE_STATUS.QUEUE_HELP
538 }); 538 });
539 - } else if (result.code === 401) { 539 + } else if (result.code === 9001) {
540 this.setData({ 540 this.setData({
541 queueSuccess: QUEUE_SUCCESS.REPEAT 541 queueSuccess: QUEUE_SUCCESS.REPEAT
542 }); 542 });
@@ -218,74 +218,11 @@ @@ -218,74 +218,11 @@
218 </view> 218 </view>
219 </action-bar> 219 </action-bar>
220 220
221 - <block wx:elif="{{queueStatus === 4}}">  
222 - <block wx:if="{{showStatus === 3}}">  
223 - <action-bar>  
224 - <view class="top-assist-action">  
225 - <view class="top-title" >当前活动已结束</view>  
226 - <view class="top-action3">  
227 - <view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>  
228 - <view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>  
229 - </view>  
230 - </view>  
231 - </action-bar>  
232 - </block>  
233 -  
234 - <block wx:elif="{{showStatus === 4}}">  
235 - <action-bar>  
236 - <view class="bottom1-action">  
237 - <view class="as-bottom ok" bindtap="buyNow">立即购买</view>  
238 - </view>  
239 - </action-bar>  
240 - </block>  
241 -  
242 - <block wx:elif="{{showStatus === 6}}">  
243 - <action-bar>  
244 - <view class="bottom1-action">  
245 - <view class="as-bottom cancel width200">即将开售</view>  
246 - <view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view>  
247 - </view>  
248 - </action-bar>  
249 - </block>  
250 -  
251 - <block wx:elif="{{showStatus === 7}}">  
252 - <action-bar>  
253 - <view class="bottom1-action">  
254 - <view class="as-bottom cancel">立即购买</view>  
255 - </view>  
256 - </action-bar>  
257 - </block>  
258 -  
259 - <action-bar wx:else>  
260 - <view class="top-assist-action">  
261 - <view class="top-title" >当前活动已结束</view>  
262 - <view class="top-action3">  
263 - <view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>  
264 - <view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>  
265 - </view>  
266 - </view>  
267 - </action-bar>  
268 - </block>  
269 -  
270 - <block wx:elif="{{queueStatus === 6}}">  
271 - <action-bar>  
272 - <view class="bottom1-action">  
273 - <view class="action-list">  
274 - <view class="as-bottom cancel width200" bindtap="goQueueList">查看排队详情</view>  
275 - <view class="as-bottom ok width200">等待抽奖</view>  
276 - </view>  
277 -  
278 - <view class="help" bindtap="goHelp">?</view>  
279 - </view>  
280 - </action-bar>  
281 - </block>  
282 -  
283 <action-bar wx:else> 221 <action-bar wx:else>
284 <view class="top-assist-action"> 222 <view class="top-assist-action">
285 - <view class="top-title" >当前活动已结束</view>  
286 - <view class="top-action3">  
287 - <view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>  
288 - <view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view> 223 + <view class="bottom1-action">
  224 + <view class="as-bottom ok" bindtap="goQueueList">排队已结束 查看详情</view>
  225 + <view class="help" bindtap="goHelp">?</view>
289 </view> 226 </view>
290 </view> 227 </view>
291 </action-bar> 228 </action-bar>
@@ -311,25 +248,11 @@ @@ -311,25 +248,11 @@
311 </action-bar> 248 </action-bar>
312 249
313 <block wx:elif="{{queueStatus === 4}}"> 250 <block wx:elif="{{queueStatus === 4}}">
314 - <block wx:if="{{showStatus === 2}}">  
315 - <action-bar>  
316 - <view class="bottom1-action">  
317 - <view class="as-bottom cancel">立即购买</view>  
318 - </view>  
319 - </action-bar>  
320 - </block>  
321 - <block wx:elif="{{showStatus === 5}}">  
322 - <action-bar>  
323 - <view class="bottom1-action">  
324 - <view class="as-bottom cancel">即将售罄</view>  
325 - </view>  
326 - </action-bar>  
327 - </block>  
328 - <action-bar wx:else> 251 + <action-bar>
329 <view class="top-assist-action"> 252 <view class="top-assist-action">
330 <view class="top-title" >当前活动已结束</view> 253 <view class="top-title" >当前活动已结束</view>
331 <view class="top-action3"> 254 <view class="top-action3">
332 - <view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view> 255 + <view class="as-bottom ok width200" bindtap="goQueueList">查看详情</view>
333 <view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view> 256 <view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
334 </view> 257 </view>
335 </view> 258 </view>
@@ -340,6 +263,7 @@ @@ -340,6 +263,7 @@
340 <action-bar> 263 <action-bar>
341 <view class="bottom1-action"> 264 <view class="bottom1-action">
342 <view class="as-bottom cancel width200">已助力</view> 265 <view class="as-bottom cancel width200">已助力</view>
  266 + <view style="width:10rpx;"></view>
343 <view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view> 267 <view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view>
344 <view class="help" bindtap="goHelp">?</view> 268 <view class="help" bindtap="goHelp">?</view>
345 </view> 269 </view>
@@ -351,7 +275,7 @@ @@ -351,7 +275,7 @@
351 <view class="top-assist-action"> 275 <view class="top-assist-action">
352 <view class="top-title" >你的好友已助力成功</view> 276 <view class="top-title" >你的好友已助力成功</view>
353 <view class="top-action3"> 277 <view class="top-action3">
354 - <view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view> 278 + <view class="as-bottom ok width200" bindtap="goQueueList">查看详情</view>
355 <view class="as-bottom cancel width200" bindtap="restartSelfShare">我也要参加</view> 279 <view class="as-bottom cancel width200" bindtap="restartSelfShare">我也要参加</view>
356 </view> 280 </view>
357 </view> 281 </view>
@@ -362,7 +286,7 @@ @@ -362,7 +286,7 @@
362 <view class="top-assist-action"> 286 <view class="top-assist-action">
363 <view class="top-title" >当前活动已结束</view> 287 <view class="top-title" >当前活动已结束</view>
364 <view class="top-action3"> 288 <view class="top-action3">
365 - <view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view> 289 + <view class="as-bottom ok width200" bindtap="goQueueList">查看详情</view>
366 <view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view> 290 <view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
367 </view> 291 </view>
368 </view> 292 </view>