Jing il y a 20 heures
Parent
commit
81389f06de

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

@@ -29,7 +29,7 @@ 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, getLinkPathDetail1, getRoutePath, getLinkPath1 } from '../composables/publicFunction';
 export { seoSetup } from '../composables/useSeo';
 export { apiUse, asyncFetchData, fGET, fPOST, fPUT, fDELETE, GET, POST, PUT, DELETE } from '../utils/request';
 export { definePageMeta } from '../node_modules/nuxt/dist/pages/runtime/composables';

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

@@ -1 +1 @@
-{"id":"7d717dfe-d957-446a-abfd-4c64d8aa55f9","timestamp":1746693552529}
+{"id":"465e2a1d-ddc8-463c-8e4a-3abeaf800431","timestamp":1746771065161}

+ 1 - 0
.nuxt/manifest/meta/465e2a1d-ddc8-463c-8e4a-3abeaf800431.json

@@ -0,0 +1 @@
+{"id":"465e2a1d-ddc8-463c-8e4a-3abeaf800431","timestamp":1746771065161,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/7d717dfe-d957-446a-abfd-4c64d8aa55f9.json

@@ -1 +0,0 @@
-{"id":"7d717dfe-d957-446a-abfd-4c64d8aa55f9","timestamp":1746693552529,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/7d717dfe-d957-446a-abfd-4c64d8aa55f9.json"
+        "./manifest/meta/465e2a1d-ddc8-463c-8e4a-3abeaf800431.json"
       ],
       "#components": [
         "./components"

+ 4 - 0
.nuxt/types/imports.d.ts

@@ -37,7 +37,9 @@ 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 getLinkPathDetail1: typeof import('../../composables/publicFunction')['getLinkPathDetail1']
   const getLinkPathDetail: typeof import('../../composables/publicFunction')['getLinkPathDetail']
   const getRoutePath: typeof import('../../composables/publicFunction')['getRoutePath']
   const getRouteRules: typeof import('../../node_modules/nuxt/dist/app/composables/manifest')['getRouteRules']
@@ -234,7 +236,9 @@ 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 getLinkPathDetail1: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPathDetail1']>
     readonly getLinkPathDetail: UnwrapRef<typeof import('../../composables/publicFunction')['getLinkPathDetail']>
     readonly getRoutePath: UnwrapRef<typeof import('../../composables/publicFunction')['getRoutePath']>
     readonly getRouteRules: UnwrapRef<typeof import('../../node_modules/nuxt/dist/app/composables/manifest')['getRouteRules']>

+ 1 - 1
assets/css/class.less

@@ -275,7 +275,7 @@ section {
 
 .index_2 {
     margin-top: 20px;
-    height: 490px;
+    height: 555px;
 }
 
 .index_2_left {

+ 1 - 1
assets/css/list.less

@@ -210,7 +210,7 @@
                     .listTitle {
                         // float: left;
                         display: inline-block;
-                        width: 486px;
+                        width: 750px;
                         white-space: nowrap;
                         overflow: hidden;
                         text-overflow: ellipsis;

+ 9 - 1
assets/css/search.less

@@ -110,7 +110,7 @@
                     line-height: 56px;
 
 
-                    >a {
+                    a {
                         width: 360px;
                         height: 26px;
                         font-family: Microsoft YaHei, Microsoft YaHei;
@@ -123,6 +123,14 @@
                         text-transform: none;
                     }
 
+                    .listText {
+                        display: inline-block;
+                        width: 1000px;
+                        white-space: nowrap;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
+
                     .time {
                         float: right;
                         font-family: Microsoft YaHei, Microsoft YaHei;

+ 75 - 33
components/home/ListSecondaryHeading.vue

@@ -1,12 +1,21 @@
 <template>
     <div class="index_main">
         <nav class="index_nav clearfix">
-            <span class="index_nav_a_one" href="javascript:(void)">{{ name }}</span>
-            <span v-for="(item,index) in nav" :class="['index_nav_a', { 'index_nav_a_only': targetSegment === item.aLIas_pinyin }]">
-                <span v-if="index<=7">
-                    <NuxtLink :to="{ path: `/${targetRoute}/${item.aLIas_pinyin}/list-1.html`}">{{ item.alias }}</NuxtLink>
+            <div class="index_navTitle_box">
+                <NuxtLink :to="`/${pinyin}/index.html`">
+                    <span class="index_nav_a_one" title="">
+                        {{ name }}
+                    </span>
+                </NuxtLink>
+            </div>
+            <div class="index_nav_box">
+                <span v-for="(item, index) in nav"
+                    :class="['index_nav_a', { 'index_nav_a_only': targetSegment === item.aLIas_pinyin }]">
+                    <span v-if="index <= 20">
+                        <NuxtLink :to="{ path: `/${item.aLIas_pinyin}/list-1.html` }">{{ item.alias }}</NuxtLink>
+                    </span>
                 </span>
-            </span>
+            </div>
         </nav>
     </div>
 </template>
@@ -15,16 +24,17 @@
 //1.设置组件数据 start---------------------------------------->
 //子导航
 const props = defineProps({
-    name:String,
-    nav:Array
+    name: String,
+    nav: Array,
+    pinyin: String,
 });
 
 //获取当前url路径
 const route = useRoute();
 //获得当前的完整路径
 const fullPath = route.path;
-const segments = fullPath.split('/'); 
-const targetRoute = segments[1]; 
+const segments = fullPath.split('/');
+const targetRoute = segments[1];
 //1.设置组件数据 end---------------------------------------->
 
 </script>
@@ -33,13 +43,27 @@ const targetRoute = segments[1];
 .index_main {
     width: 1200px;
     margin: 0 auto;
+    margin-bottom: 10px;
 }
+
 .index_nav {
     width: 1200px;
     margin: 0 auto;
     margin-top: 20px;
     border-bottom: solid 1px #D9D9D9;
     height: 88px;
+
+    .index_navTitle_box {
+        float: left;
+        height: 88px;
+        line-height: 88px;
+        font-size: 16px;
+        font-weight: bold;
+        color: #333;
+        width: 153px;
+        // margin: 0px 30px;
+    }
+
     .index_nav_a_one {
         float: left;
         color: #333;
@@ -63,31 +87,47 @@ const targetRoute = segments[1];
         background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/3.png) no-repeat left top;
         background-size: 100% 100%;
     }
+
+    .index_nav_box {
+        float: left;
+        // height: 88px;
+        // line-height: 88px;
+        font-size: 16px;
+        font-weight: bold;
+        color: #333;
+        width: 1009px;
+        margin-top: 15px;
+        margin-left: 25px;
+    }
+
     .index_nav_a {
         float: left;
         color: #333;
         font-size: 16px;
-        margin: 0px 30px;
-        height: 88px;
-        line-height: 88px;
+        margin: 5px 30px;
         font-weight: bold;
         border-bottom: solid 3px #fff;
         box-sizing: border-box;
         position: relative;
+
         a {
-            color:#333333
+            color: #333333
         }
-        &:hover{
+
+        &:hover {
             border-bottom: solid 3px #D2600F;
         }
     }
-    .index_nav_a a:hover{
+
+    .index_nav_a a:hover {
         color: #D2600F;
         // border-bottom: solid 3px #D2600F;
     }
+
     .index_nav_a_only {
         border-bottom: solid 3px #D2600F;
     }
+
     .index_nav_a::after {
         content: '';
         display: block;
@@ -95,24 +135,26 @@ const targetRoute = segments[1];
         width: 2px;
         height: 12px;
         background: #DBDBDB;
-        right: -38px;
-        top: 39px;
-    }
-    .index_nav_a:nth-last-of-type(1) {
-        overflow: hidden;
-    }
-    a.index_nav_a:nth-of-type(1) {
-        overflow: hidden;
-        height: 56px;
-        line-height: 56px;
-        color: #fff;
-        font-size: 18px;
-        font-weight: bold;
-        width: 153px;
-        margin: 14px 30px 0px 0px;
-        text-indent: 46px;
-        background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/3.png) no-repeat left top;
-        background-size: 100% 100%;
+        right: -28px;
+        top: 6px;
     }
+
+    // .index_nav_a:nth-last-of-type(1) {
+    //     overflow: hidden;
+    // }
+
+    // a.index_nav_a:nth-of-type(1) {
+    //     overflow: hidden;
+    //     height: 56px;
+    //     line-height: 56px;
+    //     color: #fff;
+    //     font-size: 18px;
+    //     font-weight: bold;
+    //     width: 153px;
+    //     margin: 14px 30px 0px 0px;
+    //     text-indent: 46px;
+    //     background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/3.png) no-repeat left top;
+    //     background-size: 100% 100%;
+    // }
 }
 </style>

+ 0 - 1
components/home/SecondaryHeading.vue

@@ -12,7 +12,6 @@
                     </span>
                 </span>
             </div>
-
         </nav>
     </div>
 </template>

+ 14 - 2
composables/publicFunction.ts

@@ -58,7 +58,11 @@ const getLinkPath = (item: any) => {
     return `/${item.aLIas_pinyin}/index.html`;
   }
 }
-//3.2跳转到详情页
+//3.2跳转到频道页
+const getLinkPath1 = (item: any) => {
+  return `/${item.aLIas_pinyin}/list-1.html`;
+}
+//3.3跳转到详情页
 const getLinkPathDetail = (item: any) => {
   if (item.islink == 1) {
     return `${item.linkurl}`;
@@ -66,6 +70,14 @@ const getLinkPathDetail = (item: any) => {
     return `/${item.pinyin}/${item.id}.html`;
   }
 }
+//3.3特殊跳转到详情页
+const getLinkPathDetail1 = (item: any) => {
+  if (item.islink == 1) {
+    return `${item.linkurl}`;
+  } else {
+    return `/${item.aLIas_pinyin}/${item.id}.html`;
+  }
+}
 //3.格式化跳转路径 end ---------------------------------------->
 
 
@@ -90,4 +102,4 @@ const getRoutePath = (type: Number) => {
 
 
 //4.获得路由路径 end ---------------------------------------->
-export { getTime, getTitleLength, getLinkPath, getLinkPathDetail, getRoutePath };
+export { getTime, getTitleLength, getLinkPath, getLinkPathDetail,getLinkPathDetail1, getRoutePath, getLinkPath1 };

+ 14 - 22
pages/[dir]/[dir]/list-[id].vue

@@ -7,7 +7,8 @@
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
         <!-- 二级标题-->
-        <HomeListSecondaryHeading v-if="parent_name != ''" :name="parent_name" :nav="secondNav"></HomeListSecondaryHeading>
+        <HomeListSecondaryHeading v-if="parent_name != ''" :name="parent_name" :nav="secondNav" :pinyin="parent_pinyin">
+        </HomeListSecondaryHeading>
         <!-- 资讯列表 -->
         <div class="newsList">
             <div class="inner">
@@ -20,7 +21,7 @@
                                 <el-breadcrumb-item>
                                     <NuxtLink to="/">首页</NuxtLink>
                                 </el-breadcrumb-item>
-                                <el-breadcrumb-item v-if="parent_name !=''">
+                                <el-breadcrumb-item v-if="parent_name != ''">
                                     <NuxtLink :to="`/${parent_pinyin}/index.html`"> {{ parent_name }}</NuxtLink>
                                 </el-breadcrumb-item>
                                 <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
@@ -37,18 +38,9 @@
                     </ul>
                     <!-- 分页器 -->
                     <div class="pagination" v-if="total > 0">
-                        <el-pagination 
-                            size="small" 
-                            background 
-                            layout="prev, pager, next" 
-                            :total="total" 
-                            class="mt-4"
-                            :page-size="pageSize" 
-                            :current-page="pageNum"
-                            prev-text="上一页" 
-                            next-text="下一页" 
-                            @current-change="changePage" 
-                        />
+                        <el-pagination size="small" background layout="prev, pager, next" :total="total" class="mt-4"
+                            :page-size="pageSize" :current-page="pageNum" prev-text="上一页" next-text="下一页"
+                            @current-change="changePage" />
                     </div>
                 </div>
                 <div class="innerRight">
@@ -85,10 +77,10 @@ const getRouteId = await requestDataPromise('/web/getWebsiteRoute', {
         'pinyin': targetSegment,
     },
 });
-if(getRouteId.code == 200){
+if (getRouteId.code == 200) {
     articleId = getRouteId.data.category_id
-}else{
-    console.log("后端错误反馈:",getRouteId.message)
+} else {
+    console.log("后端错误反馈:", getRouteId.message)
 }
 pageNum.value = parseInt(route.params.id);
 //2.路径 end---------------------------------------->
@@ -178,7 +170,7 @@ let getSecondNav = async () => {
         query: {
             'placeid': 1,
             'pid': parent_id.value,
-            'num': 8,
+            'num': 20,
         },
     });
     console.log('listData', listData);
@@ -210,8 +202,8 @@ if (setData.code == 200) {
     useSeoMeta({
         title: seoTitle + "_" + seoName + "_" + seoSuffix,
         meta: [
-            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix , tagPriority: 10 },
-            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
         ]
     });
 } else {
@@ -223,7 +215,7 @@ if (setData.code == 200) {
 let adImg1 = ref({});
 let adImg2 = ref({});
 
-onMounted(async ()  => {
+onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
@@ -237,7 +229,7 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
-    
+
     //广告2
     let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_list_0002`
     const responseAd2 = await fetch(url2, {

+ 69 - 19
pages/[dir]/index.html.vue

@@ -62,11 +62,11 @@
                     <div class="index_2_left_ul_box">
                         <div class="index_2_left_ul index_2_left_ul_group_6">
                             <div class="index_2_left_ul_li dot1" v-for="item in pageData[1].data3" :key="item.id">
-                                <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPathDetail(item)"
+                                <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPath1(item)"
                                     :title="item.title" :key="item.id" :target="item.islink == 1 ? '_blank' : '_self'">
-                                    资讯关注
+                                    {{ item.alias }}
                                 </NuxtLink>
-                                <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail(item)"
+                                <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail1(item)"
                                     :title="item.title" :key="item.id" :target="item.islink == 1 ? '_blank' : '_self'">
                                     {{ item.title }}
                                 </NuxtLink>
@@ -135,12 +135,12 @@
                         <div class="index_2_left_img_out">
                             <div class="index_2_left_ul index_2_left_ul_group_5">
                                 <div class="index_2_left_ul_li dot1" v-for="item in pageData[3].data" :key="item.id">
-                                    <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPathDetail(item)"
+                                    <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPath1(item)"
                                         :title="item.title" :key="item.id"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        资讯关注
+                                        {{ item.alias }}
                                     </NuxtLink>
-                                    <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail(item)"
+                                    <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail1(item)"
                                         :title="item.title" :key="item.id"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
                                         {{ item.title }}
@@ -151,7 +151,7 @@
                         <div class="index_2_left_ul_box">
                             <div class="index_3_img_ul">
                                 <div class="index_3_img_li clearfix" v-for="item in pageData[3].data2" :key="item.id">
-                                    <NuxtLink class="index_3_img_li_a" :href="getLinkPathDetail(item)"
+                                    <NuxtLink class="index_3_img_li_a" :href="getLinkPathDetail1(item)"
                                         :title="item.title" :key="item.id"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
                                         <div class="index_3_img_li_img_box">
@@ -161,7 +161,11 @@
                                             <div class="index_3_img_li_dot3 dot3">
                                                 {{ item.title }}
                                             </div>
-                                            <span class="index_3_img_li_tag">资讯关注</span>
+                                            <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPath1(item)"
+                                                :title="item.title" :key="item.id"
+                                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                                <span class="index_3_img_li_tag">{{ item.alias }}</span>
+                                            </NuxtLink>
                                         </div>
                                     </NuxtLink>
                                 </div>
@@ -172,12 +176,12 @@
                         <div class="index_2_left_img_out">
                             <div class="index_2_left_ul index_2_left_ul_group_5">
                                 <div class="index_2_left_ul_li dot1" v-for="item in pageData[4].data" :key="item.id">
-                                    <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPathDetail(item)"
+                                    <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPath1(item)"
                                         :title="item.title" :key="item.id"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        资讯关注
+                                        {{ item.alias }}
                                     </NuxtLink>
-                                    <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail(item)"
+                                    <NuxtLink class="index_2_left_ul_li_a_text" :href="getLinkPathDetail1(item)"
                                         :title="item.title" :key="item.id"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
                                         {{ item.title }}
@@ -188,7 +192,7 @@
                         <div class="index_2_left_ul_box">
                             <div class="index_3_img_ul">
                                 <div class="index_3_img_li clearfix" v-for="item in pageData[4].data2" :key="item.id">
-                                    <NuxtLink class="index_3_img_li_a" :href="getLinkPathDetail(item)"
+                                    <NuxtLink class="index_3_img_li_a" :href="getLinkPathDetail1(item)"
                                         :title="item.title" :key="item.id"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
                                         <div class="index_3_img_li_img_box">
@@ -198,7 +202,11 @@
                                             <div class="index_3_img_li_dot3 dot3">
                                                 {{ item.title }}
                                             </div>
-                                            <span class="index_3_img_li_tag">资讯关注</span>
+                                            <NuxtLink class="index_2_left_ul_li_a_name" :href="getLinkPath1(item)"
+                                                :title="item.title" :key="item.id"
+                                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                                <span class="index_3_img_li_tag">{{ item.alias }}</span>
+                                            </NuxtLink>
                                         </div>
                                     </NuxtLink>
                                 </div>
@@ -390,6 +398,21 @@ try {
         let jsonString = JSON.stringify(getJson);
         getPageAllData(jsonString);
 
+        //频道页特殊数据
+        let getJson1 = []
+        for (let index in pageData.value) {
+            // console.log("index", index)
+            if (index == 1) {
+                getJson1.push({ "parent": pageData.value[index].cid + ",0,11" })//模块2典型经验
+            } else if (index == 3) {
+                getJson1.push({ "parent": pageData.value[index].cid + ",3,10" })//模块4美丽乡村
+            } else if (index == 4) {
+                getJson1.push({ "parent": pageData.value[index].cid + ",3,10" })//模块5农民之家 
+            }
+        }
+        let jsonString1 = JSON.stringify(getJson1);
+        getPageAllData1(jsonString1);
+
     } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:分类页导航池")
@@ -423,7 +446,7 @@ async function getPageAllData(jsonString) {
                 pageData.value[1].data2.push(mkdata.data[1].child.imgnum[index]);
             }
         }
-        pageData.value[1].data3 = mkdata.data[1].child.textnum;
+        // pageData.value[1].data3 = mkdata.data[1].child.textnum;
         //模块3
         for (let index in mkdata.data[2].child.imgnum) {
             if (index <= 1) {
@@ -434,11 +457,11 @@ async function getPageAllData(jsonString) {
         }
         pageData.value[2].data3 = mkdata.data[2].child.textnum;
         //模块4
-        pageData.value[3].data = mkdata.data[3].child.textnum;
-        pageData.value[3].data2 = mkdata.data[3].child.imgnum;
-        //模块5
-        pageData.value[4].data = mkdata.data[4].child.textnum;
-        pageData.value[4].data2 = mkdata.data[4].child.imgnum;
+        // pageData.value[3].data = mkdata.data[3].child.textnum;
+        // pageData.value[3].data2 = mkdata.data[3].child.imgnum;
+        // //模块5
+        // pageData.value[4].data = mkdata.data[4].child.textnum;
+        // pageData.value[4].data2 = mkdata.data[4].child.imgnum;
         //模块6
         pageData.value[5].data = mkdata.data[5].child.textnum;
 
@@ -446,6 +469,33 @@ async function getPageAllData(jsonString) {
         ElMessage.error(mkdata.message)
     }
 }
+
+
+//频道页特殊数据
+async function getPageAllData1(jsonString1) {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticles', {
+        method: 'GET',
+        query: {
+            'id': jsonString1
+        },
+    });
+    console.log('模块数据111:', mkdata);
+
+
+    if (mkdata.code == 200) {
+        //模块2
+        pageData.value[1].data3 = mkdata.data[0].textnum;
+        //模块4
+        pageData.value[3].data = mkdata.data[1].textnum;
+        pageData.value[3].data2 = mkdata.data[1].imgnum;
+        //模块5
+        pageData.value[4].data = mkdata.data[2].textnum;
+        pageData.value[4].data2 = mkdata.data[2].imgnum;
+
+    } else {
+        ElMessage.error(mkdata.message)
+    }
+}
 //4.页面数据 end ---------------------------------------->
 
 //5.设置seo信息 start---------------------------------------->

+ 13 - 19
pages/[dir]/list-[id].vue

@@ -6,6 +6,9 @@
         <HomePageNavigation1></HomePageNavigation1>
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
+        <!-- 二级标题-->
+        <HomeListSecondaryHeading v-if="parent_name != ''" :name="parent_name" :nav="secondNav" :pinyin="parent_pinyin">
+        </HomeListSecondaryHeading>
         <!-- 资讯列表 -->
         <div class="newsList">
             <div class="inner">
@@ -18,7 +21,7 @@
                                 <el-breadcrumb-item>
                                     <NuxtLink to="/">首页</NuxtLink>
                                 </el-breadcrumb-item>
-                                <el-breadcrumb-item v-if="parent_name !=''">
+                                <el-breadcrumb-item v-if="parent_name != ''">
                                     <NuxtLink :to="`/${parent_pinyin}/index.html`"> {{ parent_name }}</NuxtLink>
                                 </el-breadcrumb-item>
                                 <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
@@ -35,18 +38,9 @@
                     </ul>
                     <!-- 分页器 -->
                     <div class="pagination" v-if="total > 0">
-                        <el-pagination 
-                            size="small" 
-                            background 
-                            layout="prev, pager, next" 
-                            :total="total" 
-                            class="mt-4"
-                            :page-size="pageSize" 
-                            :current-page="pageNum"
-                            prev-text="上一页" 
-                            next-text="下一页" 
-                            @current-change="changePage" 
-                        />
+                        <el-pagination size="small" background layout="prev, pager, next" :total="total" class="mt-4"
+                            :page-size="pageSize" :current-page="pageNum" prev-text="上一页" next-text="下一页"
+                            @current-change="changePage" />
                     </div>
                 </div>
                 <div class="innerRight">
@@ -81,9 +75,9 @@ const getRouteId = await requestDataPromise('/web/getWebsiteRoute', {
         'pinyin': targetSegment,
     },
 });
-if(getRouteId.code == 200){
+if (getRouteId.code == 200) {
     articleId = getRouteId.data.category_id
-}else{
+} else {
     console.log("错误位置:获得页面路径")
 }
 //2.页面路径 end ---------------------------------------->
@@ -202,8 +196,8 @@ if (setData.code == 200) {
     useSeoMeta({
         title: seoTitle + "_" + seoName + "_" + seoSuffix,
         meta: [
-            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 },
-            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
         ]
     });
 } else {
@@ -218,7 +212,7 @@ if (setData.code == 200) {
 let adImg1 = ref({});
 let adImg2 = ref({});
 
-onMounted(async ()  => {
+onMounted(async () => {
 
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
@@ -233,7 +227,7 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
-    
+
     //广告2
     let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_list_0002`
     const responseAd2 = await fetch(url2, {

+ 41 - 38
pages/index.vue

@@ -139,11 +139,11 @@
                     <div class="part2_left_content1">
                         <ul class="part2_left_content111">
                             <li class="part2_left_content1_list" v-for="item in boxData4" :key="index">
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                <NuxtLink :href="getLinkPath1(item)" :title="item.title"
                                     :target="item.islink == 1 ? '_blank' : '_self'">
-                                    <span class="nav2_title">{{ item.category_name }}</span>
+                                    <span class="nav2_title">{{ item.alias }}</span>
                                 </NuxtLink>
-                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                <NuxtLink :href="getLinkPathDetail1(item)" :title="item.title"
                                     :target="item.islink == 1 ? '_blank' : '_self'">
                                     <span class="nav2_title_content">
                                         {{ item.title }}
@@ -154,14 +154,17 @@
                     </div>
                     <ul class="part2_left_content2">
                         <li class="part2_left_content2list" v-for="item in boxData4data2" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            <NuxtLink :href="getLinkPathDetail1(item)" :title="item.title"
                                 :target="item.islink == 1 ? '_blank' : '_self'">
                                 <img :src="item.imgurl" :alt="item.title" class="part2_left_content222img">
                                 <div class="content2_text">
                                     <span class="content2_text_content">
                                         {{ item.title }}
                                     </span>
-                                    <span class="content2_text_title">{{ item.category_name }}</span>
+                                    <NuxtLink :href="getLinkPath1(item)" :title="item.title"
+                                        :target="item.islink == 1 ? '_blank' : '_self'">
+                                        <span class="content2_text_title">{{ item.alias }}</span>
+                                    </NuxtLink>
                                 </div>
                             </NuxtLink>
                         </li>
@@ -237,11 +240,11 @@
                         <div class="part3_left_content2">
                             <ul class="part3_left_content2_text">
                                 <li class="part3_left_content2_list" v-for="item in boxData6data3" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    <NuxtLink :href="getLinkPath1(item)" :title="item.title"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <span class="nav3_title">{{ item.category_name }}</span>
+                                        <span class="nav3_title">{{ item.alias }}</span>
                                     </NuxtLink>
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    <NuxtLink :href="getLinkPathDetail1(item)" :title="item.title"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
                                         <span class="nav3_title_content">
                                             {{ item.title }}
@@ -251,11 +254,11 @@
                             </ul>
                             <ul class="part3_left_content2_text">
                                 <li class="part3_left_content2_list" v-for="item in boxData6data4" :key="index">
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    <NuxtLink :href="getLinkPath1(item)" :title="item.title"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <span class="nav3_title">{{ item.category_name }}</span>
+                                        <span class="nav3_title">{{ item.alias }}</span>
                                     </NuxtLink>
-                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                    <NuxtLink :href="getLinkPathDetail1(item)" :title="item.title"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
                                         <span class="nav3_title_content">
                                             {{ item.title }}
@@ -342,11 +345,11 @@
                     </div>
                     <ul class="part4_photo_content">
                         <li class="part4_photo_contentlist" v-for="item in boxData8data2" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            <NuxtLink :href="getLinkPath1(item)" :title="item.title"
                                 :target="item.islink == 1 ? '_blank' : '_self'">
-                                <span class="nav11_title">{{ item.category_name }}</span>
+                                <span class="nav11_title">{{ item.alias }}</span>
                             </NuxtLink>
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            <NuxtLink :href="getLinkPathDetail1(item)" :title="item.title"
                                 :target="item.islink == 1 ? '_blank' : '_self'">
                                 <span class="nav11_title_content">
                                     {{ item.title }}
@@ -642,8 +645,8 @@ async function getPageAllData() {
         boxData3.value = mkdata.data[2].imgnum;
         boxData3data2.value = mkdata.data[2].textnum;
         //模块4
-        boxData4.value = mkdata.data[3].textnum;
-        boxData4data2.value = mkdata.data[3].imgnum;
+        // boxData4.value = mkdata.data[3].textnum;
+        // boxData4data2.value = mkdata.data[3].imgnum;
         //模块5
         boxData5.value = mkdata.data[4].textnum;
         //模块6
@@ -654,13 +657,13 @@ async function getPageAllData() {
                 boxData6data2.value.push(item);
             }
         });
-        mkdata.data[5].textnum.forEach((item, index) => {
-            if (index < 6) {
-                boxData6data3.value.push(item);
-            } else {
-                boxData6data4.value.push(item);
-            }
-        })
+        // mkdata.data[5].textnum.forEach((item, index) => {
+        //     if (index < 6) {
+        //         boxData6data3.value.push(item);
+        //     } else {
+        //         boxData6data4.value.push(item);
+        //     }
+        // })
         //模块7
         mkdata.data[6].imgnum.forEach((item, index) => {
             if (index < 2) {
@@ -678,7 +681,7 @@ async function getPageAllData() {
         });
         //模块8
         boxData8.value = mkdata.data[7].imgnum;
-        boxData8data2.value = mkdata.data[7].textnum;
+        // boxData8data2.value = mkdata.data[7].textnum;
         //模块9
         boxData9.value = mkdata.data[8].imgnum;
         boxData9data2.value = mkdata.data[8].textnum;
@@ -693,9 +696,9 @@ getPageAllData();
 
 //获取模块下的特殊数据
 let getJson1 = [
-    { "parent": "375,1,10" },//模块4 商贸信息375
-    { "parent": "432,0,10" },//模块6 法治天地432
-    { "parent": "374,0,5" },//模块8 农知农技374
+    { "parent": $pageNav[3] + ",1,10" },//模块4 商贸信息375
+    { "parent": $pageNav[5] + ",0,10" },//模块6 法治天地432
+    { "parent": $pageNav[7] + ",0,5" },//模块8 农知农技374
 ]
 let jsonString1 = JSON.stringify(getJson1);
 //获取模块下的特殊数据
@@ -706,23 +709,23 @@ async function getPageData() {
             'id': jsonString1
         },
     });
-    // console.log("成功获取模块数据2222!", mkdata);
+    console.log("成功获取模块数据2222!", mkdata);
     if (mkdata.code == 200) {
         // console.log("成功获取模块数据2222!", mkdata);
 
         //模块4商贸信息375
-        // boxData4.value = mkdata.data[0].textnum;
-        // boxData4data2.value = mkdata.data[0].imgnum;
+        boxData4.value = mkdata.data[0].textnum;
+        boxData4data2.value = mkdata.data[0].imgnum;
         //模块6法治天地426
-        // mkdata.data[1].textnum.forEach((item, index) => {
-        //     if (index < 6) {
-        //         boxData6data3.value.push(item);
-        //     } else {
-        //         boxData6data4.value.push(item);
-        //     }
-        // });
+        mkdata.data[1].textnum.forEach((item, index) => {
+            if (index < 6) {
+                boxData6data3.value.push(item);
+            } else {
+                boxData6data4.value.push(item);
+            }
+        });
         //模块8农知农技374
-        // boxData8data2.value = mkdata.data[2].textnum;
+        boxData8data2.value = mkdata.data[2].textnum;
     }
 
 }

+ 21 - 29
pages/search/[id].vue

@@ -29,8 +29,9 @@
                 <div class="innerLeft">
                     <ul class="list" v-if="newsList.length >= 0">
                         <li v-for="(item, index) in newsList" :key="index">
-                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                {{ item.title }}
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                                :target="item.islink == 1 ? '_blank' : '_self'">
+                                <span class="listText"> {{ item.title }}</span>
                                 <span class="time">{{ getTime(item.updated_at, 'month', 1) }}</span>
                             </NuxtLink>
                         </li>
@@ -43,17 +44,8 @@
                     </div>
                     <!-- 分页器 -->
                     <div class="pagination" v-if="total > 0">
-                        <el-pagination 
-                            size="small" 
-                            background 
-                            layout="prev, pager, next" 
-                            :total="total" 
-                            class="mt-4"
-                            :page-size="pageSize" 
-                            prev-text="上一页" 
-                            next-text="下一页" 
-                            @change="changePage"
-                         />
+                        <el-pagination size="small" background layout="prev, pager, next" :total="total" class="mt-4"
+                            :page-size="pageSize" prev-text="上一页" next-text="下一页" @change="changePage" />
                     </div>
                 </div>
             </div>
@@ -74,9 +66,9 @@ import { ref, onMounted } from 'vue';
 const route = useRoute();
 //const pageCatids = route.query.catids;
 const pageCatids = ""
-if(route.params.id=='search'){
-    
-}else{
+if (route.params.id == 'search') {
+
+} else {
     const pageCatids = route.params.id
 }
 
@@ -105,7 +97,7 @@ const getLinkPathDetail = (item) => {
 //2.1 广告
 let adImg1 = ref([]);
 let adImg2 = ref([]);
-onMounted(async ()  => {
+onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
@@ -119,7 +111,7 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
-    
+
     //广告2
     let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_search_0002`
     const responseAd2 = await fetch(url2, {
@@ -145,26 +137,26 @@ let goSearch = async () => {
     console.log(keywordInput.value)
     console.log(pageCatids)
     console.log(pageDepartment_id)
-    
-    const listData =  await requestDataPromise('/web/selectWebsiteCategory', {
+
+    const listData = await requestDataPromise('/web/selectWebsiteCategory', {
         method: 'GET',
         query: {
             'page': page.value,
             'pageSize': pageSize.value,
-            'keyword':keywordInput.value,
-            'cityid':pageCatids,
-            'department_id':pageDepartment_id
+            'keyword': keywordInput.value,
+            'cityid': pageCatids,
+            'department_id': pageDepartment_id
         },
     });
-    if(listData.data.rows){
+    if (listData.data.rows) {
         console.log(listData)
         newsList.value = listData.data.rows;
         total.value = listData.data.count;
-    }else{
+    } else {
         newsList.value = [];
         total.value = 0;
     }
-   
+
 }
 
 goSearch();
@@ -278,7 +270,7 @@ let changePage = (value) => {
 
 //4.设置seo信息 start---------------------------------------->
 //4.1 设置seo信息
-const setData =  await requestDataPromise('/web/getWebsiteFootInfo', {
+const setData = await requestDataPromise('/web/getWebsiteFootInfo', {
     method: 'GET',
     query: {},
 });
@@ -292,8 +284,8 @@ let seoName = setData.data.website_head.website_name;
 useSeoMeta({
     title: seoTitle + "_" + seoSuffix,
     meta: [
-        { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix , tagPriority: 10 },
-        { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+        { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+        { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
     ]
 });
 //4.设置seo信息 end---------------------------------------->