浏览代码

修改bug

Jing 1 周之前
父节点
当前提交
32b750d8ad
共有 47 个文件被更改,包括 1341 次插入2040 次删除
  1. 1 1
      .env
  2. 0 979
      .nuxt/dev/index.mjs
  3. 0 0
      .nuxt/dev/index.mjs.map
  4. 1 2
      .nuxt/imports.d.ts
  5. 1 1
      .nuxt/manifest/latest.json
  6. 1 0
      .nuxt/manifest/meta/70bd7ecd-8e56-45d4-a2b8-dc54ae84af25.json
  7. 0 1
      .nuxt/manifest/meta/bf8c9acd-a0a7-4c55-9127-2008e6f60c9f.json
  8. 0 1
      .nuxt/manifest/meta/dev.json
  9. 0 17
      .nuxt/nitro.json
  10. 1 1
      .nuxt/nuxt.d.ts
  11. 0 9
      .nuxt/nuxt.json
  12. 1 1
      .nuxt/tsconfig.json
  13. 0 1
      .nuxt/types/build.d.ts
  14. 2 2
      .nuxt/types/imports.d.ts
  15. 3 7
      .nuxt/types/plugins.d.ts
  16. 6 6
      assets/css/about.less
  17. 27 0
      assets/css/class.less
  18. 1 1
      assets/css/error.less
  19. 24 1
      assets/css/index.less
  20. 2 2
      assets/css/public/footer.less
  21. 38 9
      assets/css/public/head.less
  22. 16 13
      assets/css/public/nav.less
  23. 9 5
      components/detail/HotNews.vue
  24. 12 13
      components/detail/HotNews2.vue
  25. 15 16
      components/home/SmallSwiperNmg.vue
  26. 1 1
      components/home/SmallSwiperTwo.vue
  27. 11 11
      components/home/Surveyvote.vue
  28. 2 2
      components/home/foot.vue
  29. 25 25
      components/home/kefu.vue
  30. 50 37
      components/home/pageHead.vue
  31. 138 57
      components/home/pageNavigation.vue
  32. 1 1
      components/home/pageNavigation1.vue
  33. 28 21
      composables/publicFunction.ts
  34. 3 3
      pages/[dir]/[dir]/[id].vue
  35. 2 2
      pages/[dir]/[dir]/list-[id].vue
  36. 3 3
      pages/[dir]/[id].vue
  37. 475 310
      pages/[dir]/index.html.vue
  38. 2 2
      pages/[dir]/list-[id].vue
  39. 5 4
      pages/about/[dir]/[dir]/[id].vue
  40. 5 4
      pages/about/[dir]/index.html.vue
  41. 3 3
      pages/about/[dir]/list-[id].vue
  42. 344 453
      pages/index.vue
  43. 4 4
      pages/search/[id].vue
  44. 70 0
      plugins/category.ts
  45. 6 6
      plugins/globals.ts
  46. 2 2
      plugins/request.ts
  47. 二进制
      public/favicon.ico

+ 1 - 1
.env

@@ -1 +1 @@
-PORT=3000
+PORT=3004

文件差异内容过多而无法显示
+ 0 - 979
.nuxt/dev/index.mjs


文件差异内容过多而无法显示
+ 0 - 0
.nuxt/dev/index.mjs.map


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

@@ -29,7 +29,6 @@ export { onBeforeRouteLeave, onBeforeRouteUpdate, useLink } from 'vue-router';
 export { withCtx, withDirectives, withKeys, withMemo, withModifiers, withScopeId, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, computed, customRef, isProxy, isReactive, isReadonly, isRef, markRaw, proxyRefs, reactive, readonly, ref, shallowReactive, shallowReadonly, shallowRef, toRaw, toRef, toRefs, triggerRef, unref, watch, watchEffect, watchPostEffect, watchSyncEffect, isShallow, effect, effectScope, getCurrentScope, onScopeDispose, defineComponent, defineAsyncComponent, resolveComponent, getCurrentInstance, h, inject, hasInjectionContext, nextTick, provide, mergeModels, toValue, useModel, useAttrs, useCssModule, useCssVars, useSlots, useTransitionState, useId, useTemplateRef, useShadowRoot, Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue';
 export { injectHead, useHead, useSeoMeta, useHeadSafe, useServerHead, useServerSeoMeta, useServerHeadSafe } from '@unhead/vue';
 export { requestData, requestDataPromise, requestDataWebUrl, requestHome } from '../composables/getData';
-export { getTime, getTitleLength, getLinkPath, getLinkPathDetail, getRoutePath } from '../composables/publicFunction';
+export { getTime, getTitleLength, getLinkPath, getLinkPathDetail, getRoutePath, getLinkPath1 } from '../composables/publicFunction';
 export { seoSetup } from '../composables/useSeo';
-export { useNuxtDevTools } from '../node_modules/@nuxt/devtools/dist/runtime/use-nuxt-devtools';
 export { definePageMeta } from '../node_modules/nuxt/dist/pages/runtime/composables';

+ 1 - 1
.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1745395243161}
+{"id":"70bd7ecd-8e56-45d4-a2b8-dc54ae84af25","timestamp":1745823176546}

+ 1 - 0
.nuxt/manifest/meta/70bd7ecd-8e56-45d4-a2b8-dc54ae84af25.json

@@ -0,0 +1 @@
+{"id":"70bd7ecd-8e56-45d4-a2b8-dc54ae84af25","timestamp":1745823176546,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/bf8c9acd-a0a7-4c55-9127-2008e6f60c9f.json

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

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

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

+ 0 - 17
.nuxt/nitro.json

@@ -1,17 +0,0 @@
-{
-  "date": "2025-04-23T08:00:51.157Z",
-  "preset": "nitro-dev",
-  "framework": {
-    "name": "nuxt",
-    "version": "3.15.2"
-  },
-  "versions": {
-    "nitro": "2.10.4"
-  },
-  "dev": {
-    "pid": 16724,
-    "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-16724-1.sock"
-    }
-  }
-}

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

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

+ 0 - 9
.nuxt/nuxt.json

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

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/dev"
+        "./manifest/meta/70bd7ecd-8e56-45d4-a2b8-dc54ae84af25.json"
       ],
       "#components": [
         "./components"

+ 0 - 1
.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";

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

@@ -27,6 +27,7 @@ declare global {
   const getAppManifest: typeof import('../../node_modules/nuxt/dist/app/composables/manifest')['getAppManifest']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
   const getCurrentScope: typeof import('vue')['getCurrentScope']
+  const getLinkPath1: typeof import('../../composables/publicFunction')['getLinkPath1']
   const getLinkPath: typeof import('../../composables/publicFunction')['getLinkPath']
   const getLinkPathDetail: typeof import('../../composables/publicFunction')['getLinkPathDetail']
   const getRoutePath: typeof import('../../composables/publicFunction')['getRoutePath']
@@ -122,7 +123,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']
@@ -215,6 +215,7 @@ declare module 'vue' {
     readonly getAppManifest: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/manifest')['getAppManifest']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+    readonly getLinkPath1: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPath1']>
     readonly getLinkPath: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPath']>
     readonly getLinkPathDetail: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPathDetail']>
     readonly getRoutePath: UnwrapRef<typeof import('../../composables/publicFunction')['getRoutePath']>
@@ -310,7 +311,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']>

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

@@ -9,19 +9,15 @@ 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/category")> &
   InjectionType<typeof import("../../plugins/globals")> &
   InjectionType<typeof import("../../plugins/pinia")>
 
@@ -29,7 +25,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'
   }
 }
 

+ 6 - 6
assets/css/about.less

@@ -62,8 +62,6 @@
 // 资讯列表
 .newsDetail {
     width: 100%;
-    // height: 1400px;
-    // margin-bottom: 70px;
 
     .inner {
         width: 1200px;
@@ -74,26 +72,28 @@
             width: 1080px;
             margin: 0 auto;
             margin-bottom: 60px;
+            min-height: 600px;
 
             .headImg {
                 width: 1086px;
                 height: 10px;
-                background: url("../../public/special/head01.png") no-repeat 100% 100%;
+                background: url("@/public/special/head01.png") no-repeat 100% 100%;
             }
 
             .footImg {
                 width: 1086px;
                 height: 7px;
-                background: url("../../public/special/foot01.png") no-repeat 100% 100%;
+                background: url("@/public/special/foot01.png") no-repeat 100% 100%;
             }
 
             .innerDetail1 {
                 width: 1086px;
+                min-height: 600px;
                 margin: 0 auto;
                 padding: 30px 50px 40px;
                 box-sizing: border-box; 
                 border-left: 1px solid #8ac5c0;
-                background: url("../../public/special/mid01.png") repeat-y 100% 100%;
+                background: url("@/public/special/mid01.png") repeat-y 100% 100%;
             }
 
            .leftBottom::v-deep {
@@ -118,7 +118,7 @@
                 line-height: 58px;
                 text-align: center;
                 color: #fff;
-                background: url("../../public/special/projectMoreTitle.png") no-repeat;
+                background: url("@/public/special/projectMoreTitle.png") no-repeat;
                 margin-bottom: 30px;
             }
 

+ 27 - 0
assets/css/class.less

@@ -102,6 +102,10 @@ section {
     }
 }
 
+.index_2_body{
+    height: 483px;
+}
+
 .index_2_head::after {
     content: '';
     display: block;
@@ -510,6 +514,7 @@ section {
     border: solid 1px #E8E8E8;
     border-top: solid 1px #fff;
     padding-bottom: 20px;
+    height: 148px;
 }
 
 .channel_5_ul_box_in {
@@ -533,6 +538,8 @@ section {
     width: 190px;
     height: 126px;
     margin-right: 16px;
+    position: relative;
+    overflow: hidden;
 }
 
 .channel_5_ul_left_img {
@@ -541,6 +548,23 @@ section {
     height: 126px;
 }
 
+.channel_5_text {
+    width: 190px;
+    height: 30px;
+    line-height: 30px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    padding: 0 5px;
+    box-sizing: border-box;
+    color: #fff;
+    font-size: 16px;
+    background: rgba(0, 0, 0, .3);
+    position: absolute;
+    left: 0px;
+    bottom: 0px;
+}
+
 .channel_5_ul_a {
     display: block;
     height: 19px;
@@ -599,6 +623,7 @@ section {
 .channel_6_line {
     border: solid 1px #E8E8E8;
     width: 594px;
+    height: 313px;
     box-sizing: border-box;
     box-sizing: border-box;
     padding: 19px 14px 20px;
@@ -625,6 +650,8 @@ section {
     width: 190px;
     height: 126px;
     margin-right: 16px;
+    position: relative;
+    overflow: hidden
 }
 
 .channel_6_ul_left_img {

+ 1 - 1
assets/css/error.less

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

+ 24 - 1
assets/css/index.less

@@ -79,6 +79,10 @@ section {
     width: 1200px;
 }
 
+.index_1 {
+    min-height: 80px;
+}
+
 .index_1_h3 {
     margin-top: 30px;
 
@@ -437,6 +441,7 @@ section {
 }
 
 .index_5 {
+    height: 550px;
     margin-top: 20px;
 }
 
@@ -779,6 +784,19 @@ section {
 
 .index_8 {
     margin-top: 20px;
+    height: 560px;
+    position: relative;
+    margin-bottom: 20px;
+}
+
+.adBox1 {
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+}
+
+.index_9 {
+    height: 405px;
 }
 
 .index_9_box_1 {
@@ -809,9 +827,14 @@ section {
     margin-top: 30px;
 }
 
+.index_10 {
+    height: 205px;
+}
+
 .index_10_ul {
     margin-top: 30px;
 
+
     .index_10_ul_a {
         float: left;
         width: 172px;
@@ -863,7 +886,7 @@ section {
     }
 
     .index_10_img_ul_li_dot1 {
-        height: 33px;
+        height: 40px;
         width: 220px;
         position: absolute;
         color: #fff;

+ 2 - 2
assets/css/public/footer.less

@@ -118,7 +118,7 @@
     box-sizing: border-box;
     padding: 0 19px;
     font-weight: bold;
-    border-left: solid 1px #1F497B;
+    border-left: solid 2px #408f8a;
     margin: 18px 0;
 }
 
@@ -181,7 +181,7 @@
 
 .foot_logo_out>* {
     position: absolute;
-    top: -177px;
+    top: -145px;
 }
 
 .foot_logo_out>*:nth-of-type(1) {

+ 38 - 9
assets/css/public/head.less

@@ -1,3 +1,27 @@
+.userInfo11 {
+    width: 100px;
+    height: 80px;
+    background-color: #fff;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+    border-radius: 3px;
+    position: absolute;
+    top: 40px;
+    right: 35px;
+    font-size: 14px;
+    z-index: 999;
+
+    li {
+        height: 40px;
+        line-height: 40px;
+        color: #333333;
+        padding-left: 10px;
+    }
+
+    >li:hover {
+        color: #489d97;
+    }
+}
+
 .tips {
     padding: 20px 0;
     text-align: center;
@@ -29,11 +53,11 @@
 /* 页面头部 */
 header {
     width: 100%;
-    height: 201px;
+    // height: 201px;
     font-size: 12px;
     font-family: PingFang SC-Regular;
     color: #666666;
-    background: url("../../../public/head/headtopbg.png") repeat-x;
+    background: url("@/public/head/headtopbg.png") repeat-x;
 }
 
 .headerNav {
@@ -43,12 +67,17 @@ header {
 }
 
 .headerNav .left>span {
-    margin-right: 47px;
+    margin-right: 20px;
+
+    a {
+        color: #666666;
+    }
 }
 
 .headerNav .right {
     display: flex;
     margin-right: 10px;
+    position: relative;
 
     button {
         font-size: 12px;
@@ -114,7 +143,7 @@ header {
 /* // 头部logo */
 .headerLogo {
     width: 100%;
-    height: 174px;
+    height: 145px;
 
     .inner {
         display: flex;
@@ -122,19 +151,19 @@ header {
         width: 1200px;
         margin: 0 auto;
         position: relative;
-        height: 174px;
+        height: 145px;
 
         .titlead {
             position: absolute;
-            bottom: 30px;
+            bottom: 14px;
             right: 0px;
         }
     }
 
     .inner>img {
-        width: 297px;
-        height: 114px;
-        margin-top: 30px;
+        width: 305px;
+        height: 110px;
+        margin-top: 20px;
         cursor: pointer;
     }
 

+ 16 - 13
assets/css/public/nav.less

@@ -28,9 +28,8 @@
             text-align: left;
             font-style: normal;
             text-transform: none;
-            margin: 0 12px;
+            margin: 0 15px;
             text-align: center;
-            width: 76px;
 
             a {
                 color: #fff;
@@ -42,9 +41,6 @@
             color: #fff59d;
         }
 
-        // .active {
-        //     color: #ABE874;
-        // }
     }
 }
 
@@ -62,11 +58,9 @@
             color: #333;
             display: flex;
             flex-wrap: wrap;
-            // justify-content: space-between;
 
             .navList:first-child {
-                padding-left: 40px;
-                // padding-right: 20px;
+                padding-left: 20px;
             }
 
             .navList {
@@ -76,7 +70,7 @@
                 font-weight: 400;
                 font-size: 16px;
                 color: #333333;
-                margin: 0 20px;
+                margin: 0 23px;
 
                 a {
                     color: #333;
@@ -87,7 +81,6 @@
 
             .navList:last-child {
                 margin-right: 0;
-                // padding-right: 20px;
             }
 
             .navList:hover a {
@@ -116,6 +109,7 @@
             line-height: 50px;
             padding-left: 35px;
         }
+
         .title1 {
             font-family: PingFang SC;
             font-weight: 400;
@@ -156,10 +150,16 @@
                 background: url('@/public/image/Iconly/Broken/Search.png');
                 cursor: pointer;
             }
-            .search{
+            .searchbtn{
+                display: inline-block;
+                margin-left: 60px;
+            }
+
+            .search {
                 margin-left: 20px;
             }
-            .search1{
+
+            .search1 {
                 margin-left: 160px;
             }
 
@@ -204,6 +204,9 @@
                 font-weight: 600;
             }
         }
-
+        .box111{
+            display: inline-block;
+            width: 60px;
+        }
     }
 }

+ 9 - 5
components/detail/HotNews.vue

@@ -50,14 +50,16 @@ async function getPageData() {
     const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize':6,
+            'imgnum': 2,
+            'textnum': 4,
+            'placeid':0,
             'level': 4,
             'id': 0,
         },
     });
     if(mkdata.code == 200){
-        hotNewsListdata1.value = mkdata.data.slice(0, 2);
-        hotNewsListdata2.value = mkdata.data.slice(2, 6);
+        hotNewsListdata1.value = mkdata.data.img;
+        hotNewsListdata2.value = mkdata.data.text;
     }else{
         console.log("错误位置:获取最新资讯")
     }
@@ -66,6 +68,9 @@ getPageData();
 </script>
 
 <style lang="less" scoped>
+.hotList {
+    height: 405px;
+}
 .title {
     width: 100px;
     font-family: Microsoft YaHei, Microsoft YaHei;
@@ -95,7 +100,7 @@ getPageData();
         .hotlist_text {
             float: left;
             width: 126px;
-            height: 72px;
+            height: 76px;
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-line-clamp: 3;
@@ -105,7 +110,6 @@ getPageData();
             font-weight: 400;
             font-size: 18px;
             color: #333333;
-            padding-top: 3px;
         }
     }
 

+ 12 - 13
components/detail/HotNews2.vue

@@ -6,12 +6,8 @@
         <ul class="hotNews_message">
             <li class="hotNews_messageList" v-for="(item, index) in hotNewsList" :key="index">
                 <span class="number">{{ index + 1 }}</span>
-                <NuxtLink
-                    :href="getLinkPathDetail(item)"
-                    :title="item.title"
-                    :key="item.id"
-                    :target="item.islink == 1 ? '_blank' : '_self'"
-                >
+                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :key="item.id"
+                    :target="item.islink == 1 ? '_blank' : '_self'">
                     <span class="hotlist_text">{{ item.title }}</span>
                 </NuxtLink>
             </li>
@@ -33,14 +29,15 @@ async function getPageData() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 8,
+            'imgnum': 0,
+            'textnum': 8,
             'level': 5,
             'placeid': 0,
             'id': 0
         },
     });
     if (mkdata.code == 200) {
-        hotNewsList.value = mkdata.data;
+        hotNewsList.value = mkdata.data.text;
     } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:获取热点精选")
@@ -55,18 +52,20 @@ getPageData();
 <style lang="less" scoped>
 .hotNews {
     width: 270px;
+    height: 548px;
     margin-top: 20px;
 
     //标题
     .hotNews_title {
         width: 100px;
-        height: 40px;
-        line-height: 40px;
         font-family: Microsoft YaHei, Microsoft YaHei;
         font-weight: bold;
-        margin: 20px 0 5px;
-        font-size: 20px;
-        color: #333333;
+        font-size: 22px;
+        color: #489D97;
+        margin: 10px 0 20px;
+        position: relative;
+        border-left: #489D97 5px solid;
+        padding-left: 15px;
     }
 
     //新闻列表

+ 15 - 16
components/home/SmallSwiperNmg.vue

@@ -1,14 +1,12 @@
 <template>
-    <div class="swiper">
+    <div class="swiper" v-if="imagelist.length>0">
         <el-carousel :interval="5000" height="405px" indicator-class="custom-indicator" @change="handleIndicatorChange">
-                <el-carousel-item v-for="item in imagelist" :key="item">
-                    <NuxtLink 
-                            :to="`/${item.pinyin}/${item.id}.html`"
-                            :title="item.title">
-                            <img :src="item.imgurl" :alt="item.title">
-                            <span class="swiper_dot1 dot1">{{ item.title }}</span>
-                    </NuxtLink>
-                </el-carousel-item>
+            <el-carousel-item v-for="item in imagelist" :key="item">
+                <NuxtLink :to="`/${item.pinyin}/${item.id}.html`" :title="item.title">
+                    <img :src="item.imgurl" :alt="item.title">
+                    <span class="swiper_dot1 dot1">{{ item.title }}</span>
+                </NuxtLink>
+            </el-carousel-item>
         </el-carousel>
     </div>
 </template>
@@ -18,19 +16,20 @@ import { ElCarousel, ElCarouselItem } from 'element-plus'
 //获取焦点图数据 start---------------------------------------->
 const imagelist = ref("")
 async function getModelData1() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 5,
+            'imgnum': 5,
+            'textnum': 0,
             'level': 2,
             'placeid': 0,
-            'id':''
+            'id': ''
         },
     });
-    if(mkdata.code == 200){
-      imagelist.value = mkdata.data;
-    }else{
-      console.log("错误位置错误:获取首页轮播图",mkdata.message)
+    if (mkdata.code == 200) {
+        imagelist.value = mkdata.data.img;
+    } else {
+        console.log("错误位置错误:获取首页轮播图", mkdata.message)
     }
 }
 getModelData1()

+ 1 - 1
components/home/SmallSwiperTwo.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="swiper">
+    <div class="swiper" v-if="data.length>0">
         <el-carousel :interval="5000" height="405px" indicator-class="custom-indicator" @change="handleIndicatorChange">
                 <el-carousel-item v-for="item in data" :key="item">
                     <NuxtLink 

+ 11 - 11
components/home/Surveyvote.vue

@@ -417,7 +417,7 @@ async function addWebsiteSurvey(){
         }
         .radio {
             /deep/.el-radio {
-                --el-radio-input-border-color-hover: #27881a;
+                --el-radio-input-border-color-hover: #489d97;
             }
             /deep/.el-radio-group {
                 align-items: center;
@@ -446,17 +446,17 @@ async function addWebsiteSurvey(){
                 width: 16px;
             }
             /deep/.el-radio__input.is-checked+.el-radio__label {
-                color: #27881a;
+                color: #489d97;
             }
             /deep/.el-radio__input.is-checked .el-radio__inner {
-                background: #33b023;
-                border-color: #27881a;
+                background: #489d97;
+                border-color: #489d97;
             }
         }
 
         .checkInputBox {
             /deep/.el-checkbox {
-                --el-radio-input-border-color-hover: #27881a;
+                --el-radio-input-border-color-hover: #489d97;
             }
             /deep/.el-checkbox-group {
                 align-items: center;
@@ -485,11 +485,11 @@ async function addWebsiteSurvey(){
                 width: 16px;
             }
             /deep/.el-checkbox__input.is-checked+.el-checkbox__label {
-                color: #27881a;
+                color: #489d97;
             }
             /deep/.el-checkbox__input.is-checked .el-checkbox__inner {
-                background: #33b023;
-                border-color: #27881a;
+                background: #489d97;
+                border-color: #489d97;
             }
         }
 
@@ -545,9 +545,9 @@ async function addWebsiteSurvey(){
             }
         }
         .active {
-            color:#49A769;
-            background: #dff7e8;
-            border: 1px solid #49A769;
+            color:#489d97;
+            background: #d9f0ee;
+            border: 1px solid #489d97;
         }
     }
 }

+ 2 - 2
components/home/foot.vue

@@ -73,8 +73,8 @@ async function getModelDataAll() {
     const mkdata =  await requestDataPromise('/web/getWebsiteFootAll', {
         method: 'GET',
         query: {
-            'link_textnum':8,
-            'link_imgnum':12,
+            'link_textnum':24,
+            'link_imgnum':18,
             'link_footnum':4
         },
     });

+ 25 - 25
components/home/kefu.vue

@@ -11,45 +11,45 @@
       <img src="https://img.bjzxtw.org.cn/pre/public/image/qq1.png">
       <p>QQ客服</p>
       <div class="kefu_item_content_QQ">
-          <div @click="addQQFriend(bottomBase.customer_service_qq)" class="qqadd">
-              <img src="https://img.bjzxtw.org.cn/pre/public/index/tubiao1.png" width="100">
-              <div class="qqfs">{{bottomBase.customer_service_qq}}</div>
-          </div>
-          <div @click="addQQFriend(bottomBase.communications)" class="qqadd">
-              <img src="https://img.bjzxtw.org.cn/pre/public/index/tubiao2.png" width="100">
-              <div class="qqfs">{{bottomBase.communications}}</div>
-          </div>
-          <div class="arrow"></div>
+        <div @click="addQQFriend(bottomBase.customer_service_qq)" class="qqadd">
+          <img :src="service_qq_img" width="100">
+          <div class="qqfs">{{ bottomBase.customer_service_qq }}</div>
+        </div>
+        <div @click="addQQFriend(bottomBase.communications)" class="qqadd">
+          <img :src="communications_img" width="100">
+          <div class="qqfs">{{ bottomBase.communications }}</div>
+        </div>
+        <div class="arrow"></div>
       </div>
     </div>
     <div class="kefu_itemPhone">
       <img src="https://img.bjzxtw.org.cn/pre/public/image/dianhua1.png">
       <p>电话客服</p>
       <div class="kefu_item_content_phone">
-          <div class="kefu_item_content_phone_title">联系电话:</div>
-          <div>{{bottomBase.customer_service}}</div>
-          <div class="arrow"></div>
+        <div class="kefu_item_content_phone_title">联系电话:</div>
+        <div>{{ bottomBase.customer_service }}</div>
+        <div class="arrow"></div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-  const props = defineProps({
-    bottomBase: {
-      type: Object,
-      required: true
-    }
-  })
-
-  //添加网站客服
-  function addQQFriend(qqNumber) {
-    let qq = qqNumber.match(/\d+/g);
-    // 使用tencent协议唤起QQ客户端并添加好友
-    window.location.href = `tencent://message/?uin=${qq}&Site=&Menu=yes`;
+const props = defineProps({
+  bottomBase: {
+    type: Object,
+    required: true
   }
+})
+
+//添加网站客服
+function addQQFriend(qqNumber) {
+  let qq = qqNumber.match(/\d+/g);
+  // 使用tencent协议唤起QQ客户端并添加好友
+  window.location.href = `tencent://message/?uin=${qq}&Site=&Menu=yes`;
+}
 </script>
 
 <style lang="less" scoped>
-  @import url('@/assets/css/public/kefu.less');
+@import url('@/assets/css/public/kefu.less');
 </style>

+ 50 - 37
components/home/pageHead.vue

@@ -5,7 +5,9 @@
         <nav class="headerNav">
             <div class="inner">
                 <div class="left">
-                    <span>中农兴业网团</span>
+                    <span>
+                        <a href="http://znxyw.org.cn/">中农兴业网团</a>
+                    </span>
                     <span>
                         农业百强网站(科技文化类10强)
                     </span>
@@ -27,7 +29,8 @@
                             <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/topicon4.png" alt="注册">注册
                         </button>
                         <button class="reg" @click="userCenter" v-show="showToken">
-                            <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/topicon3.png" alt="用户信息">{{ username }}
+                            <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/topicon3.png" alt="用户信息">{{
+                                username }}
                         </button>
                         <button class="reg" @click="goSearch">
                             <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/searchicon.png" alt="搜索">搜索
@@ -45,9 +48,10 @@
             <div class="inner">
                 <img :src="logo" :alt="webSiteName" class="left" @click="backHome">
                 <div class="titlead" v-if="adImg">
-                    <a href="http://sannongdy.org.cn/" v-if="adImg.image_url==null" target="_blank" :title="adImg.place_name">
+                    <a href="http://sannongdy.org.cn/" v-if="adImg.image_url == null" target="_blank"
+                        :title="adImg.place_name">
                         <img :src="adImg.thumb" :alt="adImg.place_name" data-tag="imgurl.ad_tag">
-                    </a>     
+                    </a>
                     <a :href="adImg.image_url" v-else :title="adImg.ad_name">
                         <img :src="adImg.image_src" :alt="adImg.ad_name" data-tag="imgurl.ad_tag">
                     </a>
@@ -57,7 +61,7 @@
         <el-dialog v-model="dialogTableVisible" title="" width="800">
             <div class="tips">
                 <p>
-                    <img src="../../public/topic/tips.png" alt="">
+                    <img src="@/public/topic/tips.png" alt="">
                     提示:注册请联系管理员操作!
                 </p>
                 <p>
@@ -164,6 +168,7 @@ let userCenter = () => {
 //3.跳转菜单逻辑 start ---------------------------------------->
 let gotosystem = () => {
     let url = $BwebUrl + '/#/login?userurl=' + $CwebUrl;
+    isShow.value = false
     //window.location.href = url; 
     window.open(url, '_blank');
 }
@@ -171,10 +176,9 @@ let gotosystem = () => {
 //点击退出按钮
 let exit = () => {
     window.location.href = $CwebUrl;
-
+    isShow.value = false
     isDel.value = 1
     token1.value = getToken()
-
     let tokendata = getToken()
     console.log("用户退出登录======token为:", tokendata)
     //王鹏
@@ -251,43 +255,52 @@ onMounted(async () => {
     //从客户端获取登录状态
     //从客户端阶段开始 持续查询登录状态
     let getLoginStatus = async () => {
+        //获得token
+        const token = getToken();
         const { $webUrl, $CwebUrl } = useNuxtApp();
-        const queryParams = new URLSearchParams({
-            token: getToken()
-        });
-        let url = `${$webUrl}/api/loginStatus?${queryParams.toString()}`
 
-        const responseStatus = await fetch(url, {
-            method: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-                'Userurl': $CwebUrl,
-                //'token': getToken(),
-                'Origin': $CwebUrl
-            }
-        });
-        const result = await responseStatus.json();
-        console.log(result)
-        if (result.code == 200) {
-            if (result.data.isLogin == true) {
+        if(token == undefined){
+            //如果没有获取到token 不访问后端获取在线状态
+            console.log("没有获取到token!无需查询登录状态!")
+            showToken.value = false;
+
+        }else{
+            //如果获取到了token 访问后端查询状态
+            console.log("已获取到用户token,开始查询登录状态!")
+            const queryParams = new URLSearchParams({
+                token: getToken()
+            });
+            let url = `${$webUrl}/api/loginStatus?${queryParams.toString()}`
+            const responseStatus = await fetch(url, {
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Userurl': $CwebUrl,
+                    //'token': getToken(),
+                    'Origin': $CwebUrl
+                }
+            });
+            const result = await responseStatus.json();
+            console.log(result)
+            
+            if (result.code == 200) {
                 console.log("用户已经登录!");
                 showToken.value = true;
-
-            } else {
-                console.log("用户未登录!");
+            }
+            if (result.code == -1) {
+                isShow.value = false;
                 showToken.value = false;
-                //退出登录
+                removeToken();
+                removeTicket();
+                ElMessage.error('您没有权限登录该网站!')
+            }
+            if (result.code == -2) {
                 isShow.value = false;
+                showToken.value = false;
                 removeToken();
                 removeTicket();
+                ElMessage.error('您已退出登录!')
             }
-        } else {
-            console.log("用户已退出登录!");
-            //退出登录
-            isShow.value = false;
-            showToken.value = false;
-            removeToken();
-            removeTicket();
         }
     }
     getLoginStatus();
@@ -297,7 +310,7 @@ onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_top`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_top`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -326,5 +339,5 @@ onMounted(async () => {
 </script>
 
 <style lang="less" scoped>
-    @import url('@/assets/css/public/head.less');
+@import url('@/assets/css/public/head.less');
 </style>

+ 138 - 57
components/home/pageNavigation.vue

@@ -9,7 +9,8 @@
                         </NuxtLink>
                     </li>
                     <li v-for="(item, index) in navigation1" :key="index">
-                        <NuxtLink :href="getLinkPath(item)" :title="item.alias" :target="item.is_url == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPath(item)" :title="item.alias"
+                            :target="item.is_url == 1 ? '_blank' : '_self'">
                             {{ item.alias }}
                         </NuxtLink>
                     </li>
@@ -19,9 +20,10 @@
         <div class="partTwo">
             <div class="inner">
                 <ul class="partTwoNav">
-                    <li class="navList">农民工资讯</li>
+                    <!-- <li class="navList">农民工资讯</li> -->
                     <li class="navList" v-for="(item, index) in navigation2" :key="index">
-                        <NuxtLink :href="getLinkPath(item)" :title="item.alias" :target="item.is_url == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPath(item)" :title="item.alias"
+                            :target="item.is_url == 1 ? '_blank' : '_self'">
                             {{ item.alias }}
                         </NuxtLink>
                     </li>
@@ -31,20 +33,42 @@
         <div class="partThree">
             <div class="inner">
                 <div class="title">
-                    搜索职位 : 
+                    搜索职位 :
                 </div>
                 <div class="searchRole">
                     <!--下拉框只在客户端渲染-->
-                    <client-only> 
-                        <el-select v-model="searchInputValue1" placeholder="招聘" size="large" style="width: 75px" :key="'select1'">
-                            <el-option v-for="item in selectOptions" :key="item.id" :label="item.name" :value="item.id" />
+                    <client-only>
+                        <el-select v-model="searchInputValue1" placeholder="招聘" size="large" style="width: 75px"
+                            :key="'select1'">
+                            <el-option v-for="item in selectOptions" :key="item.id" :label="item.name"
+                                :value="item.id" />
                         </el-select>
                     </client-only>
                     <i></i>
                     <input type="text" v-model="typeValue" placeholder="输入关键词" class="ipt">
                     <em class="search"></em>
                 </div>
-                <div class="searchRole">
+                <div class="box111"></div>
+                <div class="title">搜索地区 :</div>
+                <div class="searchRole" v-if="provinceList.length > 0">
+                    <!--  -->
+                    <el-select v-model="province" placeholder="请选择省" size="large" style="width: 80px">
+                        <el-option v-for="item in provinceList" :key="item.id" :label="item.name"
+                            @click="change(item.id)" :value="item.id" />
+                    </el-select>
+                    <i></i>
+                    <el-select v-model="city" placeholder="请选择市" no-data-text="请先选择省份" size="large" style="width: 80px">
+                        <el-option v-for="(item, index) in cityList" :key="item.id" :label="item.name"
+                            @click="change1(item.id)" :value="item.id" />
+                    </el-select>
+                    <i></i>
+                    <el-select v-model="region" placeholder="请选择区/县" no-data-text="请先选择市" size="large"
+                        style="width: 100px">
+                        <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                    <em class="searchbtn" @click="goToPrimary"></em>
+                </div>
+                <!-- <div class="searchRole">
                     <client-only> 
                         <el-select v-model="searchInputValue2" placeholder="选择职业" size="large" style="width: 80px" :key="'select2'">
                             <el-option 
@@ -67,11 +91,11 @@
                         </el-select>
                     </client-only>
                     <i></i>
-                    <!-- <em class="search1" @click="goToPrimary"></em> -->
-                </div>
-                <div class="title1">
+                    <em class="search1" @click="goToPrimary"></em>
+                </div> -->
+                <!-- <div class="title1">
                     更多搜索条件>>
-                </div>
+                </div> -->
             </div>
         </div>
     </div>
@@ -119,61 +143,118 @@ const searchInputValue2 = ref("")
 const searchInputValue3 = ref("")
 
 let selectOptions = [
-    {name:'资讯',id:1},
-    {name:'商城',id:2},
-    {name:'招工招聘',id:3},
-]
-let selectOptions2 = [
-    {name:'职业1',id:1},
-    {name:'职业2',id:2},
-    {name:'职业3',id:3},
-]
-let selectOptions3 = [ 
-    {name:'地区1',id:1},
-    {name:'地区2',id:2},
-    {name:'地区3',id:3},
+    { name: '求职', id: 1 },
+    { name: '招聘', id: 2 },
 ]
-const selectValue = ref("") //搜索左侧下拉选择的值
-const inputValue = ref("") //搜索右侧框输入的值
+// let selectOptions2 = [
+//     { name: '职业1', id: 1 },
+//     { name: '职业2', id: 2 },
+//     { name: '职业3', id: 3 },
+// ]
+// let selectOptions3 = [
+//     { name: '地区1', id: 1 },
+//     { name: '地区2', id: 2 },
+//     { name: '地区3', id: 3 },
+// ]
+// const selectValue = ref("") //搜索左侧下拉选择的值
+// const inputValue = ref("") //搜索右侧框输入的值
 
 
 //2.1跳转到搜索页面
+// let goToPrimary = async () => {
+//     if (inputValue.value == "" || selectValue.value == "") {
+//         ElMessage.error('搜索项不能为空!')
+//     } else {
+//         if (selectValue.value == 2 || selectValue.value == 3) {
+//             ElMessage.error('所选分类暂不支持检索!')
+//         } else {
+//             const route = `/search/search?type=${selectValue.value}&keyword=${inputValue.value}`;
+//             window.location.href = route;
+//         }
+//     }
+// }
+
+//2.搜索 end ---------------------------------------->
+
+//4.展示行政区划 start ---------------------------------------->
+//let areaList = ref("")
+//4.1 省
+let province = ref("")
+let provinceid = ref("")
+let provinceList = ref("")
+//4.2 市
+let city = ref("")
+let cityid = ref("")
+let cityList = ref("")
+//4.3 县
+let region = ref("")
+//let regionid = ref("")
+let regionList = ref("")
+
+//选择省
+let areaArrList = async () => {
+    const mkdata = await requestDataPromise('/web/selectWebsiteArea', {
+        method: 'GET',
+        query: {},
+    });
+    if (mkdata.code == 200) {
+        provinceList.value = mkdata.data;
+    } else {
+        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
+        console.log("错误位置:获取行政区划")
+        console.log("后端错误反馈:", mkdata.message)
+        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
+    }
+}
+//一开始只需要获取一下省
+areaArrList();
+
+//选择市
+let change = async (id) => {
+    provinceid.value = id;
+    const shengData = await requestDataPromise('/web/selectWebsiteArea', {
+        method: 'GET',
+        query: {
+            'pid': id,
+        },
+    });
+    cityList.value = shengData.data;
+}
+
+//选择县
+let change1 = async (id) => {
+    cityid.value = id;
+    const xianData = await requestDataPromise('/web/selectWebsiteArea', {
+        method: 'GET',
+        query: {
+            'pid': id,
+        },
+    });
+    regionList.value = xianData.data;
+}
+//4.展示行政区划 end ---------------------------------------->
+
+//5.执行搜索 start ---------------------------------------->
+const getcityid = ref("")
+
+//获得cityid和
 let goToPrimary = async () => {
-    if (inputValue.value==""||selectValue.value=="") {
-        ElMessage.error('搜索项不能为空!')
-    }else{
-        if(selectValue.value == 2||selectValue.value == 3){
-            ElMessage.error('所选分类暂不支持检索!')
-        }else{
-            const route = `/search/search?type=${selectValue.value}&keyword=${inputValue.value}`;
-            window.location.href = route;
-        }
+    if (province.value != "") { getcityid.value = province.value }
+    if (city.value != "") { getcityid.value = city.value }
+    if (region.value != "") { getcityid.value = region.value }
+
+    if (province.value == "" && city.value == "" && region.value == "") {
+        ElMessage.error('请选择地区!')
+    } else {
+        const route = `/search/search?catids=${getcityid.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);
-    // }
-})
-//2.搜索 end ---------------------------------------->
+//5.执行搜索 end ---------------------------------------->
 
 </script>
 
 <style lang="less" scoped>
-    @import url('@/assets/css/public/nav.less');
+@import url('@/assets/css/public/nav.less');
 </style>

+ 1 - 1
components/home/pageNavigation1.vue

@@ -19,7 +19,7 @@
         <div class="partTwo">
             <div class="inner">
                 <ul class="partTwoNav">
-                    <li class="navList">农民工资讯</li>
+                    <!-- <li class="navList">农民工资讯</li> -->
                     <li class="navList" v-for="(item, index) in navigation2" :key="index">
                         <NuxtLink :href="getLinkPath(item)" :title="item.alias" :target="item.is_url == 1 ? '_blank' : '_self'">
                             {{ item.alias }}

+ 28 - 21
composables/publicFunction.ts

@@ -1,34 +1,34 @@
 //1.格式化日期 start ---------------------------------------->
 //time 日期字符串 type 从什么时候开始返回 year = 返回年月日 month = 返回月日..
 //style 样式,比如 年-月-日 年.月.日
-const getTime = function(time:string,type:string,style:Number){
+const getTime = function (time: string, type: string, style: Number) {
   const date = new Date(time);
   const year = date.getFullYear();
   const month = date.getMonth() + 1;
   const day = date.getDate();
 
   //返回 年-月-日
-  if(type == 'year'&& style == 1){
+  if (type == 'year' && style == 1) {
     return `${year}-${month}-${day}`;
   }
   //返回 年-月
-  if(type == 'year'&& style == 2){
+  if (type == 'year' && style == 2) {
     return `${year}-${month}`;
   }
   //返回 年
-  if(type == 'year'&& style == 3){
+  if (type == 'year' && style == 3) {
     return `${year}`;
   }
   //返回 月-日
-  if(type == 'month'&& style == 1){
+  if (type == 'month' && style == 1) {
     return `${month}-${day}`;
   }
   //返回 月.日
-  if(type == 'month'&& style == 2){
+  if (type == 'month' && style == 2) {
     return `${month}.${day}`;
   }
   //返回 日
-  if(type == 'day'&& style == 1){
+  if (type == 'day' && style == 1) {
     return `${day}`;
   }
 }
@@ -36,10 +36,10 @@ const getTime = function(time:string,type:string,style:Number){
 
 //2.格式化标题长度 start ---------------------------------------->
 //title 标题 length 长度
-const getTitleLength = function(title:string,length:number){
-  if(title.length >= length){
+const getTitleLength = function (title: string, length: number) {
+  if (title.length >= length) {
     return title.substring(0, length) + "...";
-  }else{
+  } else {
     return title;
   }
 }
@@ -47,26 +47,33 @@ const getTitleLength = function(title:string,length:number){
 
 //3.格式化跳转路径 start ---------------------------------------->
 //3.1跳转到频道页面或者一级列表页
-const getLinkPath = (item:any) => {
-  if (item.children_count == 0) {
-      return `/${item.aLIas_pinyin}/list-1.html`;
+const getLinkPath = (item: any) => {
+  if (item.is_url == 1) {
+    return `${item.web_url}`;
+  } else if (item.children_count == 0) {
+    //return `/newsList/${item.category_id}?page=1`;
+    return `/${item.aLIas_pinyin}/list-1.html`;
   } else {
-      return `/${item.aLIas_pinyin}/index.html`;
+    //return `/primaryNavigation/${item.aLIas_pinyin}/`;
+    return `/${item.aLIas_pinyin}/index.html`;
   }
 }
+const getLinkPath1 = (item: any) => {
+  return `/${item.pinyin}/list-1.html`;
+}
 //3.2跳转到详情页
-const getLinkPathDetail = (item:any) => {
+const getLinkPathDetail = (item: any) => {
   if (item.islink == 1) {
-      return `${item.linkurl}`;
+    return `${item.linkurl}`;
   } else {
-      return `/${item.pinyin}/${item.id}.html`;
+    return `/${item.pinyin}/${item.id}.html`;
   }
 }
 //3.格式化跳转路径 end ---------------------------------------->
 
 
 //4.获得路由路径 start ---------------------------------------->
-const getRoutePath = (type:Number) => {
+const getRoutePath = (type: Number) => {
   const route = useRoute();
   //获得当前的完整路径
   const fullPath = route.path;
@@ -75,10 +82,10 @@ const getRoutePath = (type:Number) => {
   const targetSegmentOne = segments[1];
   const targetSegmentTwo = segments[2];
 
-  if(type == 1){
+  if (type == 1) {
     return targetSegmentOne;
   }
-  if(type == 2){
+  if (type == 2) {
     return targetSegmentTwo;
   }
 }
@@ -86,4 +93,4 @@ const getRoutePath = (type:Number) => {
 
 
 //4.获得路由路径 end ---------------------------------------->
-export { getTime,getTitleLength,getLinkPath,getLinkPathDetail,getRoutePath};
+export { getTime, getTitleLength, getLinkPath, getLinkPathDetail, getRoutePath, getLinkPath1 };

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

@@ -164,8 +164,8 @@ async function getPageData() {
         //获取发布时间
         time.value = newsDetail.value.updated_at.split(' ')[0];
         //修正标题长度
-        if (newsDetail.value.title.length >= 30) {
-            routeNewsTtitle.value = newsDetail.value.title.substr(0, 30) + "...";
+        if (newsDetail.value.title.length >= 20) {
+            routeNewsTtitle.value = newsDetail.value.title.substr(0, 20) + "...";
         } else {
             routeNewsTtitle.value = newsDetail.value.title
         }
@@ -185,7 +185,7 @@ let adImg1 = ref([]);
 onMounted(async ()  => {
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_detail_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_detail_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',

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

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

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

@@ -156,8 +156,8 @@ async function getPageData() {
         //获取发布时间
         time.value = newsDetail.value.updated_at.split(' ')[0];
         //修正标题长度
-        if (newsDetail.value.title.length >= 30) {
-            routeNewsTtitle.value = newsDetail.value.title.substr(0, 30) + "...";
+        if (newsDetail.value.title.length >= 20) {
+            routeNewsTtitle.value = newsDetail.value.title.substr(0, 20) + "...";
         } else {
             routeNewsTtitle.value = newsDetail.value.title
         }
@@ -174,7 +174,7 @@ let adImg1 = ref([]);
 onMounted(async ()  => {
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_detail_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_detail_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',

文件差异内容过多而无法显示
+ 475 - 310
pages/[dir]/index.html.vue


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

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

+ 5 - 4
pages/about/[dir]/[dir]/[id].vue

@@ -2,7 +2,7 @@
     <!-- 页面头部 -->
     <HomePageHead></HomePageHead>
     <!-- 导航栏 -->
-    <HomePageNavigation1></HomePageNavigation1>
+    <HomePageNavigation></HomePageNavigation>
     <!-- 列表页广告一 -->
     <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
     <!-- 面包屑导航 -->
@@ -131,7 +131,8 @@ async function getPageData() {
     const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
         method: 'GET',
         query: {
-            'fcat_id': articleId
+            'fcat_id': articleId,
+            'type': 0,
         },
     });
     newsDetail.value = mkdata.data;
@@ -175,7 +176,7 @@ onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_page_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -187,7 +188,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_page_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

+ 5 - 4
pages/about/[dir]/index.html.vue

@@ -2,7 +2,7 @@
     <!-- 页面头部 -->
     <HomePageHead></HomePageHead>
     <!-- 导航栏 -->
-    <HomePageNavigation1></HomePageNavigation1>
+    <HomePageNavigation></HomePageNavigation>
     <!-- 列表页广告一 -->
     <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
     <!-- 面包屑导航 -->
@@ -132,7 +132,8 @@ async function getPageData() {
     const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
         method: 'GET',
         query: {
-            'fcat_id': articleId
+            'fcat_id': articleId,
+            'type': 0,
         },
     });
     newsDetail.value = mkdata.data;
@@ -176,7 +177,7 @@ onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_page_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -188,7 +189,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_page_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

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

@@ -3,7 +3,7 @@
         <!-- 页面头部 -->
         <HomePageHead></HomePageHead>
         <!-- 导航栏 -->
-        <HomePageNavigation1></HomePageNavigation1>
+        <HomePageNavigation></HomePageNavigation>
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
         <!-- 面包屑导航 -->
@@ -184,7 +184,7 @@ onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_page_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -196,7 +196,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_page_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_page_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

+ 344 - 453
pages/index.vue

@@ -11,12 +11,8 @@
                     </NuxtLink>
                 </h3>
                 <div class="index_1_h3_title_box">
-                    <NuxtLink class="index_1_h3_title_box_a" 
-                        :href="getLinkPathDetail(headline)" 
-                        :title="headline.title"
-                        :target="headline.islink == 1 ? '_blank' : '_self'"
-                        v-for="item in headlineData2"
-                    >
+                    <NuxtLink class="index_1_h3_title_box_a" :href="getLinkPathDetail(headline)" :title="headline.title"
+                        :target="headline.islink == 1 ? '_blank' : '_self'" v-for="item in headlineData2">
                         {{ item.title }}
                     </NuxtLink>
                 </div>
@@ -29,65 +25,35 @@
                 <!-- open 农民工人才库-->
                 <div class="index_2_right_box">
                     <div class="index_2_head clearfix">
-                        <NuxtLink
-                            class="index_2_head_a"
-                            :class="{'index_2_head_a_only': hoverStatus === 1}"
-                            @mouseenter="qhPic(1)"
-                            :href="getLinkPath(pageData[0])"
-                            :title="pageData[0].alias"
-                            >
-                            {{pageData[0].alias}}
+                        <NuxtLink class="index_2_head_a" :class="{ 'index_2_head_a_only': hoverStatus === 1 }"
+                            @mouseenter="qhPic(1)" :href="getLinkPath(pageData[0])" :title="pageData[0].alias">
+                            {{ pageData[0].alias }}
                         </NuxtLink>
-                        <NuxtLink
-                            class="index_2_head_a"
-                            :class="{'index_2_head_a_only': hoverStatus === 2}"
-                            @mouseenter="qhPic(2)"
-                            :href="getLinkPath(pageData[1])"
-                            :title="pageData[1].alias"
-                            >
-                            {{pageData[1].alias}}
+                        <NuxtLink class="index_2_head_a" :class="{ 'index_2_head_a_only': hoverStatus === 2 }"
+                            @mouseenter="qhPic(2)" :href="getLinkPath(pageData[1])" :title="pageData[1].alias">
+                            {{ pageData[1].alias }}
                         </NuxtLink>
-                        <NuxtLink
-                            class="index_2_head_a"
-                            :class="{'index_2_head_a_only': hoverStatus === 3}"
-                            @mouseenter="qhPic(3)"
-                            :href="getLinkPath(pageData[2])"
-                            :title="pageData[2].alias"
-                            >
-                            {{pageData[2].alias}}
+                        <NuxtLink class="index_2_head_a" :class="{ 'index_2_head_a_only': hoverStatus === 3 }"
+                            @mouseenter="qhPic(3)" :href="getLinkPath(pageData[2])" :title="pageData[2].alias">
+                            {{ pageData[2].alias }}
                         </NuxtLink>
                     </div>
                     <div class="index_2_ul index_2_ul_top index_2_ul_bold" v-if="hoverStatus == 1">
-                        <NuxtLink
-                            class="index_2_ul_a dot1"
-                            v-for="item in boxData1"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
-                        {{ item.title }}
+                        <NuxtLink class="index_2_ul_a dot1" v-for="item in boxData1" :href="getLinkPathDetail(item)"
+                            :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                            {{ item.title }}
                         </NuxtLink>
                     </div>
                     <div class="index_2_ul index_2_ul_top index_2_ul_bold" v-if="hoverStatus == 2">
-                        <NuxtLink
-                            class="index_2_ul_a dot1"
-                            v-for="item in boxData2"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
-                        {{ item.title }}
+                        <NuxtLink class="index_2_ul_a dot1" v-for="item in boxData2" :href="getLinkPathDetail(item)"
+                            :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                            {{ item.title }}
                         </NuxtLink>
                     </div>
                     <div class="index_2_ul index_2_ul_top index_2_ul_bold" v-if="hoverStatus == 3">
-                        <NuxtLink
-                            class="index_2_ul_a dot1"
-                            v-for="item in boxData3"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
-                        {{ item.title }}
+                        <NuxtLink class="index_2_ul_a dot1" v-for="item in boxData3" :href="getLinkPathDetail(item)"
+                            :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                            {{ item.title }}
                         </NuxtLink>
                     </div>
                 </div>
@@ -265,36 +231,22 @@
             <!-- 动态模块开始-->
             <section class="index_5 clearfix">
                 <div class="index_2_head  clearfix">
-                    <NuxtLink
-                        class="index_2_head_a"
-                        :class="{'index_2_head_a_only': hoverStatusTwo === 1}"
-                        @mouseenter="qhPicTwo(1)"
-                        :href="getLinkPath(pageData[3])"
-                        :title="pageData[3].alias"
-                        >
-                        {{pageData[3].alias}}
+                    <NuxtLink class="index_2_head_a" :class="{ 'index_2_head_a_only': hoverStatusTwo === 1 }"
+                        @mouseenter="qhPicTwo(1)" :href="getLinkPath(pageData[3])" :title="pageData[3].alias">
+                        {{ pageData[3].alias }}
                     </NuxtLink>
-                    <NuxtLink
-                        class="index_2_head_a"
-                        :class="{'index_2_head_a_only': hoverStatusTwo === 2}"
-                        @mouseenter="qhPicTwo(2)"
-                        :href="getLinkPath(pageData[4])"
-                        :title="pageData[4].alias"
-                        >
-                        {{pageData[4].alias}}
+                    <NuxtLink class="index_2_head_a" :class="{ 'index_2_head_a_only': hoverStatusTwo === 2 }"
+                        @mouseenter="qhPicTwo(2)" :href="getLinkPath(pageData[4])" :title="pageData[4].alias">
+                        {{ pageData[4].alias }}
                     </NuxtLink>
                 </div>
                 <div class="clearfix" v-if="hoverStatusTwo === 1">
                     <div class="index_5_box_1 clearfix">
                         <div class="index_5_big_img_ul">
                             <div class="index_5_big_img_li">
-                                <NuxtLink
-                                    class="index_5_big_img_li_a"
-                                    :href="getLinkPathDetail(item)"
-                                    v-for="item in boxData4"
-                                    :title="item.title"
-                                    :target="item.islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="index_5_big_img_li_a" :href="getLinkPathDetail(item)"
+                                    v-for="item in boxData4" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <img class="index_5_big_img_li_img" :src="item.imgurl" alt="item.title">
                                     <div class="index_5_big_img_li_dot2 dot2">
                                         {{ item.title }}
@@ -304,12 +256,8 @@
                         </div>
                         <div class="index_5_img_ul">
                             <div class="index_5_img_li" v-for="item in boxData4data2">
-                                <NuxtLink
-                                    class="index_5_img_li_a"
-                                    :href="getLinkPathDetail(item)"
-                                    :title="item.title"
-                                    :target="item.islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="index_5_img_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <img class="index_5_img_li_img" :src="item.imgurl" alt="item.title">
                                     <div class="index_5_img_li_dot2 dot2">
                                         {{ item.title }}
@@ -320,13 +268,9 @@
                     </div>
                     <div class="index_5_box_2 clearfix">
                         <div class="index_5_ul">
-                            <NuxtLink
-                                class="index_5_ul_a dot1"
-                                :href="getLinkPathDetail(item)"
-                                v-for="item in boxData4data4"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_5_ul_a dot1" :href="getLinkPathDetail(item)"
+                                v-for="item in boxData4data4" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 {{ item.title }}
                             </NuxtLink>
                         </div>
@@ -334,12 +278,8 @@
                     <div class="index_5_box_3 clearfix">
                         <div class="index_5_img_ul_2 clearfix">
                             <div class="index_5_img_ul_2_li" v-for="item in boxData4data3">
-                                <NuxtLink
-                                    class="index_5_img_ul_2_li_a"
-                                    :href="getLinkPathDetail(item)"
-                                    :title="item.title"
-                                    :target="item.islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="index_5_img_ul_2_li_a" :href="getLinkPathDetail(item)"
+                                    :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                     <img class="index_5_img_ul_2_li_img" :src="item.imgurl" alt="item.title">
                                     <div class="index_5_img_ul_2_li_dot1 dot1">
                                         {{ item.title }}
@@ -348,13 +288,9 @@
                             </div>
                         </div>
                         <div class="index_2_ul index_2_ul_2">
-                            <NuxtLink
-                                class="index_2_ul_a dot1"
-                                :href="getLinkPathDetail(item)"
-                                v-for="item in boxData4data5"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_2_ul_a dot1" :href="getLinkPathDetail(item)"
+                                v-for="item in boxData4data5" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 {{ item.title }}
                             </NuxtLink>
                         </div>
@@ -364,13 +300,9 @@
                     <div class="index_5_box_1 clearfix">
                         <div class="index_5_big_img_ul">
                             <div class="index_5_big_img_li">
-                                <NuxtLink
-                                    class="index_5_big_img_li_a"
-                                    :href="getLinkPathDetail(item)"
-                                    v-for="item in boxData5"
-                                    :title="item.title"
-                                    :target="item.islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="index_5_big_img_li_a" :href="getLinkPathDetail(item)"
+                                    v-for="item in boxData5" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <img class="index_5_big_img_li_img" :src="item.imgurl" alt="item.title">
                                     <div class="index_5_big_img_li_dot2 dot2">
                                         {{ item.title }}
@@ -380,12 +312,8 @@
                         </div>
                         <div class="index_5_img_ul">
                             <div class="index_5_img_li" v-for="item in boxData5data2">
-                                <NuxtLink
-                                    class="index_5_img_li_a"
-                                    :href="getLinkPathDetail(item)"
-                                    :title="item.title"
-                                    :target="item.islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="index_5_img_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                    :target="item.islink == 1 ? '_blank' : '_self'">
                                     <img class="index_5_img_li_img" :src="item.imgurl" alt="item.title">
                                     <div class="index_5_img_li_dot2 dot2">
                                         {{ item.title }}
@@ -396,13 +324,9 @@
                     </div>
                     <div class="index_5_box_2 clearfix">
                         <div class="index_5_ul">
-                            <NuxtLink
-                                class="index_5_ul_a dot1"
-                                :href="getLinkPathDetail(item)"
-                                v-for="item in boxData5data4"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_5_ul_a dot1" :href="getLinkPathDetail(item)"
+                                v-for="item in boxData5data4" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 {{ item.title }}
                             </NuxtLink>
                         </div>
@@ -410,12 +334,8 @@
                     <div class="index_5_box_3 clearfix">
                         <div class="index_5_img_ul_2 clearfix">
                             <div class="index_5_img_ul_2_li" v-for="item in boxData5data3">
-                                <NuxtLink
-                                    class="index_5_img_ul_2_li_a"
-                                    :href="getLinkPathDetail(item)"
-                                    :title="item.title"
-                                    :target="item.islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="index_5_img_ul_2_li_a" :href="getLinkPathDetail(item)"
+                                    :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
                                     <img class="index_5_img_ul_2_li_img" :src="item.imgurl" alt="item.title">
                                     <div class="index_5_img_ul_2_li_dot1 dot1">
                                         {{ item.title }}
@@ -424,13 +344,9 @@
                             </div>
                         </div>
                         <div class="index_2_ul index_2_ul_2">
-                            <NuxtLink
-                                class="index_2_ul_a dot1"
-                                :href="getLinkPathDetail(item)"
-                                v-for="item in boxData5data5"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_2_ul_a dot1" :href="getLinkPathDetail(item)"
+                                v-for="item in boxData5data5" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 {{ item.title }}
                             </NuxtLink>
                         </div>
@@ -442,102 +358,66 @@
             <!-- open 农民工资讯-->
             <section class="index_6 clearfix">
                 <div class="index_2_head clearfix">
-                    <NuxtLink
-                        class="index_2_head_a index_2_head_a_only"
-                        v-if="pageData[5].cid"
-                        :href="getLinkPath(pageData[5])"
-                        :title="pageData[5].alias"
-                        >
-                        {{pageData[5].alias}}
+                    <NuxtLink class="index_2_head_a index_2_head_a_only" v-if="pageData[5].cid"
+                        :href="getLinkPath(pageData[5])" :title="pageData[5].alias">
+                        {{ pageData[5].alias }}
                     </NuxtLink>
 
                     <div class="index_6_head_right">
                         <div class="index_6_head_right_in">
-                            <NuxtLink 
-                                class="index_6_head_right_in_a" 
-                                v-for="item in boxData6menu"
-                                :to="{ path: `/${item.aLIas_pinyin}/list-1.html`}" 
-                                :title="item.alias"
-                            >
-                                {{item.alias}}
+                            <NuxtLink class="index_6_head_right_in_a" v-for="item in boxData6menu"
+                                :to="{ path: `/${item.aLIas_pinyin}/list-1.html` }" :title="item.alias">
+                                {{ item.alias }}
                             </NuxtLink>
                         </div>
 
-                        <NuxtLink
-                            class="index_6_head_right_in_a"
-                            v-if="pageData[5].cid"
-                            :href="getLinkPath(pageData[5])"
-                            :title="pageData[5].alias"
-                            >
+                        <NuxtLink class="index_6_head_right_in_a" v-if="pageData[5].cid"
+                            :href="getLinkPath(pageData[5])" :title="pageData[5].alias">
                             更多 &gt;
                         </NuxtLink>
                     </div>
                 </div>
                 <div class="index_6_left clearfix">
                     <div class="roll_2_box">
-                        <div class="roll_2_img_ul" v-if="boxData6.length>0">
+                        <div class="roll_2_img_ul" v-if="boxData6.length > 0">
                             <div class="roll_2_per">
-                                <NuxtLink
-                                    class="roll_2_per_a"
-                                    v-if="showImg == 1&&boxData6[0]"
-                                    :href="getLinkPathDetail(boxData6[0])"
-                                    :title="boxData6[0].title"
-                                    :target="boxData6[0].islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="roll_2_per_a" v-if="showImg == 1 && boxData6[0]"
+                                    :href="getLinkPathDetail(boxData6[0])" :title="boxData6[0].title"
+                                    :target="boxData6[0].islink == 1 ? '_blank' : '_self'">
                                     <img class="roll_2_per_a_img" :src="boxData6[0].imgurl" alt="boxData6[0].title">
                                 </NuxtLink>
-                                <NuxtLink
-                                    class="roll_2_per_a"
-                                    v-if="showImg == 2&&boxData6[1]"
-                                    :href="getLinkPathDetail(boxData6[1])"
-                                    :title="boxData6[1].title"
-                                    :target="boxData6[1].islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="roll_2_per_a" v-if="showImg == 2 && boxData6[1]"
+                                    :href="getLinkPathDetail(boxData6[1])" :title="boxData6[1].title"
+                                    :target="boxData6[1].islink == 1 ? '_blank' : '_self'">
                                     <img class="roll_2_per_a_img" :src="boxData6[1].imgurl" alt="boxData6[1].title">
                                 </NuxtLink>
-                                <NuxtLink
-                                    class="roll_2_per_a"
-                                    v-if="showImg == 3&&boxData6[2]"
-                                    :href="getLinkPathDetail(boxData6[2])"
-                                    :title="boxData6[2].title"
-                                    :target="boxData6[2].islink == 1 ? '_blank' : '_self'"
-                                >
+                                <NuxtLink class="roll_2_per_a" v-if="showImg == 3 && boxData6[2]"
+                                    :href="getLinkPathDetail(boxData6[2])" :title="boxData6[2].title"
+                                    :target="boxData6[2].islink == 1 ? '_blank' : '_self'">
                                     <img class="roll_2_per_a_img" :src="boxData6[2].imgurl" alt="boxData6[2].title">
                                 </NuxtLink>
                             </div>
                         </div>
                     </div>
-                    <div class="roll_2_btn_box" v-if="boxData6.length>0">
+                    <div class="roll_2_btn_box" v-if="boxData6.length > 0">
                         <div class="roll_2_btn roll_2_btn_only">
-                            <NuxtLink
-                                class="roll_2_btn_dot2 dot2"
-                                @mouseenter="changeImg(1)"
-                                :href="getLinkPathDetail(boxData6[0])"
-                                :title="boxData6[0].title"
-                                :target="boxData6[0].islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="roll_2_btn_dot2 dot2" @mouseenter="changeImg(1)"
+                                :href="getLinkPathDetail(boxData6[0])" :title="boxData6[0].title"
+                                :target="boxData6[0].islink == 1 ? '_blank' : '_self'">
                                 {{ boxData6[0].title }}
                             </NuxtLink>
                         </div>
                         <div class="roll_2_btn roll_2_btn_only">
-                            <NuxtLink
-                                class="roll_2_btn_dot2 dot2"
-                                @mouseenter="changeImg(2)"
-                                :href="getLinkPathDetail(boxData6[1])"
-                                :title="boxData6[1].title"
-                                :target="boxData6[1].islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="roll_2_btn_dot2 dot2" @mouseenter="changeImg(2)"
+                                :href="getLinkPathDetail(boxData6[1])" :title="boxData6[1].title"
+                                :target="boxData6[1].islink == 1 ? '_blank' : '_self'">
                                 {{ boxData6[1].title }}
                             </NuxtLink>
                         </div>
                         <div class="roll_2_btn roll_2_btn_only">
-                            <NuxtLink
-                                class="roll_2_btn_dot2 dot2"
-                                @mouseenter="changeImg(3)"
-                                :href="getLinkPathDetail(boxData6[2])"
-                                :title="boxData6[2].title"
-                                :target="boxData6[2].islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="roll_2_btn_dot2 dot2" @mouseenter="changeImg(3)"
+                                :href="getLinkPathDetail(boxData6[2])" :title="boxData6[2].title"
+                                :target="boxData6[2].islink == 1 ? '_blank' : '_self'">
                                 {{ boxData6[2].title }}
                             </NuxtLink>
                         </div>
@@ -546,12 +426,8 @@
                 <div class="index_6_right clearfix">
                     <div class="index_6_img_ul clearfix">
                         <div class="index_6_img_li" v-for="item in boxData6data2">
-                            <NuxtLink
-                                class="index_6_img_li_a"
-                                :href="getLinkPathDetail(item)"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_6_img_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <img class="index_6_img_li_img" :src="item.imgurl" alt="item.title">
                                 <div class="index_6_img_li_dot3 dot3">
                                     {{ item.title }}
@@ -566,22 +442,15 @@
                 <!-- open 专题报道-->
                 <div class="index_6_left clearfix">
                     <div class="index_7_head" v-if="boxData6menu[0]">
-                        <NuxtLink
-                            :to="{ path: `/${boxData6pinyin}/list-1.html`}"
-                            v-if="boxData6menu[0]" 
-                            class="index_7_head_a" 
-                            :title="boxData6menu[0].alias">
+                        <NuxtLink :to="{ path: `/${boxData6pinyin}/list-1.html` }" v-if="boxData6menu[0]"
+                            class="index_7_head_a" :title="boxData6menu[0].alias">
                             {{ boxData6menu[0].alias }}
                         </NuxtLink>
                     </div>
                     <div class="index_7_ul clearfix">
-                        <NuxtLink
-                            class="index_7_ul_a dot1"
-                            :href="getLinkPathDetail(item)"
-                            v-for="item in boxData6mainData"
-                            :title="item.title"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
+                        <NuxtLink class="index_7_ul_a dot1" :href="getLinkPathDetail(item)"
+                            v-for="item in boxData6mainData" :title="item.title"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </div>
@@ -593,12 +462,24 @@
                         <a class="index_7_head_a" href="" title="">各地机构动态</a>
                     </div>
                     <div class="index_7_btn_ul clearfix">
-                        <a class="index_7_btn_a dot1" href="" title="">各地用户大户</a>
-                        <a class="index_7_btn_a dot1" href="" title="">劳动保障部门</a>
-                        <a class="index_7_btn_a dot1" href="" title="">各级工会组织</a>
-                        <a class="index_7_btn_a dot1" href="" title="">各地妇联组织</a>
-                        <a class="index_7_btn_a dot1" href="" title="">各地人才市场</a>
+                        <NuxtLink class="index_7_btn_a dot1" v-if="pageData[11].cid" :href="getLinkPath(pageData[11])"
+                            :title="pageData[11].alias">
+                            劳动保障部门
+                        </NuxtLink>
+                        <NuxtLink class="index_7_btn_a dot1" v-if="pageData[12].cid" :href="getLinkPath(pageData[12])"
+                            :title="pageData[12].alias">
+                            各级工会组织
+                        </NuxtLink>
+                        <NuxtLink class="index_7_btn_a dot1" v-if="pageData[13].cid" :href="getLinkPath(pageData[13])"
+                            :title="pageData[13].alias">
+                            各地妇联组织
+                        </NuxtLink>
+                        <NuxtLink class="index_7_btn_a dot1" v-if="pageData[14].cid" :href="getLinkPath(pageData[14])"
+                            :title="pageData[14].alias">
+                            各地人才市场
+                        </NuxtLink>
                         <a class="index_7_btn_a dot1" href="" title="">各地人才中介</a>
+                        <a class="index_7_btn_a dot1" href="" title="">各地用户大户</a>
                     </div>
                 </div>
                 <!-- 各地机构动态over -->
@@ -606,31 +487,19 @@
             <section class="index_8 clearfix">
                 <!-- open 人才服务-->
                 <div class="index_2_head  clearfix">
-                    <NuxtLink
-                        class="index_2_head_a index_2_head_a_only"
-                        v-if="pageData[6].cid"
-                        :href="getLinkPath(pageData[6])"
-                        :title="pageData[6].alias"
-                        >
-                        {{pageData[6].alias}}
+                    <NuxtLink class="index_2_head_a index_2_head_a_only" v-if="pageData[6].cid"
+                        :href="getLinkPath(pageData[6])" :title="pageData[6].alias">
+                        {{ pageData[6].alias }}
                     </NuxtLink>
                     <div class="index_6_head_right">
                         <div class="index_6_head_right_in">
-                            <NuxtLink 
-                                class="index_6_head_right_in_a" 
-                                v-for="item in boxData7menu"
-                                :to="{ path: `/${item.aLIas_pinyin}/list-1.html`}" 
-                                :title="item.alias"
-                            >
-                                {{item.alias}}
+                            <NuxtLink class="index_6_head_right_in_a" v-for="item in boxData7menu"
+                                :to="{ path: `/${item.aLIas_pinyin}/list-1.html` }" :title="item.alias">
+                                {{ item.alias }}
                             </NuxtLink>
                         </div>
-                        <NuxtLink
-                            class="index_6_head_right_in_a"
-                            v-if="pageData[6].cid"
-                            :href="getLinkPath(pageData[6])"
-                            :title="pageData[6].alias"
-                            >
+                        <NuxtLink class="index_6_head_right_in_a" v-if="pageData[6].cid"
+                            :href="getLinkPath(pageData[6])" :title="pageData[6].alias">
                             更多 &gt;
                         </NuxtLink>
                     </div>
@@ -638,13 +507,9 @@
                 <div class="index_5_box_1 clearfix">
                     <div class="index_5_big_img_ul">
                         <div class="index_5_big_img_li">
-                            <NuxtLink
-                                class="index_5_big_img_li_a"
-                                :href="getLinkPathDetail(item)"
-                                v-for="item in boxData7"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_5_big_img_li_a" :href="getLinkPathDetail(item)"
+                                v-for="item in boxData7" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <img class="index_5_big_img_li_img" :src="item.imgurl" alt="item.title">
                                 <div class="index_5_big_img_li_dot2 dot2">
                                     {{ item.title }}
@@ -654,12 +519,8 @@
                     </div>
                     <div class="index_5_img_ul">
                         <div class="index_5_img_li" v-for="item in boxData7data2">
-                            <NuxtLink
-                                class="index_5_img_li_a"
-                                :href="getLinkPathDetail(item)"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_5_img_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <img class="index_5_img_li_img" :src="item.imgurl" alt="item.title">
                                 <div class="index_5_img_li_dot2 dot2">
                                     {{ item.title }}
@@ -670,13 +531,8 @@
                 </div>
                 <div class="index_5_box_2 clearfix">
                     <div class="index_5_ul">
-                        <NuxtLink
-                            class="index_5_ul_a dot1"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            v-for="item in boxData7data4"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
+                        <NuxtLink class="index_5_ul_a dot1" :href="getLinkPathDetail(item)" :title="item.title"
+                            v-for="item in boxData7data4" :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </div>
@@ -684,12 +540,8 @@
                 <div class="index_5_box_3 clearfix">
                     <div class="index_5_img_ul_2 clearfix">
                         <div class="index_5_img_ul_2_li" v-for="item in boxData7data3">
-                            <NuxtLink
-                                class="index_5_img_ul_2_li_a"
-                                :href="getLinkPathDetail(item)"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_5_img_ul_2_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <img class="index_5_img_ul_2_li_img" :src="item.imgurl" alt="item.title">
                                 <div class="index_5_img_ul_2_li_dot1 dot1">
                                     {{ item.title }}
@@ -697,66 +549,48 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <div class="index_2_ul index_2_ul_2">
-                        <NuxtLink
-                            class="index_2_ul_a dot1"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            v-for="item in boxData7data5"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
-                            {{ item.title }}
-                        </NuxtLink>
+                    <div class="adBox1" v-if="adImg3">
+                        <a href="http://nzgxw.org.cn/" v-if="adImg3.image_url == null" target="_blank"
+                            :title="adImg3.introduce">
+                            <img :src="adImg3.thumb" :title="adImg3.introduce" :id="adImg3.ad_tag"
+                                data-tag="adImg3.ad_tag">
+                        </a>
+                        <a :href="adImg3.image_url" :title="adImg3.introduce" v-else>
+                            <img :src="adImg3.image_src" :alt="adImg3.introduce" :id="adImg3.ad_tag"
+                                data-tag="adImg3.ad_tag">
+                        </a>
                     </div>
                 </div>
                 <!-- over 人才服务-->
             </section>
             <!-- 广告位三 start -->
-            <HomeAdvertising :imgurl="adImg3"></HomeAdvertising>
+            <HomeAdvertising :imgurl="adImg4"></HomeAdvertising>
             <!-- <HomeTopTenTitle :imgurl="adList[2]" v-if="adList[2]"></HomeTopTenTitle> -->
             <!-- 广告位三 end -->
             <section class="index_9 clearfix">
                 <!-- open 民工培训-->
                 <div class="index_9_box_1">
                     <div class="index_2_head clearfix">
-                        <NuxtLink
-                            :class="['index_2_head_a', hoverStatusThree==1 ? 'index_2_head_a_only' : '']"
-                            @mouseenter="qhPicThree(1)"
-                            v-if="pageData[7].cid"
-                            :href="getLinkPath(pageData[7])"
-                            :title="pageData[7].alias"
-                            >
-                            {{pageData[7].alias}}
+                        <NuxtLink :class="['index_2_head_a', hoverStatusThree == 1 ? 'index_2_head_a_only' : '']"
+                            @mouseenter="qhPicThree(1)" v-if="pageData[7].cid" :href="getLinkPath(pageData[7])"
+                            :title="pageData[7].alias">
+                            {{ pageData[7].alias }}
                         </NuxtLink>
-                        <NuxtLink
-                            :class="['index_2_head_a', hoverStatusThree==2 ? 'index_2_head_a_only' : '']"
-                            @mouseenter="qhPicThree(2)"
-                            v-if="pageData[8].cid"
-                            :href="getLinkPath(pageData[8])"
-                            :title="pageData[8].alias"
-                            >
-                            {{pageData[8].alias}}
+                        <NuxtLink :class="['index_2_head_a', hoverStatusThree == 2 ? 'index_2_head_a_only' : '']"
+                            @mouseenter="qhPicThree(2)" v-if="pageData[8].cid" :href="getLinkPath(pageData[8])"
+                            :title="pageData[8].alias">
+                            {{ pageData[8].alias }}
                         </NuxtLink>
                     </div>
-                    <div class="index_2_ul index_9_ul_1" v-if="hoverStatusThree==1">
-                        <NuxtLink
-                            class="index_2_ul_a dot1"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            v-for="item in boxData8"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
+                    <div class="index_2_ul index_9_ul_1" v-if="hoverStatusThree == 1">
+                        <NuxtLink class="index_2_ul_a dot1" :href="getLinkPathDetail(item)" :title="item.title"
+                            v-for="item in boxData8" :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </div>
-                    <div class="index_2_ul index_9_ul_1" v-if="hoverStatusThree==2">
-                        <NuxtLink
-                            class="index_2_ul_a dot1"
-                            :href="getLinkPathDetail(item)"
-                            :title="item.title"
-                            v-for="item in boxData9"
-                            :target="item.islink == 1 ? '_blank' : '_self'"
-                        >
+                    <div class="index_2_ul index_9_ul_1" v-if="hoverStatusThree == 2">
+                        <NuxtLink class="index_2_ul_a dot1" :href="getLinkPathDetail(item)" :title="item.title"
+                            v-for="item in boxData9" :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </div>
@@ -769,13 +603,9 @@
                     </div>
                     <div class="index_9_big_img_ul">
                         <div class="index_5_big_img_li">
-                            <NuxtLink
-                                class="index_5_big_img_li_a"
-                                :href="getLinkPathDetail(item)"
-                                v-for="item in boxData10"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_5_big_img_li_a" :href="getLinkPathDetail(item)"
+                                v-for="item in boxData10" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <img class="index_9_big_img_li_img" :src="item.imgurl" alt="item.title">
                                 <div class="index_5_big_img_li_dot2 dot2">
                                     {{ item.title }}
@@ -793,10 +623,22 @@
                         <a class="index_2_head_a index_2_head_a_only" title="">各地组织机构展示</a>
                     </div>
                     <div class="index_10_ul clearfix">
-                        <a class="index_10_ul_a dot1" href="" title="">妇联组织</a>
-                        <a class="index_10_ul_a dot1" href="" title="">人才市场</a>
-                        <a class="index_10_ul_a dot1" href="" title="">劳动保障机构</a>
-                        <a class="index_10_ul_a dot1" href="" title="">工会组织</a>
+                        <NuxtLink class="index_10_ul_a dot1" v-if="pageData[13].cid" :href="getLinkPath(pageData[13])"
+                            :title="pageData[13].alias">
+                            妇联组织
+                        </NuxtLink>
+                        <NuxtLink class="index_10_ul_a dot1" v-if="pageData[14].cid" :href="getLinkPath(pageData[14])"
+                            :title="pageData[14].alias">
+                            人才市场
+                        </NuxtLink>
+                        <NuxtLink class="index_10_ul_a dot1" v-if="pageData[11].cid" :href="getLinkPath(pageData[11])"
+                            :title="pageData[11].alias">
+                            劳动保障机构
+                        </NuxtLink>
+                        <NuxtLink class="index_10_ul_a dot1" v-if="pageData[12].cid" :href="getLinkPath(pageData[12])"
+                            :title="pageData[12].alias">
+                            工会组织
+                        </NuxtLink>
                     </div>
                 </div>
                 <!-- over 各地组织机构展示-->
@@ -807,12 +649,8 @@
                     </div>
                     <div class="index_10_img_ul clearfix">
                         <div class="index_10_img_ul_li" v-for="item in boxData11">
-                            <NuxtLink
-                                class="index_10_img_ul_li_a"
-                                :href="getLinkPathDetail(item)"
-                                :title="item.title"
-                                :target="item.islink == 1 ? '_blank' : '_self'"
-                            >
+                            <NuxtLink class="index_10_img_ul_li_a" :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
                                 <img class="index_10_img_ul_li_img" :src="item.imgurl" alt="item.title">
                                 <div class="index_10_img_ul_li_dot1 dot1">
                                     {{ item.title }}
@@ -842,7 +680,8 @@ async function getModelData1() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 5,
+            'imgnum': 0,
+            'textnum': 5,
             'level': 1,
             'placeid': 0,
             'id': ''
@@ -850,12 +689,12 @@ async function getModelData1() {
     });
     if (mkdata.code == 200) {
         //填充大标题
-        for (let index in mkdata.data) {
-           if(index < 1 ){
-                headline.value = mkdata.data[index]
-           }else{
-                headlineData2.value.push(mkdata.data[index])
-           }
+        for (let index in mkdata.data.text) {
+            if (index < 1) {
+                headline.value = mkdata.data.text[index]
+            } else {
+                headlineData2.value.push(mkdata.data.text[index])
+            }
         }
     } else {
         console.log("设置大标题错误", mkdata.message)
@@ -920,7 +759,7 @@ onMounted(async () => {
 
     //从客户端启动广告
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_index_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_index_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -932,7 +771,7 @@ onMounted(async () => {
     adImg1.value = resultAd1.data[0];
 
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_index_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_index_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',
@@ -944,7 +783,7 @@ onMounted(async () => {
     adImg2.value = resultAd2.data[0];
 
     //广告3
-    let url3 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_index_0003`
+    let url3 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_index_0003`
     const responseAd3 = await fetch(url3, {
         headers: {
             'Content-Type': 'application/json',
@@ -956,7 +795,7 @@ onMounted(async () => {
     adImg3.value = resultAd3.data[0];
 
     //广告4
-    let url4 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_index_0004`
+    let url4 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_index_0004`
     const responseAd4 = await fetch(url4, {
         headers: {
             'Content-Type': 'application/json',
@@ -1018,6 +857,9 @@ const boxData10 = ref([]);
 //模块11
 const boxData11 = ref([]);
 
+//获得全局配置的导航数据
+const { $pageNav } = useNuxtApp();
+
 //4.3获得导航数据
 try {
     const navigateData = await requestDataPromise('/web/getWebsiteModelCategory', {
@@ -1040,30 +882,37 @@ try {
                 chilid_id: navigateData.data[index].chilid_id
             };
             //渲染标题
-            //1
-            if (navigateData.data[index].category_id == 11) { pageData.value[0] = data }
-            //2
-            if (navigateData.data[index].category_id == 317) { pageData.value[1] = data }
-            //3
-            if (navigateData.data[index].category_id == 1) { pageData.value[2] = data }
-            //4
-            if (navigateData.data[index].category_id == 2) { pageData.value[3] = data }
-            //5
-            if (navigateData.data[index].category_id == 5) { pageData.value[4] = data }
-            //6
-            if (navigateData.data[index].category_id == 21) { pageData.value[5] = data }
-            //7
-            if (navigateData.data[index].category_id == 153) { pageData.value[6] = data }
-            //8
-            if (navigateData.data[index].category_id == 12) { pageData.value[7] = data }
-            //9
-            if (navigateData.data[index].category_id == 13) { pageData.value[8] = data }
-            //10
-            if (navigateData.data[index].category_id == 24) { pageData.value[9] = data }
-            //11
-            if (navigateData.data[index].category_id == 14) { pageData.value[10] = data }
-            //12
-            if (navigateData.data[index].category_id == 15) { pageData.value[11] = data }
+            //1农民工资讯552 759
+            if (navigateData.data[index].category_id == $pageNav[0]) { pageData.value[0] = data }
+            //2农民工维权548 747
+            if (navigateData.data[index].category_id == $pageNav[1]) { pageData.value[1] = data }
+            //3人才市场554  760
+            if (navigateData.data[index].category_id == $pageNav[2]) { pageData.value[2] = data }
+            //4致富信息545  689
+            if (navigateData.data[index].category_id == $pageNav[3]) { pageData.value[3] = data }
+            //5书刊音像城561 690
+            if (navigateData.data[index].category_id == $pageNav[4]) { pageData.value[4] = data }
+            //6农民工资讯552  759
+            if (navigateData.data[index].category_id == $pageNav[5]) { pageData.value[5] = data }
+            //7人才服务539  762
+            if (navigateData.data[index].category_id == $pageNav[6]) { pageData.value[6] = data }
+            //8农民工创业546  691
+            if (navigateData.data[index].category_id == $pageNav[7]) { pageData.value[7] = data }
+            //9农民工培训547  692
+            if (navigateData.data[index].category_id == $pageNav[8]) { pageData.value[8] = data }
+            //10知识天地558  686
+            if (navigateData.data[index].category_id == $pageNav[9]) { pageData.value[9] = data }
+            //11三农人物18  687
+            if (navigateData.data[index].category_id == $pageNav[10]) { pageData.value[10] = data }
+            // 固定的一级栏目
+            //12 劳动保障555  768
+            if (navigateData.data[index].category_id == $pageNav[11]) { pageData.value[11] = data }
+            //13 工会组织556  771
+            if (navigateData.data[index].category_id == $pageNav[12]) { pageData.value[12] = data }
+            //14 妇联组织557  773
+            if (navigateData.data[index].category_id == $pageNav[13]) { pageData.value[13] = data }
+            //15 人才市场554  760
+            if (navigateData.data[index].category_id == $pageNav[14]) { pageData.value[14] = data }
         }
     } else {
         console.log("获取导航池出错!", navigateData.message)
@@ -1073,17 +922,17 @@ try {
 }
 
 let getJson = [
-    { "parent": "11,0,6", "child": "" },//模块1
-    { "parent": "317,0,6", "child": "" },//模块2
-    { "parent": "1,0,6", "child": "" },//模块3
-    { "parent": "2,5,15", "child": "" },//模块4
-    { "parent": "5,5,15", "child": "" },//模块5
-    { "parent": "21,6,0", "child": "189,0,4" },//模块6 必须含有一个子导航的id 才能获取到子导航列表
-    { "parent": "153,5,15", "child": "258,0,5"},//模块7
-    { "parent": "12,0,6", "child": "" },//模块8
-    { "parent": "13,0,6", "child": "" },//模块9
-    { "parent": "24,1,0", "child": "" },//模块10
-    { "parent": "14,2,0", "child": "" },//模块11
+    { "parent": $pageNav[0] + ",0,6", "child": "" },//模块1 农民工资讯552
+    { "parent": $pageNav[1] + ",0,6", "child": "" },//模块2 农民工维权548
+    { "parent": $pageNav[2] + ",0,6", "child": "" },//模块3 人才市场554
+    { "parent": $pageNav[3] + ",5,15", "child": "" },//模块4 致富信息545
+    { "parent": $pageNav[4] + ",5,15", "child": "" },//模块5 书刊音像城561
+    { "parent": $pageNav[5] + ",6,0", "child": $pageNav[15] + ",0,4" },//模块6 农民工资讯552pre 必须含有一个子导航的id 才能获取到子导航列表
+    { "parent": $pageNav[6] + ",5,15", "child": "" },//模块7人才服务539
+    { "parent": $pageNav[7] + ",0,6", "child": "" },//模块8 农民工创业546
+    { "parent": $pageNav[8] + ",0,6", "child": "" },//模块9 农民工培训547
+    { "parent": $pageNav[9] + ",1,0", "child": "" },//模块10 知识天地558
+    { "parent": $pageNav[10] + ",2,0", "child": "" },//模块11 三农人物18
 ]
 
 let jsonString = JSON.stringify(getJson);
@@ -1097,93 +946,135 @@ async function getPageAllData() {
     });
 
     if (mkdata.code == 200) {
-        //模块1
-        boxData1.value = mkdata.data[0].textnum;
-        //模块2
-        boxData2.value = mkdata.data[1].textnum;
-        //模块3
-        boxData3.value = mkdata.data[2].textnum;
-        //模块4
-        mkdata.data[3].imgnum.forEach((item, index) => {
-            if (index < 1) {
-                boxData4.value.push(item);
-            }else if(index >= 1 && index <= 2){
-                boxData4data2.value.push(item);
-            }else if(index >= 3){
-                boxData4data3.value.push(item);
-            }
-        });
-        mkdata.data[3].textnum.forEach((item, index) => {
-            if (index < 10) {
-                boxData4data4.value.push(item);
-            }else{
-                boxData4data5.value.push(item);
+        if (mkdata.data.length > 0) {
+            //模块1
+            boxData1.value = mkdata.data[0].textnum;
+        }
+
+        if (mkdata.data.length > 1) {
+            //模块2
+            boxData2.value = mkdata.data[1].textnum;
+        }
+
+        if (mkdata.data.length > 2) {
+            //模块3
+            boxData3.value = mkdata.data[2].textnum;
+        }
+
+        if (mkdata.data.length > 3) {
+            //模块4
+            mkdata.data[3].imgnum.forEach((item, index) => {
+                if (index < 1) {
+                    boxData4.value.push(item);
+                } else if (index >= 1 && index <= 2) {
+                    boxData4data2.value.push(item);
+                } else if (index >= 3) {
+                    boxData4data3.value.push(item);
+                }
+            });
+            mkdata.data[3].textnum.forEach((item, index) => {
+                if (index < 10) {
+                    boxData4data4.value.push(item);
+                } else {
+                    boxData4data5.value.push(item);
+                }
+            });
+        }
+
+        if (mkdata.data.length > 4) {
+            //模块5
+            mkdata.data[4].imgnum.forEach((item, index) => {
+                if (index < 1) {
+                    boxData5.value.push(item);
+                } else if (index >= 1 && index <= 2) {
+                    boxData5data2.value.push(item);
+                } else if (index >= 3) {
+                    boxData5data3.value.push(item);
+                }
+            });
+            mkdata.data[4].textnum.forEach((item, index) => {
+                if (index < 10) {
+                    boxData5data4.value.push(item);
+                } else {
+                    boxData5data5.value.push(item);
+                }
+            });
+        }
+
+        if (mkdata.data.length > 5) {
+            //模块6
+            for (let index in mkdata.data[5].imgnum) {
+                if (index < 3) {
+                    boxData6.value.push(mkdata.data[5].imgnum[index])
+                } else {
+                    boxData6data2.value.push(mkdata.data[5].imgnum[index])
+                }
             }
-        });
-        //模块5
-        mkdata.data[4].imgnum.forEach((item, index) => {
-            if (index < 1) {
-                boxData5.value.push(item);
-            }else if(index >= 1 && index <= 2){
-                boxData5data2.value.push(item);
-            }else if(index >= 3){
-                boxData5data3.value.push(item);
+            if (mkdata.data[5].child) {
+                for (let index in mkdata.data[5].child.all_childcat) {
+                    if (index < 6) {
+                        boxData6menu.value.push(mkdata.data[5].child.all_childcat[index])
+                    }
+                }
+                //子导航路径
+                boxData6pinyin.value = mkdata.data[5].child.pinyin;
+                //子导航内容
+                boxData6mainData.value = mkdata.data[5].child.textnum;
             }
-        });
-        mkdata.data[4].textnum.forEach((item, index) => {
-            if (index < 10) {
-                boxData5data4.value.push(item);
-            }else{
-                boxData5data5.value.push(item);
+
+
+        }
+
+        if (mkdata.data.length > 6) {
+            //模块7
+            for (let index in mkdata.data[6].imgnum) {
+                if (index < 1) {
+                    boxData7.value.push(mkdata.data[6].imgnum[index])
+                } else if (index >= 1 && index <= 2) {
+                    boxData7data2.value.push(mkdata.data[6].imgnum[index])
+                } else if (index >= 3) {
+                    boxData7data3.value.push(mkdata.data[6].imgnum[index])
+                }
             }
-        });
-        //模块6
-        for(let index in mkdata.data[5].imgnum){
-            if(index < 3){
-                boxData6.value.push(mkdata.data[5].imgnum[index])
-            }else{
-                boxData6data2.value.push(mkdata.data[5].imgnum[index])
+
+            for (let index in mkdata.data[6].textnum) {
+                if (index <= 9) {
+                    boxData7data4.value.push(mkdata.data[6].textnum[index])
+                } else {
+                    boxData7data5.value.push(mkdata.data[6].textnum[index])
+                }
             }
-        }
-        for(let index in mkdata.data[5].child.all_childcat){
-            if(index < 6){
-                boxData6menu.value.push(mkdata.data[5].child.all_childcat[index])
+            if (mkdata.data[6].child) {
+                //子导航路径
+                boxData7pinyin.value = mkdata.data[6].child.pinyin;
+                //子导航内容
+                boxData7mainData.value = mkdata.data[6].child.textnum;
             }
+
         }
-        //子导航路径
-        boxData6pinyin.value = mkdata.data[5].child.pinyin;
-        //子导航内容
-        boxData6mainData.value = mkdata.data[5].child.textnum;
 
-        //模块7
-        for(let index in mkdata.data[6].imgnum){
-            if(index < 1){
-                boxData7.value.push(mkdata.data[6].imgnum[index])
-            }else if(index >= 1 && index <= 2){
-                boxData7data2.value.push(mkdata.data[6].imgnum[index])
-            }else if(index >= 3){
-                boxData7data3.value.push(mkdata.data[6].imgnum[index])
-            }
+        if (mkdata.data.length > 7) {
+            //模块8
+            boxData8.value = mkdata.data[7].textnum;
         }
-        for(let index in mkdata.data[6].textnum){
-            if(index <= 9){
-                boxData7data4.value.push(mkdata.data[6].textnum[index])
-            }else{
-                boxData7data5.value.push(mkdata.data[6].textnum[index])
-            }
+        if (mkdata.data.length > 8) {
+            //模块9
+            boxData9.value = mkdata.data[8].textnum;
+        }
+        if (mkdata.data.length > 9) {
+            //模块10
+            boxData10.value = mkdata.data[9].imgnum;
+        }
+        if (mkdata.data.length > 10) {
+            //模块11
+            boxData11.value = mkdata.data[10].imgnum;
         }
-        //子导航路径
-        boxData7pinyin.value = mkdata.data[6].child.pinyin;
-        //子导航内容
-        boxData7mainData.value = mkdata.data[6].child.textnum;
-        //模块8
-        boxData8.value = mkdata.data[7].textnum;
-        //模块9
-        boxData9.value = mkdata.data[8].textnum;
-        //模块10
-        boxData10.value = mkdata.data[9].imgnum;
-        //模块11
-        boxData11.value = mkdata.data[10].imgnum;
+
+
+
+
+
+
     } else {
         ElMessage.error(mkdata.message)
     }

+ 4 - 4
pages/search/[id].vue

@@ -3,7 +3,7 @@
         <!-- 页面头部 -->
         <HomePageHead></HomePageHead>
         <!-- 导航栏 -->
-        <HomePageNavigation1></HomePageNavigation1>
+        <HomePageNavigation></HomePageNavigation>
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
         <!-- 搜索框 -->
@@ -75,7 +75,7 @@ import { ref, onMounted } from 'vue';
 
 //2.获取url中的参数 start ---------------------------------------->
 const route = useRoute();
-const pageCatids = ""
+const pageCatids = route.query.catids;
 let keywordInput = ref("");
 
 if(route.params.id=='search'){
@@ -153,7 +153,7 @@ onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_search_0001`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_search_0001`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -165,7 +165,7 @@ onMounted(async ()  => {
     adImg1.value = resultAd1.data[0];
     
     //广告2
-    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_search_0002`
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmgw_search_0002`
     const responseAd2 = await fetch(url2, {
         headers: {
             'Content-Type': 'application/json',

+ 70 - 0
plugins/category.ts

@@ -0,0 +1,70 @@
+
+//master 环境
+const navMaster: number[] = [
+    759,//1
+    747,//2
+    760,//3
+    689,//4
+    690,//5
+    759,//6
+    762,//7
+    691,//8
+    692,//9
+    686,//10
+    687,//11
+    // 固定的一级栏目
+    768,//12
+    771,//13
+    773,//14
+    760,//15
+    // 首页二级栏目
+    1931,//16
+    // 频道页一级栏目
+    691,//17
+    768,//18
+    762,//19
+    // 频道页二级栏目
+    787,//20
+    786,//21
+    788,//22
+    789,//23
+    1724 //24招贤纳士
+]
+
+const navPre: number[] = [
+    552,
+    548,
+    554,
+    545,
+    561,
+    552,
+    539,
+    546,
+    547,
+    558,
+    18,
+    // 固定的一级栏目
+    555,
+    556,
+    557,
+    554,
+    // 二级栏目
+    588,
+    // 频道页一级栏目
+    546,
+    555,
+    539,
+    // 频道页二级栏目
+    568,
+    570,
+    571,
+    580,
+    587 //招贤纳士
+]
+
+export default defineNuxtPlugin((nuxtApp) => {
+    //master 环境
+    // nuxtApp.provide('pageNav', navMaster)
+    //pre 环境
+    nuxtApp.provide('pageNav', navPre)
+})

+ 6 - 6
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('CwebUrl', 'http://pre.zgnmg.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.zgnmg.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')

+ 2 - 2
plugins/request.ts

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

二进制
public/favicon.ico


部分文件因为文件数量过多而无法显示