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

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-28 15:38:38
+ * @LastEditTime: 2021-06-28 16:17:53
  * @Description:
  * @Description:
  */
  */
 
 
@@ -78,22 +78,21 @@ if (getParameterByName('code') && isWeiXin()) {
 }else{
 }else{
   mount()
   mount()
 }
 }
-
-function getWXWorkLoginNoCheck(enterpriseId:string, userId:string){
+function getWXWorkLoginNoCheck(enterpriseId:string,userId:string) {
   const params = {
   const params = {
     appTermEnum: 'XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN',
     appTermEnum: 'XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN',
     enterpriseId,
     enterpriseId,
     userId,
     userId,
   };
   };
-  BaseService.getWXWorkLoginNoCheck(params).then((res) => {
-    User.setUserId(res.result.loginInfo.userId);
-    User.setToken(res.result.loginInfo.xmToken);
-    User.setEnterpriseId(res.result.enterpriseId);
-    window.currentStoreUserInfo = {};
+  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.userId = res.result.loginInfo.userId;
     window.currentStoreUserInfo.token = res.result.loginInfo.xmToken;
     window.currentStoreUserInfo.token = res.result.loginInfo.xmToken;
     window.currentStoreUserInfo.enterpriseId = res.result.enterpriseId;
     window.currentStoreUserInfo.enterpriseId = res.result.enterpriseId;
-    User.setIdentifier(res.result.identifier);
-    mount()
+    User.setIdentifier(res.result.identifier)
+    mount();
   });
   });
 }
 }

src/modules/root/Login.jsx

@@ -55,7 +55,6 @@ function Login(props) {
     User.removeUserId();
     User.removeUserId();
     User.removeToken();
     User.removeToken();
     User.removeEnterpriseId();
     User.removeEnterpriseId();
-    storage.set('expiration_tip_login', true);
   }, []);
   }, []);
   function getWXWorkLoginNoCheck(enterpriseId, userId) {
   function getWXWorkLoginNoCheck(enterpriseId, userId) {
     const params = {
     const params = {