Browse Source

修改bug

Jing 1 day ago
parent
commit
4fb79b1a45

File diff suppressed because it is too large
+ 0 - 979
.nuxt/dev/index.mjs


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dev/index.mjs.map


+ 1 - 2
.nuxt/imports.d.ts

@@ -29,7 +29,6 @@ export { onBeforeRouteLeave, onBeforeRouteUpdate, useLink } from 'vue-router';
 export { withCtx, withDirectives, withKeys, withMemo, withModifiers, withScopeId, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, computed, customRef, isProxy, isReactive, isReadonly, isRef, markRaw, proxyRefs, reactive, readonly, ref, shallowReactive, shallowReadonly, shallowRef, toRaw, toRef, toRefs, triggerRef, unref, watch, watchEffect, watchPostEffect, watchSyncEffect, isShallow, effect, effectScope, getCurrentScope, onScopeDispose, defineComponent, defineAsyncComponent, resolveComponent, getCurrentInstance, h, inject, hasInjectionContext, nextTick, provide, mergeModels, toValue, useModel, useAttrs, useCssModule, useCssVars, useSlots, useTransitionState, useId, useTemplateRef, useShadowRoot, Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue';
 export { injectHead, useHead, useSeoMeta, useHeadSafe, useServerHead, useServerSeoMeta, useServerHeadSafe } from '@unhead/vue';
 export { requestData, requestDataPromise, requestDataWebUrl, requestHome } from '../composables/getData';
-export { getTime, getTitleLength, getLinkPath, getLinkPathDetail, getRoutePath } from '../composables/publicFunction';
+export { getTime, getTitleLength, getLinkPath, getLinkPath1, getLinkPathDetail, getLinkPathDetail1, getRoutePath } from '../composables/publicFunction';
 export { seoSetup } from '../composables/useSeo';
-export { useNuxtDevTools } from '../node_modules/@nuxt/devtools/dist/runtime/use-nuxt-devtools';
 export { definePageMeta } from '../node_modules/nuxt/dist/pages/runtime/composables';

+ 1 - 1
.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1746686511148}
+{"id":"c7ed0f9d-0f6d-41bd-8938-e11740356c6a","timestamp":1746781693478}

+ 0 - 1
.nuxt/manifest/meta/661fd28d-1c96-42fc-9d02-02a5a5ffd574.json

@@ -1 +0,0 @@
-{"id":"661fd28d-1c96-42fc-9d02-02a5a5ffd574","timestamp":1746685860085,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 0
.nuxt/manifest/meta/c7ed0f9d-0f6d-41bd-8938-e11740356c6a.json

@@ -0,0 +1 @@
+{"id":"c7ed0f9d-0f6d-41bd-8938-e11740356c6a","timestamp":1746781693478,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/d5beaaec-dd09-44c6-a599-6da3475ed189.json

@@ -1 +0,0 @@
-{"id":"d5beaaec-dd09-44c6-a599-6da3475ed189","timestamp":1745741738825,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/dev.json

@@ -1 +0,0 @@
-{"id":"dev","timestamp":1746686511148,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 17
.nuxt/nitro.json

@@ -1,17 +0,0 @@
-{
-  "date": "2025-05-08T06:41:53.882Z",
-  "preset": "nitro-dev",
-  "framework": {
-    "name": "nuxt",
-    "version": "3.15.2"
-  },
-  "versions": {
-    "nitro": "2.10.4"
-  },
-  "dev": {
-    "pid": 9048,
-    "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-9048-1.sock"
-    }
-  }
-}

+ 0 - 9
.nuxt/nuxt.json

@@ -1,9 +0,0 @@
-{
-  "_hash": "GN5x5R9wS9",
-  "project": {
-    "rootDir": "D:/01_AA_ssr_master/nongfuchanpingongxiao"
-  },
-  "versions": {
-    "nuxt": "3.15.2"
-  }
-}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/dev"
+        "./manifest/meta/c7ed0f9d-0f6d-41bd-8938-e11740356c6a.json"
       ],
       "#components": [
         "./components"

+ 0 - 1
.nuxt/types/build.d.ts

@@ -11,7 +11,6 @@ declare module "#build/paths.mjs";
 declare module "#build/root-component.mjs";
 declare module "#build/plugins.server.mjs";
 declare module "#build/test-component-wrapper.mjs";
-declare module "#build/devtools/settings.mjs";
 declare module "#build/routes.mjs";
 declare module "#build/pages.mjs";
 declare module "#build/router.options.mjs";

+ 4 - 2
.nuxt/types/imports.d.ts

@@ -27,7 +27,9 @@ declare global {
   const getAppManifest: typeof import('../../node_modules/nuxt/dist/app/composables/manifest')['getAppManifest']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
   const getCurrentScope: typeof import('vue')['getCurrentScope']
+  const getLinkPath1: typeof import('../../composables/publicFunction')['getLinkPath1']
   const getLinkPath: typeof import('../../composables/publicFunction')['getLinkPath']
+  const getLinkPathDetail1: typeof import('../../composables/publicFunction')['getLinkPathDetail1']
   const getLinkPathDetail: typeof import('../../composables/publicFunction')['getLinkPathDetail']
   const getRoutePath: typeof import('../../composables/publicFunction')['getRoutePath']
   const getRouteRules: typeof import('../../node_modules/nuxt/dist/app/composables/manifest')['getRouteRules']
@@ -122,7 +124,6 @@ declare global {
   const useModel: typeof import('vue')['useModel']
   const useNuxtApp: typeof import('../../node_modules/nuxt/dist/app/nuxt')['useNuxtApp']
   const useNuxtData: typeof import('../../node_modules/nuxt/dist/app/composables/asyncData')['useNuxtData']
-  const useNuxtDevTools: typeof import('../../node_modules/@nuxt/devtools/dist/runtime/use-nuxt-devtools')['useNuxtDevTools']
   const usePreviewMode: typeof import('../../node_modules/nuxt/dist/app/composables/preview')['usePreviewMode']
   const useRequestEvent: typeof import('../../node_modules/nuxt/dist/app/composables/ssr')['useRequestEvent']
   const useRequestFetch: typeof import('../../node_modules/nuxt/dist/app/composables/ssr')['useRequestFetch']
@@ -215,7 +216,9 @@ declare module 'vue' {
     readonly getAppManifest: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/manifest')['getAppManifest']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+    readonly getLinkPath1: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPath1']>
     readonly getLinkPath: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPath']>
+    readonly getLinkPathDetail1: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPathDetail1']>
     readonly getLinkPathDetail: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPathDetail']>
     readonly getRoutePath: UnwrapRef<typeof import('../../composables/publicFunction')['getRoutePath']>
     readonly getRouteRules: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/manifest')['getRouteRules']>
@@ -310,7 +313,6 @@ declare module 'vue' {
     readonly useModel: UnwrapRef<typeof import('vue')['useModel']>
     readonly useNuxtApp: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/nuxt')['useNuxtApp']>
     readonly useNuxtData: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/asyncData')['useNuxtData']>
-    readonly useNuxtDevTools: UnwrapRef<typeof import('../../node_modules/@nuxt/devtools/dist/runtime/use-nuxt-devtools')['useNuxtDevTools']>
     readonly usePreviewMode: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/preview')['usePreviewMode']>
     readonly useRequestEvent: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/ssr')['useRequestEvent']>
     readonly useRequestFetch: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/ssr')['useRequestFetch']>

+ 2 - 7
.nuxt/types/plugins.d.ts

@@ -9,17 +9,12 @@ type NuxtAppInjections =
   InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/revive-payload.client.js")> &
   InjectionType<typeof import("../../node_modules/nuxt/dist/head/runtime/plugins/unhead.js")> &
   InjectionType<typeof import("../../node_modules/nuxt/dist/pages/runtime/plugins/router.js")> &
-  InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/browser-devtools-timing.client.js")> &
+  InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/payload.client.js")> &
   InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/navigation-repaint.client.js")> &
   InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/check-outdated-build.client.js")> &
   InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/revive-payload.server.js")> &
   InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/chunk-reload.client.js")> &
   InjectionType<typeof import("../../node_modules/nuxt/dist/pages/runtime/plugins/prefetch.client.js")> &
-  InjectionType<typeof import("../../node_modules/nuxt/dist/pages/runtime/plugins/check-if-page-unused.js")> &
-  InjectionType<typeof import("../../node_modules/@nuxt/devtools/dist/runtime/plugins/devtools.server.js")> &
-  InjectionType<typeof import("../../node_modules/@nuxt/devtools/dist/runtime/plugins/devtools.client.js")> &
-  InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/dev-server-logs.js")> &
-  InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/check-if-layout-used.js")> &
   InjectionType<typeof import("../../plugins/element-plus")> &
   InjectionType<typeof import("../../plugins/request")> &
   InjectionType<typeof import("../../plugins/category")> &
@@ -30,7 +25,7 @@ declare module '#app' {
   interface NuxtApp extends NuxtAppInjections { }
 
   interface NuxtAppLiterals {
-    pluginName: 'nuxt:revive-payload:client' | 'nuxt:head' | 'nuxt:router' | 'nuxt:browser-devtools-timing' | 'nuxt:revive-payload:server' | 'nuxt:chunk-reload' | 'nuxt:global-components' | 'nuxt:prefetch' | 'nuxt:checkIfPageUnused' | 'nuxt:checkIfLayoutUsed'
+    pluginName: 'nuxt:revive-payload:client' | 'nuxt:head' | 'nuxt:router' | 'nuxt:payload' | 'nuxt:revive-payload:server' | 'nuxt:chunk-reload' | 'nuxt:global-components' | 'nuxt:prefetch'
   }
 }
 

+ 1 - 1
assets/css/list.less

@@ -93,7 +93,7 @@
                     .listTitle {
                         // float: left;
                         display: inline-block;
-                        width: 486px;
+                        width: 800px;
                         white-space: nowrap;
                         overflow: hidden;
                         text-overflow: ellipsis;

+ 3 - 2
components/home/ListSecondaryHeading.vue

@@ -1,6 +1,6 @@
 <template>
     <nav class="channel_nav">
-        <a class="channel_nav_head_name" href="javascript:(void)" title="name">{{ name }}</a>
+        <a class="channel_nav_head_name" :href="`/${pinyin}/index.html`" title="name">{{ name }}</a>
         <div class="channel_nav_a_box">
             <NuxtLink v-for="(item, index) in nav" :to="{ path: `/${targetRoute}/${item.aLIas_pinyin}/list-1.html` }"
                 class="channel_nav_a" >{{ item.alias }}</NuxtLink>
@@ -13,7 +13,8 @@
 //子导航
 const props = defineProps({
     name: String,
-    nav: Array
+    nav: Array,
+    pinyin: String,
 });
 
 //获取当前url路径

+ 36 - 28
composables/publicFunction.ts

@@ -1,34 +1,34 @@
 //1.格式化日期 start ---------------------------------------->
 //time 日期字符串 type 从什么时候开始返回 year = 返回年月日 month = 返回月日..
 //style 样式,比如 年-月-日 年.月.日
-const getTime = function(time:string,type:string,style:Number){
+const getTime = function (time: string, type: string, style: Number) {
   const date = new Date(time);
   const year = date.getFullYear();
   const month = date.getMonth() + 1;
   const day = date.getDate();
 
   //返回 年-月-日
-  if(type == 'year'&& style == 1){
+  if (type == 'year' && style == 1) {
     return `${year}-${month}-${day}`;
   }
   //返回 年-月
-  if(type == 'year'&& style == 2){
+  if (type == 'year' && style == 2) {
     return `${year}-${month}`;
   }
   //返回 年
-  if(type == 'year'&& style == 3){
+  if (type == 'year' && style == 3) {
     return `${year}`;
   }
   //返回 月-日
-  if(type == 'month'&& style == 1){
+  if (type == 'month' && style == 1) {
     return `${month}-${day}`;
   }
   //返回 月.日
-  if(type == 'month'&& style == 2){
+  if (type == 'month' && style == 2) {
     return `${month}.${day}`;
   }
   //返回 日
-  if(type == 'day'&& style == 1){
+  if (type == 'day' && style == 1) {
     return `${day}`;
   }
 }
@@ -36,10 +36,10 @@ const getTime = function(time:string,type:string,style:Number){
 
 //2.格式化标题长度 start ---------------------------------------->
 //title 标题 length 长度
-const getTitleLength = function(title:string,length:number){
-  if(title.length >= length){
+const getTitleLength = function (title: string, length: number) {
+  if (title.length >= length) {
     return title.substring(0, length) + "...";
-  }else{
+  } else {
     return title;
   }
 }
@@ -47,30 +47,38 @@ const getTitleLength = function(title:string,length:number){
 
 //3.格式化跳转路径 start ---------------------------------------->
 //3.1跳转到频道页面或者一级列表页
-const getLinkPath = (item:any) => {
-    if(item.is_url==1){
-        return `${item.web_url}`;
-    }else if(item.children_count == 0){
-        //return `/newsList/${item.category_id}?page=1`;
-        return `/${item.aLIas_pinyin}/list-1.html`;
-    }else{
-        //return `/primaryNavigation/${item.aLIas_pinyin}/`;
-        return `/${item.aLIas_pinyin}/index.html`;
-    }
+const getLinkPath = (item: any) => {
+  if (item.is_url == 1) {
+    return `${item.web_url}`;
+  } else if (item.children_count == 0) {
+    //return `/newsList/${item.category_id}?page=1`;
+    return `/${item.aLIas_pinyin}/list-1.html`;
+  } else {
+    //return `/primaryNavigation/${item.aLIas_pinyin}/`;
+    return `/${item.aLIas_pinyin}/index.html`;
+  }
 }
-//3.2跳转到详情页
-const getLinkPathDetail = (item:any) => {
+//3.2跳转到频道页
+const getLinkPath1 = (item: any) => {
+  return `/${item.aLIas_pinyin}/list-1.html`;
+}
+//3.3跳转到详情页
+const getLinkPathDetail = (item: any) => {
   if (item.islink == 1) {
-      return `${item.linkurl}`;
+    return `${item.linkurl}`;
   } else {
-      return `/${item.pinyin}/${item.id}.html`;
+    return `/${item.pinyin}/${item.id}.html`;
   }
 }
+//3.4特殊跳转到详情页
+const getLinkPathDetail1 = (item: any) => {
+  return `/${item.aLIas_pinyin}/${item.id}.html`;
+}
 //3.格式化跳转路径 end ---------------------------------------->
 
 
 //4.获得路由路径 start ---------------------------------------->
-const getRoutePath = (type:Number) => {
+const getRoutePath = (type: Number) => {
   const route = useRoute();
   //获得当前的完整路径
   const fullPath = route.path;
@@ -79,10 +87,10 @@ const getRoutePath = (type:Number) => {
   const targetSegmentOne = segments[1];
   const targetSegmentTwo = segments[2];
 
-  if(type == 1){
+  if (type == 1) {
     return targetSegmentOne;
   }
-  if(type == 2){
+  if (type == 2) {
     return targetSegmentTwo;
   }
 }
@@ -90,4 +98,4 @@ const getRoutePath = (type:Number) => {
 
 
 //4.获得路由路径 end ---------------------------------------->
-export { getTime,getTitleLength,getLinkPath,getLinkPathDetail,getRoutePath};
+export { getTime, getTitleLength, getLinkPath, getLinkPath1, getLinkPathDetail, getLinkPathDetail1, getRoutePath };

+ 1 - 1
pages/[dir]/[dir]/list-[id].vue

@@ -7,7 +7,7 @@
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
         <!-- 二级标题-->
-        <HomeListSecondaryHeading v-if="parent_name != ''" :name="parent_name" :nav="secondNav"></HomeListSecondaryHeading>
+        <HomeListSecondaryHeading v-if="parent_name != ''" :name="parent_name" :nav="secondNav" :pinyin="parent_pinyin"></HomeListSecondaryHeading>
         <!-- 资讯列表 -->
         <div class="newsList">
             <div class="inner">

+ 13 - 19
pages/[dir]/list-[id].vue

@@ -6,6 +6,9 @@
         <HomePageNavigation></HomePageNavigation>
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
+        <!-- 二级标题-->
+        <HomeListSecondaryHeading v-if="parent_name != ''" :name="parent_name" :nav="secondNav" :pinyin="parent_pinyin">
+        </HomeListSecondaryHeading>
         <!-- 资讯列表 -->
         <div class="newsList">
             <div class="inner">
@@ -18,7 +21,7 @@
                                 <el-breadcrumb-item>
                                     <NuxtLink to="/">首页</NuxtLink>
                                 </el-breadcrumb-item>
-                                <el-breadcrumb-item v-if="parent_name !=''">
+                                <el-breadcrumb-item v-if="parent_name != ''">
                                     <NuxtLink :to="`/${parent_pinyin}/index.html`"> {{ parent_name }}</NuxtLink>
                                 </el-breadcrumb-item>
                                 <el-breadcrumb-item class="nameBox">{{ name }}</el-breadcrumb-item>
@@ -35,18 +38,9 @@
                     </ul>
                     <!-- 分页器 -->
                     <div class="pagination" v-if="total > 0">
-                        <el-pagination 
-                            size="small" 
-                            background 
-                            layout="prev, pager, next" 
-                            :total="total" 
-                            class="mt-4"
-                            :page-size="pageSize" 
-                            :current-page="pageNum"
-                            prev-text="上一页" 
-                            next-text="下一页" 
-                            @current-change="changePage" 
-                        />
+                        <el-pagination size="small" background layout="prev, pager, next" :total="total" class="mt-4"
+                            :page-size="pageSize" :current-page="pageNum" prev-text="上一页" next-text="下一页"
+                            @current-change="changePage" />
                     </div>
                 </div>
                 <div class="innerRight">
@@ -81,9 +75,9 @@ const getRouteId = await requestDataPromise('/web/getWebsiteRoute', {
         'pinyin': targetSegment,
     },
 });
-if(getRouteId.code == 200){
+if (getRouteId.code == 200) {
     articleId = getRouteId.data.category_id
-}else{
+} else {
     console.log("错误位置:获得页面路径")
 }
 //2.页面路径 end ---------------------------------------->
@@ -202,8 +196,8 @@ if (setData.code == 200) {
     useSeoMeta({
         title: seoTitle + "_" + seoName + "_" + seoSuffix,
         meta: [
-            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 },
-            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
         ]
     });
 } else {
@@ -218,7 +212,7 @@ if (setData.code == 200) {
 let adImg1 = ref({});
 let adImg2 = ref({});
 
-onMounted(async ()  => {
+onMounted(async () => {
 
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
@@ -233,7 +227,7 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
-    
+
     //广告2
     let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nfcpgxw_list_0002`
     const responseAd2 = await fetch(url2, {

+ 117 - 95
pages/index.vue

@@ -39,33 +39,21 @@
             <section class="index_3 clearfix">
                 <div class="index_box_3 clearfix">
                     <div class="index_head_btn_box">
-                        <div class="index_head_btn" 
-                            :class="{ index_head_btn_only: hoverStatus == 1 }"
-                            v-if="pageData[0]" 
-                            @mouseover="qhPic(1)"
-                        >
-                            <NuxtLink class="index_head_a":href="getLinkPath(pageData[0])"
-                                :title="pageData[0].alias">
+                        <div class="index_head_btn" :class="{ index_head_btn_only: hoverStatus == 1 }"
+                            v-if="pageData[0]" @mouseover="qhPic(1)">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[0])" :title="pageData[0].alias">
                                 {{ pageData[0].alias }}
                             </NuxtLink>
                         </div>
-                        <div class="index_head_btn" 
-                            :class="{ index_head_btn_only: hoverStatus == 2 }"
-                            v-if="pageData[1]"
-                            @mouseover="qhPic(2)"
-                        >
-                            <NuxtLink class="index_head_a"  :href="getLinkPath(pageData[1])"
-                                :title="pageData[1].alias">
+                        <div class="index_head_btn" :class="{ index_head_btn_only: hoverStatus == 2 }"
+                            v-if="pageData[1]" @mouseover="qhPic(2)">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[1])" :title="pageData[1].alias">
                                 {{ pageData[1].alias }}
                             </NuxtLink>
                         </div>
-                        <div class="index_head_btn" 
-                            :class="{ index_head_btn_only: hoverStatus == 3 }"
-                            v-if="pageData[2]"
-                            @mouseover="qhPic(3)"
-                        >
-                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[2])"
-                                :title="pageData[2].alias">
+                        <div class="index_head_btn" :class="{ index_head_btn_only: hoverStatus == 3 }"
+                            v-if="pageData[2]" @mouseover="qhPic(3)">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[2])" :title="pageData[2].alias">
                                 {{ pageData[2].alias }}
                             </NuxtLink>
                         </div>
@@ -90,11 +78,11 @@
                                 </div>
                                 <div class="index_name_ul">
                                     <div class="index_name_ul_li" v-for="item in boxData1data3" :key="per_obj">
-                                        <NuxtLink class="index_name_ul_li_tag" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_li_tag" :href="getLinkPath1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                            [{{ item.category_name }}]
+                                            [{{ item.alias }}]
                                         </NuxtLink>
-                                        <NuxtLink class="index_name_ul_li_dot1 dot1" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_li_dot1 dot1" :href="getLinkPathDetail1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                             {{ item.title }}
                                         </NuxtLink>
@@ -118,11 +106,11 @@
                                 </div>
                                 <div class="index_name_ul_2">
                                     <div class="index_name_ul_2_li" v-for="item in boxData1data4">
-                                        <NuxtLink class="index_name_ul_2_li_tag" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_2_li_tag" :href="getLinkPath1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                            [{{ item.category_name }}]
+                                            [{{ item.alias }}]
                                         </NuxtLink>
-                                        <NuxtLink class="index_name_ul_2_li_dot1 dot1" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_2_li_dot1 dot1" :href="getLinkPathDetail1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                             {{ item.title }}
                                         </NuxtLink>
@@ -150,11 +138,11 @@
                                 </div>
                                 <div class="index_name_ul">
                                     <div class="index_name_ul_li" v-for="item in boxData2data3" :key="per_obj">
-                                        <NuxtLink class="index_name_ul_li_tag" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_li_tag" :href="getLinkPath1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                            [{{ item.category_name }}]
+                                            [{{ item.alias }}]
                                         </NuxtLink>
-                                        <NuxtLink class="index_name_ul_li_dot1 dot1" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_li_dot1 dot1" :href="getLinkPathDetail1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                             {{ item.title }}
                                         </NuxtLink>
@@ -178,11 +166,11 @@
                                 </div>
                                 <div class="index_name_ul_2">
                                     <div class="index_name_ul_2_li" v-for="item in boxData2data4">
-                                        <NuxtLink class="index_name_ul_2_li_tag" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_2_li_tag" :href="getLinkPath1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                            [{{ item.category_name }}]
+                                            [{{ item.alias }}]
                                         </NuxtLink>
-                                        <NuxtLink class="index_name_ul_2_li_dot1 dot1" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_2_li_dot1 dot1" :href="getLinkPathDetail1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                             {{ item.title }}
                                         </NuxtLink>
@@ -210,11 +198,11 @@
                                 </div>
                                 <div class="index_name_ul">
                                     <div class="index_name_ul_li" v-for="item in boxData3data3" :key="per_obj">
-                                        <NuxtLink class="index_name_ul_li_tag" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_li_tag" :href="getLinkPath1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                            [{{ item.category_name }}]
+                                            [{{ item.alias }}]
                                         </NuxtLink>
-                                        <NuxtLink class="index_name_ul_li_dot1 dot1" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_li_dot1 dot1" :href="getLinkPathDetail1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                             {{ item.title }}
                                         </NuxtLink>
@@ -238,11 +226,11 @@
                                 </div>
                                 <div class="index_name_ul_2">
                                     <div class="index_name_ul_2_li" v-for="item in boxData3data4">
-                                        <NuxtLink class="index_name_ul_2_li_tag" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_2_li_tag" :href="getLinkPath1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                            [{{ item.category_name }}]
+                                            [{{ item.alias }}]
                                         </NuxtLink>
-                                        <NuxtLink class="index_name_ul_2_li_dot1 dot1" :href="getLinkPathDetail(item)"
+                                        <NuxtLink class="index_name_ul_2_li_dot1 dot1" :href="getLinkPathDetail1(item)"
                                             :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                             {{ item.title }}
                                         </NuxtLink>
@@ -255,21 +243,15 @@
                 </div>
                 <div class="index_box_4 clearfix">
                     <div class="index_head_btn_box">
-                        <div class="index_head_btn" 
-                            :class="{ index_head_btn_only: hoverStatusTwo == 1 }" 
-                            v-if="pageData[3]" 
-                            @mouseover="qhPicTwo(1)">
-                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[3])"
-                                :title="pageData[3].alias">
+                        <div class="index_head_btn" :class="{ index_head_btn_only: hoverStatusTwo == 1 }"
+                            v-if="pageData[3]" @mouseover="qhPicTwo(1)">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[3])" :title="pageData[3].alias">
                                 {{ pageData[3].alias }}
                             </NuxtLink>
                         </div>
-                        <div class="index_head_btn" 
-                            :class="{ index_head_btn_only: hoverStatusTwo == 2 }"
-                            v-if="pageData[4]" 
-                            @mouseover="qhPicTwo(2)">
-                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[4])"
-                                :title="pageData[4].alias">
+                        <div class="index_head_btn" :class="{ index_head_btn_only: hoverStatusTwo == 2 }"
+                            v-if="pageData[4]" @mouseover="qhPicTwo(2)">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[4])" :title="pageData[4].alias">
                                 {{ pageData[4].alias }}
                             </NuxtLink>
                         </div>
@@ -361,8 +343,7 @@
                 <div class="index_box_3 clearfix">
                     <div class="index_head_btn_box">
                         <div class="index_head_btn index_head_btn_only" v-if="pageData[5]">
-                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[5])"
-                                :title="pageData[5].alias">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[5])" :title="pageData[5].alias">
                                 {{ pageData[5].alias }}
                             </NuxtLink>
                         </div>
@@ -409,8 +390,7 @@
                 <div class="index_box_4 clearfix">
                     <div class="index_head_btn_box">
                         <div class="index_head_btn index_head_btn_only" v-if="pageData[6]">
-                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[6])"
-                                :title="pageData[6].alias">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[6])" :title="pageData[6].alias">
                                 {{ pageData[6].alias }}
                             </NuxtLink>
                         </div>
@@ -419,9 +399,8 @@
                     <div class="index_5_right">
                         <div class="index_5_right_img_ul clearfix">
                             <div class="index_5_right_img_li clearfix">
-                                <div class="index_5_right_img_li_img_box" v-if="boxData7[0]" >
-                                    <NuxtLink class="index_5_right_img_li_a" 
-                                        :href="getLinkPathDetail(boxData7[0])"
+                                <div class="index_5_right_img_li_img_box" v-if="boxData7[0]">
+                                    <NuxtLink class="index_5_right_img_li_a" :href="getLinkPathDetail(boxData7[0])"
                                         :title="boxData7[0].title"
                                         :target="boxData7[0].islink == 1 ? '_blank' : '_self'">
                                         <img class="index_5_right_img_li_a_img" :src="boxData7[0].imgurl"
@@ -429,8 +408,8 @@
                                     </NuxtLink>
                                 </div>
                                 <div class="index_ul_3" v-if="boxData7[0]">
-                                    <NuxtLink class="index_ul_3_a dot1"
-                                        :href="getLinkPathDetail(boxData7[0])" :title="boxData7[0].title"
+                                    <NuxtLink class="index_ul_3_a dot1" :href="getLinkPathDetail(boxData7[0])"
+                                        :title="boxData7[0].title"
                                         :target="boxData7[0].islink == 1 ? '_blank' : '_self'">
                                         {{ boxData7[0].title }}
                                     </NuxtLink>
@@ -452,8 +431,8 @@
                                     </NuxtLink>
                                 </div>
                                 <div class="index_ul_3" v-if="boxData7[1]">
-                                    <NuxtLink class="index_ul_3_a dot1"
-                                        :href="getLinkPathDetail(boxData7[1])" :title="boxData7[1].title"
+                                    <NuxtLink class="index_ul_3_a dot1" :href="getLinkPathDetail(boxData7[1])"
+                                        :title="boxData7[1].title"
                                         :target="boxData7[1].islink == 1 ? '_blank' : '_self'">
                                         {{ boxData7[1].title }}
                                     </NuxtLink>
@@ -477,8 +456,7 @@
                 <div class="index_box_3 clearfix">
                     <div class="index_head_btn_box">
                         <div class="index_head_btn index_head_btn_only" v-if="pageData[7]">
-                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[7])"
-                                :title="pageData[7].alias">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[7])" :title="pageData[7].alias">
                                 {{ pageData[7].alias }}
                             </NuxtLink>
                         </div>
@@ -522,8 +500,7 @@
                 <div class="index_box_4 clearfix">
                     <div class="index_head_btn_box">
                         <div class="index_head_btn index_head_btn_only" v-if="pageData[8]">
-                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[8])"
-                                :title="pageData[8].alias">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[8])" :title="pageData[8].alias">
                                 {{ pageData[8].alias }}
                             </NuxtLink>
                         </div>
@@ -552,9 +529,8 @@
             <section class="index_7 clearfix">
                 <div class="index_box_3 clearfix">
                     <div class="index_head_btn_box">
-                        <div class="index_head_btn index_head_btn_only" v-if="pageData[9]" >
-                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[9])"
-                                :title="pageData[9].alias">
+                        <div class="index_head_btn index_head_btn_only" v-if="pageData[9]">
+                            <NuxtLink class="index_head_a" :href="getLinkPath(pageData[9])" :title="pageData[9].alias">
                                 {{ pageData[9].alias }}
                             </NuxtLink>
                         </div>
@@ -680,8 +656,8 @@ async function getModelData1() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'imgnum':0,
-            'textnum':4,
+            'imgnum': 0,
+            'textnum': 4,
             'level': 1,
             'placeid': 0,
             'id': '',
@@ -689,7 +665,7 @@ async function getModelData1() {
     });
     if (mkdata.code == 200) {
         // console.log("设置大标题", mkdata.data);
-        
+
         //填充大标题
         for (let index in mkdata.data.text) {
             if (index < 1) {
@@ -710,8 +686,8 @@ async function getModelData3() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'imgnum':0,
-            'textnum':10,
+            'imgnum': 0,
+            'textnum': 10,
             'level': 6,
             'placeid': 0,
             'id': '',
@@ -955,13 +931,13 @@ async function getPageAllData() {
                 boxData1data2.value.push(mkdata.data[0].imgnum[index])
             }
         }
-        for (let index in mkdata.data[0].textnum) {
-            if (index < 6) {
-                boxData1data3.value.push(mkdata.data[0].textnum[index])
-            } else {
-                boxData1data4.value.push(mkdata.data[0].textnum[index])
-            }
-        }
+        // for (let index in mkdata.data[0].textnum) {
+        //     if (index < 6) {
+        //         boxData1data3.value.push(mkdata.data[0].textnum[index])
+        //     } else {
+        //         boxData1data4.value.push(mkdata.data[0].textnum[index])
+        //     }
+        // }
         //模块2
         for (let index in mkdata.data[1].imgnum) {
             if (index < 1) {
@@ -970,13 +946,13 @@ async function getPageAllData() {
                 boxData2data2.value.push(mkdata.data[1].imgnum[index])
             }
         }
-        for (let index in mkdata.data[1].textnum) {
-            if (index < 6) {
-                boxData2data3.value.push(mkdata.data[1].textnum[index])
-            } else {
-                boxData2data4.value.push(mkdata.data[1].textnum[index])
-            }
-        }
+        // for (let index in mkdata.data[1].textnum) {
+        //     if (index < 6) {
+        //         boxData2data3.value.push(mkdata.data[1].textnum[index])
+        //     } else {
+        //         boxData2data4.value.push(mkdata.data[1].textnum[index])
+        //     }
+        // }
         //模块3
         for (let index in mkdata.data[2].imgnum) {
             if (index < 1) {
@@ -985,13 +961,13 @@ async function getPageAllData() {
                 boxData3data2.value.push(mkdata.data[2].imgnum[index])
             }
         }
-        for (let index in mkdata.data[2].textnum) {
-            if (index < 6) {
-                boxData3data3.value.push(mkdata.data[2].textnum[index])
-            } else {
-                boxData3data4.value.push(mkdata.data[2].textnum[index])
-            }
-        }
+        // for (let index in mkdata.data[2].textnum) {
+        //     if (index < 6) {
+        //         boxData3data3.value.push(mkdata.data[2].textnum[index])
+        //     } else {
+        //         boxData3data4.value.push(mkdata.data[2].textnum[index])
+        //     }
+        // }
         //模块4
         boxData4.value = mkdata.data[3].imgnum;
         boxData4data2.value = mkdata.data[3].textnum;
@@ -1053,6 +1029,52 @@ async function getPageAllData() {
     }
 }
 getPageAllData();
+
+//特殊资讯
+let getJson1 = [
+    { "parent": $pageNav[0] + ",0,12", "child": "" },//模块1农产供求527
+    { "parent": $pageNav[1] + ",0,12", "child": "" },//模块2致富项目552
+    { "parent": $pageNav[2] + ",0,12", "child": "" },//模块3招商招标529
+]
+
+let jsonString1 = JSON.stringify(getJson1);
+async function getPageAllData1() {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticles', {
+        method: 'GET',
+        query: {
+            'id': jsonString1
+        },
+    });
+    if (mkdata.code == 200) {
+        //模块1
+        for (let index in mkdata.data[0].textnum) {
+            if (index < 6) {
+                boxData1data3.value.push(mkdata.data[0].textnum[index])
+            } else {
+                boxData1data4.value.push(mkdata.data[0].textnum[index])
+            }
+        }
+        //模块2
+        for (let index in mkdata.data[1].textnum) {
+            if (index < 6) {
+                boxData2data3.value.push(mkdata.data[1].textnum[index])
+            } else {
+                boxData2data4.value.push(mkdata.data[1].textnum[index])
+            }
+        }
+        //模块3
+        for (let index in mkdata.data[2].textnum) {
+            if (index < 6) {
+                boxData3data3.value.push(mkdata.data[2].textnum[index])
+            } else {
+                boxData3data4.value.push(mkdata.data[2].textnum[index])
+            }
+        }
+    } else {
+        ElMessage.error(mkdata.message)
+    }
+}
+getPageAllData1();
 //4.页面数据 end---------------------------------------->
 
 //5.设置seo数据 start---------------------------------------->

+ 2 - 2
plugins/category.ts

@@ -30,7 +30,7 @@ const navPre: number[] = [
 
 export default defineNuxtPlugin((nuxtApp) => {
     //master 环境
-    // nuxtApp.provide('pageNav', navMaster)
+    nuxtApp.provide('pageNav', navMaster)
     //pre 环境
-    nuxtApp.provide('pageNav', navPre)
+    // nuxtApp.provide('pageNav', navPre)
 })

+ 10 - 10
plugins/globals.ts

@@ -1,17 +1,17 @@
 export default defineNuxtPlugin((nuxtApp) => {
   //农副产品供销网pre环境
-  nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  nuxtApp.provide('CwebUrl', 'http://pre.nfcpgx.org.cn')
-  nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3005')
+  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
+  // nuxtApp.provide('CwebUrl', 'http://pre.nfcpgx.org.cn')
+  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
+  // nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
+  // nuxtApp.provide('userUrl', 'http://localhost:3005')
 
   // 农副产品供销网正式环境
-  // nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  // nuxtApp.provide('CwebUrl', 'http://nw.nfcpgx.org.cn')
-  // nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
-  // nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-  // nuxtApp.provide('userUrl', 'http://localhost:3005')
+  nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+  nuxtApp.provide('CwebUrl', 'http://nw.nfcpgx.org.cn')
+  nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+  nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+  nuxtApp.provide('userUrl', 'http://localhost:3005')
 
   // 农副产品供销网正式环境
   // nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')

Some files were not shown because too many files changed in this diff