Browse Source

修复1.5用户登陆问题

featrue/v4.2
huziyuan 5 years ago
parent
commit
968a9cbfa9
2 changed files with 4 additions and 2 deletions
  1. 2
      pages/index/index.js
  2. 4
      pages/login/index.js

2
pages/index/index.js

@ -194,7 +194,7 @@ Page({
'user-token': userToken 'user-token': userToken
} }
getOrderExists().then(result => { getOrderExists().then(result => {
if (Number(result.data) != 1 || !app.release) {
if (Number(result.data) != 1 || !app.evn) {
getBaseInfo().then(result => { getBaseInfo().then(result => {
app.globalData.userInfo = result.data app.globalData.userInfo = result.data
wx.hideLoading() wx.hideLoading()

4
pages/login/index.js

@ -138,7 +138,8 @@ Page({
} }
getOrderExists().then(result => { getOrderExists().then(result => {
wx.hideLoading() wx.hideLoading()
if (Number(result.data) != 1 || !app.release) {
if (Number(result.data) != 1 || !app.evn) {
getBaseInfo().then(result => { getBaseInfo().then(result => {
app.globalData.userInfo = result.data app.globalData.userInfo = result.data
this.setData({ loging: false}) this.setData({ loging: false})
@ -154,6 +155,7 @@ Page({
this.setData({ loging: false}) this.setData({ loging: false})
}) })
} else { } else {
getBaseInfo().then(result => { getBaseInfo().then(result => {
app.globalData.userInfo = result.data app.globalData.userInfo = result.data
this.setData({ loging: false}) this.setData({ loging: false})

Loading…
Cancel
Save