Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents bc8ab39f 19a48f7a
Showing 14 changed files with 305 additions and 309 deletions
pages/user/assistance/assistance.js
pages/user/assistance/assistance.json
pages/user/assistance/assistance.wxml
pages/user/assistance/assistance_success.json
pages/user/assistance/friend_assistance.json
pages/user/assistance/friend_assistance.wxml
pages/user/assistance/giftpacklist.js
pages/user/assistance/giftpacklist.json
pages/user/assistance/giftpacklist.wxml
pages/user/assistance/giftpacklist.wxss
pages/user/assistance/task_assistance.js
pages/user/assistance/task_assistance.json
pages/user/assistance/task_assistance.wxml
pages/user/assistance/task_assistance.wxss
@@ -6,7 +6,9 @@ var t = getApp(),
   ut = i,
   s = require("../../../utils/common.js");
 var regeneratorRuntime = require('../../../utils/runtime.js');
-var oo = t.globalData.setting,os=oo, ut= require("../../../utils/util.js");
+var oo = t.globalData.setting,
+  os = oo,
+  ut = require("../../../utils/util.js");
 Page({
   /**
@@ -22,10 +24,10 @@ Page({
     cur_page: 1, //页码
     page_num: 5, //每页多少个
     is_show_more: 0, //是否加载更多
-    help_id:"",//助力活动的id
-    timer:"",//任务列表的定时器
-	  s_num:"",//多少人已经领取任务
-    page:1,//我的任务的当前页
+    help_id: "", //助力活动的id
+    timer: "", //任务列表的定时器
+    s_num: "", //多少人已经领取任务
+    page: 1, //我的任务的当前页
   },
   /**
@@ -36,79 +38,85 @@ Page({
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.set_name("助力", "/pages/user/assistance/assistance");
     // 助力活动
-    this.assistance();
+    th.assistance();
   },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
- 
+
   },
   // 助力活动
-   assistance() {
-    var th=this;
+  assistance() {
+    var th = this;
     var user_id = getApp().globalData.user_id;
     var store_id = os.stoid;
-   
     getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
+      isShowLoading: true,
       data: {
         storeId: store_id,
         userId: user_id
       }
     }).then(res => {
       if (res.data.code == 0) {
-        var help_data=res.data.data;
-        th.setData({ zl_act:help_data, help_id:help_data.id });  
-        if (th.data.help_id != "" && th.data.help_id!=null) {
-           //我的任务
+        var help_data = res.data.data;
+        help_data.remark = help_data.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"');
+        th.setData({
+          zl_act: help_data,
+          help_id: help_data.id
+        });
+        if (th.data.help_id != "" && th.data.help_id != null) {
+          //我的任务
           th.get_list();
-         }
-       
-		return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
-		    data: {
-		      helpId: help_data.id, storeId: store_id
-		    }
-		  })
-
+        }
+        return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
+          isShowLoading: true,
+          data: {
+            helpId: help_data.id,
+            storeId: store_id
+          }
+        })
       }
-	  return ut.null_promise();	   
-    }).then(res=>{
-		if(res.data.code==0)
-	     	th.setData({s_num:res.data.data.countAll})
-	})
-	
-	
+      return ut.null_promise();
+    }).then(res => {
+      if (res.data.code == 0)
+        th.setData({
+          s_num: res.data.data.countAll
+        })
+    })
+
+
   },
   //--点击获取用户任务列表--会员的任务列表
-  get_list:function() {
-  
+  get_list: function() {
+
     var th = this;
-    var page=th.data.page;
-    var help_id=this.data.help_id;
+    var page = th.data.page;
+    var help_id = this.data.help_id;
     t.request.get("/api/weshop/marketing/help/help/user/page", {
+      isShowLoading: true,
       data: {
-        userId:getApp().globalData.user_id,
+        userId: getApp().globalData.user_id,
         storeId: os.stoid,
         helpId: help_id,
         page: page,
-        pageSize:5
+        pageSize: 5
       },
       success: function(res) {
         clearTimeout(th.data.timer);
-        
-        if (!th.data.is_load) 
-        th.setData({
-          is_load: 1
-        })
-     
-      
+
+        if (!th.data.is_load)
+          th.setData({
+            is_load: 1
+          })
+
         if (res.data.code == 0) {
-         
+
           var list = th.data.zl_user_list;
           //连接数组	
-          list = list.concat(res.data.data.pageData); 
+          list = list.concat(res.data.data.pageData);
           th.setData({
             zl_user_list: list,
             is_load: 1,
@@ -117,20 +125,19 @@ Page({
             th.setData({
               is_show_more: 1
             })
-          }else{
+          } else {
             var page = th.data.page + 1;
             th.setData({
               is_show_more: 0,
               page: page
             })
           }
-         
         } else {
-        
-          getApp().showWarning("暂无更多内容",0);
+
+          getApp().showWarning("暂无更多内容", 0);
           th.setData({
             is_show_more: 1,
-             page: page
+            page: page
           })
         }
@@ -140,11 +147,11 @@ Page({
   //-----跳转到领取礼包的页面------
   go_task: function() {
-   
-    var help_id=this.data.help_id;
-    getApp().goto("/pages/user/assistance/task_assistance?help_id="+help_id);
+    var th = this;
+    var help_id = th.data.help_id;
+    getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id);
   },
-  switch_head: function (e) {
+  switch_head: function(e) {
     var th = this;
     var index = e.currentTarget.dataset.index; //获取当前选择的是任务还是活动说明
     var switch_head = th.data.switch_head; //0任务，1活动说明
@@ -156,22 +163,22 @@ Page({
   },
   //关闭导航
-  close: function () {
+  close: function() {
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
   },
+
   // 领取礼包
-  get_libao:function(e){
-    var libao_id=e.currentTarget.dataset.libaoid;
-    var completeid= e.currentTarget.dataset.completeid;
-    
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&completeid=" + completeid);    
+  get_libao: function(e) {
+    var libao_id = e.currentTarget.dataset.libaoid;
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1);
   },
+
   //查看礼包id
-  select_libao:function(){
-    var libao_id = e.currentTarget.dataset.libaoid;
-    var ordersn = e.currentTarget.dataset.orderid;
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 0 + "&ordersn=" + ordersn );    
+  select_libao: function() {
+    var orderSn = e.currentTarget.dataset.orderSn;//订单号
+    getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
   }
+
 })
 \ No newline at end of file
 {
   "navigationBarTitleText": "好友助力,得好礼",
-  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
@@ -8,7 +8,7 @@
       <view class="flex-center">
         <image class="getgift" src="{{iurl+'miniapp/images/friendhelp/getgift.png'}}" lazy-load="true"></image>
       </view>
-      <view class="flex-center fs32"> 
+      <view class="flex-center fs32">
         <view class="excitation">机会总是留给最有行动力的人</view>
       </view>
       <view class="flex-center">
@@ -48,31 +48,30 @@
             <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-completeid="{{item.id}}" >领取礼包</view>
+              <view class="ellipsis-1" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包</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 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-orderid="{{item.ordersn}}" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</view>
-			</view>
-			
-			
+
+
           </view>
           <!-- 加载更多 -->
-           <block wx:if="{{is_show_more==0}}">
-          <view class="fs28 flex-center">
-            <view class="line"></view>
-            <view class="load" bindtap="get_list">点击加载更多</view>
-            <view class="line"></view>
-          </view>
-             </block>
+          <block wx:if="{{is_show_more==0}}">
+            <view class="fs28 flex-center">
+              <view class="line"></view>
+              <view class="load" bindtap="get_list">点击加载更多</view>
+              <view class="line"></view>
+            </view>
+          </block>
         </view>
-      
+
         <view class="fs30" style="margin-top: 30rpx;">
           <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}">
@@ -93,11 +92,14 @@
       <view wx:if="{{switch_head}}" class="white">
         <view class="items">
           <view class="content fs28 padding">
-            <!-- <view>{{zl_act.remark}}</view> -->
-            <rich-text nodes="{{zl_act.remark}}"></rich-text>
+            <block wx:if="{{zl_act.remark!=''}}">
+              <rich-text nodes="{{zl_act.remark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
+            </block>
+            <block wx:else>
+              <view>暂无活动说明</view>
+            </block>
           </view>
         </view>
-
       </view>
     </view>
 {
   "navigationBarTitleText": "好友助力,得好礼",
-  "navigationStyle": "custom",
   "usingComponents": {
       "warn": "/components/long_warn/long_warn",
       "my_confirm": "/components/my_confirm/my_confirm",
 {
   "navigationBarTitleText": "好友助力,得好礼",
-  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
 <wxs module="filter" src="c_filter.wxs"></wxs>
 <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)">
   <view class="flex-vertical user_assis">
-    <image class="circle user_img" src="{{user.head_pic}}"></image>
+    <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  class="caption_title white fs32 t-c">
@@ -9,7 +9,7 @@
   </view>
   <!-- 礼包图片 -->
 <view class="t-c">
-<image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png">
+<image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png" lazy-load="true">
 </image>
 </view>
     <view class="flex jc-center">
@@ -10,7 +10,6 @@ Page({
     url: a.url, //接口网址
     iurl: a.imghost, //图片前缀网址
     isBuy: 0,
-    getGiftID: '', //礼包id
     giftImage: '',
     giftTitle: '',
     giftDate: '',
@@ -29,39 +28,47 @@ Page({
     c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
     is_lb: 0, //是否有礼包
     receiveState: 0, //0未领取  1已领取
-    completeid: "",
     is_sub: 0, //判断是否重复提交
     is_libao: 0, //0轮播查看活动   1领取礼包 2.查看礼包详情
     held_id: "", //活动id
     taskId: "", //任务id
     orderSn: "", //订单号
+    is_type:"",//类型 0.轮播过来的 1.领取礼包过来的  2.查看礼包过来的
+    is_head:0,//数据是否加载完成
+    giftBagId:"",//礼包id
   },
   onLoad: function(options) {
     var th = this;
     if (options.is_libao == 0) {
       th.setData({
-        held_id: options.help_id, //options.help_id
-        taskId: options.taskId, //options.libao_id
+        held_id: options.help_id, 
+        taskId: options.taskId, 
+        is_type:0
       })
       th.help();
     }
     if (options.is_libao == 1) {
       th.setData({
-        taskId: options.libao_id,
-        held_id: options.held_id
+        giftBagId: options.libao_id,
+        is_type: 1
       })
       th.GetBuyGiftList();
     }
     if (options.order_sn) {
       th.setData({
-        orderSn: options.orderSn
+        orderSn: options.orderSn,
+        is_type: 2
       })
       th.GetMyGiftList();
     }
-    th.close();
   },
   onShow: function() {
-
+    var th = this;
+    var is_read = th.data.is_read;
+    if (is_read){
+      var nav_b = th.selectComponent("#nav_b"); //组件的id
+      nav_b.set_name("助力", "/pages/user/assistance/assistance");
+    }
   },
   //助力活动查看礼包详情调用
   help: function(e) {
@@ -78,7 +85,8 @@ Page({
       if (res.data.code == 0) {
         th.setData({
           giftImage: th.data.iurl + res.data.data.lbUrl,
-          giftTitle: res.data.data.giftTitle
+          giftTitle: res.data.data.giftTitle,
+          is_head:1
         })
         if (res.data.data.giftRemark == '') {
           th.setData({
@@ -90,22 +98,7 @@ Page({
           })
         }
-        // //---获取日期的时间戳---
-        // var t_endtime = res.data.data.endTime;
-        // t_endtime = t_endtime.replace(/-/g, '/');
-        // var t_date = new Date(t_endtime) / 1000;
-        // var t_now = ut.gettimestamp();
-
-        // if (res.data.data.goodsUseState) th.setData({
-        //   c_state: 1
-        // })
-        // else if (t_date <= t_now)
-        //   th.setData({
-        //     c_state: 2
-        //   })
-
         th.setData({
-          giftDate: res.data.data.endTime,
           giftPosPrice: res.data.data.giftPosPrice,
           giftQty: res.data.data.giftQty,
           giftIntegral: res.data.data.payIntegral,
@@ -145,7 +138,8 @@ Page({
         if (res.data.code == 0) {
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
-            giftTitle: res.data.data.giftTitle
+            giftTitle: res.data.data.giftTitle,
+            is_head:1
           })
           if (res.data.data.giftRemark == '') {
             th.setData({
@@ -210,9 +204,9 @@ Page({
         is_sub: 1
       })
       var json = {
-        "actId": th.data.completeid, //活动Id
+        "actId": th.data.held_id, //活动Id
         "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-        "giftBagId": th.data.giftID, //礼包Id
+        "giftBagId": th.data.giftBagId, //礼包Id
         "storeId": a.stoid, //商家Id
         "userId": d.user_id //用户ID
       };
@@ -248,13 +242,14 @@ Page({
       data: {
         "storeId": a.stoid, //商家ID
         "userId": d.user_id, //用户ID
-        "giftBagId": th.taskId
+        "giftBagId": th.giftBagId
       },
       success: function(res) {
         if (res.data.code == 0) {
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
-            giftTitle: res.data.data.giftTitle
+            giftTitle: res.data.data.giftTitle,
+            is_head:1
           })
           if (res.data.data.giftRemark == '') {
@@ -267,7 +262,6 @@ Page({
             })
           }
           _this2.setData({
-            giftDate: res.data.data.endTime,
             giftPosPrice: res.data.data.giftPosPrice,
             giftQty: res.data.data.giftQty,
             giftIntegral: res.data.data.payIntegral,
@@ -345,6 +339,5 @@ Page({
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
-    nav_b.set_name("礼包", "/pages/giftpack/buygiftpack/giftpackbuy");
   }
 });
 \ No newline at end of file
 {
-  "navigationBarTitleText": "助力详情",
+  "navigationBarTitleText": "礼包详情",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
-<view class="box data-v-3a5b7e36">
+<view wx:if="{{is_head}}" class="box data-v-3a5b7e36" bindtap="close">
   <view class="box_top data-v-3a5b7e36">
     <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="giftImage"></image>
   </view>
@@ -6,7 +6,7 @@
     <view class="top_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
-    <view wx:if="{{giftDate}}" class="top_time data-v-3a5b7e36">
+    <view wx:if="{{giftDate!=''}}" class="top_time data-v-3a5b7e36">
       <text class="data-v-3a5b7e36">{{"兑换截至时间："+giftDate}}</text>
     </view>
     <view class="top_price data-v-3a5b7e36">
@@ -65,27 +65,30 @@
           <view class="box_ware_item_qty data-v-3a5b7e36">
             <text class="data-v-3a5b7e36 ellipsis-1">{{"数量:"+item.num}}</text>
           </view>
-          <view class="box_ware_code data-v-3a5b7e36">
-            <block wx:if="{{c_state==0}}">
-              <block wx:if="{{item.lbType==1}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
+          <!-- 已完成方可显示 -->
+          <block wx:if="{{is_type==2}}">
+            <view class="box_ware_code data-v-3a5b7e36">
+              <block wx:if="{{c_state==0}}">
+                <block wx:if="{{item.lbType==1}}">
+                  <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
+                </block>
               </block>
-            </block>
-            <block wx:else>
-              <block wx:if="{{isBuy==0&item.lbType==1}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image>
+              <block wx:else>
+                <block wx:if="{{isBuy==0&item.lbType==1}}">
+                  <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image>
+                </block>
               </block>
-            </block>
-            <block wx:if="{{item.lbType==2}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
-            </block>
-            <block wx:if="{{item.lbType==3}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
-            </block>
-            <block wx:if="{{item.lbType>3}}">
-              <text class="data-v-3a5b7e36">奖励已发放</text>
-            </block>
-          </view>
+              <block wx:if="{{item.lbType==2}}">
+                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
+              </block>
+              <block wx:if="{{item.lbType==3}}">
+                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
+              </block>
+              <block wx:if="{{item.lbType>3}}">
+                <text class="data-v-3a5b7e36">奖励已发放</text>
+              </block>
+            </view>
+          </block>
         </view>
       </view>
     </block>
@@ -99,21 +102,14 @@
     </view>
   </view>
   <view class="foot_empty data-v-3a5b7e36"></view>
-  <block wx:if="{{isBuy==0}}">
-    <view class="foot_button data-v-3a5b7e36">
-      <block wx:if="{{true}}">
-        <block wx:if="{{receiveState}}">
-          <view class="foot_button_buy data-v-3a5b7e36 overdue">
-            <text class="data-v-3a5b7e36">已领取</text>
-          </view>
-        </block>
-        <block wx:else>
-          <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetReceive">
-            <text class="data-v-3a5b7e36">一键全部领取</text>
-          </view>
-        </block>
+  <view class="foot_button data-v-3a5b7e36">
+    <block wx:if="{{is_type!=0}}">
+      <block wx:if="{{is_type==1}}">
+        <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetReceive">
+          <text class="data-v-3a5b7e36">一键全部领取</text>
+        </view>
       </block>
-      <block wx:else>
+      <block wx:if="{{is_type==2}}">
         <block wx:if="{{is_lb!=1}}">
           <view class="foot_button_buy data-v-3a5b7e36 overdue">
             <text class="data-v-3a5b7e36">无核销商品</text>
@@ -131,8 +127,13 @@
           </view>
         </block>
       </block>
-    </view>
-  </block>
+    </block>
+    <block wx:else>
+      <view class="foot_button_buy data-v-3a5b7e36" bindtap="goto" data-url="/pages/index/index/index">
+        <text class="data-v-3a5b7e36">回到首页</text>
+      </view>
+    </block>
+  </view>
 </view>
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
@@ -140,4 +141,4 @@
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
 \ No newline at end of file
+<nav_b wx:if="{{is_head}}" id="nav_b"></nav_b>
 \ No newline at end of file
- @charset "UTF-8";
+@charset "UTF-8";
 /* Author XGQ
  * 2019-12-12
@@ -96,6 +96,7 @@
   border: 2rpx solid #999;
   width: 120rpx;
   height: 120rpx;
+  /* background-color: rgba(153, 153, 153, 0.664); */
 }
 .box_ware_item.data-v-3a5b7e36 {
@@ -239,6 +240,7 @@ page.data-v-3a5b7e36 {
 .foot_box_remark.data-v-3a5b7e36 .img {
   line-height: 0;
 }
-.overdue.data-v-3a5b7e36{
-  background-color: rgb(153,153,153);
-}
 \ No newline at end of file
+
+.overdue.data-v-3a5b7e36 {
+  background-color: rgb(153, 153, 153);
+}
@@ -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) {
 {
   "navigationBarTitleText": "好友助力,得好礼",
-  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
- <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>
-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
+}