Jing 2 päivää sitten
vanhempi
sitoutus
7aca81cb47

+ 1 - 0
assets/css/about.less

@@ -89,6 +89,7 @@
 
             .innerDetail1 {
                 width: 1086px;
+                min-height: 600px;
                 margin: 0 auto;
                 padding: 30px 50px 40px;
                 box-sizing: border-box;

+ 49 - 32
components/home/pageHead.vue

@@ -6,7 +6,7 @@
                     <span class="znxy">
                         <a href="http://znxyw.org.cn/" target="_blank">中农兴业网团</a>
                     </span>
-                    <span>旗下网站 · 农业百强网站(科教文化类十强)</span>
+                    <span>旗下网站 · 政府类农业百强网站!</span>
                 </div>
                 <div class="right">
                     <div class="menu">
@@ -172,6 +172,7 @@ const handleClickOutside = (event) => {
 //3.跳转菜单逻辑 start ---------------------------------------->
 let gotosystem = () => {
     let url = $BwebUrl + '/#/login?userurl=' + $CwebUrl;
+    isShow.value = false
     //window.location.href = url; 
     window.open(url, '_blank');
 }
@@ -179,7 +180,7 @@ let gotosystem = () => {
 //点击退出按钮
 let exit = () => {
     window.location.href = $CwebUrl;
-
+    isShow.value = false
     isDel.value = 1
     token1.value = getToken()
 
@@ -267,43 +268,58 @@ onMounted(async () => {
     //从客户端获取登录状态
     //从客户端阶段开始 持续查询登录状态
     let getLoginStatus = async () => {
+        //获得token
+        const token = getToken();
         const { $webUrl, $CwebUrl } = useNuxtApp();
-        const queryParams = new URLSearchParams({
-            token: getToken()
-        });
-        let url = `${$webUrl}/api/loginStatus?${queryParams.toString()}`
-
-        const responseStatus = await fetch(url, {
-            method: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-                'Userurl': $CwebUrl,
-                //'token': getToken(),
-                'Origin': $CwebUrl
-            }
-        });
-        const result = await responseStatus.json();
-        console.log(result)
-        if (result.code == 200) {
-            if (result.data.isLogin == true) {
-                console.log("用户已经登录!");
-                showToken.value = true;
 
+        if (token == undefined) {
+            //如果没有获取到token 不访问后端获取在线状态
+            console.log("没有获取到token!无需查询登录状态!")
+            showToken.value = false;
+
+        } else {
+            //如果获取到了token 访问后端查询状态
+            console.log("已获取到用户token,开始查询登录状态!")
+            const queryParams = new URLSearchParams({
+                token: getToken()
+            });
+            let url = `${$webUrl}/api/loginStatus?${queryParams.toString()}`
+            const responseStatus = await fetch(url, {
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Userurl': $CwebUrl,
+                    //'token': getToken(),
+                    'Origin': $CwebUrl
+                }
+            });
+            const result = await responseStatus.json();
+            console.log(result)
+            if (result.code == 200) {
+                if (result.data.isLogin == true) {
+                    console.log("用户已经登录!");
+                    showToken.value = true;
+
+                } else {
+                    console.log("用户已退出登录!");
+                    showToken.value = false;
+                    //退出登录
+                    isShow.value = false;
+                    removeToken();
+                    removeTicket();
+                    ElMessage.error('您已退出登录!')
+                }
             } else {
-                console.log("用户未登录!");
-                showToken.value = false;
+                console.log("用户已退出登录!");
                 //退出登录
                 isShow.value = false;
+                showToken.value = false;
                 removeToken();
                 removeTicket();
+                ElMessage.error('您没有权限登录该网站!')
+                //跳转到首页
+                //window.location.href = $CwebUrl;
             }
-        } else {
-            console.log("用户已退出登录!");
-            //退出登录
-            isShow.value = false;
-            showToken.value = false;
-            removeToken();
-            removeTicket();
         }
     }
     getLoginStatus();
@@ -412,7 +428,8 @@ header {
 
 .headerNav .left span {
     margin-right: 20px;
-    a{
+
+    a {
         color: #666666;
     }
 }

+ 11 - 11
components/home/pageNavigation.vue

@@ -77,17 +77,17 @@
 //1.加载依赖 end ---------------------------------------->
 
 //2.页面公用方法 start ---------------------------------------->
-const getLinkPath = (item) => {
-    if (item.is_url == 1) {
-        return `${item.web_url}`;
-    } else if (item.children_count == 0) {
-        //return `/newsList/${item.category_id}?page=1`;
-        return `/${item.aLIas_pinyin}/list-1.html`;
-    } else {
-        //return `/primaryNavigation/${item.aLIas_pinyin}/`;
-        return `/${item.aLIas_pinyin}/index.html`;
-    }
-}
+// const getLinkPath = (item) => {
+//     if (item.is_url == 1) {
+//         return `${item.web_url}`;
+//     } else if (item.children_count == 0) {
+//         //return `/newsList/${item.category_id}?page=1`;
+//         return `/${item.aLIas_pinyin}/list-1.html`;
+//     } else {
+//         //return `/primaryNavigation/${item.aLIas_pinyin}/`;
+//         return `/${item.aLIas_pinyin}/index.html`;
+//     }
+// }
 //搜索跳转
 //点击搜索按钮
 let goSearch = () => {

+ 60 - 13
composables/publicFunction.ts

@@ -1,46 +1,93 @@
-//1.格式化日期
+//1.格式化日期 start ---------------------------------------->
 //time 日期字符串 type 从什么时候开始返回 year = 返回年月日 month = 返回月日..
 //style 样式,比如 年-月-日 年.月.日
-const getTime = function(time:string,type:string,style:Number){
+const getTime = function (time: string, type: string, style: Number) {
   const date = new Date(time);
   const year = date.getFullYear();
   const month = date.getMonth() + 1;
   const day = date.getDate();
 
   //返回 年-月-日
-  if(type == 'year'&& style == 1){
+  if (type == 'year' && style == 1) {
     return `${year}-${month}-${day}`;
   }
   //返回 年-月
-  if(type == 'year'&& style == 2){
+  if (type == 'year' && style == 2) {
     return `${year}-${month}`;
   }
   //返回 年
-  if(type == 'year'&& style == 3){
+  if (type == 'year' && style == 3) {
     return `${year}`;
   }
   //返回 月-日
-  if(type == 'month'&& style == 1){
+  if (type == 'month' && style == 1) {
     return `${month}-${day}`;
   }
   //返回 月.日
-  if(type == 'month'&& style == 2){
+  if (type == 'month' && style == 2) {
     return `${month}.${day}`;
   }
   //返回 日
-  if(type == 'day'&& style == 1){
+  if (type == 'day' && style == 1) {
     return `${day}`;
   }
 }
+//1.格式化日期 end ---------------------------------------->
 
-//2.格式化标题长度
+//2.格式化标题长度 start ---------------------------------------->
 //title 标题 length 长度
-const getTitleLength = function(title:string,length:number){
-  if(title.length >= length){
+const getTitleLength = function (title: string, length: number) {
+  if (title.length >= length) {
     return title.substring(0, length) + "...";
-  }else{
+  } else {
     return title;
   }
 }
+//2.格式化标题长度 start ---------------------------------------->
 
-export { getTime,getTitleLength };
+//3.格式化跳转路径 start ---------------------------------------->
+//3.1跳转到频道页面或者一级列表页
+const getLinkPath = (item: any) => {
+    if(item.is_url==1){
+        return `${item.web_url}`;
+    }else if(item.children_count == 0){
+        //return `/newsList/${item.category_id}?page=1`;
+        return `/${item.aLIas_pinyin}/list-1.html`;
+    }else{
+        //return `/primaryNavigation/${item.aLIas_pinyin}/`;
+        return `/${item.aLIas_pinyin}/index.html`;
+    }
+}
+//3.2跳转到详情页
+const getLinkPathDetail = (item: any) => {
+  if (item.islink == 1) {
+    return `${item.linkurl}`;
+  } else {
+    return `/${item.pinyin}/${item.id}.html`;
+  }
+}
+//3.格式化跳转路径 end ---------------------------------------->
+
+
+//4.获得路由路径 start ---------------------------------------->
+const getRoutePath = (type: Number) => {
+  const route = useRoute();
+  //获得当前的完整路径
+  const fullPath = route.path;
+  //拆分,取出来中间这一段,然后提取数字部分
+  const segments = fullPath.split('/');
+  const targetSegmentOne = segments[1];
+  const targetSegmentTwo = segments[2];
+
+  if (type == 1) {
+    return targetSegmentOne;
+  }
+  if (type == 2) {
+    return targetSegmentTwo;
+  }
+}
+
+
+
+//4.获得路由路径 end ---------------------------------------->
+export { getTime, getTitleLength, getLinkPath, getLinkPathDetail, getRoutePath };

+ 7 - 27
pages/[dir]/index.html.vue

@@ -314,7 +314,7 @@
                             <em></em>
                         </h2>
                         <div class="rightMore">
-                            <NuxtLink to="#">更多》</NuxtLink>
+                            <!-- <NuxtLink to="#">更多》</NuxtLink> -->
                         </div>
                     </div>
                     <ul class="part3_right_content_top" v-if="pageData[7].data1.length > 0">
@@ -376,26 +376,6 @@
 <script setup>
 //0.加载页面依赖 start ---------------------------------------->
 import { ref, onMounted } from 'vue';
-
-//格式化跳转路径 - 标题
-//首页分类栏目标题,不需要考虑外链
-const getLinkPath = (item) => {
-    // console.log('item111333',item)
-    // return `/${item.url}/1.html`;
-    // return `/newsList/${item.cid}?page=1`;
-    return `/${item.aLIas_pinyin}/list-1.html`;
-}
-//首页跳转到详情,这里需要考虑外链
-const getLinkPathDetail = (item) => {
-    // console.log('item111222', item)
-    if (item.islink == 1) {
-        return `${item.linkurl}`;
-    } else {
-        //return `/${item.aLIas_pinyin}/${item.id}`;
-        // return `/newsDetail/${item.id}?page=1`
-        return `/${item.pinyin}/${item.id}.html`;
-    }
-}
 //0.加载页面依赖 end ---------------------------------------->
 
 //1.获得路由id start ---------------------------------------->
@@ -705,16 +685,16 @@ async function getPageAllData(jsonString) {
         }
         pageData.value[6].data2 = mkdata.data[6].child.textnum;
         //模块8高端资讯
-        pageData.value[7].data2 = mkdata.data[7].child.imgnum;
-        for (let i in mkdata.data[4].child.textnum) {
+        pageData.value[7].data = mkdata.data[7].child.imgnum;
+        for (let i in mkdata.data[7].child.textnum) {
             if (i < 7) {
-                pageData.value[7].data1.push(mkdata.data[4].child.textnum[i]);
+                pageData.value[7].data1.push(mkdata.data[7].child.textnum[i]);
             } else if (i < 9) {
-                pageData.value[7].data2.push(mkdata.data[4].child.textnum[i]);
+                pageData.value[7].data2.push(mkdata.data[7].child.textnum[i]);
             } else if (i < 11) {
-                pageData.value[7].data3.push(mkdata.data[4].child.textnum[i]);
+                pageData.value[7].data3.push(mkdata.data[7].child.textnum[i]);
             } else {
-                pageData.value[7].data4.push(mkdata.data[4].child.textnum[i]);
+                pageData.value[7].data4.push(mkdata.data[7].child.textnum[i]);
             }
         }