From e9b6409144438d0b31b4a2a168a2155d11daf6a9 Mon Sep 17 00:00:00 2001
From: R2m1liA <15258427350@163.com>
Date: Thu, 21 Aug 2025 15:44:35 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E6=AD=A3=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BDBug=20&=20=E8=B0=83=E6=95=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/JinshenHeader.vue    | 45 +++++++++++++++++----
 app/components/MarkdownRenderer.vue |  2 +-
 app/pages/about/contact-us.vue      | 31 +++++++++-----
 app/pages/about/index.vue           | 63 ++++++++++++++++++-----------
 app/pages/index.vue                 | 62 +---------------------------
 app/pages/productions/[...slug].vue |  2 +-
 app/pages/productions/index.vue     | 11 +++--
 app/pages/solutions/index.vue       | 35 ++++++++++++++++
 i18n/locales/en.json                |  6 ++-
 i18n/locales/zh.json                |  6 ++-
 10 files changed, 150 insertions(+), 113 deletions(-)
 create mode 100644 app/pages/solutions/index.vue

diff --git a/app/components/JinshenHeader.vue b/app/components/JinshenHeader.vue
index 1083f90..6df30f6 100644
--- a/app/components/JinshenHeader.vue
+++ b/app/components/JinshenHeader.vue
@@ -8,17 +8,17 @@
 
 
         <!-- 导航菜单 -->
-        <el-menu default-active="productions" class="header-menu" mode="horizontal" :ellipsis="false" router>
-            <el-menu-item :index="$localePath('/productions')">
+        <el-menu :default-active="activeName" class="header-menu" mode="horizontal" :ellipsis="false" :persistent="false" router>
+            <el-menu-item index="productions" :route="$localePath('/productions')">
                 <span class="title">{{ $t('navigation.productions') }}</span>
             </el-menu-item>
-            <el-menu-item :index="$localePath('/solutions')">
+            <el-menu-item index="solutions" :route="$localePath('/solutions')">
                 <span class="title">{{ $t('navigation.solutions') }}</span>
             </el-menu-item>
-            <el-menu-item :index="$localePath('/support')">
+            <el-menu-item index="support" :route="$localePath('/support')">
                 <span class="title">{{ $t('navigation.support') }}</span>
             </el-menu-item>
-            <el-menu-item :index="$localePath('/about')">
+            <el-menu-item index="about" :route="$localePath('/about')">
                 <span class="title">{{ $t('navigation.about-us') }}</span>
             </el-menu-item>
         </el-menu>
@@ -46,10 +46,14 @@ v-model="searchQuery" class="search-input" :placeholder="$t('search-placeholder'
 <script setup lang="ts">
 import { Search } from '@element-plus/icons-vue';
 
+const router = useRouter();
+
 const { setLocale } = useI18n();
 
 const searchQuery = ref('')
 
+const activeName = ref('')
+
 const handleSearch = () => {
     if (searchQuery.value.trim()) {
         // 这里可以添加搜索逻辑，例如导航到搜索结果页面
@@ -58,6 +62,22 @@ const handleSearch = () => {
         // router.push({ path: '/search', query: { q: searchQuery.value } });
     }
 }
+
+onMounted(() => {
+    const path = router.currentRoute.value.path;
+    if (path.startsWith('/productions')) {
+        activeName.value = 'productions';
+    } else if (path.startsWith('/solutions')) {
+        activeName.value = 'solutions';
+    } else if (path.startsWith('/support')) {
+        activeName.value = 'support';
+    } else if (path.startsWith('/about')) {
+        activeName.value = 'about';
+    } else {
+        activeName.value = '';
+    }
+    console.log('Current path:', path, 'Active menu:', activeName.value);
+})
 </script>
 
 <style scoped>
@@ -66,7 +86,7 @@ const handleSearch = () => {
     padding: 0 10px;
     display: flex;
     align-items: center;
-    border-bottom: 1px solid #e0e0e0;
+    /* border-bottom: 1px solid #e0e0e0; */
 }
 
 .logo-section {
@@ -82,7 +102,7 @@ const handleSearch = () => {
 }
 
 .website-logo {
-    height: 64px;
+    height: 80px;
     width: auto;
 }
 
@@ -93,7 +113,16 @@ const handleSearch = () => {
 }
 
 .header-menu .el-menu-item {
-    border-bottom: none !important;
+    font-size: 16px;
+    background-color: transparent !important;
+}
+
+.header-menu .el-menu-item:active {
+    border-bottom: 2px solid var(--el-color-primary);
+}
+
+.header-menu .el-menu-item:hover {
+    border-bottom: 2px solid var(--el-color-primary);
 }
 
 .header-actions {
diff --git a/app/components/MarkdownRenderer.vue b/app/components/MarkdownRenderer.vue
index eb09b74..ecfdfbc 100644
--- a/app/components/MarkdownRenderer.vue
+++ b/app/components/MarkdownRenderer.vue
@@ -11,11 +11,11 @@ interface Props {
 
 const props = defineProps<Props>()
 
-
 const contentWithAbsoluteUrls = convertMedia(props.content)
 
 // 将 Markdown 转换成 HTML
 const safeHtml = computed(() => renderMarkdown(contentWithAbsoluteUrls))
+// const safeHtml = computed(() => renderMarkdown(props.content))
 
 </script>
 
diff --git a/app/pages/about/contact-us.vue b/app/pages/about/contact-us.vue
index 06f70a2..5547ed0 100644
--- a/app/pages/about/contact-us.vue
+++ b/app/pages/about/contact-us.vue
@@ -1,16 +1,21 @@
 <template>
-    <div>
-        <el-breadcrumb class="breadcrumb" separator="/">
-            <el-breadcrumb-item class="text-sm opacity-50" :to="{ path: $localePath('/') }">
-                {{ $t('navigation.home') }}
-            </el-breadcrumb-item>
-            <el-breadcrumb-item class="text-sm opacity-50">
-                {{ $t('contact-info') }}
-            </el-breadcrumb-item>
-        </el-breadcrumb>
+    <div class="page-container">
+        <div v-if="content">
+            <el-breadcrumb class="breadcrumb" separator="/">
+                <el-breadcrumb-item class="text-sm opacity-50" :to="{ path: $localePath('/') }">
+                    {{ $t('navigation.home') }}
+                </el-breadcrumb-item>
+                <el-breadcrumb-item class="text-sm opacity-50">
+                    {{ $t('navigation.contact-info') }}
+                </el-breadcrumb-item>
+            </el-breadcrumb>
 
-        <div class="content">
-            <markdown-renderer :content="content || ''" />
+            <div class="content">
+                <markdown-renderer :content="content || ''" />
+            </div>
+        </div>
+        <div v-else class="loading">
+            <el-skeleton :rows="5" animated />
         </div>
     </div>
 </template>
@@ -41,6 +46,10 @@ onMounted(async () => {
 </script>
 
 <style scoped>
+.page-container {
+    padding: 2rem 1rem;
+}
+
 .breadcrumb {
     padding: 1rem 1rem;
 }
diff --git a/app/pages/about/index.vue b/app/pages/about/index.vue
index 1c41983..68cdb55 100644
--- a/app/pages/about/index.vue
+++ b/app/pages/about/index.vue
@@ -1,27 +1,34 @@
 <template>
-    <div>
-        <el-breadcrumb class="breadcrumb" separator="/">
-            <el-breadcrumb-item class="text-sm opacity-50" :to="{ path: $localePath('/') }">
-                {{ $t('navigation.home') }}
-            </el-breadcrumb-item>
-            <el-breadcrumb-item class="text-sm opacity-50">
-                {{ $t('about-us') }}
-            </el-breadcrumb-item>
-        </el-breadcrumb>
+    <div class="page-container">
+        <div v-if="content">
+            <el-breadcrumb class="breadcrumb" separator="/">
+                <el-breadcrumb-item class="text-sm opacity-50" :to="{ path: $localePath('/') }">
+                    {{ $t('navigation.home') }}
+                </el-breadcrumb-item>
+                <el-breadcrumb-item class="text-sm opacity-50">
+                    {{ $t('navigation.about-us') }}
+                </el-breadcrumb-item>
+            </el-breadcrumb>
 
-        <div class="content">
-            <markdown-renderer :content="content || ''" />
+            <div class="content">
+                <markdown-renderer :content="content || ''" />
+            </div>
+
+            <el-divider content-position="left">更多信息</el-divider>
+            <div class="button-group">
+                <NuxtLink :to="$localePath('/about/contact-us')">
+                    <el-card class="card-button">
+                        <el-icon class="icon" size="80">
+                            <ElIconService />
+                        </el-icon>
+                        <br>
+                        联系信息
+                    </el-card>
+                </NuxtLink>
+            </div>
         </div>
-
-        <el-divider content-position="left">更多信息</el-divider>
-        <div class="button-group">
-            <NuxtLink :to="$localePath('/about/contact-us')">
-                <el-card class="card-button">
-                    <el-icon class="icon" size="80"><ElIconService /></el-icon>
-                    <br>
-                    联系信息
-                </el-card>
-            </NuxtLink>
+        <div v-else class="loading">
+            <el-skeleton :rows="5" animated />
         </div>
     </div>
 </template>
@@ -32,12 +39,11 @@ const { getStrapiLocale } = useLocalizations()
 
 const strapiLocale = getStrapiLocale()
 
-const content = ref<string>('')
+const content = ref<string | null>(null)
 
 onMounted(async () => {
     try {
         const response = await findOne<StrapiCompanyProfile>('company-profile', undefined, {
-            populate: '*',
             locale: strapiLocale,
         })
         if (response.data) {
@@ -52,6 +58,10 @@ onMounted(async () => {
 </script>
 
 <style scoped>
+.page-container {
+    padding: 2rem 1rem;
+}
+
 .breadcrumb {
     padding: 1rem 1rem;
 }
@@ -99,4 +109,11 @@ onMounted(async () => {
 .icon {
     padding: 10px;
 }
+
+.loading {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 1rem;
+}
 </style>
\ No newline at end of file
diff --git a/app/pages/index.vue b/app/pages/index.vue
index 1ec4404..a54d75b 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -1,29 +1,6 @@
 <template>
   <div class="homepage">
-    <div class="hero-section">
-      <h1>{{ $t('company-name') }}</h1>
-      <p>{{ $t('company-description') }}</p>
-      <el-button type="primary" size="large">
-        {{ $t('learn-more') }}
-      </el-button>
-    </div>
-    
-    <div class="content-sections">
-      <div class="section">
-        <h2>{{ $t('productions') }}</h2>
-        <p>{{ $t('productions-desc') }}</p>
-      </div>
-      
-      <div class="section">
-        <h2>{{ $t('solutions') }}</h2>
-        <p>{{ $t('solutions-desc') }}</p>
-      </div>
-      
-      <div class="section">
-        <h2>{{ $t('support') }}</h2>
-        <p>{{ $t('support-desc') }}</p>
-      </div>
-    </div>
+    <p>主页还没做^^</p>
   </div>
 </template>
 
@@ -32,43 +9,6 @@
   padding: 2rem;
 }
 
-.hero-section {
-  text-align: center;
-  padding: 4rem 0;
-  background: linear-gradient(135deg, var(--el-color-primary-light-3), var(--el-color-primary));
-  border-radius: 8px;
-  margin-bottom: 3rem;
-  color: white;
-}
-
-.hero-section h1 {
-  font-size: 3rem;
-  margin-bottom: 1rem;
-}
-
-.hero-section p {
-  font-size: 1.2rem;
-  margin-bottom: 2rem;
-}
-
-.content-sections {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-  gap: 2rem;
-}
-
-.section {
-  padding: 2rem;
-  background: var(--el-bg-color);
-  border-radius: 8px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-}
-
-.section h2 {
-  color: var(--el-color-primary);
-  margin-bottom: 1rem;
-}
-
 .section p {
   color: var(--el-text-color-regular);
   line-height: 1.6;
diff --git a/app/pages/productions/[...slug].vue b/app/pages/productions/[...slug].vue
index 9972f6b..ee9a95b 100644
--- a/app/pages/productions/[...slug].vue
+++ b/app/pages/productions/[...slug].vue
@@ -5,7 +5,7 @@
       <el-breadcrumb class="breadcrumb" separator="/">
         <el-breadcrumb-item class="text-sm opacity-50" :to="{ path: $localePath('/') }">{{ $t('navigation.home')
           }}</el-breadcrumb-item>
-        <el-breadcrumb-item class="text-sm opacity-50" :to="{ path: $localePath('/productions') }">{{ $t('productions')
+        <el-breadcrumb-item class="text-sm opacity-50" :to="{ path: $localePath('/productions') }">{{ $t('navigation.productions')
           }}</el-breadcrumb-item>
         <el-breadcrumb-item class="text-sm opactiy-50">{{ production.title }}</el-breadcrumb-item>
       </el-breadcrumb>
diff --git a/app/pages/productions/index.vue b/app/pages/productions/index.vue
index 0377ac5..c63baa4 100644
--- a/app/pages/productions/index.vue
+++ b/app/pages/productions/index.vue
@@ -3,10 +3,10 @@
         <div class="page-header">
             <h1 class="page-title">{{ $t('our-productions') }}</h1>
             <el-breadcrumb class="breadcrumb">
-                <el-breadcrumb-item class="text-sm opacity-50">
+                <el-breadcrumb-item class="text-md opacity-50">
                     <NuxtLink :to="$localePath('/')">{{ $t('navigation.home') }}</NuxtLink>
                 </el-breadcrumb-item>
-                <el-breadcrumb-item class="text-sm opacity-50">
+                <el-breadcrumb-item class="text-md opacity-50">
                     <NuxtLink :to="$localePath('/productions')">{{ $t('navigation.productions') }}</NuxtLink>
                 </el-breadcrumb-item>
             </el-breadcrumb>
@@ -91,15 +91,19 @@ onMounted(async () => {
 </script>
 
 <style scoped>
+.page-container {
+    padding: 2rem 1rem;
+}
+
 .page-header {
     display: flex;
-    padding: 20px;
 }
 
 .page-title {
     font-size: 2rem;
     font-weight: bold;
     color: var(--el-color-primary);
+    margin-bottom: 20px;
 }
 
 .breadcrumb {
@@ -110,7 +114,6 @@ onMounted(async () => {
     display: flex;
     flex-direction: column;
     gap: 40px;
-    padding: 20px;
 }
 
 .production-group {
diff --git a/app/pages/solutions/index.vue b/app/pages/solutions/index.vue
new file mode 100644
index 0000000..6fb521a
--- /dev/null
+++ b/app/pages/solutions/index.vue
@@ -0,0 +1,35 @@
+<template>
+    <div class="page-container">
+        <div class="page-header">
+            <h1 class="page-title">{{ $t('get-our-solutions') }}</h1>
+            <el-breadcrumb class="breadcrumb">
+                <el-breadcrumb-item class="text-md opacity-50">
+                    <NuxtLink :to="$localePath('/')">{{ $t('navigation.home') }}</NuxtLink>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item class="text-md opacity-50">
+                    <NuxtLink :to="$localePath('/solutions')">{{ $t('navigation.solutions') }}</NuxtLink>
+                </el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+    </div>
+</template>
+
+<style scoped>
+.page-container {
+    padding: 2rem 1rem;
+}
+
+.page-header {
+    display: flex;
+}
+
+.page-title {
+    font-size: 2rem;
+    font-weight: bold;
+    color: var(--el-color-primary);
+}
+
+.breadcrumb {
+    margin-left: auto;
+}
+</style>
\ No newline at end of file
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 26f0bc9..2d3f368 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -14,7 +14,8 @@
     "productions": "Productions",
     "solutions": "Solutions",
     "support": "Support",
-    "about-us": "About Us"
+    "about-us": "About Us",
+    "contact-info": "Contact Info"
   },
   "contact-info": "Contact Us",
   "telephone": "Telephone",
@@ -32,5 +33,6 @@
   "back-to-productions": "Back to Products",
   "no-content-available": "No detailed information available",
   "loading": "Loading...",
-  "our-productions": "Our Productions"
+  "our-productions": "Our Productions",
+  "get-our-solutions": "Get Our Solutions"
 }
diff --git a/i18n/locales/zh.json b/i18n/locales/zh.json
index 6bc4dcb..5705c85 100644
--- a/i18n/locales/zh.json
+++ b/i18n/locales/zh.json
@@ -14,7 +14,8 @@
     "productions": "产品中心",
     "solutions": "解决方案",
     "support": "服务支持",
-    "about-us": "关于我们"
+    "about-us": "关于我们",
+    "contact-info": "联系信息"
   },
   "contact-info": "联系我们",
   "telephone": "电话",
@@ -32,5 +33,6 @@
   "back-to-productions": "返回产品列表",
   "no-content-available": "暂无详细信息",
   "loading": "加载中...",
-  "our-productions": "我们的产品"
+  "our-productions": "我们的产品",
+  "get-our-solutions": "了解我们的解决方案"
 }