网站逻辑已完成

.env

@@ -1 +1 @@
-PORT=3000
+PORT=3002

.nuxt/dev/index.mjs

@@ -3,30 +3,30 @@ import { Server } from 'node:http';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { parentPort, threadId } from 'node:worker_threads';
-import { getRequestHeader, splitCookiesString, setResponseStatus, setResponseHeader, send, getRequestHeaders, defineEventHandler, handleCacheHeaders, createEvent, fetchWithEvent, isEvent, eventHandler, setHeaders, sendRedirect, proxyRequest, createApp, createRouter as createRouter$1, toNodeListener, lazyEventHandler, getResponseStatus, setResponseHeaders, createError, getRouterParam, getQuery as getQuery$1, readBody, getResponseStatusText } from 'file://D:/MyProject/gogs/nongminwang/node_modules/h3/dist/index.mjs';
-import { getRequestDependencies, getPreloadLinks, getPrefetchLinks, createRenderer } from 'file://D:/MyProject/gogs/nongminwang/node_modules/vue-bundle-renderer/dist/runtime.mjs';
-import { stringify, uneval } from 'file://D:/MyProject/gogs/nongminwang/node_modules/devalue/index.js';
-import destr from 'file://D:/MyProject/gogs/nongminwang/node_modules/destr/dist/index.mjs';
-import { withQuery, joinURL, withTrailingSlash, parseURL, withoutBase, getQuery, joinRelativeURL } from 'file://D:/MyProject/gogs/nongminwang/node_modules/ufo/dist/index.mjs';
-import { renderToString } from 'file://D:/MyProject/gogs/nongminwang/node_modules/vue/server-renderer/index.mjs';
-import { propsToString, renderSSRHead } from 'file://D:/MyProject/gogs/nongminwang/node_modules/@unhead/ssr/dist/index.mjs';
-import { createServerHead as createServerHead$1, CapoPlugin } from 'file://D:/MyProject/gogs/nongminwang/node_modules/unhead/dist/index.mjs';
-import { klona } from 'file://D:/MyProject/gogs/nongminwang/node_modules/klona/dist/index.mjs';
-import defu, { defuFn } from 'file://D:/MyProject/gogs/nongminwang/node_modules/defu/dist/defu.mjs';
-import { snakeCase } from 'file://D:/MyProject/gogs/nongminwang/node_modules/scule/dist/index.mjs';
-import { createHooks } from 'file://D:/MyProject/gogs/nongminwang/node_modules/hookable/dist/index.mjs';
-import { createFetch as createFetch$1, Headers as Headers$1 } from 'file://D:/MyProject/gogs/nongminwang/node_modules/ofetch/dist/node.mjs';
-import { createCall, createFetch } from 'file://D:/MyProject/gogs/nongminwang/node_modules/unenv/runtime/fetch/index.mjs';
+import { getRequestHeader, splitCookiesString, setResponseStatus, setResponseHeader, send, getRequestHeaders, defineEventHandler, handleCacheHeaders, createEvent, fetchWithEvent, isEvent, eventHandler, setHeaders, sendRedirect, proxyRequest, createApp, createRouter as createRouter$1, toNodeListener, lazyEventHandler, getResponseStatus, setResponseHeaders, createError, getRouterParam, getQuery as getQuery$1, readBody, getResponseStatusText } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/h3/dist/index.mjs';
+import { getRequestDependencies, getPreloadLinks, getPrefetchLinks, createRenderer } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/vue-bundle-renderer/dist/runtime.mjs';
+import { stringify, uneval } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/devalue/index.js';
+import destr from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/destr/dist/index.mjs';
+import { withQuery, joinURL, withTrailingSlash, parseURL, withoutBase, getQuery, joinRelativeURL } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/ufo/dist/index.mjs';
+import { renderToString } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/vue/server-renderer/index.mjs';
+import { propsToString, renderSSRHead } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/@unhead/ssr/dist/index.mjs';
+import { createServerHead as createServerHead$1, CapoPlugin } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/unhead/dist/index.mjs';
+import { klona } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/klona/dist/index.mjs';
+import defu, { defuFn } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/defu/dist/defu.mjs';
+import { snakeCase } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/scule/dist/index.mjs';
+import { createHooks } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/hookable/dist/index.mjs';
+import { createFetch as createFetch$1, Headers as Headers$1 } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/ofetch/dist/node.mjs';
+import { createCall, createFetch } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/unenv/runtime/fetch/index.mjs';
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { consola } from 'file://D:/MyProject/gogs/nongminwang/node_modules/consola/dist/index.mjs';
-import { getContext } from 'file://D:/MyProject/gogs/nongminwang/node_modules/unctx/dist/index.mjs';
-import { captureRawStackTrace, parseRawStackTrace } from 'file://D:/MyProject/gogs/nongminwang/node_modules/errx/dist/index.js';
-import { isVNode, version, unref } from 'file://D:/MyProject/gogs/nongminwang/node_modules/vue/index.mjs';
-import { hash } from 'file://D:/MyProject/gogs/nongminwang/node_modules/ohash/dist/index.mjs';
-import { createStorage, prefixStorage } from 'file://D:/MyProject/gogs/nongminwang/node_modules/unstorage/dist/index.mjs';
-import unstorage_47drivers_47fs from 'file://D:/MyProject/gogs/nongminwang/node_modules/unstorage/drivers/fs.mjs';
-import { toRouteMatcher, createRouter } from 'file://D:/MyProject/gogs/nongminwang/node_modules/radix3/dist/index.mjs';
-import { defineHeadPlugin } from 'file://D:/MyProject/gogs/nongminwang/node_modules/@unhead/shared/dist/index.mjs';
+import { consola } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/consola/dist/index.mjs';
+import { getContext } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/unctx/dist/index.mjs';
+import { captureRawStackTrace, parseRawStackTrace } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/errx/dist/index.js';
+import { isVNode, version, unref } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/vue/index.mjs';
+import { hash } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/ohash/dist/index.mjs';
+import { createStorage, prefixStorage } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/unstorage/dist/index.mjs';
+import unstorage_47drivers_47fs from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/unstorage/drivers/fs.mjs';
+import { toRouteMatcher, createRouter } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/radix3/dist/index.mjs';
+import { defineHeadPlugin } from 'file://D:/01_AA_ssr_master/01/nongminwang/node_modules/@unhead/shared/dist/index.mjs';
 
 function hasReqHeader(event, name, includes) {
   const value = getRequestHeader(event, name);
@@ -172,13 +172,13 @@ if (!window.__NUXT_DEVTOOLS_TIME_METRIC__) {
 window.__NUXT_DEVTOOLS_TIME_METRIC__.appInit = Date.now()
 `;
 
-const _XYzHutxL7P = (function(nitro) {
+const _XfccDJkdiu = (function(nitro) {
   nitro.hooks.hook("render:html", (htmlContext) => {
     htmlContext.head.push(`<script>${script}<\/script>`);
   });
 });
 
-const rootDir = "D:/MyProject/gogs/nongminwang";
+const rootDir = "D:/01_AA_ssr_master/01/nongminwang";
 
 const appHead = {"meta":[{"name":"viewport","content":"width=device-width, initial-scale=1"},{"charset":"utf-8"},{"name":"description","content":""},{"name":"keywords","content":""}],"link":[],"style":[],"script":[],"noscript":[],"title":""};
 
@@ -197,7 +197,7 @@ const devReducers = {
   URL: (data) => data instanceof URL ? data.toString() : undefined
 };
 const asyncContext = getContext("nuxt-dev", { asyncContext: true, AsyncLocalStorage });
-const _lrCI0MH0Mq = (nitroApp) => {
+const _vXvFtmAutF = (nitroApp) => {
   const handler = nitroApp.h3App.handler;
   nitroApp.h3App.handler = (event) => {
     return asyncContext.callAsync({ logs: [], event }, () => handler(event));
@@ -267,20 +267,20 @@ function onConsoleLog(callback) {
 }
 
 const plugins = [
-  _XYzHutxL7P,
-_lrCI0MH0Mq
+  _XfccDJkdiu,
+_vXvFtmAutF
 ];
 
-const _lazy_feGkJK = () => Promise.resolve().then(function () { return index; });
-const _lazy_PQUD28 = () => Promise.resolve().then(function () { return renderer$1; });
+const _lazy_ZvnMch = () => Promise.resolve().then(function () { return index; });
+const _lazy_8ST0Y3 = () => Promise.resolve().then(function () { return renderer$1; });
 
 const handlers = [
-  { route: '/api', handler: _lazy_feGkJK, lazy: true, middleware: false, method: undefined },
-  { route: '/__nuxt_error', handler: _lazy_PQUD28, lazy: true, middleware: false, method: undefined },
-  { route: '/**', handler: _lazy_PQUD28, lazy: true, middleware: false, method: undefined }
+  { route: '/api', handler: _lazy_ZvnMch, lazy: true, middleware: false, method: undefined },
+  { route: '/__nuxt_error', handler: _lazy_8ST0Y3, lazy: true, middleware: false, method: undefined },
+  { route: '/**', handler: _lazy_8ST0Y3, lazy: true, middleware: false, method: undefined }
 ];
 
-const serverAssets = [{"baseName":"server","dir":"D:/MyProject/gogs/nongminwang/server/assets"}];
+const serverAssets = [{"baseName":"server","dir":"D:/01_AA_ssr_master/01/nongminwang/server/assets"}];
 
 const assets = createStorage();
 
@@ -292,11 +292,11 @@ const storage = createStorage({});
 
 storage.mount('/assets', assets);
 
-storage.mount('root', unstorage_47drivers_47fs({"driver":"fs","readOnly":true,"base":"D:\\MyProject\\gogs\\nongminwang","ignore":["**/node_modules/**","**/.git/**"]}));
-storage.mount('src', unstorage_47drivers_47fs({"driver":"fs","readOnly":true,"base":"D:\\MyProject\\gogs\\nongminwang\\server","ignore":["**/node_modules/**","**/.git/**"]}));
-storage.mount('build', unstorage_47drivers_47fs({"driver":"fs","readOnly":false,"base":"D:\\MyProject\\gogs\\nongminwang\\.nuxt","ignore":["**/node_modules/**","**/.git/**"]}));
-storage.mount('cache', unstorage_47drivers_47fs({"driver":"fs","readOnly":false,"base":"D:\\MyProject\\gogs\\nongminwang\\.nuxt\\cache","ignore":["**/node_modules/**","**/.git/**"]}));
-storage.mount('data', unstorage_47drivers_47fs({"driver":"fs","base":"D:\\MyProject\\gogs\\nongminwang\\.data\\kv","ignore":["**/node_modules/**","**/.git/**"]}));
+storage.mount('root', unstorage_47drivers_47fs({"driver":"fs","readOnly":true,"base":"D:\\01_AA_ssr_master\\01\\nongminwang","ignore":["**/node_modules/**","**/.git/**"]}));
+storage.mount('src', unstorage_47drivers_47fs({"driver":"fs","readOnly":true,"base":"D:\\01_AA_ssr_master\\01\\nongminwang\\server","ignore":["**/node_modules/**","**/.git/**"]}));
+storage.mount('build', unstorage_47drivers_47fs({"driver":"fs","readOnly":false,"base":"D:\\01_AA_ssr_master\\01\\nongminwang\\.nuxt","ignore":["**/node_modules/**","**/.git/**"]}));
+storage.mount('cache', unstorage_47drivers_47fs({"driver":"fs","readOnly":false,"base":"D:\\01_AA_ssr_master\\01\\nongminwang\\.nuxt\\cache","ignore":["**/node_modules/**","**/.git/**"]}));
+storage.mount('data', unstorage_47drivers_47fs({"driver":"fs","base":"D:\\01_AA_ssr_master\\01\\nongminwang\\.data\\kv","ignore":["**/node_modules/**","**/.git/**"]}));
 
 function useStorage(base = "") {
   return base ? prefixStorage(storage, base) : storage;
@@ -1167,8 +1167,8 @@ function publicAssetsURL(...path) {
 
 globalThis.__buildAssetsURL = buildAssetsURL;
 globalThis.__publicAssetsURL = publicAssetsURL;
-const getClientManifest = () => import('file://D:/MyProject/gogs/nongminwang/.nuxt/dist/server/client.manifest.mjs').then((r) => r.default || r).then((r) => typeof r === "function" ? r() : r);
-const getServerEntry = () => import('file://D:/MyProject/gogs/nongminwang/.nuxt/dist/server/server.mjs').then((r) => r.default || r);
+const getClientManifest = () => import('file://D:/01_AA_ssr_master/01/nongminwang/.nuxt/dist/server/client.manifest.mjs').then((r) => r.default || r).then((r) => typeof r === "function" ? r() : r);
+const getServerEntry = () => import('file://D:/01_AA_ssr_master/01/nongminwang/.nuxt/dist/server/server.mjs').then((r) => r.default || r);
 const getSSRStyles = lazyCachedFunction(() => Promise.resolve().then(function () { return styles$1; }).then((r) => r.default || r));
 const getSSRRenderer = lazyCachedFunction(async () => {
   const manifest = await getClientManifest();

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1744608806222}
+{"id":"dev","timestamp":1744796602053}

.nuxt/manifest/meta/96d7b98e-233e-4101-8c47-36ace736c79c.json

@@ -1 +0,0 @@
-{}

.nuxt/manifest/meta/dev.json

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

.nuxt/nitro.json

@@ -1,5 +1,5 @@
 {
-  "date": "2025-04-14T05:33:34.835Z",
+  "date": "2025-04-16T09:43:33.573Z",
   "preset": "nitro-dev",
   "framework": {
     "name": "nuxt",
@@ -9,9 +9,9 @@
     "nitro": "2.10.4"
   },
   "dev": {
-    "pid": 8572,
+    "pid": 19104,
     "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-8572-1.sock"
+      "socketPath": "\\\\.\\pipe\\nitro\\worker-19104-1.sock"
     }
   }
 }

.nuxt/nuxt.d.ts

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

.nuxt/nuxt.json

@@ -1,7 +1,7 @@
 {
-  "_hash": "uVxffiE3iZ",
+  "_hash": "EMFtRvsgKm",
   "project": {
-    "rootDir": "D:/MyProject/gogs/nongminwang"
+    "rootDir": "D:/01_AA_ssr_master/01/nongminwang"
   },
   "versions": {
     "nuxt": "3.15.2"

assets/css/class.less

@@ -72,8 +72,8 @@ section {
     height: 45px;
     display: block;
     width: 100%;
-    margin-bottom: 40px;
-    background: url(@/public/img/2.png) left center;
+    margin-bottom: 20px;
+    background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/2.png) left center;
     background-repeat: repeat-x;
     background-size: auto 10px;
 }
@@ -108,7 +108,7 @@ section {
     height: 45px;
     line-height: 45px;
     color: #999;
-    font-size: 34px;
+    font-size: 24px;
     font-weight: bold;
     padding-right: 28px;
     background: #fff;
@@ -122,8 +122,8 @@ section {
     height: 45px;
     display: block;
     width: 100%;
-    margin-bottom: 40px;
-    background: url(@/public/img/2.png) left center;
+    margin-bottom: 20px;
+    background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/2.png) left center;
     background-repeat: repeat-x;
     background-size: auto 10px;
 }
@@ -192,14 +192,14 @@ section {
         width: 153px;
         margin: 14px 30px 0px 0px;
         text-indent: 46px;
-        background: url(../public/img/3.png) no-repeat left top;
+        background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/3.png) no-repeat;
         background-size: 100% 100%;
     }
 
 }
 
 .index_1 {
-    margin-top: 40px;
+    margin-top: 20px;
     height: 410px;
 }
 
@@ -274,7 +274,8 @@ section {
 
 
 .index_2 {
-    margin-top: 40px;
+    margin-top: 20px;
+    height: 490px;
 }
 
 .index_2_left {
@@ -448,7 +449,7 @@ section {
 }
 
 .index_3 {
-    margin-top: 40px;
+    margin-top: 20px;
     height: 555px;
 }
 

assets/css/detail.less

@@ -107,10 +107,10 @@
 
             .leftBottom {
                 width: 885px;
-                margin-top: 50px;
+                margin-top: 20px;
                 font-size: 20px;
                 line-height: 38px;
-                margin-bottom: 30px;
+                margin-bottom: 20px;
 
                 ul>li img {
                     width: 885px;
@@ -191,6 +191,209 @@
     font-weight: 500;
 }
 
+//投票
+.index_3_box_vote {
+    .voteTitle {
+        font-size: 20px;
+        height: 40px;
+        line-height: 40px;
+        color: #333333;
+        padding-left: 20px;
+        width: 100%;
+        border-bottom: 1px solid #E7E7E7;
+        border-top: 1px solid #dd7d18;
+        box-sizing: border-box;
+    }
+
+    width:100%;
+    box-sizing:border-box;
+    border:solid 1px #FBFBFB;
+    background: #FBFBFB;
+
+    .inquire {
+        height: 394px;
+        margin-top: 20px;
+        border-radius: 6px 6px 6px 6px;
+        padding: 4px 40px 4px 6px;
+        box-sizing: border-box;
+
+        p {
+            font-weight: bold;
+            height: 69px;
+            font-family: PingFang SC, PingFang SC;
+            font-size: 20px;
+            color: #333333;
+            line-height: 21px;
+            text-align: left;
+            font-style: normal;
+            text-transform: none;
+            padding: 12px 20px 0 32px;
+        }
+
+        .radioBox {
+            height: 250px;
+            padding-left: 30px;
+            overflow-y: auto;
+            box-sizing: border-box;
+            padding-bottom: 20px;
+        }
+
+        .radio {
+            /deep/.el-radio {
+                --el-radio-input-border-color-hover: #dd7d18;
+            }
+
+            /deep/.el-radio-group {
+                align-items: center;
+                display: inline-flex;
+                flex-wrap: wrap;
+                font-size: 0;
+                //padding-left: 35px;
+            }
+
+            /deep/.el-radio.el-radio--large {
+                width: 100%;
+                height: 29px;
+                margin-bottom: 15px;
+            }
+
+            /deep/.el-radio.el-radio--large .el-radio__label {
+                font-family: PingFang SC, PingFang SC;
+                font-weight: 400;
+                font-size: 16px;
+                color: #333333;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                width: 300px;
+            }
+
+            /deep/.el-radio.el-radio--large .el-radio__inner {
+                height: 16px;
+                width: 16px;
+            }
+
+            /deep/.el-radio__input.is-checked+.el-radio__label {
+                color: #dd7d18;
+            }
+
+            /deep/.el-radio__input.is-checked .el-radio__inner {
+                background: #dd7d18;
+                border-color: #dd7d18;
+            }
+        }
+
+        .checkInputBox {
+            /deep/.el-checkbox {
+                --el-radio-input-border-color-hover: #dd7d18;
+            }
+
+            /deep/.el-checkbox-group {
+                align-items: center;
+                display: inline-flex;
+                flex-wrap: wrap;
+                font-size: 0;
+            }
+
+            /deep/.el-checkbox.el-checkbox--large {
+                width: 330px;
+                height: 29px;
+                margin-bottom: 15px;
+            }
+
+            /deep/.el-checkbox.el-checkbox--large .el-checkbox__label {
+                font-family: PingFang SC, PingFang SC;
+                font-weight: 400;
+                font-size: 16px;
+                color: #333333;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                width: 300px;
+            }
+
+            /deep/.el-checkbox.el-checkbox--large .el-checkbox__inner {
+                height: 16px;
+                width: 16px;
+            }
+
+            /deep/.el-checkbox__input.is-checked+.el-checkbox__label {
+                color: #dd7d18;
+            }
+
+            /deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+                background: #dd7d18;
+                border-color: #dd7d18;
+            }
+        }
+
+        .btn {
+            padding-left: 30px;
+
+            button {
+                width: 78px;
+                height: 37px;
+                line-height: 37px;
+                border-radius: 6px;
+                border: none;
+                font-family: PingFang SC, PingFang SC;
+                font-weight: 400;
+                font-size: 16px;
+                color: #999999;
+            }
+
+            .voting {
+                background-color: #dd7d18;
+                color: #fff;
+                margin-right: 44px;
+                cursor: pointer;
+            }
+
+            .look {
+                cursor: pointer;
+            }
+        }
+    }
+
+    .inquireData {
+        .inquireDataItem {
+            width: 100%;
+            height: 38px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            background: #F3F3F3;
+            border: 1px solid #D2D2D2;
+            margin-bottom: 10px;
+            border-radius: 6px;
+            padding: 0 15px;
+            box-sizing: border-box;
+            color: #999999;
+
+            .inquireDataItemTitle {
+                width: 290px;
+                height: 38px;
+                font-size: 16px;
+                line-height: 38px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+
+            .inquireDataItemNum {
+                font-size: 16px;
+            }
+        }
+
+        .active {
+            color: #dd7d18;
+            background: #f3e9de;
+            border: 1px solid #dd7d18;
+        }
+    }
+}
+
+
 
 //放大图片
 .preview-modal {

assets/css/index.less

@@ -398,6 +398,7 @@
             }
 
             .part2_left_content2 {
+                position: relative;
                 float: right;
                 width: 450px;
                 height: 430px;
@@ -406,6 +407,7 @@
                 .part2_left_content2list {
                     display: flex;
                     width: 450px;
+                    height: 120px;
                     margin-bottom: 30px;
 
                     img {
@@ -457,6 +459,13 @@
                         }
                     }
                 }
+                .adlogo3{
+                    position: absolute;
+                    bottom: 0;
+                    right: 0;
+                    width: 450px;
+                    height: 290px;
+                }
             }
         }
 
@@ -803,6 +812,8 @@
 //第四部分
 .part4 {
     width: 100%;
+    height: 600px;
+    // background-color: #ccc;
     overflow: hidden;
     margin-bottom: 30px;
     margin-top: 30px;
@@ -835,7 +846,7 @@
                         background: #DD7D18;
                         position: absolute;
                         top: 0px;
-                        left: 46px;
+                        left: 38px;
                     }
                 }
 
@@ -865,6 +876,8 @@
             .part4_photo_text {
                 position: relative;
                 margin-top: 20px;
+                width: 380px;
+                height: 249px;
 
                 a img {
                     width: 380px;

assets/css/list.less

@@ -305,6 +305,11 @@
         .innerRight {
             width: 270px;
             margin-top: 60px;
+
+            .hotList {
+                width: 270px;
+                height: 618px;
+            }
         }
     }
 }
@@ -544,5 +549,4 @@
         }
 
     }
-}
-
+}

assets/css/public/footer.less

@@ -181,7 +181,7 @@
 
 .foot_logo_out>* {
     position: absolute;
-    top: -177px;
+    top: -145px;
 }
 
 .foot_logo_out>*:nth-of-type(1) {

assets/css/public/nav.less

@@ -120,12 +120,12 @@
             font-weight: 400;
             font-size: 16px;
             color: #333333;
-                        /*display: flex;
+            /*display: flex;
             justify-content: space-between;
             flex-wrap: wrap;*/
 
             .navListItem {
-            float: left;
+                float: left;
                 width: 97px;
                 text-align: center;
                 font-family: Microsoft YaHei, Microsoft YaHei;
@@ -151,7 +151,7 @@
             height: 75px;
             font-size: 16px;
             margin-top: 25px;
-            background: url(/_nuxt/public/index/nav_bg.png) no-repeat;
+            background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/nav_bg.png) no-repeat;
 
             .nav111 {
                 width: 98px;

assets/css/search.less

@@ -97,11 +97,11 @@
         .innerLeft {
             //height: 675px;
 
-            >.list {
+            .list {
                 //height: 570px;
                 margin-bottom: 70px;
 
-                >li {
+                li {
                     width: 100%;
                     height: 56px;
                     white-space: nowrap;
@@ -123,6 +123,15 @@
                         text-transform: none;
                     }
 
+                    .time {
+                        float: right;
+                        font-family: Microsoft YaHei, Microsoft YaHei;
+                        font-weight: 400;
+                        font-size: 18px;
+                        color: #333333;
+                        padding-top: 15px;
+                    }
+
                 }
 
                 >li:hover>a {

components/detail/HotNews.vue

@@ -102,6 +102,7 @@ getPageData();
 //标题
 .hotList {
     width: 270px;
+    height: 618px;
     border-top: 2px solid #dd7d18;
 
     .title {

components/detail/HotNews2.vue

@@ -73,6 +73,7 @@ getPageData();
 <style lang="less" scoped>
 .hotNews {
     width: 270px;
+    height: 597px;
     border-top: 2px solid #dd7d18;
     margin-top: 40px;
 

components/home/AdvertisingClass.vue

@@ -37,7 +37,7 @@ const props = defineProps({
     }
 
     .banner_2 {
-        margin-top: 40px;
+        margin-top: 20px;
         height: 106px;
         .banner_2_left {
             float: left;

components/home/ListSecondaryHeading.vue

@@ -60,7 +60,7 @@ const targetRoute = segments[1];
         width: 153px;
         margin: 14px 30px 0px 0px;
         text-indent: 46px;
-        background: url(@/public/img/3.png) no-repeat left top;
+        background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/3.png) no-repeat left top;
         background-size: 100% 100%;
     }
     .index_nav_a {
@@ -111,7 +111,7 @@ const targetRoute = segments[1];
         width: 153px;
         margin: 14px 30px 0px 0px;
         text-indent: 46px;
-        background: url(@/public/img/3.png) no-repeat left top;
+        background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/3.png) no-repeat left top;
         background-size: 100% 100%;
     }
 }

components/home/SecondaryHeading.vue

@@ -81,7 +81,7 @@ getPageData();
         width: 153px;
         margin: 14px 30px 0px 0px;
         text-indent: 46px;
-        background: url(@/public/img/3.png) no-repeat left top;
+        background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/3.png) no-repeat left top;
         background-size: 100% 100%;
     }
     .index_nav_a {
@@ -132,7 +132,7 @@ getPageData();
         width: 153px;
         margin: 14px 30px 0px 0px;
         text-indent: 46px;
-        background: url(@/public/img/3.png) no-repeat left top;
+        background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/3.png) no-repeat left top;
         background-size: 100% 100%;
     }
 }

components/home/pageHead.vue

@@ -1,7 +1,5 @@
 <template>
-    <!-- 页面头部 -->
     <header>
-        <!-- 顶部导航 -->
         <nav class="headerNav">
             <div class="inner">
                 <div class="left">
@@ -24,7 +22,8 @@
                             <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/topicon4.png" alt="注册">注册
                         </button>
                         <button class="reg" @click="userCenter" v-show="showToken">
-                            <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/topicon3.png" alt="用户信息">{{ username }}
+                            <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/topicon3.png" alt="用户信息">{{
+                            username }}
                         </button>
                         <button class="reg" @click="goSearch">
                             <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/searchicon.png" alt="搜索">搜索
@@ -37,32 +36,27 @@
                 </div>
             </div>
         </nav>
-        <!-- 头部logo -->
         <div class="headerLogo">
             <div class="inner">
                 <img :src="logo" :alt="webSiteName" class="left" @click="backHome">
                 <div class="titlead" v-if="adImg">
-                    <a href="http://sannongdy.org.cn/" v-if="adImg.image_url==null" target="_blank" :title="adImg.place_name">
-                        <img :src="adImg.thumb" :alt="adImg.place_name" data-tag="imgurl.ad_tag">
-                    </a>     
-                    <a :href="adImg.image_url" v-else :title="adImg.ad_name">
-                        <img :src="adImg.image_src" :alt="adImg.ad_name" data-tag="imgurl.ad_tag">
+                    <a href="http://sannongdy.org.cn/" v-if="adImg.image_url == null" target="_blank"
+                        :title="adImg.introduce">
+                        <img :src="adImg.thumb" :alt="adImg.introduce" data-tag="imgurl.ad_tag" :id="adImg.ad_tag">
+                    </a>
+                    <a :href="adImg.image_url" v-else :title="adImg.introduce">
+                        <img :src="adImg.image_src" :alt="adImg.introduce" data-tag="imgurl.ad_tag" :id="adImg.ad_tag">
                     </a>
                 </div>
             </div>
         </div>
-        <el-dialog v-model="dialogTableVisible" title="" width="800">
+        <el-dialog v-model="dialogTableVisible" width="800">
             <div class="tips">
                 <p>
-                    <img src="../../public/topic/tips.png" alt="">
-                    提示:注册请联系管理员操作!
-                </p>
-                <p>
-                    联系电话:010-56019387
-                </p>
-                <p>
-                    QQ ： 2909421493 、213552413
+                    <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/tips.png"> 提示:注册请联系管理员操作!
                 </p>
+                <p>联系电话:010-56019387</p>
+                <p>QQ ： 2909421493 、213552413</p>
             </div>
         </el-dialog>
     </header>
@@ -109,8 +103,6 @@ let showToken = useState("showToken", () => '')
 token1.value = getToken()
 
 
-
-
 //检测登录状态
 let tokenStatus = ref('');
 tokenStatus.value = getToken()
@@ -131,7 +123,7 @@ let goLogin = () => {
     //王鹏
     window.open($BwebUrl + "/auth/login.php?backurl=" + $CwebUrl, '_blank');
     //刘佳伟
-    //window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl, '_blank');
+    // window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl, '_blank');
     //开启线上登录模式 end---------------------------------------->
 
     //开启本地登录模式 start---------------------------------------->
@@ -156,6 +148,21 @@ let userCenter = () => {
         return
     }
 }
+
+// 添加点击事件处理函数
+const handleClickOutside = (event) => {
+  // 获取用户信息菜单元素
+  const userInfoMenu = document.querySelector('.userInfo11');
+  // 获取用户按钮元素
+  const userButton = document.querySelector('.reg img[alt="用户信息"]')?.parentElement;
+  
+  // 如果点击的不是菜单本身且不是用户按钮，则隐藏菜单
+  if (userInfoMenu && 
+      !userInfoMenu.contains(event.target) && 
+      !userButton?.contains(event.target)) {
+    isShow.value = false;
+  }
+}
 //2.登录逻辑 end ---------------------------------------->
 
 //3.跳转菜单逻辑 start ---------------------------------------->
@@ -173,11 +180,12 @@ let exit = () => {
     token1.value = getToken()
 
     let tokendata = getToken()
-    console.log("用户退出登录======token为：", tokendata)
+  
     //王鹏
-    //let url = $BwebUrl + '/auth/logout.php?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+    let url = $BwebUrl + '/auth/logout.php?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+      console.log("用户退出登录======token为：", tokendata,url)
     //刘佳伟
-    let url = $LoginWebUrl + '/api/logout?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+    // let url = $LoginWebUrl + '/api/logout?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
     window.location.href = url;
     removeToken()
     removeTicket()
@@ -243,7 +251,14 @@ let adImg = ref({})
 //4.获取广告 end ---------------------------------------->
 
 //5.获取登录状态 start ---------------------------------------->
+// 在组件卸载时移除事件监听
+onUnmounted(() => {
+  document.removeEventListener('click', handleClickOutside);
+})
+
 onMounted(async () => {
+    //添加监听关闭个人中心菜单
+    document.addEventListener('click', handleClickOutside);
 
     //从客户端获取登录状态
     //从客户端阶段开始 持续查询登录状态

components/home/pageNavigation.vue

@@ -5,14 +5,15 @@
             <div class="inner">
                 <div class="home">
                     <em></em>
-                    <NuxtLink :to="'/'">首页</NuxtLink> 
+                    <NuxtLink :to="'/'">首页</NuxtLink>
                 </div>
                 <ul class="partOneTitle">
                     <li class="titleList1">
                         深度服务
                     </li>
                     <li class="titleList111" v-for="(item, index) in navigation1" :key="index">
-                        <NuxtLink :href="getLinkPath(item)" :title="item.alias" :target="item.is_url == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPath(item)" :title="item.alias"
+                            :target="item.is_url == 1 ? '_blank' : '_self'">
                             {{ item.alias }}
                         </NuxtLink>
                     </li>
@@ -26,15 +27,19 @@
                     <div> 推荐版块 </div>
                 </div>
                 <ul class="navlist">
-                    <li class="navListItem" v-for="(item,index) in navigation2" :key="index">
-                        <NuxtLink :href="getLinkPath(item)" :title="item.alias" :target="item.is_url == 1 ? '_blank' : '_self'">
+                    <li class="navListItem" v-for="(item, index) in navigation2" :key="index">
+                        <NuxtLink :href="getLinkPath(item)" :title="item.alias"
+                            :target="item.is_url == 1 ? '_blank' : '_self'">
                             {{ item.alias }}
                         </NuxtLink>
                     </li>
                 </ul>
                 <div class="navright">
-                    <div class="nav111" v-for="(item, index) in 2" :key="index">
-                        <a href="#">信访投诉</a>
+                    <div class="nav111" v-for="(item, index) in navigation3" :key="index">
+                        <NuxtLink :href="getLinkPath(item)" :title="item.alias"
+                            :target="item.is_url == 1 ? '_blank' : '_self'">
+                            {{ item.alias }}
+                        </NuxtLink>
                     </div>
                 </div>
             </div>
@@ -93,12 +98,12 @@ getNavigation3();
 
 //格式化跳转路径
 const getLinkPath = (item) => {
-    if(item.is_url==1){
+    if (item.is_url == 1) {
         return `${item.web_url}`;
-    }else if(item.children_count == 0){
+    } else if (item.children_count == 0) {
         //return `/newsList/${item.category_id}?page=1`;
         return `/${item.aLIas_pinyin}/list-1.html`;
-    }else{
+    } else {
         //return `/primaryNavigation/${item.aLIas_pinyin}/`;
         return `/${item.aLIas_pinyin}/index.html`;
     }
@@ -106,5 +111,5 @@ const getLinkPath = (item) => {
 </script>
 
 <style lang="less" scoped>
-    @import url('@/assets/css/public/nav.less');
+@import url('@/assets/css/public/nav.less');
 </style>

components/home/pageNavigation1.vue

@@ -33,8 +33,11 @@
                     </li>
                 </ul>
                 <div class="navright">
-                    <div class="nav111" v-for="(item, index) in 2" :key="index">
-                        <a href="#">信访投诉</a>
+                    <div class="nav111" v-for="(item, index) in navigation3" :key="index">
+                        <NuxtLink :href="getLinkPath(item)" :title="item.alias"
+                            :target="item.is_url == 1 ? '_blank' : '_self'">
+                            {{ item.alias }}
+                        </NuxtLink>
                     </div>
                 </div>
             </div>

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

@@ -4,7 +4,7 @@
     <!-- 导航栏 -->
     <HomePageNavigation1></HomePageNavigation1>
     <!-- 列表页广告一 -->
-    <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
+    <HomeAdvertising :imgurl="adImg1"></HomeAdvertising>
     <!-- 资讯列表 -->
     <div class="newsDetail">
         <div class="inner">
@@ -235,8 +235,8 @@ async function getPageData() {
         //获取发布时间
         time.value = newsDetail.value.updated_at.split(' ')[0];
         //修正标题长度
-        if (newsDetail.value.title.length >= 30) {
-            routeNewsTtitle.value = newsDetail.value.title.substr(0, 30) + "...";
+        if (newsDetail.value.title.length >= 20) {
+            routeNewsTtitle.value = newsDetail.value.title.substr(0, 20) + "...";
         } else {
             routeNewsTtitle.value = newsDetail.value.title
         }
@@ -256,7 +256,7 @@ let adImg1 = ref([]);
 onMounted(async ()  => {
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_detail_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_detail_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',

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

@@ -227,7 +227,7 @@ onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_list_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_list_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -239,7 +239,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_list_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_list_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

pages/[dir]/[id].vue

@@ -4,7 +4,7 @@
     <!-- 导航栏 -->
     <HomePageNavigation1></HomePageNavigation1>
     <!-- 列表页广告一 -->
-    <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
+    <HomeAdvertising :imgurl="adImg1"></HomeAdvertising>
     
     <!-- 资讯列表 -->
     <div class="newsDetail">
@@ -226,8 +226,8 @@ async function getPageData() {
         //获取发布时间
         time.value = newsDetail.value.updated_at.split(' ')[0];
         //修正标题长度
-        if (newsDetail.value.title.length >= 30) {
-            routeNewsTtitle.value = newsDetail.value.title.substr(0, 30) + "...";
+        if (newsDetail.value.title.length >= 20) {
+            routeNewsTtitle.value = newsDetail.value.title.substr(0, 20) + "...";
         } else {
             routeNewsTtitle.value = newsDetail.value.title
         }
@@ -244,7 +244,7 @@ let adImg1 = ref([]);
 onMounted(async ()  => {
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_detail_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_detail_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',

pages/[dir]/index.html.vue

@@ -13,18 +13,15 @@
                 <div class="index_1_right">
                     <div class="index_1_color_box">
                         <h3 class="index_1_head_h3 clearfix">
-                            <NuxtLink class="index_1_head_a" :href="getLinkPath(pageData[0])" v-if="pageData[0]" :title="pageData[0].alias">
+                            <NuxtLink class="index_1_head_a" :href="getLinkPath(pageData[0])" v-if="pageData[0]"
+                                :title="pageData[0].alias">
                                 {{ pageData[0].alias }}
                             </NuxtLink>
                         </h3>
-                        <div class="index_1_ul">
-                            <NuxtLink class="index_1_ul_a dot1" 
-                                :href="getLinkPathDetail(item)" 
-                                :title="item.title" 
-                                v-for="item in pageData[0].data2" 
-                                :key="item.id"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                        <div class="index_1_ul" v-if="pageData[0].data2">
+                            <NuxtLink class="index_1_ul_a dot1" :href="getLinkPathDetail(item)" :title="item.title"
+                                v-for="item in pageData[0].data2" :key="item.id"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 {{ item.title }}
                             </NuxtLink>
                         </div>
@@ -33,36 +30,30 @@
             </section>
             <HomeAdvertisingClass :adData1="adImg1" :adData2="adImg2"></HomeAdvertisingClass>
             <section class="index_2 clearfix">
-                <div class="index_2_left">
+                <div class="index_2_left" v-if="pageData[1]">
                     <h3 class="index_2_left_h3 clearfix">
-                        <NuxtLink class="index_2_left_h3_a index_2_left_h3_a_only" :href="getLinkPath(pageData[1])" v-if="pageData[1]" :title="pageData[1].alias">
+                        <NuxtLink class="index_2_left_h3_a index_2_left_h3_a_only" :href="getLinkPath(pageData[1])"
+                            v-if="pageData[1]" :title="pageData[1].alias">
                             {{ pageData[1].alias }}
                         </NuxtLink>
                     </h3>
                     <div class="index_2_left_img_out">
                         <div class="index_2_big_img_ul clearfix">
                             <div class="index_2_big_img_li">
-                                <NuxtLink class="index_2_big_img_li_a"
-                                    :href="getLinkPathDetail(item)"
-                                    :title="item.title"
-                                    v-for="item in pageData[1].data"
-                                    :key="item.id"
-                                    :target="item.islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="index_2_big_img_li_a" :href="getLinkPathDetail(item)"
+                                    :title="item.title" v-for="item in pageData[1].data" :key="item.id"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <img :src="item.imgurl" title="item.title" alt="item.title">
-                                    <div class="index_2_img_li_dot1 dot1">{{item.title}}</div>
+                                    <div class="index_2_img_li_dot1 dot1">{{ item.title }}</div>
                                 </NuxtLink>
                             </div>
                         </div>
                         <div class="index_2_img_ul clearfix">
                             <div class="index_2_img_li" v-for="item in pageData[1].data2" :key="item.id">
-                                <NuxtLink class="index_2_img_li_a"
-                                    :href="getLinkPathDetail(item)"
-                                    :title="item.title"
-                                    :target="item.islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="index_2_img_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <img :src="item.imgurl" title="item.title" alt="item.title">
-                                    <div class="index_2_img_li_dot1 dot1">{{item.title}}</div>
+                                    <div class="index_2_img_li_dot1 dot1">{{ item.title }}</div>
                                 </NuxtLink>
                             </div>
                         </div>
@@ -71,73 +62,54 @@
                     <div class="index_2_left_ul_box">
                         <div class="index_2_left_ul index_2_left_ul_group_6">
                             <div class="index_2_left_ul_li dot1" v-for="item in pageData[1].data3" :key="item.id">
-                                    <NuxtLink class="index_2_left_ul_li_a_name"
-                                        :href="getLinkPathDetail(item)"
-                                        :title="item.title"
-                                        :key="item.id"
-                                        :target="item.islink == 1 ? '_blank' : '_self'"
-                                    >
-                                        资讯关注
-                                    </NuxtLink>
-                                    <NuxtLink class="index_2_left_ul_li_a_text"
-                                        :href="getLinkPathDetail(item)"
-                                        :title="item.title"
-                                        :key="item.id"
-                                        :target="item.islink == 1 ? '_blank' : '_self'"
-                                    >
-                                        {{item.title}}
-                                    </NuxtLink>
+                                <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPathDetail(item)"
+                                    :title="item.title" :key="item.id" :target="item.islink == 1 ? '_blank' : '_self'">
+                                    资讯关注
+                                </NuxtLink>
+                                <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail(item)"
+                                    :title="item.title" :key="item.id" :target="item.islink == 1 ? '_blank' : '_self'">
+                                    {{ item.title }}
+                                </NuxtLink>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="index_2_right">
+                <div class="index_2_right" v-if="pageData[2]">
                     <h3 class="index_2_right_head">
-                        <NuxtLink class="index_2_right_head_a" :href="getLinkPath(pageData[2])" v-if="pageData[2]" :title="pageData[2].alias">
+                        <NuxtLink class="index_2_right_head_a" :href="getLinkPath(pageData[2])" v-if="pageData[2]"
+                            :title="pageData[2].alias">
                             {{ pageData[2].alias }}
                         </NuxtLink>
                     </h3>
                     <div class="index_2_right_img_ul">
                         <div class="index_2_right_img_li clearfix" v-for="item in pageData[2].data" :key="item.id">
-                            <NuxtLink class="index_2_right_img_li_a"
-                                :href="getLinkPathDetail(item)"
-                                :title="item.title"
-                                :key="item.id"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_2_right_img_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                :key="item.id" :target="item.islink == 1 ? '_blank' : '_self'">
                                 <div class="index_2_right_img_li_a_img_box">
                                     <img class="" :src="item.imgurl" title="" alt="">
                                 </div>
                                 <div class="index_2_right_img_li_dot3 dot3">
-                                    {{item.title}}
+                                    {{ item.title }}
                                 </div>
                             </NuxtLink>
                         </div>
                     </div>
                     <div class="index_1_ul index_1_ul_2">
-                        <NuxtLink class="index_1_ul_a dot1"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            v-for="item in pageData[2].data3"
-                            :key="item.id"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
+                        <NuxtLink class="index_1_ul_a dot1" :href="getLinkPathDetail(item)" :title="item.title"
+                            v-for="item in pageData[2].data3" :key="item.id"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </div>
                     <div class="index_2_right_img_ul">
                         <div class="index_2_right_img_li clearfix" v-for="item in pageData[2].data2" :key="item.id">
-                            <NuxtLink class="index_2_right_img_li_a"
-                                :href="getLinkPathDetail(item)"
-                                :title="item.title"
-                                :key="item.id"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_2_right_img_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                :key="item.id" :target="item.islink == 1 ? '_blank' : '_self'">
                                 <div class="index_2_right_img_li_a_img_box">
                                     <img class="" :src="item.imgurl" title="" alt="">
                                 </div>
                                 <div class="index_2_right_img_li_dot3 dot3">
-                                    {{item.title}}
+                                    {{ item.title }}
                                 </div>
                             </NuxtLink>
                         </div>
@@ -146,24 +118,16 @@
             </section>
 
             <section class="index_3 clearfix">
-                <div class="index_2_left">
+                <div class="index_2_left" v-if="pageData[4]">
                     <h3 class="index_2_left_h3 clearfix">
-                        <NuxtLink 
-                            :class="{'index_2_left_h3_a': true, 'index_2_left_h3_a_only': showTabs == 1}"
-                            :href="getLinkPath(pageData[3])" 
-                            v-if="pageData[3]" 
-                            :title="pageData[3].alias"
-                            @mouseenter="qhtabs(1)"
-                        >
+                        <NuxtLink :class="{ 'index_2_left_h3_a': true, 'index_2_left_h3_a_only': showTabs == 1 }"
+                            :href="getLinkPath(pageData[3])" v-if="pageData[3]" :title="pageData[3].alias"
+                            @mouseenter="qhtabs(1)">
                             {{ pageData[3].alias }}
                         </NuxtLink>
-                        <NuxtLink 
-                            :class="{'index_2_left_h3_a': true, 'index_2_left_h3_a_only': showTabs == 2}"
-                            :href="getLinkPath(pageData[4])"
-                            v-if="pageData[4]" 
-                            :title="pageData[4].alias"
-                            @mouseenter="qhtabs(2)"
-                        >
+                        <NuxtLink :class="{ 'index_2_left_h3_a': true, 'index_2_left_h3_a_only': showTabs == 2 }"
+                            :href="getLinkPath(pageData[4])" v-if="pageData[4]" :title="pageData[4].alias"
+                            @mouseenter="qhtabs(2)">
                             {{ pageData[4].alias }}
                         </NuxtLink>
                     </h3>
@@ -171,21 +135,15 @@
                         <div class="index_2_left_img_out">
                             <div class="index_2_left_ul index_2_left_ul_group_5">
                                 <div class="index_2_left_ul_li dot1" v-for="item in pageData[3].data" :key="item.id">
-                                    <NuxtLink class="index_2_left_ul_li_a_name"
-                                        :href="getLinkPathDetail(item)"
-                                        :title="item.title"
-                                        :key="item.id"
-                                        :target="item.islink == 1 ? '_blank' : '_self'"
-                                    >
+                                    <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPathDetail(item)"
+                                        :title="item.title" :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
                                         资讯关注
                                     </NuxtLink>
-                                    <NuxtLink class="index_2_left_ul_li_a_text"
-                                        :href="getLinkPathDetail(item)"
-                                        :title="item.title"
-                                        :key="item.id"
-                                        :target="item.islink == 1 ? '_blank' : '_self'"
-                                    >
-                                        {{item.title}}
+                                    <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail(item)"
+                                        :title="item.title" :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
+                                        {{ item.title }}
                                     </NuxtLink>
                                 </div>
                             </div>
@@ -193,12 +151,9 @@
                         <div class="index_2_left_ul_box">
                             <div class="index_3_img_ul">
                                 <div class="index_3_img_li clearfix" v-for="item in pageData[3].data2" :key="item.id">
-                                    <NuxtLink class="index_3_img_li_a"
-                                        :href="getLinkPathDetail(item)"
-                                        :title="item.title"
-                                        :key="item.id"
-                                        :target="item.islink == 1 ? '_blank' : '_self'"
-                                    >
+                                    <NuxtLink class="index_3_img_li_a" :href="getLinkPathDetail(item)"
+                                        :title="item.title" :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
                                         <div class="index_3_img_li_img_box">
                                             <img :src="item.imgurl" title="item.title" alt="item.title">
                                         </div>
@@ -217,21 +172,15 @@
                         <div class="index_2_left_img_out">
                             <div class="index_2_left_ul index_2_left_ul_group_5">
                                 <div class="index_2_left_ul_li dot1" v-for="item in pageData[4].data" :key="item.id">
-                                    <NuxtLink class="index_2_left_ul_li_a_name"
-                                        :href="getLinkPathDetail(item)"
-                                        :title="item.title"
-                                        :key="item.id"
-                                        :target="item.islink == 1 ? '_blank' : '_self'"
-                                    >
+                                    <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPathDetail(item)"
+                                        :title="item.title" :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
                                         资讯关注
                                     </NuxtLink>
-                                    <NuxtLink class="index_2_left_ul_li_a_text"
-                                        :href="getLinkPathDetail(item)"
-                                        :title="item.title"
-                                        :key="item.id"
-                                        :target="item.islink == 1 ? '_blank' : '_self'"
-                                    >
-                                        {{item.title}}
+                                    <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail(item)"
+                                        :title="item.title" :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
+                                        {{ item.title }}
                                     </NuxtLink>
                                 </div>
                             </div>
@@ -239,12 +188,9 @@
                         <div class="index_2_left_ul_box">
                             <div class="index_3_img_ul">
                                 <div class="index_3_img_li clearfix" v-for="item in pageData[4].data2" :key="item.id">
-                                    <NuxtLink class="index_3_img_li_a"
-                                        :href="getLinkPathDetail(item)"
-                                        :title="item.title"
-                                        :key="item.id"
-                                        :target="item.islink == 1 ? '_blank' : '_self'"
-                                    >
+                                    <NuxtLink class="index_3_img_li_a" :href="getLinkPathDetail(item)"
+                                        :title="item.title" :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
                                         <div class="index_3_img_li_img_box">
                                             <img :src="item.imgurl" title="item.title" alt="item.title">
                                         </div>
@@ -263,18 +209,15 @@
 
                 <div class="index_2_right">
                     <h3 class="index_2_right_head">
-                        <NuxtLink class="index_2_right_head_a" :href="getLinkPath(pageData[5])" v-if="pageData[5]" :title="pageData[5].alias">
+                        <NuxtLink class="index_2_right_head_a" :href="getLinkPath(pageData[5])" v-if="pageData[5]"
+                            :title="pageData[5].alias">
                             {{ pageData[5].alias }}
                         </NuxtLink>
                     </h3>
-                    <div class="index_3_num_ul">
-                        <NuxtLink class="index_1_ul_a dot1"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            v-for="item in pageData[5].data"
-                            :key="item.id"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
+                    <div class="index_3_num_ul" v-if="pageData[5]">
+                        <NuxtLink class="index_1_ul_a dot1" :href="getLinkPathDetail(item)" :title="item.title"
+                            v-for="item in pageData[5].data" :key="item.id"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </div>
@@ -321,13 +264,11 @@ let qhtabs = function (number) {
 //3.广告 start ---------------------------------------->
 let adImg1 = ref({})
 let adImg2 = ref({})
-let adImg3 = ref({})
-let adImg4 = ref({})
 onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_category_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_category_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -339,7 +280,7 @@ onMounted(async () => {
     adImg1.value = resultAd1.data[0];
 
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_category_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_category_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',
@@ -349,30 +290,6 @@ onMounted(async () => {
     });
     const resultAd2 = await responseAd2.json();
     adImg2.value = resultAd2.data[0];
-
-    //广告3
-    let url3 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_category_0003`
-    const responseAd3 = await fetch(url3, {
-        headers: {
-            'Content-Type': 'application/json',
-            'Userurl': $CwebUrl,
-            'Origin': $CwebUrl
-        }
-    });
-    const resultAd3 = await responseAd3.json();
-    adImg3.value = resultAd3.data[0];
-
-    //广告4
-    let url4 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_category_0004`
-    const responseAd4 = await fetch(url4, {
-        headers: {
-            'Content-Type': 'application/json',
-            'Userurl': $CwebUrl,
-            'Origin': $CwebUrl
-        }
-    });
-    const resultAd4 = await responseAd4.json();
-    adImg4.value = resultAd4.data[0];
 })
 //3.广告 end ---------------------------------------->
 
@@ -441,15 +358,35 @@ try {
         }
         //导航池加载完毕，开始申请模块数据
         let getJson = [
-            { "parent": routeId + ",0,0", "child": pageData.value[0].cid + ",5,7" },//模块1理论前沿
-            { "parent": routeId + ",0,0", "child": pageData.value[1].cid + ",3,11" },//模块2典型经验
-            { "parent": routeId + ",0,0", "child": pageData.value[2].cid + ",4,2" },//模块3农业天地
-            { "parent": routeId + ",0,0", "child": pageData.value[3].cid + ",3,10" },//模块4美丽乡村
-            { "parent": routeId + ",0,0", "child": pageData.value[4].cid + ",3,10" },//模块5农民之家
-            { "parent": routeId + ",0,0", "child": pageData.value[5].cid + ",0,7" },//模块6农业天地
-            //{ "parent": routeId + ",0,0", "child": pageData.value[6].cid + ",2,3" },//模块7农村建设
-            //{ "parent": routeId + ",0,0", "child": pageData.value[7].cid + ",4,0" },//模块8高端资讯
+            // { "parent": routeId + ",0,0", "child": pageData.value[0].cid + ",5,7" },//模块1理论前沿
+            // { "parent": routeId + ",0,0", "child": pageData.value[1].cid + ",3,11" },//模块2典型经验
+            // { "parent": routeId + ",0,0", "child": pageData.value[2].cid + ",4,2" },//模块3农业天地
+            // { "parent": routeId + ",0,0", "child": pageData.value[3].cid + ",3,10" },//模块4美丽乡村
+            // { "parent": routeId + ",0,0", "child": pageData.value[4].cid + ",3,10" },//模块5农民之家
+            // { "parent": routeId + ",0,0", "child": pageData.value[5].cid + ",0,7" },//模块6农业天地
+            // { "parent": routeId + ",0,0", "child": pageData.value[6].cid + ",2,3" },//模块7农村建设
+            // { "parent": routeId + ",0,0", "child": pageData.value[7].cid + ",4,0" },//模块8高端资讯
         ]
+        for (let index in pageData.value) {
+            // console.log("index", index)
+            if (index == 0) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[index].cid + ",5,7" })//模块1理论前沿
+            } else if (index == 1) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[index].cid + ",3,11" })//模块2典型经验
+            } else if (index == 2) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[index].cid + ",4,2" })//模块3农业天地
+            } else if (index == 3) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[index].cid + ",3,10" })//模块4美丽乡村
+            } else if (index == 4) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[index].cid + ",3,10" })//模块5农民之家 
+            } else if (index == 5) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[index].cid + ",0,7" })//模块6农业天地 
+            } else if (index == 6) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[index].cid + ",2,3" })//模块7农村建设 
+            } else if (index == 7) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[index].cid + ",4,0" })//模块8高端资讯 
+            }
+        }
         let jsonString = JSON.stringify(getJson);
         getPageAllData(jsonString);
 
@@ -471,25 +408,27 @@ async function getPageAllData(jsonString) {
             'id': jsonString
         },
     });
+    console.log('模块数据：', mkdata);
+
 
     if (mkdata.code == 200) {
         //模块1
         pageData.value[0].data = mkdata.data[0].child.imgnum;
         pageData.value[0].data2 = mkdata.data[0].child.textnum;
         //模块2
-        for(let index in mkdata.data[1].child.imgnum){
-            if(index==0){
+        for (let index in mkdata.data[1].child.imgnum) {
+            if (index == 0) {
                 pageData.value[1].data.push(mkdata.data[1].child.imgnum[index]);
-            }else{
+            } else {
                 pageData.value[1].data2.push(mkdata.data[1].child.imgnum[index]);
             }
         }
         pageData.value[1].data3 = mkdata.data[1].child.textnum;
         //模块3
-        for(let index in mkdata.data[2].child.imgnum){
-            if(index<=1){
+        for (let index in mkdata.data[2].child.imgnum) {
+            if (index <= 1) {
                 pageData.value[2].data.push(mkdata.data[2].child.imgnum[index]);
-            }else{
+            } else {
                 pageData.value[2].data2.push(mkdata.data[2].child.imgnum[index]);
             }
         }
@@ -532,7 +471,7 @@ if (setData.code == 200) {
         ]
     });
 } else {
-    console.log("设置频道页SEO出错！",setData.message)
+    console.log("设置频道页SEO出错！", setData.message)
 }
 //5.设置seo信息 end---------------------------------------->
 </script>

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

@@ -223,7 +223,7 @@ onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_list_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_list_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -235,7 +235,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_list_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_list_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

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

@@ -45,10 +45,11 @@
                         </NuxtLink>
                         <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" :title="item.name"
                             v-if="item.id == 7 && pageId == 7 && routeHref == '/specialList/7'">
-                            {{item.name }}
+                            {{ item.name }}
                         </NuxtLink>
-                        <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" class="active" :title="item.name" v-else-if="item.id == 7">
-                            {{ item.name}}
+                        <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" class="active" :title="item.name"
+                            v-else-if="item.id == 7">
+                            {{ item.name }}
                         </NuxtLink>
                     </li>
                 </ul>
@@ -73,8 +74,8 @@ const route = useRoute();
 //获得当前的完整路径
 const fullPath = route.path;
 //拆分，取出来中间这一段，然后提取数字部分
-const segments = fullPath.split('/'); 
-const targetSegment = segments[2]; 
+const segments = fullPath.split('/');
+const targetSegment = segments[2];
 //const numberPart = targetSegment.match(/\d+$/)?.[0]; 
 
 let articleId;
@@ -86,13 +87,13 @@ const getRouteId = await requestDataPromise('/web/getWebsiteRoute', {
         'foot_pinyin': targetSegment,
     },
 });
-if(getRouteId.code == 200){
+if (getRouteId.code == 200) {
     articleId = getRouteId.data.id;
     pageId = getRouteId.data.id;
-}else{
+} else {
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     console.log("错误位置：通过url路径查询导航池id")
-    console.log("后端错误反馈：",getRouteId.message)
+    console.log("后端错误反馈：", getRouteId.message)
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
 }
 
@@ -103,22 +104,22 @@ if(getRouteId.code == 200){
 const adList = ref([]);
 let adImg1 = ref([]);
 let adImg2 = ref([]);
-async function getAdData(){
-    const adData = await requestDataPromise('/web/getWebsiteAdvertisement',{method:'GET',query:{'ad_tag':'PAGE'}});
+async function getAdData() {
+    const adData = await requestDataPromise('/web/getWebsiteAdvertisement', { method: 'GET', query: { 'ad_tag': 'PAGE' } });
     adList.value = adData.data;
-    if(adData.code==200){
-        for(let item of adData.data){
-            if(item.ad_tag == 'PAGE_0001'){
+    if (adData.code == 200) {
+        for (let item of adData.data) {
+            if (item.ad_tag == 'PAGE_0001') {
                 adImg1.value = item;
             }
-            if(item.ad_tag == 'PAGE_0002'){
+            if (item.ad_tag == 'PAGE_0002') {
                 adImg2.value = item;
             }
         }
-    }else{
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：获取详情页广告列表")
-        console.log("后端错误反馈：",adData.message)
+        console.log("后端错误反馈：", adData.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
@@ -128,18 +129,22 @@ const newsDetail = ref({})
 const bottomMenu = ref([]);
 
 async function getPageData() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
+    const mkdata = await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
         method: 'GET',
         query: {
-            'fcat_id': articleId
+            'fcat_id': articleId,
+            'type': '0',
         },
     });
+    console.log('newsDetail.value', mkdata.data);
+
     newsDetail.value = mkdata.data;
+    console.log('newsDetail.value', newsDetail.value);
 }
 getPageData();
 
 async function getPageMenu() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategory', {
+    const mkdata = await requestDataPromise('/web/getWebsiteFooterCategory', {
         method: 'GET',
         query: {},
     });
@@ -151,7 +156,7 @@ getPageMenu();
 
 //4.设置seo信息 start---------------------------------------->
 //4.1 设置seo信息
-const setData =  await requestDataPromise('/web/getWebsiteFootInfo', {
+const setData = await requestDataPromise('/web/getWebsiteFootInfo', {
     method: 'GET',
     query: {},
 });
@@ -165,17 +170,17 @@ let seoName = setData.data.website_head.website_name;
 useSeoMeta({
     title: seoTitle + "_" + seoSuffix,
     meta: [
-        { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10  },
-        { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+        { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+        { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
     ]
 });
 //4.设置seo信息 end---------------------------------------->
 
-onMounted(async ()  => {
+onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_page_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -185,9 +190,9 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
-    
+
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_page_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

pages/about/[dir]/index.html.vue

@@ -132,7 +132,8 @@ async function getPageData() {
     const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
         method: 'GET',
         query: {
-            'fcat_id': articleId
+            'fcat_id': articleId,
+            'type': '0'
         },
     });
     newsDetail.value = mkdata.data;
@@ -176,7 +177,7 @@ onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_page_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -188,7 +189,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_page_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

pages/about/[dir]/list-[id].vue

@@ -184,7 +184,7 @@ onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_page_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -196,7 +196,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_page_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

pages/index.vue

@@ -14,21 +14,18 @@
                     </div>
                     <div class="part1_left_title">
                         <img src="../public/index/nav01.png" alt="">
-                        <NuxtLink
-                            class="active"
-                            v-if="pageData[0].cid"
-                            :href="getLinkPath(pageData[0])"
-                            :title="pageData[0].alias"
-                        >
-                            {{pageData[0].alias}}
+                        <NuxtLink class="active" v-if="pageData[0].cid" :href="getLinkPath(pageData[0])"
+                            :title="pageData[0].alias">
+                            {{ pageData[0].alias }}
                         </NuxtLink>
                     </div>
                     <div class="part1_left_content">
                         <div class="part1_left_content1">
                             <div class="part1_left_photo">
                                 <div class="part1_left_photo11" v-for="item in boxData1" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <img :src="item.imgurl" alt="item.title">
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
+                                        <img :src="item.imgurl" :alt="item.title">
                                         <div class="left_content">
                                             {{ item.title }}
                                         </div>
@@ -44,14 +41,16 @@
                         <div class="part1_left_content2">
                             <ul class="part1_left_context222">
                                 <li class="part1_left_contextList222" v-for="item in boxData1data3" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
                                         {{ item.title }}
                                     </NuxtLink>
                                 </li>
                             </ul>
                             <ul class="part1_left_context222">
                                 <li class="part1_left_contextList222" v-for="item in boxData1data4" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
                                         {{ item.title }}
                                     </NuxtLink>
                                 </li>
@@ -61,30 +60,23 @@
                 </div>
                 <div class="part1_right">
                     <div class="part1_right_title">
-                        <NuxtLink
-                            :class="{'part1_right_titlelist': true, 'active': hoverStatus==1}"
-                                @mouseenter="qhPic(1)"
-                            v-if="pageData[1].cid"
-                            :href="getLinkPath(pageData[1])"
-                            :title="pageData[1].alias"
-                            >
-                            {{pageData[1].alias}}
+                        <NuxtLink :class="{ 'part1_right_titlelist': true, 'active': hoverStatus == 1 }"
+                            @mouseenter="qhPic(1)" v-if="pageData[1].cid" :href="getLinkPath(pageData[1])"
+                            :title="pageData[1].alias">
+                            {{ pageData[1].alias }}
                         </NuxtLink>
-                        <NuxtLink
-                            :class="{'part1_right_titlelist': true, 'active': hoverStatus==2}"
-                                @mouseenter="qhPic(2)"
-                            v-if="pageData[2].cid"
-                            :href="getLinkPath(pageData[2])"
-                            :title="pageData[2].alias"
-                            >
-                            {{pageData[2].alias}}
+                        <NuxtLink :class="{ 'part1_right_titlelist': true, 'active': hoverStatus == 2 }"
+                            @mouseenter="qhPic(2)" v-if="pageData[2].cid" :href="getLinkPath(pageData[2])"
+                            :title="pageData[2].alias">
+                            {{ pageData[2].alias }}
                         </NuxtLink>
                     </div>
-                    <div v-if="hoverStatus==1">
+                    <div v-if="hoverStatus == 1">
                         <div class="part1_right_photo_text">
                             <div v-for="item in boxData2" :key="index">
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                    <img :src="item.imgurl" alt="item.title">
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
+                                    <img :src="item.imgurl" :alt="item.title">
                                     <div class="part1_right_text">
                                         {{ item.title }}
                                     </div>
@@ -93,18 +85,20 @@
                         </div>
                         <ul class="part1_right_content">
                             <li class="part1_right_contentList" v-for="item in boxData2data2" :key="index">
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <em></em>
                                     {{ item.title }}
                                 </NuxtLink>
                             </li>
                         </ul>
                     </div>
-                    <div v-if="hoverStatus==2">
+                    <div v-if="hoverStatus == 2">
                         <div class="part1_right_photo_text">
                             <div v-for="item in boxData3" :key="index">
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                    <img :src="item.imgurl" alt="item.title">
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
+                                    <img :src="item.imgurl" :alt="item.title">
                                     <div class="part1_right_text">
                                         {{ item.title }}
                                     </div>
@@ -113,7 +107,8 @@
                         </div>
                         <ul class="part1_right_content">
                             <li class="part1_right_contentList" v-for="item in boxData3data2" :key="index">
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <em></em>
                                     {{ item.title }}
                                 </NuxtLink>
@@ -125,7 +120,7 @@
         </div>
 
         <!-- 广告位 2 -->
-        <HomeTopTenTitle></HomeTopTenTitle>
+        <HomeAdvertising :imgurl="adImg2"></HomeAdvertising>
 
         <!-- 第二部分 -->
         <div class="part2">
@@ -136,24 +131,22 @@
                     </div>
                     <div class="part2_left_title">
                         <img src="../public/index/nav02.png" alt="">
-                        <NuxtLink
-                            class="active"
-                            v-if="pageData[3].cid"
-                            :href="getLinkPath(pageData[3])"
-                            :title="pageData[3].alias"
-                            >
-                            {{pageData[3].alias}}
+                        <NuxtLink class="active" v-if="pageData[3].cid" :href="getLinkPath(pageData[3])"
+                            :title="pageData[3].alias">
+                            {{ pageData[3].alias }}
                         </NuxtLink>
                     </div>
                     <div class="part2_left_content1">
                         <ul class="part2_left_content111">
                             <li class="part2_left_content1_list" v-for="item in boxData4" :key="index">
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                    <span class="nav2_title">致富信息</span>
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
+                                    <span class="nav2_title">{{ item.alias }}</span>
                                 </NuxtLink>
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <span class="nav2_title_content">
-                                        {{item.title}}
+                                        {{ item.title }}
                                     </span>
                                 </NuxtLink>
                             </li>
@@ -161,32 +154,39 @@
                     </div>
                     <ul class="part2_left_content2">
                         <li class="part2_left_content2list" v-for="item in boxData4data2" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                <img :src="item.imgurl" alt="item.title" class="part2_left_content222img">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                <img :src="item.imgurl" :alt="item.title" class="part2_left_content222img">
                                 <div class="content2_text">
                                     <span class="content2_text_content">
                                         {{ item.title }}
                                     </span>
-                                    <span class="content2_text_title">致富信息</span>
+                                    <span class="content2_text_title">{{ item.alias }}</span>
                                 </div>
                             </NuxtLink>
                         </li>
+                        <div class="adlogo3" v-if="adImg3">
+                            <a href="http://sannongdy.org.cn/" v-if="adImg3.image_url == null" target="_blank"
+                                :title="adImg3.place_name">
+                                <img :src="adImg3.thumb" :alt="adImg3.place_name" data-tag="imgurl.ad_tag">
+                            </a>
+                            <a :href="adImg3.image_url" v-else :title="adImg3.ad_name">
+                                <img :src="adImg3.image_src" :alt="adImg3.ad_name" data-tag="imgurl.ad_tag">
+                            </a>
+                        </div>
                     </ul>
                 </div>
                 <div class="part2_right">
                     <div class="part2_right_title">
-                        <NuxtLink
-                            v-if="pageData[4].cid"
-                            :href="getLinkPath(pageData[4])"
-                            :title="pageData[4].alias"
-                            >
-                            {{pageData[4].alias}}
+                        <NuxtLink v-if="pageData[4].cid" :href="getLinkPath(pageData[4])" :title="pageData[4].alias">
+                            {{ pageData[4].alias }}
                         </NuxtLink>
                     </div>
                     <ul class="part2_right_content">
                         <li class="part2_right_contentList" v-for="(item, index) in boxData5" :key="index">
                             <span class="listNumber">{{ index + 1 }}</span>
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 {{ item.title }}
                             </NuxtLink>
                         </li>
@@ -204,21 +204,18 @@
                     </div>
                     <div class="part3_left_title">
                         <img src="../public/index/nav03.png" alt="">
-                        <NuxtLink
-                            class="active"
-                            v-if="pageData[5].cid"
-                            :href="getLinkPath(pageData[5])"
-                            :title="pageData[5].alias"
-                            >
-                            {{pageData[5].alias}}
+                        <NuxtLink class="active" v-if="pageData[5].cid" :href="getLinkPath(pageData[5])"
+                            :title="pageData[5].alias">
+                            {{ pageData[5].alias }}
                         </NuxtLink>
                     </div>
                     <div class="part3_left_content">
                         <div class="part3_left_content1">
                             <div class="part3_left_content1_photo1">
                                 <div v-for="item in boxData6" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <img :src="item.imgurl" alt="item.title">
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
+                                        <img :src="item.imgurl" :alt="item.title">
                                         <div class="part3_left_content1_text">
                                             {{ item.title }}
                                         </div>
@@ -227,8 +224,9 @@
                             </div>
                             <div class="part3_left_content1_photo2">
                                 <div class="part3_left_content1_photo2list" v-for="item in boxData6data2" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <img :src="item.imgurl" alt="item.title">
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
+                                        <img :src="item.imgurl" :alt="item.title">
                                         <div class="part3_left_content1_text">
                                             {{ item.title }}
                                         </div>
@@ -239,24 +237,28 @@
                         <div class="part3_left_content2">
                             <ul class="part3_left_content2_text">
                                 <li class="part3_left_content2_list" v-for="item in boxData6data3" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <span class="nav3_title">致富信息</span>
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
+                                        <span class="nav3_title">{{ item.alias }}</span>
                                     </NuxtLink>
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
                                         <span class="nav3_title_content">
-                                            {{item.title}}
+                                            {{ item.title }}
                                         </span>
                                     </NuxtLink>
                                 </li>
                             </ul>
                             <ul class="part3_left_content2_text">
                                 <li class="part3_left_content2_list" v-for="item in boxData6data4" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <span class="nav3_title">致富信息</span>
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
+                                        <span class="nav3_title">{{ item.alias }}</span>
                                     </NuxtLink>
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
                                         <span class="nav3_title_content">
-                                            {{item.title}}
+                                            {{ item.title }}
                                         </span>
                                     </NuxtLink>
                                 </li>
@@ -266,19 +268,16 @@
                 </div>
                 <div class="part3_right">
                     <div class="part3_right_title">
-                        <NuxtLink
-                            class="active"
-                            v-if="pageData[6].cid"
-                            :href="getLinkPath(pageData[6])"
-                            :title="pageData[6].alias"
-                            >
-                            {{pageData[6].alias}}
+                        <NuxtLink class="active" v-if="pageData[6].cid" :href="getLinkPath(pageData[6])"
+                            :title="pageData[6].alias">
+                            {{ pageData[6].alias }}
                         </NuxtLink>
                     </div>
                     <div class="part3_right_content">
                         <div class="right_photo_text" v-for="item in boxData7" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                <img :src="item.imgurl" alt="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                <img :src="item.imgurl" :alt="item.title">
                                 <div class="right_text">
                                     {{ item.title }}
                                 </div>
@@ -287,14 +286,16 @@
                         <ul class="rightcontent_text">
                             <li class="rightcontent_textlist" v-for="item in boxData7data3" :key="index">
                                 <em></em>
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     {{ item.title }}
                                 </NuxtLink>
                             </li>
                         </ul>
                         <div class="right_photo_text" v-for="item in boxData7data2" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                <img :src="item.imgurl" alt="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                <img :src="item.imgurl" :alt="item.title">
                                 <div class="right_text">
                                     {{ item.title }}
                                 </div>
@@ -303,7 +304,8 @@
                         <ul class="rightcontent_text">
                             <li class="rightcontent_textlist" v-for="item in boxData7data4" :key="index">
                                 <em></em>
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     {{ item.title }}
                                 </NuxtLink>
                             </li>
@@ -312,7 +314,7 @@
                 </div>
             </div>
         </div>
-        <HomeAdvertising :imgurl="adImg2"></HomeAdvertising>
+        <HomeAdvertising :imgurl="adImg4"></HomeAdvertising>
         <!-- 第四部分 -->
         <div class="part4">
             <div class="inner">
@@ -323,32 +325,31 @@
                         </div>
                         <div class="part4_left_title">
                             <img src="../public/index/nav03.png" alt="">
-                            <NuxtLink
-                                class="active"
-                                v-if="pageData[7].cid"
-                                :href="getLinkPath(pageData[7])"
-                                :title="pageData[7].alias"
-                                >
-                                {{pageData[7].alias}}
+                            <NuxtLink class="active" v-if="pageData[7].cid" :href="getLinkPath(pageData[7])"
+                                :title="pageData[7].alias">
+                                {{ pageData[7].alias }}
                             </NuxtLink>
                         </div>
                     </div>
                     <div class="part4_photo_text">
                         <div v-for="item in boxData8" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                <img :src="item.imgurl" alt="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                <img :src="item.imgurl" :alt="item.title">
                                 <span class="text">{{ item.title }}</span>
                             </NuxtLink>
                         </div>
                     </div>
                     <ul class="part4_photo_content">
                         <li class="part4_photo_contentlist" v-for="item in boxData8data2" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                <span class="nav11_title">农技农知</span>
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                <span class="nav11_title">{{ item.alias }}</span>
                             </NuxtLink>
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <span class="nav11_title_content">
-                                   {{ item.title }}
+                                    {{ item.title }}
                                 </span>
                             </NuxtLink>
                         </li>
@@ -361,29 +362,27 @@
                         </div>
                         <div class="part4_left_title">
                             <img src="../public/index/nav03.png" alt="">
-                            <NuxtLink
-                                class="active"
-                                v-if="pageData[8].cid"
-                                :href="getLinkPath(pageData[8])"
-                                :title="pageData[8].alias"
-                                >
-                                {{pageData[8].alias}}
+                            <NuxtLink class="active" v-if="pageData[8].cid" :href="getLinkPath(pageData[8])"
+                                :title="pageData[8].alias">
+                                {{ pageData[8].alias }}
                             </NuxtLink>
                         </div>
                     </div>
                     <div class="part4_photo_text">
                         <div v-for="item in boxData9" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                <img :src="item.imgurl" alt="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                <img :src="item.imgurl" :alt="item.title">
                                 <span class="text">{{ item.title }}</span>
                             </NuxtLink>
                         </div>
                     </div>
                     <ul class="part4_photo_content">
                         <li class="part4_photo_contentlist" v-for="item in boxData9data2" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <span class="nav11_title_content2">
-                                   {{ item.title }}
+                                    {{ item.title }}
                                 </span>
                             </NuxtLink>
                         </li>
@@ -396,29 +395,27 @@
                         </div>
                         <div class="part4_left_title">
                             <img src="../public/index/nav03.png" alt="">
-                            <NuxtLink
-                                class="active"
-                                v-if="pageData[9].cid"
-                                :href="getLinkPath(pageData[9])"
-                                :title="pageData[9].alias"
-                                >
-                                {{pageData[9].alias}}
+                            <NuxtLink class="active" v-if="pageData[9].cid" :href="getLinkPath(pageData[9])"
+                                :title="pageData[9].alias">
+                                {{ pageData[9].alias }}
                             </NuxtLink>
                         </div>
                     </div>
                     <div class="part4_photo_text">
                         <div v-for="item in boxData10" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                <img :src="item.imgurl" alt="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                <img :src="item.imgurl" :alt="item.title">
                                 <span class="text">{{ item.title }}</span>
                             </NuxtLink>
                         </div>
                     </div>
                     <ul class="part4_photo_content">
                         <li class="part4_photo_contentlist" v-for="item in boxData10data2" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <span class="nav11_title_content2">
-                                   {{ item.title }}
+                                    {{ item.title }}
                                 </span>
                             </NuxtLink>
                         </li>
@@ -451,13 +448,13 @@ let adImg2 = ref({})
 let adImg3 = ref({})
 let adImg4 = ref({})
 
-onMounted(async ()  => {
+onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度//从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
 
     //从客户端启动广告
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_index_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_index_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -467,9 +464,9 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
-    
+
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_index_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_index_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',
@@ -481,7 +478,7 @@ onMounted(async ()  => {
     adImg2.value = resultAd2.data[0];
 
     //广告3
-    let url3 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_index_0003`
+    let url3 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_index_0003`
     const responseAd3 = await fetch(url3, {
         headers: {
             'Content-Type': 'application/json',
@@ -491,9 +488,11 @@ onMounted(async ()  => {
     });
     const resultAd3 = await responseAd3.json();
     adImg3.value = resultAd3.data[0];
+    console.log('ad3', adImg3.value);
+
 
     //广告4
-    let url4 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_index_0004`
+    let url4 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_index_0004`
     const responseAd4 = await fetch(url4, {
         headers: {
             'Content-Type': 'application/json',
@@ -556,10 +555,10 @@ try {
         query: {
             'placeid': 1,
             'pid': 0,
-            'num':30
+            'num': 30
         },
     });
-    if(navigateData.code == 200){
+    if (navigateData.code == 200) {
         // 遍历可用的导航池放到页面中
         for (let index in navigateData.data) {
             let data = {
@@ -570,58 +569,59 @@ try {
                 aLIas_pinyin: navigateData.data[index].aLIas_pinyin
             };
             //渲染标题
-            //1
-            if(navigateData.data[index].category_id == 11){pageData.value[0]=data}
-            //2
-            if(navigateData.data[index].category_id == 317){pageData.value[1]=data}
-            //3
-            if(navigateData.data[index].category_id == 1){pageData.value[2]=data}
-            //4
-            if(navigateData.data[index].category_id == 2){pageData.value[3]=data}
-            //5
-            if(navigateData.data[index].category_id == 5){pageData.value[4]=data}
-            //6
-            if(navigateData.data[index].category_id == 12){pageData.value[5]=data}
-            //7
-            if(navigateData.data[index].category_id == 13){pageData.value[6]=data}
-            //8
-            if(navigateData.data[index].category_id == 24){pageData.value[7]=data}
-            //9
-            if(navigateData.data[index].category_id == 14){pageData.value[8]=data}
-            //10
-            if(navigateData.data[index].category_id == 15){pageData.value[9]=data}
+            //1 农业生产372
+            if (navigateData.data[index].category_id == 372) { pageData.value[0] = data }
+            //2 三农资讯328
+            if (navigateData.data[index].category_id == 328) { pageData.value[1] = data }
+            //3 市场行情377
+            if (navigateData.data[index].category_id == 377) { pageData.value[2] = data }
+            //4 商贸信息375
+            if (navigateData.data[index].category_id == 375) { pageData.value[3] = data }
+            //5 农民生活373
+            if (navigateData.data[index].category_id == 373) { pageData.value[4] = data }
+            //6 法治天地432
+            if (navigateData.data[index].category_id == 432) { pageData.value[5] = data }
+            //7 招商引资431
+            if (navigateData.data[index].category_id == 431) { pageData.value[6] = data }
+            //8 农知农技374
+            if (navigateData.data[index].category_id == 374) { pageData.value[7] = data }
+            //9 农民合作社433
+            if (navigateData.data[index].category_id == 433) { pageData.value[8] = data }
+            //10 新农村11
+            if (navigateData.data[index].category_id == 11) { pageData.value[9] = data }
         }
-    }else{
-        console.log("获取导航池出错！",navigateData.message)
+    } else {
+        console.log("获取导航池出错！", navigateData.message)
     }
 } catch (error) {
     console.log("错误：导航池渲染执行接口出错！请检查首页的14的模块的具体执行方法！")
 }
 
 let getJson = [
-    {"parent":"11,2,12","child":""},//模块1
-    {"parent":"317,1,4","child":""},//模块2
-    {"parent":"1,1,4","child":""},//模块3
-    {"parent":"2,3,10","child":""},//模块4
-    {"parent":"5,1,8","child":""},//模块5
-    {"parent":"12,3,11","child":""},//模块6
-    {"parent":"13,4,4","child":""},//模块7
-    {"parent":"24,1,5","child":""},//模块8
-    {"parent":"14,1,5","child":""},//模块9
-    {"parent":"15,1,5","child":""},//模块10
+    { "parent": "372,2,12", "child": "" },//模块1 农业生产372
+    { "parent": "328,1,4", "child": "" },//模块2 三农资讯328
+    { "parent": "377,1,4", "child": "" },//模块3 市场行情377
+    { "parent": "375,1,10", "child": "" },//模块4 商贸信息375
+    { "parent": "373,1,8", "child": "" },//模块5 农民生活373
+    { "parent": "432,3,11", "child": "" },//模块6 法治天地432
+    { "parent": "431,4,4", "child": "" },//模块7 招商引资431
+    { "parent": "374,1,5", "child": "" },//模块8 农知农技374
+    { "parent": "433,1,5", "child": "" },//模块9 农民合作社433
+    { "parent": "11,1,5", "child": "" },//模块10 新农村11
 ]
 
 let jsonString = JSON.stringify(getJson);
 
-async function getPageAllData(){
-    const mkdata =  await requestDataPromise('/web/getWebsiteAllArticle', {
+async function getPageAllData() {
+    const mkdata = await requestDataPromise('/web/getWebsiteAllArticle', {
         method: 'GET',
         query: {
-            'id':jsonString
+            'id': jsonString
         },
     });
+    console.log('mkdata', mkdata)
 
-    if(mkdata.code==200){
+    if (mkdata.code == 200) {
         //模块1
         boxData1.value = mkdata.data[0].imgnum;
         mkdata.data[0].textnum.forEach((item, index) => {
@@ -650,14 +650,7 @@ async function getPageAllData(){
                 boxData6.value.push(item);
             } else {
                 boxData6data2.value.push(item);
-            } 
-        });
-        mkdata.data[5].textnum.forEach((item, index) => {
-            if (index < 6) {
-                boxData6data3.value.push(item);
-            } else {
-                boxData6data4.value.push(item);
-            } 
+            }
         });
         //模块7
         mkdata.data[6].imgnum.forEach((item, index) => {
@@ -665,44 +658,81 @@ async function getPageAllData(){
                 boxData7.value.push(item);
             } else {
                 boxData7data2.value.push(item);
-            } 
+            }
         });
         mkdata.data[6].textnum.forEach((item, index) => {
             if (index < 2) {
                 boxData7data3.value.push(item);
             } else {
                 boxData7data4.value.push(item);
-            } 
+            }
         });
         //模块8
         boxData8.value = mkdata.data[7].imgnum;
-        boxData8data2.value = mkdata.data[7].textnum;
         //模块9
         boxData9.value = mkdata.data[8].imgnum;
         boxData9data2.value = mkdata.data[8].textnum;
         //模块10
         boxData10.value = mkdata.data[9].imgnum;
         boxData10data2.value = mkdata.data[9].textnum;
-    }else{
+    } else {
         ElMessage.error(mkdata.message)
     }
 }
 getPageAllData();
+
+//获取模块下的特殊数据
+let getJson1 = [
+    { "parent": "375,1,10" },//模块4 商贸信息375
+    { "parent": "432,0,10" },//模块6 法治天地432
+    { "parent": "374,0,5" },//模块8 农知农技374
+]
+let jsonString1 = JSON.stringify(getJson1);
+//获取模块下的特殊数据
+async function getPageData() {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticles', {
+        method: 'GET',
+        query: {
+            'id': jsonString1
+        },
+    });
+    // console.log("成功获取模块数据2222！", mkdata);
+    if (mkdata.code == 200) {
+        // console.log("成功获取模块数据2222！", mkdata);
+
+        //模块4商贸信息375
+        boxData4.value = mkdata.data[0].textnum;
+        boxData4data2.value = mkdata.data[0].imgnum;
+        //模块6法治天地426
+        mkdata.data[1].textnum.forEach((item, index) => {
+            if (index < 6) {
+                boxData6data3.value.push(item);
+            } else {
+                boxData6data4.value.push(item);
+            }
+        });
+        //模块8农知农技374
+        boxData8data2.value = mkdata.data[2].textnum;
+    }
+
+}
+getPageData();
+
 //4.页面数据 end---------------------------------------->
 
 //5.设置seo数据 start---------------------------------------->
 //获取seo数据
-const setData =  await requestDataPromise('/web/getWebsiteFootInfo', {
+const setData = await requestDataPromise('/web/getWebsiteFootInfo', {
     method: 'GET',
     query: {},
 });
-if(setData.code == 200){
+if (setData.code == 200) {
     let seoTitle = setData.data.website_head.title;
     let seoDescription = setData.data.website_head.description;
     let seoKeywords = setData.data.website_head.keywords;
     let seoSuffix = setData.data.website_head.suffix;
     let seoName = setData.data.website_head.website_name;
-  
+
     useSeoMeta({
         title: seoTitle + "_" + seoSuffix,
         meta: [
@@ -710,12 +740,12 @@ if(setData.code == 200){
             { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
         ]
     });
-}else{
-    console.log("设置首页SEO出错！",setData.message)
+} else {
+    console.log("设置首页SEO出错！", setData.message)
 }
 //5.设置seo数据 start---------------------------------------->
 </script>
 
 <style lang="less" scoped>
-    @import url('@/assets/css/index.less');
+@import url('@/assets/css/index.less');
 </style>

pages/search/[id].vue

@@ -29,9 +29,9 @@
                 <div class="innerLeft">
                     <ul class="list" v-if="newsList.length >= 0">
                         <li v-for="(item, index) in newsList" :key="index">
-                            
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                 {{ item.title }}
+                                <span class="time">{{ getTime(item.updated_at, 'month', 1) }}</span>
                             </NuxtLink>
                         </li>
                     </ul>
@@ -105,35 +105,11 @@ const getLinkPathDetail = (item) => {
 //2.1 广告
 let adImg1 = ref([]);
 let adImg2 = ref([]);
-// async function getAdData(){
-//     const mkdata = await requestDataPromise('/web/getWebsiteAdvertisement',{
-//         method:'GET',
-//         query:{
-//             'ad_tag':'SEARCH'
-//         }
-//     });
-//     if(adData.code==200){
-//         for(let item of adData.data){
-//             if(item.ad_tag == 'SEARCH_0001'){
-//                 adImg1.value = item;
-//             }
-//             if(item.ad_tag == 'SEARCH_0002'){
-//                 adImg2.value = item;
-//             }
-//         }
-//     }else{
-//         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-//         console.log("错误位置：获取搜索页广告列表")
-//         console.log("后端错误反馈：",adData.message)
-//         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-//     }
-// }
-// getAdData();
 onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_search_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_search_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -145,7 +121,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_search_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_search_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

plugins/globals.js

@@ -1,29 +1,16 @@
 export default defineNuxtPlugin((nuxtApp) => {
-  //Pre环境
+  //农民网Pre环境
   // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://nwpre.bjzxtw.org.cn')
+  // nuxtApp.provide('CwebUrl', 'http://pre.nmwwt.org')
   // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
+  // nuxtApp.provide('userUrl', 'http://localhost:3002')
 
-  //正式环境
+  //农民网正式环境
   nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  nuxtApp.provide('CwebUrl', 'http://nw.bjzxtw.org.cn')
+  nuxtApp.provide('CwebUrl', 'http://nw.nmwwt.org')
   nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
   nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3000')
-  
-  //乡村网
-  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://pre.china-village.com.cn')
-  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
-
-  //农民网
-  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://pre.nmwwt.org')
-  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
+  nuxtApp.provide('userUrl', 'http://localhost:3002')
 
   //Dev环境
   // nuxtApp.provide('webUrl', 'http://apidev.bjzxtw.org.cn')

plugins/request.js

@@ -7,10 +7,10 @@ export default defineNuxtPlugin(nuxtApp => {
     let Url = {
         //正式环境
         webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
-        CwebUrl: 'nw.bjzxtw.org.cn' //页面地址
+        CwebUrl: 'nw.nmwwt.org/' //页面地址
         //pre环境
         // webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
-        // CwebUrl: 'nwpre.bjzxtw.org.cn' //页面地址
+        // CwebUrl: 'pre.nmwwt.org' //页面地址
     }
 
     const service = axios.create({
@@ -27,7 +27,7 @@ export default defineNuxtPlugin(nuxtApp => {
             config.headers.token = token;
         }
 
-        config.headers.Userurl = Url.CwebUrl;
+        config.headers.userurl = Url.CwebUrl;
         return config;
     }, error => {
         console.log(error)