From fe348ae97b4a842ea6e16c51696868746d0c9bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 27 Mar 2025 08:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=B7=A5=E5=8C=A0=E5=9F=BA=E5=9C=B0?=
 =?UTF-8?q?=E7=BD=91=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                         |  5 --
 .idea/UniappTool.xml                     | 10 ---
 .idea/modules.xml                        |  8 ---
 .idea/template-10398.iml                 | 12 ----
 .idea/vcs.xml                            |  6 --
 components/AppFooter/AppFooter.vue       |  2 +-
 components/AppFooter/SubMenu/SubMenu.vue |  2 +-
 components/AppHeader/AppHeader.vue       |  2 +-
 components/AppHeader/Logo/Logo.vue       |  2 +-
 components/Index/Customized.vue          |  2 +-
 components/Index/HotNews.vue             | 86 ++++++++++++++++++++++++
 nuxt.config.ts                           |  4 +-
 pages/index.vue                          | 13 +++-
 13 files changed, 103 insertions(+), 51 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/UniappTool.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/template-10398.iml
 delete mode 100644 .idea/vcs.xml
 create mode 100644 components/Index/HotNews.vue

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index b58b603..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/UniappTool.xml b/.idea/UniappTool.xml
deleted file mode 100644
index f7328e8..0000000
--- a/.idea/UniappTool.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="cn.fjdmy.uniapp.UniappProjectDataService">
-    <option name="generalBasePath" value="$PROJECT_DIR$" />
-    <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
-    <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
-    <option name="scanNum" value="1" />
-    <option name="type" value="store" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index d49c0ab..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/template-10398.iml" filepath="$PROJECT_DIR$/.idea/template-10398.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/template-10398.iml b/.idea/template-10398.iml
deleted file mode 100644
index 24643cc..0000000
--- a/.idea/template-10398.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/components/AppFooter/AppFooter.vue b/components/AppFooter/AppFooter.vue
index 8611199..a5a2865 100644
--- a/components/AppFooter/AppFooter.vue
+++ b/components/AppFooter/AppFooter.vue
@@ -7,7 +7,7 @@
   <!-- 侧边工具栏 -->
   <ToolBar />
   <!-- 底部菜单 -->
-  <TabBar />
+<!--  <TabBar />-->
 
 </template>
 
diff --git a/components/AppFooter/SubMenu/SubMenu.vue b/components/AppFooter/SubMenu/SubMenu.vue
index eba5148..79e9962 100644
--- a/components/AppFooter/SubMenu/SubMenu.vue
+++ b/components/AppFooter/SubMenu/SubMenu.vue
@@ -13,7 +13,7 @@
         </div>
       </template>
       <div class="flex flex-col text-base">
-        <p class="text-base text-gray-400 py-2 font-bold">关注我们</p>
+        <p class="text-base text-gray-400 py-2 font-bold">APP客户端</p>
         <el-avatar :src="config.wxQrcode" shape="square" :size="120" />
       </div>
     </div>
diff --git a/components/AppHeader/AppHeader.vue b/components/AppHeader/AppHeader.vue
index 9f16a43..865c623 100644
--- a/components/AppHeader/AppHeader.vue
+++ b/components/AppHeader/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 头部组件 -->
-  <div class="sm:p-0 px-4 shadow-sm fixed z-100 top-0 w-full bg-white bg-opacity-90">
+  <div class="sm:p-0 px-4 shadow-sm fixed z-100 top-0 w-full bg-white">
     <!-- 顶部通栏 -->
     <TopBar />
     <!-- 导航栏 -->
diff --git a/components/AppHeader/Logo/Logo.vue b/components/AppHeader/Logo/Logo.vue
index 90515f7..0d77772 100644
--- a/components/AppHeader/Logo/Logo.vue
+++ b/components/AppHeader/Logo/Logo.vue
@@ -1,6 +1,6 @@
 <template>
   <nuxt-link to="/" class="flex items-center cursor-pointer gap-sm mr-7" v-if="website">
-    <el-image v-if="website.websiteLogo || logo?.value" :style="`${logo?.style}`" :src="logo?.value || website?.websiteLogo" class="rounded-sm rounded-sm w-[107px] h-[24px] py-3 sm:py-0"/>
+    <el-image v-if="website.websiteLogo || logo?.value" :style="`${logo?.style}`" :src="logo?.value || website?.websiteLogo" class="rounded-sm rounded-sm sm:w-[158px] sm:h-[54px] h-[50px] py-1 sm:py-0"/>
     <h4 v-else class="text-gray-700 text-xl font-bold" :style="`${logo?.style}`">{{ website?.websiteName }}</h4>
   </nuxt-link>
 </template>
diff --git a/components/Index/Customized.vue b/components/Index/Customized.vue
index 9a37806..9a3105a 100644
--- a/components/Index/Customized.vue
+++ b/components/Index/Customized.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="w-full container-bg bg-blue-600 gap-10 flex justify-center items-center py-6">
     <span class="text-xl text-white font-bold">联系我们，为您降本增效</span>
-    <el-button size="large" @click="navigateTo(`/order/3622.html`)">马上联系</el-button>
+    <el-button size="large" @click="navigateTo(`/order/659.html`)">马上联系</el-button>
   </div>
 </template>
 
diff --git a/components/Index/HotNews.vue b/components/Index/HotNews.vue
new file mode 100644
index 0000000..5537944
--- /dev/null
+++ b/components/Index/HotNews.vue
@@ -0,0 +1,86 @@
+<template>
+  <div class="xl:w-screen-xl m-auto py-4 px-4 sm:px-0">
+    <div class="text-center flex flex-col items-center z-0 relative">
+      <h2 class="text-4xl font-bold tracking-tight text-gray-800 dark:text-white">
+        {{ title || '热点新闻' }}
+      </h2>
+<!--      <div class="sub-title">-->
+<!--        <p class="text-gray-400 text-sm dark:text-gray-400 py-3">-->
+<!--          {{ comments || '官方开发的应用' }}-->
+<!--        </p>-->
+<!--      </div>-->
+    </div>
+    <el-row :gutter="24" id="container" class="clearfix">
+      <el-col v-for="(item,index) in list" :key="index" :xs="24" :span="6" class="left mb-6">
+        <el-card shadow="hover" :body-style="{ padding: '0px' }" class=" hover:bg-gray-50 cursor-pointer" @click="navigateTo(`/detail/${item.articleId}.html`)">
+          <el-image
+            :src="item.image"
+            fit="cover"
+            :lazy="true" class="w-full md:h-[166px] h-[199px] cursor-pointer bg-gray-50"/>
+          <div class="flex-1 px-4 py-5 sm:p-6 !p-4">
+            <div class="text-gray-700 dark:text-white text-base font-semibold  flex flex-col gap-1.5">
+              <div class="line-clamp-2 text-lg min-h-[54px]">
+                {{ item.title }}
+              </div>
+            </div>
+            <!--              <div class="flex items-center gap-1.5 py-2 text-gray-500 justify-between">-->
+            <!--                <div class="text-gray-500 line-clamp-2">{{ item.comments }}</div>-->
+            <!--              </div>-->
+            <div class="button-group flex justify-between items-center mt-3 text-sm">
+              <el-space class="flex items-end">
+                <div class="text-gray-400 gap-1 flex items-center"><el-icon><View /></el-icon><span>{{ getViews(item) }}</span></div>
+              </el-space>
+              <div class="text-gray-400">
+                {{ dayjs(item.createTime).format('YYYY-MM-DD') }}
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+  <div v-if="disabled" class="px-1 text-center text-gray-500 min-h-xs">
+    没有更多了
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {navigateTo} from "#imports";
+import dayjs from "dayjs";
+import type {CmsArticle} from "~/api/cms/cmsArticle/model";
+import {listCmsArticle} from "~/api/cms/cmsArticle";
+import type {CmsArticleParam} from "~/api/cms/cmsArticle/model";
+
+const props = withDefaults(
+    defineProps<{
+      param?: CmsArticleParam;
+      disabled?: boolean;
+      categoryId?: number;
+      title?: string;
+      comments?: string;
+      fit?: any;
+    }>(),
+    {
+      fit: 'cover'
+    }
+);
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+}>();
+
+const list = ref<CmsArticle[]>([]);
+const id = ref<number>(0);
+
+// 请求数据
+const reload = async () => {
+  listCmsArticle({
+    limit: 8,
+    recommend: 1,
+    categoryId: props.categoryId
+  }).then(data => {
+    list.value = data || [];
+  })
+}
+reload();
+</script>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 033d786..148004e 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -6,11 +6,11 @@
  */
 
 // 填租户ID
-const appId = 10398;
+const appId = 10491;
 // 接口地址
 let apiBaseUrl = 'https://cms-api.websoft.top/api'
 // 应用名称
-const appName = '网宿软件';
+const appName = '工匠基地';
 
 
 
diff --git a/pages/index.vue b/pages/index.vue
index 5fd0185..a0b92f2 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -4,16 +4,22 @@
   <Carousel/>
 
   <!-- 着陆页 -->
-  <LandingHero/>
+<!--  <LandingHero/>-->
 
   <!-- 站点列表 -->
-  <SiteList/>
+<!--  <SiteList/>-->
 
   <!-- 插件列表 -->
   <!--  <MarketList />-->
 
+  <!-- 热点新闻 -->
+  <HotNews title="热点新闻" :categoryId="650"/>
+
+  <!-- 媒体视角 -->
+  <HotNews title="媒体视角" :categoryId="652"/>
+
   <!-- 客户案例 -->
-  <CaseList/>
+<!--  <CaseList/>-->
 
   <!-- 合作伙伴 -->
   <Partners/>
@@ -38,6 +44,7 @@ import Carousel from "~/components/Index/Carousel.vue";
 import LandingHero from "~/components/Index/LandingHero.vue";
 import SiteList from "~/components/Index/SiteList.vue";
 import MarketList from "~/components/Index/MarketList.vue";
+import HotNews from "~/components/Index/HotNews.vue";
 import CaseList from "~/components/Index/CaseList.vue"
 import Partners from "~/components/Index/Partners.vue";
 import Customized from "~/components/Index/Customized.vue";