助力活动首页界面优化

iceling
1 parent 921a3ab3
Showing 3 changed files with 10 additions and 8 deletions
pages/user/assistance/assistance.js
pages/user/assistance/assistance.wxml
pages/user/assistance/assistance.wxss
@@ -131,8 +131,7 @@ Page({
             })
           }
         } else {
-          console.log("是什么鬼",res.data.msg);
-             getApp().my_warnning(res.data.msg,0,th);
+          getApp().my_warnning(res.data.msg, 0, th);
           th.setData({
             is_show_more: 1,
             page: page
@@ -170,12 +169,13 @@ Page({
   // 领取礼包
   get_libao: function(e) {
     var libao_id = e.currentTarget.dataset.libaoid;
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1);
+    var taskId = e.currentTarget.dataset.taskid;//任务id
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskId);
   },
  
   //查看礼包id
   select_libao: function() {
-    var orderSn = e.currentTarget.dataset.orderSn;//订单号
+    var orderSn = e.currentTarget.dataset.orderSn; //订单号
     getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
   }
  
@@ -14,7 +14,7 @@
       <view class="flex-center">
         <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>
       </view>
-      <view class="flex-center fs26 time">
+      <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">
         <view>活动时间：{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view>
  
       </view>
@@ -51,7 +51,7 @@
  
             <!-- 已完成的颜色nostate -->
             <view class="flex-center width state" wx:if="{{item.status==1}}">
-              <view class="ellipsis-1" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包</view>
+              <view class="ellipsis-1" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}" data-taskId="{{item.id}}">领取礼包</view>
             </view>
             <view class="flex-center width state" wx:if="{{item.status==0}}">
               <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
@@ -78,8 +78,8 @@
             <view>暂无任务记录</view>
           </view>
           <view class="flex-center receive" wx:if="{{is_load && s_num}}">
-            <view class="flex-center">
-              <view>已有 {{s_num}}人领取了任务</view>
+            <view class="flex-center ai-bas">
+              <view>已有{{s_num}}人领取了任务</view>
             </view>
  
           </view>
@@ -116,6 +116,8 @@ page {
  
 .item {
   margin-bottom: 35rpx;
+  display: flex;
+  align-items: baseline;
 }
  
 .state {