Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc

051f99bd · maolipeng · 2a8d9352 · bab73254 · 051f99bd · 051f99bd
Commit 051f99bd authored Jun 24, 2021 by maolipeng
8 changed files
--- a/src/common/js/axios.ts
+++ b/src/common/js/axios.ts
 /*
 * @Author: 吴文洁
 * @Date: 2020-08-31 09:34:31
- * @LastEditors: wufan
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-27 10:42:12
+ * @LastEditTime: 2021-06-21 17:21:17
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -84,10 +84,14 @@ 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) {
+          // if(code === "NONE_STORE_USER"){
+          //   window.RCHistory.replace('/login');
+          //   return Promise.reject();
+          // }
          message.error(ResMessage || resultMsg);
        }
        return Promise.reject(response.data);
@@ -106,6 +110,7 @@ class Axios {
          break;
          default:
            message.error(error.message);
+            console.log('222');
          break;
        }
        return Promise.reject(error.message);

--- a/src/common/js/user.ts
+++ b/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() {

--- a/src/index.tsx
+++ b/src/index.tsx
 /*
 * @Author: 吴文洁
 * @Date: 2020-04-27 20:35:34
- * @LastEditors: wufan
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-03-26 16:14:09
+ * @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 {

--- a/src/modules/root/App.tsx
+++ b/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';
@@ -31,7 +31,7 @@ const App: React.FC = (props: any) => {
  const [menuType, setMenuType] = useState(true);
  const enterpriseId = User.getEnterpriseId();
  window.ctx = ctx;
  useEffect(() => {
    getStoreAndUserInfo();
@@ -62,24 +62,36 @@ const App: React.FC = (props: any) => {
  async function getStoreAndUserInfo() {
    await (enterpriseId ? getStoreInfo() : getStoreGroupAndStoreList());
  }
  function getStoreInfo() {
+    console.log("currentStoreUserInfo",window.currentStoreUserInfo);
    const params = {
      storeId: User.getStoreId(),
      userId: User.getUserId(),
    };
    Service.Hades('public/customerHades/getStoreAndUserMsg', params).then((res) => {
-      const { id, storeUserId, storeName, userRole, storeType } = res.result;
+      if(res.success){
-      User.setStoreId(id);
+        const { id, storeUserId, storeName, userRole, storeType } = res.result;
-      User.setStoreUserId(storeUserId);
+        User.setStoreId(id);
-      User.setStoreName(storeName);
+        User.setStoreUserId(storeUserId);
-      Bus.trigger('storeNameChange',storeName);
+        User.setStoreName(storeName);
-      User.setUserRole(userRole);
+        Bus.trigger('storeNameChange',storeName);
-      User.setStoreType(storeType);
+        User.setUserRole(userRole);
-      setStoreUserId(storeUserId)
+        User.setStoreType(storeType);
-      getUserPermission();
+        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() {
@@ -99,6 +111,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)

--- a/src/modules/root/CollegeManagePage.jsx
+++ b/src/modules/root/CollegeManagePage.jsx
@@ -180,6 +180,8 @@ export default class CollegeManagePage extends React.Component {
                    };
                    User.setStoreId(item.id);
                    User.setStoreUserId(item.storeUserId);
+                    window.currentStoreUserInfo.storeId = item.id;
+                    window.currentStoreUserInfo.storeUserId = item.storeUserId;
                    window.RCHistory.push('/home')
                  }}
                >
@@ -198,6 +200,8 @@ export default class CollegeManagePage extends React.Component {
                          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>
@@ -253,6 +257,8 @@ export default class CollegeManagePage extends React.Component {
                    };
                    User.setStoreId(item.id);
                    User.setStoreUserId(item.storeUserId);
+                    window.currentStoreUserInfo.storeId = item.id;
+                    window.currentStoreUserInfo.storeUserId = item.storeUserId;
                    window.RCHistory.push('/home')
                  }}
                >
@@ -271,6 +277,8 @@ export default class CollegeManagePage extends React.Component {
                          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>

--- a/src/modules/root/Header.jsx
+++ b/src/modules/root/Header.jsx
 /*
 * @Author: 吴文洁
 * @Date: 2019-09-10 18:26:03
- * @LastEditors: fusanqiasng
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-22 15:00:53
+ * @LastEditTime: 2021-06-24 09:52:03
 * @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();
                    }}

--- a/src/modules/root/Login.jsx
+++ b/src/modules/root/Login.jsx
@@ -51,10 +51,14 @@ function Login(props) {
      userId,
    };
    BaseService.getWXWorkLoginNoCheck(params).then((res) => {
-      User.setUserId(res.result.loginInfo.userId);
+      User.setUserId(res.result.loginInfo.userId)
-      User.setToken(res.result.loginInfo.xmToken);
+      User.setToken(res.result.loginInfo.xmToken)
-      User.setEnterpriseId(res.result.enterpriseId);
+      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;
+      User.setIdentifier(res.result.identifier)
      window.RCHistory.push({
        pathname: `/switch-route`,
      });

--- a/src/modules/root/WechatLogin.tsx
+++ b/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;
@@ -75,6 +76,10 @@ export default function WechatLogin(props: 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`,