修改bug

修改bug

.nuxt/dist/server/client.manifest.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< Updated upstream
   "@vite/client": {
     "prefetch": true,
     "isEntry": true,
@@ -8,11 +9,816 @@
     "resourceType": "script"
   },
   "D:/01_AA_ssr_pre/sannongzixunwang_web/node_modules/nuxt/dist/app/entry.js": {
+=======
+  "_4tCxsJsQ.js": {
+>>>>>>> Stashed changes
     "resourceType": "script",
     "module": true,
     "prefetch": true,
     "preload": true,
+    "file": "4tCxsJsQ.js",
+    "name": "publicFunction",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DCb8mxMO.js",
+      "_BAOl86nO.js"
+    ],
+    "css": [
+      "publicFunction.DIg_nDi3.css"
+    ]
+  },
+  "publicFunction.DIg_nDi3.css": {
+    "file": "publicFunction.DIg_nDi3.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_B3Trpf3b.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "B3Trpf3b.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "_BAOl86nO.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BAOl86nO.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "_BL7tLFsu.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BL7tLFsu.js",
+    "name": "foot1",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "foot1.B6Iy1ZgG.css"
+    ]
+  },
+  "foot1.B6Iy1ZgG.css": {
+    "file": "foot1.B6Iy1ZgG.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_BUM6mosb.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BUM6mosb.js",
+    "name": "index",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_LDrOZ0-g.js",
+      "_DCb8mxMO.js",
+      "_D52PBlVl.js"
+    ]
+  },
+  "_BXTm0ibM.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BXTm0ibM.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_B3Trpf3b.js"
+    ]
+  },
+  "_BZPwWbmn.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BZPwWbmn.js",
+    "name": "status",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DCb8mxMO.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js",
+      "_DdkkIZc_.js",
+      "_BXTm0ibM.js"
+    ],
+    "css": [
+      "status.CwCqeKJH.css"
+    ]
+  },
+  "status.CwCqeKJH.css": {
+    "file": "status.CwCqeKJH.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_B_ztiYQB.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "B_ztiYQB.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js"
+    ]
+  },
+  "_CcJBD8-b.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "CcJBD8-b.js",
+    "name": "HotNews2",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "HotNews2.DiLSNQHa.css"
+    ]
+  },
+  "HotNews2.DiLSNQHa.css": {
+    "file": "HotNews2.DiLSNQHa.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_CmTbk0jS.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "CmTbk0jS.js",
+    "name": "pageNavigation1",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "pageNavigation1.CuT5EAa-.css"
+    ]
+  },
+  "pageNavigation1.CuT5EAa-.css": {
+    "file": "pageNavigation1.CuT5EAa-.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_D52PBlVl.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "D52PBlVl.js",
+    "name": "index",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ]
+  },
+  "_DCb8mxMO.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DCb8mxMO.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "_DUmbpPn8.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DUmbpPn8.js",
+    "name": "TopTen",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "TopTen.B06sivl2.css"
+    ]
+  },
+  "TopTen.B06sivl2.css": {
+    "file": "TopTen.B06sivl2.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_DdkkIZc_.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DdkkIZc_.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "_DhUw87bh.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DhUw87bh.js",
+    "name": "pageHead",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "pageHead.zchp-JB2.css"
+    ]
+  },
+  "pageHead.zchp-JB2.css": {
+    "file": "pageHead.zchp-JB2.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_DslIXb95.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DslIXb95.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_D52PBlVl.js",
+      "_DCb8mxMO.js"
+    ]
+  },
+  "_HotNews2.DiLSNQHa.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "HotNews2.DiLSNQHa.css",
+    "src": "_HotNews2.DiLSNQHa.css"
+  },
+  "_LDrOZ0-g.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "LDrOZ0-g.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js"
+    ]
+  },
+  "_TopTen.B06sivl2.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "TopTen.B06sivl2.css",
+    "src": "_TopTen.B06sivl2.css"
+  },
+  "_foot1.B6Iy1ZgG.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "foot1.B6Iy1ZgG.css",
+    "src": "_foot1.B6Iy1ZgG.css"
+  },
+  "_m9CkyVCY.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "m9CkyVCY.js",
+    "name": "index",
+    "imports": [
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ]
+  },
+  "_pageHead.zchp-JB2.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "pageHead.zchp-JB2.css",
+    "src": "_pageHead.zchp-JB2.css"
+  },
+  "_pageNavigation1.CuT5EAa-.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "pageNavigation1.CuT5EAa-.css",
+    "src": "_pageNavigation1.CuT5EAa-.css"
+  },
+  "_publicFunction.DIg_nDi3.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "publicFunction.DIg_nDi3.css",
+    "src": "_publicFunction.DIg_nDi3.css"
+  },
+  "_status.CwCqeKJH.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "status.CwCqeKJH.css",
+    "src": "_status.CwCqeKJH.css"
+  },
+  "_yHxGdRHg.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "yHxGdRHg.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "middleware/auth.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "0j9It3v1.js",
+    "name": "auth",
+    "src": "middleware/auth.js",
+    "isDynamicEntry": true
+  },
+  "node_modules/nuxt/dist/app/entry.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "CSuFIKe5.js",
+    "name": "entry",
+    "src": "node_modules/nuxt/dist/app/entry.js",
     "isEntry": true,
+<<<<<<< Updated upstream
     "file": "D:/01_AA_ssr_pre/sannongzixunwang_web/node_modules/nuxt/dist/app/entry.js"
+=======
+    "dynamicImports": [
+      "middleware/auth.js"
+    ],
+    "css": [
+      "entry.BBvX8a_U.css"
+    ],
+    "assets": [
+      "tubiao1.6lb5zJyu.png",
+      "tubiao2.DR-DvYS6.png",
+      "404.YizNGDMD.png"
+    ],
+    "_globalCSS": true
+  },
+  "entry.BBvX8a_U.css": {
+    "file": "entry.BBvX8a_U.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "tubiao1.6lb5zJyu.png": {
+    "file": "tubiao1.6lb5zJyu.png",
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png"
+  },
+  "tubiao2.DR-DvYS6.png": {
+    "file": "tubiao2.DR-DvYS6.png",
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png"
+  },
+  "404.YizNGDMD.png": {
+    "file": "404.YizNGDMD.png",
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png"
+  },
+  "pages/advertising/adDetail.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DZDuTY_5.js",
+    "name": "adDetail",
+    "src": "pages/advertising/adDetail.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_BZPwWbmn.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_DdkkIZc_.js",
+      "_BXTm0ibM.js",
+      "_B3Trpf3b.js"
+    ],
+    "css": []
+  },
+  "adDetail.u8ZEpNcv.css": {
+    "file": "adDetail.u8ZEpNcv.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/advertising/index.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "Do7lfsD0.js",
+    "name": "index",
+    "src": "pages/advertising/index.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_BZPwWbmn.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_BUM6mosb.js",
+      "_m9CkyVCY.js",
+      "_BAOl86nO.js",
+      "_BL7tLFsu.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_B3Trpf3b.js",
+      "_yHxGdRHg.js",
+      "_DdkkIZc_.js",
+      "_DslIXb95.js",
+      "_BXTm0ibM.js",
+      "_D52PBlVl.js"
+    ],
+    "css": []
+  },
+  "index.iI4le9dd.css": {
+    "file": "index.iI4le9dd.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/index.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BoKYOQn1.js",
+    "name": "index",
+    "src": "pages/index.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_4tCxsJsQ.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DslIXb95.js",
+      "_DUmbpPn8.js",
+      "_BAOl86nO.js",
+      "_yHxGdRHg.js",
+      "_B3Trpf3b.js",
+      "_DdkkIZc_.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_D52PBlVl.js"
+    ],
+    "css": [],
+    "assets": [
+      "sndc.C2AWBCR5.png"
+    ]
+  },
+  "index.D1U40MGG.css": {
+    "file": "index.D1U40MGG.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "sndc.C2AWBCR5.png": {
+    "file": "sndc.C2AWBCR5.png",
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png"
+  },
+  "pages/login.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DxsRxWOK.js",
+    "name": "login",
+    "src": "pages/login.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": []
+  },
+  "login.B38gbU7i.css": {
+    "file": "login.B38gbU7i.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/newsDetail/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "Dap8-gVT.js",
+    "name": "_id_",
+    "src": "pages/newsDetail/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_CcJBD8-b.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_BAOl86nO.js",
+      "_B_ztiYQB.js",
+      "_yHxGdRHg.js",
+      "_B3Trpf3b.js",
+      "_DdkkIZc_.js",
+      "_LDrOZ0-g.js"
+    ],
+    "css": []
+  },
+  "_id_.vjuJKv2P.css": {
+    "file": "_id_.vjuJKv2P.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/newsList/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "8mAMBo25.js",
+    "name": "_id_",
+    "src": "pages/newsList/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_CcJBD8-b.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_B_ztiYQB.js",
+      "_BXTm0ibM.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_B3Trpf3b.js"
+    ],
+    "css": []
+  },
+  "_id_.C-s3MraB.css": {
+    "file": "_id_.C-s3MraB.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/primaryNavigation/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DOvA-86a.js",
+    "name": "_id_",
+    "src": "pages/primaryNavigation/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_4tCxsJsQ.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DUmbpPn8.js",
+      "_DslIXb95.js",
+      "_BL7tLFsu.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_BAOl86nO.js",
+      "_D52PBlVl.js"
+    ],
+    "css": []
+  },
+  "_id_.D1YZ9unR.css": {
+    "file": "_id_.D1YZ9unR.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/search/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "8RkLC2kK.js",
+    "name": "_id_",
+    "src": "pages/search/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_B_ztiYQB.js",
+      "_BXTm0ibM.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_B3Trpf3b.js"
+    ],
+    "css": []
+  },
+  "_id_.D_M_9Z05.css": {
+    "file": "_id_.D_M_9Z05.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/speciaArticle/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "vnxghbXx.js",
+    "name": "_id_",
+    "src": "pages/speciaArticle/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_B_ztiYQB.js"
+    ],
+    "css": []
+  },
+  "_id_.CuqHyZMi.css": {
+    "file": "_id_.CuqHyZMi.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/specialList/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "HE-jMVT7.js",
+    "name": "_id_",
+    "src": "pages/specialList/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_B_ztiYQB.js"
+    ],
+    "css": []
+  },
+  "_id_.DeP1RQne.css": {
+    "file": "_id_.DeP1RQne.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/topic/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "ifbHcZtw.js",
+    "name": "_id_",
+    "src": "pages/topic/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_m9CkyVCY.js",
+      "_B3Trpf3b.js",
+      "_BAOl86nO.js",
+      "_BXTm0ibM.js",
+      "_LDrOZ0-g.js",
+      "_DCb8mxMO.js"
+    ],
+    "css": []
+  },
+  "_id_.B8xLMiS_.css": {
+    "file": "_id_.B8xLMiS_.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/topic/index.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "B3dxU3LU.js",
+    "name": "index",
+    "src": "pages/topic/index.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_BUM6mosb.js",
+      "_BXTm0ibM.js",
+      "_LDrOZ0-g.js",
+      "_DCb8mxMO.js",
+      "_D52PBlVl.js",
+      "_B3Trpf3b.js"
+    ],
+    "css": []
+  },
+  "index.DmxC_wPZ.css": {
+    "file": "index.DmxC_wPZ.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/user/about.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "Btiqc-TN.js",
+    "name": "about",
+    "src": "pages/user/about.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js"
+    ]
+  },
+  "public/error/404.png": {
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png",
+    "file": "404.YizNGDMD.png",
+    "src": "public/error/404.png"
+  },
+  "public/index/sndc.png": {
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png",
+    "file": "sndc.C2AWBCR5.png",
+    "src": "public/index/sndc.png"
+  },
+  "public/index/tubiao1.png": {
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png",
+    "file": "tubiao1.6lb5zJyu.png",
+    "src": "public/index/tubiao1.png"
+  },
+  "public/index/tubiao2.png": {
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png",
+    "file": "tubiao2.DR-DvYS6.png",
+    "src": "public/index/tubiao2.png"
+>>>>>>> Stashed changes
   }
 }

.nuxt/dist/server/client.manifest.mjs

@@ -1 +1,812 @@
-export { default } from "file:///D:/01_AA_ssr_pre/sannongzixunwang_web/node_modules/@nuxt/vite-builder/dist/runtime/client.manifest.mjs"
+<<<<<<< Updated upstream
+export { default } from "file:///D:/01_AA_ssr_pre/sannongzixunwang_web/node_modules/@nuxt/vite-builder/dist/runtime/client.manifest.mjs"
+=======
+export default {
+  "_4tCxsJsQ.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "4tCxsJsQ.js",
+    "name": "publicFunction",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DCb8mxMO.js",
+      "_BAOl86nO.js"
+    ],
+    "css": [
+      "publicFunction.DIg_nDi3.css"
+    ]
+  },
+  "publicFunction.DIg_nDi3.css": {
+    "file": "publicFunction.DIg_nDi3.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_B3Trpf3b.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "B3Trpf3b.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "_BAOl86nO.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BAOl86nO.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "_BL7tLFsu.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BL7tLFsu.js",
+    "name": "foot1",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "foot1.B6Iy1ZgG.css"
+    ]
+  },
+  "foot1.B6Iy1ZgG.css": {
+    "file": "foot1.B6Iy1ZgG.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_BUM6mosb.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BUM6mosb.js",
+    "name": "index",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_LDrOZ0-g.js",
+      "_DCb8mxMO.js",
+      "_D52PBlVl.js"
+    ]
+  },
+  "_BXTm0ibM.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BXTm0ibM.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_B3Trpf3b.js"
+    ]
+  },
+  "_BZPwWbmn.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BZPwWbmn.js",
+    "name": "status",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DCb8mxMO.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js",
+      "_DdkkIZc_.js",
+      "_BXTm0ibM.js"
+    ],
+    "css": [
+      "status.CwCqeKJH.css"
+    ]
+  },
+  "status.CwCqeKJH.css": {
+    "file": "status.CwCqeKJH.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_B_ztiYQB.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "B_ztiYQB.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js"
+    ]
+  },
+  "_CcJBD8-b.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "CcJBD8-b.js",
+    "name": "HotNews2",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "HotNews2.DiLSNQHa.css"
+    ]
+  },
+  "HotNews2.DiLSNQHa.css": {
+    "file": "HotNews2.DiLSNQHa.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_CmTbk0jS.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "CmTbk0jS.js",
+    "name": "pageNavigation1",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "pageNavigation1.CuT5EAa-.css"
+    ]
+  },
+  "pageNavigation1.CuT5EAa-.css": {
+    "file": "pageNavigation1.CuT5EAa-.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_D52PBlVl.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "D52PBlVl.js",
+    "name": "index",
+    "imports": [
+      "_DhUw87bh.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ]
+  },
+  "_DCb8mxMO.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DCb8mxMO.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "_DUmbpPn8.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DUmbpPn8.js",
+    "name": "TopTen",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "TopTen.B06sivl2.css"
+    ]
+  },
+  "TopTen.B06sivl2.css": {
+    "file": "TopTen.B06sivl2.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_DdkkIZc_.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DdkkIZc_.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "_DhUw87bh.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DhUw87bh.js",
+    "name": "pageHead",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": [
+      "pageHead.zchp-JB2.css"
+    ]
+  },
+  "pageHead.zchp-JB2.css": {
+    "file": "pageHead.zchp-JB2.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "_DslIXb95.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DslIXb95.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_D52PBlVl.js",
+      "_DCb8mxMO.js"
+    ]
+  },
+  "_HotNews2.DiLSNQHa.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "HotNews2.DiLSNQHa.css",
+    "src": "_HotNews2.DiLSNQHa.css"
+  },
+  "_LDrOZ0-g.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "LDrOZ0-g.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js"
+    ]
+  },
+  "_TopTen.B06sivl2.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "TopTen.B06sivl2.css",
+    "src": "_TopTen.B06sivl2.css"
+  },
+  "_foot1.B6Iy1ZgG.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "foot1.B6Iy1ZgG.css",
+    "src": "_foot1.B6Iy1ZgG.css"
+  },
+  "_m9CkyVCY.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "m9CkyVCY.js",
+    "name": "index",
+    "imports": [
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js",
+      "node_modules/nuxt/dist/app/entry.js"
+    ]
+  },
+  "_pageHead.zchp-JB2.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "pageHead.zchp-JB2.css",
+    "src": "_pageHead.zchp-JB2.css"
+  },
+  "_pageNavigation1.CuT5EAa-.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "pageNavigation1.CuT5EAa-.css",
+    "src": "_pageNavigation1.CuT5EAa-.css"
+  },
+  "_publicFunction.DIg_nDi3.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "publicFunction.DIg_nDi3.css",
+    "src": "_publicFunction.DIg_nDi3.css"
+  },
+  "_status.CwCqeKJH.css": {
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true,
+    "file": "status.CwCqeKJH.css",
+    "src": "_status.CwCqeKJH.css"
+  },
+  "_yHxGdRHg.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "yHxGdRHg.js",
+    "name": "index",
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DhUw87bh.js",
+      "_LDrOZ0-g.js"
+    ]
+  },
+  "middleware/auth.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "0j9It3v1.js",
+    "name": "auth",
+    "src": "middleware/auth.js",
+    "isDynamicEntry": true
+  },
+  "node_modules/nuxt/dist/app/entry.js": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "CSuFIKe5.js",
+    "name": "entry",
+    "src": "node_modules/nuxt/dist/app/entry.js",
+    "isEntry": true,
+    "dynamicImports": [
+      "middleware/auth.js"
+    ],
+    "css": [
+      "entry.BBvX8a_U.css"
+    ],
+    "assets": [
+      "tubiao1.6lb5zJyu.png",
+      "tubiao2.DR-DvYS6.png",
+      "404.YizNGDMD.png"
+    ],
+    "_globalCSS": true
+  },
+  "entry.BBvX8a_U.css": {
+    "file": "entry.BBvX8a_U.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "tubiao1.6lb5zJyu.png": {
+    "file": "tubiao1.6lb5zJyu.png",
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png"
+  },
+  "tubiao2.DR-DvYS6.png": {
+    "file": "tubiao2.DR-DvYS6.png",
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png"
+  },
+  "404.YizNGDMD.png": {
+    "file": "404.YizNGDMD.png",
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png"
+  },
+  "pages/advertising/adDetail.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DZDuTY_5.js",
+    "name": "adDetail",
+    "src": "pages/advertising/adDetail.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_BZPwWbmn.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_DdkkIZc_.js",
+      "_BXTm0ibM.js",
+      "_B3Trpf3b.js"
+    ],
+    "css": []
+  },
+  "adDetail.u8ZEpNcv.css": {
+    "file": "adDetail.u8ZEpNcv.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/advertising/index.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "Do7lfsD0.js",
+    "name": "index",
+    "src": "pages/advertising/index.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_BZPwWbmn.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_BUM6mosb.js",
+      "_m9CkyVCY.js",
+      "_BAOl86nO.js",
+      "_BL7tLFsu.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_B3Trpf3b.js",
+      "_yHxGdRHg.js",
+      "_DdkkIZc_.js",
+      "_DslIXb95.js",
+      "_BXTm0ibM.js",
+      "_D52PBlVl.js"
+    ],
+    "css": []
+  },
+  "index.iI4le9dd.css": {
+    "file": "index.iI4le9dd.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/index.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "BoKYOQn1.js",
+    "name": "index",
+    "src": "pages/index.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_4tCxsJsQ.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DslIXb95.js",
+      "_DUmbpPn8.js",
+      "_BAOl86nO.js",
+      "_yHxGdRHg.js",
+      "_B3Trpf3b.js",
+      "_DdkkIZc_.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_D52PBlVl.js"
+    ],
+    "css": [],
+    "assets": [
+      "sndc.C2AWBCR5.png"
+    ]
+  },
+  "index.D1U40MGG.css": {
+    "file": "index.D1U40MGG.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "sndc.C2AWBCR5.png": {
+    "file": "sndc.C2AWBCR5.png",
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png"
+  },
+  "pages/login.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DxsRxWOK.js",
+    "name": "login",
+    "src": "pages/login.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js"
+    ],
+    "css": []
+  },
+  "login.B38gbU7i.css": {
+    "file": "login.B38gbU7i.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/newsDetail/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "Dap8-gVT.js",
+    "name": "_id_",
+    "src": "pages/newsDetail/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_CcJBD8-b.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_BAOl86nO.js",
+      "_B_ztiYQB.js",
+      "_yHxGdRHg.js",
+      "_B3Trpf3b.js",
+      "_DdkkIZc_.js",
+      "_LDrOZ0-g.js"
+    ],
+    "css": []
+  },
+  "_id_.vjuJKv2P.css": {
+    "file": "_id_.vjuJKv2P.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/newsList/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "8mAMBo25.js",
+    "name": "_id_",
+    "src": "pages/newsList/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_CcJBD8-b.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_B_ztiYQB.js",
+      "_BXTm0ibM.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_B3Trpf3b.js"
+    ],
+    "css": []
+  },
+  "_id_.C-s3MraB.css": {
+    "file": "_id_.C-s3MraB.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/primaryNavigation/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "DOvA-86a.js",
+    "name": "_id_",
+    "src": "pages/primaryNavigation/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_4tCxsJsQ.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_DUmbpPn8.js",
+      "_DslIXb95.js",
+      "_BL7tLFsu.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_BAOl86nO.js",
+      "_D52PBlVl.js"
+    ],
+    "css": []
+  },
+  "_id_.D1YZ9unR.css": {
+    "file": "_id_.D1YZ9unR.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/search/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "8RkLC2kK.js",
+    "name": "_id_",
+    "src": "pages/search/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_B_ztiYQB.js",
+      "_BXTm0ibM.js",
+      "_DCb8mxMO.js",
+      "_LDrOZ0-g.js",
+      "_B3Trpf3b.js"
+    ],
+    "css": []
+  },
+  "_id_.D_M_9Z05.css": {
+    "file": "_id_.D_M_9Z05.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/speciaArticle/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "vnxghbXx.js",
+    "name": "_id_",
+    "src": "pages/speciaArticle/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_B_ztiYQB.js"
+    ],
+    "css": []
+  },
+  "_id_.CuqHyZMi.css": {
+    "file": "_id_.CuqHyZMi.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/specialList/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "HE-jMVT7.js",
+    "name": "_id_",
+    "src": "pages/specialList/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_DUmbpPn8.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_B_ztiYQB.js"
+    ],
+    "css": []
+  },
+  "_id_.DeP1RQne.css": {
+    "file": "_id_.DeP1RQne.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/topic/[id].vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "ifbHcZtw.js",
+    "name": "_id_",
+    "src": "pages/topic/[id].vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_m9CkyVCY.js",
+      "_B3Trpf3b.js",
+      "_BAOl86nO.js",
+      "_BXTm0ibM.js",
+      "_LDrOZ0-g.js",
+      "_DCb8mxMO.js"
+    ],
+    "css": []
+  },
+  "_id_.B8xLMiS_.css": {
+    "file": "_id_.B8xLMiS_.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/topic/index.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "B3dxU3LU.js",
+    "name": "index",
+    "src": "pages/topic/index.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "_DhUw87bh.js",
+      "_CmTbk0jS.js",
+      "_BL7tLFsu.js",
+      "node_modules/nuxt/dist/app/entry.js",
+      "_BUM6mosb.js",
+      "_BXTm0ibM.js",
+      "_LDrOZ0-g.js",
+      "_DCb8mxMO.js",
+      "_D52PBlVl.js",
+      "_B3Trpf3b.js"
+    ],
+    "css": []
+  },
+  "index.DmxC_wPZ.css": {
+    "file": "index.DmxC_wPZ.css",
+    "resourceType": "style",
+    "prefetch": true,
+    "preload": true
+  },
+  "pages/user/about.vue": {
+    "resourceType": "script",
+    "module": true,
+    "prefetch": true,
+    "preload": true,
+    "file": "Btiqc-TN.js",
+    "name": "about",
+    "src": "pages/user/about.vue",
+    "isDynamicEntry": true,
+    "imports": [
+      "node_modules/nuxt/dist/app/entry.js"
+    ]
+  },
+  "public/error/404.png": {
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png",
+    "file": "404.YizNGDMD.png",
+    "src": "public/error/404.png"
+  },
+  "public/index/sndc.png": {
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png",
+    "file": "sndc.C2AWBCR5.png",
+    "src": "public/index/sndc.png"
+  },
+  "public/index/tubiao1.png": {
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png",
+    "file": "tubiao1.6lb5zJyu.png",
+    "src": "public/index/tubiao1.png"
+  },
+  "public/index/tubiao2.png": {
+    "resourceType": "image",
+    "prefetch": true,
+    "mimeType": "image/png",
+    "file": "tubiao2.DR-DvYS6.png",
+    "src": "public/index/tubiao2.png"
+  }
+}
+>>>>>>> Stashed changes

.nuxt/imports.d.ts

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

.nuxt/manifest/latest.json

@@ -1 +1,5 @@
-{"id":"dev","timestamp":1742520715386}
+<<<<<<< Updated upstream
+{"id":"dev","timestamp":1742520715386}
+=======
+{"id":"a604f263-e8a1-4dec-ae4b-e5094ebd7b60","timestamp":1742521912061}
+>>>>>>> Stashed changes

.nuxt/manifest/meta/a604f263-e8a1-4dec-ae4b-e5094ebd7b60.json

@@ -0,0 +1 @@
+{"id":"a604f263-e8a1-4dec-ae4b-e5094ebd7b60","timestamp":1742521912061,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/nuxt.d.ts

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

.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/dev.json"
+        "./manifest/meta/a604f263-e8a1-4dec-ae4b-e5094ebd7b60.json"
       ],
       "#components": [
         "./components"

.nuxt/types/build.d.ts

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

.nuxt/types/imports.d.ts

@@ -130,7 +130,6 @@ declare global {
   const useModel: typeof import('vue')['useModel']
   const useNuxtApp: typeof import('../../node_modules/nuxt/dist/app/nuxt')['useNuxtApp']
   const useNuxtData: typeof import('../../node_modules/nuxt/dist/app/composables/asyncData')['useNuxtData']
-  const useNuxtDevTools: typeof import('../../node_modules/@nuxt/devtools/dist/runtime/use-nuxt-devtools')['useNuxtDevTools']
   const usePreviewMode: typeof import('../../node_modules/nuxt/dist/app/composables/preview')['usePreviewMode']
   const useRequestEvent: typeof import('../../node_modules/nuxt/dist/app/composables/ssr')['useRequestEvent']
   const useRequestFetch: typeof import('../../node_modules/nuxt/dist/app/composables/ssr')['useRequestFetch']
@@ -326,7 +325,6 @@ declare module 'vue' {
     readonly useModel: UnwrapRef<typeof import('vue')['useModel']>
     readonly useNuxtApp: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/nuxt')['useNuxtApp']>
     readonly useNuxtData: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/asyncData')['useNuxtData']>
-    readonly useNuxtDevTools: UnwrapRef<typeof import('../../node_modules/@nuxt/devtools/dist/runtime/use-nuxt-devtools')['useNuxtDevTools']>
     readonly usePreviewMode: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/preview')['usePreviewMode']>
     readonly useRequestEvent: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/ssr')['useRequestEvent']>
     readonly useRequestFetch: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/ssr')['useRequestFetch']>

.nuxt/types/plugins.d.ts

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

assets/css/detail.less

@@ -235,6 +235,7 @@
             padding-left: 30px;
             overflow-y: auto;
             box-sizing: border-box;
+            padding-bottom: 20px;
         }
         .radio {
             /deep/.el-radio {

pages/index.vue

@@ -1363,8 +1363,13 @@ async function getVoteList(){
         }else{
             isRadio.value = false;
         }
-        //把最后一个的值拿出来 用于判断用户是否选择了其他
-        userIsChoice.value = voteData.data[voteData.data.length - 1].id;
+
+        for(let item of voteData.data){
+            //如果含有其他
+            if(item.is_other==1){
+                userIsChoice.value = item.id;
+            }
+        }
         //用户投票属于哪一篇文章
         userSurId.value = voteData.data[0].sur_id;
 

pages/newsDetail/[id].vue

@@ -43,13 +43,12 @@
                 </div>
                 <div v-if="articleChoice">
                     <!-- 投票 start ---------------------------------------->
-                    <div class="index_3_box_vote">
+                    <div class="index_3_box_vote" v-if="articleChoice">
                         <div class="voteTitle">投票区</div>
-                        <div class="inquire" v-if="voteList.length>0">
+                        <div class="inquire">
                             <p v-if="voteList.length>0">{{voteList[0].survey_name}}</p>
                             <div class="radioBox">
-                                <!--投票选项-->
-                                <!--投票选项-->
+                            <!--投票选项-->
                             <div v-if="!isDisabled">
                                 <div class="radio" v-if="isRadio">
                                     <el-radio-group v-model="radio1" @change="handleRadioChange">
@@ -168,6 +167,7 @@ async function getPageData() {
     if(mkdata.code==200){
         //判断是否显示投票
         if(mkdata.data.is_survey==1){
+            console.log("本篇文章含有投票！")
             articleChoice.value = true;
         }
         //获取内容
@@ -258,7 +258,9 @@ const websiteSurveyData = ref([]);//投票结果
 //3.2获得投票列表
 let voteList = ref([]);
 async function getVoteList(){
-    const voteData = await requestHome('/web/getWebsiteSurvey',{method:'GET',query:{'art_id':4150}});
+    const voteData = await requestHome('/web/getWebsiteSurvey',{method:'GET',query:{'art_id':articleId}});
+    console.log(778899)
+    console.log(voteData)
     if(voteData.code == 200){
         voteList.value = voteData.data;
         console.log(voteList.value)
@@ -271,7 +273,12 @@ async function getVoteList(){
             isRadio.value = false;
         }
         //把最后一个的值拿出来 用于判断用户是否选择了其他
-        userIsChoice.value = voteData.data[voteData.data.length - 1].id;
+        for(let item of voteData.data){
+            //如果含有其他
+            if(item.is_other==1){
+                userIsChoice.value = item.id;
+            }
+        }
         //用户投票属于哪一篇文章
         userSurId.value = voteData.data[0].sur_id;