Merge remote-tracking branch 'origin/StableVersion' into develop

2024-08-13 09:36:32 +08:00
parent a0c3b06b80 3eb8754e0c
commit a8ab30f30c
15 changed files with 305 additions and 131 deletions
--- a/src/views/Administrator.vue
+++ b/src/views/Administrator.vue
@@ -131,7 +131,7 @@ export default defineComponent({
 			isShow:true,
 			children:[
 				{
-					name:'Trial All User',
+					name:'All Trial User',
 					route:'/administrator/trialAllUser',
 					icon:'usetime',
 					key:'sub3-1',
@@ -215,7 +215,7 @@ export default defineComponent({
 		}],
 		openKeys: [],
 		selectedKeys: ['sub1'],
-		nowPageName:'Trial User',//当前页面名称
+		nowPageName:'All User',//当前页面名称
 		});
 		let routers:any = ref([])

--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -453,6 +453,7 @@ export default defineComponent({
 			this.store.commit('clearSystemUser')

 			// WriteCookie("token");
+			clonAllCookie()
 			// window.location.reload()
            
        },