瀏覽代碼

fix: 还原多站点逻辑

周玉环 2 天之前
父節點
當前提交
34ec5905c4

+ 2 - 2
xinkeaboard-seller/src/components/GlobalHeader/RightContent.js

@@ -4,7 +4,7 @@ import { Tag, Menu, Icon } from 'antd';
 import moment from 'moment';
 import groupBy from 'lodash/groupBy';
 import HeaderDropdown from '../HeaderDropdown';
-import SiteSelector from '../SiteSelector';
+// import SiteSelector from '../SiteSelector';
 import styles from './index.less';
 import { sldComLanguage } from '@/utils/utils';
 import { specialFlag } from '@/utils/sldconfig';
@@ -94,7 +94,7 @@ export default class GlobalHeaderRight extends PureComponent {
 		}
 		return (
 			<div className={className}>
-				<SiteSelector></SiteSelector>
+				{/* <SiteSelector></SiteSelector> */}
 				<HeaderDropdown overlay={menu}>
 					<span className={`${styles.action} ${styles.account}`}>
 						<span className={styles.name} style={{color:'#fff'}}>

+ 3 - 4
xinkeaboard-seller/src/layouts/BasicLayout.js

@@ -62,7 +62,7 @@ class BasicLayout extends React.PureComponent {
       dispatch,
       route: { routes, authority },
     } = this.props;
-    dispatch({ type: 'global/get_site_list_data' });
+    // dispatch({ type: 'global/get_site_list_data' });
     dispatch({
       type: 'menu/getMenuData',
       payload: { routes, authority },
@@ -214,14 +214,13 @@ class BasicLayout extends React.PureComponent {
 
 export default connect(({ global, setting, menu }) => ({
   collapsed: global.collapsed,
-  currentSite: global.currentSite,
+  // currentSite: global.currentSite,
   layout: setting.layout,
   menuData: menu.menuData,
   breadcrumbNameMap: menu.breadcrumbNameMap,
   ...setting,
 }))(props => (
-   props.currentSite && 
    <Media query="(max-width: 599px)">
-    {isMobile => <BasicLayout  key={props.currentSite} {...props} isMobile={isMobile} />}
+    {isMobile => <BasicLayout  {...props} isMobile={isMobile} />}
   </Media> 
 ));

+ 1 - 1
xinkeaboard-seller/src/pages/User/Login.js

@@ -172,7 +172,7 @@ export default class LoginPage extends Component {
                   router.push('/apply/open_up');
                 }
               } else {
-                dispatch({ type: 'global/get_site_list_data' });
+                // dispatch({ type: 'global/get_site_list_data' });
               }
             } else {
               failTip(res.msg);