修改bug

.nuxt/imports.d.ts

@@ -33,5 +33,4 @@ export { getTime, getTitleLength } from '../composables/publicFunction';
 export { seoSetup } from '../composables/useSeo';
 export { default as proxy } from '../utils/proxy';
 export { apiUse, asyncFetchData, fGET, fPOST, fPUT, fDELETE, GET, POST, PUT, DELETE } from '../utils/request';
-export { useNuxtDevTools } from '../node_modules/@nuxt/devtools/dist/runtime/use-nuxt-devtools';
 export { definePageMeta } from '../node_modules/nuxt/dist/pages/runtime/composables';

.nuxt/manifest/latest.json

@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"id":"dev","timestamp":1749434513627}
-=======
-{"id":"ff21e388-c100-40f1-92e8-fbb0a525729a","timestamp":1747190563132}
->>>>>>> 240e9e8d1582dd2ffadc1534e47dd1e298295d8d
+{"id":"da435399-e31d-4583-b04c-98e80d5891e5","timestamp":1749781738832}

.nuxt/manifest/meta/da435399-e31d-4583-b04c-98e80d5891e5.json

@@ -0,0 +1 @@
+{"id":"da435399-e31d-4583-b04c-98e80d5891e5","timestamp":1749781738832,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/dev.json

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

.nuxt/manifest/meta/fdde2b8d-2fab-4876-a720-917d932144ae.json

@@ -1 +0,0 @@
-{"id":"fdde2b8d-2fab-4876-a720-917d932144ae","timestamp":1747878303909,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/ff21e388-c100-40f1-92e8-fbb0a525729a.json

@@ -1 +0,0 @@
-{"id":"ff21e388-c100-40f1-92e8-fbb0a525729a","timestamp":1747190563132,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/nitro.json

@@ -1,17 +0,0 @@
-{
-  "date": "2025-06-09T02:02:06.791Z",
-  "preset": "nitro-dev",
-  "framework": {
-    "name": "nuxt",
-    "version": "3.15.2"
-  },
-  "versions": {
-    "nitro": "2.10.4"
-  },
-  "dev": {
-    "pid": 12856,
-    "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-12856-1.sock"
-    }
-  }
-}

.nuxt/nuxt.d.ts

@@ -1,6 +1,6 @@
 // Generated by nuxi
-/// <reference types="@nuxt/telemetry" />
 /// <reference types="@nuxt/devtools" />
+/// <reference types="@nuxt/telemetry" />
 /// <reference path="types/builder-env.d.ts" />
 /// <reference types="nuxt" />
 /// <reference path="types/app-defaults.d.ts" />

.nuxt/nuxt.json

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

.nuxt/tsconfig.json

@@ -102,11 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-<<<<<<< HEAD
-        "./manifest/meta/dev"
-=======
-        "./manifest/meta/ff21e388-c100-40f1-92e8-fbb0a525729a.json"
->>>>>>> 240e9e8d1582dd2ffadc1534e47dd1e298295d8d
+        "./manifest/meta/da435399-e31d-4583-b04c-98e80d5891e5.json"
       ],
       "#components": [
         "./components"

.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";

.nuxt/types/imports.d.ts

@@ -130,7 +130,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']
@@ -326,7 +325,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']>

.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.js")> &
   InjectionType<typeof import("../../plugins/request.js")> &
   InjectionType<typeof import("../../plugins/globals.js")> &
@@ -29,7 +24,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'
   }
 }
 

assets/css/detail.less

@@ -2,7 +2,7 @@
 .breadcrumb {
     width: 100%;
     height: 22px;
-    margin-bottom: 30px;
+    margin-bottom: 20px;
     font-family: Microsoft YaHei, Microsoft YaHei;
     font-weight: 400;
     font-size: 20px;
@@ -59,7 +59,7 @@
 .newsDetail {
     width: 100%;
     //height: 1400px;
-    margin-bottom: 70px;
+    margin-bottom: 10px;
 
     .inner {
         width: 1200px;
@@ -72,11 +72,11 @@
             border-top: 1px solid #139602;
 
             .LeftTop {
-                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;
@@ -106,7 +106,7 @@
             .leftBottom {
                 width: 790px;
                 // height: 754px;
-                margin-top: 40px;
+                margin-top: 20px;
                 font-size: 20px;
                 line-height: 38px;
                 margin-bottom: 30px;

assets/css/foot.less

@@ -46,7 +46,7 @@
 .foot_frind_box div{width:100%;overflow:hidden; }
 .foot_frind_box div *{float:left;line-height:22px;height:22px;color:#333;font-size:16px;margin:0 30px;margin-bottom: 20px;}
 .call_us_box{
-    display:block;width:100%;margin:40px auto 0;overflow:hidden;text-align:center;font-size:0px;background:#49A769; 
+    display:block;width:100%;margin:25px auto 0;overflow:hidden;text-align:center;font-size:0px;background:#49A769; 
     a {
         color: #fff;
     }

assets/css/list.less

@@ -4,7 +4,7 @@
 }
 //二级栏目
 .sannongzhichuang {
-    margin: 30px 0 40px;
+    margin: 20px 0 20px;
 
     .inner {
         width: 1200px;
@@ -125,8 +125,8 @@
 .breadcrumb {
     width: 100%;
     height: 22px;
-    margin-top: 30px;
-    margin-bottom: 30px;
+    margin-top: 20px;
+    margin-bottom: 20px;
     font-family: Microsoft YaHei, Microsoft YaHei;
     font-weight: 400;
     font-size: 20px;
@@ -184,7 +184,7 @@
     width: 100%;
     // height: 675px;
     overflow: hidden;
-    margin-bottom: 70px;
+    margin-bottom: 10px;
 
     .inner {
         width: 1200px;
@@ -203,11 +203,11 @@
 
                 >li {
                     width: 790px;
-                    height: 56px;
+                    height: 50px;
                     white-space: nowrap;
                     overflow: hidden;
                     text-overflow: ellipsis;
-                    line-height: 56px;
+                    line-height: 50px;
 
                     >a {
                         width: 360px;

assets/css/shukan.less

@@ -121,7 +121,7 @@ section {
 .index_main {
     width: 1200px;
     margin: 0 auto;
-    margin-bottom: 222px;
+    // margin-bottom: 222px;
 }
 
 .slow_6 {
@@ -254,7 +254,7 @@ section {
 }
 
 .book_1_img_ul {
-    height: 590px;
+    height: 650px;
 
     .book_1_img_li {
         width: 350px;
@@ -423,7 +423,7 @@ section {
 
 .book_2_img_ul {
     margin-top: 30px;
-    height: 530px;
+    height: 590px;
 }
 
 .book_2_img_li {
@@ -560,6 +560,7 @@ section {
 
 .index_4 {
     margin-top: 11px;
+    margin-bottom: 25px;
 }
 
 .index_4_left {

components/home/SecondaryHeading.vue

@@ -53,7 +53,7 @@ getPageData();
 <style lang="less" scoped>
 // 三农之窗
 .sannongzhichuang {
-    margin: 30px 0 40px;
+    margin: 25px 0 25px;
 
     .inner {
         width: 1200px;

components/home/SecondaryHeading_shukan.vue

@@ -53,7 +53,7 @@ getPageData();
 <style lang="less" scoped>
 // 三农之窗
 .sannongzhichuang {
-    margin: 30px 0 40px;
+    margin: 25px 0 25px;
 
     .inner {
         width: 1200px;

middleware/setup.global.js

@@ -100,6 +100,7 @@ function getRouteWhiteList(path){
             "advertising",//广告
             "about",//关于我们
             "zhaogongzhaopin",//招工招聘
+            "shukanxinxi",//书刊信息
         ]
 
         if(whiteList.includes(parts[0])){

pages/shukanxinxi/[dir]/[id].vue

@@ -21,14 +21,14 @@
                                 <div class="book_detail_price_box_in clearfix">
                                     <span class="book_detail_price_red">￥</span>
                                     <span class="book_detail_price_num"
-                                        v-if="newsDetail.price == '' || newsDetail.price != 0">
-                                        {{ newsDetail.price }}
+                                        v-if="newsDetail.market_price == '' || newsDetail.market_price != 0">
+                                        {{ newsDetail.market_price }}
                                     </span>
                                 </div>
                                 <span class="book_detail_price_text">市场价：</span>
                                 <span class="book_detail_price_delete"
-                                    v-if="newsDetail.market_price == '' || newsDetail.market_price != 0">
-                                    {{ newsDetail.market_price }}
+                                    v-if="newsDetail.price == '' || newsDetail.price != 0">
+                                    {{ newsDetail.price }}
                                 </span>
                             </div>
                             <div class="book_detail_right_ul clearfix">

pages/shukanxinxi/index.html.vue

@@ -202,9 +202,9 @@
                                     <div class="book_5_img_li_dot2 dot2">{{ item.title }}</div>
                                     <div class="book_5_img_li_foot clearfix">
                                         <span class="book_5_img_li_foot_red">￥</span>
-                                        <span class="book_5_img_li_foot_num">{{ item.price }}</span>
+                                        <span class="book_5_img_li_foot_num">{{ item.market_price }}</span>
                                         <span class="book_5_img_li_foot_text">市场价：</span>
-                                        <span class="book_5_img_li_foot_price">￥{{ item.market_price }}</span>
+                                        <span class="book_5_img_li_foot_price">￥{{ item.price }}</span>
                                     </div>
                                 </div>
                             </NuxtLink>
@@ -245,8 +245,8 @@
                 </div>
                 <!-- 模块8 end -->
             </section>
+            <HomeAdvertising :imgurl="adImg3"></HomeAdvertising>
         </main>
-
         <!-- 页脚部分 -->
         <HomeFoot1></HomeFoot1>
     </div>