From bbbbe3747855153e4caf2ae929daef3a476c5f6f Mon Sep 17 00:00:00 2001
From: iceling <iceling@meidd.com>
Date: Fri, 17 Jan 2020 19:56:53 +0800
Subject: [PATCH] 助力活动首页领取礼包跳转优化

---
 pages/user/assistance/assistance.js   |  4 ++--
 pages/user/assistance/assistance.wxml | 34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index c19b322..6f22649 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -168,9 +168,9 @@ Page({
 
   // 领取礼包
   get_libao: function(e) {
-    var libao_id = e.currentTarget.dataset.libaoid;
+    var help_id = e.currentTarget.dataset.help_id;
     var taskId = e.currentTarget.dataset.taskid;//任务id
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskId);
+    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId);
   },
 
   //查看礼包id
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index 54b3391..857a981 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -16,7 +16,7 @@
       </view>
       <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>
       <view class="flex-center" bindtap="go_task">
         <view class="flex-center take">
@@ -43,24 +43,24 @@
       <!-- 我的任务 -->
       <view wx:if="{{switch_head==0}}" class="white">
         <view class="items">
-        <view class="tesk_list">
-          <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
-            <view class="flex-center width">
-              <view class="ellipsis-1">{{item.helpTaskName}}</view>
-            </view>
+          <view class="tesk_list">
+            <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
+              <view class="flex-center width">
+                <view class="ellipsis-1">{{item.helpTaskName}}</view>
+              </view>
 
-            <!-- 已完成的颜色nostate -->
-            <view class="flex-center width state" wx:if="{{item.status==1}}">
-              <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>
-            </view>
-            <view class="flex-center width state" wx:if="{{item.status==2}}">
-              <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view>
-            </view>
+              <!-- 已完成的颜色nostate -->
+              <view class="flex-center width state" wx:if="{{item.status==1}}">
+                <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}">领取礼包</view>
+              </view>
+              <view class="flex-center width state" wx:if="{{item.status==0}}">
+                <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
+              </view>
+              <view class="flex-center width state" wx:if="{{item.status==2}}">
+                <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view>
+              </view>
 
-          </view>
+            </view>
           </view>
           <!-- 加载更多 -->
           <block wx:if="{{is_show_more==0}}">
--
libgit2 0.21.4