diff --git a/app.js b/app.js index 6dce1b2..b2f96c6 100644 --- a/app.js +++ b/app.js @@ -39,7 +39,7 @@ App({ // 获取前端配置文件 commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest159? true : false; + data.isTest = data.isTest160? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/user/logout/index.js b/pages/user/logout/index.js index 7b275a2..9154de4 100644 --- a/pages/user/logout/index.js +++ b/pages/user/logout/index.js @@ -43,17 +43,23 @@ Page({ if (res.confirm) { common.user_post('uservice/user/user_logout', { protocol: that.data.protocol ? 1 : 0 }).then(res => { if (res) { - wx.showToast({ - title: res.msg, - icon: 'none' - }) - if (res.code === 1) { - setTimeout(() => { - wx.switchTab({ - url: '/pages/user/user', - }) - }, 400) - } + if (res.code === 1) { + wx.showModal({ + title: '提示', + content: res.msg, + showCancel: false, + complete: () => { + wx.switchTab({ + url: '/pages/user/user', + }) + } + }) + } else { + wx.showModal({ + title: res.msg, + icon: 'none' + }) + } } }) diff --git a/pages/user/user.js b/pages/user/user.js index 1bbe1d2..48a5a40 100644 --- a/pages/user/user.js +++ b/pages/user/user.js @@ -83,6 +83,8 @@ Page({ this.setData({ info: res.data }) + } else{ + this.setData({info: null}) } }) util.pagePoint({