Commit bbbbe3747855153e4caf2ae929daef3a476c5f6f
1 parent
f6b3fd46
助力活动首页领取礼包跳转优化
Showing
2 changed files
with
19 additions
and
19 deletions
pages/user/assistance/assistance.js
@@ -168,9 +168,9 @@ Page({ | @@ -168,9 +168,9 @@ Page({ | ||
168 | 168 | ||
169 | // 领取礼包 | 169 | // 领取礼包 |
170 | get_libao: function(e) { | 170 | get_libao: function(e) { |
171 | - var libao_id = e.currentTarget.dataset.libaoid; | 171 | + var help_id = e.currentTarget.dataset.help_id; |
172 | var taskId = e.currentTarget.dataset.taskid;//任务id | 172 | var taskId = e.currentTarget.dataset.taskid;//任务id |
173 | - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskId); | 173 | + getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId); |
174 | }, | 174 | }, |
175 | 175 | ||
176 | //查看礼包id | 176 | //查看礼包id |
pages/user/assistance/assistance.wxml
@@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
16 | </view> | 16 | </view> |
17 | <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time"> | 17 | <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time"> |
18 | <view>活动时间:{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view> | 18 | <view>活动时间:{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view> |
19 | - | 19 | + |
20 | </view> | 20 | </view> |
21 | <view class="flex-center" bindtap="go_task"> | 21 | <view class="flex-center" bindtap="go_task"> |
22 | <view class="flex-center take"> | 22 | <view class="flex-center take"> |
@@ -43,24 +43,24 @@ | @@ -43,24 +43,24 @@ | ||
43 | <!-- 我的任务 --> | 43 | <!-- 我的任务 --> |
44 | <view wx:if="{{switch_head==0}}" class="white"> | 44 | <view wx:if="{{switch_head==0}}" class="white"> |
45 | <view class="items"> | 45 | <view class="items"> |
46 | - <view class="tesk_list"> | ||
47 | - <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}"> | ||
48 | - <view class="flex-center width"> | ||
49 | - <view class="ellipsis-1">{{item.helpTaskName}}</view> | ||
50 | - </view> | 46 | + <view class="tesk_list"> |
47 | + <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}"> | ||
48 | + <view class="flex-center width"> | ||
49 | + <view class="ellipsis-1">{{item.helpTaskName}}</view> | ||
50 | + </view> | ||
51 | 51 | ||
52 | - <!-- 已完成的颜色nostate --> | ||
53 | - <view class="flex-center width state" wx:if="{{item.status==1}}"> | ||
54 | - <view class="ellipsis-1" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}" data-taskId="{{item.id}}">领取礼包</view> | ||
55 | - </view> | ||
56 | - <view class="flex-center width state" wx:if="{{item.status==0}}"> | ||
57 | - <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view> | ||
58 | - </view> | ||
59 | - <view class="flex-center width state" wx:if="{{item.status==2}}"> | ||
60 | - <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view> | ||
61 | - </view> | 52 | + <!-- 已完成的颜色nostate --> |
53 | + <view class="flex-center width state" wx:if="{{item.status==1}}"> | ||
54 | + <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}">领取礼包</view> | ||
55 | + </view> | ||
56 | + <view class="flex-center width state" wx:if="{{item.status==0}}"> | ||
57 | + <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view> | ||
58 | + </view> | ||
59 | + <view class="flex-center width state" wx:if="{{item.status==2}}"> | ||
60 | + <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view> | ||
61 | + </view> | ||
62 | 62 | ||
63 | - </view> | 63 | + </view> |
64 | </view> | 64 | </view> |
65 | <!-- 加载更多 --> | 65 | <!-- 加载更多 --> |
66 | <block wx:if="{{is_show_more==0}}"> | 66 | <block wx:if="{{is_show_more==0}}"> |