Commit ffe52f369e55075a212ddc64d9e7feecda639263
1 parent
921a3ab3
助力活动首页界面优化
Showing
3 changed files
with
10 additions
and
8 deletions
pages/user/assistance/assistance.js
| @@ -131,8 +131,7 @@ Page({ | @@ -131,8 +131,7 @@ Page({ | ||
| 131 | }) | 131 | }) |
| 132 | } | 132 | } |
| 133 | } else { | 133 | } else { |
| 134 | - console.log("是什么鬼",res.data.msg); | ||
| 135 | - getApp().my_warnning(res.data.msg,0,th); | 134 | + getApp().my_warnning(res.data.msg, 0, th); |
| 136 | th.setData({ | 135 | th.setData({ |
| 137 | is_show_more: 1, | 136 | is_show_more: 1, |
| 138 | page: page | 137 | page: page |
| @@ -170,12 +169,13 @@ Page({ | @@ -170,12 +169,13 @@ Page({ | ||
| 170 | // 领取礼包 | 169 | // 领取礼包 |
| 171 | get_libao: function(e) { | 170 | get_libao: function(e) { |
| 172 | var libao_id = e.currentTarget.dataset.libaoid; | 171 | var libao_id = e.currentTarget.dataset.libaoid; |
| 173 | - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1); | 172 | + var taskId = e.currentTarget.dataset.taskid;//任务id |
| 173 | + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskId); | ||
| 174 | }, | 174 | }, |
| 175 | 175 | ||
| 176 | //查看礼包id | 176 | //查看礼包id |
| 177 | select_libao: function() { | 177 | select_libao: function() { |
| 178 | - var orderSn = e.currentTarget.dataset.orderSn;//订单号 | 178 | + var orderSn = e.currentTarget.dataset.orderSn; //订单号 |
| 179 | getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn); | 179 | getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn); |
| 180 | } | 180 | } |
| 181 | 181 |
pages/user/assistance/assistance.wxml
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | <view class="flex-center"> | 14 | <view class="flex-center"> |
| 15 | <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image> | 15 | <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image> |
| 16 | </view> | 16 | </view> |
| 17 | - <view 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> |
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | 51 | ||
| 52 | <!-- 已完成的颜色nostate --> | 52 | <!-- 已完成的颜色nostate --> |
| 53 | <view class="flex-center width state" wx:if="{{item.status==1}}"> | 53 | <view class="flex-center width state" wx:if="{{item.status==1}}"> |
| 54 | - <view class="ellipsis-1" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包</view> | 54 | + <view class="ellipsis-1" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}" data-taskId="{{item.id}}">领取礼包</view> |
| 55 | </view> | 55 | </view> |
| 56 | <view class="flex-center width state" wx:if="{{item.status==0}}"> | 56 | <view class="flex-center width state" wx:if="{{item.status==0}}"> |
| 57 | <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view> | 57 | <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view> |
| @@ -78,8 +78,8 @@ | @@ -78,8 +78,8 @@ | ||
| 78 | <view>暂无任务记录</view> | 78 | <view>暂无任务记录</view> |
| 79 | </view> | 79 | </view> |
| 80 | <view class="flex-center receive" wx:if="{{is_load && s_num}}"> | 80 | <view class="flex-center receive" wx:if="{{is_load && s_num}}"> |
| 81 | - <view class="flex-center"> | ||
| 82 | - <view>已有 {{s_num}}人领取了任务</view> | 81 | + <view class="flex-center ai-bas"> |
| 82 | + <view>已有{{s_num}}人领取了任务</view> | ||
| 83 | </view> | 83 | </view> |
| 84 | 84 | ||
| 85 | </view> | 85 | </view> |