feat:完善各页面

src/common/js/user.ts

@@ -8,7 +8,7 @@
  */
 
 import Storage from './storage';
-import { PREFIX } from '@/domains/basic-domain/constants';
+import { PREFIX, USER_PREFIX } from '@/domains/basic-domain/constants';
 
 class User {
   
@@ -94,6 +94,17 @@ class User {
   removeEnterpriseId() {
     return Storage.remove(`${PREFIX}_enterpriseId`)
   }
+
+  clearUserInfo(){
+    Storage.remove(`${USER_PREFIX}_token_${Storage.get(`${USER_PREFIX}_storeId`)}`);
+    Storage.remove(`${USER_PREFIX}_userId_${Storage.get(`${USER_PREFIX}_storeId`)}`);
+    Storage.remove(`${USER_PREFIX}_userPhone_${Storage.get(`${USER_PREFIX}_storeId`)}`);
+    Storage.remove(`${USER_PREFIX}_bindPhone_${Storage.get(`${USER_PREFIX}_storeId`)}`);
+    Storage.remove(`${USER_PREFIX}_bindWeChat_${Storage.get(`${USER_PREFIX}_storeId`)}`);
+    Storage.remove(`${USER_PREFIX}_userName_${Storage.get(`${USER_PREFIX}_storeId`)}`);
+    Storage.remove(`${USER_PREFIX}_avatar_${Storage.get(`${USER_PREFIX}_storeId`)}`);
+    Storage.remove(`${USER_PREFIX}_customerId_${Storage.get(`${USER_PREFIX}_storeId`)}`);
+  }
 }
 
 export default new User();
\ No newline at end of file

src/domains/basic-domain/constants.ts

@@ -32,6 +32,7 @@ export const USER_TYPE: string = 'B';
 export const PROJECT = 'xmzj-web-b';
 export const VERSION = '5.4.8';
 export const PREFIX = 'cloud-class';
+export const USER_PREFIX = 'store-live';
 
 // host
 export const BASIC_HOST: string = BASIC_HOST_MAP[ENV];

src/modules/root/CollegeManagePage.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import Service from "@/common/js/service";
 import BaseService from "@/domains/basic-domain/baseService";
 import User from "@/common/js/user";
+import { LIVE_SHARE } from "@/domains/course-domain/constants";
 import moment from 'moment';
 import { Modal, message } from 'antd';
 import './CollegeManagePage.less';
@@ -49,9 +50,11 @@ export default class CollegeManagePage extends React.Component {
     };
     Service.Hades('public/customerHades/getStoreListUser', params).then((res) => {
       const list = res.result;
+      if (!User.getStoreId()) {
         const mainStore = _.find(list, item => item.mainStore) || {};
         User.setStoreId(mainStore.id);
         User.setStoreUserId(mainStore.storeUserId);
+      }
       this.setState({ list })
     });
   }
@@ -70,6 +73,17 @@ export default class CollegeManagePage extends React.Component {
     })
   }
 
+  handleLogout() {
+    BaseService.logout({}).then((res) => {
+      User.removeUserId();
+      User.removeToken();
+      User.removeEnterpriseId();
+      User.clearUserInfo();
+      const htmlUrl = `${LIVE_SHARE}store/index?id=${User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
+      window.location.href = htmlUrl;
+    });
+  }
+
   render() {
     const {
       name,
@@ -88,12 +102,20 @@ export default class CollegeManagePage extends React.Component {
               <span
                 className="logout"
                 onClick={() => {
-                  if (!User.getEnterpriseId()) {
-                    User.setEnterpriseId(list[0].id);
-                  }
-                  window.RCHistory.push('/home');
+                  Modal.confirm({
+                    title: "你确定要退出登录吗？",
+                    content: "退出后，需重新登录",
+                    icon: (
+                      <span className="icon iconfont default-confirm-icon">&#xe839; </span>
+                    ),
+                    okText: "退出登录",
+                    cancelText: "点错了",
+                    onOk: () => {
+                      this.handleLogout();
+                    },
+                  });
                 }}
-              >退出</span>
+              >退出登录</span>
             </div>
           </div>
         </div>
@@ -104,7 +126,7 @@ export default class CollegeManagePage extends React.Component {
           </div>
           <div className="title-box">
             <span className="title">企学院 ({list.length})</span>
-            <span className="text">最多可创建10个企学院，您还能创建{10 - list.length}个</span>
+            {isAdmin && <span className="text">最多可创建10个企学院，您还能创建{10 - list.length}个</span>}
           </div>
           <div className="college-list">
             {list.map((item) => (

src/modules/root/CreateCollege.jsx

@@ -4,6 +4,7 @@ import Upload from '@/core/upload';
 import Service from "@/common/js/service";
 import BaseService from "@/domains/basic-domain/baseService";
 import User from "@/common/js/user";
+import Breadcrumbs from "@/components/Breadcrumbs";
 import './CreateCollege.less';
 
 let cutFlag = false;
@@ -187,18 +188,14 @@ export default class CreateCollege extends React.Component {
         <div className="college-header">
           <div className="box">
             <img className="box-image" src="https://image.xiaomaiketang.com/xm/HNHCAF6Fc2.png" />
-            <div className="user">
-              <img className="image" src={avatar} />
-              <span className="name">{name}</span>
-              <span
-                className="logout"
-                onClick={() => {
-                  window.RCHistory.goBack();
-                }}
-              >退出</span>
-            </div>
           </div>
         </div>
+        <Breadcrumbs
+          navList="创建企学院"
+          goBack={() => {
+            window.RCHistory.goBack();
+          }}
+        />
         <div className="create-box">
           <div className="image-box">
             <img className="image" src={logo} />

src/modules/root/Header.jsx

@@ -140,9 +140,8 @@ function Header(props) {
       User.removeUserId();
       User.removeToken();
       User.removeEnterpriseId();
-      window.RCHistory.push({
-        pathname: `/login`,
-      });
+      User.clearUserInfo();
+      window.location.href = htmlUrl;
     });
   }