Browse Source

补充导航外链判断

补充导航外链判断
dangyunlong 2 months ago
parent
commit
e375413ab1

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

@@ -1 +1 @@
-{"id":"dev","timestamp":1745544127147}
+{"id":"dev","timestamp":1745557351539}

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

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

+ 3 - 3
.nuxt/nitro.json

@@ -1,5 +1,5 @@
 {
-  "date": "2025-04-25T01:22:09.701Z",
+  "date": "2025-04-25T05:02:41.087Z",
   "preset": "nitro-dev",
   "framework": {
     "name": "nuxt",
@@ -9,9 +9,9 @@
     "nitro": "2.10.4"
   },
   "dev": {
-    "pid": 15048,
+    "pid": 11428,
     "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-15048-1.sock"
+      "socketPath": "\\\\.\\pipe\\nitro\\worker-11428-1.sock"
     }
   }
 }

+ 5 - 3
components/detail/HotNews.vue

@@ -50,14 +50,16 @@ async function getPageData() {
     const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize':6,
+            'imgnum': 2,
+            'textnum': 4,
             'level': 4,
+            'placeid': 0,
             'id': 0,
         },
     });
     if(mkdata.code == 200){
-        hotNewsListdata1.value = mkdata.data.slice(0, 2);
-        hotNewsListdata2.value = mkdata.data.slice(2, 6);
+        hotNewsListdata1.value = mkdata.data.img;
+        hotNewsListdata2.value = mkdata.data.text;
     }else{
         console.log("错误位置:获取最新资讯")
     }

+ 3 - 2
components/detail/HotNews2.vue

@@ -33,14 +33,15 @@ async function getPageData() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 8,
+            'imgnum': 0,
+            'textnum': 8,
             'level': 5,
             'placeid': 0,
             'id': 0
         },
     });
     if (mkdata.code == 200) {
-        hotNewsList.value = mkdata.data;
+        hotNewsList.value = mkdata.data.text;
     } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:获取热点精选")

+ 57 - 55
pages/[dir]/index.html.vue

@@ -43,10 +43,9 @@
                             </div>
                         </div>
                     </div>
-                    <!--热点话题 open-->
                     <div class=" clearfix">
                         <div class="channel_3_box clearfix">
-                            <div class="channel_ul_2 clearfix">
+                            <div class="channel_ul_2 clearfix" v-if="pageData[1]">
                                 <NuxtLink class="channel_ul_2_a dot1"
                                     :href="getLinkPathDetail(item)"
                                     :title="item.title"
@@ -60,7 +59,7 @@
                         </div>
                         <div class="channel_4_box clearfix">
                             <div class="channel_img_ul_1">
-                                <div class="channel_img_ul_1_li">
+                                <div class="channel_img_ul_1_li" v-if="pageData[1]">
                                     <NuxtLink class="channel_img_ul_1_li_a"
                                         :href="getLinkPathDetail(item)"
                                         :title="item.title"
@@ -75,7 +74,7 @@
                                     </NuxtLink>
                                 </div>
                             </div>
-                            <div class="channel_img_ul_even_1 clearfix">
+                            <div class="channel_img_ul_even_1 clearfix" v-if="pageData[1]">
                                 <div class="channel_img_ul_even_1_li" v-for="item in pageData[1].data2">
                                     <NuxtLink class="channel_img_ul_even_1_li_a"
                                         :href="getLinkPathDetail(item)"
@@ -92,7 +91,6 @@
                             </div>
                         </div>
                     </div>
-                    <!--热点话题 end-->
                 </div>
                 <div class="channel_2_box">
                     <div class="channel_head_box clearfix">
@@ -117,9 +115,8 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <!--人物访谈 open-->
                     <div class=" clearfix">
-                        <div class="channel_even_img_ul_2 clearfix">
+                        <div class="channel_even_img_ul_2 clearfix" v-if="pageData[2]">
                             <div class="channel_even_img_ul_2_li" v-for="item in pageData[2].data">
                                 <NuxtLink class="channel_even_img_ul_2_a"
                                     :href="getLinkPathDetail(item)"
@@ -132,7 +129,7 @@
                                 </NuxtLink>
                             </div>
                         </div>
-                        <div class="channel_ul_3 clearfix">
+                        <div class="channel_ul_3 clearfix" v-if="pageData[2]">
                             <NuxtLink class="channel_ul_3_a dot1"
                                 :href="getLinkPathDetail(item)"
                                 :title="item.title"
@@ -144,7 +141,6 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <!--人物访谈 end-->
                 </div>
             </section>
             <section class="channel_3 clearfix">
@@ -171,9 +167,8 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <!--国际采风 open-->
                     <div class=" clearfix">
-                        <div class="channel_ul_4 clearfix">
+                        <div class="channel_ul_4 clearfix" v-if="pageData[3]">
                             <NuxtLink class="channel_ul_4_a dot1"
                                 :href="getLinkPathDetail(item)"
                                 :title="item.title"
@@ -185,7 +180,6 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <!--国际采风 end-->
                 </div>
                 <div class="channel_2_box">
                     <div class="channel_head_box clearfix">
@@ -210,9 +204,8 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <!--品牌快讯 open-->
                     <div class="channel_img_ul_2">
-                        <div class="channel_img_ul_2_li">
+                        <div class="channel_img_ul_2_li" v-if="pageData[4]">
                             <NuxtLink class="channel_img_ul_2_li_a"
                                 :href="getLinkPathDetail(item)"
                                 :title="item.title"
@@ -225,7 +218,6 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <!--品牌快讯 end-->
                 </div>
             </section>
             <!-- 广告 2-->
@@ -254,11 +246,10 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <!--企业采风 open-->
                     <div class=" clearfix">
                         <div class="channel_3_box clearfix">
                             <div class="channel_img_ul_3_ul">
-                                <div class="channel_img_ul_3_li">
+                                <div class="channel_img_ul_3_li" v-if="pageData[5]" >
                                     <NuxtLink class="channel_img_ul_3_li_a"
                                         :href="getLinkPathDetail(item)"
                                         :title="item.title"
@@ -275,7 +266,7 @@
                             </div>
                         </div>
                         <div class="channel_4_box clearfix">
-                            <div class="channel_ul_5 clearfix">
+                            <div class="channel_ul_5 clearfix" v-if="pageData[5]">
                                 <NuxtLink class="channel_ul_5_a dot1"
                                     :href="getLinkPathDetail(item)"
                                     :title="item.title"
@@ -288,7 +279,6 @@
                             </div>
                         </div>
                     </div>
-                    <!--企业采风 end-->
                     <div class="channel_head_box clearfix channel_head_box_2">
                         <div class="channel_head_box_left">
                             <div class="channel_head_left_a_btn">
@@ -311,11 +301,10 @@
                             </NuxtLink> 
                         </div>
                     </div>
-                    <!--农资动态 open-->
                     <div class=" clearfix">
                         <div class="channel_3_box clearfix">
                             <div class="channel_img_ul_4_ul">
-                                <div class="channel_img_ul_4_li">
+                                <div class="channel_img_ul_4_li" v-if="pageData[6]">
                                     <NuxtLink class="channel_img_ul_4_li_a"
                                         :href="getLinkPathDetail(item)"
                                         :title="item.title"
@@ -332,8 +321,7 @@
                             </div>
                         </div>
                         <div class="channel_4_box clearfix">
-                            <div class="channel_ul_6 clearfix">
-
+                            <div class="channel_ul_6 clearfix" v-if="pageData[6]">
                                 <NuxtLink class="channel_ul_6_a dot1"
                                     :href="getLinkPathDetail(item)"
                                     :title="item.title"
@@ -346,7 +334,6 @@
                             </div>
                         </div>
                     </div>
-                    <!--农资动态 end-->
                 </div>
                 <div class="channel_2_box">
                     <div class="channel_head_box clearfix">
@@ -371,10 +358,9 @@
                             </NuxtLink> 
                         </div>
                     </div>
-                    <!--专题报道 open-->
                     <div class=" clearfix">
                         <div class="channel_img_ul_5_ul">
-                            <div class="channel_img_ul_5_li">
+                            <div class="channel_img_ul_5_li" v-if="pageData[7]">
                                 <NuxtLink class="channel_img_ul_5_li_a"
                                     :href="getLinkPathDetail(item)"
                                     :title="item.title"
@@ -387,7 +373,7 @@
                                 </NuxtLink>
                             </div>
                         </div>
-                        <div class="index_ul_7 clearfix">
+                        <div class="index_ul_7 clearfix"  v-if="pageData[7]">
                             <NuxtLink class="index_ul_7_a dot1"
                                 :href="getLinkPathDetail(item)"
                                 :title="item.title"
@@ -399,7 +385,6 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <!--专题报道 end-->
                 </div>
             </section>
         </main>
@@ -592,35 +577,52 @@ async function getPageAllData(jsonString) {
     });
 
     if (mkdata.code == 200) {
-        //模块1 顶部大图和列表
-        pageData.value[0].data = mkdata.data[0].child.imgnum;
-        pageData.value[0].data2 = mkdata.data[0].child.textnum;
-        //模块2
-        pageData.value[1].data3 = mkdata.data[1].child.textnum;
-        for(let index in mkdata.data[1].child.imgnum){
-            if(index<1){
-                pageData.value[1].data.push(mkdata.data[1].child.imgnum[index]);
-            }else{
-                pageData.value[1].data2.push(mkdata.data[1].child.imgnum[index]);
+        if(mkdata.data.length > 0){
+            //模块1 顶部大图和列表
+            pageData.value[0].data = mkdata.data[0].child.imgnum;
+            pageData.value[0].data2 = mkdata.data[0].child.textnum;
+        }
+        if(mkdata.data.length > 1){
+            //模块2
+            pageData.value[1].data3 = mkdata.data[1].child.textnum;
+            for(let index in mkdata.data[1].child.imgnum){
+                if(index<1){
+                    pageData.value[1].data.push(mkdata.data[1].child.imgnum[index]);
+                }else{
+                    pageData.value[1].data2.push(mkdata.data[1].child.imgnum[index]);
+                }
             }
         }
-        //模块3
-        pageData.value[2].data = mkdata.data[2].child.imgnum;
-        pageData.value[2].data2 = mkdata.data[2].child.textnum;
-        //模块4
-        pageData.value[3].data = mkdata.data[3].child.imgnum;
-        pageData.value[3].data2 = mkdata.data[3].child.textnum;
-        //模块5
-        pageData.value[4].data = mkdata.data[4].child.imgnum;
-        //模块6
-        pageData.value[5].data = mkdata.data[5].child.imgnum;
-        pageData.value[5].data2 = mkdata.data[5].child.textnum;
-        //模块7
-        pageData.value[6].data = mkdata.data[6].child.imgnum;
-        pageData.value[6].data2 = mkdata.data[6].child.textnum;
-        //模块8
-        pageData.value[7].data = mkdata.data[7].child.imgnum;
-        pageData.value[7].data2 = mkdata.data[7].child.textnum;
+        if(mkdata.data.length > 2){
+            //模块3
+            pageData.value[2].data = mkdata.data[2].child.imgnum;
+            pageData.value[2].data2 = mkdata.data[2].child.textnum;
+        }
+        if(mkdata.data.length > 3){
+            //模块4
+            pageData.value[3].data = mkdata.data[3].child.imgnum;
+            pageData.value[3].data2 = mkdata.data[3].child.textnum;
+        }
+        if(mkdata.data.length > 4){
+            //模块5
+            pageData.value[4].data = mkdata.data[4].child.imgnum;
+        }
+        if(mkdata.data.length > 5){
+            //模块6
+            pageData.value[5].data = mkdata.data[5].child.imgnum;
+            pageData.value[5].data2 = mkdata.data[5].child.textnum;
+        }
+        if(mkdata.data.length > 6){
+            //模块7
+            pageData.value[6].data = mkdata.data[6].child.imgnum;
+            pageData.value[6].data2 = mkdata.data[6].child.textnum;
+        }
+        if(mkdata.data.length > 7){
+            //模块8
+            pageData.value[7].data = mkdata.data[7].child.imgnum;
+            pageData.value[7].data2 = mkdata.data[7].child.textnum;
+        }
+
     } else {
         ElMessage.error(mkdata.message)
     }