feat:解决C端跳转过来闪退到登录页和先进入登录页后进入学院列表的问题

src/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-04-27 20:35:34
  * @Date: 2020-04-27 20:35:34
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-23 14:14:20
+ * @LastEditTime: 2021-06-28 16:15:59
  * @Description:
  * @Description:
  */
  */
 
 
@@ -21,6 +21,7 @@ import '@/core/function';
 import '@/core/xmTD';
 import '@/core/xmTD';
 import User from '@/common/js/user';
 import User from '@/common/js/user';
 import Service from "@/common/js/service";
 import Service from "@/common/js/service";
+import BaseService from '@/domains/basic-domain/baseService';
 
 
 declare var getParameterByName: any;
 declare var getParameterByName: any;
 declare var window: any;
 declare var window: any;
@@ -71,7 +72,27 @@ if (getParameterByName('code') && isWeiXin()) {
     window.currentStoreUserInfo.enterpriseId = res.result.enterpriseId;
     window.currentStoreUserInfo.enterpriseId = res.result.enterpriseId;
     mount()
     mount()
   })
   })
-} else {
+} else if(getParameterByName('from') === 'customer' && getParameterByName('enterpriseId') && getParameterByName('userId')){
+  User.setCustomerStoreId(getParameterByName('storeId'));
+  getWXWorkLoginNoCheck(getParameterByName('enterpriseId'),getParameterByName('userId'));  //从C端跳转过来的学院自动执行免登录
+}else{
   mount()
   mount()
 }
 }
-
+function getWXWorkLoginNoCheck(enterpriseId:string,userId:string) {
+  const params = {
+    appTermEnum: 'XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN',
+    enterpriseId,
+    userId,
+  };
+  BaseService.getWXWorkLoginNoCheck(params).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)
+    mount();
+  });
+}

src/modules/root/Login.jsx

@@ -31,26 +31,29 @@ function Login(props) {
    */
    */
 
 
   useEffect(() => {
   useEffect(() => {
-    const enterpriseId = getParameterByName('enterpriseId');
-    const userId = getParameterByName('userId');
-    const from = getParameterByName('from');
-    const storeId = getParameterByName('storeId');
-    if (storeId) {
-      User.setCustomerStoreId(storeId);
-    }
-    if (from === 'customer' && enterpriseId && userId) {
-      if (!user.getToken() || enterpriseId !== user.getEnterpriseId() || userId !== User.getUserId()) {
-        getWXWorkLoginNoCheck(enterpriseId, userId);
-      } else {
-        window.RCHistory.push({
-          pathname: `/switch-route`,
-        });
-      }
-    } else {
-      User.removeUserId();
-      User.removeToken();
-      User.removeEnterpriseId();
-    }
+    // const enterpriseId = getParameterByName('enterpriseId');
+    // const userId = getParameterByName('userId');
+    // const from = getParameterByName('from');
+    // const storeId = getParameterByName('storeId');
+    // if (storeId) {
+    //   User.setCustomerStoreId(storeId);
+    // }
+    // if (from === 'customer' && enterpriseId && userId) {
+    //   if (!user.getToken() || enterpriseId !== user.getEnterpriseId() || userId !== User.getUserId()) {
+    //     getWXWorkLoginNoCheck(enterpriseId, userId);
+    //   } else {
+    //     window.RCHistory.push({
+    //       pathname: `/switch-route`,
+    //     });
+    //   }
+    // } else {
+    //   User.removeUserId();
+    //   User.removeToken();
+    //   User.removeEnterpriseId();
+    // }
+    User.removeUserId();
+    User.removeToken();
+    User.removeEnterpriseId();
   }, []);
   }, []);
   function getWXWorkLoginNoCheck(enterpriseId, userId) {
   function getWXWorkLoginNoCheck(enterpriseId, userId) {
     const params = {
     const params = {