From 1578c38026919fa99c8f16df7105f7dc2078cae0 Mon Sep 17 00:00:00 2001 From: jmal Date: Mon, 29 Aug 2022 23:15:31 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=BD=91=E7=9B=98logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - .../SimpleUploader/globalUploader.vue | 1604 +++++++++-------- src/layout/components/Sidebar/Logo.vue | 9 +- src/main.js | 4 +- src/permission.js | 8 +- src/store/modules/user.js | 3 + src/utils/get-page-title.js | 13 +- src/utils/logo.js | 24 +- src/views/login/index.vue | 8 +- src/views/setting/articles/articleManager.vue | 2 +- .../setting/articles/categoryManager.vue | 2 +- src/views/setting/articles/tagManager.vue | 2 +- src/views/setting/cloudManager.vue | 6 +- src/views/setting/sys/cusomerInfo.vue | 2 +- src/views/setting/sys/cusomerManager.vue | 2 +- src/views/setting/sys/menuManager.vue | 2 +- src/views/setting/sys/roleManager.vue | 2 +- vue.config.js | 2 +- 18 files changed, 873 insertions(+), 823 deletions(-) diff --git a/package.json b/package.json index 29d834d..a6a103c 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "vue-runtime-helpers": "^1.1.2", "vue-simple-uploader": "^0.7.4", "vue-video-player": "^5.0.2", - "vue-wechat-title": "^2.0.5", "vuedraggable": "^2.23.2", "vuex": "^3.1.0", "websocket": "^1.0.34" diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue index b3b3336..fa94bf6 100755 --- a/src/components/SimpleUploader/globalUploader.vue +++ b/src/components/SimpleUploader/globalUploader.vue @@ -1,5 +1,5 @@ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 541db8e..9e3771b 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -2,13 +2,9 @@
- - - + - -

{{ title }}

@@ -31,11 +27,10 @@ export default { }, computed: { title() { - console.log('this.$store.state.user', this.$store.state.user) if (this.$store.state.user.netdiskName) { return this.$store.state.user.netdiskName } - return 'jmalcloud' + return 'JmalCloud' }, netdiskLogo() { if (this.$store.state.user.netdiskLogo) { diff --git a/src/main.js b/src/main.js index 740b54a..d26494b 100644 --- a/src/main.js +++ b/src/main.js @@ -9,8 +9,6 @@ import EVueContextmenu from 'e-vue-contextmenu' import App from './App' import store from './store' import router from './router' -import VueWechatTitle from 'vue-wechat-title' - // ant-design-vue import { Affix } from 'ant-design-vue'; @@ -33,7 +31,7 @@ import Viewer from 'v-viewer' Vue.use(Viewer) -Vue.use(VueWechatTitle) +// Vue.use(VueWechatTitle) Vue.use(uploader) Vue.use(EVueContextmenu) diff --git a/src/permission.js b/src/permission.js index 4c47206..3a276ac 100644 --- a/src/permission.js +++ b/src/permission.js @@ -3,19 +3,21 @@ import store from './store' import NProgress from 'nprogress' // 进度条 import 'nprogress/nprogress.css' // 进度条样式 import { getToken } from '@/utils/auth' // 认证获取token +import {setFavicon} from '@/utils/logo' import getPageTitle from '@/utils/get-page-title' -import { getLogoName, getLogo } from '@/utils/logo' - NProgress.configure({ showSpinner: false }) // NProgress配置 const whiteList = ['/login','/s','/s/','/s_m','/s_m/'] // 白名单 +window.onload = function() { + setFavicon() +} + router.beforeEach(async(to, from, next) => { // 开始进度条 NProgress.start() // 设置页面标题 - console.log('to.meta.title', to.meta.title) document.title = getPageTitle(to.meta.title) // 确认用户是否已登录 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c4c6400..c0e95e9 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,6 +1,7 @@ import { login, logout, getInfo } from '@/api/user' import menuApi from '@/api/menu' import { getToken, setToken, getConsumerId, setConsumerId, removeToken, removeConsumerId , setRememberName, removeRememberName } from '@/utils/auth' +import { setLogo } from '@/utils/logo' import { resetRouter } from '@/router' import router from '@/router' import Layout from '@/layout' @@ -98,6 +99,7 @@ const actions = { const { netdiskName, netdiskLogo } = logoInfo commit('SET_NETDISK_NAME', netdiskName) commit('SET_NETDISK_LOGO', netdiskLogo) + setLogo(netdiskName, netdiskLogo) }, // get user info @@ -121,6 +123,7 @@ const actions = { commit('SET_USER_INFO', data) commit('SET_NETDISK_NAME', netdiskName) commit('SET_NETDISK_LOGO', netdiskLogo) + setLogo(netdiskName, netdiskLogo) sessionStorage.setItem('store', JSON.stringify(state)) resolve(data) }).catch(error => { diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js index 88bf77c..cd94639 100644 --- a/src/utils/get-page-title.js +++ b/src/utils/get-page-title.js @@ -1,11 +1,16 @@ import defaultSettings from '@/settings' +import { getLogoName } from '@/utils/logo' + const title = defaultSettings.title || 'Vue Admin Template' export default function getPageTitle(pageTitle) { - if (pageTitle) { - console.log('title', title) - return `${pageTitle} - ${title}` + let logoName = getLogoName() + if (!logoName || logoName === 'undefined') { + logoName = title } - return `${title}` + if (pageTitle) { + return `${pageTitle} - ${logoName}` + } + return `${logoName}` } diff --git a/src/utils/logo.js b/src/utils/logo.js index bd730cc..04c8c9c 100644 --- a/src/utils/logo.js +++ b/src/utils/logo.js @@ -1,25 +1,37 @@ import Cookies from 'js-cookie' +import fileConfig from "@/utils/file-config"; +import getPageTitle from "@/utils/get-page-title"; const titleKey = 'netdisk-name' const logoKey = 'netdisk-logo' export function getLogoName() { - const res = Cookies.get(titleKey) - return !res || res === 'undefined' ? res : 'jmalcloud' + return Cookies.get(titleKey) } export function getLogo() { - const res = Cookies.get(logoKey) - return !res || res === 'undefined' ? res : '' + return Cookies.get(logoKey) } -export function setLogoName(logoName, logo) { +export function setLogo(logoName, logo) { Cookies.set(titleKey, logoName) - return Cookies.set(logoKey, logo) + Cookies.set(logoKey, logo) + setFavicon() } export function removeLogo() { Cookies.remove(titleKey) return Cookies.remove(logoKey) } + +export function setFavicon() { + const logo = getLogo() + if (logo && logo !== 'undefined') { + let link = document.querySelector("link[rel*='icon']") || document.createElement('link') + link.type = 'image/x-icon' + link.rel = 'shortcut icon' + link.href = fileConfig.logoUrl(logo) + document.getElementsByTagName('head')[0].appendChild(link) + } +} diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 94ee91c..734c1e3 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -13,7 +13,7 @@
-
{{ webstieRecord.netdiskName ? webstieRecord.netdiskName : 'jmalcloud' }}
+
{{ webstieRecord.netdiskName ? webstieRecord.netdiskName : 'JmalCloud' }}
@@ -105,6 +105,7 @@ import { getWebstieRecord } from "@/api/setting-api"; import { hasUser, initialization } from '@/api/user' import { getRememberName } from '@/utils/auth' import Logo from "@/components/Logo"; +import Bus from "@/assets/js/bus"; export default { name: 'Login', @@ -119,14 +120,12 @@ export default { } const validatePassword = (rule, value, callback) => { if (value.length < 6) { - callback(new Error('密码不能少于6位数字')) } else { callback() } } const confirmPassword = (rule, value, callback) => { if (value.length < 6) { - callback(new Error('密码不能少于6位数字')) } else if(this.loginForm.password !== value) { callback(new Error('密码不一致')) } else { @@ -189,6 +188,9 @@ export default { getWebstieRecord().then((res) => { this.webstieRecord = res.data + if (this.webstieRecord.netdiskName || this.webstieRecord.netdiskLogo) { + this.$store.dispatch('user/setLogo', {netdiskName: this.webstieRecord.netdiskName, netdiskLogo: this.webstieRecord.netdiskLogo}) + } }) }, methods: { diff --git a/src/views/setting/articles/articleManager.vue b/src/views/setting/articles/articleManager.vue index ce7f930..203051c 100644 --- a/src/views/setting/articles/articleManager.vue +++ b/src/views/setting/articles/articleManager.vue @@ -1,5 +1,5 @@