Merge branch 'hotfix/zhangleyuan/20210619/storeuserId' into 'master'

Hotfix/zhangleyuan/20210619/storeuser

See merge request !50

src/common/js/axios.ts

 /*
  * @Author: 吴文洁
  * @Date: 2020-08-31 09:34:31
- * @LastEditors: wufan
- * @LastEditTime: 2021-05-27 10:42:12
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-06-24 19:34:21
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
@@ -84,7 +84,7 @@ class Axios {
       })
 
       instance.interceptors.response.use((response: AxiosResponse): AxiosResponse | AxiosPromise => {
-        const { message: ResMessage, success, resultMsg, resultCode } = response.data;
+        const { message: ResMessage, success, resultMsg, resultCode,code} = response.data;
         if (success || resultCode === 0) {
           return response;
         } else if (!options.reject) {

src/common/js/user.ts

@@ -2,21 +2,26 @@
  * @Author: 吴文洁
  * @Date: 2020-08-31 09:34:25
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-12 17:27:08
+ * @LastEditTime: 2021-06-23 16:08:50
  * @Description:
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
 
 import Storage from './storage';
 import { PREFIX, USER_PREFIX } from '@/domains/basic-domain/constants';
-
+declare var window:any;
 class User {
-  getStoreId() {
-    return Storage.get(`${PREFIX}_storeId`);
+  
+  getVersion() {
+    return Storage.getObj(`${PREFIX}_version`)
+  }
+
+  getStoreId(){
+    return  window.currentStoreUserInfo.storeId || Storage.get(`${PREFIX}_storeId`)
   }
 
   getEnterpriseId() {
-    return Storage.get(`${PREFIX}_enterpriseId`);
+    return window.currentStoreUserInfo.enterpriseId || Storage.get(`${PREFIX}_enterpriseId`);
   }
 
   getStoreName() {
@@ -28,21 +33,23 @@ class User {
   }
 
   getStoreUserId() {
-    return Storage.get(`${PREFIX}_storeUserId`);
+    return window.currentStoreUserInfo.storeUserId || Storage.get(`${PREFIX}_storeUserId`);
   }
 
   getCustomerId() {
     return Storage.get(`${PREFIX}_customerId`);
   }
+  
   getUserId() {
-    return Storage.get(`${PREFIX}_userId`);
+    return window.currentStoreUserInfo.userId || Storage.get(`${PREFIX}_userId`);
   }
+
   getUserRole() {
     return Storage.get(`${PREFIX}_userRole`);
   }
 
   getToken() {
-    return Storage.get(`${PREFIX}_token`);
+    return window.currentStoreUserInfo.token || Storage.get(`${PREFIX}_token`);
   }
 
   getIsAdmin() {

src/index.tsx

 /*
  * @Author: 吴文洁
  * @Date: 2020-04-27 20:35:34
- * @LastEditors: wufan
- * @LastEditTime: 2021-03-26 16:14:09
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-06-23 14:14:20
  * @Description:
  */
 
@@ -23,8 +23,8 @@ import User from '@/common/js/user';
 import Service from "@/common/js/service";
 
 declare var getParameterByName: any;
-
-
+declare var window: any;
+window.currentStoreUserInfo = {}
 const history = createHashHistory();
 
 window.RCHistory = _.extend({}, history, {
@@ -65,6 +65,10 @@ if (getParameterByName('code') && isWeiXin()) {
     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;
     mount()
   })
 } else {

src/modules/root/App.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2019-07-10 10:30:49
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-24 16:29:05
+ * @LastEditTime: 2021-06-22 17:47:02
  * @Description:
  */
 import React, { useContext, useEffect, useState } from 'react';
@@ -62,11 +62,13 @@ const App: React.FC = (props: any) => {
   }
   
   function getStoreInfo() {
+    console.log("currentStoreUserInfo",window.currentStoreUserInfo);
     const params = {
       storeId: User.getStoreId(),
       userId: User.getUserId(),
     };
     Service.Hades('public/customerHades/getStoreAndUserMsg', params).then((res) => {
+      if(res.success){
         const { id, storeUserId, storeName, userRole, storeType } = res.result;
         User.setStoreId(id);
         User.setStoreUserId(storeUserId);
@@ -74,11 +76,21 @@ const App: React.FC = (props: any) => {
         Bus.trigger('storeNameChange',storeName);
         User.setUserRole(userRole);
         User.setStoreType(storeType);
-      setStoreUserId(storeUserId)
+        setCurrentStoreUserInfo(id,storeUserId)
+        setStoreUserId(storeUserId);
         getUserPermission();
+      }
     })
   }
   
+  function setCurrentStoreUserInfo(storeId:any,storeUserId:any){
+    window.currentStoreUserInfo.storeId = storeId;
+    window.currentStoreUserInfo.storeUserId = storeUserId;
+    window.currentStoreUserInfo.userId = User.getUserId();
+    window.currentStoreUserInfo.token = User.getToken();
+    window.currentStoreUserInfo.enterpriseId = User.getEnterpriseId();
+  }
+
   function getStoreGroupAndStoreList() {
 
     BaseService.getUserStore({ userId }).then((res) => {
@@ -97,6 +109,7 @@ const App: React.FC = (props: any) => {
       Bus.trigger('storeNameChange', storeName);
       User.setUserRole(userRole);
       User.setStoreType(storeType);
+      setCurrentStoreUserInfo(id,storeUserId);
       ctx.dispatch(setStoreGroupList(storeGroupVOS))
       ctx.dispatch(setStoreList(storeVOS));
       setStoreUserId(storeUserId)

src/modules/root/CollegeManagePage.jsx

@@ -179,6 +179,9 @@ export default class CollegeManagePage extends React.Component {
                       return null;
                     };
                     User.setStoreId(item.id);
+                    User.setStoreUserId(item.storeUserId);
+                    window.currentStoreUserInfo.storeId = item.id;
+                    window.currentStoreUserInfo.storeUserId = item.storeUserId;
                     window.RCHistory.push('/home')
                   }}
                 >
@@ -196,6 +199,9 @@ export default class CollegeManagePage extends React.Component {
                           e.preventDefault();
                           e.stopPropagation();
                           User.setStoreId(item.id);
+                          User.setStoreUserId(item.storeUserId);
+                          window.currentStoreUserInfo.storeId = item.id;
+                          window.currentStoreUserInfo.storeUserId = item.storeUserId;
                           window.RCHistory.push('/college-info')
                         }}
                       >编辑</span>
@@ -250,6 +256,9 @@ export default class CollegeManagePage extends React.Component {
                       return null;
                     };
                     User.setStoreId(item.id);
+                    User.setStoreUserId(item.storeUserId);
+                    window.currentStoreUserInfo.storeId = item.id;
+                    window.currentStoreUserInfo.storeUserId = item.storeUserId;
                     window.RCHistory.push('/home')
                   }}
                 >
@@ -267,6 +276,9 @@ export default class CollegeManagePage extends React.Component {
                           e.preventDefault();
                           e.stopPropagation();
                           User.setStoreId(item.id);
+                          User.setStoreUserId(item.storeUserId);
+                          window.currentStoreUserInfo.storeId = item.id;
+                          window.currentStoreUserInfo.storeUserId = item.storeUserId;
                           window.RCHistory.push('/college-info')
                         }}
                       >编辑</span>

src/modules/root/CreateCollege.jsx

@@ -10,6 +10,7 @@ import './CreateCollege.less';
 let cutFlag = false;
 
 export default class CreateCollege extends React.Component {
+  
   constructor(props) {
     super(props);
     this.state = {
@@ -18,6 +19,7 @@ export default class CreateCollege extends React.Component {
       name: '',
       enterpriseId: User.getEnterpriseId(),
     };
+    this.loginInputRef = React.createRef()
   }
 
   componentDidMount() {
@@ -200,11 +202,11 @@ export default class CreateCollege extends React.Component {
         </div>
         <div className="create-box">
           <div className="image-box">
-            <img className="image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png"/>
+            <img className="image" src={logo}/>
             <div className="image-mask">
               <span
                 className="icon iconfont"
-                onClick={() => this.refs.logoInput.click()}
+                onClick={() => this.loginInputRef.current.click()}
               >&#xe6f5;</span>
               <span
                 className="icon iconfont"
@@ -241,7 +243,7 @@ export default class CreateCollege extends React.Component {
           type="file"
           accept="image/*"
           value={""}
-          ref="logoInput"
+          ref={this.loginInputRef}
           style={{ display: "none" }}
           onChange={this.handleSelectCover}
         />

src/modules/root/Header.jsx

 /*
  * @Author: 吴文洁
  * @Date: 2019-09-10 18:26:03
- * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-06-22 15:00:53
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-06-24 19:28:14
  * @Description:
  */
 import React, { useRef, useContext, useEffect, useState } from 'react';
@@ -271,6 +271,14 @@ function Header(props) {
                     onChange={(e) => {
                       setStoreId(e.target.value);
                       User.setStoreId(e.target.value);
+                      list.map((item)=>{
+                        if(item.id === e.target.value){
+                          User.setStoreUserId(item.storeUserId);
+                        }
+                      })
+                      User.setUserId(User.getUserId());
+                      User.setToken(User.getToken());
+                      User.setEnterpriseId(User.getEnterpriseId())
                       window.RCHistory.push('/home');
                       window.location.reload();
                     }}

src/modules/root/Login.jsx

@@ -59,10 +59,14 @@ function Login(props) {
       userId,
     };
     BaseService.getWXWorkLoginNoCheck(params).then((res) => {
-      User.setUserId(res.result.loginInfo.userId);
-      User.setToken(res.result.loginInfo.xmToken);
-      User.setEnterpriseId(res.result.enterpriseId);
-      User.setIdentifier(res.result.identifier);
+      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`,
       });

src/modules/root/WechatLogin.tsx

@@ -6,6 +6,7 @@ import { PATH } from '@/domains/basic-domain/constants';
 import './WechatLogin.less';
 const Logo = require('@/common/images/logo.png');
 declare var location: any;
+declare var window: any;
 
 export default function WechatLogin(props: any) {
   const freshTime = 60;
@@ -72,6 +73,10 @@ export default function WechatLogin(props: any) {
           User.setToken(_res.result.loginInfo.xmToken);
           User.setEnterpriseId(_res.result.enterpriseId);
           User.setIdentifier(_res.result.identifier);
+          window.currentStoreUserInfo = {}
+          window.currentStoreUserInfo.userId = _res.result.loginInfo.userId;
+          window.currentStoreUserInfo.token = _res.result.loginInfo.xmToken;
+          window.currentStoreUserInfo.enterpriseId = _res.result.enterpriseId;
           window.RCHistory.push({
             pathname: `/switch-route`,
           });