feat:解决合并代码后的冲突

src/modules/root/WechatLogin.tsx

@@ -47,42 +47,9 @@ export default function WechatLogin(props: any) {
         timer.current = setInterval(() => {
           if (leftTimeRef.current == 0) {
             clearInterval(timer.current);
-<<<<<<< HEAD
             setStatus(1);
             return;
           }
-=======
-        }
-    }, [status])
-
-    useEffect(() => {
-        if (leftTime == 60 || !ticket) {
-            return
-        }
-
-        Service.Hades('anon/hades/getTicketState', {
-            ticket
-        }).then((res: any) => {
-            if (res.result === 'AUTH_SUCCESS') {
-                Service.Hades('anon/hades/getTicketWXWorkLogin', {
-                    ticket
-                }).then((_res: any) => {
-                    User.setUserId(_res.result.loginInfo.userId);
-                    User.setToken(_res.result.loginInfo.xmToken);
-                    User.setEnterpriseId(_res.result.enterpriseId);
-                    window.currentStoreUserInfo = {}
-                    window.currentStoreUserInfo.userId = _res.result.loginInfo.userId;
-                    window.currentStoreUserInfo.token = _res.result.loginInfo.xmToken;
-                    window.currentStoreUserInfo.enterpriseId = _res.result.enterpriseId;
-                    User.setIdentifier(_res.result.identifier)
-                    window.RCHistory.push({
-                        pathname: `/switch-route`,
-                    })
-                })
-            }
-
-        })
->>>>>>> feat:切换学院处理
 
           setLeftTime(leftTimeRef.current - 1);
         }, 1000);