From 4ad7d2763421774fcef80ac2bc6f5a9c20c0559a Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Mon, 5 Jan 2026 10:59:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BA=A7=E5=93=81=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E6=94=B9=E6=88=90=E8=AE=BF=E9=97=AE=E6=BC=94?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 13 +- src/utils/auth.js | 14 + src/utils/request.js | 6 +- src/utils/request_formdata.js | 6 +- src/utils/validate.js | 8 +- .../publicService/components/navBar2.vue | 400 ++++++++++++++++++ src/views/publicService/index.vue | 25 +- src/views/publicService/index_1.vue | 1 + .../publicService/proMaterials/index.vue | 4 +- .../publicService/productCenter/index.vue | 6 +- .../publicService/productCenter/index_old.vue | 8 +- .../productCenter/product-detail.vue | 6 +- vue.config.js | 231 +++++----- 13 files changed, 589 insertions(+), 139 deletions(-) create mode 100644 src/views/publicService/components/navBar2.vue diff --git a/src/store/modules/user.js b/src/store/modules/user.js index d5c39da..59d4f5d 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,7 +1,15 @@ import router from '@/router' import { MessageBox } from 'element-ui' import { login, logout, getInfo } from '@/api/login' -import { getToken, setToken, removeToken,setPermissions,removePermissions, } from '@/utils/auth' +import { + getToken, + setToken, + removeToken, + setPermissions, + removePermissions, + setUserName, + removeUserName, +} from '@/utils/auth' import { isHttp, isEmpty } from '@/utils/validate' import defAva from '@/assets/images/profile.jpg' import { encryptWithSM4 } from '@/utils/sm' @@ -56,6 +64,7 @@ const user = { .then((res) => { setToken(res.token) setPermissions(res.authorities) + setUserName(userInfo.username.trim()) commit('SET_TOKEN', res.token) resolve() }) @@ -144,6 +153,7 @@ const user = { commit('SET_PERMISSIONS', []) removeToken() removePermissions() + removeUserName() resolve() }) .catch((error) => { @@ -158,6 +168,7 @@ const user = { commit('SET_TOKEN', '') removeToken() removePermissions() + removeUserName() resolve() }) }, diff --git a/src/utils/auth.js b/src/utils/auth.js index 584f71f..e9528c8 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -4,6 +4,8 @@ const TokenKey = 'Admin-Token' const Permissions = '0' +const UserName = 'Admin-UserName' + export function getToken() { return Cookies.get(TokenKey) } @@ -28,3 +30,15 @@ export function setPermissions(permissions) { export function removePermissions() { return Cookies.remove(Permissions) } + +export function getUserName() { + return Cookies.get(UserName) +} + +export function setUserName( name){ + return Cookies.set(UserName, name) +} + +export function removeUserName() { + return Cookies.remove(UserName) +} diff --git a/src/utils/request.js b/src/utils/request.js index 44ee33c..0ed5bff 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -76,9 +76,9 @@ service.interceptors.request.use( requestObj.time - s_time < interval && s_url === requestObj.url ) { - const message = '数据正在处理,请勿重复提交' - console.warn(`[${s_url}]: ` + message) - return Promise.reject(new Error(message)) + // const message = '数据正在处理,请勿重复提交' + // console.warn(`[${s_url}]: ` + message) + // return Promise.reject(new Error(message)) } else { cache.session.setJSON('sessionObj', requestObj) } diff --git a/src/utils/request_formdata.js b/src/utils/request_formdata.js index 333cd87..4697318 100644 --- a/src/utils/request_formdata.js +++ b/src/utils/request_formdata.js @@ -85,9 +85,9 @@ service.interceptors.request.use( requestObj.time - s_time < interval && s_url === requestObj.url ) { - const message = '数据正在处理,请勿重复提交' - console.warn(`[${s_url}]: ` + message) - return Promise.reject(new Error(message)) + // const message = '数据正在处理,请勿重复提交' + // console.warn(`[${s_url}]: ` + message) + // return Promise.reject(new Error(message)) } else { cache.session.setJSON('sessionObj', requestObj) } diff --git a/src/utils/validate.js b/src/utils/validate.js index 6a4c0c5..3516202 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -11,7 +11,7 @@ export function isPathMatch(pattern, path) { } /** - * 判断value字符串是否为空 + * 判断value字符串是否为空 * @param {string} value * @returns {Boolean} */ @@ -23,7 +23,7 @@ export function isEmpty(value) { } /** - * 判断url是否是http或https + * 判断url是否是http或https * @param {string} url * @returns {Boolean} */ @@ -37,7 +37,7 @@ export function isHttp(url) { * @returns {Boolean} */ export function isExternal(path) { - return /^(https?:|mailto:|tel:)/.test(path) + return /^(http?:|mailto:|tel:)/.test(path) } /** @@ -54,7 +54,7 @@ export function validUsername(str) { * @returns {Boolean} */ export function validURL(url) { - const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/ + const reg = /^(http?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/ return reg.test(url) } diff --git a/src/views/publicService/components/navBar2.vue b/src/views/publicService/components/navBar2.vue new file mode 100644 index 0000000..26c206d --- /dev/null +++ b/src/views/publicService/components/navBar2.vue @@ -0,0 +1,400 @@ + + + + + diff --git a/src/views/publicService/index.vue b/src/views/publicService/index.vue index 842195c..bcdde79 100644 --- a/src/views/publicService/index.vue +++ b/src/views/publicService/index.vue @@ -1,7 +1,15 @@