Browse Source

修改bug

Jing 2 days ago
parent
commit
fcc8831d95

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

@@ -1 +1 @@
-{"id":"31432f0d-727a-45f9-bbfd-a4276b1bba88","timestamp":1744857677837}
+{"id":"b8fddec9-d08d-4a3a-9752-a91c8347400d","timestamp":1744869000515}

+ 0 - 1
.nuxt/manifest/meta/31432f0d-727a-45f9-bbfd-a4276b1bba88.json

@@ -1 +0,0 @@
-{"id":"31432f0d-727a-45f9-bbfd-a4276b1bba88","timestamp":1744857677837,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 0
.nuxt/manifest/meta/b8fddec9-d08d-4a3a-9752-a91c8347400d.json

@@ -0,0 +1 @@
+{"id":"b8fddec9-d08d-4a3a-9752-a91c8347400d","timestamp":1744869000515,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

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

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

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
         "./imports"
       ],
       ],
       "#app-manifest": [
       "#app-manifest": [
-        "./manifest/meta/31432f0d-727a-45f9-bbfd-a4276b1bba88.json"
+        "./manifest/meta/b8fddec9-d08d-4a3a-9752-a91c8347400d.json"
       ],
       ],
       "#components": [
       "#components": [
         "./components"
         "./components"

+ 1 - 1
assets/css/public/head.less

@@ -26,7 +26,7 @@
     padding: 20px 0;
     padding: 20px 0;
     text-align: center;
     text-align: center;
     font-size: 20px;
     font-size: 20px;
-    color: #40663B;
+    color: #333333;
     font-weight: bold;
     font-weight: bold;
 
 
     img {
     img {

+ 1 - 1
components/home/BigSwiper.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
     <!-- 首页大的轮播图 -->
     <!-- 首页大的轮播图 -->
     <div class="swiper" v-if="imagelist">
     <div class="swiper" v-if="imagelist">
-        <el-carousel height="400px">
+        <el-carousel height="400px" v-if="imagelist">
             <el-carousel-item v-for="(item, index) in imagelist" :key="index">
             <el-carousel-item v-for="(item, index) in imagelist" :key="index">
                 <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">
                 <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">
                     <img :src="item.imgurl">
                     <img :src="item.imgurl">

+ 49 - 36
components/home/PageMessage.vue

@@ -4,13 +4,16 @@
         <div class="inner">
         <div class="inner">
             <div class="toutiao">
             <div class="toutiao">
                 <div class="xwtt">
                 <div class="xwtt">
-                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'" v-for="(item, index) in headlinelist" :key="index">
+                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                        :target="item.islink == 1 ? '_blank' : '_self'" v-for="(item, index) in headlinelist"
+                        :key="index">
                         <h1 class="tttitle">{{ item.title }}</h1>
                         <h1 class="tttitle">{{ item.title }}</h1>
                     </NuxtLink>
                     </NuxtLink>
                 </div>
                 </div>
-                <ul class="toutiao1">
+                <ul class="toutiao1" v-if="headlinelist1">
                     <li class="toutiaolist" v-for="item in headlinelist1">
                     <li class="toutiaolist" v-for="item in headlinelist1">
-                        <NuxtLink :to="{path:`/${item.pinyin}/${item.id}.html`}" :title="item.title">{{item.title}}</NuxtLink>
+                        <NuxtLink :to="{ path: `/${item.pinyin}/${item.id}.html` }" :title="item.title">{{ item.title }}
+                        </NuxtLink>
                     </li>
                     </li>
                 </ul>
                 </ul>
             </div>
             </div>
@@ -18,12 +21,12 @@
                 <div class="lunbo">
                 <div class="lunbo">
                     <HomeBigSwiper></HomeBigSwiper>
                     <HomeBigSwiper></HomeBigSwiper>
                 </div>
                 </div>
-                <div class="messageleft_photo_text">
+                <div class="messageleft_photo_text" v-if="moveBannerList">
                     <div class="messageleft_photo" v-for="item in moveBannerList" :key="index">
                     <div class="messageleft_photo" v-for="item in moveBannerList" :key="index">
                         <NuxtLink :to="`/${item.pinyin}/${item.id}.html`" :title="item.title">
                         <NuxtLink :to="`/${item.pinyin}/${item.id}.html`" :title="item.title">
                             <img :src="item.imgurl">
                             <img :src="item.imgurl">
                             <div class="message_text">
                             <div class="message_text">
-                                {{item.title}}
+                                {{ item.title }}
                             </div>
                             </div>
                         </NuxtLink>
                         </NuxtLink>
                     </div>
                     </div>
@@ -33,23 +36,26 @@
                 <div class="messageRight_title">
                 <div class="messageRight_title">
                     要闻
                     要闻
                 </div>
                 </div>
-                <ul class="messageRight_content">  
+                <ul class="messageRight_content" v-if="hotNewsList_data1">
                     <li v-for="item in hotNewsList_data1" :key="index" class="messageRight_content_title">
                     <li v-for="item in hotNewsList_data1" :key="index" class="messageRight_content_title">
-                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                             {{ item.title }}
                         </NuxtLink>
                         </NuxtLink>
                     </li>
                     </li>
                 </ul>
                 </ul>
-                <ul class="messageRight_content">
+                <ul class="messageRight_content" v-if="hotNewsList_data2">
                     <li v-for="item in hotNewsList_data2" :key="index" class="messageRight_content_title">
                     <li v-for="item in hotNewsList_data2" :key="index" class="messageRight_content_title">
-                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                             {{ item.title }}
                         </NuxtLink>
                         </NuxtLink>
                     </li>
                     </li>
                 </ul>
                 </ul>
-                <ul class="messageRight_content">
+                <ul class="messageRight_content" v-if="hotNewsList_data3">
                     <li v-for="item in hotNewsList_data3" :key="index" class="messageRight_content_title">
                     <li v-for="item in hotNewsList_data3" :key="index" class="messageRight_content_title">
-                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                             {{ item.title }}
                         </NuxtLink>
                         </NuxtLink>
                     </li>
                     </li>
@@ -82,26 +88,33 @@ const headlinelist = ref([])
 const headlinelist1 = ref([])
 const headlinelist1 = ref([])
 
 
 async function getModelData1() {
 async function getModelData1() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         method: 'GET',
         query: {
         query: {
             'pageSize': 4,
             'pageSize': 4,
             'level': 1,
             'level': 1,
             'placeid': 0,
             'placeid': 0,
-            'id':''
+            'id': ''
         },
         },
     });
     });
-    if(mkdata.code == 200){
+    if (mkdata.code == 200) {
+        for (let i = 0; i < mkdata.data.length; i++) {
+            if (i < 1) {
+                headlinelist.value.push(mkdata.data[i])
+            }else{
+                headlinelist1.value.push(mkdata.data[i])
+            }
+        }
         //填充大标题
         //填充大标题
-        headlinelist.value.push(mkdata.data[0])
-        //剩余的两条放到大标题下面
-        headlinelist1.value.push(mkdata.data[1])
-        headlinelist1.value.push(mkdata.data[2])
-        headlinelist1.value.push(mkdata.data[3])
-    }else{
+        // headlinelist.value.push(mkdata.data[0])
+        // //剩余的两条放到大标题下面
+        // headlinelist1.value.push(mkdata.data[1])
+        // headlinelist1.value.push(mkdata.data[2])
+        // headlinelist1.value.push(mkdata.data[3])
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:设置大标题")
         console.log("错误位置:设置大标题")
-        console.log("后端错误反馈:",mkdata.message)
+        console.log("后端错误反馈:", mkdata.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
     }
 }
 }
@@ -109,21 +122,21 @@ getModelData1()
 
 
 const moveBannerList = ref([])
 const moveBannerList = ref([])
 async function getModelData2() {
 async function getModelData2() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         method: 'GET',
         query: {
         query: {
             'pageSize': 2,
             'pageSize': 2,
             'level': 2,
             'level': 2,
             'placeid': 6,
             'placeid': 6,
-            'id':''
+            'id': ''
         },
         },
     });
     });
-    if(mkdata.code == 200){
+    if (mkdata.code == 200) {
         moveBannerList.value = mkdata.data;
         moveBannerList.value = mkdata.data;
-    }else{
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:获取首页轮播图下面的图文")
         console.log("错误位置:获取首页轮播图下面的图文")
-        console.log("后端错误反馈:",mkdata.message)
+        console.log("后端错误反馈:", mkdata.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
     }
 }
 }
@@ -133,29 +146,29 @@ const hotNewsList_data1 = ref([])
 const hotNewsList_data2 = ref([])
 const hotNewsList_data2 = ref([])
 const hotNewsList_data3 = ref([])
 const hotNewsList_data3 = ref([])
 async function getModelData3() {
 async function getModelData3() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         method: 'GET',
         query: {
         query: {
             'pageSize': 8,
             'pageSize': 8,
             'level': 6,
             'level': 6,
             'placeid': 0,
             'placeid': 0,
-            'id':''
+            'id': ''
         },
         },
     });
     });
-    if(mkdata.code == 200){
-        for(let i = 0; i < mkdata.data.length; i++){
-            if(i >= 0 && i <= 4){
+    if (mkdata.code == 200) {
+        for (let i = 0; i < mkdata.data.length; i++) {
+            if (i >= 0 && i <= 4) {
                 hotNewsList_data1.value.push(mkdata.data[i])
                 hotNewsList_data1.value.push(mkdata.data[i])
-            } else if(i >= 5 && i <= 9){
+            } else if (i >= 5 && i <= 9) {
                 hotNewsList_data2.value.push(mkdata.data[i])
                 hotNewsList_data2.value.push(mkdata.data[i])
-            } else if(i >= 10 && i <= 14){
+            } else if (i >= 10 && i <= 14) {
                 hotNewsList_data3.value.push(mkdata.data[i])
                 hotNewsList_data3.value.push(mkdata.data[i])
             }
             }
         }
         }
-    }else{
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:获取首页今日热点")
         console.log("错误位置:获取首页今日热点")
-        console.log("后端错误反馈:",mkdata.message)
+        console.log("后端错误反馈:", mkdata.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
     }
 }
 }
@@ -164,5 +177,5 @@ getModelData3()
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
-    @import url('@/assets/css/components/pagemessage.less');
+@import url('@/assets/css/components/pagemessage.less');
 </style>
 </style>

+ 2 - 2
pages/index.vue

@@ -572,7 +572,7 @@ try {
             //1 农业生产372
             //1 农业生产372
             if (navigateData.data[index].category_id == 372) { pageData.value[0] = data }
             if (navigateData.data[index].category_id == 372) { pageData.value[0] = data }
             //2 三农资讯328
             //2 三农资讯328
-            if (navigateData.data[index].category_id == 328) { pageData.value[1] = data }
+            if (navigateData.data[index].category_id == 445) { pageData.value[1] = data }
             //3 市场行情377
             //3 市场行情377
             if (navigateData.data[index].category_id == 377) { pageData.value[2] = data }
             if (navigateData.data[index].category_id == 377) { pageData.value[2] = data }
             //4 商贸信息375
             //4 商贸信息375
@@ -599,7 +599,7 @@ try {
 
 
 let getJson = [
 let getJson = [
     { "parent": "372,2,12", "child": "" },//模块1 农业生产372
     { "parent": "372,2,12", "child": "" },//模块1 农业生产372
-    { "parent": "328,1,4", "child": "" },//模块2 三农资讯328
+    { "parent": "445,1,4", "child": "" },//模块2 三农资讯328
     { "parent": "377,1,4", "child": "" },//模块3 市场行情377
     { "parent": "377,1,4", "child": "" },//模块3 市场行情377
     { "parent": "375,1,10", "child": "" },//模块4 商贸信息375
     { "parent": "375,1,10", "child": "" },//模块4 商贸信息375
     { "parent": "373,1,8", "child": "" },//模块5 农民生活373
     { "parent": "373,1,8", "child": "" },//模块5 农民生活373