From e97d08f4109c45a80b8b2ebb564baf09c6179a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 12 May 2025 20:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E8=89=B2=E5=86=9C=E6=A0=A1=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/cms/cmsArticle/model/index.ts    | 3 +++
 components/Index/BNNews.vue          | 1 +
 components/Index/Carousel2.vue       | 5 ++++-
 components/Index/HotNewsCarousel.vue | 5 +++--
 nuxt.config.ts                       | 2 +-
 pages/search/[keywords].vue          | 6 ++++--
 types/global.d.ts                    | 1 +
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/api/cms/cmsArticle/model/index.ts b/api/cms/cmsArticle/model/index.ts
index f262036..f0e502a 100644
--- a/api/cms/cmsArticle/model/index.ts
+++ b/api/cms/cmsArticle/model/index.ts
@@ -28,6 +28,8 @@ export interface CmsArticle {
   categoryName?: string;
   // 封面图
   image?: string;
+  // 版本号
+  version?: number;
   // 缩列图
   thumbnail?: string;
   // 来源
@@ -119,6 +121,7 @@ export interface CmsArticleParam extends PageParam {
   articleIds?: string;
   parentId?: number;
   status?: number;
+  hasImage?: boolean;
   // 是否推荐
   recommend?: number;
   keywords?: string;
diff --git a/components/Index/BNNews.vue b/components/Index/BNNews.vue
index 6ae9d40..6668ce8 100644
--- a/components/Index/BNNews.vue
+++ b/components/Index/BNNews.vue
@@ -56,6 +56,7 @@
     pageCmsArticle({
       recommend: 1,
       limit: 5,
+      hasImage: true,
       lang: getLang()
     }).then(res => {
       imgList.value = res?.list || [];
diff --git a/components/Index/Carousel2.vue b/components/Index/Carousel2.vue
index 0219501..57a57ab 100644
--- a/components/Index/Carousel2.vue
+++ b/components/Index/Carousel2.vue
@@ -3,7 +3,8 @@
       <el-carousel id="flash1" :height="flashHeight + 'px'" :interval="2000">
         <el-carousel-item v-for="(item,index) in list" :key="index">
           <div class="item relative  flex justify-center items-center">
-            <el-image :src="`${FILE_SERVER}${item.image}`" fit="fill" class="w-full" :style="`height: 300px;`" />
+            {{item.version }}
+            <el-image :src="`${item.version == 1 ? config.FILE_SERVER : ''}${item.image}`" fit="fill" class="w-full" :style="`height: 300px;`" />
 <!--            fit: '' | 'fill' | 'contain' | 'cover' | 'none' | 'scale-down'-->
           </div>
         </el-carousel-item>
@@ -27,6 +28,7 @@ import {getCmsAd, pageCmsAd} from "~/api/cms/cmsAd";
 import {pageCmsArticle} from "~/api/cms/cmsArticle";
 import type {CmsArticle} from "~/api/cms/cmsArticle/model";
 import {FILE_SERVER} from "~/config";
+import {useConfigInfo} from "~/composables/configState";
 
 const props = withDefaults(
     defineProps<{
@@ -46,6 +48,7 @@ const emit = defineEmits<{
   (e: 'done'): void;
 }>();
 
+const config = useConfigInfo()
 const isMobile = useIsMobile();
 const list = ref<CmsArticle[]>([]);
 const flashHeight = ref<number>(372)
diff --git a/components/Index/HotNewsCarousel.vue b/components/Index/HotNewsCarousel.vue
index be6a0fb..e2a343c 100644
--- a/components/Index/HotNewsCarousel.vue
+++ b/components/Index/HotNewsCarousel.vue
@@ -3,7 +3,7 @@
     <el-carousel :height="flashHeight + 'px'" :interval="2000"  motion-blur indicator-position="none">
       <el-carousel-item v-for="(item,index) in data" :key="index">
         <nuxt-link :to="`/detail/${item.articleId}.html`" class="item flex justify-center items-center">
-          <el-image :src="`${FILE_SERVER}${item.image}`" class="w-[500px] h-[380px]" />
+          <el-image :src="`${item.version == 1 ? config.FILE_SERVER : ''}${item.image}`" class="w-[500px] h-[380px]" />
           <div class="absolute bottom-0 z-100 w-[468px] bg-black opacity-80 font-bold px-4 line-clamp-1 text-sm lg:text-lg">
             <span class="text-white">{{ item.title }}</span>
           </div>
@@ -16,9 +16,10 @@
 <script setup lang="ts">
 import type {CompanyParam} from "~/api/system/company/model";
 import type {CmsArticle} from "~/api/cms/cmsArticle/model";
-import {FILE_SERVER} from "~/config";
+import {useConfigInfo} from "~/composables/configState";
 
 const isMobile = useIsMobile();
+const config = useConfigInfo()
 
 const props = withDefaults(
     defineProps<{
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 95a5318..a8d8f90 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -19,7 +19,7 @@ const appName = '广西百色农业学校';
 
 const isDev = process.env.NODE_ENV === 'development'
 if(isDev){
-    // apiBaseUrl = 'http://127.0.0.1:9000/api'
+    apiBaseUrl = 'http://127.0.0.1:9000/api'
 }
 
 export default defineNuxtConfig({
diff --git a/pages/search/[keywords].vue b/pages/search/[keywords].vue
index e22b908..750a448 100644
--- a/pages/search/[keywords].vue
+++ b/pages/search/[keywords].vue
@@ -16,7 +16,7 @@
           <el-card shadow="hover" :body-style="{ padding: '0px' }" class=" hover:bg-gray-50 cursor-pointer">
             <nuxt-link :to="`/detail/${item.articleId}.html`">
               <el-image
-                  :src="item.image"
+                  :src="`${config.FILE_SERVER}${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">
@@ -45,11 +45,12 @@
 <script setup lang="ts">
 import Banner from "@/components/Banner.vue";
 import { ArrowLeft,View,Search } from '@element-plus/icons-vue'
-import {useLayout, usePage} from "~/composables/configState";
+import {useConfigInfo, useLayout, usePage} from "~/composables/configState";
 import type {CmsArticle, CmsArticleParam} from "~/api/cms/cmsArticle/model";
 import dayjs from "dayjs";
 import {getViews} from "~/utils/common";
 import {pageCmsArticle} from "~/api/cms/cmsArticle";
+import {FILE_SERVER} from "~/config";
 
 const route = useRoute();
 const router = useRouter();
@@ -61,6 +62,7 @@ const total = ref(0);
 // 获取状态
 const page = usePage();
 const layout = useLayout();
+const config = useConfigInfo()
 
 // 搜索表单
 const where = reactive<CmsArticleParam>({
diff --git a/types/global.d.ts b/types/global.d.ts
index c59174f..399578f 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -37,6 +37,7 @@ export interface Config {
     IndexAboutNum?: string;
     showTopBar?: string;
     showLoginButton?: string;
+    FILE_SERVER?: string;
 }
 
 export interface BreadcrumbItem {