修改bug

修改bug

.env

@@ -1 +1 @@
-PORT=3000
+PORT=3006

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1745290570986}
+{"id":"dev","timestamp":1745485029978}

.nuxt/manifest/meta/dev.json

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

.nuxt/nitro.json

@@ -1,5 +1,5 @@
 {
-  "date": "2025-04-22T02:56:13.518Z",
+  "date": "2025-04-24T08:57:12.565Z",
   "preset": "nitro-dev",
   "framework": {
     "name": "nuxt",
@@ -9,9 +9,9 @@
     "nitro": "2.10.4"
   },
   "dev": {
-    "pid": 7028,
+    "pid": 21052,
     "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-7028-1.sock"
+      "socketPath": "\\\\.\\pipe\\nitro\\worker-21052-1.sock"
     }
   }
 }

.nuxt/types/plugins.d.ts

@@ -22,6 +22,7 @@ type NuxtAppInjections =
   InjectionType<typeof import("../../node_modules/nuxt/dist/app/plugins/check-if-layout-used.js")> &
   InjectionType<typeof import("../../plugins/element-plus")> &
   InjectionType<typeof import("../../plugins/request")> &
+  InjectionType<typeof import("../../plugins/category")> &
   InjectionType<typeof import("../../plugins/globals")> &
   InjectionType<typeof import("../../plugins/pinia")>
 

components/home/BigSwiper.vue

@@ -36,14 +36,16 @@ async function getModelData1() {
     const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 5,
+            'imgnum': 5,
+            'textnum': 0,
             'level': 2,
             'placeid': 0,
             'id':''
         },
     });
     if(mkdata.code == 200){
-        imagelist.value = mkdata.data;
+        imagelist.value = mkdata.data.img;
+        roll_num_lang.value = mkdata.data.img.length;
     }else{
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：获取首页轮播图")

pages/index.vue

@@ -5,14 +5,14 @@
         <!-- 农资供销 nzgx -->
         <main class="index_main">
             <div class="index_head_out clearfix">
-                <h3 class="index_head_h3">
+                <h3 class="index_head_h3" v-if="headline">
                     <NuxtLink class="index_head_h3_a" :href="getLinkPathDetail(headline)" :title="headline.title"
                         :target="headline.islink == 1 ? '_blank' : '_self'">
                         <div class="index_head_h3_tag">头条</div>
                         {{ headline.title }}
                     </NuxtLink>
                 </h3>
-                <div class="index_head_a_box clearfix">
+                <div class="index_head_a_box clearfix" v-if="headlineData2">
                     <NuxtLink 
                         :href="getLinkPathDetail(item)" 
                         class="index_head_a dot1"
@@ -137,7 +137,7 @@
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     :class="['index_head_left_a', hoverStatus == 1 ? 'index_head_left_a_only' : '']"
-                                    v-if="pageData[0].cid"
+                                    v-if="pageData[0]"
                                     @mouseenter="qhPic(1)"
                                     :href="getLinkPath(pageData[0])"
                                     :title="pageData[0].alias"
@@ -148,7 +148,7 @@
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     :class="['index_head_left_a', hoverStatus == 2 ? 'index_head_left_a_only' : '']"
-                                    v-if="pageData[1].cid"
+                                    v-if="pageData[1]"
                                     @mouseenter="qhPic(2)"
                                     :href="getLinkPath(pageData[1])"
                                     :title="pageData[1].alias"
@@ -354,7 +354,7 @@
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     class="index_head_left_a index_head_left_a_only"
-                                    v-if="pageData[2].cid"
+                                    v-if="pageData[2]"
                                     :href="getLinkPath(pageData[2])"
                                     :title="pageData[2].alias"
                                     >
@@ -390,12 +390,12 @@
             </section>
             <section class="index_5 clearfix">
                 <div class="index_1_box clearfix">
-                    <div class="index_head_box clearfix">
+                    <!-- <div class="index_head_box clearfix">
                         <div class="index_head_box_left">
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     class="index_head_left_a index_head_left_a_only"
-                                    v-if="pageData[3].cid"
+                                    v-if="pageData[3]"
                                     :href="getLinkPath(pageData[3])"
                                     :title="pageData[3].alias"
                                     >
@@ -413,9 +413,65 @@
                                 {{item.alias}}
                             </NuxtLink>
                         </div>
+                    </div> -->
+                    <div class="index_head_box clearfix">
+                        <div class="index_head_box_left">
+                            <div class="index_head_left_a_btn">
+                                <a class="index_head_left_a index_head_left_a_only" href="" title="">农资供求</a>
+                            </div>
+                        </div>
+                        <div class="index_head_box_right_3">
+                            <a class="index_head_box_right_3_a" href="" title=""> 种子</a>
+                            <a class="index_head_box_right_3_a" href="" title=""> 种苗</a>
+                            <a class="index_head_box_right_3_a" href="" title=""> 农药</a>
+                            <a class="index_head_box_right_3_a" href="" title=""> 兽药</a>
+                            <a class="index_head_box_right_3_a" href="" title=""> 化肥</a>
+                            <a class="index_head_box_right_3_a" href="" title=""> 农机农具</a>
+                            <a class="index_head_box_right_3_a" href="" title=""> 饲料饲草</a>
+                        </div>
                     </div>
                     <!--农资供求open-->
                     <div class=" clearfix">
+                        <div class="index_3_box clearfix">
+                            <div class="index_img_ul_1_ul">
+                                <div class="index_img_ul_1_li">
+                                    <a class="index_img_ul_1_li_a" href="" title="">
+                                        <img class="index_img_ul_1_li_img" src="../public/img/8.png" title="" alt="">
+                                        <div class="index_img_ul_1_li_dot1 dot1">
+                                            农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权农民工维权
+                                        </div>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="index_4_box clearfix">
+                            <div class="index_name_ul">
+                                <div class="index_name_ul_li">
+                                    <a class="index_name_ul_li_tag" href="" title="">供应</a>
+                                    <a class="index_name_ul_li_dot1 dot1" href=""
+                                        title="">民工动态民工动态民工动态民工动态民工动态民工动态民工动态</a>
+                                </div>
+                                <div class="index_name_ul_li" v-for="(per_obj, per_index) in 2" :key="per_obj">
+                                    <a class="index_name_ul_li_tag" href="" title="">【供应】</a>
+                                    <a class="index_name_ul_li_dot1 dot1" href=""
+                                        title="">民工动态民工动态民工动态民工动态民工动态民工动态民工动态</a>
+                                </div>
+                            </div>
+                            <div class="index_name_ul_2">
+                                <div class="index_name_ul_2_li">
+                                    <a class="index_name_ul_2_li_tag" href="" title="">求购</a>
+                                    <a class="index_name_ul_2_li_dot1 dot1" href=""
+                                        title="">民工动态民工动态民工动态民工动态民工动态民工动态民工动态</a>
+                                </div>
+                                <div class="index_name_ul_2_li" v-for="(per_obj, per_index) in 2" :key="per_obj">
+                                    <a class="index_name_ul_2_li_tag" href="" title="">【求购】</a>
+                                    <a class="index_name_ul_2_li_dot1 dot1" href=""
+                                        title="">民工动态民工动态民工动态民工动态民工动态民工动态民工动态</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- <div class=" clearfix">
                         <div class="index_3_box clearfix">
                             <div class="index_img_ul_1_ul">
                                 <div class="index_img_ul_1_li">
@@ -512,7 +568,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    </div> -->
                     <!--农资供求 end-->
                 </div>
                 <div class="index_2_box clearfix">
@@ -521,7 +577,7 @@
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     class="index_head_left_a index_head_left_a_only"
-                                    v-if="pageData[4].cid"
+                                    v-if="pageData[4]"
                                     :href="getLinkPath(pageData[4])"
                                     :title="pageData[4].alias"
                                     >
@@ -532,7 +588,7 @@
                         <div class="index_head_box_right">
                             <NuxtLink
                                 class="index_head_box_right_1_a"
-                                v-if="pageData[4].cid"
+                                v-if="pageData[4]"
                                 :href="getLinkPath(pageData[4])"
                                 :title="pageData[4].alias"
                                 >
@@ -588,7 +644,7 @@
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     class="index_head_left_a index_head_left_a_only"
-                                    v-if="pageData[5].cid"
+                                    v-if="pageData[5]"
                                     :href="getLinkPath(pageData[5])"
                                     :title="pageData[5].alias"
                                     >
@@ -611,6 +667,7 @@
                     <div class=" clearfix">
                         <div class="index_3_box clearfix">
                             <div class="index_img_ul_3">
+                                {{ boxData6 }}
                                 <div class="index_img_ul_3_li">
                                     <NuxtLink
                                         class="index_img_ul_3_li_a"
@@ -674,7 +731,7 @@
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     class="index_head_left_a index_head_left_a_only"
-                                    v-if="pageData[6].cid"
+                                    v-if="pageData[6]"
                                     :href="getLinkPath(pageData[6])"
                                     :title="pageData[6].alias"
                                     >
@@ -685,7 +742,7 @@
                         <div class="index_head_box_right">
                             <NuxtLink
                                 class="index_head_box_right_1_a"
-                                v-if="pageData[6].cid"
+                                v-if="pageData[6]"
                                 :href="getLinkPath(pageData[6])"
                                 :title="pageData[6].alias"
                                 >
@@ -731,7 +788,7 @@
                         <div class="index_7_head">
                             <NuxtLink
                                 class="index_7_head_a"
-                                v-if="pageData[7].cid"
+                                v-if="pageData[7]"
                                 :href="getLinkPath(pageData[7])"
                                 :title="pageData[7].alias"
                                 >
@@ -754,7 +811,7 @@
                         <div class="index_7_head">
                             <NuxtLink
                                 class="index_7_head_a"
-                                v-if="pageData[8].cid"
+                                v-if="pageData[8]"
                                 :href="getLinkPath(pageData[8])"
                                 :title="pageData[8].alias"
                                 >
@@ -779,7 +836,7 @@
                         <div class="index_7_head">
                             <NuxtLink
                                 class="index_7_head_a"
-                                v-if="pageData[9].cid"
+                                v-if="pageData[9]"
                                 :href="getLinkPath(pageData[9])"
                                 :title="pageData[9].alias"
                                 >
@@ -809,7 +866,7 @@
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     class="index_head_left_a index_head_left_a_only"
-                                    v-if="pageData[10].cid"
+                                    v-if="pageData[10]"
                                     :href="getLinkPath(pageData[10])"
                                     :title="pageData[10].alias"
                                     >
@@ -869,7 +926,7 @@
                             <div class="index_head_left_a_btn">
                                 <NuxtLink
                                     class="index_head_left_a index_head_left_a_only"
-                                    v-if="pageData[11].cid"
+                                    v-if="pageData[11]"
                                     :href="getLinkPath(pageData[11])"
                                     :title="pageData[11].alias"
                                     >
@@ -880,7 +937,7 @@
                         <div class="index_head_box_right">
                             <NuxtLink
                                 class="index_head_box_right_1_a"
-                                v-if="pageData[11].cid"
+                                v-if="pageData[11]"
                                 :href="getLinkPath(pageData[11])"
                                 :title="pageData[11].alias"
                                 >
@@ -947,7 +1004,8 @@ async function getModelData1() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 4,
+            'imgnum': 0,
+            'textnum': 4,
             'level': 1,
             'placeid': 0,
             'id': ''
@@ -955,11 +1013,11 @@ async function getModelData1() {
     });
     if (mkdata.code == 200) {
         //填充大标题
-        for (let index in mkdata.data) {
+        for (let index in mkdata.data.text) {
            if(index < 1 ){
-                headline.value = mkdata.data[index]
+                headline.value = mkdata.data.text[index]
            }else{
-                headlineData2.value.push(mkdata.data[index])
+                headlineData2.value.push(mkdata.data.text[index])
            }
         }
     } else {
@@ -974,14 +1032,15 @@ async function getModelData3() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 10,
+            'imgnum':0,
+            'textnum': 10,
             'level': 6,
             'placeid': 0,
             'id': ''
         },
     });
     if (mkdata.code == 200) {
-        hotNewsList.value = mkdata.data;
+        hotNewsList.value = mkdata.data.text;
     } else {
         console.log("获取首页今日热点错误", mkdata.message)
     }
@@ -1130,6 +1189,9 @@ const boxData11data2 = ref([]);
 const boxData12 = ref([]);
 const boxData12data2 = ref([]);
 
+//引入导航
+const { $pageNav } = useNuxtApp();
+
 //4.3获得导航数据
 try {
     const navigateData = await requestDataPromise('/web/getWebsiteModelCategory', {
@@ -1153,29 +1215,29 @@ try {
             };
             //渲染标题
             //1
-            if (navigateData.data[index].category_id == 11) { pageData.value[0] = data }
+            if (navigateData.data[index].category_id == $pageNav[0]) { pageData.value[0] = data }
             //2
-            if (navigateData.data[index].category_id == 317) { pageData.value[1] = data }
+            if (navigateData.data[index].category_id == $pageNav[1]) { pageData.value[1] = data }
             //3
-            if (navigateData.data[index].category_id == 21) { pageData.value[2] = data }
+            if (navigateData.data[index].category_id == $pageNav[2]) { pageData.value[2] = data }
             //4
-            if (navigateData.data[index].category_id == 153) { pageData.value[3] = data }
+            if (navigateData.data[index].category_id == $pageNav[3]) { pageData.value[3] = data }
             //5
-            if (navigateData.data[index].category_id == 1) { pageData.value[4] = data }
+            if (navigateData.data[index].category_id == $pageNav[4]) { pageData.value[4] = data }
             //6
-            if (navigateData.data[index].category_id == 26) { pageData.value[5] = data }
+            if (navigateData.data[index].category_id == $pageNav[5]) { pageData.value[5] = data }
             //7
-            if (navigateData.data[index].category_id == 2) { pageData.value[6] = data }
+            if (navigateData.data[index].category_id == $pageNav[6]) { pageData.value[6] = data }
             //8
-            if (navigateData.data[index].category_id == 5) { pageData.value[7] = data }
+            if (navigateData.data[index].category_id == $pageNav[7]) { pageData.value[7] = data }
             //9
-            if (navigateData.data[index].category_id == 12) { pageData.value[8] = data }
+            if (navigateData.data[index].category_id == $pageNav[8]) { pageData.value[8] = data }
             //10
-            if (navigateData.data[index].category_id == 13) { pageData.value[9] = data }
+            if (navigateData.data[index].category_id == $pageNav[9]) { pageData.value[9] = data }
             //11
-            if (navigateData.data[index].category_id == 24) { pageData.value[10] = data }
+            if (navigateData.data[index].category_id == $pageNav[10]) { pageData.value[10] = data }
             //12
-            if (navigateData.data[index].category_id == 14) { pageData.value[11] = data }
+            if (navigateData.data[index].category_id == $pageNav[11]) { pageData.value[11] = data }
         }
     } else {
         console.log("获取导航池出错！", navigateData.message)
@@ -1185,18 +1247,18 @@ try {
 }
 
 let getJson = [
-    { "parent": "11,2,10", "child": "" },//模块1
-    { "parent": "317,2,10", "child": "" },//模块2
-    { "parent": "21,0,7", "child": "189,0,1" },//模块3 必须含有一个子导航的id 才能获取到子导航列表
-    { "parent": "153,1,6", "child": "258,0,1"},//模块4
-    { "parent": "1,2,4", "child": "" },//模块5
-    { "parent": "26,3,10", "child": "191,0,11"},//模块6
-    { "parent": "2,2,7", "child": "" },//模块7
-    { "parent": "5,0,3", "child": "" },//模块8
-    { "parent": "12,0,3", "child": "" },//模块9
-    { "parent": "13,0,3", "child": "" },//模块10
-    { "parent": "24,4,3", "child": "" },//模块11
-    { "parent": "14,1,3", "child": "" },//模块12
+    { "parent": $pageNav[0] + ",2,10", "child": "" },//模块1
+    { "parent": $pageNav[1] + ",2,10", "child": "" },//模块2
+    { "parent": $pageNav[2] + ",0,7", "child": $pageNav[11] + ",0,1" },//模块3 
+    { "parent": $pageNav[3] + ",1,6", "child": ""},//模块4 商城相关，暂时不用
+    { "parent": $pageNav[4] + ",2,4", "child": "" },//模块5
+    { "parent": $pageNav[5] + ",3,10", "child": $pageNav[12] + ",0,11"},//模块6
+    { "parent": $pageNav[6] + ",2,7", "child": "" },//模块7
+    { "parent": $pageNav[7] + ",0,3", "child": "" },//模块8
+    { "parent": $pageNav[8] + ",0,3", "child": "" },//模块9
+    { "parent": $pageNav[9] + ",0,3", "child": "" },//模块10
+    { "parent": $pageNav[10] + ",4,3", "child": "" },//模块11
+    { "parent": $pageNav[11] + ",1,3", "child": "" },//模块12
 ]
 
 let jsonString = JSON.stringify(getJson);
@@ -1254,24 +1316,24 @@ async function getPageAllData() {
                 boxData3menu.value.push(mkdata.data[2].child.all_childcat[index])
             }
         }
-        //模块4
-        boxData4.value = mkdata.data[3].imgnum;
-        for(let index in mkdata.data[3].textnum){
-            if(index < 1){
-                boxData4data2.value.push(mkdata.data[3].textnum[index])
-            }else if(index >= 1 && index < 3){
-                boxData4data3.value.push(mkdata.data[3].textnum[index])
-            }else if(index >= 3 && index < 4){
-                boxData4data4.value.push(mkdata.data[3].textnum[index])
-            }else if(index >= 4 && index <= 5){
-                boxData4data5.value.push(mkdata.data[3].textnum[index])
-            }
-        }
-        for(let index in mkdata.data[3].child.all_childcat){
-            if(index < 3){
-                boxData4menu.value.push(mkdata.data[3].child.all_childcat[index])
-            }
-        }
+        //模块4 商城相关 暂时不用
+        // boxData4.value = mkdata.data[3].imgnum;
+        // for(let index in mkdata.data[3].textnum){
+        //     if(index < 1){
+        //         boxData4data2.value.push(mkdata.data[3].textnum[index])
+        //     }else if(index >= 1 && index < 3){
+        //         boxData4data3.value.push(mkdata.data[3].textnum[index])
+        //     }else if(index >= 3 && index < 4){
+        //         boxData4data4.value.push(mkdata.data[3].textnum[index])
+        //     }else if(index >= 4 && index <= 5){
+        //         boxData4data5.value.push(mkdata.data[3].textnum[index])
+        //     }
+        // }
+        // for(let index in mkdata.data[3].child.all_childcat){
+        //     if(index < 3){
+        //         boxData4menu.value.push(mkdata.data[3].child.all_childcat[index])
+        //     }
+        // }
         //模块5
         boxData5.value = mkdata.data[4].imgnum;
         boxData5data2.value = mkdata.data[4].textnum;

plugins/category.ts

@@ -0,0 +1,30 @@
+
+//master 环境
+const navMaster: number[] = [
+    
+]
+
+
+const navPre: number[] = [
+    527,//模块1 生活用品
+    528,//模块2 书刊音像
+    501,//模块3 动态资讯 - 原来综合资讯
+    565,//模块4 农资供求 - 商城相关的暂时不使用
+    149,//模块5 三农专题
+    1,//模块6 政策法规
+    529,//模块7 会展服务
+    531,//模块8 推广服务
+    532,//模块9 策划服务
+    539,//模块10 人才服务
+    533,//模块11 行业报告
+    530,//模块12 专家服务
+    586,//子导航 法律法规 - 属于政策法规
+    585//子导航 三农新闻 - 属于动态资讯
+]
+
+export default defineNuxtPlugin((nuxtApp) => {
+    //master 环境
+    //nuxtApp.provide('pageNav', navMaster)
+    //pre 环境
+    nuxtApp.provide('pageNav', navPre)
+})

plugins/globals.ts

@@ -1,33 +1,16 @@
 export default defineNuxtPlugin((nuxtApp) => {
   //Pre环境
   nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  nuxtApp.provide('CwebUrl', 'http://nwpre.bjzxtw.org.cn')
+  nuxtApp.provide('CwebUrl', 'http://pre.nzgx.org')
   nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
   nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3000')
+  nuxtApp.provide('userUrl', 'http://localhost:3006')
 
   //正式环境
 //   nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-//   nuxtApp.provide('CwebUrl', 'http://nw.bjzxtw.org.cn')
+//   nuxtApp.provide('CwebUrl', 'http://nw.nzgx.org')
 //   nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
 //   nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-//   nuxtApp.provide('userUrl', 'http://localhost:3000')
+//   nuxtApp.provide('userUrl', 'http://localhost:3006')
   
-  //乡村网
-  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://pre.china-village.com.cn')
-  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
-
-  //农民网
-  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://pre.nmwwt.org')
-  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
-
-  //Dev环境
-  // nuxtApp.provide('webUrl', 'http://apidev.bjzxtw.org.cn')
-  // nuxtApp.provide('CwebUrl', 'http://nwdev.bjzxtw.org.cn')
-  // nuxtApp.provide('BwebUrl', 'http://admindev.bjzxtw.org.cn')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
 })