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

src/common/js/user.ts

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-08-31 09:34:25
  * @Date: 2020-08-31 09:34:25
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-22 11:16:53
+ * @LastEditTime: 2021-06-23 16:08:50
  * @Description:
  * @Description:
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -11,8 +11,13 @@ import Storage from './storage';
 import { PREFIX, USER_PREFIX } from '@/domains/basic-domain/constants';
 import { PREFIX, USER_PREFIX } from '@/domains/basic-domain/constants';
 declare var window:any;
 declare var window:any;
 class User {
 class User {
-  getStoreId() {
-    return window.currentStoreUserInfo.storeId || Storage.get(`${PREFIX}_storeId`);
+  
+  getVersion() {
+    return Storage.getObj(`${PREFIX}_version`)
+  }
+
+  getStoreId(){
+    return  window.currentStoreUserInfo.storeId || Storage.get(`${PREFIX}_storeId`)
   }
   }
 
 
   getEnterpriseId() {
   getEnterpriseId() {

src/modules/root/Header.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2019-09-10 18:26:03
  * @Date: 2019-09-10 18:26:03
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-23 14:04:57
+ * @LastEditTime: 2021-06-23 16:11:49
  * @Description:
  * @Description:
  */
  */
 import React, { useRef, useContext, useEffect, useState } from "react";
 import React, { useRef, useContext, useEffect, useState } from "react";
@@ -276,9 +276,9 @@ function Header(props) {
                           User.setStoreUserId(item.storeUserId);
                           User.setStoreUserId(item.storeUserId);
                         }
                         }
                       })
                       })
-                      User.setUserId(window.currentStoreUserInfo.userId);
-                      User.setToken(window.currentStoreUserInfo.token);
-                      User.setEnterpriseId(window.currentStoreUserInfo.enterpriseId)
+                      User.setUserId(User.getUserId());
+                      User.setToken(User.getToken());
+                      User.setEnterpriseId(User.getEnterpriseId())
                       window.RCHistory.push('/home');
                       window.RCHistory.push('/home');
                       window.location.reload();
                       window.location.reload();
                     }}
                     }}