修改获取新闻接口bug及登录问题

assets/css/about.less

@@ -78,13 +78,13 @@
             .headImg {
                 width: 1086px;
                 height: 10px;
-                background: url("../../../public/special/head11.png") no-repeat 100% 100%;
+                background: url("@/public/special/head11.png") no-repeat 100% 100%;
             }
 
             .footImg {
                 width: 1086px;
                 height: 7px;
-                background: url("../../../public/special/foot01.png") no-repeat 100% 100%;
+                background: url("@/public/special/foot01.png") no-repeat 100% 100%;
             }
 
             .innerDetail1 {
@@ -93,7 +93,7 @@
                 padding: 30px 50px 40px;
                 box-sizing: border-box;
                 border-left: 1px solid #DBBE9E;
-                background: url("../../../public/special/mid01.png") repeat-y 100% 100%;
+                background: url("@/public/special/mid01.png") repeat-y 100% 100%;
             }
 
             .leftBottom::v-deep {

assets/css/foot.less

@@ -110,7 +110,7 @@
 
 .foot_frind_box {
     display: block;
-    margin: 11px auto;
+    margin: 10px auto 0;
     overflow: hidden;
     display: flex;
     width: 100%;
@@ -139,12 +139,13 @@
     color: #333;
     font-size: 16px;
     margin: 0 30px;
+    margin-bottom: 20px;
 }
 
 .call_us_box {
     display: block;
     width: 100%;
-    margin: 30px auto 0;
+    margin: 0 auto;
     overflow: hidden;
     text-align: center;
     font-size: 0px;

components/detail/HotNews.vue

@@ -37,14 +37,15 @@ async function getPageData() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 5,
+            'imgnum':0,
+            'textnum': 5,
             'level': 4,
             'id': 0,
+            'placeid':0,
         },
     });
     if (mkdata.code == 200) {
-        hotNewsList.value = mkdata.data;
-        console.log("11111111111111111111111111", hotNewsList.value);
+        hotNewsList.value = mkdata.data.text;
 
     } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
@@ -59,20 +60,15 @@ async function getPageData1() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 5,
+            'imgnum':1,
+            'textnum': 0,
             'level': 4,
             'id': 0,
+            'placeid':0,
         },
     });
     if (mkdata.code == 200) {
-        for (let item of mkdata.data) {
-            if (item.imgurl) {
-                if (hotNewsListImg.value.length < 1) {
-                    hotNewsListImg.value.push(item)
-                }
-            }
-        }
-        // hotNewsListImg.value = mkdata.data;
+        hotNewsListImg.value = mkdata.data.img;
     } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：获取最新资讯")

components/detail/HotNews2.vue

@@ -38,14 +38,17 @@ async function getPageData() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 7,
+            'imgnum': 2,
+            'textnum': 7,
             'level': 5,
             'placeid': 0,
             'id': 0
         },
     });
+    console.log('mkdata', mkdata)
     if (mkdata.code == 200) {
-        hotNewsList.value = mkdata.data;
+        hotNewsList.value = mkdata.data.text;
+        hotNewsListImg.value = mkdata.data.img;
     } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：获取热点精选")
@@ -54,32 +57,27 @@ async function getPageData() {
     }
 }
 getPageData();
-async function getPageData1() {
-    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
-        method: 'GET',
-        query: {
-            'pageSize': 30,
-            'level': 5,
-            'placeid': 1,
-            'id': 0
-        },
-    });
-    if (mkdata.code == 200) {
-        for (let item of mkdata.data) {
-            if (item.imgurl) {
-                if (hotNewsListImg.value.length < 2) {
-                    hotNewsListImg.value.push(item)
-                }
-            }
-        }
-    } else {
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-        console.log("错误位置：获取热点精选")
-        console.log("后端错误反馈：", mkdata.message)
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-    }
-}
-getPageData1();
+// async function getPageData1() {
+//     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
+//         method: 'GET',
+//         query: {
+//             'imgmun': 2,
+//             'pageSize': 0,
+//             'level': 5,
+//             'placeid': 1,
+//             'id': 0
+//         },
+//     });
+//     if (mkdata.code == 200) {
+//         hotNewsListImg.value = mkdata.data.img;
+//     } else {
+//         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
+//         console.log("错误位置：获取热点精选")
+//         console.log("后端错误反馈：", mkdata.message)
+//         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
+//     }
+// }
+// getPageData1();
 </script>
 
 

components/home/BigSwiper.vue

@@ -1,9 +1,9 @@
 <template>
     <!-- 首页大的轮播图 -->
-    <div class="swiper"v-if="imagelist">
+    <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" alt="">
                     <div class="text">
                         <span>{{ item.title }}</span>
@@ -21,25 +21,34 @@ import { onMounted } from 'vue'
 //轮播图数据
 let imagelist = useState("imageList", () => "")
 async function getModelData1() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 5,
+            'imgnum': 5,
+            'textnum': 5,
             'level': 2,
             'placeid': 0,
-            'id':0,
+            'id': 0,
         },
     });
-    if(mkdata.code == 200){
-        imagelist.value = mkdata.data;
-    }else{
+    if (mkdata.code == 200) {
+        imagelist.value = mkdata.data.img;
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：设置大标题")
-        console.log("后端错误反馈：",mkdata.message)
+        console.log("后端错误反馈：", mkdata.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
 getModelData1()
+// 跳转详情页
+const getLinkPathDetail = (item) => {
+    if (item.islink == 1) {
+        return `${item.linkurl}`;
+    } else {
+        return `/${item.pinyin}/${item.id}.html`;
+    }
+}
 
 
 </script>

components/home/foot.vue

@@ -83,8 +83,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
         },
     });

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">
@@ -23,7 +26,7 @@
                         </button>
                         <button class="reg" @click="userCenter" v-show="showToken">
                             <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/topicon3.png" alt="用户信息">{{
-                            username }}
+                                username }}
                         </button>
                         <button class="reg" @click="goSearch">
                             <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/head/searchicon.png" alt="搜索">搜索
@@ -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---------------------------------------->
@@ -151,17 +155,17 @@ let userCenter = () => {
 
 // 添加点击事件处理函数
 const handleClickOutside = (event) => {
-  // 获取用户信息菜单元素
-  const userInfoMenu = document.querySelector('.userInfo11');
-  // 获取用户按钮元素
-  const userButton = document.querySelector('.reg img[alt="用户信息"]')?.parentElement;
-  
-  // 如果点击的不是菜单本身且不是用户按钮，则隐藏菜单
-  if (userInfoMenu && 
-      !userInfoMenu.contains(event.target) && 
-      !userButton?.contains(event.target)) {
-    isShow.value = false;
-  }
+    // 获取用户信息菜单元素
+    const userInfoMenu = document.querySelector('.userInfo11');
+    // 获取用户按钮元素
+    const userButton = document.querySelector('.reg img[alt="用户信息"]')?.parentElement;
+
+    // 如果点击的不是菜单本身且不是用户按钮，则隐藏菜单
+    if (userInfoMenu &&
+        !userInfoMenu.contains(event.target) &&
+        !userButton?.contains(event.target)) {
+        isShow.value = false;
+    }
 }
 //2.登录逻辑 end ---------------------------------------->
 
@@ -180,12 +184,12 @@ let exit = () => {
     token1.value = getToken()
 
     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()
@@ -253,7 +257,7 @@ let adImg = ref({})
 //5.获取登录状态 start ---------------------------------------->
 // 在组件卸载时移除事件监听
 onUnmounted(() => {
-  document.removeEventListener('click', handleClickOutside);
+    document.removeEventListener('click', handleClickOutside);
 })
 
 onMounted(async () => {
@@ -309,7 +313,7 @@ onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
-    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snzxw_top`
+    let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=xcw_top`
     const responseAd1 = await fetch(url, {
         headers: {
             'Content-Type': 'application/json',
@@ -366,7 +370,7 @@ onMounted(async () => {
     padding: 20px 0;
     text-align: center;
     font-size: 20px;
-    color: #40663B;
+    color: #333333;
     font-weight: bold;
 
     img {
@@ -406,8 +410,11 @@ header {
     line-height: 33px;
 }
 
-.headerNav .left>span {
+.headerNav .left span {
     margin-right: 20px;
+    a{
+        color: #666666;
+    }
 }
 
 .headerNav .right {
@@ -488,6 +495,7 @@ header {
 .headerLogo {
     height: 145px;
     position: relative;
+
     //background: url("../../public/head/topBg.png") no-repeat center;
     .titlead {
         position: absolute;
@@ -496,21 +504,25 @@ header {
         width: 830px;
         height: 110px;
         overflow: hidden;
+
         a {
             display: block;
             width: 830px;
             height: 110px;
             overflow: hidden;
         }
+
         img {
             width: 100%;
-            height:110px;
+            height: 110px;
         }
     }
+
     .inner {
         position: relative;
         height: 145px;
     }
+
     .inner>img {
         width: 297px;
         height: 110px;

pages/index.vue

@@ -1293,7 +1293,8 @@ async function getModelData1() {
     const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
-            'pageSize': 6,
+            'imgnum': 0,
+            'textnum': 6,
             'level': 1,
             'placeid': 0,
             'id': 0
@@ -1301,7 +1302,7 @@ async function getModelData1() {
     });
     console.log("mkdata", mkdata);
     if (mkdata.code == 200) {
-        headlinelist.value = mkdata.data;
+        headlinelist.value = mkdata.data.text;
         // console.log("成功获取头条信息！", headlinelist.value);
 
     } else {