Authored by 邱骏

修改

... ... @@ -108,6 +108,7 @@ function wechatUserIsBind(unionID, nickName) {
userInfo.uid = data.data.uid;
userInfo.sessionKey = data.data.session_key;
userInfo.wechat = app.globalData.userInfo.wechat || '';
console.log('wechatUserIsBind=>', userInfo);
app._removeSync('disableAutoLogin');
app.setUserInfo(userInfo);
... ... @@ -285,6 +286,7 @@ function getPhoneNumber(e) {
userInfo.ssouid = res.data.ssouid;
userInfo.sessionKey = res.data.session_key;
userInfo.wechat = app.globalData.userInfo.wechat || '';
console.log('getPhoneNumber => ', userInfo);
app._removeSync('disableAutoLogin');
app.setUserInfo(userInfo);
... ... @@ -331,7 +333,7 @@ function getUserInfo(e) {
});
} else {
console.log(e.detail);
let userInfo = Object.assign(app.globalData.userInfo, { wechat: e.detail.userInfo});
let userInfo = Object.assign(app.globalData.userInfo || {}, { wechat: e.detail.userInfo});
app.setUserInfo(userInfo);
}
... ...
... ... @@ -43,8 +43,13 @@ Page({
},
onLoad: function() {
yas = new Yas(app);
let that = this;
setTimeout(function() {
that.getList(0, 1, 20, false);
}, 300);
this.getList(0, 1, 20, false);
// this.getList(0, 1, 20, false);
},
onShow: function() {
yas.pageOpenReport();
... ... @@ -60,7 +65,6 @@ Page({
refreshText: '下拉刷新'
});
});
},
onReachBottom: function() {
let page = this.data.listData[this.data.tabSelected].page;
... ...
... ... @@ -138,6 +138,7 @@ Page(Object.assign({
this.productInfo().then(() => {
this.getAssitInfo();
});
},
onShareAppMessage: function(res) {
let params = {
... ...