提交代码

components/advertising/Head.vue

@@ -1,135 +1,370 @@
 <template>
     <div>
-        <div class="head">
+        <!-- 顶部导航 -->
+        <nav class="headerNav">
             <div class="inner">
-                <div class="headLogo left">
-                    <img src="../../static/images/image 36.png" alt="" @click="goBack">
-                    <span>广告服务</span>
+                <div class="left">
+                    <span>中农兴业网团</span>
+                    <span>旗下网站：
+                        <span>农业百强网站（政府类30强）</span>
+                    </span>
+                    <span class="ad">广告服务</span>
                 </div>
                 <div class="right">
-                    <!-- <span>
-                        <em class="home"></em>
-                        设为首页
-                    </span>
-                    <span>
-                        <em class="collection"></em>
-                        加入收藏
-                    </span> -->
+                    <div class="menu">
+                        <button class="reg" @click="goSearch">
+                            <img src="../../static/head/searchicon.png" alt="搜索">
+                            搜索
+                        </button>
+                        <button class="reg" @click="goTopic">
+                            <img src="../../static/head/topicon1.png" alt="商圈">
+                            商圈
+                        </button>
+                        <button class="reg" @click="goAdvertising">
+                            <img src="../../static/head/topicon2.png" alt="广告服务">
+                            广告服务
+                        </button>
+                    </div>
+                    <div class="right-top-menu">
+                        <button class="reg" @click="goLogin" v-show="!showToken">
+                            <img src="../../static/head/topicon3.png" alt="登录">
+                            登录
+                        </button>
+                        <button class="reg" @click="goRegister" v-show="!showToken">
+                            <img src="../../static/head/topicon4.png" alt="注册">
+                            注册
+                        </button>
+                        <button class="reg" @click="userCenter" v-show="showToken">
+                            <img src="../../static/head/topicon3.png" alt="用户信息">
+                            {{ username }}
+                        </button>
+
+                    </div>
+                    <ul class="userInfo11" v-if="isShow">
+                        <li @click="gotosystem">个人中心</li>
+                        <li @click="exit">退出</li>
+                    </ul>
+
                 </div>
             </div>
-        </div>
-        <div class="tips">
-            <div class="inner">
-                <p v-show="false">注意：广告购买需提交信息，用户与商务人员进行线下金额交易，交易成功后由商务人员后台审核。审核通过，即广告投放成功。</p>
+        </nav>
+        <el-dialog v-model="dialogTableVisible" title="" width="800">
+            <div class="tips">
+                <p>
+                    <img src="../../static/topic/tips.png" alt="">
+                    提示:注册请联系管理员操作!
+                </p>
+                <p>
+                    联系电话:010-56019387
+                </p>
+                <p>
+                    QQ ： 2909421493 、213552413
+                </p>
             </div>
-        </div>
+        </el-dialog>
     </div>
 
 </template>
 
 <script setup>
+import { ref, onMounted, watch } from 'vue'
+import { ElPopover, ElDialog } from 'element-plus'
+import { getToken, setToken, removeToken } from '@/store/useCookieStore'
+import { setTicket, removeTicket } from '@/store/useticketStore'
+// import { navigateTo } from '@nuxtjs/composables';
+
+const nuxtApp = useNuxtApp();
+console.log("===:", nuxtApp) // 输出: someValue
+const axios = nuxtApp.$axios;
+
+let ticket = ref('')
+let token = ref('')
+let route = useRoute()
+ticket.value = route.query.ticket
+token.value = route.query.admintoken
+if (ticket.value) {
+    setTicket(ticket.value)
+}
+if (token.value) {
+    setToken(token.value)
+}
+
+
+console.log('查询参数：', ticket.value);
+console.log('查询参数：', token.value);
+
+definePageMeta({
+    middleware: 'auth'
+});
+
+let keyword = useState('keyword', () => '')
+let username = useState('username', () => '')
+let isDel = useState('isDel', () => 1)
+let isShow = useState('isShow', () => false)
+
+//点击登录按钮
+let goLogin = () => {
+    isDel.value = 0
+    token1.value = getToken()
+    window.location.href = ("http://admindev.bjzxtw.org.cn/auth/login.php?backurl=http://nwdev.bjzxtw.org.cn")
+    token1.value = getToken()
+}
+let dialogTableVisible = ref(false)
+
+//点击注册按钮
+let goRegister = () => {
+    dialogTableVisible.value = true
+}
+let userCenter = () => {
+    if(isShow.value){
+        isShow.value = false
+        return
+    }else{
+        isShow.value = true
+        return
+    }
+}
+
+let gotosystem = () => {
+    window.location.href = ("http://admindev.bjzxtw.org.cn/#/login?userurl=http://nwdev.bjzxtw.org.cn")
+}
+
+//点击退出按钮
+let exit = () => {
+    window.location.href = ('http://nwdev.bjzxtw.org.cn/')
+
+    isDel.value = 1
+    token1.value = getToken()
+
+    // axios.get(`http://admindev.bjzxtw.org.cn/auth/logoutapi.php?token=${token}`).then(response => {
+    //     console.log("退出登录", response);
+    //     isDel.value = response.data.isDel
+    // })
+    window.location.href = (`http://admindev.bjzxtw.org.cn/auth/logout.php?backurl=http://nwdev.bjzxtw.org.cn&admintoken=${token1}`)
+    removeToken()
+    removeTicket()
+}
+
+//点击搜索按钮
+let goSearch = () => {
+    const route = `/search/search?keyword=${keyword.value}`;
+    window.open(route, '_blank');
+}
+
+// 点击广告服务
+let goAdvertising = () => {
+    // window.location.href = ('http://localhost:3000/advertising?activeName=${1}')
+    if (getToken()) {
+        window.open(`http://nwdev.bjzxtw.org.cn/advertising?activeName=${1}`, '_blank');
+    } else {
+        goLogin()
+    }
+}
+
+//点击商圈
+let goTopic = () => {
+    // window.location.href = ('http://localhost:3000/topic')
+    if (getToken()) {
+        window.open('http://nwdev.bjzxtw.org.cn/topic', '_blank');
+    } else {
+        goLogin()
+    }
+}
+
+
+//获取用户信息
+let getUserInfo = async () => {
+    try {
+        const response = await axios.get("/user/getUserInfo");
+        console.log('获取用户信息', response);
+        username.value = response.data.nickname
+
+    } catch (error) {
+        console.error(error);
+    }
+}
+
+let token1 = useState("token1", () => '')
+let showToken = useState("showToken", () => '')
+token1.value = getToken()
 
-let goBack=()=>{
-    window.location.href = ('http://nwpre.bjzxtw.org.cn/')
+watch(token1, (newval, oldval) => {
+    console.log(newval, oldval);
+    showToken.value = newval
+}, {
+    deep: true,
+    immediate: true,
+})
+
+onMounted(() => {
+
+    //获取用户信息
+    getUserInfo()
+
+    //获取登录状态
+    getLoginStatus()
+})
+
+//检测登录状态
+//http://admindev.bjzxtw.org.cn/auth/loginstatus.php?token=XXXXXXXXXXXX
+let tokenStatus = ref('');
+tokenStatus.value = getToken()
+console.log(tokenStatus.value);
+//获取用户信息
+let getLoginStatus = async () => {
+    try {
+        const response = await axios.get(`http://nwdev.bjzxtw.org.cn/auth/loginstatus.php?token=${tokenStatus}`);
+        console.log('登录状态', response);
+        if (response.data.code == 200) {
+
+        } else if (response.data.code == 0) {
+            //退出登录
+            exit();
+        }
+    } catch (error) {
+        console.error(error);
+    }
 }
 
-// const goBack = () => {
-//     window.history.back();
-// };
-// const props = defineProps({
-//     title: String
-// });
+
 </script>
 
 <style lang="less" scoped>
 // 广告页面头部
-.head {
+.headerNav {
     width: 100%;
-    padding: 15px 0;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    height: 56px;
+    line-height: 56px;
+    border-bottom: 1px solid #E5E5E5;
+    // background-color: red;
+}
+
+.headerNav .left>span {
+    margin-right: 47px;
+    color: #666666;
+}
+
+.headerNav .left>.ad {
+    border-left: 1px solid #E5E5E5;
+    padding-left: 45px;
+    color: #333333;
+    font-weight: 600px;
+}
+
+.headerNav .right {
+    display: flex;
+    margin-right: 10px;
+    position: relative;
+
+    button {
+        font-size: 12px;
+        color: #666666;
+        border: none;
+        background: none;
+        cursor: pointer;
+    }
+
+    .login {
+        width: 36px;
+        height: 19px;
+        color: #fff;
+        border-radius: 4px;
+        background-color: #028E21;
+        margin-right: 15px;
+        cursor: pointer;
+    }
 
-    .inner {
-        width: 1200px;
-        height: 27px;
+    .menu,
+    .right-top-menu {
+        display: flex;
     }
 
-    .headLogo {
+    .reg {
+        margin-right: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 50px;
+
         img {
-            width: 127px;
-            height: 27px;
-            padding-right: 15px;
-            vertical-align: -10px;
-            border-right: 1px solid #999;
+            margin-right: 5px;
         }
+    }
+}
 
-        span {
-            display: inline-block;
-            width: 100px;
-            padding-left: 15px;
-            vertical-align: middle;
-            font-family: Microsoft YaHei, Microsoft YaHei;
-            font-weight: 400;
-            font-size: 18px;
-            color: #333333;
-            line-height: 21px;
-            text-align: left;
-            font-style: normal;
-            text-transform: none;
-        }
+.headerNav .right {
+    float: right;
+    font-size: 12px;
+    // margin-top: 10px;
+
+    span {
+        margin-left: 26px;
     }
 
-    .right {
-        span {
-            margin-left: 26px;
-            font-family: PingFang SC, PingFang SC;
-            font-weight: 400;
-            font-size: 12px;
-            color: #666666;
-            line-height: 14px;
-            text-align: left;
-            font-style: normal;
-            text-transform: none;
-        }
+    .home,
+    .collection {
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        vertical-align: -3px;
+    }
 
-        .home,
-        .collection {
-            display: inline-block;
-            width: 16px;
-            height: 16px;
-            vertical-align: -3px;
-        }
+    .exit {
+        line-height: 30px;
+    }
 
-        .home {
-            background-image: url("../../static/images/Iconly／Light／Home.png");
-        }
+}
 
-        .collection {
-            background-image: url("../../static/images/Iconly／Light／Star.png");
-        }
+.userInfo11 {
+    width: 100px;
+    height: 80px;
+    background-color: #fff;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+    border-radius: 3px;
+    position: absolute;
+    top: 50px;
+    right: 0;
+    font-size: 14px;
+    z-index: 999;
+
+    li {
+        height: 40px;
+        line-height: 40px;
+        color: #333333;
+        padding-left: 10px;
+    }
+
+    >li:hover {
+        color: #028E21;
     }
 }
 
 //提示信息
 .tips {
-    width: 100%;
-    height: 70px;
-    line-height: 70px;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    padding: 20px 0;
+    text-align: center;
+    font-size: 20px;
+    color: #40663B;
+    font-weight: bold;
+
+    img {
+        width: 78px;
+        height: 78px;
+        vertical-align: middle;
+        margin-right: 20px;
 
-    .inner {
-        width: 1200px;
-        height: 70px;
+        p {
+            line-height: 30px;
+        }
     }
 
     p {
-        font-family: Microsoft YaHei, Microsoft YaHei;
-        font-weight: 400;
-        font-size: 16px;
-        color: #FE0101;
-        // line-height: 19px;
-        text-align: left;
-        font-style: normal;
-        text-transform: none;
+        line-height: 40px;
+    }
+
+    >p:first-child {
+        margin-bottom: 30px;
     }
+
 }
 </style>

components/detail/HotNews.vue

@@ -2,14 +2,15 @@
     <div class="hotList">
         <div class="title">
             <h4>
-                热点资讯
+                今日热点
             </h4>
         </div>
         <ul class="messageList">
             <li v-for="(item, index) in hotNewsList">
                 <span>{{ index + 1 }}</span>
-                <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">{{ item.title }}</NuxtLink>
-                <!-- <NuxtLink>数说新中国75年｜人民文化生活日益丰富 文...</NuxtLink> -->
+                <NuxtLink :to="item.linkurl" target="_blank" v-show="item.islink == 1">{{ item.title }}</NuxtLink>
+                <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank" v-if="item.islink == 0">{{ item.title }}
+                </NuxtLink>
             </li>
         </ul>
     </div>

components/detail/HotNews2.vue

@@ -1,13 +1,17 @@
 <template>
     <div class="title">
         <h4>
-            热点资讯
+            热点精选
         </h4>
     </div>
     <!-- 列表 -->
     <ul class="rightList">
         <li v-for="item in hotNewsList">
-            <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">
+            <NuxtLink :to="item.linkurl" target="_blank" v-show="item.islink == 1">
+                <img class="left hotNewsImg" :src="item.imgurl">
+                <p class="left">{{ item.title }}</p>
+            </NuxtLink>
+            <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank" v-if="item.islink == 0">
                 <img class="left hotNewsImg" :src="item.imgurl">
                 <p class="left">{{ item.title }}</p>
             </NuxtLink>

components/home/Advertising.vue

@@ -2,7 +2,9 @@
     <!-- 广告位 -->
     <div class="adversing">
         <div class="inner">
-            <img src="../../static/images/Group 1538.png" alt="">
+            <a href="http://www.baidu.com">
+                <img :src="imgurl.thumb" alt="">
+            </a>
         </div>
         <p>{{ message }}</p>
     </div>
@@ -14,9 +16,11 @@ import { onMounted } from 'vue'
 const nuxtApp = useNuxtApp();
 const axios = nuxtApp.$axios;
 
-// const props = defineProps({
-//     message: String
-// });
+const props = defineProps({
+    imgurl: String
+});
+
+
 let image = useState("image", () => "")
 let getWebsiteAdvertisement = async () => {
     try {

components/home/BigSwiper.vue

@@ -49,7 +49,7 @@ let handleIndicatorChange = (val) => {
 
 <style lang="less" scoped>
 .swiper {
-    width: 790px;
+    width: 720px;
     height: 405px;
     position: relative;
 

components/home/BigTitle_List.vue

@@ -20,7 +20,7 @@ const axios = nuxtApp.$axios;
 const headlinelist1 = useState("headlinelist1", () => "");
 const headline1 = async () => {
     try {
-        const response = await axios.get(`/web/getWebsiteArticlett?pageSize=${2}&level=${1}&placeid=${1}`);
+        const response = await axios.get(`/web/getWebsiteArticlett?pageSize=${2}&level=${1}&placeid=${2}`);
         console.log('headlinelist1', response.data);
         headlinelist1.value = response.data;
     } catch (error) {

components/home/PageMessage.vue

@@ -9,7 +9,10 @@
                     <img src="../../static/head/mainTitleicon.png" alt="" class="left">
                     <!-- <h1 class="left">{{ item.title }}</h1> -->
                     <!-- <a>{{ item.title }}</a> -->
-                    <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">
+                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                        <h1 class="left">{{ item.title }}</h1>
+                    </NuxtLink>
+                    <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank" v-if="item.islink==0">
                         <h1 class="left">{{ item.title }}</h1>
                     </NuxtLink>
                 </div>
@@ -44,7 +47,8 @@
                     <ul>
                         <li v-for="(item, index) in hotNewsList" :key="index">
                             <strong>{{ index + 1 }}</strong>
-                            <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">{{ item.title }}</NuxtLink>
+                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
+                            <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                         </li>
                     </ul>
                 </div>
@@ -244,13 +248,13 @@ onMounted(() => {
 
     // 右侧
     .messageRight {
-        width: 380px;
+        width: 450px;
         height: 405px;
         margin-left: 30px;
 
         .hotTop,
         .suggest {
-            width: 380px;
+            width: 450px;
             height: 283px;
 
             >h3 {
@@ -326,7 +330,7 @@ onMounted(() => {
                     >a,
                     >span {
                         display: inline-block;
-                        width: 347px;
+                        width: 416px;
                         height: 25px;
                         font-family: PingFang SC, PingFang SC;
                         font-weight: 500;
@@ -353,7 +357,7 @@ onMounted(() => {
         }
 
         .hotTop {
-            width: 380px;
+            width: 450px;
         }
 
         .suggest {

components/home/SecondaryHeading.vue

@@ -4,7 +4,7 @@
         <div class="inner">
             <h2>
                 <!-- 三农之窗 -->
-                {{ titleName }}
+                {{ title.name }}
                 <em class="iconfont icon-xingzhuang-zhijiaosanjiaoxing-copy"></em>
             </h2>
             <p class="introduction">
@@ -21,11 +21,37 @@
 </template>
 
 <script setup>
-//let ChannelList = ['理论前沿', '典型经验', '魅力乡村', '农民之家', '农业天地', '农村建设', '高端资讯', '实践探索']
+import { onMounted } from 'vue'
+
 const props = defineProps({
     titleName: String,
     titleData:Array
 });
+
+//获得axios
+const nuxtApp = useNuxtApp();
+const axios = nuxtApp.$axios;
+//let ChannelList = ['理论前沿', '典型经验', '魅力乡村', '农民之家', '农业天地', '农村建设', '高端资讯', '实践探索']
+
+//获得跳转过来的id
+const route = useRoute();
+const routeId = route.params.id; //获得该页面的id
+const routeName = route.query.name; //获得该页面的名称
+
+const title = ref("")
+const getTitle = async () => {
+    try {
+        const response = await axios.get(`/web/getOneWebsiteCategory?catid=${routeId}`);
+        title.value = response.data;
+    } catch (error) {
+        console.error(error);
+    }
+}
+
+onMounted(() => {
+    getTitle()
+})
+
 </script>
 
 <style lang="less" scoped>

components/home/Slider.vue

@@ -4,8 +4,17 @@
     <div class="slider" v-if="navigation1[2]">
         <!-- 标题部分 -->
         <div class="scienceTitle" v-if="navigation1[2]">
-            <h5>
-                <span>{{ navigation1[2].alias }}</span>
+            <h5 v-if="navigation1[2].category_id">
+                <NuxtLink
+                    :to="{ path: `/newsList/${navigation1[2].category_id}`}"
+                    target="_blank" v-if="navigation1[2].category_id&&message.children_count!=0" class="active">
+                    {{navigation1[2].alias}}
+                </NuxtLink>
+                <NuxtLink
+                    :to="{ path: `/primaryNavigation/${navigation1[2].category_id}`}"
+                    target="_blank" v-else-if="navigation1[2].category_id&&message.children_count==0" class="active">
+                    {{navigation1[2].alias}}
+                </NuxtLink>
             </h5>
             <NuxtLink :to="`/newsList/${navigation1[2].category_id}`" target="_blank">
                 查看更多
@@ -22,36 +31,36 @@
             <div class="boxcontent">
                 <div class="boxleft" v-if="boxData1[0]">
                     <div class="boxBigImg">
-                        <NuxtLink :to="`/newsDetail/${boxData1[0].id}`" target="_blank">
+                        <NuxtLink :to="`/newsDetail/${boxData1[0].id}`" target="_blank" class="imgbg">
                             <img :src="boxData1[0].imgurl">
                             <div>
-                                <p>{{ boxData1[0].title }}</p>
-                                <span>{{ boxData1[0].created_at }}</span>
+                                <p><span>专题</span>{{ boxData1[0].title }}</p>
+                                <span>{{ getDays(boxData1[0].created_at) }}</span>
                             </div>
                         </NuxtLink>
                     </div>
                     <div class="boxMainImg">
-                        <NuxtLink :to="`/newsDetail/${boxData1[1].id}`" target="_blank">
+                        <NuxtLink :to="`/newsDetail/${boxData1[1].id}`" target="_blank" class="imgbg">
                             <img :src="boxData1[1].imgurl">
                             <div>
                                 <p>{{ boxData1[1].title }}</p>
-                                <span>{{ boxData1[1].created_at }}</span>
+                                <span>{{ getDays(boxData1[1].created_at) }}</span>
                             </div>
                         </NuxtLink>
-                        <NuxtLink :to="`/newsDetail/${boxData1[2].id}`" target="_blank">
+                        <NuxtLink :to="`/newsDetail/${boxData1[2].id}`" target="_blank" class="imgbg">
                             <img :src="boxData1[2].imgurl">
                             <div>
                                 <p>{{ boxData1[2].title }}</p>
-                                <span>{{ boxData1[2].created_at }}</span>
+                                <span>{{ getDays(boxData1[2].created_at) }}</span>
                             </div>
                         </NuxtLink>
                     </div>
                     <div class="boxBigImg">
-                        <NuxtLink :to="`/newsDetail/${boxData1[3].id}`" target="_blank">
+                        <NuxtLink :to="`/newsDetail/${boxData1[3].id}`" target="_blank" class="imgbg">
                             <img :src="boxData1[3].imgurl">
                             <div>
                                 <p>{{ boxData1[3].title }}</p>
-                                <span>{{ boxData1[3].created_at }}</span>
+                                <span>{{ getDays(boxData1[3].created_at) }}</span>
                             </div>
                         </NuxtLink>
                     </div>
@@ -61,7 +70,7 @@
                         <li v-for="item in boxData2">
                             <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">
                                 <p class="title">{{ item.title }}</p>
-                                <p class="time">{{ item.created_at }}</p>
+                                <p class="time">{{ getDays(item.created_at) }}</p>
                             </NuxtLink> 
                         </li>
                    </ul>
@@ -169,7 +178,13 @@ const getWebsiteModelArticles2 = async () => {
     }
 }
 
-
+function getTime(time) {
+    const date = new Date(time);
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    return `${year}-${month}-${day}`;
+}
 
 onMounted(() => {
     // 一级导航
@@ -219,6 +234,13 @@ let scienceTitleList = [
 //         }
 //     }
 // }
+function getDays(time) {
+    const date = new Date(time);
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    return `${month}-${day}`;
+}
 
 </script>
 
@@ -251,14 +273,16 @@ let scienceTitleList = [
 
         height: 50px;
         line-height: 50px;
-        
-        span {
+        a {
+            font-size: 22px;
             color: #139602;
             border-bottom: 3px solid #139602;
             height: 50px;
             line-height: 50px;
             display: inline-block;
             box-sizing: border-box;
+            width: auto;
+            font-weight: bold;
         }
     }
 
@@ -385,6 +409,7 @@ let scienceTitleList = [
                 position: absolute;
                 bottom: 7px;
                 left: 20px;  
+                z-index: 99;
                 p{
                     display: -webkit-box;
                     -webkit-box-orient: vertical;
@@ -395,6 +420,17 @@ let scienceTitleList = [
                     width: 320px;
                     height: 42px;
                     color: #fff;
+                    font-size: 16px;
+                    margin-bottom: 5px;
+                    span {
+                        display: inline-block;
+                        background: #9CD26B;
+                        font-size: 14px;
+                        color: #fff;
+                        padding: 0 6px;
+                        border-radius: 4px;
+                        margin-right: 5px;
+                    }
                 }
                 span {
                     display:block;
@@ -434,7 +470,7 @@ let scienceTitleList = [
     top: 0;
     left: 0;
     transition: all 3s linear 0;
-
+    z-index: 99;
 }
 
 // 标题下列表
@@ -494,6 +530,7 @@ let scienceTitleList = [
         width: 40px;
         height: 20px;
         position: absolute;
+        z-index: 99;
         top: 0;
         right: 0;
         background-image: url("../../static/images/Component 209.png");
@@ -523,12 +560,31 @@ let scienceTitleList = [
                 color: #333333;
                 margin-bottom: 5px;
             }
+            .title:hover {
+                color: #49A769;
+            }
             .time {
                 font-size: 14px;
                 color: #999999;
                 margin-bottom: 10px;
             }
+           
+            
         }
     }
 }
+
+.imgbg::after{
+    content: '';
+    display: block;
+    width:100%;
+    height:68px;
+    z-index:44;
+    left:0px;
+    bottom:4px;
+    position:absolute;
+    background:linear-gradient(to bottom,rgba(0,0,0,0),black);
+    opacity:.3;
+    border-radius: 6px;
+}
 </style>

components/home/TopTen.vue

@@ -1,13 +1,17 @@
 <template>
     <div class="topTenTitle">
         <div class="inner">
-            <img src="../../static/index/ad2.png" alt="">
+            <a href="http://www.baidu.com">
+                <img :src="imgurl.thumb" alt="">
+            </a>
         </div>
     </div>
 </template>
 
 <script setup>
-    // defineProps(['logoSrc'])
+    const props = defineProps({
+        imgurl: String
+    });
 </script>
 
 <style lang="less">

components/home/foot.vue

@@ -6,14 +6,14 @@
             <div class="index_foot_name">LIANJIE</div>		
         </div>
         <div class="foot_img_box"> 
-            <a :href="item.url" v-for="(item, index) in bottomLink">
+            <a :href="item.url" v-for="(item, index) in bottomLink" target="_blank">
                 <img :src="item.logo_url" alt="">
             </a>
         </div>
         <div class="foot_frind_box">
             <span>友情链接</span>	 		
             <div>
-                <a :href="item.url" v-for="(item, index) in bottomText" :key="index">{{ item.title }}</a>	
+                <a :href="item.url" v-for="(item, index) in bottomText" :key="index" target="_blank">{{ item.title }}</a>	
             </div>
         </div>
         <div class="call_us_box">
@@ -28,24 +28,24 @@
         </div>
         <div class="foot_text_box">
            <!-- <p>{{ bottomBase.statistics_onetext }} <a :href="'http://' + bottomBase.statistics_twourl">中农兴业</a> {{ bottomBase.statistics_twotext }}</p> -->
-           <p>{{ bottomBase.statistics_onetext }} <a :href="bottomBase.record_number_url">中农兴业</a> {{ bottomBase.statistics_twotext }}</p>
-            <p>{{ bottomBase.organizer }} <a :href="currentDomain">三农资讯网</a> {{ currentDomainUrl }} 版权所有。</p>
+           <p>{{ bottomBase.statistics_onetext }} <a :href="bottomBase.record_number_url" target="_blank">中农兴业</a> {{ bottomBase.statistics_twotext }}</p>
+            <p>{{ bottomBase.organizer }} <a :href="currentDomain" target="_blank">三农资讯网</a> {{ currentDomainUrl }} 版权所有。</p>
             <!-- <p><img :src="bottomBase.icp_number_img"><a :href="'http://' + bottomBase.statistics_twourl">{{ bottomBase.record_number }}</a> <a :href="'http://' + bottomBase.icp_number_url">{{ bottomBase.icp_number }}</a> </p> -->
-            <p><a :href="bottomBase.record_number_url">{{ bottomBase.record_number }}</a> &nbsp;&nbsp; <img :src="bottomBase.icp_number_img"><a :href="bottomBase.icp_number_url">{{ bottomBase.icp_number }}</a> </p>
+            <p><a :href="bottomBase.record_number_url" target="_blank">{{ bottomBase.record_number }}</a> &nbsp;&nbsp; <img :src="bottomBase.icp_number_img"><a :href="bottomBase.icp_number_url" target="_blank">{{ bottomBase.icp_number }}</a> </p>
             <p>{{ bottomBase.email }}</p>
             <p>{{ bottomBase.company_address }}</p>
             <p>{{ bottomBase.contact_number }}</p>
         </div>
         <div class="foot_logo_out" >
-            <a :href="'http://' + bottomBase.company_url" :title="bottomBase.company_name">
+            <a :href="'http://' + bottomBase.company_url" :title="bottomBase.company_name" target="_blank">
                 <img :src="bottomBase.project_logo" class="floatLogoLeft" :alt="bottomBase.company_name">
             </a>
-            <a :href="'http://' + bottomBase.project_url" :title="bottomBase.project_name">
+            <a :href="'http://' + bottomBase.project_url" :title="bottomBase.project_name" target="_blank">
                 <img :src="bottomBase.company_logo" class="floatLogoRight" :alt="bottomBase.project_name">
             </a>
         </div>
         <div class="foot_last_img_box">
-            <a :href="item.url" v-for="(item, index) in bottomphoto">
+            <a :href="item.url" v-for="(item, index) in bottomphoto"  target="_blank">
                 <img :src="item.logo_url" alt="">
             </a>
         </div>
@@ -128,11 +128,11 @@ const getDomain = () => {
 
 <style lang="less" scoped>
 .index_foot{box-sizing:border-box;width: 1200px;margin: 0 auto;}
-.index_foot_name_box{margin:60px auto 0px; text-align:center;font-size:0px;}
+.index_foot_name_box{margin:40px auto 0px; text-align:center;font-size:0px;}
 .index_foot_name{display:inline-block;height:67px;line-height:67px;color:#f2f9f4;font-size:51px;font-weight:bold;overflow:hidden;}
 .index_foot_name:nth-of-type(even){color:#333;font-size:32px;}
 .foot_img_box{overflow:hidden;display:block;margin:40px auto 0;width:100%; }
-.foot_img_box>*{float: left;width:150px;height:50px;overflow:hidden;box-sizing:border-box;border:dashed 1px #139602;margin:0px 25px 10px 0px;}
+.foot_img_box>*{float: left;width:150px;height:50px;overflow:hidden;box-sizing:border-box;border:solid 1px #D7EDD4;margin:0px 25px 10px 0px;}
 .foot_img_box>* *{display: block;width:100%;height:100%;}
 .foot_img_box>*:nth-of-type(7n){margin-right:0px; }
 .foot_frind_box{ display:block;margin:11px auto;overflow:hidden;display:flex;width:100%;border-bottom:solid 2px #49A769;padding-bottom:35px;}

components/home/pageHead.vue

@@ -10,24 +10,8 @@
                         <span>农业百强网站（政府类30强）</span>
                     </span>
                 </div>
-                <div class="mid" v-show="!showToken">
-                    <!-- <button class="login" @click="goLogin">登录</button>
-                    <NuxtLink to="/">
-                        <button class="reg">注册</button>
-                    </NuxtLink> -->
-                    <!-- <button class="changePwd">修改密码</button> -->
-                    <!-- <el-popover placement="top-start" :width="100" trigger="hover" algin="center">
-                        <template #reference>
-                            <span v-show="showToken">
-                                <em class="iconfont icon-gerenzhongxin"></em>
-                                {{ username }}
-                            </span>
-                        </template>
-                    <p class="exit" @click="exit">退出</p>
-                    </el-popover> -->
-                </div>
                 <div class="right">
-                    <div v-show="!showToken" class="right-top-menu">
+                    <div class="menu">
                         <button class="reg" @click="goSearch">
                             <img src="../../static/head/searchicon.png" alt="搜索">
                             搜索
@@ -40,60 +24,42 @@
                             <img src="../../static/head/topicon2.png" alt="广告服务">
                             广告服务
                         </button>
-                        <button class="reg" @click="goLogin">
+                    </div>
+                    <div class="right-top-menu">
+                        <button class="reg" @click="goLogin" v-show="!showToken">
                             <img src="../../static/head/topicon3.png" alt="登录">
                             登录
                         </button>
-                        <button class="reg" @click="goRegister">
+                        <button class="reg" @click="goRegister" v-show="!showToken">
                             <img src="../../static/head/topicon4.png" alt="注册">
                             注册
                         </button>
+                        <el-popover placement="top-start" :width="100" trigger="hover" algin="center">
+                            <template #reference>
+                                <span v-show="showToken">
+                                    <em class="iconfont icon-gerenzhongxin"></em>
+                                    {{ username }}
+                                </span>
+                            </template>
+                            <p class="exit" @click="gotosystem">个人中心</p>
+                            <p class="exit" @click="exit">退出</p>
+                        </el-popover>
                     </div>
-                    <el-popover placement="top-start" :width="100" trigger="hover" algin="center">
-                        <template #reference>
-                            <span v-show="showToken">
-                                <em class="iconfont icon-gerenzhongxin"></em>
-                                {{ username }}
-                            </span>
-                        </template>
-                        <p class="exit" @click="gotosystem">个人中心</p>
-                        <p class="exit" @click="exit">退出</p>
-                    </el-popover>
-                    <!-- <span>
-                        <em class="home"></em>
-                        设为首页
-                    </span>
-                    <span>
-                        <em class="collection"></em>
-                        加入收藏
-                    </span> -->
                 </div>
+
             </div>
         </nav>
         <!-- 头部logo -->
         <div class="headerLogo">
             <div class="inner">
-                <img src="../../static/images/logo1.png" alt="" class="left" @click="backHome">
-                <!-- <div class="search">
-                    <em></em>
-                    <input type="text" placeholder="输入关键词" v-model="keyword">
-                    <button @click="goSearch">搜索</button>
-                </div> -->
-                <!-- <ul class="serve">
-                    <li @click="goTopic">
-                        <NuxtLink to="/topic" target="_blank">
-                            <img src="../../static/images/huiyuan 1.png" alt="">
-                            <p>商圈</p>
-                        </NuxtLink>
-                    </li>
-                    <li @click="goAdvertising">
-                        <NuxtLink :to="`/advertising?activeName=${1}`" target="_blank">
-                            <img src="../../static/images/lingquguanggao 1.png" alt="">
-                            <p>广告服务</p>
-                        </NuxtLink>
-                    </li>
-                </ul> -->
+                <img src="../../static/images/logo1.png" alt="三农资讯网" class="left" @click="backHome">
+                <div class="titlead">
+                    <a href="http://www.baidu.com">
+                        <img src="../../static/index/titlead.png" alt="">
+                    </a>                 
+                </div>
             </div>
+           
         </div>
         <el-dialog v-model="dialogTableVisible" title="" width="800">
             <div class="tips">
@@ -174,7 +140,7 @@ let gotosystem = () => {
 //点击退出按钮
 let exit = () => {
     window.location.href = ('http://nwdev.bjzxtw.org.cn/')
-    console.log('退出1111111111111111111111');
+    // console.log('退出1111111111111111111111');
 
     isDel.value = 1
     token1.value = getToken()
@@ -189,11 +155,11 @@ let exit = () => {
     //     // 重新加载页面（赋值给location.href会触发页面刷新）
     //     window.location.href = newUrl;
     // }
-    axios.get(`http://admindev.bjzxtw.org.cn/auth/logoutapi.php?token=${token}`).then(response => {
-        console.log("退出登录", response);
-        isDel.value = response.data.isDel
-    })
-    // window.location.href = (`http://admindev.bjzxtw.org.cn/auth/login.php`)
+    // axios.get(`http://admindev.bjzxtw.org.cn/auth/logoutapi.php?token=${token}`).then(response => {
+    //     console.log("退出登录", response);
+    //     isDel.value = response.data.isDel
+    // })
+    window.location.href = (`http://admindev.bjzxtw.org.cn/auth/logout.php?backurl=http://nwdev.bjzxtw.org.cn&admintoken=${token1}`)
     removeToken()
     removeTicket()
 }
@@ -217,22 +183,22 @@ let goSearch = () => {
 
 // 点击广告服务
 let goAdvertising = () => {
-    // navigateTo('/advertising')
-    // if (getToken()) {
-    //     navigateTo('/advertising?activeName=${1}')
-    // } else {
-    //     goLogin()
-    // }
+    // window.open(`http://localhost:3000/advertising?activeName=${1}`, '_blank');
+    if (getToken()) {
+        window.open(`http://nwdev.bjzxtw.org.cn/advertising?activeName=${1}`, '_blank');
+    } else {
+        goLogin()
+    }
 }
 
 //点击商圈
 let goTopic = () => {
-    // navigateTo('/topic')
-    // if (getToken()) {
-    //     navigateTo('/topic')
-    // } else {
-    //     goLogin()
-    // }
+    // window.open(`http://localhost:3000/topic`, '_blank');
+    if (getToken()) {
+        window.open('http://nwdev.bjzxtw.org.cn/topic', '_blank');
+    } else {
+        goLogin()
+    }
 }
 
 
@@ -264,8 +230,32 @@ onMounted(() => {
 
     //获取用户信息
     getUserInfo()
+
+    //获取登录状态
+    getLoginStatus()
 })
 
+//检测登录状态
+//http://admindev.bjzxtw.org.cn/auth/loginstatus.php?token=XXXXXXXXXXXX
+let tokenStatus = ref('');
+tokenStatus.value = getToken()
+console.log(tokenStatus.value);
+//获取用户信息
+let getLoginStatus = async () => {
+    try {
+        const response = await axios.get(`http://nwdev.bjzxtw.org.cn/auth/loginstatus.php?token=${tokenStatus}`);
+        console.log('登录状态', response);
+        if(response.data.code == 200){
+            
+        }else if(response.data.code == 0){
+            //退出登录
+            exit();
+        }
+    } catch (error) {
+        console.error(error);
+    }
+}
+
 </script>
 
 <style lang="less" scoped>
@@ -311,17 +301,14 @@ header {
     width: 100%;
     height: 33px;
     line-height: 33px;
-    // background-color: #fff;
 }
 
 .headerNav .left>span {
     margin-right: 47px;
 }
 
-.headerNav .right,
-.headerNav .mid {
-    // float: left;
-    // margin-left: 100px;
+.headerNav .right {
+    display: flex;
     margin-right: 10px;
 
     button {
@@ -341,9 +328,12 @@ header {
         margin-right: 15px;
         cursor: pointer;
     }
+
+    .menu,
     .right-top-menu {
         display: flex;
     }
+
     .reg {
         margin-right: 20px;
         display: flex;
@@ -393,20 +383,22 @@ header {
 /* // 头部logo */
 .headerLogo {
     height: 185px;
-
+    position: relative;
     background: url("../../static/head/topBg.png") no-repeat center;
-    // display: flex;
-
-    // .inner{
-    //     width: 1200px;
-    //     overflow: hidden;
-    //     margin: 0 auto;
-    // }
-
+    .titlead {
+        position: absolute;
+        bottom: 54px;
+        right: 134px;
+    }
+    .inner {
+        position: relative;
+        height: 185px;
+    }
     .inner>img {
         width: 342px;
         height: 72px;
         margin-top: 51px;
+        cursor: pointer;
     }
 
     /* // 搜索框部分 */

components/home/pageNavigation.vue

@@ -30,7 +30,12 @@
                         </NuxtLink>
                         <!-- <NuxtLink :to="{ path: `/newsList/${item.category_id}`, query: { name: item.name } }" -->
                         <NuxtLink :to="{ path: `/newsList/${item.category_id}` }"
-                            target="_blank" v-if="item.children_count == 0">
+                            target="_blank" v-if="item.children_count == 0 && item.is_url != 1">
+                            <span class="active" v-if="item.category_id == routeId">{{ item.name }}</span>
+                            <span v-else>{{ item.name }}</span>
+                        </NuxtLink>
+                        <NuxtLink :to="item.web_url"
+                            target="_blank" v-if="item.children_count == 0 && item.is_url == 1">
                             <span class="active" v-if="item.category_id == routeId">{{ item.name }}</span>
                             <span v-else>{{ item.name }}</span>
                         </NuxtLink>
@@ -67,10 +72,11 @@
                     地方频道
                 </div>
                 <ul class="cityList">
-                    <li v-for="(item, index) in provinceList" :key="index">
-                        <NuxtLink :to="{path:`/newsList/${item.id}`}" target="_blank">
+                    <li v-for="(item, index) in provinceList" :key="index" @click="goToSearch(item.id)">
+                        <!-- <NuxtLink :to="{path:`/search/search?catids=${item.id}`}" target="_blank">
                             {{item.abbreviation}}
-                        </NuxtLink>
+                        </NuxtLink> -->
+                        {{item.abbreviation}}
                     </li>
                 </ul>
             </div>
@@ -119,6 +125,8 @@
 </template>
 
 <script setup>
+import { ElMessage } from 'element-plus'
+
 import { ref, onMounted } from 'vue';
 import { ElSelect, ElOption } from 'element-plus'
 const nuxtApp = useNuxtApp();
@@ -244,6 +252,15 @@ let change1 = (id) => {
 //city.value 市id
 //region.value 县id
 const getcityid = ref("")
+
+
+
+let goToSearch = (id) => {
+    console.log(id)
+    const route = `/search/search?catids=${id}`;
+    window.open(route, '_blank');
+}
+
 //获得cityid和
 let goToPrimary = () => {
     // console.log(depValue.value)
@@ -264,20 +281,25 @@ let goToPrimary = () => {
     //     }
     // })
 
-    //根据市id获取对应的区/县名称
-    axios.get(`/web/selectWebsiteCategory?cityid=${getcityid.value}&department_id=${depValue.value}`).then(response => {
-        if (response.data.catid && response.data.catid.length > 0) {
-            const catids = response.data.catid.join(',');
-            const route = `/search/search?catids=${catids}`;
-            window.open(route, '_blank');
-        } else {
-            // 可以在这里处理数组为空的情况
-            console.log('没有可用的分类ID');
-            const route = `/search/search`;
-            window.open(route, '_blank');
-        }
+    if (province.value == ""&&city.value == ""&&region.value == ""&&depValue.value=="") {
+        ElMessage.error('请选择行政区划或者职能部门！')
+    }else{
+        //根据市id获取对应的区/县名称
+        axios.get(`/web/selectWebsiteCategory?cityid=${getcityid.value}&department_id=${depValue.value}`).then(response => {
+            if (response.data.catid && response.data.catid.length > 0) {
+                const catids = response.data.catid.join(',');
+                const route = `/search/search?catids=${catids}`;
+                window.open(route, '_blank');
+            } else {
+                // 可以在这里处理数组为空的情况
+                console.log('没有可用的分类ID');
+                const route = `/search/search`;
+                window.open(route, '_blank');
+            }
 
-    })
+        })
+    }
+        
 
 }
 
@@ -331,7 +353,7 @@ onMounted(() => {
 .partOne {
     width: 100%;
     height: 110px;
-    margin-bottom: 30px;
+    margin-bottom: 10px;
     background-color: #fff;
     font-size: 20px;
     font-family: PingFang SC-Semibold;
@@ -344,10 +366,11 @@ onMounted(() => {
             width:160px;
             font-size: 16px;
             display: flex;
+            
         }
         .navIndex {
             height: 100px;
-            line-height: 100px;
+            line-height: 120px;
             a {
                 font-size: 16px;
                 color: #fff;
@@ -358,7 +381,7 @@ onMounted(() => {
             }
         }
         .navClass {
-            padding-top: 24px;
+            padding-top: 29px;
             padding-left: 30px;
             font-weight: bold;
             color: #fff;
@@ -379,12 +402,12 @@ onMounted(() => {
         color: #333;
         display: flex;
         flex-wrap: wrap;
-        padding-top: 15px;
+        padding-top: 20px;
         
         //justify-content: space-around;
 
         li {
-            width: 80px;
+            width: 68px;
             font-family: PingFang SC;
             height: 40px;
             line-height: 40px;
@@ -539,7 +562,7 @@ onMounted(() => {
     width: 100%;
     height: 62px;
     line-height: 62px;
-    margin-top: 20px;
+    margin-top: 10px;
 
     .inner {
         width: 1200px;
@@ -714,11 +737,19 @@ onMounted(() => {
             li {
                 font-size: 16px;
                 float: left;
-               
-                a {
-                    color: #fff;
-                    margin-right: 10px;
+                color: #fff;
+                margin-right: 14px;
+                cursor: pointer;
+                &:hover {
+                    color: #ABE874;
                 }
+                // a {
+                //     color: #fff;
+                //     margin-right: 14px;
+                //     &:hover {
+                //         color: #ABE874;
+                //     }
+                // }
             }
         }
     }

components/topic/head.vue

@@ -1,131 +1,370 @@
 <template>
     <div>
-        <div class="head">
+        <!-- 顶部导航 -->
+        <nav class="headerNav">
             <div class="inner">
-                <div class="headLogo left">
-                    <img src="../../static/images/image 36.png" alt="" @click="goBack">
-                    <!-- <span>{{ props.title }}</span> -->
-                    <span>商圈</span>
+                <div class="left">
+                    <span>中农兴业网团</span>
+                    <span>旗下网站：
+                        <span>农业百强网站（政府类30强）</span>
+                    </span>
+                    <span class="ad">商圈</span>
                 </div>
                 <div class="right">
-                    <!-- <span>
-                        <em class="home"></em>
-                        设为首页
-                    </span>
-                    <span>
-                        <em class="collection"></em>
-                        加入收藏
-                    </span> -->
+                    <div class="menu">
+                        <button class="reg" @click="goSearch">
+                            <img src="../../static/head/searchicon.png" alt="搜索">
+                            搜索
+                        </button>
+                        <button class="reg" @click="goTopic">
+                            <img src="../../static/head/topicon1.png" alt="商圈">
+                            商圈
+                        </button>
+                        <button class="reg" @click="goAdvertising">
+                            <img src="../../static/head/topicon2.png" alt="广告服务">
+                            广告服务
+                        </button>
+                    </div>
+                    <div class="right-top-menu">
+                        <button class="reg" @click="goLogin" v-show="!showToken">
+                            <img src="../../static/head/topicon3.png" alt="登录">
+                            登录
+                        </button>
+                        <button class="reg" @click="goRegister" v-show="!showToken">
+                            <img src="../../static/head/topicon4.png" alt="注册">
+                            注册
+                        </button>
+                        <button class="reg" @click="userCenter" v-show="showToken">
+                            <img src="../../static/head/topicon3.png" alt="用户信息">
+                            {{ username }}
+                        </button>
+
+                    </div>
+                    <ul class="userInfo11" v-if="isShow">
+                        <li @click="gotosystem">个人中心</li>
+                        <li @click="exit">退出</li>
+                    </ul>
+
                 </div>
             </div>
-        </div>
-        <!-- <div class="tips">
-            <div class="inner">
-                <p v-show="false">注意：广告购买需提交信息，用户与商务人员进行线下金额交易，交易成功后由商务人员后台审核。审核通过，即广告投放成功。</p>
+        </nav>
+        <el-dialog v-model="dialogTableVisible" title="" width="800">
+            <div class="tips">
+                <p>
+                    <img src="../../static/topic/tips.png" alt="">
+                    提示:注册请联系管理员操作!
+                </p>
+                <p>
+                    联系电话:010-56019387
+                </p>
+                <p>
+                    QQ ： 2909421493 、213552413
+                </p>
             </div>
-        </div> -->
+        </el-dialog>
     </div>
 
 </template>
 
 <script setup>
-const props = defineProps({
-    title: String
+import { ref, onMounted, watch } from 'vue'
+import { ElPopover, ElDialog } from 'element-plus'
+import { getToken, setToken, removeToken } from '@/store/useCookieStore'
+import { setTicket, removeTicket } from '@/store/useticketStore'
+// import { navigateTo } from '@nuxtjs/composables';
+
+const nuxtApp = useNuxtApp();
+console.log("===:", nuxtApp) // 输出: someValue
+const axios = nuxtApp.$axios;
+
+let ticket = ref('')
+let token = ref('')
+let route = useRoute()
+ticket.value = route.query.ticket
+token.value = route.query.admintoken
+if (ticket.value) {
+    setTicket(ticket.value)
+}
+if (token.value) {
+    setToken(token.value)
+}
+
+
+console.log('查询参数：', ticket.value);
+console.log('查询参数：', token.value);
+
+definePageMeta({
+    middleware: 'auth'
 });
-let goBack=()=>{
-    window.location.href = ('http://nwpre.bjzxtw.org.cn/')
+
+let keyword = useState('keyword', () => '')
+let username = useState('username', () => '')
+let isDel = useState('isDel', () => 1)
+let isShow = useState('isShow', () => false)
+
+//点击登录按钮
+let goLogin = () => {
+    isDel.value = 0
+    token1.value = getToken()
+    window.location.href = ("http://admindev.bjzxtw.org.cn/auth/login.php?backurl=http://nwdev.bjzxtw.org.cn")
+    token1.value = getToken()
+}
+let dialogTableVisible = ref(false)
+
+//点击注册按钮
+let goRegister = () => {
+    dialogTableVisible.value = true
+}
+let userCenter = () => {
+    if(isShow.value){
+        isShow.value = false
+        return
+    }else{
+        isShow.value = true
+        return
+    }
+}
+
+let gotosystem = () => {
+    window.location.href = ("http://admindev.bjzxtw.org.cn/#/login?userurl=http://nwdev.bjzxtw.org.cn")
+}
+
+//点击退出按钮
+let exit = () => {
+    window.location.href = ('http://nwdev.bjzxtw.org.cn/')
+
+    isDel.value = 1
+    token1.value = getToken()
+
+    // axios.get(`http://admindev.bjzxtw.org.cn/auth/logoutapi.php?token=${token}`).then(response => {
+    //     console.log("退出登录", response);
+    //     isDel.value = response.data.isDel
+    // })
+    window.location.href = (`http://admindev.bjzxtw.org.cn/auth/logout.php?backurl=http://nwdev.bjzxtw.org.cn&admintoken=${token1}`)
+    removeToken()
+    removeTicket()
+}
+
+//点击搜索按钮
+let goSearch = () => {
+    const route = `/search/search?keyword=${keyword.value}`;
+    window.open(route, '_blank');
+}
+
+// 点击广告服务
+let goAdvertising = () => {
+    // window.location.href = ('http://localhost:3000/advertising?activeName=${1}')
+    if (getToken()) {
+        window.open(`http://nwdev.bjzxtw.org.cn/advertising?activeName=${1}`, '_blank');
+    } else {
+        goLogin()
+    }
+}
+
+//点击商圈
+let goTopic = () => {
+    // window.location.href = ('http://localhost:3000/topic')
+    if (getToken()) {
+        window.open('http://nwdev.bjzxtw.org.cn/topic', '_blank');
+    } else {
+        goLogin()
+    }
+}
+
+
+//获取用户信息
+let getUserInfo = async () => {
+    try {
+        const response = await axios.get("/user/getUserInfo");
+        console.log('获取用户信息', response);
+        username.value = response.data.nickname
+
+    } catch (error) {
+        console.error(error);
+    }
+}
+
+let token1 = useState("token1", () => '')
+let showToken = useState("showToken", () => '')
+token1.value = getToken()
+
+watch(token1, (newval, oldval) => {
+    console.log(newval, oldval);
+    showToken.value = newval
+}, {
+    deep: true,
+    immediate: true,
+})
+
+onMounted(() => {
+
+    //获取用户信息
+    getUserInfo()
+
+    //获取登录状态
+    getLoginStatus()
+})
+
+//检测登录状态
+//http://admindev.bjzxtw.org.cn/auth/loginstatus.php?token=XXXXXXXXXXXX
+let tokenStatus = ref('');
+tokenStatus.value = getToken()
+console.log(tokenStatus.value);
+//获取用户信息
+let getLoginStatus = async () => {
+    try {
+        const response = await axios.get(`http://nwdev.bjzxtw.org.cn/auth/loginstatus.php?token=${tokenStatus}`);
+        console.log('登录状态', response);
+        if (response.data.code == 200) {
+
+        } else if (response.data.code == 0) {
+            //退出登录
+            exit();
+        }
+    } catch (error) {
+        console.error(error);
+    }
 }
+
+
 </script>
 
 <style lang="less" scoped>
 // 广告页面头部
-.head {
+.headerNav {
     width: 100%;
-    padding: 15px 0;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    height: 56px;
+    line-height: 56px;
+    border-bottom: 1px solid #E5E5E5;
+    // background-color: red;
+}
 
-    .inner {
-        width: 1200px;
-        height: 27px;
+.headerNav .left>span {
+    margin-right: 47px;
+    color: #666666;
+}
+
+.headerNav .left>.ad {
+    border-left: 1px solid #E5E5E5;
+    padding-left: 45px;
+    color: #333333;
+    font-weight: 600px;
+}
+
+.headerNav .right {
+    display: flex;
+    margin-right: 10px;
+    position: relative;
+
+    button {
+        font-size: 12px;
+        color: #666666;
+        border: none;
+        background: none;
+        cursor: pointer;
     }
 
-    .headLogo {
-        >img {
-            width: 127px;
-            height: 27px;
-            padding-right: 15px;
-            vertical-align: -10px;
-            border-right: 1px solid #999;
-        }
+    .login {
+        width: 36px;
+        height: 19px;
+        color: #fff;
+        border-radius: 4px;
+        background-color: #028E21;
+        margin-right: 15px;
+        cursor: pointer;
+    }
 
-        >span {
-            display: inline-block;
-            width: 100px;
-            padding-left: 15px;
-            vertical-align: middle;
-            font-family: Microsoft YaHei, Microsoft YaHei;
-            font-weight: 400;
-            font-size: 18px;
-            color: #333333;
-            line-height: 21px;
-            text-align: left;
-            font-style: normal;
-            text-transform: none;
-        }
+    .menu,
+    .right-top-menu {
+        display: flex;
     }
 
-    .right {
-        span {
-            margin-left: 26px;
-            font-family: PingFang SC, PingFang SC;
-            font-weight: 400;
-            font-size: 12px;
-            color: #666666;
-            line-height: 14px;
-            text-align: left;
-            font-style: normal;
-            text-transform: none;
-        }
+    .reg {
+        margin-right: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 50px;
 
-        .home,
-        .collection {
-            display: inline-block;
-            width: 16px;
-            height: 16px;
-            vertical-align: -3px;
+        img {
+            margin-right: 5px;
         }
+    }
+}
 
-        .home {
-            background-image: url("../../static/images/Iconly／Light／Home.png");
-        }
+.headerNav .right {
+    float: right;
+    font-size: 12px;
+    // margin-top: 10px;
 
-        .collection {
-            background-image: url("../../static/images/Iconly／Light／Star.png");
-        }
+    span {
+        margin-left: 26px;
+    }
+
+    .home,
+    .collection {
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        vertical-align: -3px;
+    }
+
+    .exit {
+        line-height: 30px;
+    }
+
+}
+
+.userInfo11 {
+    width: 100px;
+    height: 80px;
+    background-color: #fff;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+    border-radius: 3px;
+    position: absolute;
+    top: 50px;
+    right: 0;
+    font-size: 14px;
+    z-index: 999;
+
+    li {
+        height: 40px;
+        line-height: 40px;
+        color: #333333;
+        padding-left: 10px;
+    }
+
+    >li:hover {
+        color: #028E21;
     }
 }
 
 //提示信息
 .tips {
-    width: 100%;
-    height: 70px;
-    line-height: 70px;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    padding: 20px 0;
+    text-align: center;
+    font-size: 20px;
+    color: #40663B;
+    font-weight: bold;
 
-    .inner {
-        width: 1200px;
-        height: 70px;
+    img {
+        width: 78px;
+        height: 78px;
+        vertical-align: middle;
+        margin-right: 20px;
+
+        p {
+            line-height: 30px;
+        }
     }
 
     p {
-        font-family: Microsoft YaHei, Microsoft YaHei;
-        font-weight: 400;
-        font-size: 16px;
-        color: #FE0101;
-        // line-height: 19px;
-        text-align: left;
-        font-style: normal;
-        text-transform: none;
+        line-height: 40px;
     }
+
+    >p:first-child {
+        margin-bottom: 30px;
+    }
+
 }
 </style>

pages/advertising/adDetail.vue

@@ -114,6 +114,21 @@ let order = useState("order", () => "")
 let orderDetail = useState("orderDetail", () => "")
 let newArr = useState("newArr", () => "")
 
+// 定义响应式数据
+const seoData = ref({
+    title: '广告服务',
+    description: '默认描述',
+    keywords: '默认关键词',
+    image: 'https://example.com/default-image.jpg'
+});
+
+// 在 onMounted 钩子中获取数据
+onMounted(()=>{
+    seoData.value.title = '广告服务';
+    seoData.value.description = '默认描述';
+    seoData.value.keywords = '默认关键词';
+})
+
 //获取订单状态
 const getOrderstatus = async () => {
     try {

pages/advertising/index.vue

@@ -2,65 +2,8 @@
     <!-- 广告服务 -->
     <div>
         <!-- 广告页面头部 -->
-        <div class="head">
-            <div class="inner">
-                <div class="headLogo left">
-                    <!-- <img src="../../static/images/image 36.png" alt="" @click="goBack"> -->
-                    <div class="webName">
-                        <span>中农兴业网团</span>
-                        <span>旗下网站：农业百强网站（政府类30强）</span>
-                    </div>
-                    <span>广告服务</span>
-                </div>
-                <div class="right">
-                    <span @click="goTopic">
-                        <em class="topic"></em>
-                        商圈
-                    </span>
-                    <span @click="goAD">
-                        <em class="ad"></em>
-                        广告服务
-                    </span>
-                    <span @click="goLogin" v-if="!showToken">
-                        <em class="login"></em>
-                        登录
-                    </span>
-                    <span @click="goReg" v-if="!showToken">
-                        <em class="reg"></em>
-                        注册
-                    </span>
-                    <!-- <span @click="goUserInfo" v-if="showToken">
-                        <em class="user"></em>
-                        用户信息
-                    </span> -->
-                    <!-- <el-popover placement="top-start" :width="100" trigger="hover" algin="center">
-                        <template #reference>
-                            <span v-show="showToken">
-                                <em class="iconfont icon-gerenzhongxin"></em>
-                                {{ username }}
-                            </span>
-                        </template>
-<p class="exit" @click="gotosystem">个人中心</p>
-<p class="exit" @click="exit">退出</p>
-</el-popover> -->
-                </div>
-                <el-dialog v-model="dialogTableVisible1" title="" width="800">
-                    <div class="tips1">
-                        <p>
-                            <img src="../../static/topic/tips.png" alt="">
-                            提示:注册请联系管理员操作!
-                        </p>
-                        <p>
-                            联系电话:010-56019387
-                        </p>
-                        <p>
-                            QQ ： 2909421493 、213552413
-                        </p>
-                    </div>
-                </el-dialog>
-            </div>
-        </div>
-        <div class="tips">
+        <AdvertisingHead></AdvertisingHead>
+        <div class="adtips">
             <div class="inner">
                 <p v-if="activeName == '1'">注意：广告购买需提交信息，用户与商务人员进行线下金额交易，交易成功后由商务人员后台审核。审核通过，即广告投放成功。</p>
             </div>
@@ -77,7 +20,7 @@
 
                                     <!-- 填写广告信息内容 -->
                                     <div class="textOne" v-if="ad == 1">
-                                        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="110"
+                                        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="120"
                                             class="demo-ruleForm" :size="formSize" status-icon>
                                             <el-form-item label="广告名称:" prop="adName">
                                                 <el-input v-model="ruleForm.adName" placeholder="请输入广告名称" />
@@ -109,7 +52,7 @@
 
                                             <!-- 表格部分 -->
                                             <div class="pageTable">
-                                                <el-table :data="tableData" border ref="multipleTable"
+                                                <el-table :data="tableData" border ref="multipleTable" empty-text="暂无数据"
                                                     @selection-change="handleSelectionChange" style="width: 100%"
                                                     :header-row-style="{ height: '60px' }"
                                                     :row-style="{ height: '74px' }"
@@ -276,6 +219,20 @@ watch(token, (newval, oldval) => {
     immediate: true,
 })
 
+// 定义响应式数据
+const seoData = ref({
+    title: '广告服务',
+    description: '默认描述',
+    keywords: '默认关键词',
+    image: 'https://example.com/default-image.jpg'
+});
+
+// 在 onMounted 钩子中获取数据
+onMounted(()=>{
+    seoData.value.title = '广告服务';
+    seoData.value.description = '默认描述';
+    seoData.value.keywords = '默认关键词';
+})
 
 let goTopic = () => {
     navigateTo({
@@ -668,7 +625,6 @@ let submitStep = () => {
         if (response.code == 200) {
             tableData.value = response.data.rows
             orderInformation.value = response.data.ordernum
-            ad.value = 3
             orderId.value = response.data.order_id
         }
 
@@ -834,7 +790,7 @@ watch(ad, (newval) => {
 }
 
 //提示信息
-.tips {
+.adtips {
     width: 100%;
     height: 70px;
     line-height: 70px;

pages/newsDetail/[id].vue

@@ -12,7 +12,8 @@
             <el-breadcrumb :separator-icon="ArrowRight">
                 <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
                 <el-breadcrumb-item :to="{ path: `/newsList/${routLevelId}` }">{{ routLevelTitle }}</el-breadcrumb-item>
-                <el-breadcrumb-item>{{ routeNewsTtitle }}</el-breadcrumb-item>
+                <el-breadcrumb-item>文章详情</el-breadcrumb-item>
+                <!-- <el-breadcrumb-item>{{ routeNewsTtitle }}</el-breadcrumb-item> -->
             </el-breadcrumb>
         </div>
     </div>
@@ -26,7 +27,7 @@
                     <p>
                         来源: <span>{{ newsDetail.copyfrom }}</span>
                         作者: <span>{{ newsDetail.author }}</span>
-                        发布时间:<span>{{time}}</span>
+                        发布时间: <span>{{time}}</span>
                         <!-- 浏览量: <span>{{ newsDetail.hits }}</span> -->
                     </p>
                     <img :src="newsDetail.imgurl" alt="">
@@ -135,7 +136,8 @@ const getNewsInfo = async () => {
     const response = await axios.get(`/web/selectWebsiteArticleInfo?articleid=${articleId}`);
     newsDetail.value = response.data;
     routLevelTitle.value = newsDetail.value.cat_name
-    routLevelId.value = newsDetail.value.cat_id
+    console.log(123145)
+    routLevelId.value = newsDetail.value.category_id
     time.value = newsDetail.value.updated_at.split(' ')[0]
     if (newsDetail.value.title.length >= 30) {
         routeNewsTtitle.value = newsDetail.value.title.substr(0, 30) + "...";
@@ -144,6 +146,13 @@ const getNewsInfo = async () => {
     }
 }
 
+function getDays(time) {
+    const date = new Date(time);
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    return `${month}-${day}`;
+}
 
 onMounted(() => {
     getNewsInfo()
@@ -270,6 +279,13 @@ onMounted(() => {
                 //     width: 790px;   
                 //     height: 382px;
                 // }
+                p.tinymce-material {
+                    img {
+                        width: 790px;
+                    }
+                }
+
+
 
                 >h3,
                 >p {
@@ -280,7 +296,9 @@ onMounted(() => {
                     color: #333333;
                     line-height: 38px;
                     padding-bottom: 30px;
-
+                    img {
+                        width:790px;
+                    }
                 }
 
                 >h3 {
@@ -294,14 +312,16 @@ onMounted(() => {
             }
 
             .disclaimer {
+                width: 790px;
+                overflow: hidden;
                 border-top: 1px solid #e6e6e6;
                 padding: 30px 0px;
                 color: #999999 ;
-                font-size: 20px;
+                font-size: 17px;
                 p{
+                    width: 790px;
                     line-height: 30px;
                 }
-                // font-family: Microsoft YaHei, Microsoft YaHei;;
             }
         }
 
@@ -317,4 +337,9 @@ onMounted(() => {
         }
     }
 }
+
+.leftBottom::v-deep p img{
+  max-width: 700px;
+}
+
 </style>

pages/newsList/[id].vue

@@ -10,7 +10,7 @@
                 <span class="location">当前位置:</span>
                 <el-breadcrumb :separator-icon="ArrowRight">
                     <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                    <el-breadcrumb-item :to="{ path: '/newsList' }">{{ name }}</el-breadcrumb-item>
+                    <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
                 </el-breadcrumb>
             </div>
         </div>
@@ -20,14 +20,14 @@
                 <div class="innerLeft">
                     <ul class="list">
                         <li v-for="(item, index) in newsList" :key="index">
-                            <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">{{ item.title }}</NuxtLink>
+                            <NuxtLink :to="item.linkurl" target="_blank" v-show="item.islink==1">{{ item.title }}</NuxtLink>
+                            <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                         </li>
                     </ul>
                     <!-- 分页器 -->
                     <div class="pagination" v-if="total">
                         <el-pagination size="small" background layout="prev, pager, next" :total="total" class="mt-4"
                             v-model:page-size="pageSize" prev-text="上一页" next-text="下一页" @change="changePage" />
-                        <!-- <HomePagination @sendData="handleData"></HomePagination> -->
                     </div>
                 </div>
                 <div class="innerRight">

pages/primaryNavigation/[id].vue

@@ -13,81 +13,90 @@
         <!-- 第一层 -->
         <div class="farmingPartOne">
             <div class="inner">
-                <div class="innerLeft" v-if="pageData.length >= 1">
-                    <!-- 标题部分 -->
+                <div class="innerLeft" v-if="pageData[0]">
                     <div class="title">
                         <h3>
-                            {{ pageData[0].title }}
+                            <NuxtLink :to="{ path: `/newsList/${pageData[0].cid}`}" target="_blank" v-if="pageData[0]">
+                                {{ pageData[0].title }}
+                            </NuxtLink>
                             <span>
                                 <NuxtLink
-                                    :to="{ path: `/newsList/${pageData[0].cid}`, query: { catid: pageData[0].cid } }"
+                                    :to="{ path: `/newsList/${pageData[0].cid}`}"
                                     target="_blank" v-if="pageData[0]">查看更多</NuxtLink>
                             </span>
                         </h3>
                     </div>
                     <div class="leftTop">
-                        <div class="leftTopPhoto left">
-                            <!-- PartTwoPhoto -->
-                            <!--当pageData[0].data[0]存在的时候才渲染，如果直接渲染会导致页面找不到属性-->
-                            <NuxtLink
-                                :to="{ path: `/newsDetail/${pageData[0].data[0].id}`, query: { listId: routeId, listName: routeName } }"
-                                target="_blank" v-if="pageData[0].data[0]">
-                                <img :src="pageData[0].data[0].imgurl" v-if="pageData[0].data[0]">
-                                <span v-if="pageData[0].data[0]">{{ pageData[0].data[0].title }}</span>
+                        <div class="leftTopPhoto left" >
+                            <NuxtLink :to="item.linkurl" target="_blank" v-if="pageData[0].data[0]&&pageData[0].data[0].islink==1">
+                                <img :src="pageData[0].data[0].imgurl">
+                                <span>{{pageData[0].data[0].title }}</span>
+                            </NuxtLink>
+                            <NuxtLink :to="{ path: `/newsDetail/${pageData[0].data[0].id}`, query: { listId: routeId, listName: routeName } }"
+                                target="_blank" v-if="pageData[0].data[0]&&pageData[0].data[0].islink==0">
+                                <img :src="pageData[0].data[0].imgurl">
+                                <span>{{pageData[0].data[0].title}}</span>
                             </NuxtLink>
                         </div>
                         <ul class="left">
                             <li v-for="item in pageData[0].data">
                                 <em></em>
-                                <!-- <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank" >{{item.title}}</NuxtLink> -->
                                 <span>
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                     <NuxtLink
                                         :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">{{ item.title }}</NuxtLink>
+                                        target="_blank" v-if="item.islink==0">{{ item.title }}
+                                    </NuxtLink>
                                 </span>
-
                             </li>
                         </ul>
                     </div>
-                    <ul class="leftBottom">
+                    <ul class="leftBottom" v-if="pageData[0]">
                         <li v-for="item in pageData[0].data2">
+                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                <img :src="item.imgurl">
+                            </NuxtLink>
                             <NuxtLink
                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                target="_blank"><img :src="item.imgurl"></NuxtLink>
+                                target="_blank" v-if="item.islink==0">
+                                <img :src="item.imgurl">
+                            </NuxtLink>
                             <p>
+                                <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                 <NuxtLink
                                     :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                    target="_blank">{{ item.title }}</NuxtLink>
+                                    target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                             </p>
                         </li>
                     </ul>
                 </div>
-                <div class="innerRight" v-if="pageData.length >= 2">
-                    <!-- 标题部分 -->
+                <div class="innerRight" v-if="pageData[1].cid!=''">
                     <div class="title">
                         <h3>
-                            {{ pageData[1].title }}
+                            <NuxtLink :to="{ path: `/newsList/${pageData[1].cid}`}" target="_blank" v-if="pageData[1]">
+                                {{ pageData[1].title }}
+                            </NuxtLink>
                             <span>
                                 <NuxtLink
-                                    :to="{ path: `/newsList/${pageData[1].cid}`, query: { catid: pageData[1].cid } }"
+                                    :to="{ path: `/newsList/${pageData[1].cid}`}"
                                     v-if="pageData[1]" target="_blank">查看更多</NuxtLink>
                             </span>
 
-                            <!-- <span>查看更多</span> -->
                         </h3>
                     </div>
-                    <!-- 列表 -->
                     <ul class="rightList">
                         <li v-for="item in pageData[1].data">
+                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                             <NuxtLink
                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                target="_blank">
+                                target="_blank" v-if="item.islink==0">
                                 <img class="left" :src="item.imgurl">
                             </NuxtLink>
                             <p class="left">
+                                <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                 <NuxtLink
                                     :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                    target="_blank">
+                                    target="_blank" v-if="item.islink==0">
                                     {{ item.title }}
                                 </NuxtLink>
                             </p>
@@ -101,25 +110,29 @@
         <HomeSannongzixun></HomeSannongzixun>
 
         <!-- 第二层 -->
-        <div class="farmingPartTwo">
+        <div class="farmingPartTwo" v-if="pageData[2].cid!=''&&pageData[3].cid!=''&&pageData[4].cid!=''">
             <div class="inner">
-                <div class="farmer" v-if="pageData.length >= 3">
-                    <!-- 标题部分 -->
+                <div class="farmer" v-if="pageData[2].cid!=''">
                     <div class="title">
                         <h3>
-                            {{ pageData[2].title }}
+                            <NuxtLink :to="{ path: `/newsList/${pageData[2].cid}`}" target="_blank" v-if="pageData[2]">
+                                {{ pageData[2].title }}
+                            </NuxtLink>
                             <span>
                                 <NuxtLink
                                     :to="{ path: `/newsList/${pageData[2].cid}`, query: { catid: pageData[2].cid } }"
                                     v-if="pageData[2]" target="_blank">查看更多</NuxtLink>
                             </span>
-
                         </h3>
                     </div>
                     <div class="PartTwoPhoto" v-if="pageData[2].data[0]">
+                        <NuxtLink :to="item.linkurl" target="_blank" v-if="pageData[2].data[0].islink==1">
+                            <img :src="pageData[2].data[0].imgurl">
+                            <span>{{ pageData[2].data[0].title }}</span>
+                        </NuxtLink>
                         <NuxtLink
                             :to="{ path: `/newsDetail/${pageData[2].data[0].id}`, query: { listId: routeId, listName: routeName } }"
-                            target="_blank">
+                            target="_blank" v-if="pageData[2].data[0].islink==0">
                             <img :src="pageData[2].data[0].imgurl">
                             <span>{{ pageData[2].data[0].title }}</span>
                         </NuxtLink>
@@ -127,18 +140,19 @@
                     <ul class="PartTwoList">
                         <li v-for="item in pageData[2].data">
                             <em></em>
+                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                             <NuxtLink
                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                target="_blank">{{ item.title }}</NuxtLink>
+                                target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                         </li>
                     </ul>
                 </div>
-                <div class="farmer" v-if="pageData.length >= 4">
-                    <!-- 标题部分 -->
+                <div class="farmer" v-if="pageData[3].cid!=''">
                     <div class="title">
                         <h3>
-                            {{ pageData[3].title }}
-                            <!-- <span>查看更多</span> -->
+                            <NuxtLink :to="{ path: `/newsList/${pageData[3].cid}`}" target="_blank" v-if="pageData[3]">
+                                {{ pageData[3].title }}
+                            </NuxtLink>
                             <span>
                                 <NuxtLink
                                     :to="{ path: `/newsList/${pageData[3].cid}`, query: { catid: pageData[3].cid } }"
@@ -147,9 +161,13 @@
                         </h3>
                     </div>
                     <div class="PartTwoPhoto" v-if="pageData[3].data[0]">
+                        <NuxtLink :to="item.linkurl" target="_blank" v-if="pageData[3].data[0].islink==1">
+                            <img :src="pageData[3].data[0].imgurl">
+                            <span>{{ pageData[3].data[0].title }}</span>
+                        </NuxtLink>
                         <NuxtLink
                             :to="{ path: `/newsDetail/${pageData[3].data[0].id}`, query: { listId: routeId, listName: routeName } }"
-                            target="_blank">
+                            target="_blank" v-if="pageData[3].data[0].islink==0">
                             <img :src="pageData[3].data[0].imgurl">
                             <span>{{ pageData[3].data[0].title }}</span>
                         </NuxtLink>
@@ -157,17 +175,19 @@
                     <ul class="PartTwoList">
                         <li v-for="item in pageData[3].data">
                             <em></em>
+                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                             <NuxtLink
                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                target="_blank">{{ item.title }}</NuxtLink>
+                                target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                         </li>
                     </ul>
                 </div>
-                <div class="farmer" v-if="pageData.length >= 5">
-                    <!-- 标题部分 -->
+                <div class="farmer" v-if="pageData[4].cid!=''">
                     <div class="title">
                         <h3>
-                            {{ pageData[4].title }}
+                            <NuxtLink :to="{ path: `/newsList/${pageData[4].cid}`}" target="_blank" v-if="pageData[4]">
+                                {{ pageData[4].title }}
+                            </NuxtLink>
                             <span>
                                 <NuxtLink
                                     :to="{ path: `/newsList/${pageData[4].cid}`, query: { catid: pageData[4].cid } }"
@@ -176,9 +196,13 @@
                         </h3>
                     </div>
                     <div class="PartTwoPhoto" v-if="pageData[4].data[0]">
+                        <NuxtLink :to="item.linkurl" target="_blank" v-if="pageData[4].data[0].islink==1">
+                            <img :src="pageData[4].data[0].imgurl">
+                            <span>{{ pageData[4].data[0].title }}</span>
+                        </NuxtLink>
                         <NuxtLink
                             :to="{ path: `/newsDetail/${pageData[4].data[0].id}`, query: { listId: routeId, listName: routeName } }"
-                            target="_blank">
+                            target="_blank" v-if="pageData[4].data[0].islink==0">
                             <img :src="pageData[4].data[0].imgurl">
                             <span>{{ pageData[4].data[0].title }}</span>
                         </NuxtLink>
@@ -186,9 +210,12 @@
                     <ul class="PartTwoList">
                         <li v-for="item in pageData[4].data">
                             <em></em>
+                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                             <NuxtLink
                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                target="_blank">{{ item.title }}</NuxtLink>
+                                target="_blank" v-if="item.islink==0">
+                                {{ item.title }}
+                            </NuxtLink>
                         </li>
                     </ul>
                 </div>
@@ -199,58 +226,63 @@
         <HomeSannongzixun></HomeSannongzixun>
 
         <!-- 第三层 -->
-        <div class="zixuntuijian">
+        <div class="zixuntuijian" v-if="pageData[5].cid!=''&&pageData[6].cid!=''&&pageData[7].cid!=''&&pageData[8].cid!=''&&pageData[9].cid!=''">
             <div class="inner">
-                <div class="innerLeft">
+                <div class="innerLeft" >
                     <div class="zixunTop">
-                        <div class="zixunLeft">
-                            <!-- 标题部分 -->
+                        <div class="zixunLeft" v-if="pageData[5].cid!=''">
                             <div class="title">
                                 <h3>
-                                    {{ pageData[5].title }}
+                                    <NuxtLink :to="{ path: `/newsList/${pageData[5].cid}`}" target="_blank" v-if="pageData[5]">
+                                        {{ pageData[5].title }}
+                                    </NuxtLink>
                                     <span>
                                         <NuxtLink
                                             :to="{ path: `/newsList/${pageData[5].cid}`, query: { catid: pageData[5].cid } }"
                                             v-if="pageData[5]" target="_blank">查看更多</NuxtLink>
                                     </span>
-
                                 </h3>
                             </div>
-                            <!-- 图片和文字列表 160 -->
                             <ul class="photo_text">
                                 <li v-for="(item, index) in pageData[5].data">
                                     <article v-if="index == 0">
+                                        <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                            <img :src="item.imgurl" alt="">
+                                        </NuxtLink>
                                         <NuxtLink
                                             :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                            target="_blank">
+                                            target="_blank" v-if="item.islink==0">
                                             <img :src="item.imgurl" alt="">
                                         </NuxtLink>
                                         <div>
                                             <h5>
+                                                <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                                 <NuxtLink
                                                     :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                                    target="_blank">{{ item.title }}</NuxtLink>
+                                                    target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                             </h5>
                                             <p>
                                                 <span>{{ item.author }}</span>
-                                                <span>{{ item.created_at }}</span>
+                                                <span>{{ getDays(item.created_at) }}</span>
                                             </p>
                                         </div>
                                     </article>
                                     <article v-else>
                                         <em></em>
+                                        <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                         <NuxtLink
                                             :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                            target="_blank">{{ item.title }}</NuxtLink>
+                                            target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                     </article>
                                 </li>
                             </ul>
                         </div>
-                        <div class="zixunRight">
-                            <!-- 标题部分 -->
+                        <div class="zixunRight"  v-if="pageData[6].cid!=''">
                             <div class="title">
                                 <h3>
-                                    {{ pageData[6].title }}
+                                    <NuxtLink :to="{ path: `/newsList/${pageData[6].cid}`}" target="_blank" v-if="pageData[6]">
+                                        {{ pageData[6].title }}
+                                    </NuxtLink>
                                     <span>
                                         <NuxtLink
                                             :to="{ path: `/newsList/${pageData[6].cid}`, query: { catid: pageData[6].cid } }"
@@ -262,28 +294,31 @@
                             <div class="towPic">
                                 <div v-for="(item, index) in pageData[6].data" class="picBox">
                                     <div v-if="index <= 1">
+                                        <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                            <img :src="item.imgurl">
+                                        </NuxtLink>
                                         <NuxtLink
                                             :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                            target="_blank">
+                                            target="_blank" v-if="item.islink==0">
                                             <img :src="item.imgurl">
                                         </NuxtLink>
                                     </div>
                                 </div>
                             </div>
-                            <!-- 图片和文字列表 -->
                             <ul class="photo_text">
                                 <li v-for="(item, index) in pageData[6].data">
                                     <article v-if="index > 1">
                                         <em></em>
+                                        <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                         <NuxtLink
                                             :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                            target="_blank">{{ item.title }}</NuxtLink>
+                                            target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                     </article>
                                 </li>
                             </ul>
                         </div>
                     </div>
-                    <div class="zixunBottom">
+                    <div class="zixunBottom" v-if="pageData[6].cid!=''">
                         <img class="left" :src="pageData[7].data[0].imgurl"
                             v-if="pageData[7].data[0] && hoverStatus == 0">
                         <img class="left" :src="pageData[7].data[1].imgurl"
@@ -301,24 +336,22 @@
                             <li v-for="(item, index) in pageData[7].data" @mouseenter="qhPic(index)">
                                 <h4>
                                     <em></em>
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                     <NuxtLink
                                         :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">{{ item.title }}</NuxtLink>
+                                        target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                 </h4>
-                                <!-- <p>
-                                    <NuxtLink
-                                        :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">{{ item.title }}</NuxtLink>
-                                </p> -->
+                                
                             </li>
                         </ul>
                     </div>
                 </div>
-                <div class="innerRight">
-                    <!-- 标题部分 -->
+                <div class="innerRight" v-if="pageData[8].cid!=''">
                     <div class="title">
                         <h3>
-                            {{ pageData[8].title }}
+                            <NuxtLink :to="{ path: `/newsList/${pageData[8].cid}`}" target="_blank" v-if="pageData[8]">
+                                {{ pageData[8].title }}
+                            </NuxtLink>
                             <span>
                                 <NuxtLink
                                     :to="{ path: `/newsList/${pageData[8].cid}`, query: { catid: pageData[8].cid } }"
@@ -329,16 +362,18 @@
                     </div>
                     <ul class="information">
                         <li v-for="item in pageData[8].data">
+                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                <img :src="item.imgurl">
+                            </NuxtLink>
                             <NuxtLink
                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                target="_blank">
+                                target="_blank" v-if="item.islink==0">
                                 <img :src="item.imgurl">
                             </NuxtLink>
                             <div class="text">
                                 <h5>
-                                    <NuxtLink
-                                        :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">{{ item.title }}</NuxtLink>
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
+                                    <NuxtLink :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }" target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                 </h5>
                                 <p>{{ item.author }}</p>
                             </div>
@@ -348,16 +383,16 @@
             </div>
         </div>
 
-        <!-- 十强称号logo -->
-        <HomeTopTen></HomeTopTen>
+        <HomeTopTen :imgurl="adList[2]" v-if="adList[2]"></HomeTopTen>
 
-        <!-- 第四层 -->
-        <div class="farming">
+        <div class="farming" v-if="pageData[9].cid!=''&&pageData[10].cid!=''&&pageData[11].cid!=''">
             <div class="inner">
-                <div class="innerLeft">
+                <div class="innerLeft" v-if="pageData[9].cid!=''">
                     <div class="farmer">
                         <h3>
-                            {{ pageData[9].title }}
+                            <NuxtLink :to="{ path: `/newsList/${pageData[9].cid}`}" target="_blank" v-if="pageData[9]">
+                                {{ pageData[9].title }}
+                            </NuxtLink>
                             <span>
                                 <NuxtLink
                                     :to="{ path: `/newsList/${pageData[9].cid}`, query: { catid: pageData[9].cid } }"
@@ -368,16 +403,19 @@
                             <li v-for="item in pageData[9].data">
                                 <em></em>
                                 <span>
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                     <NuxtLink
                                         :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">{{ item.title }}</NuxtLink>
+                                        target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                 </span>
                             </li>
                         </ul>
                     </div>
                     <div class="farmer">
                         <h3>
-                            {{ pageData[10].title }}
+                            <NuxtLink :to="{ path: `/newsList/${pageData[10].cid}`}" target="_blank" v-if="pageData[10]">
+                                {{ pageData[10].title }}
+                            </NuxtLink>
                             <span>
                                 <NuxtLink
                                     :to="{ path: `/newsList/${pageData[10].cid}`, query: { catid: pageData[10].cid } }"
@@ -389,44 +427,52 @@
                             <li v-for="item in pageData[10].data">
                                 <em></em>
                                 <span>
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                     <NuxtLink
                                         :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">{{ item.title }}</NuxtLink>
+                                        target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                 </span>
                             </li>
                         </ul>
                     </div>
                 </div>
-                <div class="innerRight">
-                    <!-- 标题部分 -->
+                <div class="innerRight" v-if="pageData[11].cid!=''">
                     <h3>
-                        {{ pageData[11].title }}
+                        <NuxtLink :to="{ path: `/newsList/${pageData[11].cid}`}" target="_blank" v-if="pageData[11]">
+                            {{ pageData[11].title }}
+                        </NuxtLink>
                         <span>
                             <NuxtLink
                                 :to="{ path: `/newsList/${pageData[11].cid}`, query: { catid: pageData[11].cid } }"
                                 target="_blank" v-if="pageData[11]">查看更多</NuxtLink>
                         </span>
                     </h3>
-                    <!-- 轮播图 -->
                     <div class="banner">
                         <HomeSmallSwiper :swiperData="pageData[11].data"></HomeSmallSwiper>
                     </div>
-                    <!-- 轮播图下小图列表 及内容列表 -->
                     <div class="banner_b_img">
                         <div class="photo">
                             <article v-for="(item, index) in pageData[11].data2">
                                 <div class="photoL" v-if="index == 0">
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                        <img :src="item.imgurl">
+                                        <span>{{ item.title }}</span>
+                                    </NuxtLink>
                                     <NuxtLink
                                         :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">
+                                        target="_blank" v-if="item.islink==0">
                                         <img :src="item.imgurl">
                                         <span>{{ item.title }}</span>
                                     </NuxtLink>
                                 </div>
                                 <div class="photoL" v-if="index == 1">
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                        <img :src="item.imgurl">
+                                        <span>{{ item.title }}</span>
+                                    </NuxtLink>
                                     <NuxtLink
                                         :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">
+                                        target="_blank" v-if="item.islink==0">
                                         <img :src="item.imgurl">
                                         <span>{{ item.title }}</span>
                                     </NuxtLink>
@@ -438,9 +484,12 @@
                         <ul>
                             <li v-for="item in pageData[11].data3">
                                 <em></em>
+                                <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                    <span>{{ item.title }}</span>
+                                </NuxtLink>
                                 <NuxtLink
                                     :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                    target="_blank">
+                                    target="_blank" v-if="item.islink==0">
                                     <span>{{ item.title }}</span>
                                 </NuxtLink>
                             </li>
@@ -454,15 +503,17 @@
         <HomeTopTenTitle></HomeTopTenTitle>
 
         <!-- 第五层 -->
-        <div class="scienceEducation">
+        <div class="scienceEducation" v-if="pageData[12].cid!=''&&pageData[13].cid!=''">
             <div class="inner">
-                <!-- 左侧 -->
-                <div class="innerLeft">
-                    <!-- <HomeSlider ></HomeSlider> -->
+                <div class="innerLeft" v-if="pageData[12].cid!=''">
                     <div class="slider">
-                        <!-- 标题部分 -->
                         <div class="scienceTitle">
-                            <h5>{{ pageData[12].title }}</h5>
+                            <h5>
+                                <NuxtLink :to="{ path: `/newsList/${pageData[12].cid}`}" target="_blank" v-if="pageData[12]">
+                                    {{ pageData[12].title }}
+                                </NuxtLink>
+                            </h5>
+                            
                             <p class="title">
                                 <span v-if="pageData[12]" @click="qhtabs(1)">
                                     <b v-if="showTabs == 1" class="active">{{ pageData[12].title1 }}</b>
@@ -482,45 +533,47 @@
                                 </span>
                             </p>
                         </div>
-                        <!-- 标题下内容列表 -->
                         <div class="box">
                             <div class="scienceListBox">
                                 <ul class="scienceList" v-if="showTabs == 1">
                                     <li v-for="item in pageData[12].data1">
-                                        <!-- <img :src="item.imgurl"> -->
+                                        <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1"><img :src="item.imgurl"></NuxtLink>
                                         <NuxtLink
                                             :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                            target="_blank"><img :src="item.imgurl"></NuxtLink>
+                                            target="_blank" v-if="item.islink==0"><img :src="item.imgurl"></NuxtLink>
                                         <p>
+                                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                             <NuxtLink
                                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                                target="_blank">{{ item.title }}</NuxtLink>
+                                                target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                         </p>
                                     </li>
                                 </ul>
                                 <ul class="scienceList" v-if="showTabs == 2">
                                     <li v-for="item in pageData[12].data2">
-                                        <!-- <img :src="item.imgurl"> -->
+                                        <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1"><img :src="item.imgurl"></NuxtLink>
                                         <NuxtLink
                                             :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                            target="_blank"><img :src="item.imgurl"></NuxtLink>
+                                            target="_blank" v-if="item.islink==0"><img :src="item.imgurl"></NuxtLink>
                                         <p>
+                                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                             <NuxtLink
                                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                                target="_blank">{{ item.title }}</NuxtLink>
+                                                target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                         </p>
                                     </li>
                                 </ul>
                                 <ul class="scienceList" v-if="showTabs == 3">
                                     <li v-for="item in pageData[12].data3">
-                                        <!-- <img :src="item.imgurl"> -->
+                                        <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1"><img :src="item.imgurl"></NuxtLink>
                                         <NuxtLink
                                             :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                            target="_blank"><img :src="item.imgurl"></NuxtLink>
+                                            target="_blank" v-if="item.islink==0"><img :src="item.imgurl"></NuxtLink>
                                         <p>
+                                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                             <NuxtLink
                                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                                target="_blank">{{ item.title }}</NuxtLink>
+                                                target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                         </p>
                                     </li>
                                 </ul>
@@ -528,9 +581,10 @@
                                     <li v-for="item in pageData[12].data4">
                                         <img :src="item.imgurl">
                                         <p>
+                                            <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                             <NuxtLink
                                                 :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                                target="_blank">{{ item.title }}</NuxtLink>
+                                                target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                                         </p>
                                     </li>
                                 </ul>
@@ -539,11 +593,11 @@
                     </div>
 
                 </div>
-                <!-- 右侧 -->
-                <div class="innerRight">
-                    <!-- 标题部分 -->
+                <div class="innerRight" v-if="pageData[13].cid!=''">
                     <h3>
-                        {{ pageData[13].title }}
+                        <NuxtLink :to="{ path: `/newsList/${pageData[13].cid}`}" target="_blank" v-if="pageData[13]">
+                            {{ pageData[13].title }}
+                        </NuxtLink>
                         <span>
                             <NuxtLink
                                 :to="{ path: `/newsList/${pageData[13].cid}`, query: { catid: pageData[13].cid } }"
@@ -555,38 +609,41 @@
                         <li v-for="item in pageData[13].data3">
                             <em></em>
                             <span>
+                                <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">{{ item.title }}</NuxtLink>
                                 <NuxtLink
                                     :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                    target="_blank">{{ item.title }}</NuxtLink>
+                                    target="_blank" v-if="item.islink==0">{{ item.title }}</NuxtLink>
                             </span>
                         </li>
                     </ul>
-                    <!-- 轮播图 -->
                     <div class="banner">
                         <HomeSmallSwiper :swiperData="pageData[13].data"></HomeSmallSwiper>
                     </div>
-                    <!-- 轮播图下小图列表 及内容列表 -->
                     <div class="banner_b_img">
                         <div class="photo">
                             <article v-for="(item, index) in pageData[13].data2">
                                 <div class="photoL" v-if="index == 0">
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                        <img :src="item.imgurl">
+                                        <span>{{ item.title }}</span>
+                                    </NuxtLink>
                                     <NuxtLink
                                         :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">
+                                        target="_blank" v-if="item.islink==0">
                                         <img :src="item.imgurl">
-                                        <span>
-                                            {{ item.title }}
-                                        </span>
+                                        <span>{{ item.title }}</span>
                                     </NuxtLink>
                                 </div>
                                 <div class="photoL" v-if="index == 1">
+                                    <NuxtLink :to="item.linkurl" target="_blank" v-if="item.islink==1">
+                                        <img :src="item.imgurl">
+                                        <span>{{ item.title }}</span>
+                                    </NuxtLink>
                                     <NuxtLink
                                         :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
-                                        target="_blank">
+                                        target="_blank"  v-if="item.islink==0">
                                         <img :src="item.imgurl">
-                                        <span>
-                                            {{ item.title }}
-                                        </span>
+                                        <span>{{ item.title }}</span>
                                     </NuxtLink>
                                 </div>
                             </article>
@@ -631,31 +688,42 @@ const qhPic = function (num) {
     hoverStatus.value = num;
 }
 
-// 在 onMounted 钩子中获取数据
-onMounted(async () => {
+//获得所有广告
+const adList = ref("");
+const getadList = async () => {
     try {
-        const response = await axios.get(`/web/getWebsiteCategoryHead?catid=${routeId}`);
-        const data = response.data.website_head; // 假设接口返回的数据在 data 字段中
-        console.log(seoData.value.title)
-        // 更新 seoData
-        seoData.value = {
-            title: data.seo_title,
-            description: data.seo_description,
-            keywords: data.seo_keywords,
-            image: data.seo_image
-        };
-        console.log(seoData.value.title)
-
+        const response = await axios.get(`/web/getWebsiteAdvertisement`);
+        adList.value = response.data;
     } catch (error) {
-        console.error('获取 SEO 数据失败:', error);
-        // 设置默认值
-        seoData.value = {
-            title: '三农资讯网',
-            description: '默认描述',
-            keywords: '默认关键词',
-            image: 'https://example.com/default-image.jpg'
-        };
+        console.error(error);
     }
+}
+
+// 在 onMounted 钩子中获取数据
+onMounted(async () => {
+    // try {
+    //     const response = await axios.get(`/web/getWebsiteCategoryHead?catid=${routeId}`);
+    //     const data = response.data.website_head; // 假设接口返回的数据在 data 字段中
+    //     console.log(seoData.value.title)
+    //     // 更新 seoData
+    //     seoData.value = {
+    //         title: data.seo_title,
+    //         description: data.seo_description,
+    //         keywords: data.seo_keywords,
+    //         image: data.seo_image
+    //     };
+    //     console.log(seoData.value.title)
+
+    // } catch (error) {
+    //     console.error('获取 SEO 数据失败:', error);
+    //     // 设置默认值
+    //     seoData.value = {
+    //         title: '三农资讯网',
+    //         description: '默认描述',
+    //         keywords: '默认关键词',
+    //         image: 'https://example.com/default-image.jpg'
+    //     };
+    // }
 });
 
 // 监听 seoData 的变化，动态设置 SEO 字段
@@ -993,6 +1061,14 @@ onMounted(() => {
         getWebsiteModelCategory()
     }
 })
+
+function getDays(time) {
+    const date = new Date(time);
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    return `${month}-${day}`;
+}
 </script>
 
 <style lang="less" scoped>

pages/search/search.vue

@@ -4,6 +4,12 @@
         <HomePageHead></HomePageHead>
         <!-- Banner1 -->
         <HomeBanner1></HomeBanner1>
+        <div class="search">
+            <div class="inner">
+                <input v-model="keywordInput" type="text" placeholder="请输入搜索内容">
+                <button @click="goSearch">搜索</button>
+            </div>
+        </div>
         <!-- 面包屑导航 -->
         <div class="breadcrumb">
             <div class="inner">
@@ -22,15 +28,25 @@
         <div class="newsList">
             <div class="inner">
                 <div class="innerLeft">
-                    <ul class="list">
+                    <ul class="list" v-if="newsList.length >= 0">
                         <li v-for="(item, index) in newsList" :key="index">
-                            <NuxtLink :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }" target="_blank">{{ item.title }}</NuxtLink>
+                            <NuxtLink :to="item.linkurl" target="_blank" v-show="item.islink == 1">{{ item.title }}
+                            </NuxtLink>
+                            <NuxtLink
+                                :to="{ path: `/newsDetail/${item.id}`, query: { listId: routeId, listName: routeName } }"
+                                target="_blank" v-if="item.islink == 0">{{ item.title }}</NuxtLink>
                         </li>
                     </ul>
+                    <div v-if="newsList.length == 0" class="empty">
+                        <div>
+                            <img src="../../static/search/empty.png" alt="暂无内容">
+                            <p>暂无搜索数据</p>
+                        </div>
+                    </div>
                     <!-- 分页器 -->
                     <div class="pagination">
                         <el-pagination size="small" background layout="prev, pager, next" :total="total" class="mt-4"
-                            prev-text="上一页" next-text="下一页" @change="changePage" />
+                            v-model:page-size="pageSize" prev-text="上一页" next-text="下一页" @change="changePage" />
                         <!-- <HomePagination @sendData="handleData"></HomePagination> -->
                     </div>
                 </div>
@@ -135,9 +151,6 @@ console.log(name);
 //从地区跳转
 const catids = ref([]);
 
-
-
-
 //关键词
 let keyWord = useState("keyWord", () => "")
 let id = useState("id", () => "")
@@ -150,12 +163,19 @@ let keywordInput = ref("")
 
 // 定义响应式数据
 const seoData = ref({
-    title: '三农资讯网',
+    title: '搜索',
     description: '默认描述',
     keywords: '默认关键词',
     image: 'https://example.com/default-image.jpg'
 });
 
+// 在 onMounted 钩子中获取数据
+onMounted(()=>{
+    seoData.value.title = '搜索';
+    seoData.value.description = '默认描述';
+    seoData.value.keywords = '默认关键词';
+})
+
 // 在 onMounted 钩子中获取数据
 // onMounted(async () => {
 //     try {
@@ -201,13 +221,11 @@ const seoData = ref({
 // }, { immediate: true });
 
 //点击搜索按钮
-let goSearch = () => {
-    navigateTo({
-        path: '/search/search',
-        query: {
-            keyword: keywordInput.value
-        }
-    })
+let goSearch = async () => {
+    const response = await axios.get(`/web/getWebsiteArticleList?page=${page.value}&pageSize=${pageSize.value}&catid=${category_id}&keyword=${keywordInput.value}`);
+    // console.log(response.data.rows);
+    newsList.value = response.data.rows;
+    total.value = response.data.count;
 }
 
 
@@ -242,7 +260,12 @@ let changePage = (value) => {
 const newsList = useState("newsList", () => '');
 const newslists = async () => {
     try {
-        
+
+        // const response = await axios.get(`/web/getWebsiteArticleList?page=${page.value}&pageSize=${pageSize.value}&keyword=${searchKey}`);
+        // // console.log(response.data.rows);
+        // newsList.value = response.data.rows;
+        // total.value = response.data.count;
+
         // 从地区跳转
         if (route.query.catids && route.query.catids.length > 0) {
             // 将字符串转换回数组，并过滤掉可能的空值
@@ -254,12 +277,12 @@ const newslists = async () => {
                 let font = catids.value.join(",")
                 font = "[" + font + "]"
                 //console.log(font);
-                
+
                 const response = await axios.get(`/web/getWebsiteArticleList?page=${page.value}&pageSize=${pageSize.value}&catid=${font}`);
                 console.log(response.data.rows);
                 newsList.value = response.data.rows;
                 total.value = response.data.count;
-                
+
             } else {
                 // 处理空数组情况
                 console.log('未接收到有效的分类ID');
@@ -427,6 +450,24 @@ definePageMeta({
     }
 }
 
+.empty {
+    div {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding-top: 200px;
+    }
+
+    width: 100%;
+    height: 600px;
+    font-size: 26px;
+    color: #CCCCCC;
+
+    img {
+        display: inline-block;
+    }
+}
+
 // 资讯列表
 .newsList {
     width: 1200px;
@@ -787,4 +828,40 @@ definePageMeta({
     text-align: center;
     padding-bottom: 40px;
 }
+
+.search {
+    width: 100%;
+    height: 100px;
+    // background-color: #f5f5f5;
+
+    .inner {
+        width: 1200px;
+        height: 100px;
+        // line-height: 100px;
+        padding-top: 10px;
+        text-align: center;
+
+        input {
+            width: 582px;
+            height: 46px;
+            outline: none;
+            border: 1px solid #E6E6E6;
+            border-radius: 0;
+            padding-left: 20px;
+            vertical-align: 0px;
+            font-size: 16px;
+            color: #666666
+        }
+
+        button {
+            width: 120px;
+            height: 48px;
+            background-color: #139602;
+            color: #fff;
+            border: none;
+            border-radius: 0;
+            cursor: pointer;
+        }
+    }
+}
 </style>

pages/specialList/[id].vue

@@ -35,7 +35,9 @@
                     <div class="innerTitle">本网招聘</div>
                     <ul class="list">
                         <li v-for="(item, index) in newsList" :key="index">
-                            <NuxtLink :to="{ path: `/speciaArticle/${item.id}` }" target="_blank">{{ item.list_title }}
+                            <NuxtLink :to="item.linkurl" target="_blank" v-show="item.islink == 1">{{ item.title }}
+                            </NuxtLink>
+                            <NuxtLink :to="{ path: `/speciaArticle/${item.id}` }" target="_blank"  v-if="item.islink == 0">{{ item.list_title }}
                             </NuxtLink>
                         </li>
                     </ul>
@@ -56,7 +58,8 @@
                             <NuxtLink :to="`/speciaArticle/${item.id}`" target="_blank"
                                 v-else-if="item.id != pageId && item.id != 7">{{ item.name }}</NuxtLink>
                             <NuxtLink :to="`/specialList/${item.id}`" target="_blank"
-                                v-if="item.id == 7 && pageId == 7 && routeHref == '/specialList/7'" class="active">{{ item.name }}
+                                v-if="item.id == 7 && pageId == 7 && routeHref == '/specialList/7'" class="active">{{
+                                item.name }}
                             </NuxtLink>
                             <NuxtLink :to="`/specialList/${item.id}`" target="_blank" v-else-if="item.id == 7">{{
                                 item.name }}</NuxtLink>

pages/topic/[id].vue

@@ -49,7 +49,7 @@
                     <h3>评论</h3>
                     <div class="commentList" v-for="item in replyList" v-show="page_total != 0">
                         <div class="left">
-                            <img v-if='item.avatar' :src="item.avatar" alt="">
+                            <img v-if='item.avatar' :src="item.avatar" alt="" >
                             <img v-else src='../../static/topic/Rectangle.png' alt="">
                             <span class="name">{{ item.nickname }} : </span>
                             <span class="context">{{ item.content }}</span>
@@ -100,6 +100,21 @@ const axios = nuxtApp.$axios;
 
 //1.引用模块 end ---------------------------------------->
 
+// 定义响应式数据
+const seoData = ref({
+    title: '商圈',
+    description: '默认描述',
+    keywords: '默认关键词',
+    image: 'https://example.com/default-image.jpg'
+});
+
+// 在 onMounted 钩子中获取数据
+onMounted(()=>{
+    seoData.value.title = '商圈';
+    seoData.value.description = '默认描述';
+    seoData.value.keywords = '默认关键词';
+})
+
 //2.页面数据 start ---------------------------------------->
 const dataInfo = ref({})
 const groupId = useState("groupId", () => '')
@@ -150,15 +165,6 @@ const getTopicReply = () => {
         replyList.value = res.data.data
         // page_total.value = res.data.total
 
-        // replyList.value = res.data.data.sort((a, b) => {
-        //     const dateA = new Date(a.created_at);
-        //     const dateB = new Date(b.created_at);
-        //     return dateB - dateA; // 降序排序
-        // });
-        // replyList.value = res.data.data.sort((a, b) => {
-        //     return new Date(b.created_at) - new Date(a.created_at);
-        // });
-
         page_total.value = res.data.total
 
         console.log("replyList", replyList);
@@ -198,8 +204,7 @@ const joinGroup = () => {
                     type: 'success',
                 })
                 setTimeout(() => {
-                    // window.location.href = ("http://adminpre.bjzxtw.org.cn/#/hall")
-                    window.open('http://adminpre.bjzxtw.org.cn/#/hall', '_blank');
+                    window.open('http://admindev.bjzxtw.org.cn/#/hall', '_blank');
                 }, 1000)
             } else if (res.code == 200) {
                 ElMessage({
@@ -207,9 +212,7 @@ const joinGroup = () => {
                     type: 'success',
                 })
                 setTimeout(() => {
-                    // window.location.href = ("http://adminpre.bjzxtw.org.cn/#/hall")
-                    window.open('http://adminpre.bjzxtw.org.cn/#/hall', '_blank');
-
+                    window.open('http://admindev.bjzxtw.org.cn/#/hall', '_blank');
                 }, 1000)
             }
 
@@ -424,15 +427,25 @@ const addReply = () => {
                 box-sizing: border-box;
 
                 .left {
+                    width:920px;
+                    // overflow: hidden;
                     img {
+                        float: left;
                         width: 52px;
                         height: 52px;
                         border-radius: 50%;
                         vertical-align: middle;
                         margin-right: 15px;
                     }
+                    span{
+                        float: left;
+                        height: 52px;
+                        line-height: 22px;
+                        padding-top: 10px;
+                    }
 
                     .name {
+                        
                         font-family: Microsoft YaHei, Microsoft YaHei;
                         font-weight: 400;
                         font-size: 16px;
@@ -441,6 +454,13 @@ const addReply = () => {
                     }
 
                     .context {
+                        width:760px;
+                        display: -webkit-box;
+                        -webkit-box-orient: vertical;
+                        -webkit-line-clamp: 2;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        word-break: break-all;
                         font-family: Microsoft YaHei, Microsoft YaHei;
                         font-weight: bold;
                         font-size: 16px;

pages/topic/index.vue

@@ -104,6 +104,21 @@ const nuxtApp = useNuxtApp();
 const axios = nuxtApp.$axios;
 //1.引用模块 end ---------------------------------------->
 
+// 定义响应式数据
+const seoData = ref({
+    title: '商圈',
+    description: '默认描述',
+    keywords: '默认关键词',
+    image: 'https://example.com/default-image.jpg'
+});
+
+// 在 onMounted 钩子中获取数据
+onMounted(()=>{
+    seoData.value.title = '商圈';
+    seoData.value.description = '默认描述';
+    seoData.value.keywords = '默认关键词';
+})
+
 //2.页面数据 start ---------------------------------------->
 const activeName = useState("activeName", () => '')
 const listData = useState("listData", () => [])//商圈列表
@@ -230,7 +245,7 @@ onMounted(() => {
         }
 
         .adEmpty {
-            margin: 130px auto;
+            margin: 150px auto;
             text-align: center;
 
             img {