diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 7d50b95..3c3a274 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -59,8 +59,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    var help_id = options.help_id;
     var th = this;
+    var help_id = options.help_id;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.set_name("助力", "/pages/user/assistance/assistance");
     th.setData({
       help_id: help_id
     });
@@ -179,7 +181,6 @@ Page({
           });
           var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty;
           var taskid = data_aissa[0].id;
-          console.log("参考", data_aissa);
           th.setData({
             aitem: data_aissa,
             task_number: task_number,
@@ -248,7 +249,7 @@ Page({
               is_bc_show:1
             })
           }else{
-            getApp().showWarning("暂无更多内容", 0);
+            getApp().showWarning("暂无更多内容", 0,th);
           }
          
           th.setData({
@@ -265,15 +266,13 @@ Page({
   },
   // 领取礼包
   get_libao: function(e) {
-    var libao_id = e.currentTarget.dataset.libaoid;
-    var completeid = e.currentTarget.dataset.completeid;
-    console.log("礼包id", libao_id);
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&completeid=" + completeid);
+    var libao_id = e.currentTarget.dataset.libaoid;//礼包id
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1);
   },
   //查看礼包id
-  select_libao: function() {
-    var libao_id = e.currentTarget.dataset.libaoid;
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 0);
+  select_libao: function(e) {
+    var orderSn = e.currentTarget.dataset.orderSn;
+    getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
   },
 
   //划动的时候监听
@@ -283,8 +282,6 @@ Page({
     var aitem = this.data.aitem;
     var task_number = aitem[ind].giftQty - aitem[ind].useGiftQty;
     var task_id = aitem[ind].id;
-    console.log("划动的任务总数", task_number, "任务所有的参数", aitem,
-      "任务id", task_id);
     th.setData({
       sw_index: ind,
       task_number: task_number,
@@ -304,7 +301,6 @@ Page({
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
-    nav_b.set_name("助力", "/pages/user/assistance/assistance");
   },
   // 获取会员的参与的任务列表 我的任务
   user_task_list: function(e) {
@@ -340,6 +336,7 @@ Page({
               rw_page: rw_page,
               is_show: 1
             })
+            getApp().my_warnning();
             getApp().showWarning("暂无更多内容", 0);
           }else{
             var rw_page = th.data.rw_page + 1;
@@ -389,7 +386,6 @@ Page({
         storeId: os.stoid,
       },
       success: function(su) {
-        console.log(su.data.code, "获取助力活动参与的人数", su.data)
         if (su.data.code == 0) {
           var usercount = su.data.data.countAll;
 
@@ -413,7 +409,6 @@ Page({
           swiperError: swiperError
         })
         if (swiperError >= 3) { //在开关被触发3次以上
-          console.error(this.data.swiperError)
           this.setData({
             sw_index: this.data.preIndex
           }); //，重置current为正确索引
@@ -504,7 +499,6 @@ Page({
 
     // var o = endTimeList[i];
     var endTime = th.data.endDate;
-    console.log("结束时间5555555", endTime);
     // if (o.status == 0) endTime = o.start_time
 
     var obj = null;
@@ -590,90 +584,75 @@ Page({
     wx.getImageInfo({
       src: iurl + images[0],
       success: function(res) {
-        console.log(res + i);
         //res.path是网络图片的本地地址
         images[0] = res.path;
       },
       fail: function(res) {
-        console.log(res.toString() + "" + i);
       }
     });
     wx.getImageInfo({
       src: iurl + images[1],
       success: function(res) {
-        console.log(res + i);
         //res.path是网络图片的本地地址
         images[1] = res.path;
       },
       fail: function(res) {
-        console.log(res.toString() + "" + i);
       }
     });
     wx.getImageInfo({
       src: iurl + images[2],
       success: function(res) {
-        console.log(res + i);
         //res.path是网络图片的本地地址
         images[2] = res.path;
       },
       fail: function(res) {
-        console.log(res.toString() + "" + i);
+
       }
     });
     wx.getImageInfo({
       src: iurl + images[3],
       success: function(res) {
-        console.log(res + i);
         //res.path是网络图片的本地地址
         images[3] = res.path;
       },
       fail: function(res) {
-        console.log(res.toString() + "" + i);
       }
     });
     wx.getImageInfo({
       src: iurl + images[4],
       success: function(res) {
-        console.log(res + i);
         //res.path是网络图片的本地地址
         images[4] = res.path;
       },
       fail: function(res) {
-        console.log(res.toString() + "" + i);
       }
     });
     wx.getImageInfo({
       src: iurl + images[5],
       success: function(res) {
-        console.log(res + i);
         //res.path是网络图片的本地地址
         images[5] = res.path;
       },
       fail: function(res) {
-        console.log(res.toString() + "" + i);
       }
     });
     wx.getImageInfo({
       src: iurl + images[6],
       success: function(res) {
-        console.log(res + i);
         //res.path是网络图片的本地地址
         images[6] = res.path;
       },
       fail: function(res) {
-        console.log(res.toString() + "" + i);
       }
     });
 
     wx.getImageInfo({
       src: iurl + images[7],
       success: function(res) {
-        console.log(res + i);
         //res.path是网络图片的本地地址
         images[7] = res.path;
       },
       fail: function(res) {
-        console.log(res.toString() + "" + i);
       }
     })
     th.setData({
@@ -734,7 +713,6 @@ Page({
       ctx.drawImage(images[2], 65 * unit, 445 * unit, 320 * unit, 12 * unit);
       ctx.drawImage(images[3], 65 * unit, 445 * unit, 320 * unit * c, 12 * unit);
       //  var dynamic = th.data.dynamic; //助力的微信头像
-      // console.log(dynamic[0].headPic + "动态图片显示");
       for (var i = 0; i < 6; i++) {
         if (i < 0) {
           // ctx.beginPath();
@@ -960,7 +938,6 @@ Page({
     var th = this;
     var images = th.data.dynamic;
     if (images[0] != null && images[0] != "" && images[0] != undefined) {
-      console.log(images[0].headPic + "就将计就计");
       wx.getImageInfo({
         src: images[0].headPic,
         success: function(res) {
diff --git a/pages/user/assistance/task_assistance.json b/pages/user/assistance/task_assistance.json
index 63f5fe9..b1940cd 100644
--- a/pages/user/assistance/task_assistance.json
+++ b/pages/user/assistance/task_assistance.json
@@ -1,6 +1,5 @@
 {
   "navigationBarTitleText": "好友助力,得好礼",
-  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 22495c6..d4f70be 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -1,13 +1,19 @@
- <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
-<view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)">
+<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+<view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
   <!-- 助力活动头部 -->
   <view class="top-frame">
-    <view class="top-title white fs36 t-c">
-      {{aitem[sw_index].helpTaskName}}
+    <view class="flex-center">
+      <view class="top-title white fs36 t-c ellipsis-1">
+        {{aitem[sw_index].helpTaskName}}
+      </view>
     </view>
     <view class="activity-data t-c fs28  white">
-      活动剩余时间:<text class='tui-conutdown-box'> {{aitem[0].djs.day}}</text>:<text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:<text class='tui-conutdown-box'>{{aitem[0].djs.min}}</text>:<text class='tui-conutdown-box tui-countdown-bg'>{{aitem[0].djs.sec}}</text>
-    </view> 
+      活动剩余时间:
+      <text class='tui-conutdown-box'> {{aitem[0].djs.day}}</text>:
+      <text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:
+      <text class='tui-conutdown-box'>{{aitem[0].djs.min}}</text>:
+      <text class='tui-conutdown-box tui-countdown-bg'>{{aitem[0].djs.sec}}</text>
+    </view>
   </view>
   <!-- 图片的轮播图 -->
   <view class="xc-specific-more-frame flex-center">
@@ -16,10 +22,10 @@
     </view>
     <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
       <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
-   
+
         <image class="xc-center-img" bindtap="libao_details" src="{{iurl+aitem.giftBagUrl}}"></image>
-      <view class="abs select_details fs26 white">礼包详情</view>
-     
+        <view class="abs select_details fs26 white">礼包详情</view>
+
       </swiper-item>
     </swiper>
 
@@ -28,25 +34,25 @@
     </view>
   </view>
   <view class="plan-frame flex ai-center" wx:if="{{is_user_task}}">
-	  <view class="plan_num rel">
-		  <view class="is_plam abs" style="width:{{(is_user_task.zlHelpNum/is_user_task.helpNum)*100}}%"></view>
-	  </view>
-  
+    <view class="plan_num rel">
+      <view class="is_plam abs" style="width:{{(is_user_task.zlHelpNum/is_user_task.helpNum)*100}}%"></view>
+    </view>
+
+
+    <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
 
-	  <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
-	  
   </view>
   <view class="task-number fs28   white t-c ">
     今天剩余可领{{task_number}}个任务
   </view>
 
-  <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}"  bindtap="add_onlicke">
+  <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}}" 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}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}"  bindtap="test">
     测试专用
   </view> -->
 
@@ -67,66 +73,65 @@
   </view>
 
   <view class="white">
- 
+
     <view class="items" wx:if="{{is_task==0}}">
-  
-      <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}"wx:key="*this">
+
+      <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}}
           </view>
         </view>
         <view class="flex-center width state">
           <view class="ellipsis-1">
-          <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
-           <text wx:if="{{item.status==2}}"bindtap="select_libao" data-libaoid="{{item.order_sn}}">查看礼包</text>
-            <text wx:if="{{item.status==1}}"bindtap="get_libao"data-orderid="{{item.ordersn}}" data-libaoid="{{item.helpListGiftBagId}}"
-              data-completeid="{{item.id}}">领取礼包 </text>
+            <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
+            <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 class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
-    <view class="flex-center nothing white">
-      <view>暂无任务记录</view>
-    </view>
-  </view>
+        <view class="flex-center nothing white">
+          <view>暂无任务记录</view>
+        </view>
+      </view>
     </view>
 
-    
+
   </view>
- 
+
 
   <view class="items" wx:if="{{is_task==1}}">
-  <block wx:if="{{ dismantle!=null|| dismantle!=''}}">
+    <block wx:if="{{ dismantle!=null|| dismantle!=''}}">
 
 
-    <view class="item fs26 flex flex-vertical-between padding" wx:for="{{dismantle}}"wx:for-index="idx">
-     
-      <view class="flex white" style="justify-content: space-around; width: 90%;margin:auto">
-        <image class="circle user_img" src="{{item.headPic}}"></image>
-        <view class="ellipsis-1">{{item.nickName}}
-        </view>
-        <view class="ellipsis-1">{{filter.format_time(item.zltime)}}
+      <view class="item fs26 flex flex-vertical-between padding" wx:for="{{dismantle}}" wx:for-index="idx">
+
+        <view class="flex white" style="justify-content: space-around; width: 90%;margin:auto">
+          <image class="circle user_img" src="{{item.headPic}}"></image>
+          <view class="ellipsis-1">{{item.nickName}}
+          </view>
+          <view class="ellipsis-1">{{filter.format_time(item.zltime)}}
+          </view>
         </view>
       </view>
-    </view>
 
-     <view class="flex-center fs32" wx:if="{{is_bc_show==1}}">
-    <view class="line"></view>
-    <view class="load  white" bindtap="dismantle_record">点击加载更多</view>
-    <view class="line"></view>
-  </view>
-  </block>
-  
-   <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
-    <view class="flex-center nothing white">
-      <view>暂无任务记录</view>
+      <view class="flex-center fs32" wx:if="{{is_bc_show==1}}">
+        <view class="line"></view>
+        <view class="load  white" bindtap="dismantle_record">点击加载更多</view>
+        <view class="line"></view>
+      </view>
+    </block>
+
+    <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
+      <view class="flex-center nothing white">
+        <view>暂无任务记录</view>
+      </view>
     </view>
+
   </view>
- 
-  </view>
- 
+
 
 </view>
 <!-- 加载更多 -->
@@ -145,14 +150,14 @@
 
 
 <!--********** 钱巧玲 -->
-<view wx:if="{{is_share}}" >
+<view wx:if="{{is_share}}">
 
   <view class="dust"></view>
   <view class="canvas" style="width:100%;">
     <view class="flex-center">
       <canvas canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas>
     </view>
-    <view  class="closes flex-center">
+    <view class="closes flex-center">
       <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image>
     </view>
   </view>
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index 30aeed1..d921f10 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -1,52 +1,56 @@
-page{
+page {
   background: #d01119;
   width: 100%;
-  height: 100%
-
+  height: 100%;
 }
-.top-back{
+
+.top-back {
   width: 100%;
   height: 60%;
-  background-repead:no-repead;
-  background-size:100% 100%;
-  
+  background-repead: no-repead;
+  background-size: 100% 100%;
 }
-.top-frame{
+
+.top-frame {
   width: 100%;
   height: auto;
-  padding-top: 50rpx
+  padding-top: 50rpx;
 }
-.top-title{
-  letter-spacing:10rpx
+
+.top-title {
+  letter-spacing: 10rpx;
+  width: 300rpx;
 }
-.activity-data{
+
+.activity-data {
   padding-top: 10rpx;
   letter-spacing: 10rpx;
-
 }
-.xc-specific-more-frame{
+
+.xc-specific-more-frame {
   width: 100%;
   height: 40%;
-
   margin-top: 20rpx;
 }
-.task-number{
-  margin-top: 50rpx
+
+.task-number {
+  margin-top: 50rpx;
 }
-.task_clike{
+
+.task_clike {
   margin: auto;
   width: 60%;
   height: 65rpx;
   border-radius: 50rpx;
   margin-top: 20rpx;
   background: #fbda0e;
-  color:#d01119; 
+  color: #d01119;
   line-height: 65rpx;
   letter-spacing: 5rpx;
-   box-shadow: 0rpx 7rpx 0rpx 0rpx rgb(245, 119, 6);
+  box-shadow: 0rpx 7rpx 0rpx 0rpx rgb(245, 119, 6);
 }
-/* 底部列表样式 */
 
+/* 底部列表样式 */
 
 .head {
   border-bottom: 4rpx solid rgb(253, 193, 7);
@@ -73,7 +77,7 @@ page{
 }
 
 .unfinished {
-  width:35rpx;
+  width: 35rpx;
   height: 35rpx;
   margin-right: 10rpx;
 }
@@ -110,27 +114,31 @@ page{
 .receive {
   padding-bottom: 50rpx;
 }
-.xc-center-img{
+
+.xc-center-img {
   width: 100%;
-  height: 100%
+  height: 100%;
 }
 
-.xc-left{
+.xc-left {
   width: 40rpx;
   height: 40rpx;
 }
-.bcolor {
-border-color: #fff;
 
+.bcolor {
+  border-color: #fff;
 }
-.xc-right{
+
+.xc-right {
   width: 40rpx;
   height: 40rpx;
 }
-.user_img{
+
+.user_img {
   width: 50rpx;
-  height: 50rpx; 
+  height: 50rpx;
 }
+
 .dust {
   position: fixed;
   width: 100%;
@@ -140,40 +148,43 @@ border-color: #fff;
 }
 
 .closes {
- margin-top: 20rpx;
+  margin-top: 20rpx;
 }
 
 .canvas {
   position: fixed;
   z-index: 11;
   width: 100%;
-  top:20rpx;
+  top: 20rpx;
 }
 
 .close {
   width: 70rpx;
   height: 70rpx;
 }
-.plan-frame{
-	width: 86%;
-	margin: auto;
+
+.plan-frame {
+  width: 86%;
+  margin: auto;
   margin-top: 50rpx;
-	
 }
-.plan-frame .plan_num{
-	width: 90%;
-	background: #ffe7ab;
-	border-radius: 20rpx;
-	height: 22rpx;
+
+.plan-frame .plan_num {
+  width: 90%;
+  background: #ffe7ab;
+  border-radius: 20rpx;
+  height: 22rpx;
   margin-right: 10rpx;
 }
-.is_plam{
-  	border-radius: 20rpx;
+
+.is_plam {
+  border-radius: 20rpx;
   background: #fcc001;
-	height: 100%;
-	top: 0rpx;
-	left: 0rpx;
+  height: 100%;
+  top: 0rpx;
+  left: 0rpx;
 }
+
 .dust {
   position: fixed;
   width: 100%;
@@ -183,26 +194,28 @@ border-color: #fff;
 }
 
 .closes {
- margin-top: 20rpx;
+  margin-top: 20rpx;
 }
 
 .canvas {
   position: fixed;
   z-index: 20;
   width: 100%;
-  top:20rpx;
+  top: 20rpx;
 }
 
 .close {
   width: 70rpx;
   height: 70rpx;
 }
-.select_details{
+
+.select_details {
   width: 100%;
   height: 50rpx;
   line-height: 50rpx;
   text-align: center;
-    background: #000;
-    opacity:0.6; filter: alpha(opacity=60);
+  background: #000;
+  opacity: 0.6;
+  filter: alpha(opacity=60);
   bottom: 0rpx;
-}
\ No newline at end of file
+}