修改bug

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"a60e4b73-f896-4456-b961-bd493e50812a","timestamp":1745474524187}
+{"id":"7f37843a-8760-4134-96a7-e58be7e2f7dc","timestamp":1745731978130}

.nuxt/manifest/meta/7f37843a-8760-4134-96a7-e58be7e2f7dc.json

@@ -0,0 +1 @@
+{"id":"7f37843a-8760-4134-96a7-e58be7e2f7dc","timestamp":1745731978130,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/a60e4b73-f896-4456-b961-bd493e50812a.json

@@ -1 +0,0 @@
-{"id":"a60e4b73-f896-4456-b961-bd493e50812a","timestamp":1745474524187,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/a60e4b73-f896-4456-b961-bd493e50812a.json"
+        "./manifest/meta/7f37843a-8760-4134-96a7-e58be7e2f7dc.json"
       ],
       "#components": [
         "./components"

assets/css/about.less

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

components/home/pageHead.vue

@@ -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,51 @@ 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) {
+        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) {
                 console.log("用户已经登录！");
                 showToken.value = true;
-
-            } else {
-                console.log("用户未登录！");
+            }
+            if (result.code == -1) {
+                isShow.value = false;
                 showToken.value = false;
-                //退出登录
+                removeToken();
+                removeTicket();
+                ElMessage.error('您没有权限登录该网站！')
+            }
+            if (result.code == -2) {
                 isShow.value = false;
+                showToken.value = false;
                 removeToken();
                 removeTicket();
+                ElMessage.error('您已退出登录！')
             }
-        } else {
-            console.log("用户已退出登录！");
-            //退出登录
-            isShow.value = false;
-            showToken.value = false;
-            removeToken();
-            removeTicket();
         }
     }
     getLoginStatus();

composables/publicFunction.ts

@@ -1,34 +1,34 @@
 //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}`;
   }
 }
@@ -36,10 +36,10 @@ const getTime = function(time:string,type:string,style:Number){
 
 //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;
   }
 }
@@ -47,26 +47,30 @@ const getTitleLength = function(title:string,length:number){
 
 //3.格式化跳转路径 start ---------------------------------------->
 //3.1跳转到频道页面或者一级列表页
-const getLinkPath = (item:any) => {
-  if (item.children_count == 0) {
-      return `/${item.aLIas_pinyin}/list-1.html`;
-  } else {
-      return `/${item.aLIas_pinyin}/index.html`;
-  }
+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) => {
+const getLinkPathDetail = (item: any) => {
   if (item.islink == 1) {
-      return `${item.linkurl}`;
+    return `${item.linkurl}`;
   } else {
-      return `/${item.pinyin}/${item.id}.html`;
+    return `/${item.pinyin}/${item.id}.html`;
   }
 }
 //3.格式化跳转路径 end ---------------------------------------->
 
 
 //4.获得路由路径 start ---------------------------------------->
-const getRoutePath = (type:Number) => {
+const getRoutePath = (type: Number) => {
   const route = useRoute();
   //获得当前的完整路径
   const fullPath = route.path;
@@ -75,10 +79,10 @@ const getRoutePath = (type:Number) => {
   const targetSegmentOne = segments[1];
   const targetSegmentTwo = segments[2];
 
-  if(type == 1){
+  if (type == 1) {
     return targetSegmentOne;
   }
-  if(type == 2){
+  if (type == 2) {
     return targetSegmentTwo;
   }
 }
@@ -86,4 +90,4 @@ const getRoutePath = (type:Number) => {
 
 
 //4.获得路由路径 end ---------------------------------------->
-export { getTime,getTitleLength,getLinkPath,getLinkPathDetail,getRoutePath};
+export { getTime, getTitleLength, getLinkPath, getLinkPathDetail, getRoutePath };