diff --git a/pages/home/index.js b/pages/home/index.js index bc7cd58..2d7fd9a 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -1,4 +1,7 @@ // pages/home/index.js +import { + getCurrentPageUrl +} from './../../utils/util.js' const app = getApp(); let s = ''; let m = 0; @@ -206,6 +209,13 @@ Page({ //扫描二维码 sacnQRCode() { + if (!wx.getStorageSync('accessToken')) { + wx.setStorageSync('history', getCurrentPageUrl()); + wx.redirectTo({ + url: '/pages/login/index', + }) + return + } wx.scanCode({ success (res) { // wx.showToast({ diff --git a/pages/scanCode/index.js b/pages/scanCode/index.js index ad9bca6..475e937 100644 --- a/pages/scanCode/index.js +++ b/pages/scanCode/index.js @@ -31,6 +31,8 @@ Page({ setTimeout(function() { that.setData({canOpen : false}); },60000); + }else if (res.InitError){ + venue: res.InitError } }); }, diff --git a/pages/scanCode/index.wxml b/pages/scanCode/index.wxml index feec67f..a2dddac 100644 --- a/pages/scanCode/index.wxml +++ b/pages/scanCode/index.wxml @@ -6,7 +6,7 @@ 开门 返回 - - + + \ No newline at end of file