diff --git a/pages/home/index.js b/pages/home/index.js index 9e71ff6..a97eb8f 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -291,6 +291,13 @@ Page({ alertInfo(message) return } + if (!data?.length) { + alertInfo("尚无信息") + wx.redirectTo({ + url: '/pages/handleLogin/index', + }) + return; + } const [firstPark = {}] = data; const { park, tenement } = this.data; const updateDatas = {} diff --git a/pages/my/index.js b/pages/my/index.js index fd9362c..367b714 100644 --- a/pages/my/index.js +++ b/pages/my/index.js @@ -79,15 +79,22 @@ Page({ }) }, async logout() { - const { code, message } = await logout() - if (code !== OK) { - alertInfo(message) - return; - } - wx.clearStorageSync() - wx.switchTab({ - url: '/pages/home/index', - }) + Dialog.alert({ + title: '提示', + message: '确认退出登录?', + showCancelButton: true, + }).then(async () => { + const { code, message } = await logout() + if (code !== OK) { + alertInfo(message) + return; + } + wx.clearStorageSync() + wx.switchTab({ + url: '/pages/home/index', + }) + }); + }, bindTenement() { wx.navigateTo({ diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js index de33b2c..b9de7b4 100644 --- a/pages/rechargeDetail/index.js +++ b/pages/rechargeDetail/index.js @@ -50,19 +50,19 @@ Page({ // 开发版 case 'develop': wx.setClipboardData({ - data: `https://zgd.hbhcbn.com/print/?id=${detail.serialNumber}`, + data: `https://1.92.72.5:8080/print/?id=${detail.serialNumber}`, }) break; // 体验版 case 'trial': wx.setClipboardData({ - data: `https://zgd.hbhcbn.com/h5/?report=${id}&tenement=${tenement}`, + data: `http://1.92.72.5:8080/print/?id=${detail.serialNumber}`, }) break; // 正式版 case 'release': wx.setClipboardData({ - data: `https://zgd.hbhcbn.com/reporth5/?report=${id}&tenement=${tenement}`, + data: `https://zgd.hbhcbn.com/print/?id=${detail.serialNumber}`, }) break; } diff --git a/utils/request.js b/utils/request.js index b831914..c24b138 100644 --- a/utils/request.js +++ b/utils/request.js @@ -19,8 +19,7 @@ const requestWithoutCookie = promisify(wx.request); // 考虑了Cookie的请求 const request = async function (options, config = {}) { - console.log('请求参数', 'options', options, 'config', config) - console.log('token', wx.getStorageSync('token'), 'user', wx.getStorageSync('user')) + console.log('请求地址', options.url, "请求参数", options.data, 'config', config) let token = wx.getStorageSync('token'); const result = wx.getAccountInfoSync(); const { envVersion } = result.miniProgram; @@ -74,7 +73,6 @@ const request = async function (options, config = {}) { } catch(err) { alertInfo(err.errMsg) } - return response; }