Authored by 邱骏

修改

@@ -108,6 +108,7 @@ function wechatUserIsBind(unionID, nickName) { @@ -108,6 +108,7 @@ function wechatUserIsBind(unionID, nickName) {
108 userInfo.uid = data.data.uid; 108 userInfo.uid = data.data.uid;
109 userInfo.sessionKey = data.data.session_key; 109 userInfo.sessionKey = data.data.session_key;
110 userInfo.wechat = app.globalData.userInfo.wechat || ''; 110 userInfo.wechat = app.globalData.userInfo.wechat || '';
  111 + console.log('wechatUserIsBind=>', userInfo);
111 112
112 app._removeSync('disableAutoLogin'); 113 app._removeSync('disableAutoLogin');
113 app.setUserInfo(userInfo); 114 app.setUserInfo(userInfo);
@@ -285,6 +286,7 @@ function getPhoneNumber(e) { @@ -285,6 +286,7 @@ function getPhoneNumber(e) {
285 userInfo.ssouid = res.data.ssouid; 286 userInfo.ssouid = res.data.ssouid;
286 userInfo.sessionKey = res.data.session_key; 287 userInfo.sessionKey = res.data.session_key;
287 userInfo.wechat = app.globalData.userInfo.wechat || ''; 288 userInfo.wechat = app.globalData.userInfo.wechat || '';
  289 + console.log('getPhoneNumber => ', userInfo);
288 290
289 app._removeSync('disableAutoLogin'); 291 app._removeSync('disableAutoLogin');
290 app.setUserInfo(userInfo); 292 app.setUserInfo(userInfo);
@@ -331,7 +333,7 @@ function getUserInfo(e) { @@ -331,7 +333,7 @@ function getUserInfo(e) {
331 }); 333 });
332 } else { 334 } else {
333 console.log(e.detail); 335 console.log(e.detail);
334 - let userInfo = Object.assign(app.globalData.userInfo, { wechat: e.detail.userInfo}); 336 + let userInfo = Object.assign(app.globalData.userInfo || {}, { wechat: e.detail.userInfo});
335 337
336 app.setUserInfo(userInfo); 338 app.setUserInfo(userInfo);
337 } 339 }
@@ -43,8 +43,13 @@ Page({ @@ -43,8 +43,13 @@ Page({
43 }, 43 },
44 onLoad: function() { 44 onLoad: function() {
45 yas = new Yas(app); 45 yas = new Yas(app);
  46 + let that = this;
  47 +
  48 + setTimeout(function() {
  49 + that.getList(0, 1, 20, false);
  50 + }, 300);
46 51
47 - this.getList(0, 1, 20, false); 52 + // this.getList(0, 1, 20, false);
48 }, 53 },
49 onShow: function() { 54 onShow: function() {
50 yas.pageOpenReport(); 55 yas.pageOpenReport();
@@ -60,7 +65,6 @@ Page({ @@ -60,7 +65,6 @@ Page({
60 refreshText: '下拉刷新' 65 refreshText: '下拉刷新'
61 }); 66 });
62 }); 67 });
63 -  
64 }, 68 },
65 onReachBottom: function() { 69 onReachBottom: function() {
66 let page = this.data.listData[this.data.tabSelected].page; 70 let page = this.data.listData[this.data.tabSelected].page;
@@ -138,6 +138,7 @@ Page(Object.assign({ @@ -138,6 +138,7 @@ Page(Object.assign({
138 this.productInfo().then(() => { 138 this.productInfo().then(() => {
139 this.getAssitInfo(); 139 this.getAssitInfo();
140 }); 140 });
  141 +
141 }, 142 },
142 onShareAppMessage: function(res) { 143 onShareAppMessage: function(res) {
143 let params = { 144 let params = {