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

yvan.ni
2 parents ed79d976 855339c2
Showing 1 changed file with 2 additions and 3 deletions
pages/user/assistance/assistance.js
@@ -111,9 +111,7 @@ Page({
           th.setData({
             is_load: 1
           })
-
         if (res.data.code == 0) {
-
           var list = th.data.zl_user_list;
           //连接数组	
           list = list.concat(res.data.data.pageData);
@@ -133,7 +131,8 @@ Page({
             })
           }
         } else {
-          getApp().my_warnning(res.data.msg, 0, th);
+          console.log("是什么鬼",res.data.msg);
+             getApp().my_warnning(res.data.msg,0,th);
           th.setData({
             is_show_more: 1,
             page: page