Commit 511bfd0c1140950d82169746e4d3811f3dff79c3
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
2 additions
and
3 deletions
pages/user/assistance/assistance.js
| @@ -111,9 +111,7 @@ Page({ | @@ -111,9 +111,7 @@ Page({ | ||
| 111 | th.setData({ | 111 | th.setData({ |
| 112 | is_load: 1 | 112 | is_load: 1 |
| 113 | }) | 113 | }) |
| 114 | - | ||
| 115 | if (res.data.code == 0) { | 114 | if (res.data.code == 0) { |
| 116 | - | ||
| 117 | var list = th.data.zl_user_list; | 115 | var list = th.data.zl_user_list; |
| 118 | //连接数组 | 116 | //连接数组 |
| 119 | list = list.concat(res.data.data.pageData); | 117 | list = list.concat(res.data.data.pageData); |
| @@ -133,7 +131,8 @@ Page({ | @@ -133,7 +131,8 @@ Page({ | ||
| 133 | }) | 131 | }) |
| 134 | } | 132 | } |
| 135 | } else { | 133 | } else { |
| 136 | - getApp().my_warnning(res.data.msg, 0, th); | 134 | + console.log("是什么鬼",res.data.msg); |
| 135 | + getApp().my_warnning(res.data.msg,0,th); | ||
| 137 | th.setData({ | 136 | th.setData({ |
| 138 | is_show_more: 1, | 137 | is_show_more: 1, |
| 139 | page: page | 138 | page: page |