Browse Source

修改bug

Jing 6 days ago
parent
commit
88bd188deb

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

@@ -1 +1 @@
-{"id":"b8fddec9-d08d-4a3a-9752-a91c8347400d","timestamp":1744869000515}
+{"id":"673b03ea-089f-4118-ba58-9599fd4eb4ab","timestamp":1745473937321}

+ 1 - 0
.nuxt/manifest/meta/673b03ea-089f-4118-ba58-9599fd4eb4ab.json

@@ -0,0 +1 @@
+{"id":"673b03ea-089f-4118-ba58-9599fd4eb4ab","timestamp":1745473937321,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

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

@@ -1 +0,0 @@
-{"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
-/// <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" />

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/b8fddec9-d08d-4a3a-9752-a91c8347400d.json"
+        "./manifest/meta/673b03ea-089f-4118-ba58-9599fd4eb4ab.json"
       ],
       "#components": [
         "./components"

+ 1 - 0
assets/css/about.less

@@ -74,6 +74,7 @@
           width: 1080px;
           margin: 0 auto;
           margin-bottom: 60px;
+          min-height: 600px;
 
           .headImg {
               width: 1086px;

+ 1 - 1
assets/css/index.less

@@ -674,7 +674,7 @@
                         width: 460px;
 
                         .part3_left_content2_list {
-                            margin-bottom: 20px;
+                            margin-bottom: 18px;
 
                             .nav3_title {
                                 font-size: 18px;

+ 4 - 3
assets/css/public/footer.less

@@ -61,7 +61,7 @@
 
 .foot_frind_box {
     display: block;
-    margin: 20px auto 30px;
+    margin: 20px auto 20px;
     overflow: hidden;
     display: flex;
     width: 100%;
@@ -87,13 +87,14 @@
     height: 22px;
     color: #333;
     font-size: 16px;
-    margin: 0 30px;
+    margin: 0 27px;
+    margin-bottom: 20px;
 }
 
 .call_us_box {
     display: block;
     width: 100%;
-    margin: 40px auto 0;
+    margin: 0 auto;
     overflow: hidden;
     text-align: center;
     font-size: 0px;

+ 3 - 0
assets/css/public/head.less

@@ -68,6 +68,9 @@ header {
 
 .headerNav .left>span {
     margin-right: 20px;
+    a{
+        color: #666666;
+    }
 }
 
 .headerNav .right {

+ 7 - 5
components/detail/HotNews.vue

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

+ 3 - 20
components/detail/HotNews2.vue

@@ -1,22 +1,4 @@
 <template>
-    <!-- <div class="title">
-        <h4>
-            热点精选
-        </h4>
-    </div> -->
-    <!-- 列表 -->
-    <!-- <ul class="rightList">
-        <li v-for="item in hotNewsList">
-            <NuxtLink :to="item.linkurl" v-show="item.islink == 1" :title="item.title">
-                <img class="hotNewsImg" :src="item.imgurl">
-                <p>{{ item.title }}</p>
-            </NuxtLink>
-            <NuxtLink :to="`/${item.pinyin}/${item.id}.html`" v-if="item.islink == 0" :title="item.title">
-                <img class="hotNewsImg" :src="item.imgurl">
-                <p>{{ item.title }}</p>
-            </NuxtLink>
-        </li>
-    </ul> -->
     <div class="hotNews">
         <div class="hotNews_title">
             热点精选
@@ -51,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("错误位置:获取热点精选")

+ 4 - 3
components/home/BigSwiper.vue

@@ -3,7 +3,7 @@
     <div class="swiper" v-if="imagelist">
         <el-carousel height="400px" v-if="imagelist">
             <el-carousel-item v-for="(item, index) in imagelist" :key="index">
-                <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">
+                <NuxtLink :href="getLinkPathDetail(item)">
                     <img :src="item.imgurl">
                     <div class="text">
                         <span>{{ item.title }}</span>
@@ -22,14 +22,15 @@ 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;
     }else{
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:获取首页轮播图")

+ 20 - 15
components/home/PageMessage.vue

@@ -2,7 +2,7 @@
     <!-- 新闻头条部分 -->
     <div class="topNewsPart">
         <div class="inner">
-            <div class="toutiao">
+            <div class="toutiao" v-if="headlinelist">
                 <div class="xwtt">
                     <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                         :target="item.islink == 1 ? '_blank' : '_self'" v-for="(item, index) in headlinelist"
@@ -91,18 +91,21 @@ async function getModelData1() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 4,
+            'imgnum': 0,
+            'textnum': 4,
             'level': 1,
             'placeid': 0,
             'id': ''
         },
     });
     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])
+        if (mkdata.data.text.length != 0) {
+            for (let i = 0; i < mkdata.data.text.length; i++) {
+                if (i < 1) {
+                    headlinelist.value.push(mkdata.data.text[i])
+                } else {
+                    headlinelist1.value.push(mkdata.data.text[i])
+                }
             }
         }
         //填充大标题
@@ -125,14 +128,15 @@ async function getModelData2() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 2,
+            'imgnum': 2,
+            'textnum': 0,
             'level': 2,
             'placeid': 6,
-            'id': ''
+            'id': 0
         },
     });
     if (mkdata.code == 200) {
-        moveBannerList.value = mkdata.data;
+        moveBannerList.value = mkdata.data.img;
     } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:获取首页轮播图下面的图文")
@@ -149,20 +153,21 @@ async function getModelData3() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 8,
+            'imgnum': 0,
+            'textnum': 15,
             'level': 6,
             'placeid': 0,
             'id': ''
         },
     });
     if (mkdata.code == 200) {
-        for (let i = 0; i < mkdata.data.length; i++) {
+        for (let i = 0; i < mkdata.data.text.length; i++) {
             if (i >= 0 && i <= 4) {
-                hotNewsList_data1.value.push(mkdata.data[i])
+                hotNewsList_data1.value.push(mkdata.data.text[i])
             } else if (i >= 5 && i <= 9) {
-                hotNewsList_data2.value.push(mkdata.data[i])
+                hotNewsList_data2.value.push(mkdata.data.text[i])
             } else if (i >= 10 && i <= 14) {
-                hotNewsList_data3.value.push(mkdata.data[i])
+                hotNewsList_data3.value.push(mkdata.data.text[i])
             }
         }
     } else {

+ 2 - 2
components/home/foot.vue

@@ -73,8 +73,8 @@ async function getModelDataAll() {
     const mkdata =  await requestDataPromise('/web/getWebsiteFootAll', {
         method: 'GET',
         query: {
-            'link_textnum':8,
-            'link_imgnum':12,
+            'link_textnum':24,
+            'link_imgnum':18,
             'link_footnum':4
         },
     });

+ 2 - 2
components/home/kefu.vue

@@ -12,11 +12,11 @@
       <p>QQ客服</p>
       <div class="kefu_item_content_QQ">
           <div @click="addQQFriend(bottomBase.customer_service_qq)" class="qqadd">
-              <img src="https://img.bjzxtw.org.cn/pre/public/index/tubiao1.png" width="100">
+              <img :src="bottomBase.service_qq_img" width="100">
               <div class="qqfs">{{bottomBase.customer_service_qq}}</div>
           </div>
           <div @click="addQQFriend(bottomBase.communications)" class="qqadd">
-              <img src="https://img.bjzxtw.org.cn/pre/public/index/tubiao2.png" width="100">
+              <img :src="bottomBase.communications_img" width="100">
               <div class="qqfs">{{bottomBase.communications}}</div>
           </div>
           <div class="arrow"></div>

+ 12 - 8
components/home/pageHead.vue

@@ -3,7 +3,10 @@
         <nav class="headerNav">
             <div class="inner">
                 <div class="left">
-                    <span>中农兴业网团旗下网站 · 农业百强网站(科教文化类十强)</span> 
+                    <span class="znxy">
+                        <a href="http://znxyw.org.cn/" target="_blank">中农兴业网团</a>
+                    </span>
+                    <span>旗下网站 · 农业百强网站(科教文化类十强)</span>
                 </div>
                 <div class="right">
                     <div class="menu">
@@ -53,7 +56,7 @@
         <el-dialog v-model="dialogTableVisible" width="800">
             <div class="tips">
                 <p>
-                    <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/tips.png"> 提示:注册请联系管理员操作!
+                    <img src="@/public/topic/tips.png"> 提示:注册请联系管理员操作!
                 </p>
                 <p>联系电话:010-56019387</p>
                 <p>QQ : 2909421493 、213552413</p>
@@ -119,11 +122,12 @@ let goLogin = () => {
     //开启线上登录模式 start---------------------------------------->
     isDel.value = 0
     token1.value = getToken()
-
     //王鹏
-    window.open($BwebUrl + "/auth/login.php?backurl=" + $CwebUrl, '_blank');
+    //window.open($BwebUrl + "/auth/login.php?backurl=" + $CwebUrl, '_blank');
     //刘佳伟
-    // window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl, '_blank');
+    //window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl, '_blank');
+    //党云龙
+    window.open($BwebUrl + "/#/login?backurl=" + $CwebUrl, '_blank');
     //开启线上登录模式 end---------------------------------------->
 
     //开启本地登录模式 start---------------------------------------->
@@ -182,10 +186,10 @@ let exit = () => {
     let tokendata = getToken()
   
     //王鹏
-    let url = $BwebUrl + '/auth/logout.php?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
-      console.log("用户退出登录======token为:", tokendata,url)
+    // let url = $BwebUrl + '/auth/logout.php?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+    //   console.log("用户退出登录======token为:", tokendata,url)
     //刘佳伟
-    // let url = $LoginWebUrl + '/api/logout?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+    let url = $LoginWebUrl + '/api/logout?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
     window.location.href = url;
     removeToken()
     removeTicket()

+ 28 - 20
pages/index.vue

@@ -141,7 +141,7 @@
                             <li class="part2_left_content1_list" v-for="item in boxData4" :key="index">
                                 <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                                     :target="item.islink == 1 ? '_blank' : '_self'">
-                                    <span class="nav2_title">{{ item.alias }}</span>
+                                    <span class="nav2_title">{{ item.category_name }}</span>
                                 </NuxtLink>
                                 <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                                     :target="item.islink == 1 ? '_blank' : '_self'">
@@ -161,7 +161,7 @@
                                     <span class="content2_text_content">
                                         {{ item.title }}
                                     </span>
-                                    <span class="content2_text_title">{{ item.alias }}</span>
+                                    <span class="content2_text_title">{{ item.category_name }}</span>
                                 </div>
                             </NuxtLink>
                         </li>
@@ -239,7 +239,7 @@
                                 <li class="part3_left_content2_list" v-for="item in boxData6data3" :key="index">
                                     <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <span class="nav3_title">{{ item.alias }}</span>
+                                        <span class="nav3_title">{{ item.category_name }}</span>
                                     </NuxtLink>
                                     <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
@@ -253,7 +253,7 @@
                                 <li class="part3_left_content2_list" v-for="item in boxData6data4" :key="index">
                                     <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <span class="nav3_title">{{ item.alias }}</span>
+                                        <span class="nav3_title">{{ item.category_name }}</span>
                                     </NuxtLink>
                                     <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
@@ -344,7 +344,7 @@
                         <li class="part4_photo_contentlist" v-for="item in boxData8data2" :key="index">
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                                 :target="item.islink == 1 ? '_blank' : '_self'">
-                                <span class="nav11_title">{{ item.alias }}</span>
+                                <span class="nav11_title">{{ item.category_name }}</span>
                             </NuxtLink>
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
                                 :target="item.islink == 1 ? '_blank' : '_self'">
@@ -571,8 +571,8 @@ try {
             //渲染标题
             //1 农业生产372
             if (navigateData.data[index].category_id == 372) { pageData.value[0] = data }
-            //2 三农资讯328
-            if (navigateData.data[index].category_id == 445) { pageData.value[1] = data }
+            //2 三农资讯445 499
+            if (navigateData.data[index].category_id == 499) { pageData.value[1] = data }
             //3 市场行情377
             if (navigateData.data[index].category_id == 377) { pageData.value[2] = data }
             //4 商贸信息375
@@ -588,7 +588,7 @@ try {
             //9 农民合作社433
             if (navigateData.data[index].category_id == 433) { pageData.value[8] = data }
             //10 新农村11
-            if (navigateData.data[index].category_id == 11) { pageData.value[9] = data }
+            if (navigateData.data[index].category_id == 748) { pageData.value[9] = data }
         }
     } else {
         console.log("获取导航池出错!", navigateData.message)
@@ -599,7 +599,7 @@ try {
 
 let getJson = [
     { "parent": "372,2,12", "child": "" },//模块1 农业生产372
-    { "parent": "445,1,4", "child": "" },//模块2 三农资讯328
+    { "parent": "499,1,4", "child": "" },//模块2 三农资讯328
     { "parent": "377,1,4", "child": "" },//模块3 市场行情377
     { "parent": "375,1,10", "child": "" },//模块4 商贸信息375
     { "parent": "373,1,8", "child": "" },//模块5 农民生活373
@@ -607,7 +607,7 @@ let getJson = [
     { "parent": "431,4,4", "child": "" },//模块7 招商引资431
     { "parent": "374,1,5", "child": "" },//模块8 农知农技374
     { "parent": "433,1,5", "child": "" },//模块9 农民合作社433
-    { "parent": "11,1,5", "child": "" },//模块10 新农村11
+    { "parent": "748,1,5", "child": "" },//模块10 新农村11 748
 ]
 
 let jsonString = JSON.stringify(getJson);
@@ -652,6 +652,13 @@ async function getPageAllData() {
                 boxData6data2.value.push(item);
             }
         });
+        mkdata.data[5].textnum.forEach((item, index) => {
+            if (index < 6) {
+                boxData6data3.value.push(item); 
+            } else{
+                boxData6data4.value.push(item);
+            }
+        })
         //模块7
         mkdata.data[6].imgnum.forEach((item, index) => {
             if (index < 2) {
@@ -669,6 +676,7 @@ async function getPageAllData() {
         });
         //模块8
         boxData8.value = mkdata.data[7].imgnum;
+        boxData8data2.value = mkdata.data[7].textnum;
         //模块9
         boxData9.value = mkdata.data[8].imgnum;
         boxData9data2.value = mkdata.data[8].textnum;
@@ -701,18 +709,18 @@ async function getPageData() {
         // console.log("成功获取模块数据2222!", mkdata);
 
         //模块4商贸信息375
-        boxData4.value = mkdata.data[0].textnum;
-        boxData4data2.value = mkdata.data[0].imgnum;
+        // boxData4.value = mkdata.data[0].textnum;
+        // boxData4data2.value = mkdata.data[0].imgnum;
         //模块6法治天地426
-        mkdata.data[1].textnum.forEach((item, index) => {
-            if (index < 6) {
-                boxData6data3.value.push(item);
-            } else {
-                boxData6data4.value.push(item);
-            }
-        });
+        // mkdata.data[1].textnum.forEach((item, index) => {
+        //     if (index < 6) {
+        //         boxData6data3.value.push(item);
+        //     } else {
+        //         boxData6data4.value.push(item);
+        //     }
+        // });
         //模块8农知农技374
-        boxData8data2.value = mkdata.data[2].textnum;
+        // boxData8data2.value = mkdata.data[2].textnum;
     }
 
 }