diff --git a/web/components/PageBanner.vue b/web/components/PageBanner.vue
index 75924d1..3490175 100644
--- a/web/components/PageBanner.vue
+++ b/web/components/PageBanner.vue
@@ -1,6 +1,4 @@
@@ -26,10 +25,10 @@ const props = defineProps({
HOME
{{props.item.pageName.toUpperCase()}}
- {{props.item.path}}
+ {{props.item.path}}
- {{props.item.pageName.toUpperCase()}}
+ {{props.item.pageName.toUpperCase()}}
diff --git a/web/layouts/default.vue b/web/layouts/default.vue
index d18c080..c3b34d5 100644
--- a/web/layouts/default.vue
+++ b/web/layouts/default.vue
@@ -34,9 +34,9 @@ const { data: cateRes } = await useMyFetch('/index/getCateList', "GET")
{{ $t('aboutus') }}
diff --git a/web/locales/cn.js b/web/locales/cn.js
index 7da57a2..8e60c0a 100644
--- a/web/locales/cn.js
+++ b/web/locales/cn.js
@@ -11,7 +11,7 @@ export default {
Form: {
submit: '确认送出',
},
- about: {
+ About: {
company: '公司简介',
concept: '经营理念',
},
diff --git a/web/locales/en.js b/web/locales/en.js
index 1d5d782..647db2d 100644
--- a/web/locales/en.js
+++ b/web/locales/en.js
@@ -11,7 +11,7 @@ export default {
Form: {
submit: 'Submit',
},
- about: {
+ About: {
company: 'Company Overview',
concept: 'Business Philosophy',
},
diff --git a/web/locales/tw.js b/web/locales/tw.js
index 8f6c497..c4cf969 100644
--- a/web/locales/tw.js
+++ b/web/locales/tw.js
@@ -11,7 +11,7 @@ export default {
Form: {
submit: '確認送出',
},
- about: {
+ About: {
company: '公司簡介',
concept: '經營理念',
},
diff --git a/web/nuxt.config.ts b/web/nuxt.config.ts
index 80165f9..c4bc52d 100644
--- a/web/nuxt.config.ts
+++ b/web/nuxt.config.ts
@@ -61,11 +61,6 @@ export default defineNuxtConfig({
// strategy: 'prefix',
langDir: 'locales',
locales: [
- {
- code: 'en',
- iso: 'en-US',
- file: 'en.js'
- },
{
code: 'tw',
iso: 'zh-TW',
@@ -75,6 +70,11 @@ export default defineNuxtConfig({
code: 'cn',
iso: 'zh-CN',
file: 'cn.js'
+ },
+ {
+ code: 'en',
+ iso: 'en-US',
+ file: 'en.js'
}
],
defaultLocale: 'tw',
diff --git a/web/package.json b/web/package.json
index 2dfa4f0..23098d5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -4,11 +4,13 @@
"type": "module",
"scripts": {
"build": "nuxt build --dotenv .env",
+ "build:sta": "nuxt build --dotenv .env.staging",
"dev": "nuxt dev --dotenv .env.development",
"generate": "nuxt generate --dotenv .env.staging",
"preview": "nuxt preview",
"postinstall": "nuxt prepare",
- "postbuild": "cp -r .output/* ../nuxt/app && scp -r ../nuxt/app/* root@test:/www/wwwroot/prodio.zltest.com.tw/nuxt/app"
+ "postbuild:sta": "cp -rf .output/* ../nuxt/app && scp -r ../nuxt/app/* root@test:/www/wwwroot/prodio.zltest.com.tw/nuxt/app",
+ "postbuild": "rm -rf ../../prodio.prod/web/app/* && cp -rf .output/* ../../prodio.prod/web/app"
},
"devDependencies": {
"@element-plus/nuxt": "^1.0.7",
diff --git a/web/pages/about.vue b/web/pages/about.vue
index b14de5c..a1df701 100644
--- a/web/pages/about.vue
+++ b/web/pages/about.vue
@@ -8,21 +8,31 @@ const { t } = useI18n();
const route = useRoute();
const router = useRouter();
-const bannerObj = {
- "bImg":bannerImg,
- "pageName":t('aboutus'),
- "path": t('about.company'),
- "title":"關於普達"
-}
+const bannerObj = computed(() => {
+ let title;
+
+ if( route.path.includes('/about/company') ){
+ title = t('About.company');
+ }else{
+ title = t('About.concept');
+ }
+
+ return {
+ "bImg": bannerImg,
+ "pageName": t('aboutus'),
+ "path": title,
+ "title": title
+ }
+});
const menuList = [
{
- "name": t('about.company'),
- "path":"/about/company"
+ "name": t('About.company'),
+ "path": "/about/company"
},
{
- "name": t('about.concept'),
- "path":"/about/concept"
+ "name": t('About.concept'),
+ "path": "/about/concept"
},
]
@@ -30,11 +40,11 @@ const currentRoute = ref('');
onMounted(() => {
currentRoute.value = route.path;
- console.log('route',route)
+ console.log('route', route)
});
watch(() => route.params,
- (n,o) => {
+ (n, o) => {
currentRoute.value = route.path;
}
)
@@ -44,19 +54,15 @@ watch(() => route.params,