|
@@ -44,9 +44,11 @@ Page({
|
|
|
// }
|
|
// }
|
|
|
// var that = this
|
|
// var that = this
|
|
|
this.checkLogin();
|
|
this.checkLogin();
|
|
|
|
|
+ this.info();
|
|
|
},
|
|
},
|
|
|
onShow: function () {
|
|
onShow: function () {
|
|
|
var that = this;
|
|
var that = this;
|
|
|
|
|
+ // that.checkLogin();
|
|
|
this.info();
|
|
this.info();
|
|
|
// if (this.data.bindTel) {
|
|
// if (this.data.bindTel) {
|
|
|
// this.getBalanceInfo()
|
|
// this.getBalanceInfo()
|
|
@@ -59,10 +61,6 @@ Page({
|
|
|
// // this.info()
|
|
// // this.info()
|
|
|
// }
|
|
// }
|
|
|
|
|
|
|
|
- // that.checkLogin();
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
//原登陆检测
|
|
//原登陆检测
|
|
|
},
|
|
},
|
|
@@ -94,8 +92,10 @@ Page({
|
|
|
that.setData({
|
|
that.setData({
|
|
|
userInfo: userInfo
|
|
userInfo: userInfo
|
|
|
})
|
|
})
|
|
|
|
|
+ that.info()
|
|
|
that.getBalanceInfo()
|
|
that.getBalanceInfo()
|
|
|
that.getIntegralInfo()
|
|
that.getIntegralInfo()
|
|
|
|
|
+
|
|
|
// if (that.data.checkData.merchant_id > 0) {
|
|
// if (that.data.checkData.merchant_id > 0) {
|
|
|
// that.getmerchant()
|
|
// that.getmerchant()
|
|
|
// }
|
|
// }
|
|
@@ -134,8 +134,8 @@ Page({
|
|
|
userinfo: JSON.stringify(res3.userInfo)
|
|
userinfo: JSON.stringify(res3.userInfo)
|
|
|
}
|
|
}
|
|
|
var success = function (res4) {
|
|
var success = function (res4) {
|
|
|
- console.log('authorize',res4)
|
|
|
|
|
- that.onShow()
|
|
|
|
|
|
|
+ console.log('authorize',res4);
|
|
|
|
|
+ that.onLoad()
|
|
|
}
|
|
}
|
|
|
_request.$post(url, params, success)
|
|
_request.$post(url, params, success)
|
|
|
}
|
|
}
|
|
@@ -205,7 +205,7 @@ Page({
|
|
|
console.log('val',val)
|
|
console.log('val',val)
|
|
|
// _request.sendInfo(val, channel_id, invite, that)
|
|
// _request.sendInfo(val, channel_id, invite, that)
|
|
|
|
|
|
|
|
- that.onShow();
|
|
|
|
|
|
|
+ that.onLoad();
|
|
|
|
|
|
|
|
|
|
|
|
|
// wx.showToast({
|
|
// wx.showToast({
|
|
@@ -262,7 +262,7 @@ Page({
|
|
|
}
|
|
}
|
|
|
var success = function (res4) {
|
|
var success = function (res4) {
|
|
|
console.log('authorize',res4)
|
|
console.log('authorize',res4)
|
|
|
- that.onShow()
|
|
|
|
|
|
|
+ that.onLoad()
|
|
|
}
|
|
}
|
|
|
_request.$post(url, params, success)
|
|
_request.$post(url, params, success)
|
|
|
}
|
|
}
|
|
@@ -285,7 +285,9 @@ Page({
|
|
|
})
|
|
})
|
|
|
console.log('untel',res.data.user.tel)
|
|
console.log('untel',res.data.user.tel)
|
|
|
|
|
|
|
|
|
|
+ console.log('res.data.wx_user',res.data.wx_user)
|
|
|
if(res.data.wx_user.head == ''){
|
|
if(res.data.wx_user.head == ''){
|
|
|
|
|
+ console.log('indddddddddddddddddddddddd')
|
|
|
that.setData({
|
|
that.setData({
|
|
|
userInfo: 'nologin'
|
|
userInfo: 'nologin'
|
|
|
})
|
|
})
|