From f9988111b1b899298b962edbf9a26d54d0fa616f Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Sat, 19 Jul 2025 17:05:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/conf/config.js | 18 +----------------- src/i18n/index.js | 3 ++- src/router/index.js | 4 ++-- src/utils/request.js | 2 +- src/views/layout/layout.vue | 17 ++++++++++++++--- src/views/user/login/Login.vue | 18 +++++++++++++++--- 6 files changed, 35 insertions(+), 27 deletions(-) diff --git a/src/conf/config.js b/src/conf/config.js index 716578ca3..beea4497c 100644 --- a/src/conf/config.js +++ b/src/conf/config.js @@ -1,20 +1,4 @@ export default { - baseUrl: 'http://localhost:9008', apiTimeout: 15000, - lang: 'zh', - url: { - userLogin: "/home/login.pcUserLogin", - getCaptcha: "/home/user.getValidCode", - // 项目管理 - projectList: '/home/project.listProject', - projectAdd: '/home/project.saveProject', - projectUpdate: '/home/project.updateProject', - projectDelete: '/home/project.deleteProject', - - // 设备管理 - machineList: '/machine/list', - machineAdd: '/machine/add', - machineUpdate: '/machine/update', - machineDelete: '/machine/delete' - } + lang: 'zh',// zh 中文 en 英文 } diff --git a/src/i18n/index.js b/src/i18n/index.js index 079acd866..9e7f7cd37 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -1,6 +1,7 @@ import Vue from 'vue' import VueI18n from 'vue-i18n' import ElementLocale from 'element-ui/lib/locale' +import config from '@/conf/config' import { messages as loginMessages } from '../views/user/login/LoginLang' import { messages as layoutMessages } from '../views/layout/LayoutLang' import { messages as commonMessages } from './commonLang' @@ -436,7 +437,7 @@ const messages = { // 创建 i18n 实例 const i18n = new VueI18n({ - locale: 'zh', + locale: config.lang, messages }) diff --git a/src/router/index.js b/src/router/index.js index 5fd7990e5..87392c624 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -750,9 +750,9 @@ router.beforeEach((to, from, next) => { } else { let _title = to.meta.title; if (!_title) { - _title = '物业官网平台' + _title = '物业管理系统' } else { - _title = _title + ' - 物业官网平台' + _title = _title + ' - 物业管理系统' } document.title = _title next() diff --git a/src/utils/request.js b/src/utils/request.js index 1f203a359..296af409b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,7 +8,7 @@ let loadingInstance = null // 创建axios实例 const service = axios.create({ - baseURL: config.baseApi, // 基础URL + baseURL: '/', // 基础URL timeout: config.apiTimeout // 请求超时时间 }) diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue index c1da7a391..d82b74bd9 100644 --- a/src/views/layout/layout.vue +++ b/src/views/layout/layout.vue @@ -3,7 +3,7 @@
- + import { _getMenuCatalog, getMenuTree, jumpToMall, jumpToIot } from '@/api/user/menuApi' import { getStoreInfo } from "@/api/user/indexApi" +import {listSystemInfo} from '@/api/system/systemInfoManageApi' import { deepCopy, setCurrentCommunity } from "@/utils/vc" import { getCommunityName, _loadCommunityInfo } from '@/api/community/communityApi' import moreCommunity from '@/components/community/moreCommunity.vue' @@ -107,13 +108,17 @@ export default { storeTypeCd: '', storeId: '' }, - + systemInfo: { + systemSimpleTitle: '', + companyName: '', + logoUrl: '' + } } }, created() { let _user = JSON.parse(localStorage.getItem('user')); this.username = _user.name - + this.getSystemInfo() this._loadStoreInfo() this.loadCatalogs() this.curCommunityName = getCommunityName() @@ -126,6 +131,12 @@ export default { searchCommunityDataList }, methods: { + async getSystemInfo() { + const { data } = await listSystemInfo({ page: 1, row: 1 }); + this.systemInfo.systemSimpleTitle = data[0].systemSimpleTitle + this.systemInfo.companyName = data[0].companyName + this.systemInfo.logoUrl = data[0].logoUrl + }, async loadCommunity() { const { communitys } = await _loadCommunityInfo() this.communitys = communitys diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue index 83bfe7cbe..a195eb391 100644 --- a/src/views/user/login/Login.vue +++ b/src/views/user/login/Login.vue @@ -1,7 +1,9 @@