diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 6d51dec..e92f55d 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -28,18 +28,20 @@ Page({
 	 */
 	onLoad: function(options) {
 		var th = this;
+   
 		if (options.tasking) this.data.tasking = options.tasking;
 		if (options.userId) this.data.userId = options.userId;
 		//任务是不是为空
 		if (this.data.tasking == 0 || this.data.tasking == undefined) {
       this.data.tasking = decodeURIComponent(options.scene);		
 		}
-
+     
     if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
       0) {
+     
       getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
         data: {
-          id: th.data.tasking,
+          taskingId: th.data.tasking,
           storeId: os.stoid
         }
       }).then(res => {
@@ -97,6 +99,7 @@ Page({
 	cklie_button: function() {
 		var th = this;
 		var t_user_id = app_d.user_id;
+    t_user_id = 1433320;
 		var data = {
 			id: this.data.tasking,
 			storeId: os.stoid,
diff --git a/pages/user/assistance/friend_assistance.wxml b/pages/user/assistance/friend_assistance.wxml
index f9b47ad..1f3ec67 100644
--- a/pages/user/assistance/friend_assistance.wxml
+++ b/pages/user/assistance/friend_assistance.wxml
@@ -3,7 +3,7 @@
   <view class="flex-vertical user_assis">
     <image class="circle user_img" src="{{user.head_pic}}" lazy-load="true"></image>
    <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view>
-  </view>
+  </view>  
   <view  class="caption_title white fs32 t-c">
   拜托拜托，帮我拆礼盒得好礼~
   </view>
@@ -14,7 +14,7 @@
 </view>
     <view class="flex jc-center">
           <view class="activity_time fs24 white">
-             活动时间：{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.beginDate)}}
+             活动时间：{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.endDate)}}
           </view>
     </view>
 </view>
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index bb0c715..106f8d0 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -49,16 +49,21 @@
   <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke">
     就选它了
   </view>
-  <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center" bindtap="save_share">
+  <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share">
     好友拆一拆
   </view>
-  <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}"  bindtap="test" >
-    测试专用
+  <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}" bindtap="redeem_now">
+   立即兑换
+  </view>
+  <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test">
+   <!-- <input placeholder="请输助力用户的id" maxlength="11" bindblur="testinput"></input>
+   <view ></view> -->
+   测试专用
   </view>
 
 </view>
 <!-- 底部列表 -->
-<view style="margin-top:{{is_user_task!=null?130:35}}rpx">
+<view style="margin-top:{{is_user_task!=null?52:0}}rpx">
   <!-- 标题 -->
 
   <view class="flex-vertical-between fs28 padding head">
@@ -73,9 +78,9 @@
   </view>
 
   <view class="white">
-
+  
     <view class="items" wx:if="{{is_task==0}}">
-
+     <view class="tesk_list"> 
       <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}" wx:key="*this">
         <view class="flex-center width">
           <view class="ellipsis-1">{{item.helpTaskName}}
@@ -87,8 +92,8 @@
             <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text>
             <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包 </text>
           </view>
-        </view>
-
+        </view> 
+    </view>
       </view>
 
       <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index 6c55454..d9359e0 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -5,10 +5,15 @@ page {
 
 }
 
-
+.tesk_list{
+  width: 100%;
+  max-height: 335rpx;
+  overflow: hidden;
+  overflow-y:auto;
+}
 .top-back {
   width: 100%;
-  height:70%;
+  height:65%;
   background-repead: no-repead;
   background-size: 100% 100%;
 }