From 614531e765ca879f8a070caf58c61c248c435fce Mon Sep 17 00:00:00 2001 From: "471615499@qq.com" Date: Mon, 28 Oct 2024 21:51:05 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=97=A5=E5=8E=86=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA=E6=80=BB=E5=9C=BA?= =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E5=8A=A0=E5=85=A5=E4=B8=8B=E9=92=BB=202?= =?UTF-8?q?=E3=80=81=E5=8F=82=E4=BC=9A=E9=A2=86=E5=AF=BC=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=203=E3=80=81=E9=A2=84=E7=BA=A6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=8E=92=E5=BA=8F=E5=92=8C=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=AE=A4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/login.js | 35 +++++++-- src/config/router.config.js | 6 ++ src/permission.js | 5 +- src/views/admin/meeting/MeetingCount.vue | 24 +++++- .../admin/meeting/MeetingReservationList.vue | 64 +++++++++++++-- .../admin/meeting/modules/RoomOrderModal.vue | 2 +- src/views/user/LoginCode.vue | 70 +++++++++++++++++ yarn.lock | 78 +++++++++++++++++++ 9 files changed, 268 insertions(+), 17 deletions(-) create mode 100644 src/views/user/LoginCode.vue diff --git a/package.json b/package.json index 9a14751..6512369 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "vue-clipboard2": "^0.2.1", "vue-cropper": "0.4.9", "vue-i18n": "^8.17.4", + "vue-qr": "^4.0.9", "vue-quill-editor": "^3.0.6", "vue-router": "^3.1.2", "vue-svg-component-runtime": "^1.0.1", diff --git a/src/api/login.js b/src/api/login.js index e111ccc..3c0f671 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -11,7 +11,7 @@ import { axios } from '@/utils/request' * @param parameter * @returns {*} */ -export function login (parameter) { +export function login(parameter) { return axios({ url: '/login/slide', method: 'post', @@ -19,7 +19,7 @@ export function login (parameter) { }) } -export function getLoginSms (parameter) { +export function getLoginSms(parameter) { return axios({ url: '/system/sms/send', method: 'get', @@ -27,7 +27,7 @@ export function getLoginSms (parameter) { }) } -export function getInfo () { +export function getInfo() { return axios({ url: '/system/user/info', method: 'get', @@ -37,7 +37,7 @@ export function getInfo () { }) } -export function logout (token) { +export function logout(token) { return axios({ url: '/login/logout', method: 'post', @@ -49,7 +49,7 @@ export function logout (token) { } // 获取验证图片 以及token -export function getCaptcha (data) { +export function getCaptcha(data) { return axios({ url: '/captcha/get', method: 'post', @@ -58,10 +58,33 @@ export function getCaptcha (data) { } // 滑动或者点选验证 -export function captchaCheck (data) { +export function captchaCheck(data) { return axios({ url: '/captcha/check', method: 'post', data }) } + +/** + * 获取扫描登录二维码 + * @returns {AxiosPromise} + */ +export function qrCode() { + return axios({ + url: '/wxscan/get', + method: 'post' + }) +} + +/** + * 检测是否扫码登录 + * @param unique + * @returns {AxiosPromise} + */ +export function loginByCode(unique) { + return axios({ + url: '/wxscan/isLogin/' + unique, + method: 'get' + }) +} \ No newline at end of file diff --git a/src/config/router.config.js b/src/config/router.config.js index 1d17e70..5c95dcb 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -14,8 +14,14 @@ export const defaultRouterMap = [ export const constantRouterMap = [ { path: '/', + name: 'index', redirect: '/dashboard/Analysis' // 默认首页 }, + { + path: '/user/loginCode', + name: 'loginCode', + component: () => import(/* webpackChunkName: "user" */ '@/views/user/LoginCode') + }, { path: '/user', component: UserLayout, diff --git a/src/permission.js b/src/permission.js index 572d746..2290fad 100644 --- a/src/permission.js +++ b/src/permission.js @@ -10,8 +10,9 @@ import { i18nRender } from '@/locales' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const allowList = ['login', 'register', 'registerResult', 'chart'] // no redirect allowList -const loginRoutePath = '/user/login' +const allowList = ['login', 'loginCode', 'register', 'registerResult', 'chart'] // no redirect allowList +// const loginRoutePath = '/user/login' +const loginRoutePath = '/user/loginCode' const defaultRoutePath = '/dashboard/Analysis' // 登录跳转 diff --git a/src/views/admin/meeting/MeetingCount.vue b/src/views/admin/meeting/MeetingCount.vue index a532adc..934ca8f 100644 --- a/src/views/admin/meeting/MeetingCount.vue +++ b/src/views/admin/meeting/MeetingCount.vue @@ -71,8 +71,9 @@ -
    - +
      + {{getListData(value).length == 0 ? '' : getListData(value).length}} +