Commit 73ec3ff612d1825e5b7c6eb76b02befcdd7cf15e
1 parent
df08707d
助力
Showing
1 changed file
with
14 additions
and
17 deletions
pages/user/assistance/assistance.js
| ... | ... | @@ -34,7 +34,7 @@ Page({ |
| 34 | 34 | onLoad: function(options) { |
| 35 | 35 | var th = this; |
| 36 | 36 | var nav_b = th.selectComponent("#nav_b"); //组件的id |
| 37 | - nav_b.set_name("助力", ""); | |
| 37 | + nav_b.set_name("助力", "/pages/user/assistance/assistance"); | |
| 38 | 38 | // 助力活动 |
| 39 | 39 | this.assistance(); |
| 40 | 40 | }, |
| ... | ... | @@ -83,11 +83,9 @@ Page({ |
| 83 | 83 | |
| 84 | 84 | //--点击获取用户任务列表--会员的任务列表 |
| 85 | 85 | get_list:function() { |
| 86 | - | |
| 87 | - | |
| 86 | + | |
| 88 | 87 | var th = this; |
| 89 | 88 | var page=th.data.page; |
| 90 | - console.log("page是什么", page); | |
| 91 | 89 | var help_id=this.data.help_id; |
| 92 | 90 | t.request.get("/api/weshop/marketing/help/help/user/page", { |
| 93 | 91 | data: { |
| ... | ... | @@ -107,33 +105,32 @@ Page({ |
| 107 | 105 | |
| 108 | 106 | |
| 109 | 107 | if (res.data.code == 0) { |
| 110 | - var page=th.data.page+1; | |
| 108 | + | |
| 111 | 109 | var list = th.data.zl_user_list; |
| 112 | 110 | //连接数组 |
| 113 | 111 | list = list.concat(res.data.data.pageData); |
| 114 | 112 | th.setData({ |
| 115 | 113 | zl_user_list: list, |
| 116 | 114 | is_load: 1, |
| 117 | - page: page | |
| 118 | 115 | }); |
| 119 | 116 | if (res.data.data.total <= 5) { |
| 120 | 117 | th.setData({ |
| 121 | 118 | is_show_more: 1 |
| 122 | 119 | }) |
| 120 | + }else{ | |
| 121 | + var page = th.data.page + 1; | |
| 122 | + th.setData({ | |
| 123 | + is_show_more: 0, | |
| 124 | + page: page | |
| 125 | + }) | |
| 123 | 126 | } |
| 124 | - // var n_all_num = th.data.cur_page * th.data.page_num; | |
| 125 | - // if (res.data.data.total > n_all_num) th.setData({ | |
| 126 | - // is_show_more: 1 | |
| 127 | - // }) | |
| 128 | - // else th.setData({ | |
| 129 | - // is_show_more: 0 | |
| 130 | - // }) | |
| 131 | - //页吗要更新一下 | |
| 132 | - // th.data.cur_page++; | |
| 127 | + | |
| 133 | 128 | } else { |
| 134 | - getApp().showWarning("暂无更多内容"); | |
| 129 | + | |
| 130 | + getApp().showWarning("暂无更多内容",0); | |
| 135 | 131 | th.setData({ |
| 136 | - is_show_more: 1 | |
| 132 | + is_show_more: 1, | |
| 133 | + page: page | |
| 137 | 134 | }) |
| 138 | 135 | } |
| 139 | 136 | ... | ... |