修改bug

修改bug

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1743042651325}
+{"id":"dev","timestamp":1743064729172}

.nuxt/manifest/meta/70bf4e3f-0ede-48cb-ab16-61946fae6c91.json

@@ -0,0 +1 @@
+{"id":"70bf4e3f-0ede-48cb-ab16-61946fae6c91","timestamp":1743064608913,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/7594f99b-7e43-4461-946f-0e435c607364.json

@@ -1 +0,0 @@
-{"id":"7594f99b-7e43-4461-946f-0e435c607364","timestamp":1743042398816,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/dev.json

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

.nuxt/nitro.json

@@ -1,5 +1,5 @@
 {
-  "date": "2025-03-27T02:30:54.841Z",
+  "date": "2025-03-27T08:38:51.996Z",
   "preset": "nitro-dev",
   "framework": {
     "name": "nuxt",
@@ -9,9 +9,9 @@
     "nitro": "2.10.4"
   },
   "dev": {
-    "pid": 16660,
+    "pid": 21880,
     "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-16660-1.sock"
+      "socketPath": "\\\\.\\pipe\\nitro\\worker-21880-1.sock"
     }
   }
 }

.nuxt/nuxt.d.ts

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

app/router.options.ts

@@ -261,23 +261,23 @@ export default <RouterConfig> {
       //前往列表页
       //1.新农村
       {
-        path: '/lilunqianyan237/:id',
+        path: '/lilunqianyan31/:id',
         component: () => import('~/pages/newsList/[id].vue'),
         meta: { 
           isAlias: true, 
-          routeId: 237, 
+          routeId: 31, 
           routeName: '理论前沿',
-          path: '/lilunqianyan237/'
+          path: '/lilunqianyan31/'
         }
       },
       {
-        path: '/dianxingjingyan281/:id',
+        path: '/dianxingjingyan32/:id',
         component: () => import('~/pages/newsList/[id].vue'),
         meta: { 
           isAlias: true, 
-          routeId: 281, 
+          routeId: 32, 
           routeName: '典型经验',
-          path: '/dianxingjingyan281/'
+          path: '/dianxingjingyan32/'
         }
       },
       {

assets/css/detail.less

@@ -372,4 +372,24 @@
             border: 1px solid #49A769;
         }
     }
-}	
+}	
+//放大图片
+.preview-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.8);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 1000;
+}
+
+.preview-modal img {
+    max-width: 100%;
+    max-height: 100%;
+    cursor: pointer;
+    /* 关闭按钮样式 */
+}

assets/css/index.less

@@ -1461,6 +1461,7 @@
             border-radius: 8px;
         }
         div {
+            width: 181px;
             height:103px;
             box-sizing: border-box;
             border-bottom: 1px solid #D9D9D9;

components/home/MoreService.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="moreServiceBox">
         <div class="listBox">
-            <NuxtLink to="http://dy.qgsnfzzx.org.cn/list-hyfw.html" title="人员查询">
+            <NuxtLink to="http://dy.qgsnfzzx.org.cn/list-renyuanchaxun.html" title="人员查询">
                 <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/index/icon1.png" alt="人员查询">
                 <div class="line"></div>
                 人员查询

components/home/pageNavigation.vue

@@ -100,9 +100,11 @@ const getLinkPath = (item) => {
     if(item.is_url==1){
         return `${item.web_url}`;
     }else if(item.children_count == 0){
-        return `/${item.aLIas_pinyin}/1.html`;
+        //return `/${item.aLIas_pinyin}/1.html`;
+        return `/newsList/${item.category_id}?page=1`;
     }else{
-        return `/${item.aLIas_pinyin}/`;
+        //return `/${item.aLIas_pinyin}/`;
+        return `/primaryNavigation/${item.category_id}`;
     }
 }
 //2.加载模块数据 end ---------------------------------------->

components/home/pageNavigation1.vue

@@ -69,9 +69,11 @@ const getLinkPath = (item) => {
     if(item.is_url==1){
         return `${item.web_url}`;
     }else if(item.children_count == 0){
-        return `/${item.aLIas_pinyin}/1.html`;
+        //return `/${item.aLIas_pinyin}/1.html`;
+        return `/newsList/${item.category_id}?page=1`;
     }else{
-        return `/${item.aLIas_pinyin}/`;
+        //return `/${item.aLIas_pinyin}/`;
+        return `/primaryNavigation/${item.category_id}`;
     }
 }
 //2.加载模块数据 end ---------------------------------------->

pages/index.vue

@@ -557,7 +557,7 @@
                         </span>
                     </div>
                     <div class="right" v-if="tabsData3==1">
-                        <NuxtLink :to="{ path: `/newsList/${item.category_id}`}" v-if="pageData[13].cid" v-for="item in boxData14menu" :title="item.alias">
+                        <NuxtLink :to="{ path: `/newsList/${item.category_id}`}"  v-for="(item,index) in boxData14menu" :title="item.alias">
                             {{item.alias}}
                         </NuxtLink>
                     </div>
@@ -695,7 +695,7 @@
                 <div class=" clearfix">
                     <div class="index_1_box">
                         <div class="index_2_big_img_ul">
-                            <div class="index_2_big_img_li cover100" v-if="boxData16">
+                            <div class="index_2_big_img_li cover100" v-if="boxData16.length>0">
                                 <NuxtLink :href="getLinkPathDetail(boxData16[0])" :title="boxData16[0].title" :target="boxData16[0].islink == 1 ? '_blank' : '_self'">
                                     <img class="" :src="boxData16[0].imgurl" :alt="boxData16[0].title">
                                     <div class="index_2_big_img_li_dot2 dot2">
@@ -706,8 +706,8 @@
                                 </NuxtLink>
                             </div>
                         </div>
-                        <div class="index_1_box_right_img_ul index_1_box_right_img_ul_2 clearfix" v-if="boxData16[1]">
-                            <div class="index_1_box_right_img_li cover100">
+                        <div class="index_1_box_right_img_ul index_1_box_right_img_ul_2 clearfix">
+                            <div class="index_1_box_right_img_li cover100" v-if="boxData16.length>1">
                                 <NuxtLink :href="getLinkPathDetail(boxData16[1])" :title="boxData16[1].title" :target="boxData16[1].islink == 1 ? '_blank' : '_self'">
                                     <img class="" :src="boxData16[1].imgurl" :alt="boxData16[1].title">
                                     <div class="index_1_box_right_img_li_dot1 dot1">
@@ -715,7 +715,7 @@
                                     </div>
                                 </NuxtLink>
                             </div>
-                            <div class="index_1_box_right_img_li cover100" v-if="boxData16[2]">
+                            <div class="index_1_box_right_img_li cover100" v-if="boxData16.length>2">
                                 <NuxtLink :href="getLinkPathDetail(boxData16[2])" :title="boxData16[2].title" :target="boxData16[2].islink == 1 ? '_blank' : '_self'">
                                     <img class="" :src="boxData16[2].imgurl" :alt="boxData16[2].title">
                                     <div class="index_1_box_right_img_li_dot1 dot1">
@@ -724,7 +724,7 @@
                                 </NuxtLink>
                             </div>
                         </div>
-                        <div class="index_2_big_img_ul" v-if="boxData16[3]">
+                        <div class="index_2_big_img_ul" v-if="boxData16.length>3">
                             <NuxtLink :href="getLinkPathDetail(boxData16[3])" :title="boxData16[3].title" :target="boxData16[3].islink == 1 ? '_blank' : '_self'">
                                 <div class="index_2_big_img_li cover100" v-if="boxData16[3]">
                                     <img class="" :src="boxData16[3].imgurl" :alt="boxData16[3].title">
@@ -796,7 +796,7 @@ import { useSeoMeta } from '#imports';
 //首页分类栏目标题，不需要考虑外链
 const getLinkPath = (item) => {
     if (item.children_count == 0) {
-        return `/newsList/${item.cid}`;
+        return `/newsList/${item.cid}?page=1`;
     } else {
         return `/${item.url}/`;
     }
@@ -899,7 +899,7 @@ async function addWebsiteSurvey(){
                     // 用户输入的值
                     // console.log(userChoice.value)
                     //如果使用了其他，其他的选项需要增加进去
-                    const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
+                    const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
                         method:'GET',
                         query:{
                             'sur_id':userSurId.value,//投票的新闻id
@@ -908,7 +908,7 @@ async function addWebsiteSurvey(){
                     });
                     if(ChoiceData.code == 200){
                         //提交完其他选项以后，再正式发起投票
-                        const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                        const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
                             method:'GET',
                             query:{
                                 'sur_id':userSurId.value,
@@ -943,7 +943,7 @@ async function addWebsiteSurvey(){
                 }
             }else{
                 //如果没选择其他，直接提交选择的内容
-                const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
                     method:'GET',
                     query:{
                         'sur_id':userSurId.value,
@@ -980,7 +980,7 @@ async function addWebsiteSurvey(){
                 if(userChoice.value!=''){
                     //判断用户是否只选择了一个其他
                     if(check1.value.length == 1){
-                        const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
                             method:'GET',
                             query:{
                                 'sur_id':userSurId.value,//投票的新闻id
@@ -989,7 +989,7 @@ async function addWebsiteSurvey(){
                         });
                         if(ChoiceData.code == 200){
                             //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
                                 method:'GET',
                                 query:{
                                     'sur_id':userSurId.value,
@@ -1022,7 +1022,7 @@ async function addWebsiteSurvey(){
 
                     }else{
                         //用户选择了除了其他以外，还包括别的选项
-                        const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
                             method:'GET',
                             query:{
                                 'sur_id':userSurId.value,//投票的新闻id
@@ -1039,7 +1039,7 @@ async function addWebsiteSurvey(){
                             }
                             let jsonArray = JSON.stringify(data);
                             //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
                                 method:'GET',
                                 query:{
                                     'sur_id':userSurId.value,
@@ -1350,207 +1350,291 @@ try {
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
 }
 
-//获得模块数据
-async function getPageData(catid,img_num,text_num,modulesNum,childNavNum,childImgNum,childTextNum){
-    const mkdata =  await requestDataPromise('/web/getWebsiteCatidArticle', {
+
+
+let getJson = [
+    {"parent":"11,2,8","child":""},//模块1新农村 
+    {"parent":"317,0,8","child":""},//模块2农民工 
+    {"parent":"2,0,5","child":""},//模块4三农之窗
+    {"parent":"5,1,1","child":""},//模块5区域经济
+    {"parent":"12,0,3","child":""},//模块6三农投资 
+    {"parent":"13,0,4","child":""},//模块7农贸信息 
+    {"parent":"24,2,8","child":""},//模块8书刊信息
+    {"parent":"14,2,8","child":""},//模块9三农科教 
+    {"parent":"15,2,8","child":""},//模块10文化生活
+    {"parent":"27,2,4","child":""},//模块11三农服务27
+    {"parent":"16,0,14","child":""},//模块12三农探索16
+    {"parent":"18,0,14","child":""},//模块13三农人物18
+    {"parent":"21,2,8","child":"189,0,5"},//模块14农资购销
+    {"parent":"153,2,8","child":"258,0,5"},//模块15农产购销
+    {"parent":"26,4,8","child":"191,0,5"},//模块16打假维权
+]
+
+let jsonString = JSON.stringify(getJson);
+
+async function getPageAllData(){
+    const mkdata =  await requestDataPromise('/web/getWebsiteAllArticle', {
         method: 'GET',
         query: {
-            'catid': catid, //catid
-            'img_num': img_num, //图片数量
-            'text_num': text_num, //文字数量
-            'child_catnum':childNavNum,//子级栏目菜单数量
-            'child_imgnum':childImgNum,//子栏目展示图片新闻数量
-            'child_textnum':childTextNum//子栏目展示文字新闻数量
+            'id':jsonString
         },
     });
-    //模块1新农村
-    if(modulesNum == 1){
-        if(mkdata.code==200){
-            boxData1.value = mkdata.data.img;
-            boxData1data2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块2农名工
-    if(modulesNum == 2){
-        if(mkdata.code==200){
-            boxData2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块4三农之窗
-    if(modulesNum == 4){
-        if(mkdata.code==200){
-            boxData4.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块5区域经济
-    if(modulesNum == 5){
-        if(mkdata.code==200){
-            boxData5.value = mkdata.data.img;
-            boxData5data2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块6三农投资
-    if(modulesNum == 6){
-        if(mkdata.code==200){
-            boxData6.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块7农贸信息
-    if(modulesNum == 7){
-        if(mkdata.code==200){
-            boxData7.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块8书刊信息
-    if(modulesNum == 8){
-        if(mkdata.code==200){
-            boxData8.value = mkdata.data.img;
-            boxData88.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块9三农科教
-    if(modulesNum == 9){
-        if(mkdata.code==200){
-            boxData9.value = mkdata.data.img;
-            boxData9data2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        } 
-    }
-    //模块10文化生活
-    if(modulesNum == 10){
-        if(mkdata.code==200){
-            boxData10.value = mkdata.data.img;
-            boxData10data2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        } 
-    }
-    //模块11三农服务
-    if(modulesNum == 11){
-        if(mkdata.code==200){
-            boxData11.value = mkdata.data.img;
-            boxData11data2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        } 
-    }
-    //模块12三农探索
-    if(modulesNum == 12){
-        if(mkdata.code==200){
-            boxData12.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块13三农人物
-    if(modulesNum == 13){
-        if(mkdata.code==200){
-            boxData13.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块14农资购销 该栏目含有子导航
-    if(modulesNum == 14){
-        if(mkdata.code==200){
-            boxData14.value = mkdata.data.img;
-            boxData14data2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    if(modulesNum == 142){
-        if(mkdata.code==200){
-            boxData14menu.value = mkdata.data.child;
-            boxData14mainData.value = mkdata.data.child[0].text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块14农产购销 该栏目含有子导航
-    if(modulesNum == 15){
-        if(mkdata.code==200){
-            boxData15.value = mkdata.data.img;
-            boxData15data2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    if(modulesNum == 152){
-        if(mkdata.code==200){
-            boxData15menu.value = mkdata.data.child;
-            boxData15mainData.value = mkdata.data.child[0].text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    //模块15打假维权 
-    if(modulesNum == 16){
-        if(mkdata.code==200){
-            boxData16.value = mkdata.data.img;
-            boxData16data2.value = mkdata.data.text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
-    }
-    if(modulesNum == 162){
-        if(mkdata.code==200){
-            boxData16menu.value = mkdata.data.child;
-            boxData16mainData.value = mkdata.data.child[0].text;
-        }else{
-            ElMessage.error(mkdata.message)
-        }
+
+    if(mkdata.code==200){
+        //模块1新农村
+        boxData1.value = mkdata.data[0].imgnum;
+        boxData1data2.value = mkdata.data[0].textnum;
+        //模块2农名工
+        boxData2.value = mkdata.data[1].textnum;
+        //模块4三农之窗
+        boxData4.value = mkdata.data[2].textnum;
+        //模块5区域经济
+        boxData5.value = mkdata.data[3].imgnum;
+        boxData5data2.value = mkdata.data[3].textnum;
+        //模块6三农投资
+        boxData6.value = mkdata.data[4].textnum;
+        //模块7农贸信息
+        boxData7.value = mkdata.data[5].textnum;
+        //模块8书刊信息
+        boxData8.value = mkdata.data[6].imgnum;
+        boxData88.value = mkdata.data[6].textnum;
+        //模块9三农科教
+        boxData9.value = mkdata.data[7].imgnum;
+        boxData9data2.value = mkdata.data[7].textnum;
+        //模块10文化生活
+        boxData10.value = mkdata.data[8].imgnum;
+        boxData10data2.value = mkdata.data[8].textnum;
+        //模块11三农服务
+        boxData11.value = mkdata.data[9].imgnum;
+        boxData11data2.value = mkdata.data[9].textnum;
+        //模块12三农探索
+        boxData12.value = mkdata.data[10].textnum;
+        //模块13三农人物
+        boxData13.value = mkdata.data[11].textnum;
+        //模块14农资购销 该栏目含有子导航
+        boxData14.value = mkdata.data[12].imgnum;
+        boxData14data2.value = mkdata.data[12].textnum;
+        boxData14menu.value =  mkdata.data[12].child.all_childcat;
+        boxData14mainData.value = mkdata.data[12].child.textnum;
+        //模块14农产购销 
+        boxData15.value = mkdata.data[13].imgnum;
+        boxData15data2.value = mkdata.data[13].textnum;
+        boxData15menu.value = mkdata.data[13].child.all_childcat;
+        boxData15mainData.value = mkdata.data[13].child.textnum;
+        //模块15打假维权 
+        boxData16.value = mkdata.data[14].imgnum;
+        boxData16data2.value = mkdata.data[14].textnum;
+        boxData16menu.value = mkdata.data[14].child.all_childcat;
+        boxData16mainData.value = mkdata.data[14].child.textnum;
+
+    }else{
+        ElMessage.error(mkdata.message)
     }
 }
+getPageAllData();
+
+
+//获得模块数据
+// async function getPageData(catid,img_num,text_num,modulesNum,childNavNum,childImgNum,childTextNum){
+//     const mkdata =  await requestDataPromise('/web/getWebsiteCatidArticle', {
+//         method: 'GET',
+//         query: {
+//             'catid': catid, //catid
+//             'img_num': img_num, //图片数量
+//             'text_num': text_num, //文字数量
+//             'child_catnum':childNavNum,//子级栏目菜单数量
+//             'child_imgnum':childImgNum,//子栏目展示图片新闻数量
+//             'child_textnum':childTextNum//子栏目展示文字新闻数量
+//         },
+//     });
+//     //模块1新农村
+//     if(modulesNum == 1){
+//         if(mkdata.code==200){
+//             boxData1.value = mkdata.data.img;
+//             boxData1data2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块2农名工
+//     if(modulesNum == 2){
+//         if(mkdata.code==200){
+//             boxData2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块4三农之窗
+//     if(modulesNum == 4){
+//         if(mkdata.code==200){
+//             boxData4.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块5区域经济
+//     if(modulesNum == 5){
+//         if(mkdata.code==200){
+//             boxData5.value = mkdata.data.img;
+//             boxData5data2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块6三农投资
+//     if(modulesNum == 6){
+//         if(mkdata.code==200){
+//             boxData6.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块7农贸信息
+//     if(modulesNum == 7){
+//         if(mkdata.code==200){
+//             boxData7.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块8书刊信息
+//     if(modulesNum == 8){
+//         if(mkdata.code==200){
+//             boxData8.value = mkdata.data.img;
+//             boxData88.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块9三农科教
+//     if(modulesNum == 9){
+//         if(mkdata.code==200){
+//             boxData9.value = mkdata.data.img;
+//             boxData9data2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         } 
+//     }
+//     //模块10文化生活
+//     if(modulesNum == 10){
+//         if(mkdata.code==200){
+//             boxData10.value = mkdata.data.img;
+//             boxData10data2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         } 
+//     }
+//     //模块11三农服务
+//     if(modulesNum == 11){
+//         if(mkdata.code==200){
+//             boxData11.value = mkdata.data.img;
+//             boxData11data2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         } 
+//     }
+//     //模块12三农探索
+//     if(modulesNum == 12){
+//         if(mkdata.code==200){
+//             boxData12.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块13三农人物
+//     if(modulesNum == 13){
+//         if(mkdata.code==200){
+//             boxData13.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块14农资购销 该栏目含有子导航
+//     if(modulesNum == 14){
+//         if(mkdata.code==200){
+//             boxData14.value = mkdata.data.img;
+//             boxData14data2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     if(modulesNum == 142){
+//         if(mkdata.code==200){
+//             boxData14menu.value = mkdata.data.child;
+//             boxData14mainData.value = mkdata.data.child[0].text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块14农产购销 该栏目含有子导航
+//     if(modulesNum == 15){
+//         if(mkdata.code==200){
+//             boxData15.value = mkdata.data.img;
+//             boxData15data2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     if(modulesNum == 152){
+//         if(mkdata.code==200){
+//             boxData15menu.value = mkdata.data.child;
+//             boxData15mainData.value = mkdata.data.child[0].text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     //模块15打假维权 
+//     if(modulesNum == 16){
+//         if(mkdata.code==200){
+//             boxData16.value = mkdata.data.img;
+//             boxData16data2.value = mkdata.data.text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+//     if(modulesNum == 162){
+//         if(mkdata.code==200){
+//             boxData16menu.value = mkdata.data.child;
+//             boxData16mainData.value = mkdata.data.child[0].text;
+//         }else{
+//             ElMessage.error(mkdata.message)
+//         }
+//     }
+// }
 //模块1新农村 导航池11 图文2 文字8 
-await getPageData(11,2,8,1,0,0,0);
-//模块2农民工 导航池317 文字8 
-await getPageData(317,0,8,2,0,0,0);
-//----//组件 模块3政策法规 导航池1 图文4 文字8  
-//模块4三农之窗 文字8 
-await getPageData(2,0,5,4,0,0,0);
-//模块5区域经济 图文1 文字1 
-await getPageData(5,1,1,5,0,0,0);
-//模块6三农投资 导航池6 文字3
-await getPageData(12,0,3,6,0,0,0);
-//模块7农贸信息 导航池13 图片5
-await getPageData(13,0,4,7,0,0,0);
-//模块8书刊信息 导航池24 图片2 文字
-await getPageData(24,2,8,8,0,0,0);
-//模块9三农科教 图片2 文字8 （9和10是选项卡 如果只有9没有10就会报错）
-await getPageData(14,2,8,9,0,0,0);////////////////////////////////////                                   
-//模块10文化生活 图片2 文字8 /////////////////////////////////////
-await getPageData(15,2,8,10,0,0,0);///////////////////////////////////
-//模块11三农服务27 图片2 文字4
-await getPageData(27,2,4,11,0,0,0);
-//模块12三农探索16 图片0 文字10（12和13是选项卡 如果只有12没有13就会报错）
-await getPageData(16,0,14,12,0,0,0);//////////////////////////////////////
-//模块13三农人物18 图片0 文字10;//////////////////////////////////////
-await getPageData(18,0,14,13,0,0,0);//////////////////////////////////////
-//模块14农资购销21 图片2 文字8 子导航8 子导航展示： 文字6
-await getPageData(21,2,8,14,0,0,0);//////////////////////////////////////
-await getPageData(21,0,0,142,8,0,5);/////////////////////////////////////
-//模块15农产购销153 图片2 文字8 子导航8 子导航展示： 文字6
-await getPageData(153,2,8,15,0,0,0);//////////////////////////////////////
-await getPageData(153,0,0,152,8,0,5);/////////////////////////////////////
-//模块16打假维权26 图片4 文字8 子导航8 子导航展示： 文字6
-await getPageData(26,4,8,16,0,0,0);//////////////////////////////////////
-await getPageData(26,0,0,162,8,0,5);/////////////////////////////////////
+// await getPageData(11,2,8,1,0,0,0);
+// //模块2农民工 导航池317 文字8 
+// await getPageData(317,0,8,2,0,0,0);
+// //----//组件 模块3政策法规 导航池1 图文4 文字8  
+// //模块4三农之窗 文字8 
+// await getPageData(2,0,5,4,0,0,0);
+// //模块5区域经济 图文1 文字1 
+// await getPageData(5,1,1,5,0,0,0);
+// //模块6三农投资 导航池6 文字3
+// await getPageData(12,0,3,6,0,0,0);
+// //模块7农贸信息 导航池13 图片5
+// await getPageData(13,0,4,7,0,0,0);
+// //模块8书刊信息 导航池24 图片2 文字
+// await getPageData(24,2,8,8,0,0,0);
+// //模块9三农科教 图片2 文字8 （9和10是选项卡 如果只有9没有10就会报错）
+// await getPageData(14,2,8,9,0,0,0);////////////////////////////////////                                   
+// //模块10文化生活 图片2 文字8 /////////////////////////////////////
+// await getPageData(15,2,8,10,0,0,0);///////////////////////////////////
+// //模块11三农服务27 图片2 文字4
+// await getPageData(27,2,4,11,0,0,0);
+// //模块12三农探索16 图片0 文字10（12和13是选项卡 如果只有12没有13就会报错）
+// await getPageData(16,0,14,12,0,0,0);//////////////////////////////////////
+// //模块13三农人物18 图片0 文字10;//////////////////////////////////////
+// await getPageData(18,0,14,13,0,0,0);//////////////////////////////////////
+// //模块14农资购销21 图片2 文字8 子导航8 子导航展示： 文字6
+// await getPageData(21,2,8,14,0,0,0);//////////////////////////////////////
+// await getPageData(21,0,0,142,8,0,5);/////////////////////////////////////
+// //模块15农产购销153 图片2 文字8 子导航8 子导航展示： 文字6
+// await getPageData(153,2,8,15,0,0,0);//////////////////////////////////////
+// await getPageData(153,0,0,152,8,0,5);/////////////////////////////////////
+// //模块16打假维权26 图片4 文字8 子导航8 子导航展示： 文字6
+// await getPageData(26,4,8,16,0,0,0);//////////////////////////////////////
+// await getPageData(26,0,0,162,8,0,5);/////////////////////////////////////
 //5.页面基本信息 end---------------------------------------->
 
 //6.设置seo数据 start---------------------------------------->

pages/newsDetail/[id].vue

@@ -35,7 +35,16 @@
                     </p>
                     <!-- <img :src="newsDetail.imgurl" v-if="newsDetail.imgurl&&newsDetail.level==2||newsDetail.level==3"> -->
                 </div>
-                <div class="leftBottom" v-html="newsDetail.content" v-if="newsDetail.content"></div>
+                <!-- <div class="leftBottom" v-html="newsDetail.content" v-if="newsDetail.content"></div> -->
+                <div 
+                    class="leftBottom" 
+                    v-html="newsDetail.content" 
+                    v-if="newsDetail.content" 
+                    @click="openPreview">
+                </div>
+                <div v-if="previewVisible" class="preview-modal" @click="closePreview">
+                    <img :src="selectedImage" alt="Preview">
+                </div>
                 <!-- 免责声明: -->
                 <div class="disclaimer" v-if="newsDetail.copyfrom!='本网'">
                     <p>原文链接：{{ newsDetail.fromurl }}</p>
@@ -169,6 +178,7 @@ async function getPageData() {
         if(mkdata.data.is_survey==1){
             console.log("本篇文章含有投票！")
             articleChoice.value = true;
+            getVoteList();
         }
         //获取内容
         newsDetail.value = mkdata.data;
@@ -305,7 +315,7 @@ async function getVoteList(){
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->") 
     }
 }
-getVoteList();
+
 
 //3.2当用户选择了选项，判断是否展示其他输入框
 const handleRadioChange = (value) => {
@@ -420,7 +430,7 @@ async function addWebsiteSurvey(){
                 if(userChoice.value!=''){
                     //判断用户是否只选择了一个其他
                     if(check1.value.length == 1){
-                        const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
                             method:'GET',
                             query:{
                                 'sur_id':userSurId.value,//投票的新闻id
@@ -429,7 +439,7 @@ async function addWebsiteSurvey(){
                         });
                         if(ChoiceData.code == 200){
                             //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
                                 method:'GET',
                                 query:{
                                     'sur_id':userSurId.value,
@@ -462,7 +472,7 @@ async function addWebsiteSurvey(){
 
                     }else{
                         //用户选择了除了其他以外，还包括别的选项
-                        const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
                             method:'GET',
                             query:{
                                 'sur_id':userSurId.value,//投票的新闻id
@@ -479,7 +489,7 @@ async function addWebsiteSurvey(){
                             }
                             let jsonArray = JSON.stringify(data);
                             //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
                                 method:'GET',
                                 query:{
                                     'sur_id':userSurId.value,
@@ -518,7 +528,7 @@ async function addWebsiteSurvey(){
             }else{
                 let jsonArray = JSON.stringify(check1.value);
                 //如果没选择其他，直接提交选择的内容
-                const mkData = await requestHome('/web/addWebsiteSurveyVote',{
+                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
                     method:'GET',
                     query:{
                         'sur_id':userSurId.value,
@@ -552,6 +562,21 @@ async function addWebsiteSurvey(){
     }
 }
 //4.投票 end---------------------------------------->
+
+//5.页面图片放大 start---------------------------------------->
+const previewVisible = ref(false)
+const selectedImage = ref(' ')
+
+const openPreview = (event) => {
+    if (event.target.tagName === 'IMG') {
+        selectedImage.value = event.target.src;
+        previewVisible.value = true;
+    }
+}
+const closePreview = () => {
+    previewVisible.value = false;
+}
+//5.页面图片放大 end---------------------------------------->
 </script>
 
 <style lang="less" scoped>

pages/newsList/[id].vue

@@ -167,6 +167,8 @@ let changePage = (value) => {
     }else{
         navigateTo(`/newsList/${articleId}?page=${page.value}`)
     }
+
+    newslists();
 }
 
 //2.3获得页面名称

pages/primaryNavigation/[id].vue

@@ -9,36 +9,29 @@
                 <div class="innerLeft" v-if="pageData.length>0">
                     <div class="title">
                         <h3>
-                            <NuxtLink :to="{ path: `/newsList/${pageData[0].cid}`}" v-if="pageData[0]" :title="pageData[0].alias">
+                            <NuxtLink :href="getLinkPath(pageData[0])" v-if="pageData[0]" :title="pageData[0].alias">
                                 {{ pageData[0].alias }}
                             </NuxtLink>
                             <span>
-                                <NuxtLink
-                                    :to="{ path: `/newsList/${pageData[0].cid}`}"
-                                    v-if="pageData[0]" :title="pageData[0].title">查看更多</NuxtLink>
+                                <NuxtLink :href="getLinkPath(pageData[0])" v-if="pageData[0]" :title="pageData[0].title">
+                                    查看更多
+                                </NuxtLink>
                             </span>
                         </h3>
                     </div>
                     <div class="leftTop" v-if="pageData[0].data[0]">
                         <div class="leftTopPhoto left" v-if="pageData[0].data[0]">
-                            <NuxtLink :to="item.linkurl" v-if="pageData[0].data[0]&&pageData[0].data[0].islink==1" :title="pageData[0].data[0].title">
+                            <NuxtLink :href="getLinkPathDetail(pageData[0].data[0])" :title="pageData[0].data[0].title">
                                 <img :src="pageData[0].data[0].imgurl" :alt="pageData[0].data[0].title">
                                 <span>{{pageData[0].data[0].title }}</span>
                             </NuxtLink>
-                            <NuxtLink :to="{ path: `/newsDetail/${pageData[0].data[0].id}`}"
-                                v-if="pageData[0].data[0]&&pageData[0].data[0].islink==0" :title="pageData[0].data[0].title">
-                                <img :src="pageData[0].data[0].imgurl" :alt="pageData[0].data[0].title">
-                                <span>{{pageData[0].data[0].title}}</span>
-                            </NuxtLink>
                         </div>
                         <ul class="left">
                             <li v-for="item in pageData[0].data3">
                                 <em></em>
                                 <span>
-                                    <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                                    <NuxtLink
-                                        :to="{ path: `/newsDetail/${item.id}`}"
-                                        v-if="item.islink==0" :title="item.title">{{ item.title }}
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                        {{ item.title }}
                                     </NuxtLink>
                                 </span>
                             </li>
@@ -46,19 +39,13 @@
                     </div>
                     <ul class="leftBottom" v-if="pageData[0].data2[0]!=null">
                         <li v-for="item in pageData[0].data2">
-                            <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">
-                                <img :src="item.imgurl" :alt="item.title">
-                            </NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${item.id}`}"
-                                v-if="item.islink==0" :title="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 <img :src="item.imgurl" :alt="item.title">
                             </NuxtLink>
                             <p>
-                                <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                                <NuxtLink
-                                    :to="{ path: `/newsDetail/${item.id}`}"
-                                    v-if="item.islink==0" :title="item.title">{{ item.title }}</NuxtLink>
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                    {{ item.title }}
+                                </NuxtLink>
                             </p>
                         </li> 
                     </ul>
@@ -67,29 +54,23 @@
                 <div class="innerRight" v-if="pageData.length>=2">
                     <div class="title">
                         <h3>
-                            <NuxtLink :to="{ path: `/newsList/${pageData[1].cid}`}" v-if="pageData[1]" :title="pageData[1].alias">
+                            <NuxtLink :href="getLinkPath(pageData[1])" v-if="pageData[1]" :title="pageData[1].alias">
                                 {{ pageData[1].alias }}
                             </NuxtLink>
                             <span>
-                                <NuxtLink
-                                    :to="{ path: `/newsList/${pageData[1].cid}`}"
-                                    v-if="pageData[1]" :title="pageData[1].title">查看更多</NuxtLink>
+                                <NuxtLink :href="getLinkPath(pageData[1])" v-if="pageData[1]" :title="pageData[1].title">
+                                    查看更多
+                                </NuxtLink>
                             </span>
                         </h3>
                     </div>
                     <ul class="rightList">
                         <li v-for="item in pageData[1].data">
-                            <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${item.id}`}"
-                                v-if="item.islink==0" :title="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 <img class="left" :src="item.imgurl" :alt="item.title">
                             </NuxtLink>
                             <p class="left">
-                                <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                                <NuxtLink
-                                    :to="{ path: `/newsDetail/${item.id}`}"
-                                    v-if="item.islink==0" :title="item.title">
+                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                     {{ item.title }}
                                 </NuxtLink>
                             </p>
@@ -104,25 +85,19 @@
                 <div class="farmer"  v-if="pageData.length>=3">
                     <div class="title">
                         <h3>
-                            <NuxtLink :to="{ path: `/newsList/${pageData[2].cid}`}" v-if="pageData[2]" :title="pageData[2].alias">
+                            <NuxtLink :href="getLinkPath(pageData[2])" v-if="pageData[2]" :title="pageData[2].alias">
                                 {{ pageData[2].alias }}
                             </NuxtLink>
                             <span>
-                                <NuxtLink
-                                    :to="{ path: `/newsList/${pageData[2].cid}`}"
-                                    v-if="pageData[2]" :title="pageData[2].title">查看更多</NuxtLink>
+                                <NuxtLink :href="getLinkPath(pageData[2])" v-if="pageData[2]" :title="pageData[2].title">
+                                    查看更多
+                                </NuxtLink>
                             </span>
                         </h3>
                     </div>
                     <div class="PartTwoPhoto">
                         <div v-if="pageData[2].data[0]">
-                            <NuxtLink :to="item.linkurl" v-if="pageData[2].data[0].islink==1" :title="pageData[2].data[0].title">
-                                <img :src="pageData[2].data[0].imgurl" :alt="pageData[2].data[0].title">
-                                <span>{{ pageData[2].data[0].title }}</span>
-                            </NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${pageData[2].data[0].id}`}"
-                                v-if="pageData[2].data[0].islink==0" :title="pageData[2].data[0].title">
+                            <NuxtLink :href="getLinkPathDetail(pageData[2].data[0])" :title="pageData[2].data[0].title">
                                 <img :src="pageData[2].data[0].imgurl" :alt="pageData[2].data[0].title">
                                 <span>{{ pageData[2].data[0].title }}</span>
                             </NuxtLink>
@@ -131,35 +106,28 @@
                     <ul class="PartTwoList">
                         <li v-for="item in pageData[2].data2">
                             <em></em>
-                            <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${item.id}`}"
-                                v-if="item.islink==0" :title="item.title">{{ item.title }}</NuxtLink>
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                {{ item.title }}
+                            </NuxtLink>
                         </li>
                     </ul>
                 </div>
                 <div class="farmer" v-if="pageData.length>=4">
                     <div class="title">
                         <h3>
-                            <NuxtLink :to="{ path: `/newsList/${pageData[3].cid}`}" v-if="pageData[3]" :title="pageData[3].alias">
+                            <NuxtLink :href="getLinkPath(pageData[3])" v-if="pageData[3]" :title="pageData[3].alias">
                                 {{ pageData[3].alias }}
                             </NuxtLink>
                             <span>
-                                <NuxtLink
-                                    :to="{ path: `/newsList/${pageData[3].cid}`}"
-                                    v-if="pageData[3]" :title="pageData[3].title">查看更多</NuxtLink>
+                                <NuxtLink :href="getLinkPath(pageData[3])" v-if="pageData[3]" :title="pageData[3].title">
+                                    查看更多
+                                </NuxtLink>
                             </span>
                         </h3>
                     </div>
                     <div class="PartTwoPhoto">
                         <div v-if="pageData[3].data[0]">
-                            <NuxtLink :to="item.linkurl" v-if="pageData[3].data[0].islink==1" :title="pageData[3].data[0].title">
-                                <img :src="pageData[3].data[0].imgurl" :alt="pageData[3].data[0].title">
-                                <span>{{ pageData[3].data[0].title }}</span>
-                            </NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${pageData[3].data[0].id}`}"
-                                v-if="pageData[3].data[0].islink==0" :title="pageData[3].data[0].title">
+                            <NuxtLink :href="getLinkPathDetail(pageData[3].data[0])" :title="pageData[3].data[0].title">
                                 <img :src="pageData[3].data[0].imgurl" :alt="pageData[3].data[0].title">
                                 <span>{{ pageData[3].data[0].title }}</span>
                             </NuxtLink>
@@ -168,35 +136,28 @@
                     <ul class="PartTwoList">
                         <li v-for="item in pageData[3].data2">
                             <em></em>
-                            <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${item.id}`}"
-                                v-if="item.islink==0" :title="item.title">{{ item.title }}</NuxtLink>
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                {{ item.title }}
+                            </NuxtLink>
                         </li>
                     </ul>
                 </div>
                 <div class="farmer" v-if="pageData.length>=5">
                     <div class="title">
                         <h3>
-                            <NuxtLink :to="{ path: `/newsList/${pageData[4].cid}`}" v-if="pageData[4]" :title="pageData[4].alias">
+                            <NuxtLink :href="getLinkPath(pageData[4])" v-if="pageData[4]" :title="pageData[4].alias">
                                 {{ pageData[4].alias }}
                             </NuxtLink>
                             <span>
-                                <NuxtLink
-                                    :to="{ path: `/newsList/${pageData[4].cid}`}"
-                                    v-if="pageData[4]" :title="pageData[4].title">查看更多</NuxtLink>
+                                <NuxtLink :href="getLinkPath(pageData[4])" v-if="pageData[4]" :title="pageData[4].title">
+                                    查看更多
+                                </NuxtLink>
                             </span>
                         </h3>
                     </div>
                     <div class="PartTwoPhoto">
                         <div v-if="pageData[4].data[0]">
-                            <NuxtLink :to="item.linkurl" v-if="pageData[4].data[0].islink==1" :title="pageData[4].data[0].title">
-                                <img :src="pageData[4].data[0].imgurl" :alt="pageData[4].data[0].title">
-                                <span>{{ pageData[4].data[0].title }}</span>
-                            </NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${pageData[4].data[0].id}`}"
-                                v-if="pageData[4].data[0].islink==0" :title="pageData[4].data[0].title">
+                            <NuxtLink :href="getLinkPathDetail(pageData[4].data[0])" :title="pageData[4].data[0].title">
                                 <img :src="pageData[4].data[0].imgurl" :alt="pageData[4].data[0].title">
                                 <span>{{ pageData[4].data[0].title }}</span>
                             </NuxtLink>
@@ -205,10 +166,7 @@
                     <ul class="PartTwoList">
                         <li v-for="item in pageData[4].data2">
                             <em></em>
-                            <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${item.id}`}"
-                                v-if="item.islink==0" :title="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 {{ item.title }}
                             </NuxtLink>
                         </li>
@@ -224,33 +182,27 @@
                         <div class="zixunLeft" v-if="pageData.length>=6">
                             <div class="title">
                                 <h3>
-                                    <NuxtLink :to="{ path: `/newsList/${pageData[5].cid}`}" v-if="pageData[5]" :title="pageData[5].alias">
+                                    <NuxtLink :href="getLinkPath(pageData[5])" v-if="pageData[5]" :title="pageData[5].alias">
                                         {{ pageData[5].alias }}
                                     </NuxtLink>
                                     <span>
-                                        <NuxtLink
-                                            :to="{ path: `/newsList/${pageData[5].cid}`}"
-                                            v-if="pageData[5]" :title="pageData[5].title">查看更多</NuxtLink>
+                                        <NuxtLink :href="getLinkPath(pageData[5])" v-if="pageData[5]" :title="pageData[5].title">
+                                            查看更多
+                                        </NuxtLink>
                                     </span>
                                 </h3>
                             </div>
-                            <ul class="photo_text" v-if="pageData[5].data[0] != null">
+                            <ul class="photo_text" v-if="pageData[5].data[0]!= null">
                                 <li v-for="item in pageData[5].data">
                                     <article>
-                                        <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">
-                                            <img :src="item.imgurl" :alt="item.title">
-                                        </NuxtLink>
-                                        <NuxtLink
-                                            :to="{ path: `/newsDetail/${item.id}`}"
-                                            v-if="item.islink==0" :title="item.title">
+                                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                             <img :src="item.imgurl" :alt="item.title">
                                         </NuxtLink>
                                         <div>
                                             <h5>
-                                                <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                                                <NuxtLink
-                                                    :to="{ path: `/newsDetail/${item.id}`}"
-                                                    v-if="item.islink==0" :title="item.title">{{ item.title }}</NuxtLink>
+                                                <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                                    {{ item.title }}
+                                                </NuxtLink>
                                             </h5>
                                             <p>
                                                 <span>{{ item.author }}</span>
@@ -262,10 +214,9 @@
                                 <li v-for="item in pageData[5].data2">
                                     <article>
                                         <em></em>
-                                        <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                                        <NuxtLink
-                                            :to="{ path: `/newsDetail/${item.id}`}"
-                                            v-if="item.islink==0" :title="item.title">{{ item.title }}</NuxtLink>
+                                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                            {{ item.title }}
+                                        </NuxtLink>
                                     </article>
                                 </li>
                             </ul>
@@ -273,26 +224,20 @@
                         <div class="zixunRight"  v-if="pageData.length>=7">
                             <div class="title">
                                 <h3>
-                                    <NuxtLink :to="{ path: `/newsList/${pageData[6].cid}`}" v-if="pageData[6]" :title="pageData[6].alias">
+                                    <NuxtLink :href="getLinkPath(pageData[6])" v-if="pageData[6]" :title="pageData[6].alias">
                                         {{ pageData[6].alias }}
                                     </NuxtLink>
                                     <span>
-                                        <NuxtLink
-                                            :to="{ path: `/newsList/${pageData[6].cid}`}"
-                                            v-if="pageData[6]" :title="pageData[6].title">查看更多</NuxtLink>
+                                        <NuxtLink :href="getLinkPath(pageData[6])" v-if="pageData[6]" :title="pageData[6].title">
+                                            查看更多
+                                        </NuxtLink>
                                     </span>
-
                                 </h3>
                             </div>
                             <div class="towPic">
                                 <div v-for="item in pageData[6].data" class="picBox">
                                     <div>
-                                        <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">
-                                            <img :src="item.imgurl" :alt="item.title">
-                                        </NuxtLink>
-                                        <NuxtLink
-                                            :to="{ path: `/newsDetail/${item.id}`}"
-                                            v-if="item.islink==0" :title="item.title">
+                                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                             <img :src="item.imgurl" :alt="item.title">
                                         </NuxtLink>
                                     </div>
@@ -302,10 +247,8 @@
                                 <li v-for="item in pageData[6].data2">
                                     <article>
                                         <em></em>
-                                        <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                                        <NuxtLink
-                                            :to="{ path: `/newsDetail/${item.id}`}"
-                                            v-if="item.islink==0" :title="item.title">{{ item.title }}
+                                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                            {{ item.title }}
                                         </NuxtLink>
                                     </article>
                                 </li>
@@ -329,10 +272,9 @@
                             <li v-for="(item, index) in pageData[7].data" @mouseenter="qhPic(index)">
                                 <h4>
                                     <em></em>
-                                    <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                                    <NuxtLink
-                                        :to="{ path: `/newsDetail/${item.id}`}"
-                                        v-if="item.islink==0" :title="item.title">{{ item.title }}</NuxtLink>
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                        {{ item.title }}
+                                    </NuxtLink>
                                 </h4>
                             </li>
                         </ul>
@@ -341,30 +283,26 @@
                 <div class="innerRight" v-if="pageData.length>=8">
                     <div class="title">
                         <h3>
-                            <NuxtLink :to="{ path: `/newsList/${pageData[7].cid}`}" :title="pageData[7].alias">
+                            <NuxtLink :href="getLinkPath(pageData[7])" v-if="pageData[7]" :title="pageData[7].alias">
                                 {{ pageData[7].alias }}
                             </NuxtLink>
                             <span>
-                                <NuxtLink
-                                    :to="{ path: `/newsList/${pageData[7].cid}`}"
-                                    v-if="pageData[7]" :title="pageData[7].title">查看更多</NuxtLink>
+                                <NuxtLink :href="getLinkPath(pageData[7])" v-if="pageData[7]" :title="pageData[7].title">
+                                    查看更多
+                                </NuxtLink>
                             </span>
                         </h3>
                     </div>
                     <ul class="information">
                         <li v-for="item in pageData[7].data2">
-                            <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">
-                                <img :src="item.imgurl" :alt="item.title">
-                            </NuxtLink>
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${item.id}`}"
-                                v-if="item.islink==0" :title="item.title">
+                            <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 <img :src="item.imgurl" :alt="item.title">
                             </NuxtLink>
                             <div class="text">
                                 <h5>
-                                    <NuxtLink :to="item.linkurl" v-if="item.islink==1" :title="item.title">{{ item.title }}</NuxtLink>
-                                    <NuxtLink :to="{ path: `/newsDetail/${item.id}`}" v-if="item.islink==0" :title="item.title">{{ item.title }}</NuxtLink>
+                                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
+                                        {{ item.title }}
+                                    </NuxtLink>
                                 </h5>
                                 <p>{{ item.author }}</p>
                             </div>
@@ -384,6 +322,22 @@
 <script setup>
 //0.加载页面依赖 start ---------------------------------------->
 import { ref, onMounted } from 'vue';
+
+//格式化跳转路径 - 标题
+//首页分类栏目标题，不需要考虑外链
+const getLinkPath = (item) => {
+    //return `/${item.url}/1.html`;
+    return `/newsList/${item.cid}?page=1`;
+}
+//首页跳转到详情，这里需要考虑外链
+const getLinkPathDetail = (item) => {
+    if (item.islink == 1) {
+        return `${item.linkurl}`;
+    } else {
+        //return `/${item.aLIas_pinyin}/${item.id}`;
+        return `/newsDetail/${item.id}?page=1`
+    }
+}
 //0.加载页面依赖 end ---------------------------------------->
 
 //1.获得路由id start ---------------------------------------->
@@ -539,6 +493,7 @@ try {
                 cid: navigateData.data[index].category_id,
                 children_count: navigateData.data[index].children_count,
                 alias: navigateData.data[index].alias,
+                url: navigateData.data[index].aLIas_pinyin,
                 data:[],
                 data1:[],
                 data2:[],