部分优化

src/views/Administrator.vue

@@ -118,6 +118,7 @@ export default defineComponent({
 		};
 		let handleClick = (event:any) => {
             // state.selectedKeys = [Number(event.key)]
+			console.log(event.item)
             state.nowPageName = event.item.name
             router.push({path:event.item.route})
         }

src/views/HomeMain.vue

@@ -346,9 +346,9 @@ export default defineComponent({
 			for (const key in opTypeList) {
 				const element = opTypeList[key];
 				homeMainData.openTypeList[key].label = element.label
-				if(element?.length > 0){
-					element.forEach((item,index)=>{
-						homeMainData.openTypeList[key][index].label = item.label
+				if(element.list?.length > 0){
+					element.list.forEach((item,index)=>{
+						homeMainData.openTypeList[key].list[index].label = item.label
 					})
 				}
 			}
@@ -534,7 +534,8 @@ export default defineComponent({
 			})
 		})
 		onBeforeUnmount(()=>{
-			MyWs.close()
+			let imgParent = document.querySelector('.homeMain_max .detail .material_content_list_loding .historyPage_loading')
+			if(Observer?.unobserve)Observer.unobserve(imgParent);
 		})
 		const setOpenType = (type,list)=>{
 			if(homeMainData.openType == type){
@@ -594,6 +595,9 @@ export default defineComponent({
 			// router.push(`/home?history=${childItem.id}`)
 		}
 		const settingGetHistory = ()=>{
+			if(homeMainData.historyData.page == 1){
+				return
+			}
 			homeMainData.historyData.page = 1
 			// homeMainData.openTypeList.history = {
 			// 	icon:"fi-br-time-past",
@@ -947,17 +951,18 @@ export default defineComponent({
 			let url = 'https://aida-user-manual-chinese.super.site/'
 			if(this.locale == 'ENGLISH'){
 				url = 'https://code-create.com.hk/wp-content/uploads/2025/02/aida_3.0-Manual-2_5-EN.pdf'
-				showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2025/02/AiDA-demo-video_2_5_EN.mp4'})
+				showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mp4'})
 			}else{
-				showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2025/02/AiDA-demo-video_2_5_CN.mp4'})
+				showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mp4'})
 			}
-			//打开视频
-			const a = document.createElement('a');
-			a.href = url;
-			a.target = '_blank';
-			// a.download = 'aida_3.0-Manual.pptx'; // 下载的文件名
-			document.body.appendChild(a);
-			a.click();
+			this.toUserManual()
+			// //打开视频
+			// const a = document.createElement('a');
+			// a.href = url;
+			// a.target = '_blank';
+			// // a.download = 'aida_3.0-Manual.pptx'; // 下载的文件名
+			// document.body.appendChild(a);
+			// a.click();
 		},
         //登出
         async logout() {

src/views/Login.vue

@@ -62,6 +62,7 @@ import {
   createVNode,
   toRefs,
   reactive,
+  onMounted
 } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { Https } from "@/tool/https";
@@ -75,6 +76,7 @@ import personal from "@/component/LoginPage/login/personal.vue";
 import { useRoute,useRouter } from 'vue-router';
 import school from "@/component/LoginPage/login/school.vue";
 import enterprise from "@/component/LoginPage/login/enterprise.vue";
+import { setCookie, WriteCookie } from "@/tool/cookie";
 export default defineComponent({
   components: {
     Works,
@@ -87,6 +89,7 @@ export default defineComponent({
   setup(props, { emit }) {
     const store = useStore();
 	const router = useRouter()
+	const route = useRoute()
     const loginData = reactive({
       loginType: "",
       isMask: true,
@@ -109,6 +112,67 @@ export default defineComponent({
 	const toBack = ()=>{
 		router.push('/Square')
 	}
+	const setSuccessLogin = (rv: any)=>{
+      if (rv) {
+        if (rv.systemUser == 4) {
+          rv.systemUser = 1;
+        }
+        let isTest = rv.systemUser == 3 ? true : false;
+        let isBeginner = rv?.isBeginner == 1 ? true : false;
+        let token = rv.token;
+        setCookie("isMurmur", false);
+        setCookie("token", token);
+        setCookie("isTest", isTest);
+        setCookie("isBeginner", isBeginner);
+        setCookie("isBeginnerNum", 0); //从第一步开始，机器人开始的话就是从第二部开始
+        setCookie("userInfo", JSON.stringify(rv));
+        let userid: any = {
+          ueserId: rv.userId,
+          systemUser: rv.systemUser,
+        };
+        if (rv.email) userid.email = rv.email;
+        	store.commit("upUserDetail", userid);
+        if (window.innerWidth < 768) {
+          message.info(
+            "If you need to design, please log in using an iPad or computer."
+          );
+          	turnToHomePage("/Square");
+        } else {
+          	turnToHomePage("/home");
+        }
+        sessionStorage.setItem("isTimeOne", JSON.stringify(false)); //是否需要公告 提示 弹窗
+        let randomNum: any =
+          Math.floor(Math.random() * 9000000000000000) + 1000000000000000;
+        sessionStorage.setItem("sessionId", randomNum);
+        sessionStorage.setItem("record", JSON.stringify([]));
+      }
+    }
+	const turnToHomePage = (str: any)=>{
+      store.commit("clearAllData");
+      store.commit("clearAllCollection");
+      store.commit("setAllBoardDataChoose", {});
+      store.commit("clearShowSketchboard", {});
+      router.push(str);
+    }
+	const wechatLogin =(value: any)=>{
+      let data = {
+        code: value.code,
+        type: 2,
+      };
+      Https.axiosGet(Https.httpUrls.parseWeChatCode, { params: data })
+        .then((rv: any) => {
+          setSuccessLogin(rv);
+        })
+        .catch((res) => {
+        });
+    }
+	onMounted(()=>{
+		const data = route.query;
+		console.log(data)
+		if (data?.state == "weiXin") {
+			wechatLogin(data);
+		}
+	}) 
     return {
       ...toRefs(dataDom),
       ...toRefs(loginData),