完成资讯功能的开发

完成资讯功能的开发

.nuxt/components.d.ts

@@ -15,6 +15,7 @@ interface _GlobalComponents {
     'HomePagination': typeof import("../components/home/Pagination.vue")['default']
     'HomeSecondaryHeading': typeof import("../components/home/SecondaryHeading.vue")['default']
     'HomeSmallSwiper1': typeof import("../components/home/SmallSwiper1.vue")['default']
+    'HomeSurveyvote': typeof import("../components/home/Surveyvote.vue")['default']
     'HomeSwiperSnsc': typeof import("../components/home/SwiperSnsc.vue")['default']
     'HomeSwiperSnscChannel': typeof import("../components/home/SwiperSnscChannel.vue")['default']
     'HomeTopTen': typeof import("../components/home/TopTen.vue")['default']
@@ -61,6 +62,7 @@ interface _GlobalComponents {
     'LazyHomePagination': typeof import("../components/home/Pagination.vue")['default']
     'LazyHomeSecondaryHeading': typeof import("../components/home/SecondaryHeading.vue")['default']
     'LazyHomeSmallSwiper1': typeof import("../components/home/SmallSwiper1.vue")['default']
+    'LazyHomeSurveyvote': typeof import("../components/home/Surveyvote.vue")['default']
     'LazyHomeSwiperSnsc': typeof import("../components/home/SwiperSnsc.vue")['default']
     'LazyHomeSwiperSnscChannel': typeof import("../components/home/SwiperSnscChannel.vue")['default']
     'LazyHomeTopTen': typeof import("../components/home/TopTen.vue")['default']
@@ -113,6 +115,7 @@ export const HomePageMessage: typeof import("../components/home/PageMessage.vue"
 export const HomePagination: typeof import("../components/home/Pagination.vue")['default']
 export const HomeSecondaryHeading: typeof import("../components/home/SecondaryHeading.vue")['default']
 export const HomeSmallSwiper1: typeof import("../components/home/SmallSwiper1.vue")['default']
+export const HomeSurveyvote: typeof import("../components/home/Surveyvote.vue")['default']
 export const HomeSwiperSnsc: typeof import("../components/home/SwiperSnsc.vue")['default']
 export const HomeSwiperSnscChannel: typeof import("../components/home/SwiperSnscChannel.vue")['default']
 export const HomeTopTen: typeof import("../components/home/TopTen.vue")['default']
@@ -159,6 +162,7 @@ export const LazyHomePageMessage: typeof import("../components/home/PageMessage.
 export const LazyHomePagination: typeof import("../components/home/Pagination.vue")['default']
 export const LazyHomeSecondaryHeading: typeof import("../components/home/SecondaryHeading.vue")['default']
 export const LazyHomeSmallSwiper1: typeof import("../components/home/SmallSwiper1.vue")['default']
+export const LazyHomeSurveyvote: typeof import("../components/home/Surveyvote.vue")['default']
 export const LazyHomeSwiperSnsc: typeof import("../components/home/SwiperSnsc.vue")['default']
 export const LazyHomeSwiperSnscChannel: typeof import("../components/home/SwiperSnscChannel.vue")['default']
 export const LazyHomeTopTen: typeof import("../components/home/TopTen.vue")['default']

.nuxt/imports.d.ts

@@ -31,5 +31,4 @@ export { injectHead, useHead, useSeoMeta, useHeadSafe, useServerHead, useServerS
 export { requestData, requestDataPromise, requestDataWebUrl, requestHome } from '../composables/getData';
 export { getTime, getTitleLength, getLinkPath, getLinkPathDetail, getRoutePath } from '../composables/publicFunction';
 export { seoSetup } from '../composables/useSeo';
-export { useNuxtDevTools } from '../node_modules/@nuxt/devtools/dist/runtime/use-nuxt-devtools';
 export { definePageMeta } from '../node_modules/nuxt/dist/pages/runtime/composables';

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1744687228428}
+{"id":"b92575d1-b5f0-4a3b-a423-6821eda1dae0","timestamp":1744792252031}

.nuxt/manifest/meta/0d1e1dcc-369e-4d29-a0fc-27b79ef92d39.json

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

.nuxt/manifest/meta/b92575d1-b5f0-4a3b-a423-6821eda1dae0.json

@@ -0,0 +1 @@
+{"id":"b92575d1-b5f0-4a3b-a423-6821eda1dae0","timestamp":1744792252031,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/dev.json

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

.nuxt/nitro.json

@@ -1,17 +0,0 @@
-{
-  "date": "2025-04-15T03:20:36.647Z",
-  "preset": "nitro-dev",
-  "framework": {
-    "name": "nuxt",
-    "version": "3.15.2"
-  },
-  "versions": {
-    "nitro": "2.10.4"
-  },
-  "dev": {
-    "pid": 22472,
-    "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-22472-1.sock"
-    }
-  }
-}

.nuxt/nuxt.json

@@ -1,9 +0,0 @@
-{
-  "_hash": "KfTji8fXd8",
-  "project": {
-    "rootDir": "D:/MyProject/gogs/sannongshichangwang"
-  },
-  "versions": {
-    "nuxt": "3.15.2"
-  }
-}

.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/dev"
+        "./manifest/meta/b92575d1-b5f0-4a3b-a423-6821eda1dae0.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

@@ -122,7 +122,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']
@@ -310,7 +309,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")> &
   InjectionType<typeof import("../../plugins/request")> &
   InjectionType<typeof import("../../plugins/globals")> &
@@ -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/about.less

@@ -1,193 +1,172 @@
 //导航条
 .breadcrumb {
-  width: 1200px;
-  margin: 0 auto;
-  height: 22px;
-  padding-bottom: 40px;
-  margin-top: 40px;
-  margin-bottom: 60px;
-  border-bottom: 1px solid #d9d9d9;
-  font-family: Microsoft YaHei, Microsoft YaHei;
-  font-weight: 400;
-  font-size: 20px;
-  color: #666666;
-  line-height: 23px;
-  text-align: left;
-  font-style: normal;
-  text-transform: none;
-
-  .el-breadcrumb::v-deep {
-      display: inline-block;
-      vertical-align: -4px;
-  }
-
-  /deep/.el-breadcrumb__inner a,
-  /deep/.el-breadcrumb__inner.is-link {
-      color: #666666;
-      font-weight: 400;
-      text-decoration: none;
-      transition: var(--el-transition-color);
-  }
-
-  span {
-      font-family: Microsoft YaHei, Microsoft YaHei;
-      font-weight: 400;
-      font-size: 20px;
-      color: #666666;
-      line-height: 23px;
-      text-align: left;
-      font-style: normal;
-      text-transform: none;
-  }
-
-  span:hover {
-      color: #666666;
-  }
-
-  .location {
-      margin-right: 20px;
-      width: 100px;
-      height: 22px;
-      font-family: Microsoft YaHei, Microsoft YaHei;
-      font-weight: 400;
-      font-size: 20px;
-      color: #666666;
-      line-height: 23px;
-      text-align: left;
-      font-style: normal;
-      text-transform: none;
-  }
-}
+    width: 1200px;
+    margin: 0 auto;
+    height: 22px;
+    padding-bottom: 40px;
+    margin-top: 40px;
+    margin-bottom: 60px;
+    border-bottom: 1px solid #d9d9d9;
+    font-family: Microsoft YaHei, Microsoft YaHei;
+    font-weight: 400;
+    font-size: 20px;
+    color: #666666;
+    line-height: 23px;
+    text-align: left;
+    font-style: normal;
+    text-transform: none;
+
+    .el-breadcrumb::v-deep {
+        display: inline-block;
+        vertical-align: -4px;
+    }
 
-// 资讯列表
-.newsDetail {
-  width: 100%;
-  // height: 1400px;
-  // margin-bottom: 70px;
-
-  .inner {
-      width: 1200px;
-      font-size: 16px;
-      position: relative;
-
-      .innerDetail {
-          width: 1080px;
-          margin: 0 auto;
-          margin-bottom: 60px;
-
-          .headImg {
-              width: 1086px;
-              height: 10px;
-              background: url("@/public/special/head11.png") no-repeat 100% 100%;
-          }
-
-          .footImg {
-              width: 1086px;
-              height: 7px;
-              background: url("@/public/special/foot01.png") no-repeat 100% 100%;
-          }
-
-          .innerDetail1 {
-              width: 1086px;
-              margin: 0 auto;
-              padding: 30px 50px 40px;
-              box-sizing: border-box;
-              border-left: 1px solid #DBBE9E;
-              background: url("@/public/special/mid01.png") repeat-y 100% 100%;
-          }
-
-         .leftBottom::v-deep {
-              font-size: 16px;
-              line-height: 40px;  
-         }
-      }
-
-
-
-      .innerLeft {
-          width: 279px;
-          position: absolute;
-          top: 3px;
-          left: -155px;
-
-          .rightMenuTitle {
-              width: 279px;
-              height: 69px;
-              font-size: 22px;
-              font-weight: bold;
-              line-height: 58px;
-              text-align: center;
-              color: #fff;
-              background: url("@/public/special/projectMoreTitle.png") no-repeat;
-              margin-bottom: 30px;
-          }
-
-          ul {
-              li {
-                  a {
-                      display: inline-block;
-                      width: 144px;
-                      height: 60px;
-                      line-height: 60px;
-                      text-align: center;
-                      background-color: #F4F4F4;
-                      border-top: 1px #fff solid;
-                      font-family: Microsoft YaHei, Microsoft YaHei;
-                      font-weight: 400;
-                      font-size: 16px;
-                      color: #000000;
-                  }
-              }
-
-              li:nth-child(1) {
-                  width: 144px;
-                  height: 60px;
-                  line-height: 60px;
-                  text-align: center;
-                  background-color: #F4F4F4;
-                  border-top: 1px #fff solid;
-                  font-family: Microsoft YaHei, Microsoft YaHei;
-                  font-weight: 400;
-                  font-size: 16px;
-                  color: #dd7d18;
-              }
-
-          }
-
-          .active {
-              background: #dd7d18;
-              color: #fff;
-          }
-      }
-  }
-}
+    /deep/.el-breadcrumb__inner a,
+    /deep/.el-breadcrumb__inner.is-link {
+        color: #666666;
+        font-weight: 400;
+        text-decoration: none;
+        transition: var(--el-transition-color);
+    }
 
-//本网招聘
-.projectMoreBox {
-    margin: 0 auto;
-    height: 520px;
-    //margin-top: 20px;
-    //background: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/special/projectMoreBg.png") no-repeat;
-
-    .projectMoreTitle {
-        color: #dd7d18;
-        padding-top: 20px;
-        font-size: 26px;
-        //padding-left: 204px;
+    span {
+        font-family: Microsoft YaHei, Microsoft YaHei;
+        font-weight: 400;
+        font-size: 20px;
+        color: #666666;
+        line-height: 23px;
+        text-align: left;
+        font-style: normal;
+        text-transform: none;
+    }
+
+    span:hover {
+        color: #666666;
     }
 
-    .projectMoreText {
-        padding: 40px;
+    .location {
+        margin-right: 20px;
+        width: 100px;
+        height: 22px;
+        font-family: Microsoft YaHei, Microsoft YaHei;
+        font-weight: 400;
         font-size: 20px;
-        color: #333333;
-        text-indent: 2em;
-        line-height: 36px;
+        color: #666666;
+        line-height: 23px;
+        text-align: left;
+        font-style: normal;
+        text-transform: none;
     }
 }
 
+// 资讯列表
+.newsDetail {
+    width: 100%;
+    // height: 1400px;
+    // margin-bottom: 70px;
+
+    .inner {
+        width: 1200px;
+        font-size: 16px;
+        position: relative;
+
+        .innerDetail {
+            width: 1080px;
+            margin: 0 auto;
+            margin-bottom: 60px;
+
+            .headImg {
+                width: 1086px;
+                height: 10px;
+                background: url("../../public/special/1.png") no-repeat 100% 100%;
+            }
+
+            .footImg {
+                width: 1086px;
+                height: 7px;
+                background: url("../../public/special/3.png") no-repeat 100% 100%;
+            }
+
+            .innerDetail1 {
+                width: 1086px;
+                margin: 0 auto;
+                padding: 30px 50px 40px;
+                box-sizing: border-box;
+                border-left: 1px solid #c6d9f0;
+                background: url("../../public/special/2.png") repeat-y 100% 100%;
+            }
+
+           .leftBottom::v-deep {
+                font-size: 16px;
+                line-height: 40px;  
+           }
+        }
+
+
+
+        .innerLeft {
+            width: 279px;
+            position: absolute;
+            top: 3px;
+            left: -155px;
+
+            .rightMenuTitle {
+                width: 279px;
+                height: 69px;
+                font-size: 22px;
+                font-weight: bold;
+                line-height: 58px;
+                text-align: center;
+                color: #fff;
+                background: url("../../public/special/projectMoreTitle.png") no-repeat;
+                margin-bottom: 30px;
+            }
+
+            ul {
+                li {
+                    a {
+                        display: inline-block;
+                        width: 144px;
+                        height: 60px;
+                        line-height: 60px;
+                        text-align: center;
+                        background-color: #F4F4F4;
+                        border-top: 1px #fff solid;
+                        font-family: Microsoft YaHei, Microsoft YaHei;
+                        font-weight: 400;
+                        font-size: 16px;
+                        color: #000000;
+                    }
+                }
+
+                li:nth-child(1) {
+                    width: 144px;
+                    height: 60px;
+                    line-height: 60px;
+                    text-align: center;
+                    background-color: #F4F4F4;
+                    border-top: 1px #fff solid;
+                    font-family: Microsoft YaHei, Microsoft YaHei;
+                    font-weight: 400;
+                    font-size: 16px;
+                    color: #255590;
+                }
+
+            }
+
+            .active {
+                // border-left: 0;
+                // border: 1px solid #028E21;
+                background: #255590;
+                color: #fff;
+            }
+        }
+    }
+}
+/*列表样式*/
 .innerTitle {
     font-size: 24px;
-    border-bottom: 1px solid #dd7d18;
+    border-bottom: 1px solid #255590;
     padding-bottom: 20px;
 }
 

assets/css/class.less

@@ -103,7 +103,27 @@ section {
     margin-top: 40px;
 }
 
+.channel_nav {
+    height: 60px;
+    width: 1200px;
+    background-image: url(../../public/img/5.png);
+    margin-top: 40px;
+
+    .channel_nav_a {
+        float: left;
+        height: 60px;
+        line-height: 60px;
+        color: #255590;
+        font-size: 20px;
+        margin: 0px 19px;
+        font-weight: bold;
+    }
 
+    .channel_nav_a:nth-of-type(1) {
+        color: #fff;
+        margin: 0px 42px;
+    }
+}
 
 .channel_1_box {
     width: 720px;
@@ -666,6 +686,7 @@ section {
 
     .channel_img_big_5_li_img {
         display: block;
+        width: 100%;
         height: 267px;
     }
 

assets/css/error.less

@@ -15,7 +15,7 @@
     color: #fff;
     text-align: center;
     margin: 0 auto;
-    background: #DD7D18;
+    background: #255590;
     border-radius: 8px;
     margin-top: 70px;
     cursor: pointer;

assets/css/list.less

@@ -1,127 +1,10 @@
-//二级栏目
-.sannongzhichuang {
-    margin: 30px 0 40px;
-
-    .inner {
-        width: 1200px;
-        height: 67px;
-        position: relative;
-    }
-
-    h2 {
-        display: inline-block;
-        //background-image: url("../../public/image/bg1.png");
-        background: #139602;
-        width: 156px;
-        height: 43px;
-        padding: 14px 31px 10px 25px;
-        font-family: STXingkai, STXingkai;
-        font-weight: 400;
-        font-size: 39px;
-        color: #FFFFFF;
-        line-height: 46px;
-        text-align: center;
-        font-style: normal;
-        text-transform: none;
-        -webkit-text-stroke: 0.3px #3C6C47;
-        position: absolute;
-        top: 0;
-        left: 0;
-        z-index: 99;
-
-        em {
-            position: absolute;
-            top: -16px;
-            right: -12px;
-            color: #185410;
-            display: inline-block;
-            width: 13px;
-            height: 13px;
-        }
-
-        a {
-            font-family: STXingkai, STXingkai;
-            font-weight: 400;
-            font-size: 39px;
-            color: #FFFFFF;
-            line-height: 46px;
-            text-align: center;
-            -webkit-text-stroke: 0.3px #3C6C47;
-        }
-    }
-
-    p.introduction {
-        display: inline-block;
-        width: 1003px;
-        height: 56px;
-        line-height: 56px;
-        background-color: #fafafa;
-        position: absolute;
-        bottom: 0;
-        right: 0;
-        display: flex;
-
-        >strong:first-child {
-            margin-left: 40px;
-            display: inline-block;
-            vertical-align: middle;
-            width: 32px;
-            height: 36px;
-            padding: 3px 7px;
-            border: 0.5px solid #129502;
-            font-family: Microsoft YaHei, Microsoft YaHei;
-            font-weight: bold;
-            font-size: 14px;
-            color: #139602;
-            line-height: 18px;
-            text-align: center;
-            font-style: normal;
-            text-transform: none;
-
-        }
-
-        div {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-
-            >span {
-                width: 64px;
-                height: 21px;
-                font-family: Microsoft YaHei, Microsoft YaHei;
-                font-weight: 400;
-                font-size: 16px;
-                color: #000000;
-                line-height: 21px;
-                text-align: left;
-                font-style: normal;
-                text-transform: none;
-                margin-top: 17px;
-                padding: 0 24px;
-                border-right: 1px solid #ccc;
-
-                a {
-                    color: #000;
-                }
-            }
-
-            >span:hover a {
-                color: #139602;
-            }
-
-            >span:last-child {
-                border: none;
-            }
-        }
-
-    }
-}
-
 #newsList {
     width: 100%;
     overflow: hidden;
 }
 
+
+
 // 资讯列表
 .newsList {
     width: 100%;
@@ -200,7 +83,7 @@
 
                 li {
                     width: 100%;
-                    padding: 15px 0;
+                    padding: 10px 0;
 
                     a {
                         display: flex;
@@ -234,7 +117,7 @@
                 }
 
                 >li:hover .listTitle {
-                    color: #dd7d18;
+                    color: #255590;
                 }
 
                 // >li:nth-child(1)::after,
@@ -273,7 +156,7 @@
 
                 // 鼠标移入后字体颜色
                 .el-pagination::v-deep :hover {
-                    color: #dd7d18;
+                    color: #255590;
                 }
 
                 .el-pagination.is-background::v-deep .btn-next,
@@ -294,7 +177,7 @@
                 .el-pagination.is-background::v-deep .btn-next.is-active,
                 .el-pagination.is-background::v-deep .btn-prev.is-active,
                 .el-pagination.is-background::v-deep .el-pager li.is-active {
-                    background-color: #dd7d18;
+                    background-color: #255590;
                     color: #fff;
                 }
 
@@ -304,7 +187,7 @@
 
         .innerRight {
             width: 270px;
-            margin-top: 60px;
+            margin-top: 50px;
         }
     }
 }
@@ -343,7 +226,7 @@
                 text-align: left;
                 font-style: normal;
                 text-transform: none;
-                border-bottom: 1px solid #dd7d18;
+                border-bottom: 1px solid #255590;
 
             }
 
@@ -462,11 +345,11 @@
                 }
 
                 >li:hover {
-                    color: #dd7d18;
+                    color: #255590;
                 }
 
                 >li:hover em {
-                    background-color: #dd7d18;
+                    background-color: #255590;
                 }
             }
         }
@@ -481,7 +364,7 @@
             width: 380px;
             height: 40px;
             line-height: 40px;
-            border-top: 1px solid #dd7d18;
+            border-top: 1px solid #255590;
             border-bottom: 1px solid #e7e7e7;
 
             >h4 {
@@ -544,5 +427,4 @@
         }
 
     }
-}
-
+}

assets/css/search.less

@@ -89,7 +89,7 @@
 
         .innerLeft,
         .innerRight {
-            border-top: 1px solid #D9D9D9;
+            border-top: 1px solid #CCCCCC;
             clear: both;
             float: none;
         }
@@ -103,11 +103,12 @@
 
                 >li {
                     width: 100%;
-                    height: 56px;
+                    padding: 10px 0;
+                    // height: 56px;
+                    // line-height: 56px;
                     white-space: nowrap;
                     overflow: hidden;
                     text-overflow: ellipsis;
-                    line-height: 56px;
 
 
                     >a {
@@ -123,17 +124,24 @@
                         text-transform: none;
                     }
 
+                    .time {
+                        font-family: Microsoft YaHei, Microsoft YaHei;
+                        font-weight: 400;
+                        font-size: 18px;
+                        color: #333333;
+                    }
+
                 }
 
                 >li:hover>a {
-                    color: #DD7D18;
+                    color: #255590;
                 }
 
                 >li:nth-child(1)::after,
                 >li:nth-child(2)::after {
                     content: "热";
                     margin-left: 13px;
-                    background: #DD7D18;
+                    background: #ffb70f;
                     color: #fff;
                     font-size: 14px;
                     padding: 0px 2px;
@@ -141,6 +149,17 @@
 
                 >li:nth-child(5n) {
                     border-bottom: 1px solid #D9D9D9;
+                    padding-bottom: 30px;
+                }
+
+                >li:nth-child(5n+1) {
+                    span {
+                        font-weight: bold;
+                    }
+
+                    font-weight: bold;
+                    padding-top: 30px;
+
                 }
             }
 
@@ -154,7 +173,7 @@
 
                 // 鼠标移入后字体颜色
                 .el-pagination::v-deep :hover {
-                    color: #DD7D18;
+                    color: #255590;
                 }
 
                 .el-pagination.is-background::v-deep .btn-next,
@@ -175,7 +194,7 @@
                 .el-pagination.is-background::v-deep .btn-next.is-active,
                 .el-pagination.is-background::v-deep .btn-prev.is-active,
                 .el-pagination.is-background::v-deep .el-pager li.is-active {
-                    background-color: #DD7D18;
+                    background-color: #255590;
                     color: #fff;
                 }
 
@@ -226,7 +245,7 @@
                 text-align: left;
                 font-style: normal;
                 text-transform: none;
-                border-bottom: 1px solid #DD7D18;
+                border-bottom: 1px solid #255590;
 
             }
 
@@ -345,11 +364,11 @@
                 }
 
                 >li:hover {
-                    color: #139602;
+                    color: #255590;
                 }
 
                 >li:hover em {
-                    background-color: #139602;
+                    background-color: #255590;
                 }
             }
         }
@@ -364,7 +383,7 @@
             width: 380px;
             height: 40px;
             line-height: 40px;
-            border-top: 1px solid #139602;
+            border-top: 1px solid #255590;
             border-bottom: 1px solid #e7e7e7;
 
             >h4 {
@@ -437,12 +456,11 @@
 .search {
     width: 100%;
     height: 100px;
-    // background-color: #f5f5f5;
+    margin-top: 40px;
 
     .inner {
         width: 1200px;
         height: 100px;
-        // line-height: 100px;
         padding-top: 10px;
         text-align: center;
 
@@ -461,7 +479,9 @@
         button {
             width: 120px;
             height: 48px;
-            background-color: #DD7D18;
+            background-color: #255590;
+            font-size: 16px;
+            letter-spacing: 4px;
             color: #fff;
             border: none;
             border-radius: 0;

components/detail/HotNews.vue

@@ -29,32 +29,6 @@
                 </NuxtLink>
             </li>
         </ul>
-        <div class="hotList_photo_text">
-            <div class="hotList_photo_text1"  v-for="(item, index) in hotNewsListdata3" :key="index">
-                <NuxtLink
-                    :href="getLinkPathDetail(item)"
-                    :title="item.title"
-                    :key="item.id"
-                    :target="item.islink == 1 ? '_blank' : '_self'"
-                >
-                    <img :src="item.imgurl" :alt="item.title">
-                    <span class="hotlist_text">{{ item.title }}</span>
-                </NuxtLink>
-            </div>
-        </div>
-        <ul class="message">
-            <li class="messageList" v-for="(item, index) in hotNewsListdata4" :key="index">
-                <em></em>
-                <NuxtLink
-                    :href="getLinkPathDetail(item)"
-                    :title="item.title"
-                    :key="item.id"
-                    :target="item.islink == 1 ? '_blank' : '_self'"
-                >
-                    {{ item.title }}
-                </NuxtLink>
-            </li>
-        </ul>
     </div>
 </template>
 
@@ -71,53 +45,40 @@ const getLinkPathDetail = (item) => {
 
 const hotNewsListdata1 = ref([])
 const hotNewsListdata2 = ref([])
-const hotNewsListdata3 = ref([])
-const hotNewsListdata4 = ref([])
 
 async function getPageData() {
     const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize':8,
+            'pageSize':6,
             'level': 4,
             'id': 0,
         },
     });
     if(mkdata.code == 200){
         hotNewsListdata1.value = mkdata.data.slice(0, 2);
-        hotNewsListdata2.value = mkdata.data.slice(2, 4);
-        hotNewsListdata3.value = mkdata.data.slice(4, 6);
-        hotNewsListdata4.value = mkdata.data.slice(6, 8);
+        hotNewsListdata2.value = mkdata.data.slice(2, 6);
     }else{
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：获取最新资讯")
-        console.log("后端错误反馈：",mkdata.message)
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
 getPageData();
 </script>
 
 <style lang="less" scoped>
-//标题
-.hotList {
-    width: 270px;
-    border-top: 2px solid #dd7d18;
+.title {
+    width: 100px;
+    font-family: Microsoft YaHei, Microsoft YaHei;
+    font-weight: bold;
+    font-size: 22px;
+    color: #255590;
+    margin: 10px 0 20px;
+    position: relative;
+    border-left: #255590 5px solid;
+    padding-left: 15px;
 
-    .title {
-        width: 100px;
-        height: 40px;
-        line-height: 40px;
-        font-family: Microsoft YaHei, Microsoft YaHei;
-        font-weight: bold;
-        margin: 10px 0;
-        font-size: 20px;
-        color: #333333;
-        position: relative;
-    }
 }
-//今日热点
-// 图文
+
 .hotList_photo_text {
     width: 270px;
 
@@ -134,7 +95,7 @@ getPageData();
         .hotlist_text {
             float: left;
             width: 126px;
-            height: 74px;
+            height: 72px;
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-line-clamp: 3;
@@ -147,15 +108,18 @@ getPageData();
             padding-top: 3px;
         }
     }
+
     .hotList_photo_text1:first-child {
         margin-bottom: 20px;
     }
-    .hotList_photo_text1:hover{
-        .hotlist_text{
-            color: #dd7d18;
+
+    .hotList_photo_text1:hover {
+        .hotlist_text {
+            color: #255590;
         }
     }
 }
+
 // 文字
 .message {
     width: 270px;
@@ -178,10 +142,19 @@ getPageData();
         a {
             color: #333333;
         }
+        em{
+            display: inline-block;
+            width: 8px;
+            height: 8px;
+            background-color: #D9D9D9 ;
+            border-radius: 50%;
+            vertical-align: middle;
+            margin-right: 10px;
+        }
     }
 
     >li:hover>a {
-        color: #dd7d18;
+        color: #255590;
     }
 
 }

components/detail/HotNews2.vue

@@ -1,22 +1,4 @@
 <template>
-    <!-- <div class="title">
-        <h4>
-            热点精选
-        </h4>
-    </div> -->
-    <!-- 列表 -->
-    <!-- <ul class="rightList">
-        <li v-for="item in hotNewsList">
-            <NuxtLink :to="item.linkurl" v-show="item.islink == 1" :title="item.title">
-                <img class="hotNewsImg" :src="item.imgurl">
-                <p>{{ item.title }}</p>
-            </NuxtLink>
-            <NuxtLink :to="`/${item.pinyin}/${item.id}.html`" v-if="item.islink == 0" :title="item.title">
-                <img class="hotNewsImg" :src="item.imgurl">
-                <p>{{ item.title }}</p>
-            </NuxtLink>
-        </li>
-    </ul> -->
     <div class="hotNews">
         <div class="hotNews_title">
             热点精选
@@ -73,19 +55,18 @@ getPageData();
 <style lang="less" scoped>
 .hotNews {
     width: 270px;
-    border-top: 2px solid #dd7d18;
-    margin-top: 40px;
+    margin-top: 20px;
 
     //标题
     .hotNews_title {
         width: 100px;
-        height: 40px;
-        line-height: 40px;
         font-family: Microsoft YaHei, Microsoft YaHei;
         font-weight: bold;
-        margin: 20px 0 15px;
+        margin: 30px 0 10px;
         font-size: 20px;
-        color: #333333;
+        color: #255590;
+        border-left: #255590 5px solid;
+        padding-left: 17px;
     }
 
     //新闻列表
@@ -118,27 +99,27 @@ getPageData();
 
         .hotNews_messageList:nth-child(1) {
             .number {
-                color: #dd7d18;
+                color: #255590;
             }
         }
 
         .hotNews_messageList:nth-child(2) {
             .number {
-                color: #dd7d18;
+                color: #255590;
             }
         }
 
         .hotNews_messageList:nth-child(3) {
             .number {
-                color: #dd7d18;
+                color: #255590;
             }
         }
 
         .hotNews_messageList:hover {
-            color: #dd7d18;
+            color: #255590;
 
             a {
-                color: #dd7d18;
+                color: #255590;
             }
         }
     }

components/home/Surveyvote.vue

@@ -0,0 +1,554 @@
+<template>
+    <!-- 投票 start ---------------------------------------->
+    <div class="index_3_box_vote">
+        <div class="voteTitle">投票区</div>
+        <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">
+                        <el-radio v-for="item in voteList" :key="item.id" :value="item.id" size="large">
+                            <span v-if="item.is_other == 0">{{item.choice_name}}</span>
+                            <span v-else>其他</span>
+                        </el-radio>
+                    </el-radio-group>
+                    <el-input
+                        v-if="showUserChoice"
+                        v-model="userChoice"
+                        :rows="2"
+                        type="textarea"
+                        resize="none"
+                        placeholder="请输入.."
+                    />
+                </div>
+                <div class="checkInputBox" v-else>
+                    <el-checkbox-group v-model="check1" @change="handleCheckboxChange">
+                        <span v-for="item in voteList" :key="item.id">
+                            <span v-if="item.is_other == 0">
+                                <el-checkbox size="large" :label="item.choice_name" :value="item.id"/>
+                            </span>
+                            <span v-else>
+                                <el-checkbox size="large" label="其他" :value="item.id"/>
+                            </span>
+                        </span>
+                    </el-checkbox-group>
+                    <el-input
+                        v-if="showUserChoice"
+                        v-model="userChoice"
+                        :rows="2"
+                        type="textarea"
+                        resize="none"
+                        placeholder="请输入.."
+                    />
+                </div>
+            </div>
+            <!--投票结果-->
+            <div class="inquireData" v-else>
+                <div v-for="item in websiteSurveyData.data" :key="item.id">
+                    <div class="inquireDataItem active" v-if="item.status == 1">
+                        <div class="inquireDataItemTitle">
+                            <span v-if="item.choice_name == ''">其他</span>
+                            <span v-else>{{item.choice_name}}</span>
+                        </div>
+                        <div class="inquireDataItemNum">{{item.results}}票</div>
+                    </div>
+                    <div class="inquireDataItem" v-else>
+                        <div class="inquireDataItemTitle">
+                            <span v-if="item.choice_name == ''">其他</span>
+                            <span v-else>{{item.choice_name}}</span>
+                        </div>
+                        <div class="inquireDataItemNum">{{item.results}}票</div>
+                    </div>
+                </div>
+            </div>
+            </div>
+            <div class="btn">
+                <button class="voting" @click="addWebsiteSurvey" :disabled="isDisabled" v-if="!isDisabled">投票</button>
+            </div>
+        </div>
+    </div>
+    <!-- 投票 end ---------------------------------------->
+</template>
+
+<script setup>
+//1.页面依赖 start ---------------------------------------->
+const route = useRoute();
+const articleId = parseInt(route.params.id); //获得该页面的id
+
+import { ElRadio, ElRadioGroup,ElCheckbox,ElCheckboxGroup,ElMessage,ElInput } from 'element-plus'
+//1.页面依赖 start ---------------------------------------->
+
+//2.投票 start---------------------------------------->
+const radio1 = ref(''); //单选
+const check1 = ref([]); //多选
+const isDisabled = ref(false);//是否禁用提交按钮
+const isRadio = ref(true);//是否渲染单选
+
+const userSurId = ref('');//投票属于哪一篇文章
+const userChoice = ref('');//用于判断用户选择了其他选项以后，输入的值
+const userIsChoice = ref('');//用于判断其他选项目前是什么值
+const showUserChoice = ref(false);//是否显示其他输入框
+const websiteSurveyData = ref([]);//投票结果
+
+//7.2获得投票列表
+let voteList = ref([]);
+async function getVoteList(){
+    const voteData = await requestDataPromise('/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)
+        //判断显示单选还是多选
+        //survey_type 0是单选 1是多选
+        if(voteData.data[0].survey_type == 0){
+            isRadio.value = true;
+            console.log("1111")
+        }else{
+            isRadio.value = false;
+        }
+        //把最后一个的值拿出来 用于判断用户是否选择了其他
+        for(let item of voteData.data){
+            //如果含有其他
+            if(item.is_other==1){
+                userIsChoice.value = item.id;
+            }
+        }
+        //用户投票属于哪一篇文章
+        userSurId.value = voteData.data[0].sur_id;
+
+    }else{
+        console.log("投票错误：",voteData.message)
+    }
+}
+getVoteList()
+
+//7.3当用户选择了选项，判断是否展示其他输入框
+const handleRadioChange = (value) => {
+    if(value == userIsChoice.value){
+        showUserChoice.value = true;
+    }else{
+        showUserChoice.value = false;
+    }
+}
+
+const handleCheckboxChange = (value) => {
+    if (value.includes(userIsChoice.value)) {
+        showUserChoice.value = true;
+    } else {
+        showUserChoice.value = false;
+    }
+}
+
+//7.4发起投票
+async function addWebsiteSurvey(){
+    //判断当前是单选还是多选
+    console.log(isRadio.value)
+    if(isRadio.value){
+        console.log("用户单选！")
+        if(radio1.value!=''){
+            //先判断一下是否使用了其他选项
+            if(showUserChoice.value){
+                if(userChoice.value!=''){
+                    //文章id
+                    // console.log(userSurId.value)
+                    // 用户输入的值
+                    // console.log(userChoice.value)
+                    //如果使用了其他，其他的选项需要增加进去
+                    const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
+                        method:'GET',
+                        query:{
+                            'sur_id':userSurId.value,//投票的新闻id
+                            'choice_name':userChoice.value,//投票的选项id
+                        }
+                    });
+                    if(ChoiceData.code == 200){
+                        //提交完其他选项以后，再正式发起投票
+                        const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                            method:'GET',
+                            query:{
+                                'sur_id':userSurId.value,
+                                'choice_id':ChoiceData.data
+                            }
+                        });
+                        if(mkData.code == 200){
+                            ElMessage.success('投票成功！')
+                            //把投票结果显示到页面上 禁用投票按钮
+                            isDisabled.value = true;
+                            websiteSurveyData.value = mkData.data;
+                            //遍历一下，把用户选中的那个设置status为1
+                            let data = mkData.data;
+                            //遍历一下，把用户选中的那个设置status为1
+                            for(let item of data.data){
+                                for(let i of data.choice){
+                                    if(item.id == i){
+                                        console.log(item.id)
+                                        item.status = 1;
+                                    }
+                                }
+                            }
+                            websiteSurveyData.value = data;
+                        }else{
+                            ElMessage.error(mkData.message)
+                        }
+                    }else{
+                        ElMessage.error('其他投票失败！')
+                    }
+                }else{
+                    ElMessage.error('请输入选项内容！')
+                }
+            }else{
+                //如果没选择其他，直接提交选择的内容
+                const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                    method:'GET',
+                    query:{
+                        'sur_id':userSurId.value,
+                        'choice_id':radio1.value
+                    }
+                });
+                if(mkData.code == 200){
+                    ElMessage.success('投票成功！')
+                    //把投票结果显示到页面上 禁用投票按钮
+                    isDisabled.value = true;
+                    let data = mkData.data;
+                    //遍历一下，把用户选中的那个设置status为1
+                    for(let item of data.data){
+                        for(let i of data.choice){
+                            if(item.id == i){
+                                item.status = 1;
+                            }
+                        }
+                    }
+                    websiteSurveyData.value = data;
+                }else{
+                    ElMessage.error('投票失败！')
+                }
+            }
+        }else{
+            ElMessage.error('请选择一个选项')
+        }
+    }else{
+        console.log("多选！")
+        //多选
+        if(check1.value!=[]){
+             //先判断一下是否使用了其他选项
+            if(showUserChoice.value){
+                if(userChoice.value!=''){
+                    //判断用户是否只选择了一个其他
+                    if(check1.value.length == 1){
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
+                            method:'GET',
+                            query:{
+                                'sur_id':userSurId.value,//投票的新闻id
+                                'choice_name':userChoice.value,//用户输入的其他选项文字
+                            }
+                        });
+                        if(ChoiceData.code == 200){
+                            //提交完其他选项以后，再正式发起投票
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
+                                method:'GET',
+                                query:{
+                                    'sur_id':userSurId.value,
+                                    'choice_id':ChoiceData.data
+                                }
+                            });
+                            if(mkData.code == 200){
+                                ElMessage.success('投票成功！')
+                                //把投票结果显示到页面上 禁用投票按钮
+                                isDisabled.value = true;
+                                websiteSurveyData.value = mkData.data;
+                                //遍历一下，把用户选中的那个设置status为1
+                                let data = mkData.data;
+                                //遍历一下，把用户选中的那个设置status为1
+                                for(let item of data.data){
+                                    for(let i of data.choice){
+                                        if(item.id == i){
+                                            console.log(item.id)
+                                            item.status = 1;
+                                        }
+                                    }
+                                }
+                                websiteSurveyData.value = data;
+                            }else{
+                                ElMessage.error(mkData.message)
+                            }
+                        }else{
+                            ElMessage.error('其他投票失败！')
+                        }
+
+                    }else{
+                        //用户选择了除了其他以外，还包括别的选项
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
+                            method:'GET',
+                            query:{
+                                'sur_id':userSurId.value,//投票的新闻id
+                                'choice_name':userChoice.value,//用户输入的其他选项文字
+                            }
+                        });
+                        if(ChoiceData.code == 200){
+                            let data = check1.value;
+                            //找到多选的数组，把其他默认值给替换掉
+                            for (let i = 0; i < data.length; i++) {
+                                if (data[i] == userIsChoice.value) {
+                                    data[i] = ChoiceData.data;
+                                }
+                            }
+                            let jsonArray = JSON.stringify(data);
+                            //提交完其他选项以后，再正式发起投票
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
+                                method:'GET',
+                                query:{
+                                    'sur_id':userSurId.value,
+                                    'choice_id':jsonArray
+                                }
+                            });
+                            
+                            if(mkData.code == 200){
+                                ElMessage.success('投票成功！')
+                                //把投票结果显示到页面上 禁用投票按钮
+                                isDisabled.value = true;
+                                websiteSurveyData.value = mkData.data;
+                                //遍历一下，把用户选中的那个设置status为1
+                                let data = mkData.data;
+                                //遍历一下，把用户选中的那个设置status为1
+                                for(let item of data.data){
+                                    for(let i of data.choice){
+                                        if(item.id == i){
+                                            //console.log(item.id)
+                                            item.status = 1;
+                                        }
+                                    }
+                                }
+                                websiteSurveyData.value = data;
+                            }else{
+                                ElMessage.error(mkData.message)
+                            }
+                        }else{
+                            ElMessage.error('其他投票失败！')
+                        }
+
+                    }
+                }else{
+                    ElMessage.error('请输入选项内容！')
+                }
+            }else{
+                let jsonArray = JSON.stringify(check1.value);
+                //如果没选择其他，直接提交选择的内容
+                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
+                    method:'GET',
+                    query:{
+                        'sur_id':userSurId.value,
+                        'choice_id':jsonArray
+                    }
+                });
+                if(mkData.code == 200){
+                    ElMessage.success('投票成功！')
+                    //把投票结果显示到页面上 禁用投票按钮
+                    isDisabled.value = true;
+                    websiteSurveyData.value = mkData.data;
+                    //遍历一下，把用户选中的那个设置status为1
+                    let data = mkData.data;
+                    //遍历一下，把用户选中的那个设置status为1
+                    for(let item of data.data){
+                        for(let i of data.choice){
+                            if(item.id == i){
+                                console.log(item.id)
+                                item.status = 1;
+                            }
+                        }
+                    }
+                    websiteSurveyData.value = data;
+                }else{
+                    ElMessage.error('投票失败！')
+                }
+            }
+        }else{
+            ElMessage.error('请选择一个选项')
+        }
+    }
+}
+//2.投票 end---------------------------------------->
+</script>
+
+<style lang="less" scoped>
+//投票
+.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 #255590;
+        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: #27881a;
+            }
+            /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: #27881a;
+            }
+            /deep/.el-radio__input.is-checked .el-radio__inner {
+                background: #33b023;
+                border-color: #27881a;
+            }
+        }
+
+        .checkInputBox {
+            /deep/.el-checkbox {
+                --el-radio-input-border-color-hover: #27881a;
+            }
+            /deep/.el-checkbox-group {
+                align-items: center;
+                display: inline-flex;
+                flex-wrap: wrap;
+                font-size: 0;
+                //padding-left: 35px;
+            }
+            /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: #27881a;
+            }
+            /deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+                background: #33b023;
+                border-color: #27881a;
+            }
+        }
+
+        .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: #255590;
+                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:#49A769;
+            background: #dff7e8;
+            border: 1px solid #49A769;
+        }
+    }
+}
+</style>

components/home/SwiperSnscChannel.vue

@@ -1,133 +1,147 @@
 <template>
-      <div class="swiper">
-            <el-carousel :interval="3333" height="405px" indicator-class="custom-indicator">
-                  <el-carousel-item v-for="(item, item_index) in 4" :key="item">
-                        <img class="" src="../../public/img/12.png" title="" alt="">
-                        <span class="swiper_dot1 dot1">{{ item_index
-                        }}高邮市周山镇开展渔业安全生产应急高邮市周山镇开展渔业安全生产应急高邮市周山镇开展渔业安全生产应急高邮市周山镇开展渔业安全生产应急</span>
-                  </el-carousel-item>
-            </el-carousel>
-      </div>
+    <div class="swiper">
+        <el-carousel :interval="5000" height="405px" indicator-class="custom-indicator">
+            <el-carousel-item v-for="(item, index) in data" :key="item">
+                <NuxtLink class="index_2_left_ul_li_a_text"
+                    :href="getLinkPathDetail(item)"
+                    :title="item.title"
+                    :key="item.id"
+                    :target="item.islink == 1 ? '_blank' : '_self'"
+                >
+                    <img :src="item.imgurl" title="" alt="item.title">
+                    <span class="swiper_dot1 dot1">
+                        {{index}}{{item.title}}
+                    </span>
+                </NuxtLink>
+
+            </el-carousel-item>
+        </el-carousel>
+    </div>
 
 </template>
 
 <script setup>
-
 import { ElCarousel, ElCarouselItem } from 'element-plus'
 
+const props = defineProps({
+    data: {
+        type: Array
+    }
+})
+
 </script>
 
 <style lang="less" scoped>
 .dot1 {
-      display: block;
-      word-break: keep-all;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
+    display: block;
+    word-break: keep-all;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .swiper {
-      width: 100%;
-      height: 405px;
-      position: relative;
-
-      img {
-            width: 100%;
-            height: 405px;
-      }
-
-      .swiper_dot1 {
-            display: block;
-            width: 100%;
-            line-height: 60px;
-            height: 60px;
-            color: #fff;
-            font-size: 24px;
-            text-indent: 20px;
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            z-index: 10;
-            box-sizing: border-box;
-            padding-right: 244px;
-
-            background:linear-gradient(0deg,rgba(0,0,0,0.5) 33%,rgba(0,0,0,0) 100%);
-      }
+    width: 100%;
+    height: 405px;
+    position: relative;
+
+    img {
+        width: 100%;
+        height: 405px;
+    }
+
+    .swiper_dot1 {
+        display: block;
+        width: 100%;
+        line-height: 60px;
+        height: 60px;
+        color: #fff;
+        font-size: 24px;
+        text-indent: 20px;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        z-index: 10;
+        box-sizing: border-box;
+        padding-right: 244px;
+
+        background: linear-gradient(0deg, rgba(0, 0, 0, 0.5) 33%, rgba(0, 0, 0, 0) 100%);
+    }
 
 }
 
 .el-carousel {
-      /deep/.el-carousel__arrow i {
-            font-size: 30px !important;
-      }
-
-      /deep/.el-carousel__arrow--left {
-            left: 16px;
-            width: 35px;
-            height: 57px;
-            color: #616358;
-            background: #dcdedc;
-            position: absolute;
-            left: 0px;
-            border: none;
-            border-radius: 0;
-      }
-
-      /deep/.el-carousel__arrow--right {
-            right: 16px;
-            width: 35px;
-            height: 57px;
-            color: #616358;
-            background: #dcdedc;
-            position: absolute;
-            right: 0;
-            border: none;
-            border-radius: 0;
-      }
-
-      /deep/ .el-carousel__indicators {
-            // 指示器
-            left: unset;
-            transform: unset;
-            right: 10px;
-            bottom: 11px;
-      }
-
-      /deep/ .el-carousel__button {
-            // 指示器按钮
-            width: 10px;
-            height: 10px;
-            border: none;
-            border-radius: 5px;
-            background: #fff;
-            opacity: 1;
-      }
-
-      /deep/ .is-active .el-carousel__button {
-            // 指示器激活按钮
-            background: #255590;
-            width: 25px;
-            opacity: 1;
-
-      }
-
-      /deep/ .el-carousel__container {
-            height: 100%;
-      }
+    /deep/.el-carousel__arrow i {
+        font-size: 30px !important;
+    }
+
+    /deep/.el-carousel__arrow--left {
+        left: 16px;
+        width: 35px;
+        height: 57px;
+        color: #616358;
+        background: #dcdedc;
+        position: absolute;
+        left: 0px;
+        border: none;
+        border-radius: 0;
+    }
+
+    /deep/.el-carousel__arrow--right {
+        right: 16px;
+        width: 35px;
+        height: 57px;
+        color: #616358;
+        background: #dcdedc;
+        position: absolute;
+        right: 0;
+        border: none;
+        border-radius: 0;
+    }
+
+    /deep/ .el-carousel__indicators {
+        // 指示器
+        left: unset;
+        transform: unset;
+        right: 10px;
+        bottom: 11px;
+    }
+
+    /deep/ .el-carousel__button {
+        // 指示器按钮
+        width: 10px;
+        height: 10px;
+        border: none;
+        border-radius: 5px;
+        background: #fff;
+        opacity: 1;
+    }
+
+    /deep/ .is-active .el-carousel__button {
+        // 指示器激活按钮
+        background: #255590;
+        width: 25px;
+        opacity: 1;
+
+    }
+
+    /deep/ .el-carousel__container {
+        height: 100%;
+    }
 }
 
 .custom-indicator button {
-      background-color: #fff;
+    background-color: #fff;
 
-      opacity: 1;
-      width: 8px;
-      height: 8px;
+    opacity: 1;
+    width: 8px;
+    height: 8px;
 }
 
 .custom-indicator button.is-active {
-      background-color: #DD7D18;
-      width: 58px;
+    background-color: #DD7D18;
+    width: 58px;
 
-      opacity: 1;
+    opacity: 1;
 }
 </style>

components/home/pageNavigation.vue

@@ -45,12 +45,12 @@
                         站内搜索:
                     </div>
                     <div class="searchRole">
-                        <el-select v-model="depValue" placeholder="资讯" size="large" style="width: 100px">
-                            <el-option v-for="(item, index) in department" :key="index" :label="item.name"
+                        <el-select v-model="selectValue" placeholder="请选择.." size="large" style="width: 100px">
+                            <el-option v-for="(item, index) in selectOptions" :key="index" :label="item.name"
                                 :value="item.id" />
                         </el-select>
                         <i></i>
-                        <input type="text" v-model="typeValue" placeholder="输入关键词" class="ipt">
+                        <input type="text" v-model="inputValue" placeholder="输入关键词" class="ipt">
                         <em @click="goToPrimary"></em>
                     </div>
                 </div>
@@ -95,37 +95,46 @@ getNavigation2();
 
 //2.搜索 start ---------------------------------------->
 import { ElSelect, ElOption, ElMessage } from 'element-plus'
-let department = ref("") //下拉框选项
-const depValue = ref("") //搜索左侧下拉选择的值
-const typeValue = ref("") //搜索右侧框输入的值
+let selectOptions = [ //下拉框选项
+    {name:'资讯',id:1},
+    {name:'商城',id:2},
+    {name:'招工招聘',id:3},
+]
+const selectValue = ref("") //搜索左侧下拉选择的值
+const inputValue = ref("") //搜索右侧框输入的值
 
 //2.1跳转到搜索页面
 let goToPrimary = async () => {
-    
-    if (depValue.value == "" || typeValue.value=="") {
+    if (inputValue.value==""||selectValue.value=="") {
         ElMessage.error('搜索项不能为空！')
     }else{
-        const route = `/search/search?depValue=${depValue.value}&typeValue=${typeValue.value}`;
-        window.location.href = route;
+        if(selectValue.value == 2||selectValue.value == 3){
+            ElMessage.error('所选分类暂不支持检索！')
+        }else{
+            const route = `/search/search?type=${selectValue.value}&keyword=${inputValue.value}`;
+            window.location.href = route;
+        }
     }
 }
 
 onMounted(async ()  => {
     //2.2 获得搜索选项
-    try {
-        const { $webUrl, $CwebUrl } = useNuxtApp();
-        const response = await fetch($webUrl + '/web/selectWebsiteDepartment', {
-            headers: {
-                'Content-Type': 'application/json',
-                'Userurl': $CwebUrl,
-                'Origin': $CwebUrl
-            }
-        });
-        const result = await response.json();
-        department.value = result.data;
-    } catch (error) {
-        console.error('获取部门数据失败:', error);
-    }
+    //暂时为固定
+    //商城、招工招聘 都不能跳转
+    // try {
+    //     const { $webUrl, $CwebUrl } = useNuxtApp();
+    //     const response = await fetch($webUrl + '/web/selectWebsiteDepartment', {
+    //         headers: {
+    //             'Content-Type': 'application/json',
+    //             'Userurl': $CwebUrl,
+    //             'Origin': $CwebUrl
+    //         }
+    //     });
+    //     const result = await response.json();
+    //     department.value = result.data;
+    // } catch (error) {
+    //     console.error('获取部门数据失败:', error);
+    // }
 })
 //2.搜索 end ---------------------------------------->
 

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

@@ -2,7 +2,7 @@
     <!-- 页面头部 -->
     <HomePageHead></HomePageHead>
     <!-- 导航栏 -->
-    <HomePageNavigation1></HomePageNavigation1>
+    <HomePageNavigation></HomePageNavigation>
     <!-- 列表页广告一 -->
     <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
     <!-- 资讯列表 -->
@@ -53,77 +53,7 @@
                     <p>[免责声明]本文来源于网络转载，仅供学习交流使用，不构成商业目的。 版权归原作者所有，如涉及作品内容，版权和其他问题，请在30日与本网联系，我们将第一时间处理。</p>
                 </div>
                 <div v-if="articleChoice">
-                    <!-- 投票 start ---------------------------------------->
-                    <div class="index_3_box_vote" v-if="articleChoice">
-                        <div class="voteTitle">投票区</div>
-                        <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">
-                                        <el-radio v-for="item in voteList" :key="item.id" :value="item.id" size="large">
-                                            <span v-if="item.is_other == 0">{{item.choice_name}}</span>
-                                            <span v-else>其他</span>
-                                        </el-radio>
-                                    </el-radio-group>
-                                    <el-input
-                                        v-if="showUserChoice"
-                                        v-model="userChoice"
-                                        :rows="2"
-                                        type="textarea"
-                                        resize="none"
-                                        placeholder="请输入.."
-                                    />
-                                </div>
-                                <div class="checkInputBox" v-else>
-                                    <el-checkbox-group v-model="check1" @change="handleCheckboxChange">
-                                        <span v-for="item in voteList" :key="item.id">
-                                            <span v-if="item.is_other == 0">
-                                                <el-checkbox size="large" :label="item.choice_name" :value="item.id"/>
-                                            </span>
-                                            <span v-else>
-                                                <el-checkbox size="large" label="其他" :value="item.id"/>
-                                            </span>
-                                        </span>
-                                    </el-checkbox-group>
-                                    <el-input
-                                        v-if="showUserChoice"
-                                        v-model="userChoice"
-                                        :rows="2"
-                                        type="textarea"
-                                        resize="none"
-                                        placeholder="请输入.."
-                                    />
-                                </div>
-                            </div>
-                            <!--投票结果-->
-                            <div class="inquireData" v-else>
-                                <div v-for="item in websiteSurveyData.data" :key="item.id">
-                                    <div class="inquireDataItem active" v-if="item.status == 1">
-                                        <div class="inquireDataItemTitle">
-                                            <span v-if="item.choice_name == ''">其他</span>
-                                            <span v-else>{{item.choice_name}}</span>
-                                        </div>
-                                        <div class="inquireDataItemNum">{{item.results}}票</div>
-                                    </div>
-                                    <div class="inquireDataItem" v-else>
-                                        <div class="inquireDataItemTitle">
-                                            <span v-if="item.choice_name == ''">其他</span>
-                                            <span v-else>{{item.choice_name}}</span>
-                                        </div>
-                                        <div class="inquireDataItemNum">{{item.results}}票</div>
-                                    </div>
-                                </div>
-                            </div>
-                            </div>
-                            <div class="btn">
-                                <button class="voting" @click="addWebsiteSurvey" :disabled="isDisabled" v-if="!isDisabled">投票</button>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- 投票 end ---------------------------------------->
+                    <HomeSurveyvote></HomeSurveyvote>
                 </div>
             </div>
             <div class="innerRight">
@@ -225,7 +155,6 @@ async function getPageData() {
         if(mkdata.data.is_survey==1){
             console.log("本篇文章含有投票！")
             articleChoice.value = true;
-            getVoteList();
         }
         //获取内容
         newsDetail.value = mkdata.data;
@@ -295,300 +224,6 @@ if(setData.code==200){
 }
 //6.设置seo信息 end---------------------------------------->
 
-//7.投票 start---------------------------------------->
-const radio1 = ref(''); //单选
-const check1 = ref([]); //多选
-const isDisabled = ref(false);//是否禁用提交按钮
-const isRadio = ref(true);//是否渲染单选
-
-const userSurId = ref('');//投票属于哪一篇文章
-const userChoice = ref('');//用于判断用户选择了其他选项以后，输入的值
-const userIsChoice = ref('');//用于判断其他选项目前是什么值
-const showUserChoice = ref(false);//是否显示其他输入框
-const websiteSurveyData = ref([]);//投票结果
-
-//7.1获得投票列表
-let voteList = ref([]);
-async function getVoteList(){
-    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)
-        //判断显示单选还是多选
-        //survey_type 0是单选 1是多选
-        if(voteData.data[0].survey_type == 0){
-            isRadio.value = true;
-            console.log("1111")
-        }else{
-            isRadio.value = false;
-        }
-        //把最后一个的值拿出来 用于判断用户是否选择了其他
-        for(let item of voteData.data){
-            //如果含有其他
-            if(item.is_other==1){
-                userIsChoice.value = item.id;
-            }
-        }
-        //用户投票属于哪一篇文章
-        userSurId.value = voteData.data[0].sur_id;
-
-    }else{
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-        console.log("错误位置：首页投票")
-        console.log("后端错误反馈：",voteData.message)
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->") 
-    }
-}
-
-
-//7.2当用户选择了选项，判断是否展示其他输入框
-const handleRadioChange = (value) => {
-    if(value == userIsChoice.value){
-        showUserChoice.value = true;
-    }else{
-        showUserChoice.value = false;
-    }
-}
-
-const handleCheckboxChange = (value) => {
-    if (value.includes(userIsChoice.value)) {
-        showUserChoice.value = true;
-    } else {
-        showUserChoice.value = false;
-    }
-}
-
-//7.3发起投票
-async function addWebsiteSurvey(){
-    //判断当前是单选还是多选
-    console.log(isRadio.value)
-    if(isRadio.value){
-        console.log("用户单选！")
-        if(radio1.value!=''){
-            //先判断一下是否使用了其他选项
-            if(showUserChoice.value){
-                if(userChoice.value!=''){
-                    //文章id
-                    // console.log(userSurId.value)
-                    // 用户输入的值
-                    // console.log(userChoice.value)
-                    //如果使用了其他，其他的选项需要增加进去
-                    const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
-                        method:'GET',
-                        query:{
-                            'sur_id':userSurId.value,//投票的新闻id
-                            'choice_name':userChoice.value,//投票的选项id
-                        }
-                    });
-                    if(ChoiceData.code == 200){
-                        //提交完其他选项以后，再正式发起投票
-                        const mkData = await requestHome('/web/addWebsiteSurveyVote',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,
-                                'choice_id':ChoiceData.data
-                            }
-                        });
-                        if(mkData.code == 200){
-                            ElMessage.success('投票成功！')
-                            //把投票结果显示到页面上 禁用投票按钮
-                            isDisabled.value = true;
-                            websiteSurveyData.value = mkData.data;
-                            //遍历一下，把用户选中的那个设置status为1
-                            let data = mkData.data;
-                            //遍历一下，把用户选中的那个设置status为1
-                            for(let item of data.data){
-                                for(let i of data.choice){
-                                    if(item.id == i){
-                                        console.log(item.id)
-                                        item.status = 1;
-                                    }
-                                }
-                            }
-                            websiteSurveyData.value = data;
-                        }else{
-                            ElMessage.error(mkData.message)
-                        }
-                    }else{
-                        ElMessage.error('其他投票失败！')
-                    }
-                }else{
-                    ElMessage.error('请输入选项内容！')
-                }
-            }else{
-                //如果没选择其他，直接提交选择的内容
-                const mkData = await requestHome('/web/addWebsiteSurveyVote',{
-                    method:'GET',
-                    query:{
-                        'sur_id':userSurId.value,
-                        'choice_id':radio1.value
-                    }
-                });
-                if(mkData.code == 200){
-                    ElMessage.success('投票成功！')
-                    //把投票结果显示到页面上 禁用投票按钮
-                    isDisabled.value = true;
-                    let data = mkData.data;
-                    //遍历一下，把用户选中的那个设置status为1
-                    for(let item of data.data){
-                        for(let i of data.choice){
-                            if(item.id == i){
-                                item.status = 1;
-                            }
-                        }
-                    }
-                    websiteSurveyData.value = data;
-                }else{
-                    ElMessage.error('投票失败！')
-                }
-            }
-        }else{
-            ElMessage.error('请选择一个选项')
-        }
-    }else{
-        console.log("多选！")
-        //多选
-        if(check1.value!=[]){
-             //先判断一下是否使用了其他选项
-            if(showUserChoice.value){
-                if(userChoice.value!=''){
-                    //判断用户是否只选择了一个其他
-                    if(check1.value.length == 1){
-                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,//投票的新闻id
-                                'choice_name':userChoice.value,//用户输入的其他选项文字
-                            }
-                        });
-                        if(ChoiceData.code == 200){
-                            //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                                method:'GET',
-                                query:{
-                                    'sur_id':userSurId.value,
-                                    'choice_id':ChoiceData.data
-                                }
-                            });
-                            if(mkData.code == 200){
-                                ElMessage.success('投票成功！')
-                                //把投票结果显示到页面上 禁用投票按钮
-                                isDisabled.value = true;
-                                websiteSurveyData.value = mkData.data;
-                                //遍历一下，把用户选中的那个设置status为1
-                                let data = mkData.data;
-                                //遍历一下，把用户选中的那个设置status为1
-                                for(let item of data.data){
-                                    for(let i of data.choice){
-                                        if(item.id == i){
-                                            console.log(item.id)
-                                            item.status = 1;
-                                        }
-                                    }
-                                }
-                                websiteSurveyData.value = data;
-                            }else{
-                                ElMessage.error(mkData.message)
-                            }
-                        }else{
-                            ElMessage.error('其他投票失败！')
-                        }
-
-                    }else{
-                        //用户选择了除了其他以外，还包括别的选项
-                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,//投票的新闻id
-                                'choice_name':userChoice.value,//用户输入的其他选项文字
-                            }
-                        });
-                        if(ChoiceData.code == 200){
-                            let data = check1.value;
-                            //找到多选的数组，把其他默认值给替换掉
-                            for (let i = 0; i < data.length; i++) {
-                                if (data[i] == userIsChoice.value) {
-                                    data[i] = ChoiceData.data;
-                                }
-                            }
-                            let jsonArray = JSON.stringify(data);
-                            //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                                method:'GET',
-                                query:{
-                                    'sur_id':userSurId.value,
-                                    'choice_id':jsonArray
-                                }
-                            });
-                            
-                            if(mkData.code == 200){
-                                ElMessage.success('投票成功！')
-                                //把投票结果显示到页面上 禁用投票按钮
-                                isDisabled.value = true;
-                                websiteSurveyData.value = mkData.data;
-                                //遍历一下，把用户选中的那个设置status为1
-                                let data = mkData.data;
-                                //遍历一下，把用户选中的那个设置status为1
-                                for(let item of data.data){
-                                    for(let i of data.choice){
-                                        if(item.id == i){
-                                            //console.log(item.id)
-                                            item.status = 1;
-                                        }
-                                    }
-                                }
-                                websiteSurveyData.value = data;
-                            }else{
-                                ElMessage.error(mkData.message)
-                            }
-                        }else{
-                            ElMessage.error('其他投票失败！')
-                        }
-
-                    }
-                }else{
-                    ElMessage.error('请输入选项内容！')
-                }
-            }else{
-                let jsonArray = JSON.stringify(check1.value);
-                //如果没选择其他，直接提交选择的内容
-                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                    method:'GET',
-                    query:{
-                        'sur_id':userSurId.value,
-                        'choice_id':jsonArray
-                    }
-                });
-                if(mkData.code == 200){
-                    ElMessage.success('投票成功！')
-                    //把投票结果显示到页面上 禁用投票按钮
-                    isDisabled.value = true;
-                    websiteSurveyData.value = mkData.data;
-                    //遍历一下，把用户选中的那个设置status为1
-                    let data = mkData.data;
-                    //遍历一下，把用户选中的那个设置status为1
-                    for(let item of data.data){
-                        for(let i of data.choice){
-                            if(item.id == i){
-                                console.log(item.id)
-                                item.status = 1;
-                            }
-                        }
-                    }
-                    websiteSurveyData.value = data;
-                }else{
-                    ElMessage.error('投票失败！')
-                }
-            }
-        }else{
-            ElMessage.error('请选择一个选项')
-        }
-    }
-}
-//7.投票 end---------------------------------------->
-
 //8.页面图片放大 start---------------------------------------->
 const previewVisible = ref(false)
 const selectedImage = ref(' ')

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

@@ -3,7 +3,7 @@
         <!-- 页面头部 -->
         <HomePageHead></HomePageHead>
         <!-- 导航栏 -->
-        <HomePageNavigation1></HomePageNavigation1>
+        <HomePageNavigation></HomePageNavigation>
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
         <!-- 二级标题-->

pages/[dir]/[id].vue

@@ -2,7 +2,7 @@
     <!-- 页面头部 -->
     <HomePageHead></HomePageHead>
     <!-- 导航栏 -->
-    <HomePageNavigation1></HomePageNavigation1>
+    <HomePageNavigation></HomePageNavigation>
     <!-- 列表页广告一 -->
     <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
     
@@ -51,77 +51,7 @@
                     <p>[免责声明]本文来源于网络转载，仅供学习交流使用，不构成商业目的。 版权归原作者所有，如涉及作品内容，版权和其他问题，请在30日与本网联系，我们将第一时间处理。</p>
                 </div>
                 <div v-if="articleChoice">
-                    <!-- 投票 start ---------------------------------------->
-                    <div class="index_3_box_vote" v-if="articleChoice">
-                        <div class="voteTitle">投票区</div>
-                        <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">
-                                        <el-radio v-for="item in voteList" :key="item.id" :value="item.id" size="large">
-                                            <span v-if="item.is_other == 0">{{item.choice_name}}</span>
-                                            <span v-else>其他</span>
-                                        </el-radio>
-                                    </el-radio-group>
-                                    <el-input
-                                        v-if="showUserChoice"
-                                        v-model="userChoice"
-                                        :rows="2"
-                                        type="textarea"
-                                        resize="none"
-                                        placeholder="请输入.."
-                                    />
-                                </div>
-                                <div class="checkInputBox" v-else>
-                                    <el-checkbox-group v-model="check1" @change="handleCheckboxChange">
-                                        <span v-for="item in voteList" :key="item.id">
-                                            <span v-if="item.is_other == 0">
-                                                <el-checkbox size="large" :label="item.choice_name" :value="item.id"/>
-                                            </span>
-                                            <span v-else>
-                                                <el-checkbox size="large" label="其他" :value="item.id"/>
-                                            </span>
-                                        </span>
-                                    </el-checkbox-group>
-                                    <el-input
-                                        v-if="showUserChoice"
-                                        v-model="userChoice"
-                                        :rows="2"
-                                        type="textarea"
-                                        resize="none"
-                                        placeholder="请输入.."
-                                    />
-                                </div>
-                            </div>
-                            <!--投票结果-->
-                            <div class="inquireData" v-else>
-                                <div v-for="item in websiteSurveyData.data" :key="item.id">
-                                    <div class="inquireDataItem active" v-if="item.status == 1">
-                                        <div class="inquireDataItemTitle">
-                                            <span v-if="item.choice_name == ''">其他</span>
-                                            <span v-else>{{item.choice_name}}</span>
-                                        </div>
-                                        <div class="inquireDataItemNum">{{item.results}}票</div>
-                                    </div>
-                                    <div class="inquireDataItem" v-else>
-                                        <div class="inquireDataItemTitle">
-                                            <span v-if="item.choice_name == ''">其他</span>
-                                            <span v-else>{{item.choice_name}}</span>
-                                        </div>
-                                        <div class="inquireDataItemNum">{{item.results}}票</div>
-                                    </div>
-                                </div>
-                            </div>
-                            </div>
-                            <div class="btn">
-                                <button class="voting" @click="addWebsiteSurvey" :disabled="isDisabled" v-if="!isDisabled">投票</button>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- 投票 end ---------------------------------------->
+                    <HomeSurveyvote></HomeSurveyvote>
                 </div>
             </div>
             <div class="innerRight">
@@ -143,7 +73,7 @@
 <script setup>
 //1.页面依赖 start ---------------------------------------->
 import { onMounted } from 'vue'
-import { ElBreadcrumb, ElBreadcrumbItem,ElRadio, ElRadioGroup,ElCheckbox,ElCheckboxGroup,ElMessage,ElInput } from 'element-plus'
+import { ElBreadcrumb, ElBreadcrumbItem} from 'element-plus'
 import { ArrowRight } from '@element-plus/icons-vue'
 //1.页面依赖 end ---------------------------------------->
 
@@ -216,7 +146,7 @@ async function getPageData() {
         if(mkdata.data.is_survey==1){
             console.log("本篇文章含有投票！")
             articleChoice.value = true;
-            getVoteList();
+            
         }
         //获取内容
         newsDetail.value = mkdata.data;
@@ -286,299 +216,7 @@ if(setData.code==200){
 }
 //6.设置seo信息 end---------------------------------------->
 
-//7.投票 start---------------------------------------->
-const radio1 = ref(''); //单选
-const check1 = ref([]); //多选
-const isDisabled = ref(false);//是否禁用提交按钮
-const isRadio = ref(true);//是否渲染单选
-
-const userSurId = ref('');//投票属于哪一篇文章
-const userChoice = ref('');//用于判断用户选择了其他选项以后，输入的值
-const userIsChoice = ref('');//用于判断其他选项目前是什么值
-const showUserChoice = ref(false);//是否显示其他输入框
-const websiteSurveyData = ref([]);//投票结果
 
-//7.2获得投票列表
-let voteList = ref([]);
-async function getVoteList(){
-    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)
-        //判断显示单选还是多选
-        //survey_type 0是单选 1是多选
-        if(voteData.data[0].survey_type == 0){
-            isRadio.value = true;
-            console.log("1111")
-        }else{
-            isRadio.value = false;
-        }
-        //把最后一个的值拿出来 用于判断用户是否选择了其他
-        for(let item of voteData.data){
-            //如果含有其他
-            if(item.is_other==1){
-                userIsChoice.value = item.id;
-            }
-        }
-        //用户投票属于哪一篇文章
-        userSurId.value = voteData.data[0].sur_id;
-
-    }else{
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-        console.log("错误位置：首页投票")
-        console.log("后端错误反馈：",voteData.message)
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->") 
-    }
-}
-
-
-//7.3当用户选择了选项，判断是否展示其他输入框
-const handleRadioChange = (value) => {
-    if(value == userIsChoice.value){
-        showUserChoice.value = true;
-    }else{
-        showUserChoice.value = false;
-    }
-}
-
-const handleCheckboxChange = (value) => {
-    if (value.includes(userIsChoice.value)) {
-        showUserChoice.value = true;
-    } else {
-        showUserChoice.value = false;
-    }
-}
-
-//7.4发起投票
-async function addWebsiteSurvey(){
-    //判断当前是单选还是多选
-    console.log(isRadio.value)
-    if(isRadio.value){
-        console.log("用户单选！")
-        if(radio1.value!=''){
-            //先判断一下是否使用了其他选项
-            if(showUserChoice.value){
-                if(userChoice.value!=''){
-                    //文章id
-                    // console.log(userSurId.value)
-                    // 用户输入的值
-                    // console.log(userChoice.value)
-                    //如果使用了其他，其他的选项需要增加进去
-                    const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
-                        method:'GET',
-                        query:{
-                            'sur_id':userSurId.value,//投票的新闻id
-                            'choice_name':userChoice.value,//投票的选项id
-                        }
-                    });
-                    if(ChoiceData.code == 200){
-                        //提交完其他选项以后，再正式发起投票
-                        const mkData = await requestHome('/web/addWebsiteSurveyVote',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,
-                                'choice_id':ChoiceData.data
-                            }
-                        });
-                        if(mkData.code == 200){
-                            ElMessage.success('投票成功！')
-                            //把投票结果显示到页面上 禁用投票按钮
-                            isDisabled.value = true;
-                            websiteSurveyData.value = mkData.data;
-                            //遍历一下，把用户选中的那个设置status为1
-                            let data = mkData.data;
-                            //遍历一下，把用户选中的那个设置status为1
-                            for(let item of data.data){
-                                for(let i of data.choice){
-                                    if(item.id == i){
-                                        console.log(item.id)
-                                        item.status = 1;
-                                    }
-                                }
-                            }
-                            websiteSurveyData.value = data;
-                        }else{
-                            ElMessage.error(mkData.message)
-                        }
-                    }else{
-                        ElMessage.error('其他投票失败！')
-                    }
-                }else{
-                    ElMessage.error('请输入选项内容！')
-                }
-            }else{
-                //如果没选择其他，直接提交选择的内容
-                const mkData = await requestHome('/web/addWebsiteSurveyVote',{
-                    method:'GET',
-                    query:{
-                        'sur_id':userSurId.value,
-                        'choice_id':radio1.value
-                    }
-                });
-                if(mkData.code == 200){
-                    ElMessage.success('投票成功！')
-                    //把投票结果显示到页面上 禁用投票按钮
-                    isDisabled.value = true;
-                    let data = mkData.data;
-                    //遍历一下，把用户选中的那个设置status为1
-                    for(let item of data.data){
-                        for(let i of data.choice){
-                            if(item.id == i){
-                                item.status = 1;
-                            }
-                        }
-                    }
-                    websiteSurveyData.value = data;
-                }else{
-                    ElMessage.error('投票失败！')
-                }
-            }
-        }else{
-            ElMessage.error('请选择一个选项')
-        }
-    }else{
-        console.log("多选！")
-        //多选
-        if(check1.value!=[]){
-             //先判断一下是否使用了其他选项
-            if(showUserChoice.value){
-                if(userChoice.value!=''){
-                    //判断用户是否只选择了一个其他
-                    if(check1.value.length == 1){
-                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,//投票的新闻id
-                                'choice_name':userChoice.value,//用户输入的其他选项文字
-                            }
-                        });
-                        if(ChoiceData.code == 200){
-                            //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                                method:'GET',
-                                query:{
-                                    'sur_id':userSurId.value,
-                                    'choice_id':ChoiceData.data
-                                }
-                            });
-                            if(mkData.code == 200){
-                                ElMessage.success('投票成功！')
-                                //把投票结果显示到页面上 禁用投票按钮
-                                isDisabled.value = true;
-                                websiteSurveyData.value = mkData.data;
-                                //遍历一下，把用户选中的那个设置status为1
-                                let data = mkData.data;
-                                //遍历一下，把用户选中的那个设置status为1
-                                for(let item of data.data){
-                                    for(let i of data.choice){
-                                        if(item.id == i){
-                                            console.log(item.id)
-                                            item.status = 1;
-                                        }
-                                    }
-                                }
-                                websiteSurveyData.value = data;
-                            }else{
-                                ElMessage.error(mkData.message)
-                            }
-                        }else{
-                            ElMessage.error('其他投票失败！')
-                        }
-
-                    }else{
-                        //用户选择了除了其他以外，还包括别的选项
-                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,//投票的新闻id
-                                'choice_name':userChoice.value,//用户输入的其他选项文字
-                            }
-                        });
-                        if(ChoiceData.code == 200){
-                            let data = check1.value;
-                            //找到多选的数组，把其他默认值给替换掉
-                            for (let i = 0; i < data.length; i++) {
-                                if (data[i] == userIsChoice.value) {
-                                    data[i] = ChoiceData.data;
-                                }
-                            }
-                            let jsonArray = JSON.stringify(data);
-                            //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                                method:'GET',
-                                query:{
-                                    'sur_id':userSurId.value,
-                                    'choice_id':jsonArray
-                                }
-                            });
-                            
-                            if(mkData.code == 200){
-                                ElMessage.success('投票成功！')
-                                //把投票结果显示到页面上 禁用投票按钮
-                                isDisabled.value = true;
-                                websiteSurveyData.value = mkData.data;
-                                //遍历一下，把用户选中的那个设置status为1
-                                let data = mkData.data;
-                                //遍历一下，把用户选中的那个设置status为1
-                                for(let item of data.data){
-                                    for(let i of data.choice){
-                                        if(item.id == i){
-                                            //console.log(item.id)
-                                            item.status = 1;
-                                        }
-                                    }
-                                }
-                                websiteSurveyData.value = data;
-                            }else{
-                                ElMessage.error(mkData.message)
-                            }
-                        }else{
-                            ElMessage.error('其他投票失败！')
-                        }
-
-                    }
-                }else{
-                    ElMessage.error('请输入选项内容！')
-                }
-            }else{
-                let jsonArray = JSON.stringify(check1.value);
-                //如果没选择其他，直接提交选择的内容
-                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                    method:'GET',
-                    query:{
-                        'sur_id':userSurId.value,
-                        'choice_id':jsonArray
-                    }
-                });
-                if(mkData.code == 200){
-                    ElMessage.success('投票成功！')
-                    //把投票结果显示到页面上 禁用投票按钮
-                    isDisabled.value = true;
-                    websiteSurveyData.value = mkData.data;
-                    //遍历一下，把用户选中的那个设置status为1
-                    let data = mkData.data;
-                    //遍历一下，把用户选中的那个设置status为1
-                    for(let item of data.data){
-                        for(let i of data.choice){
-                            if(item.id == i){
-                                console.log(item.id)
-                                item.status = 1;
-                            }
-                        }
-                    }
-                    websiteSurveyData.value = data;
-                }else{
-                    ElMessage.error('投票失败！')
-                }
-            }
-        }else{
-            ElMessage.error('请选择一个选项')
-        }
-    }
-}
-//7.投票 end---------------------------------------->
 
 //8.页面图片放大 start---------------------------------------->
 const previewVisible = ref(false)

pages/[dir]/index.html.vue

@@ -5,76 +5,135 @@
         <HomeSecondaryHeading :titleData="pageData" :pinyinid="routeId"></HomeSecondaryHeading>
         <!-- 频道页 -->
         <main class="index_main">
-            
+            <!--板块1-->
             <section class="channel_1 clearfix">
                 <div class="channel_1_left">
                     <div class="channel_1_box">
-                        <HomeSwiperSnscChannel></HomeSwiperSnscChannel>
+                        <HomeSwiperSnscChannel :data="pageData[0].data"></HomeSwiperSnscChannel>
                     </div>
                 </div>
                 <div class="channel_1_right">
                     <div class="channel_name_ul">
-                        <div class="channel_name_ul_li" v-for="(per_obj, per_index) in 10" :key="per_obj">
-                            <a class="channel_name_ul_li_tag" href="" title="">民工动态</a>
-                            <a class="channel_name_ul_li_dot1 dot1" href="" title="">民工动态民工动态民工动态民工动态民工动态民工动态民工动态</a>
+                        <div class="channel_name_ul_li" v-for="item in pageData[0].data2">
+                            <NuxtLink class="channel_name_ul_li_tag"
+                                :href="getLinkPathDetail(item)"
+                                :title="item.title"
+                                :key="item.id"
+                                :target="item.islink == 1 ? '_blank' : '_self'"
+                            >
+                                民工动态
+                            </NuxtLink>
+                            <NuxtLink class="channel_name_ul_li_dot1 dot1"
+                                :href="getLinkPathDetail(item)"
+                                :title="item.title"
+                                :key="item.id"
+                                :target="item.islink == 1 ? '_blank' : '_self'"
+                            >
+                                {{item.title}}
+                            </NuxtLink>
                         </div>
                     </div>
                 </div>
             </section>
+            <!--板块2-->
             <section class="channel_2 clearfix">
                 <div class="channel_1_left clearfix">
                     <!--open 商贸活动-->
                     <div class="channel_head">
-                        <div class="channel_head_name">商贸活动</div>
-                        <a class="channel_head_more" href="" title=""> 栏目简介 </a>
+                        <NuxtLink class="channel_head_name" 
+                            :href="getLinkPath(pageData[1])" 
+                            v-if="pageData[1]" 
+                            :title="pageData[1].alias"
+                        >
+                            {{ pageData[1].alias }}
+                        </NuxtLink>
+                        <NuxtLink class="channel_head_more" 
+                            :href="getLinkPath(pageData[1])" 
+                            v-if="pageData[1]" 
+                            :title="pageData[1].alias"
+                        >
+                            栏目简介
+                        </NuxtLink>
                     </div>
                     <div class=" clearfix">
                         <div class="channel_1_box_1 clearfix">
                             <div class="channel_img_big_1_ul">
-                                <div class="channel_img_big_1_li" v-for="(per_obj, per_index) in 1" :key="per_obj">
-                                    <a class="channel_img_big_1_li_a" href="" title="">
-                                        <img class="channel_img_big_1_li_img" src="../../public/img/8.png" title="" alt="">
+                                <div class="channel_img_big_1_li" v-for="item in pageData[1].data">
+                                    <NuxtLink class="channel_img_big_1_li_a"
+                                        :href="getLinkPathDetail(item)"
+                                        :title="item.title"
+                                        :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'"
+                                    >
+                                        <img class="channel_img_big_1_li_img" :src="item.imgurl" alt="item.title">
                                         <div class="channel_img_big_1_li_dot1 dot1">
-                                            农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
+                                            {{ item.title }}
                                         </div>
-                                    </a>
+                                    </NuxtLink>
                                 </div>
                             </div>
                         </div>
                         <div class="channel_1_box_2 clearfix">
                             <div class="channel_ul_2">
-                                <a class="channel_ul_2_a dot1" href="" title="" v-for="(per_obj, per_index) in 6"
-                                    :key="per_obj">
-                                    农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
-                                </a>
+                                <NuxtLink class="channel_ul_2_a dot1"
+                                    :href="getLinkPathDetail(item)"
+                                    :title="item.title"
+                                    v-for="item in pageData[1].data2"
+                                    :key="item.id"
+                                    :target="item.islink == 1 ? '_blank' : '_self'"
+                                >
+                                    {{ item.title }}
+                                </NuxtLink>
                             </div>
                         </div>
                     </div>
                     <!--end 商贸活动-->
                     <!--open 科教活动-->
                     <div class="channel_head">
-                        <div class="channel_head_name">科教活动</div>
-                        <a class="channel_head_more" href="" title=""> 栏目简介 </a>
+                        <NuxtLink class="channel_head_name" 
+                            :href="getLinkPath(pageData[2])" 
+                            v-if="pageData[2]" 
+                            :title="pageData[2].alias"
+                        >
+                            {{ pageData[2].alias }}
+                        </NuxtLink>
+                        <NuxtLink class="channel_head_more" 
+                            :href="getLinkPath(pageData[2])" 
+                            v-if="pageData[2]" 
+                            :title="pageData[2].alias"
+                        >
+                            栏目简介
+                        </NuxtLink>
                     </div>
                     <div class=" clearfix">
                         <div class="channel_1_box_1 clearfix">
                             <div class="channel_img_big_2_ul">
-                                <div class="channel_img_big_2_li" v-for="(per_obj, per_index) in 1" :key="per_obj">
-                                    <a class="channel_img_big_2_li_a" href="" title="">
-                                        <img class="channel_img_big_2_li_img" src="../../public/img/8.png" title="" alt="">
+                                <div class="channel_img_big_2_li" v-for="item in pageData[2].data">
+                                    <NuxtLink class="channel_img_big_2_li_a"
+                                        :href="getLinkPathDetail(item)"
+                                        :title="item.title"
+                                        :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'"
+                                    >
+                                        <img class="channel_img_big_2_li_img" :src="item.imgurl" alt="item.title">
                                         <div class="channel_img_big_2_li_dot1 dot1">
-                                            农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
+                                            {{ item.title }}
                                         </div>
-                                    </a>
+                                    </NuxtLink>
                                 </div>
                             </div>
                         </div>
                         <div class="channel_1_box_2 clearfix">
                             <div class="channel_ul_3">
-                                <a class="channel_ul_3_a dot1" href="" title="" v-for="(per_obj, per_index) in 6"
-                                    :key="per_obj">
-                                    农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
-                                </a>
+                                <NuxtLink class="channel_ul_3_a dot1"
+                                    :href="getLinkPathDetail(item)"
+                                    :title="item.title"
+                                    v-for="item in pageData[2].data2"
+                                    :key="item.id"
+                                    :target="item.islink == 1 ? '_blank' : '_self'"
+                                >
+                                    {{ item.title }}
+                                </NuxtLink>
                             </div>
                         </div>
                     </div>
@@ -83,68 +142,120 @@
                 <div class="channel_1_right clearfix">
                     <!--open 产业动态-->
                     <div class="channel_head">
-                        <div class="channel_head_name">产业动态</div>
-                        <a class="channel_head_more" href="" title=""> 栏目简介 </a>
+                        <NuxtLink class="channel_head_name" 
+                            :href="getLinkPath(pageData[3])" 
+                            v-if="pageData[3]" 
+                            :title="pageData[3].alias"
+                        >
+                            {{ pageData[3].alias }}
+                        </NuxtLink>
+                        <NuxtLink class="channel_head_more" 
+                            :href="getLinkPath(pageData[3])" 
+                            v-if="pageData[3]" 
+                            :title="pageData[3].alias"
+                        >
+                            栏目简介
+                        </NuxtLink>
                     </div>
                     <div class="channel_img_big_3_ul clearfix">
-                        <div class="channel_img_big_3_li" v-for="(per_obj, per_index) in 1" :key="per_obj">
-                            <a class="channel_img_big_3_li_a" href="" title="">
-                                <img class="channel_img_big_3_li_img" src="../../public/img/9.png" title="" alt="">
+                        <div class="channel_img_big_3_li" v-for="item in pageData[3].data">
+                            <NuxtLink class="channel_img_big_3_li_a"
+                                :href="getLinkPathDetail(item)"
+                                :title="item.title"
+                                :key="item.id"
+                                :target="item.islink == 1 ? '_blank' : '_self'"
+                            >
+                                <img class="channel_img_big_3_li_img" :src="item.imgurl" alt="item.title">
                                 <div class="channel_img_big_3_li_dot1 dot1">
-                                    特产商城特产商城特产商城特产商城特产商城特产商城特产商城特产商城特产商城</div>
-                            </a>
+                                    {{ item.title }}
+                                </div>
+                            </NuxtLink>
                         </div>
                     </div>
                     <div class="channel_ul_4">
-                        <div class="channel_ul_4_li dot1" v-for="(per_obj, per_index) in 6" :key="per_obj">
-                            <div class="channel_ul_4_li_num">{{ per_index + 1 }}</div>
-                            <a class="channel_ul_4_a dot1" href="" title="">农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权</a>
+                        <div class="channel_ul_4_li dot1" v-for="(item, index) in pageData[3].data2">
+                            <div class="channel_ul_4_li_num">{{ index + 1 }}</div>
+                            <NuxtLink class="channel_img_big_3_li_a"
+                                :href="getLinkPathDetail(item)"
+                                :title="item.title"
+                                :key="item.id"
+                                :target="item.islink == 1 ? '_blank' : '_self'"
+                            >
+                                <div class="channel_ul_4_a dot1">
+                                    {{ item.title }}
+                                </div>
+                            </NuxtLink>
                         </div>
                     </div>
                     <!--end 产业动态-->
                 </div>
             </section>
-            <div class="channel_banner">
-                <a class="channel_banner_a" href="" title="">
-                    <img class="channel_banner_img" src="../../public/img/3.png" title="" alt="">
-                </a>
-            </div>
+            <!--广告1-->
+            <HomeAdvertising :data="adImg1"></HomeAdvertising>
+            
             <section class="channel_3 clearfix">
                 <!--open 农贸节庆-->
                 <div class="channel_1_left clearfix">
                     <div class="channel_head">
-                        <div class="channel_head_name">农贸节庆</div>
-                        <a class="channel_head_more" href="" title=""> 栏目简介 </a>
+                        <NuxtLink class="channel_head_name" 
+                            :href="getLinkPath(pageData[4])" 
+                            v-if="pageData[4]" 
+                            :title="pageData[4].alias"
+                        >
+                            {{ pageData[4].alias }}
+                        </NuxtLink>
+                        <NuxtLink class="channel_head_more" 
+                            :href="getLinkPath(pageData[4])" 
+                            v-if="pageData[4]" 
+                            :title="pageData[4].alias"
+                        >
+                            栏目简介
+                        </NuxtLink>
                     </div>
                     <div class=" clearfix">
                         <div class="channel_1_box_1 clearfix">
                             <div class="channel_img_big_4_ul">
-                                <div class="channel_img_big_4_li" v-for="(per_obj, per_index) in 1" :key="per_obj">
-                                    <a class="channel_img_big_4_li_a" href="" title="">
-                                        <img class="channel_img_big_4_li_img" src="../../public/img/8.png" title="" alt="">
+                                <div class="channel_img_big_4_li" v-for="item in pageData[4].data">
+                                    <NuxtLink class="channel_img_big_4_li"
+                                        :href="getLinkPathDetail(item)"
+                                        :title="item.title"
+                                        :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'"
+                                    >
+                                        <img class="channel_img_big_4_li_img" :src="item.imgurl" alt="item.title">
                                         <div class="channel_img_big_4_li_dot2 dot2">
-                                            农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
+                                            {{ item.title }}
                                         </div>
-                                    </a>
+                                    </NuxtLink>
                                 </div>
                             </div>
                             <div class="channel_img_ul_1 clearfix">
-                                <div class="channel_img_ul_1_li" v-for="(per_obj, per_index) in 2" :key="per_obj">
-                                    <a class="channel_img_ul_1_li_a" href="" title="">
-                                        <img class="channel_img_ul_1_li_img" src="../../public/img/9.png" title="" alt="">
+                                <div class="channel_img_ul_1_li" v-for="item in pageData[4].data2">
+                                    <NuxtLink class="channel_img_ul_1_li_a"
+                                        :href="getLinkPathDetail(item)"
+                                        :title="item.title"
+                                        :key="item.id"
+                                        :target="item.islink == 1 ? '_blank' : '_self'"
+                                    >
+                                        <img class="channel_img_ul_1_li_img" :src="item.imgurl" alt="item.title">
                                         <div class="channel_img_ul_1_li_dot2 dot2">
-                                            农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
+                                            {{ item.title }}
                                         </div>
-                                    </a>
+                                    </NuxtLink>
                                 </div>
                             </div>
                         </div>
                         <div class="channel_1_box_2 clearfix">
                             <div class="channel_ul_5">
-                                <a class="channel_ul_5_a dot1" href="" title="" v-for="(per_obj, per_index) in 10"
-                                    :key="per_obj">
-                                    农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
-                                </a>
+                                <NuxtLink class="channel_ul_5_a dot1"
+                                    :href="getLinkPathDetail(item)"
+                                    v-for="item in pageData[4].data3"
+                                    :title="item.title"
+                                    :key="item.id"
+                                    :target="item.islink == 1 ? '_blank' : '_self'"
+                                >
+                                    {{ item.title }}
+                                </NuxtLink>
                             </div>
                         </div>
                     </div>
@@ -153,23 +264,46 @@
                 <!--open 市场行情-->
                 <div class="channel_1_right clearfix">
                     <div class="channel_head">
-                        <div class="channel_head_name">市场行情</div>
-                        <a class="channel_head_more" href="" title=""> 栏目简介 </a>
+                        <NuxtLink class="channel_head_name" 
+                            :href="getLinkPath(pageData[5])" 
+                            v-if="pageData[5]" 
+                            :title="pageData[5].alias"
+                        >
+                            {{ pageData[5].alias }}
+                        </NuxtLink>
+                        <NuxtLink class="channel_head_more" 
+                            :href="getLinkPath(pageData[5])" 
+                            v-if="pageData[5]" 
+                            :title="pageData[5].alias"
+                        >
+                            栏目简介
+                        </NuxtLink>
                     </div>
                     <div class="channel_img_ul_2 clearfix">
-                        <div class="channel_img_ul_2_li" v-for="(per_obj, per_index) in 2" :key="per_obj">
-                            <a class="channel_img_ul_2_li_a" href="" title="">
-                                <img class="channel_img_ul_2_li_img" src="../../public/img/9.png" title="" alt="">
+                        <div class="channel_img_ul_2_li" v-for="item in pageData[5].data">
+                            <NuxtLink class="channel_img_ul_2_li"
+                                :href="getLinkPathDetail(item)"
+                                :title="item.title"
+                                :key="item.id"
+                                :target="item.islink == 1 ? '_blank' : '_self'"
+                            >
+                                <img class="channel_img_ul_2_li_img" :src="item.imgurl" alt="item.title">
                                 <div class="channel_img_ul_2_li_dot1 dot1">
-                                    农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权</div>
-                            </a>
+                                    {{ item.title }}
+                                </div>
+                            </NuxtLink>
                         </div>
                     </div>
                     <div class="channel_ul_6">
-                        <a class="channel_ul_6_a dot1" href="" title="" v-for="(per_obj, per_index) in 6"
-                            :key="per_obj">
-                            农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
-                        </a>
+                        <NuxtLink class="channel_ul_6_a dot1"
+                            :href="getLinkPathDetail(item)"
+                            :title="item.title"
+                            v-for="item in pageData[5].data2"
+                            :key="item.id"
+                            :target="item.islink == 1 ? '_blank' : '_self'"
+                        >
+                            {{ item.title }}
+                        </NuxtLink>
                     </div>
                     <!--end 市场行情-->
                 </div>
@@ -178,30 +312,64 @@
                 <div class="channel_1_left clearfix">
                     <!--open 业界交流-->
                     <div class="channel_head">
-                        <div class="channel_head_name">业界交流</div>
-                        <a class="channel_head_more" href="" title=""> 栏目简介 </a>
+                        <NuxtLink class="channel_head_name" 
+                            :href="getLinkPath(pageData[6])" 
+                            v-if="pageData[6]" 
+                            :title="pageData[6].alias"
+                        >
+                            {{ pageData[6].alias }}
+                        </NuxtLink>
+                        <NuxtLink class="channel_head_more" 
+                            :href="getLinkPath(pageData[6])" 
+                            v-if="pageData[6]" 
+                            :title="pageData[6].alias"
+                        >
+                            栏目简介
+                        </NuxtLink>
                     </div>
                     <div class="channel_ul_7">
-                        <a class="channel_ul_7_a dot1" href="" title="" v-for="(per_obj, per_index) in 6"
-                            :key="per_obj">
-                            农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
-                        </a>
+                        <NuxtLink class="channel_ul_7_a dot1"
+                            :href="getLinkPathDetail(item)"
+                            :title="item.title"
+                            v-for="item in pageData[6].data"
+                            :key="item.id"
+                            :target="item.islink == 1 ? '_blank' : '_self'"
+                        >
+                            {{ item.title }}
+                        </NuxtLink>
                     </div>
                     <!--end 业界交流-->
                 </div>
                 <!--open 主题活动-->
                 <div class="channel_1_right clearfix">
                     <div class="channel_head">
-                        <div class="channel_head_name">主题活动</div>
-                        <a class="channel_head_more" href="" title=""> 栏目简介 </a>
+                        <NuxtLink class="channel_head_name" 
+                            :href="getLinkPath(pageData[7])" 
+                            v-if="pageData[7]" 
+                            :title="pageData[7].alias"
+                        >
+                            {{ pageData[7].alias }}
+                        </NuxtLink>
+                        <NuxtLink class="channel_head_more" 
+                            :href="getLinkPath(pageData[7])" 
+                            v-if="pageData[7]" 
+                            :title="pageData[7].alias"
+                        >
+                            栏目简介
+                        </NuxtLink>
                     </div>
                     <div class="channel_img_big_5_ul">
-                        <div class="channel_img_big_5_li" v-for="(per_obj, per_index) in 1" :key="per_obj">
-                            <a class="channel_img_big_5_li_a" href="" title="">
-                                <img class="channel_img_big_5_li_img" src="../../public/img/8.png" title="" alt="">
-                                <div class="channel_img_big_5_li_dot2 dot2">
-                                    农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权</div>
-                            </a>
+                        <div class="channel_img_big_5_li" v-for="item in pageData[7].data">
+                            <NuxtLink class="channel_img_big_5_li_a"
+                                :href="getLinkPathDetail(item)"
+                                :title="item.title"
+                                v-for="item in pageData[7].data"
+                                :key="item.id"
+                                :target="item.islink == 1 ? '_blank' : '_self'"
+                            > 
+                                <img class="channel_img_big_5_li_img" :src="item.imgurl" alt="item.title">
+                                <div class="channel_img_big_5_li_dot2 dot2">{{ item.title }}</div>
+                            </NuxtLink>
                         </div>
                     </div>
                     <!--end 主题活动-->
@@ -368,23 +536,20 @@ 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,10" },//模块1 顶部没有标题的那个
+            { "parent": routeId + ",0,0", "child": pageData.value[1].cid + ",1,6" },//模块2
+            { "parent": routeId + ",0,0", "child": pageData.value[2].cid + ",1,6" },//模块3
+            { "parent": routeId + ",0,0", "child": pageData.value[3].cid + ",1,6" },//模块4
+            { "parent": routeId + ",0,0", "child": pageData.value[4].cid + ",3,10" },//模块5
+            { "parent": routeId + ",0,0", "child": pageData.value[5].cid + ",2,6" },//模块6
+            { "parent": routeId + ",0,0", "child": pageData.value[6].cid + ",0,6" },//模块7
+            { "parent": routeId + ",0,0", "child": pageData.value[7].cid + ",1,0" },//模块8
         ]
         let jsonString = JSON.stringify(getJson);
         getPageAllData(jsonString);
 
     } else {
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-        console.log("错误位置：分类页导航池")
-        console.log("后端错误反馈：", navigateData.message)
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
+        console.log("错误：渲染8个模块环节出错，请检查是否存在没有数据的模块！")
     }
 } catch (error) {
     console.log("错误：导航池渲染执行接口出错！请检查频道页渲染的模块数据是否完整！")
@@ -400,35 +565,34 @@ async function getPageAllData(jsonString) {
     });
 
     if (mkdata.code == 200) {
-        //模块1
+        //模块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){
-                pageData.value[1].data.push(mkdata.data[1].child.imgnum[index]);
-            }else{
-                pageData.value[1].data2.push(mkdata.data[1].child.imgnum[index]);
-            }
-        }
-        pageData.value[1].data3 = mkdata.data[1].child.textnum;
+        pageData.value[1].data = mkdata.data[1].child.imgnum;
+        pageData.value[1].data2 = mkdata.data[1].child.textnum;
         //模块3
-        for(let index in mkdata.data[2].child.imgnum){
-            if(index<=1){
-                pageData.value[2].data.push(mkdata.data[2].child.imgnum[index]);
+        pageData.value[2].data = mkdata.data[2].child.imgnum;
+        pageData.value[2].data2 = mkdata.data[2].child.textnum;
+        //模块4
+        pageData.value[3].data = mkdata.data[3].child.imgnum;
+        pageData.value[3].data2 = mkdata.data[3].child.textnum;
+        //模块5
+        for(let index in mkdata.data[4].child.imgnum){
+            if(index<1){
+                pageData.value[4].data.push(mkdata.data[4].child.imgnum[index]);
             }else{
-                pageData.value[2].data2.push(mkdata.data[2].child.imgnum[index]);
+                pageData.value[4].data2.push(mkdata.data[4].child.imgnum[index]);
             }
         }
-        pageData.value[2].data3 = mkdata.data[2].child.textnum;
-        //模块4
-        pageData.value[3].data = mkdata.data[3].child.textnum;
-        pageData.value[3].data2 = mkdata.data[3].child.imgnum;
-        //模块5
-        pageData.value[4].data = mkdata.data[4].child.textnum;
-        pageData.value[4].data2 = mkdata.data[4].child.imgnum;
+        pageData.value[4].data3 = mkdata.data[4].child.textnum;
         //模块6
-        pageData.value[5].data = mkdata.data[5].child.textnum;
+        pageData.value[5].data = mkdata.data[5].child.imgnum;
+        pageData.value[5].data2 = mkdata.data[5].child.textnum;
+        //模块7
+        pageData.value[6].data = mkdata.data[6].child.textnum;
+        //模块8
+        pageData.value[7].data = mkdata.data[7].child.imgnum;
 
     } else {
         ElMessage.error(mkdata.message)

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

@@ -3,7 +3,7 @@
         <!-- 页面头部 -->
         <HomePageHead></HomePageHead>
         <!-- 导航栏 -->
-        <HomePageNavigation1></HomePageNavigation1>
+        <HomePageNavigation></HomePageNavigation>
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
         <!-- 资讯列表 -->
@@ -21,7 +21,7 @@
                                 <el-breadcrumb-item v-if="parent_name !=''">
                                     <NuxtLink :to="`/${parent_pinyin}/index.html`"> {{ parent_name }}</NuxtLink>
                                 </el-breadcrumb-item>
-                                <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
+                                <el-breadcrumb-item class="nameBox">{{ name }}</el-breadcrumb-item>
                             </el-breadcrumb>
                         </div>
                     </div>

pages/search/[id].vue

@@ -29,10 +29,10 @@
                 <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 }}
                             </NuxtLink>
+                            <span class="time right">{{getTime(item.updated_at,'month',1)}}</span>
                         </li>
                     </ul>
                     <div v-if="newsList.length == 0" class="empty">
@@ -76,13 +76,18 @@ import { ref, onMounted } from 'vue';
 //2.获取url中的参数 start ---------------------------------------->
 const route = useRoute();
 const pageCatids = ""
+let keywordInput = ref("");
+
 if(route.params.id=='search'){
     //该处用于带有文字出入的搜索栏跳转
-    console.log(route.query.depValue)//左侧搜索下拉框的值
-    console.log(route.query.typeValue)//右侧输入框的值
-    //注意，这个跳转因为没有cityid和department_id
-    //正常情况下，应该含有这两个参数 因为搜索需要这俩参数
+    console.log("检测到从搜索栏跳转的搜索！")
+    console.log(route.query.type)//左侧搜索下拉框的值
+    console.log(route.query.keyword)//右侧输入框的值
 
+    //目前route.query.type 1=资讯 2=商城 3=招工招聘
+    //但是商城和招工招聘暂没有开发完，所以这里不需要考虑 只给keyword赋值即可
+    keywordInput.value = route.query.keyword;
+    
 }else{
     //该处用于搜索栏中含有地区的跳转
     const pageCatids = route.params.id
@@ -98,7 +103,7 @@ let pageSize = useState("pageSize", () => 20)
 
 //3.2 获得新闻列表
 const newsList = ref([]);
-let keywordInput = ref("");
+
 
 //3.3 在本页进行搜索的方法
 let goSearch = async () => {

plugins/globals.ts

@@ -1,17 +1,17 @@
 export default defineNuxtPlugin((nuxtApp) => {
   //Pre环境
-//   nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-//   nuxtApp.provide('CwebUrl', 'http://nwpre.bjzxtw.org.cn')
-//   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('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
+  nuxtApp.provide('CwebUrl', 'http://nwpre.bjzxtw.org.cn')
+  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('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  nuxtApp.provide('CwebUrl', 'http://nw.bjzxtw.org.cn')
-  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', 'https://flzxw.bjzxtw.org.cn')
+//   nuxtApp.provide('CwebUrl', 'http://nw.bjzxtw.org.cn')
+//   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')

plugins/request.ts

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