From 24a24d895d16d9183a857082bbfabbf5bc2d0be0 Mon Sep 17 00:00:00 2001 From: Wayne Date: Sun, 9 Jun 2024 11:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4prodio=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E9=83=A8=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/package.json | 2 + admin/src/config/config.js | 2 +- admin/src/config/default/setting.config.js | 6 +- admin/src/layouts/header/index.vue | 4 +- admin/src/layouts/menu/index.vue | 36 ++++++------ ...mpose-dev.yaml => docker-compose-prod.yaml | 52 ++++++++---------- web/app.vue | 4 +- web/assets/css/main.css | 22 ++++++-- web/assets/img/contact.jpg | Bin 467440 -> 82809 bytes web/assets/img/news.jpg | Bin 456418 -> 186336 bytes web/assets/img/pageBanner/p3.jpg | Bin 887927 -> 205439 bytes web/assets/img/product_bg.jpg | Bin 3563056 -> 102729 bytes web/assets/sass/page/_social.scss | 2 +- web/layouts/default.vue | 34 ++++-------- web/locales/cn.js | 1 - web/locales/en.js | 1 - web/locales/tw.js | 3 +- web/package.json | 2 + web/pages/about.vue | 4 -- web/pages/index.vue | 8 +-- web/pages/products/list/[cat_id].vue | 9 +-- web/pages/social.vue | 8 --- 22 files changed, 93 insertions(+), 107 deletions(-) rename docker-compose-dev.yaml => docker-compose-prod.yaml (62%) diff --git a/admin/package.json b/admin/package.json index 3a7975c..96463a3 100644 --- a/admin/package.json +++ b/admin/package.json @@ -6,9 +6,11 @@ "scripts": { "dev": "vite", "build": "vite build", + "build:hot": "vite build", "build:sta": "vite build --mode staging", "preview": "vite preview", "postbuild:sta": "scp -r ./dist/* root@207.148.89.145:/www/wwwroot/prodio.zltest.com.tw/public/admin", + "postbuild:hot": "scp -r ./dist/* root@207.246.102.73:/opt/wwwroot/weisen/nginx/html/admin", "postbuild": "cp -rf ./dist/* ../../prodio.prod/nginx/html/admin" }, "dependencies": { diff --git a/admin/src/config/config.js b/admin/src/config/config.js index d811456..0443dc6 100644 --- a/admin/src/config/config.js +++ b/admin/src/config/config.js @@ -1,5 +1,5 @@ let config = { - systemName: "普達後台管理系統", + systemName: "後台管理系統", theme: { color: "#13c2c2", mode: "dark", diff --git a/admin/src/config/default/setting.config.js b/admin/src/config/default/setting.config.js index b89ad1f..4960d28 100644 --- a/admin/src/config/default/setting.config.js +++ b/admin/src/config/default/setting.config.js @@ -1,5 +1,5 @@ export default { - // lang: 'tw', //語言，可選 CN(簡體)、TW(繁體)、US(英語)，也可擴充套件其它語言 + // lang: 'tw', //語言，可選 CN(簡體)、TW(繁體)、US(英語)，也可擴充套件其它語言 theme: { //主題 color: '#1890ff', //主題色 mode: 'dark', //主題模式 可選 dark、 light 和 night @@ -16,8 +16,8 @@ export default { multiPage: false, //多頁籤模式，true:開啟，false:不開啟 cachePage: true, //是否快取頁面資料，僅多頁籤模式下生效，true 快取, false 不快取 hideSetting: true, //隱藏設定抽屜，true:隱藏，false:不隱藏 - systemName: '管理系統', //系統名稱 - copyright: '2023 ZL corp.', //copyright + systemName: '管理系統', //系統名稱 + copyright: '2023 corp.', //copyright asyncRoutes: false, //非同步載入路由，true:開啟，false:不開啟 showPageTitle: true, //是否顯示頁面標題（PageLayout 佈局中的頁面標題），true:顯示，false:不顯示 filterMenu: true, //根據許可權過濾選單，true:過濾，false:不過濾 diff --git a/admin/src/layouts/header/index.vue b/admin/src/layouts/header/index.vue index a2e554d..759725a 100644 --- a/admin/src/layouts/header/index.vue +++ b/admin/src/layouts/header/index.vue @@ -66,7 +66,7 @@ const handleClick = () => {