From 7a899c2445082a73b527d0a5965695e1b3ce0444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 12 Nov 2024 13:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/cms/cmsNavigation/model/index.ts |  2 ++
 composables/configState.ts           | 18 +++++------
 nuxt.config.ts                       |  4 +--
 pages/components/AboutUs.vue         | 35 ++++++++++------------
 pages/components/Carousel.vue        | 18 +++++++----
 pages/components/CompanyStyle.vue    | 45 +++++++++++++---------------
 pages/components/NewsCenter.vue      | 34 ++++++++++++++++-----
 pages/components/VideoCenter.vue     | 23 +++++---------
 pages/index.vue                      | 30 ++++++++++++-------
 9 files changed, 114 insertions(+), 95 deletions(-)

diff --git a/api/cms/cmsNavigation/model/index.ts b/api/cms/cmsNavigation/model/index.ts
index 39deea9..66529e2 100644
--- a/api/cms/cmsNavigation/model/index.ts
+++ b/api/cms/cmsNavigation/model/index.ts
@@ -1,4 +1,5 @@
 import type { PageParam } from '@/api';
+import type {CmsDesign} from "~/api/cms/cmsDesign/model";
 
 /**
  * 网站导航记录表
@@ -77,6 +78,7 @@ export interface CmsNavigation {
   disabled?: boolean;
   label?: string;
   value?: number;
+  design?: CmsDesign;
 }
 
 /**
diff --git a/composables/configState.ts b/composables/configState.ts
index bee2c09..74782dd 100644
--- a/composables/configState.ts
+++ b/composables/configState.ts
@@ -1,37 +1,35 @@
 import { useState } from '#imports';
-import type { Config } from '~/types/global';
-import type {Website} from "~/api/cms/website/model";
-import type {Navigation} from "~/api/cms/navigation/model";
+import type {CmsWebsite} from "~/api/cms/cmsWebsite/model";
+import type {CmsNavigation} from "~/api/cms/cmsNavigation/model";
 import type {User} from "~/api/system/user/model";
 import type {Company} from "~/api/system/company/model";
-import type {MyCart, ShopCart} from "~/api/shop/shopCart/model";
 
 // 网站信息
 export const useWebsite = () =>
-    useState<Website>('website', () => {
+    useState<CmsWebsite>('website', () => {
         return {};
     });
 
 // 参数配置
 export const useConfigInfo = () =>
-  useState<Config>('config', () => {
+  useState<any>('config', () => {
     return {};
   });
 
 // 主导航
 export const useMenu = () =>
-    useState<Navigation[]>('menu', () => {
+    useState<CmsNavigation[]>('menu', () => {
         return [];
     });
 
 // 副导航
 export const useSubMenu = () =>
-    useState<Navigation[]>('subMenu', () => {
+    useState<CmsNavigation[]>('subMenu', () => {
         return [];
     });
 
 // 页面元素
-export const useForm = () => useState<Navigation>('form', () => {
+export const useForm = () => useState<CmsNavigation>('form', () => {
     return {};
 });
 
@@ -73,7 +71,7 @@ export const useCompany = () =>
 export const useShowLogin = () => useState('showLogin',() => false)
 
 // 购物车状态
-export const useCart = () => useState<MyCart>('cart', () => {
+export const useCart = () => useState<any>('cart', () => {
     return {
         num: 1,
         type: 1,
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 7ad9dfd..53090e6 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -27,11 +27,11 @@ export default defineNuxtConfig({
         }
     },
     devServer: {
-        port: 10301
+        port: 10304
     },
     runtimeConfig: {
         public: {
-            tenantId: 10301,
+            tenantId: 10304,
             // 开发环境配置
             // apiServer: 'http://127.0.0.1:9002/api',
             // 生产环境
diff --git a/pages/components/AboutUs.vue b/pages/components/AboutUs.vue
index ea46967..599e900 100644
--- a/pages/components/AboutUs.vue
+++ b/pages/components/AboutUs.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-full bg-white pb-20 mb-3 relative" style="background: url('https://oss.wsdns.cn/20241109/247155f6063c4cee91421569b974975b.png') no-repeat center">
+  <div class="w-full bg-white pb-20 mb-3 relative" :style="`background: url('${config?.IndexAboutBg}') no-repeat center`">
     <div class="text-center flex flex-col items-center py-15 relative">
       <div class="sub-title">
         <p class="text-gray-200 text-6xl font-bold dark:text-gray-700 py-0 line-height-5">
@@ -10,10 +10,10 @@
         {{ title }}
       </h2>
     </div>
-    <div class="xl:w-screen-xl m-auto text-xl flex justify-between" v-if="indexAboutInfo">
-      <p class="indent-xl max-w-3/5 px-4" :class="indexAboutInfo.style" style="font-family: Source Han Serif, SimSun,serif">{{ indexAboutInfo.value }}</p>
+    <div class="xl:w-screen-xl m-auto text-xl flex justify-between" v-if="config?.IndexAboutInfo">
+      <p class="indent-xl max-w-3/5 px-4" :class="config?.IndexAboutStyle" style="font-family: Source Han Serif, SimSun,serif">{{ config?.IndexAboutInfo }}</p>
       <div class="carousel px-3 text-center">
-        <el-image :src="indexAboutImg?.value" />
+        <el-image :src="config?.IndexAboutImg" />
       </div>
     </div>
   </div>
@@ -23,11 +23,12 @@
 
 <script setup lang="ts">
 import {useServerRequest} from "~/composables/useServerRequest";
-import type {ApiResult, PageResult} from "~/api";
-import type {CmsArticle} from "~/api/cms/cmsArticle/model";
+import type {ApiResult} from "~/api";
+import type {Config} from "~/types/global";
 
 const props = withDefaults(
     defineProps<{
+      config?: any;
       title?: string;
       comments?: string;
     }>(),
@@ -38,22 +39,16 @@ const emit = defineEmits<{
   (e: 'done'): void;
 }>();
 
-const indexAboutInfo = ref();
-const indexAboutImg = ref();
 
 // 请求数据
-const reload = async () => {
-  const {data: IndexAboutInfo} = await useServerRequest<ApiResult<PageResult<CmsArticle>>>('/cms/cms-website-field/10733', {
-    baseURL: 'https://server.gxwebsoft.com/api'
-  })
-  const {data: IndexAboutImg} = await useServerRequest<ApiResult<PageResult<CmsArticle>>>('/cms/cms-website-field/10734', {
-    baseURL: 'https://server.gxwebsoft.com/api'
-  })
-  indexAboutInfo.value = IndexAboutInfo.value?.data;
-  indexAboutImg.value = IndexAboutImg.value?.data;
-}
-
-reload();
+// const reload = async () => {
+  // const { data: fields } = await useServerRequest<ApiResult<Config>>('/cms/cms-website-field/config', {baseURL: 'https://server.gxwebsoft.com/api',});
+  // if (fields.value?.data) {
+    // config.value = fields.value?.data;
+  // }
+// }
+
+// reload();
 </script>
 
 <style lang="less">
diff --git a/pages/components/Carousel.vue b/pages/components/Carousel.vue
index 303f4f8..086d0f2 100644
--- a/pages/components/Carousel.vue
+++ b/pages/components/Carousel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-full bg-white mt-[60px] mb-3">
+  <div class="w-full bg-white mt-[60px] mb-3" v-if="ad">
     <el-carousel indicator-position="none" :height="ad?.height">
       <el-carousel-item v-for="(item,index) in ad?.imgArr" :key="index">
         <div class="item relative" @click="openSpmUrl(`https://www.baidu.com`)">
@@ -18,6 +18,7 @@ import type {CmsAd} from "~/api/cms/cmsAd/model";
 
 const props = withDefaults(
     defineProps<{
+      config?: any;
       list?: any[];
       disabled?: boolean;
       title?: string;
@@ -42,12 +43,17 @@ const where = reactive<CompanyParam>({
 
 // 请求数据
 const reload = async () => {
-  const {data: response} = await useServerRequest<ApiResult<CmsAd>>('/cms/cms-ad/287')
-  if (response.value?.data) {
-    ad.value = response.value.data;
-    console.log(ad.value,'adsss')
+  const {data: response} = await useServerRequest<ApiResult<PageResult<CmsAd>>>('/cms/cms-ad/page',{params: {adType: '幻灯片',pageName: '首页'}})
+  if (response.value?.data?.list) {
+    ad.value = response.value.data?.list[0];
   }
 }
 
-reload();
+watch(
+    () => props.config,
+    () => {
+      reload();
+    },
+    {immediate: true}
+);
 </script>
diff --git a/pages/components/CompanyStyle.vue b/pages/components/CompanyStyle.vue
index bb64f5f..dcb5e12 100644
--- a/pages/components/CompanyStyle.vue
+++ b/pages/components/CompanyStyle.vue
@@ -1,7 +1,4 @@
 <template>
-<!--  <div class="relative">-->
-<!--    <el-image src="https://oss.wsdns.cn/20241108/dbb0ef723f414394bbf6736818f7ac2c.png" class="absolute top-0 z-0" />-->
-<!--  </div>-->
   <div class="w-full bg-gray-100 pb-20">
     <div class="text-center flex flex-col items-center py-15 relative ">
       <div class="sub-title">
@@ -29,12 +26,12 @@
 <script setup lang="ts">
 import {useServerRequest} from "~/composables/useServerRequest";
 import type {ApiResult, PageResult} from "~/api";
-import type {CmsArticle} from "~/api/cms/cmsArticle/model";
 import type {FileRecord} from "~/api/system/file/model";
-import {openSpmUrl} from "~/utils/common";
 
 const props = withDefaults(
     defineProps<{
+      config?: any;
+      groupId?: number;
       title?: string;
       comments?: string;
     }>(),
@@ -50,25 +47,25 @@ const emit = defineEmits<{
 
 const list = ref<FileRecord[]>([])
 
-const {data: response} = await useServerRequest<ApiResult<PageResult<PageResult<FileRecord>>>>('/file/page',{
-  baseURL: 'https://server.gxwebsoft.com/api',
-  query: {
-    groupId: 2517
-  }
-})
-if(response.value?.data){
-  if(response.value?.data.list){
-    list.value = response.value?.data.list
+const reload = async () => {
+  const {data: response} = await useServerRequest<ApiResult<PageResult<FileRecord>>>('/file/page',{
+    baseURL: 'https://server.gxwebsoft.com/api',
+    query: {
+      groupId: props.groupId
+    }
+  })
+  if(response.value?.data){
+    if(response.value?.data.list){
+      list.value = response.value?.data.list
+    }
   }
 }
-</script>
 
-<style lang="less">
-/* 在全局样式表如 app.css 或 styles.css 中添加 */
-.el-tabs__item {
-  font-size: 3em; /* 调整为你想要的字体大小 */
-}
-.custom-tabs .el-tabs__item {
-  font-size: 22px; /* 调整为你想要的字体大小 */
-}
-</style>
+watch(
+    () => props.groupId,
+    () => {
+      reload();
+    },
+    {immediate: true}
+);
+</script>
diff --git a/pages/components/NewsCenter.vue b/pages/components/NewsCenter.vue
index b23cf4b..becd213 100644
--- a/pages/components/NewsCenter.vue
+++ b/pages/components/NewsCenter.vue
@@ -28,11 +28,7 @@
         <el-col :span="13">
           <div class="tabs px-10 w-full">
             <el-tabs class="custom-tabs" v-model="categoryId" @tab-change="handleClick">
-              <el-tab-pane label="企业新闻" :name="939" class="text-xl" />
-              <el-tab-pane label="媒体报道" :name="940">
-              </el-tab-pane>
-              <el-tab-pane label="出资企业聚焦" :name="941">
-              </el-tab-pane>
+              <el-tab-pane v-for="(cate,index) in category?.data" :key="index" :label="cate.title" :name="cate.navigationId" class="text-xl" />
             </el-tabs>
             <template v-for="(item,index) in list" :key="index">
               <li class="flex justify-between py-2">
@@ -57,9 +53,12 @@ import type {ApiResult, PageResult} from "~/api";
 import type {CmsArticle} from "~/api/cms/cmsArticle/model";
 import type {CompanyParam} from "~/api/system/company/model";
 import {TENANT_ID} from "~/config";
+import type {CmsNavigation} from "~/api/cms/cmsNavigation/model";
 
 const props = withDefaults(
     defineProps<{
+      config?: any;
+      parentId?: number;
       list?: any[];
       disabled?: boolean;
       title?: string;
@@ -75,9 +74,10 @@ const emit = defineEmits<{
   (e: 'done'): void;
 }>();
 
+const category = ref<ApiResult<CmsNavigation[]>>();
 const list = ref<CmsArticle[]>([]);
 const hotList = ref<CmsArticle[]>([]);
-const categoryId = ref(939)
+const categoryId = ref();
 
 // 搜索表单
 const where = reactive<CompanyParam>({
@@ -99,6 +99,20 @@ if (hotResponse.value?.data) {
   hotList.value = hotResponse.value?.data.list
 }
 
+// 请求文章栏目
+const getCategory = async () => {
+  const { data: categoryInfo } = await useServerRequest<ApiResult<CmsNavigation[]>>('/cms/cms-navigation', {
+    params: {
+      parentId: props.parentId
+    }
+  })
+  if(categoryInfo.value){
+    category.value = categoryInfo.value
+    categoryId.value = categoryInfo.value?.data && categoryInfo.value?.data[0].navigationId
+  }
+  await reload();
+}
+
 // 请求数据
 const reload = async () => {
   const {data: response} = await useServerRequest<ApiResult<PageResult<CmsArticle>>>('/cms/cms-article/page', {
@@ -112,5 +126,11 @@ const reload = async () => {
   }
 }
 
-reload();
+watch(
+    () => props.parentId,
+    () => {
+      getCategory();
+    },
+    {immediate: true}
+);
 </script>
diff --git a/pages/components/VideoCenter.vue b/pages/components/VideoCenter.vue
index 6b486d4..9b61415 100644
--- a/pages/components/VideoCenter.vue
+++ b/pages/components/VideoCenter.vue
@@ -10,14 +10,14 @@
         {{ title }}
       </h2>
     </div>
-    <div class="xl:w-screen-xl m-auto text-xl">
-      <div class="carousel py-3 text-center" v-if="indexVideo">
+    <div class="xl:w-screen-xl m-auto text-xl" v-if="config">
+      <div class="carousel py-3 text-center" v-if="config?.IndexVideoCenter">
         <video id="my-video" class="video-js vjs-default-skin" controls preload="auto" width="900" height="510"
-               :poster="indexVideoImg?.value" data-setup="{}">
-          <source :src="indexVideo?.value" type="video/mp4">
+               :poster="config?.IndexVideoImg" data-setup="{}">
+          <source :src="config?.IndexVideoCenter" type="video/mp4">
           <p class="vjs-no-js">
             To view this video please enable JavaScript, and consider upgrading to a web browser that
-            <a :href="indexVideo?.value" target="_blank">supports HTML5 video</a>
+            <a :href="config?.IndexVideoCenter" target="_blank">supports HTML5 video</a>
           </p>
         </video>
       </div>
@@ -26,12 +26,10 @@
 </template>
 
 <script setup lang="ts">
-import {useServerRequest} from "~/composables/useServerRequest";
-import type {ApiResult, PageResult} from "~/api";
-import type {CmsArticle} from "~/api/cms/cmsArticle/model";
 
 const props = withDefaults(
     defineProps<{
+      config?: any;
       list?: any[];
       disabled?: boolean;
       title?: string;
@@ -52,14 +50,7 @@ const indexVideoImg = ref();
 
 // 请求数据
 const reload = async () => {
-  const {data: IndexVideo} = await useServerRequest<ApiResult<PageResult<CmsArticle>>>('/cms/cms-website-field/10735', {
-    baseURL: 'https://server.gxwebsoft.com/api'
-  })
-  const {data: IndexVideoImg} = await useServerRequest<ApiResult<PageResult<CmsArticle>>>('/cms/cms-website-field/10736', {
-    baseURL: 'https://server.gxwebsoft.com/api'
-  })
-  indexVideo.value = IndexVideo.value?.data;
-  indexVideoImg.value = IndexVideoImg.value?.data;
+
 }
 
 reload();
diff --git a/pages/index.vue b/pages/index.vue
index 0df01b1..a22eece 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -2,15 +2,15 @@
 
 <!--    <Flash/>-->
 
-    <Carousel />
+    <Carousel v-if="config" />
 
-    <NewsCenter title="新闻中心" comments="News Center"/>
+    <NewsCenter title="新闻中心" v-if="config" :parentId="parentId" :config="config" comments="News Center"/>
 
-    <AboutUs title="关于我们" comments="About Us"/>
+    <AboutUs title="关于我们" v-if="config" :config="config" comments="About Us"/>
 
-    <VideoCenter title="视频中心" comments="Video Center" />
+    <VideoCenter title="视频中心" v-if="config" :config="config" comments="Video Center" />
 
-    <CompanyStyle title="公司风采" comments="Company Style" />
+    <CompanyStyle title="公司风采" v-if="config" :groupId="groupId" :config="config" comments="Company Style" />
 
 
 <!--  <CompanyList :param="{official: true,recommend: true,limit: 4}" :fit="`cover`"  title="产品服务" comments="拥抱开源、坚守品质；致力于打造安全稳定高可用的WEB应用！"/>-->
@@ -20,7 +20,7 @@
 </template>
 <script setup lang="ts">
 import {useConfigInfo, useForm, useToken, useWebsite} from "~/composables/configState";
-import type {BreadcrumbItem} from "~/types/global";
+import type {BreadcrumbItem, Config} from "~/types/global";
 import Flash from './components/Flash.vue';
 import ArticleList from './components/ArticleList.vue';
 import NewsCenter from "~/pages/components/NewsCenter.vue";
@@ -28,21 +28,24 @@ import AboutUs from "~/pages/components/AboutUs.vue";
 import VideoCenter from "~/pages/components/VideoCenter.vue";
 import CompanyStyle from "~/pages/components/CompanyStyle.vue";
 import Carousel from "~/pages/components/Carousel.vue";
+import type {ApiResult} from "~/api";
 
 // 引入状态管理
 const route = useRoute();
-const layout = ref<any>();
 const token = useToken();
 const form = useForm();
+const config = useConfigInfo();
+const groupId = ref()
+const parentId = ref()
 const breadcrumb = ref<BreadcrumbItem>();
 
 // 请求数据
 const reload = async () => {
 
   // 页面布局
-  if (form.value?.layout) {
-    layout.value = JSON.parse(form.value?.layout)
-  }
+  // if (form.value?.layout) {
+  //   layout.value = JSON.parse(form.value?.layout)
+  // }
 
   // 未登录状态(是否强制登录)
   if (!token.value || token.value == '') {
@@ -52,6 +55,13 @@ const reload = async () => {
     // }
   }
 
+  // 网站参数
+  const { data: fields } = await useServerRequest<ApiResult<Config>>('/cms/cms-website-field/config', {baseURL: 'https://server.gxwebsoft.com/api',});
+  if (fields.value?.data) {
+    config.value = fields.value?.data;
+    groupId.value = config.value?.IndexPhotoGroupId;
+    parentId.value = config.value?.IndexNewsCenterParentId;
+  }
   // seo
   useHead({
     title: `构建现代WEB应用 · WEBSOFT`,