From c8d89bc37b7cb8eca362586d35ef635fb2a8f381 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Wed, 8 Nov 2023 17:33:46 +0800 Subject: [PATCH] 2023-11-8 --- .env.development | 4 +- .env.production | 4 +- src/api/h5/index.js | 8 + src/components/XyDialog/index.vue | 11 +- src/components/XyTable/index.vue | 13 +- src/permission.js | 11 +- src/router/index.js | 6 +- src/utils/auth.js | 13 +- src/views/component/detail.vue | 9 +- src/views/component/dialog.vue | 378 ++++++------ src/views/h5/login.vue | 60 -- src/views/h5/login/component/loginPanel.vue | 224 +++++++ src/views/h5/login/login.vue | 102 ++++ src/views/login/index.vue | 2 +- src/views/record/component/add.vue | 417 +++++++++++++ src/views/record/index.vue | 632 ++++++++++++++++++++ 16 files changed, 1628 insertions(+), 266 deletions(-) create mode 100644 src/api/h5/index.js delete mode 100644 src/views/h5/login.vue create mode 100644 src/views/h5/login/component/loginPanel.vue create mode 100644 src/views/h5/login/login.vue create mode 100644 src/views/record/component/add.vue create mode 100644 src/views/record/index.vue diff --git a/.env.development b/.env.development index 4fad5c2..649935a 100644 --- a/.env.development +++ b/.env.development @@ -2,5 +2,5 @@ ENV='development' # base api -VUE_APP_BASE_API=http://starter.ali251.langye.net -VUE_APP_UPLOAD_API=http://starter.ali251.langye.net/api/admin/upload-file +VUE_APP_BASE_API=http://knzg.ali251.langye.net +VUE_APP_UPLOAD_API=http://knzg.ali251.langye.net/api/admin/upload-file diff --git a/.env.production b/.env.production index f837c50..ecacbb2 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,5 @@ ENV = 'production' # base api -VUE_APP_BASE_API = http://starter.ali251.langye.net -VUE_APP_UPLOAD_API =http://starter.ali251.langye.net/api/admin/upload-file \ No newline at end of file +VUE_APP_BASE_API=http://knzg.ali251.langye.net +VUE_APP_UPLOAD_API=http://knzg.ali251.langye.net/api/admin/upload-file diff --git a/src/api/h5/index.js b/src/api/h5/index.js new file mode 100644 index 0000000..120cd3b --- /dev/null +++ b/src/api/h5/index.js @@ -0,0 +1,8 @@ +import request from "@/utils/request"; + +export function login () { + return request({ + url: '/api/mobile/user/login', + + }) +} diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue index 32bda2d..0dd3d73 100644 --- a/src/components/XyDialog/index.vue +++ b/src/components/XyDialog/index.vue @@ -291,12 +291,15 @@ export default { .el-form-item__error{ white-space: nowrap; word-break: keep-all !important; - top: 100% !important; - left: calc(100% - 80px) !important; - transform: translateX(-100%); } .ivu-message{ z-index: 5000 !important; } - + diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 99ed9de..2992eb2 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -21,6 +21,11 @@ export default { default: "data", }, //请求后需要获取表格数据键名 + isHandlerKey: { + type: Boolean, + default: true + },//是否每次有数据跟新时会刷新表格key从而刷新视图(取消sort优化,标题不会频闪) + //操作权限 auths: { type: Array, @@ -739,7 +744,7 @@ export default { { (() => { let dom = []; _this.auths.forEach((item, index) => { - if (this.btnToMore && _this.moreAuths.find(j => j === item)) return + if ((_this.btnToMore || _this.auths.length > 5) && _this.moreAuths.find(j => j === item)) return if (_this.$scopedSlots[item]) { flag = index; dom.push(_this.$scopedSlots[item](scope, item, index)); @@ -751,7 +756,9 @@ export default { } }) - this.btnToMore? dom.push(btns.get('more')) : '' + if (_this.auths.length > 5 || _this.btnToMore) { + dom.push(btns.get('more')) + } return dom; })() } @@ -870,7 +877,7 @@ export default { { // start progress bar @@ -21,9 +21,10 @@ router.beforeEach(async(to, from, next) => { const hasToken = getToken() if (hasToken) { - if (to.path === '/login') { + if (to.path === '/login' || to.path === '/h5/login') { // if is logged in, redirect to the home page - next({ path: '/' }) + let isH5 = to.path !== '/login' + next({ path: isH5 ? '/h5' : '/' }) NProgress.done() } else { // determine whether the user has obtained his permission roles through getInfo @@ -51,7 +52,7 @@ router.beforeEach(async(to, from, next) => { // remove token and go to login page to re-login await store.dispatch('user/resetToken') Message.error(error || 'Has Error') - next(`/login?redirect=${to.path}`) + next(`${/^\/h5.*/.test(to.path) ? '/h5/login' : '/login'}?redirect=${to.path}`) NProgress.done() } } @@ -64,7 +65,7 @@ router.beforeEach(async(to, from, next) => { next() } else { // other pages that do not have permission to access are redirected to the login page. - next(`/login?redirect=${to.path}`) + next(`${/^\/h5.*/.test(to.path) ? '/h5/login' : '/login'}?redirect=${to.path}`) NProgress.done() } } diff --git a/src/router/index.js b/src/router/index.js index a5069f3..4c9602d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,7 +33,7 @@ import Layout from "@/layout"; export const constantRoutes = [ { path: "/login", - component: () => import("@/views/login/index"), + component: () => import("@/views/login/index.vue"), hidden: true, }, @@ -88,8 +88,8 @@ export const constantRoutes = [ hidden: true }, { - path: '/h5login', - component:() => import("@/views/h5/login.vue"), + path: '/h5/login', + component:() => import("@/views/h5/login/login.vue"), meta: { title: "登录", }, diff --git a/src/utils/auth.js b/src/utils/auth.js index 82a703b..5bf5a01 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,15 +1,18 @@ import Cookies from 'js-cookie' - +import router from '@/router' const TokenKey = 'difficult_employee_query_token' - +const TokenKsy_h5 = 'difficult_employee_query_token_h5' export function getToken() { - return Cookies.get(TokenKey) + let flag = /^\/h5.*/.test(router.currentRoute.path) + return Cookies.get(flag ? TokenKsy_h5 : TokenKey) } export function setToken(token) { - return Cookies.set(TokenKey, token) + let flag = /^\/h5.*/.test(router.currentRoute.path) + return Cookies.set(flag ? TokenKsy_h5 : TokenKey, token) } export function removeToken() { - return Cookies.remove(TokenKey) + let flag = /^\/h5.*/.test(router.currentRoute.path) + return Cookies.remove(flag ? TokenKsy_h5 : TokenKey) } diff --git a/src/views/component/detail.vue b/src/views/component/detail.vue index 7e48717..d423696 100644 --- a/src/views/component/detail.vue +++ b/src/views/component/detail.vue @@ -37,7 +37,7 @@ -