Ver Fonte

修改bug

Jing há 1 mês atrás
pai
commit
efedfd930a

Diff do ficheiro suprimidas por serem muito extensas
+ 979 - 0
.nuxt/dev/index.mjs


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
.nuxt/dev/index.mjs.map


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

@@ -31,4 +31,5 @@ export { injectHead, useHead, useSeoMeta, useHeadSafe, useServerHead, useServerS
 export { requestData, requestDataPromise, requestDataWebUrl, requestHome } from '../composables/getData';
 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":"b8a98cbf-5b31-4726-ad33-6d1702c28965","timestamp":1749774535977}
+{"id":"c76ed065-86a3-4d36-b351-33b9f57ba852","timestamp":1749798581671}

+ 0 - 1
.nuxt/manifest/meta/b8a98cbf-5b31-4726-ad33-6d1702c28965.json

@@ -1 +0,0 @@
-{"id":"b8a98cbf-5b31-4726-ad33-6d1702c28965","timestamp":1749774535977,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 0
.nuxt/manifest/meta/c76ed065-86a3-4d36-b351-33b9f57ba852.json

@@ -0,0 +1 @@
+{"id":"c76ed065-86a3-4d36-b351-33b9f57ba852","timestamp":1749798581671,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

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

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

+ 17 - 0
.nuxt/nitro.json

@@ -0,0 +1,17 @@
+{
+  "date": "2025-06-13T07:09:44.370Z",
+  "preset": "nitro-dev",
+  "framework": {
+    "name": "nuxt",
+    "version": "3.15.2"
+  },
+  "versions": {
+    "nitro": "2.10.4"
+  },
+  "dev": {
+    "pid": 22384,
+    "workerAddress": {
+      "socketPath": "\\\\.\\pipe\\nitro\\worker-22384-2.sock"
+    }
+  }
+}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/b8a98cbf-5b31-4726-ad33-6d1702c28965.json"
+        "./manifest/meta/dev.json"
       ],
       "#components": [
         "./components"

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

@@ -11,6 +11,7 @@ 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";

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

@@ -124,6 +124,7 @@ 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']
@@ -313,6 +314,7 @@ 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']>

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

@@ -9,12 +9,17 @@ 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/payload.client.js")> &
+  InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/browser-devtools-timing.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")> &
@@ -25,7 +30,7 @@ declare module '#app' {
   interface NuxtApp extends NuxtAppInjections { }
 
   interface NuxtAppLiterals {
-    pluginName: 'nuxt:revive-payload:client' | 'nuxt:head' | 'nuxt:router' | 'nuxt:payload' | 'nuxt:revive-payload:server' | 'nuxt:chunk-reload' | 'nuxt:global-components' | 'nuxt:prefetch'
+    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'
   }
 }
 

+ 7 - 5
assets/css/class.less

@@ -151,7 +151,7 @@ section {
 .channel_nav {
 
     border-bottom: solid 3px #004564;
-    margin-top: 30px;
+    margin-top: 20px;
     display: flex;
 
     .channel_nav_head_name {
@@ -238,7 +238,7 @@ section {
 }
 
 .channel_1 {
-    margin: 40px auto 15px;
+    margin: 30px auto 15px;
 }
 
 .channel_banner_1 {
@@ -637,13 +637,11 @@ section {
 
     .channel_ul_3_li_dot1 {
         box-sizing: border-box;
-        padding: 0px 10px;
+        padding: 0px 15px;
         color: #333;
         font-size: 18px;
         height: 62px;
         line-height: 62px;
-        width: 670px;
-        float: right;
     }
 
     .channel_ul_3_li:nth-of-type(1) .channel_ul_3_li_dot1 {
@@ -684,6 +682,10 @@ section {
 
 .channel_4 {
     margin: 15px auto 0px;
+
+    .channel_4_text {
+        min-height: 400px;
+    }
 }
 
 .channel_img_ul_6 {

+ 7 - 8
assets/css/detail.less

@@ -1,7 +1,8 @@
 // 资讯列表
 .newsDetail {
     width: 100%;
-    margin-bottom: 70px;
+    margin-bottom: 10px;
+
 
     .inner {
         width: 1200px;
@@ -16,8 +17,7 @@
             .breadcrumb {
                 width: 100%;
                 height: 22px;
-                padding-bottom: 30px;
-                margin-top: 40px;
+                padding-bottom: 20px;
                 border-bottom: 1px solid #e6e6e6;
                 font-family: Microsoft YaHei, Microsoft YaHei;
                 font-weight: 400;
@@ -72,13 +72,12 @@
             }
 
             .LeftTop {
-                // height: 522px;
-                margin-top: 50px;
+                margin-top: 20px;
 
                 >h1 {
 
                     line-height: 40px;
-                    margin-bottom: 30px;
+                    margin-bottom: 20px;
                     font-family: Microsoft YaHei, Microsoft YaHei;
                     font-weight: bold;
                     font-size: 30px;
@@ -107,7 +106,7 @@
 
             .leftBottom {
                 width: 885px;
-                margin-top: 50px;
+                margin-top: 10px;
                 font-size: 20px;
                 line-height: 38px;
                 margin-bottom: 30px;
@@ -170,7 +169,7 @@
 
         .innerRight {
             width: 270px;
-            margin-top: 60px;
+            margin-top: 10px;
         }
     }
 }

+ 1 - 1
assets/css/index.less

@@ -1098,7 +1098,7 @@ section {
         .index_7_textList {
             width: 350px;
             font-size: 18px;
-            margin-bottom: 15px;
+            margin-bottom: 18px;
 
             em {
                 display: inline-block;

+ 1 - 1
components/home/ListSecondaryHeading.vue

@@ -32,7 +32,7 @@ const targetRoute = segments[1];
     width: 1200px;
     margin: 0 auto;
     border-bottom: solid 3px #004564;
-    margin-top: 30px;
+    margin-top: 20px;
     display: flex;
     overflow: hidden;
 

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

@@ -41,7 +41,7 @@
                     <img :src="selectedImage" alt="Preview">
                 </div>
                 <!-- 免责声明: -->
-                <div class="disclaimer" v-if="newsDetail.copyfrom == '本网'">
+                <div class="disclaimer" v-if="newsDetail.copyfrom != '本网'">
                     <p>原文链接:{{ newsDetail.fromurl }}</p>
                     <p>[免责声明]本文来源于网络转载,仅供学习交流使用,不构成商业目的。 版权归原作者所有,如涉及作品内容,版权和其他问题,请在30日与本网联系,我们将第一时间处理。</p>
                 </div>

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

@@ -39,7 +39,7 @@
                     <img :src="selectedImage" alt="Preview">
                 </div>
                 <!-- 免责声明: -->
-                <div class="disclaimer" v-if="newsDetail.copyfrom == '本网'">
+                <div class="disclaimer" v-if="newsDetail.copyfrom != '本网'">
                     <p>原文链接:{{ newsDetail.fromurl }}</p>
                     <p>[免责声明]本文来源于网络转载,仅供学习交流使用,不构成商业目的。 版权归原作者所有,如涉及作品内容,版权和其他问题,请在30日与本网联系,我们将第一时间处理。</p>
                 </div>

+ 2 - 2
pages/[dir]/index.html.vue

@@ -203,7 +203,7 @@
                         <div class="channel_ul_3_li clearfix" v-for="(item, index) in pageData[4].data2" :key="index">
                             <NuxtLink class="channel_ul_3_li_a" :href="getLinkPathDetail(item)" :title="item.title"
                                 :key="item.id" :target="item.islink == 1 ? '_blank' : '_self'">
-                                <div class="channel_ul_3_li_tag">{{ pageData[4].alias }}</div>
+                                <!-- <div class="channel_ul_3_li_tag">{{ pageData[4].alias }}</div> -->
                                 <div class="channel_ul_3_li_dot1 dot1"> {{ item.title }}</div>
                             </NuxtLink>
                         </div>
@@ -251,7 +251,7 @@
                             栏目简介
                         </NuxtLink>
                     </div>
-                    <div class=" clearfix">
+                    <div class="channel_4_text clearfix">
                         <!--start   模块7-->
                         <div class=" clearfix">
                             <div class="channel_box_5 clearfix">

+ 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')

+ 4 - 4
plugins/request.ts

@@ -6,11 +6,11 @@ export default defineNuxtPlugin(() => {
 
     let Url = {
         //正式环境
-        // webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
-        // CwebUrl: 'nw.nfcpgx.org.cn' //页面地址
+        webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
+        CwebUrl: 'nw.nfcpgx.org.cn' //页面地址
         //pre环境
-        webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
-        CwebUrl: 'pre.nfcpgx.org.cn' //页面地址
+        // webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
+        // CwebUrl: 'pre.nfcpgx.org.cn' //页面地址
     }
 
     const service = axios.create({

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff