Merge branch 'master' of http://git.cc-lotus.info/network/fastNetwork

pages/setting/setting.js

@@ -49,6 +49,7 @@ Page({
     // 模板默认选择
     this.imageChange();
     let data = app.globalData.userInfo;
+    console.log(data);
     this.setData({ userInfo: data });
     // 生成二维码
     this.makeQRCode();