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

yvan.ni
2 parents c3d3c035 e5a47808
Showing 3 changed files with 39 additions and 27 deletions
pages/user/assistance/assistance.js
pages/user/assistance/assistance.json
pages/user/assistance/assistance.wxml
@@ -24,8 +24,8 @@ Page({
     is_show_more: 0, //是否加载更多
     help_id:"",//助力活动的id
     timer:"",//任务列表的定时器
-	s_num:"",//多少人已经领取任务
-    
+	  s_num:"",//多少人已经领取任务
+    page:1,//我的任务的当前页
   },
  
   /**
@@ -60,7 +60,6 @@ Page({
       if (res.data.code == 0) {
         var help_data=res.data.data;
         th.setData({ zl_act:help_data, help_id:help_data.id });  
-        console.log(th.data.help_id, '数据', res.data);
         if (th.data.help_id != "" && th.data.help_id!=null) {
            //我的任务
           th.get_list();
@@ -84,44 +83,57 @@ Page({
  
   //--点击获取用户任务列表--会员的任务列表
   get_list:function() {
-    console.log("有走这里吗会员任务11111");
+    
+    
     var th = this;
+    var page=th.data.page;
+    console.log("page是什么", page);
     var help_id=this.data.help_id;
     t.request.get("/api/weshop/marketing/help/help/user/page", {
       data: {
         userId:getApp().globalData.user_id,
         storeId: os.stoid,
-        helpId: help_id
+        helpId: help_id,
+        page: page,
+        pageSize:5
       },
       success: function(res) {
         clearTimeout(th.data.timer);
-        console.log("有走这里吗会员任务6666666");
-        // 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 page=th.data.page+1;
           var list = th.data.zl_user_list;
           //连接数组	
           list = list.concat(res.data.data.pageData); 
-          console.log("我的任务数据",list); 
           th.setData({
             zl_user_list: list,
-             is_load: 1,
+            is_load: 1,
+            page: page
           });
-          var n_all_num = th.data.cur_page * th.data.page_num;
-          if (res.data.data.total > n_all_num) th.setData({
-            is_show_more: 1
-          })
-          else th.setData({
-            is_show_more: 0
-          })
+          if (res.data.data.total <= 5) {
+            th.setData({
+              is_show_more: 1
+            })
+          }
+          // var n_all_num = th.data.cur_page * th.data.page_num;
+          // if (res.data.data.total > n_all_num) th.setData({
+          //   is_show_more: 1
+          // })
+          // else th.setData({
+          //   is_show_more: 0
+          // })
           //页吗要更新一下
-          th.data.cur_page++;
+          // th.data.cur_page++;
         } else {
+          getApp().showWarning("暂无更多内容");
           th.setData({
-            is_show_more: 0
+            is_show_more: 1
           })
         }
  
@@ -131,7 +143,7 @@ Page({
  
   //-----跳转到领取礼包的页面------
   go_task: function() {
-    console.log("跳转领取任务列表2222");
+   
     var help_id=this.data.help_id;
     getApp().goto("/pages/user/assistance/task_assistance?help_id="+help_id);
   },
@@ -156,7 +168,7 @@ 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);    
   },
   //查看礼包id
 {
-  "navigationBarTitleText": "好友助力",
+  "navigationBarTitleText": "好友助力,得好礼",
   "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
@@ -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">
@@ -64,7 +64,7 @@
  
           </view>
           <!-- 加载更多 -->
-           <block wx:if="{{is_load && zl_user_list.length!=0}}">
+           <block wx:if="{{is_show_more==0}}">
           <view class="fs28 flex-center">
             <view class="line"></view>
             <view class="load" bindtap="get_list">点击加载更多</view>