Skip to content

S
sass-admin
Commit 3e9b7c7f by liangkaiping
Options

Merge branch 'dev' into 'master' 

save

See merge request liangkaiping/sass-admin!1
parents 5acfac73 ae0cd468
Showing with 28 additions and 16 deletions
build/Ip.js
...@@ -14,7 +14,7 @@ const host = { ...@@ -14,7 +14,7 @@ const host = {
BASE_URL: "https://mg.kmelearning.com", BASE_URL: "https://mg.kmelearning.com",
}, },
deve: { deve: {
BASE_URL: "http://dev.mg.kmelearning.com", BASE_URL: "https://mg.fairyclass.cn",
}, },
sit: { sit: {
BASE_URL: "https://mg.fairyclass.cn/", BASE_URL: "https://mg.fairyclass.cn/",
......
libs/reactCli.js
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/reactCli.manifest.json
{"name":"reactCli_library","content":{"../node_modules/react/index.js":{"id":0,"buildMeta":{"providedExports":true}},"../node_modules/prop-types/index.js":{"id":1,"buildMeta":{"providedExports":true}},"../node_modules/react-dom/index.js":{"id":11,"buildMeta":{"providedExports":true}},"../node_modules/object-assign/index.js":{"id":37,"buildMeta":{"providedExports":true}},"../node_modules/webpack/buildin/global.js":{"id":43,"buildMeta":{"providedExports":true}},"../node_modules/@babel/runtime/helpers/esm/extends.js":{"id":73,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/tiny-invariant/dist/tiny-invariant.esm.js":{"id":100,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/history/esm/history.js":{"id":112,"buildMeta":{"exportsType":"namespace","providedExports":["createBrowserHistory","createHashHistory","createMemoryHistory","createLocation","locationsAreEqual","parsePath","createPath"]}},"../node_modules/react-is/index.js":{"id":125,"buildMeta":{"providedExports":true}},"../node_modules/@babel/runtime/helpers/esm/inheritsLoose.js":{"id":132,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/react-router/esm/react-router.js":{"id":174,"buildMeta":{"exportsType":"namespace","providedExports":["MemoryRouter","Prompt","Redirect","Route","Router","StaticRouter","Switch","__RouterContext","generatePath","matchPath","useHistory","useLocation","useParams","useRouteMatch","withRouter"]}},"../node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js":{"id":216,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/hoist-non-react-statics/dist/hoist-non-react-statics.cjs.js":{"id":335,"buildMeta":{"providedExports":true}},"../node_modules/gud/index.js":{"id":406,"buildMeta":{"providedExports":true}},"../node_modules/react/cjs/react.production.min.js":{"id":469,"buildMeta":{"providedExports":true}},"../node_modules/react-dom/cjs/react-dom.production.min.js":{"id":479,"buildMeta":{"providedExports":true}},"../node_modules/scheduler/index.js":{"id":480,"buildMeta":{"providedExports":true}},"../node_modules/scheduler/cjs/scheduler.production.min.js":{"id":481,"buildMeta":{"providedExports":true}},"../node_modules/react-is/cjs/react-is.production.min.js":{"id":482,"buildMeta":{"providedExports":true}},"../node_modules/prop-types/factoryWithThrowingShims.js":{"id":484,"buildMeta":{"providedExports":true}},"../node_modules/prop-types/lib/ReactPropTypesSecret.js":{"id":485,"buildMeta":{"providedExports":true}},"../node_modules/@babel/runtime/helpers/inheritsLoose.js":{"id":660,"buildMeta":{"providedExports":true}},"../node_modules/path-to-regexp/index.js":{"id":661,"buildMeta":{"providedExports":true}},"../node_modules/mini-create-react-context/dist/esm/index.js":{"id":1202,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/resolve-pathname/esm/resolve-pathname.js":{"id":1203,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/value-equal/esm/value-equal.js":{"id":1204,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/react-router-dom/esm/react-router-dom.js":{"id":1845,"buildMeta":{"exportsType":"namespace","providedExports":["MemoryRouter","Prompt","Redirect","Route","Router","StaticRouter","Switch","__RouterContext","generatePath","matchPath","useHistory","useLocation","useParams","useRouteMatch","withRouter","BrowserRouter","HashRouter","Link","NavLink"]}},"../node_modules/path-to-regexp/node_modules/isarray/index.js":{"id":1846,"buildMeta":{"providedExports":true}}}} {"name":"reactCli_library","content":{"../node_modules/react/index.js":{"id":0,"buildMeta":{"providedExports":true}},"../node_modules/prop-types/index.js":{"id":1,"buildMeta":{"providedExports":true}},"../node_modules/react-dom/index.js":{"id":6,"buildMeta":{"providedExports":true}},"../node_modules/webpack/buildin/global.js":{"id":53,"buildMeta":{"providedExports":true}},"../node_modules/react-router/esm/react-router.js":{"id":60,"buildMeta":{"exportsType":"namespace","providedExports":["MemoryRouter","Prompt","Redirect","Route","Router","StaticRouter","Switch","__HistoryContext","__RouterContext","generatePath","matchPath","useHistory","useLocation","useParams","useRouteMatch","withRouter"]}},"../node_modules/react-is/index.js":{"id":63,"buildMeta":{"providedExports":true}},"../node_modules/object-assign/index.js":{"id":66,"buildMeta":{"providedExports":true}},"../node_modules/@babel/runtime/helpers/esm/extends.js":{"id":69,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/@babel/runtime/helpers/esm/inheritsLoose.js":{"id":95,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/tiny-invariant/dist/tiny-invariant.esm.js":{"id":96,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/history/esm/history.js":{"id":106,"buildMeta":{"exportsType":"namespace","providedExports":["createBrowserHistory","createHashHistory","createMemoryHistory","createLocation","locationsAreEqual","parsePath","createPath"]}},"../node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js":{"id":216,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/hoist-non-react-statics/dist/hoist-non-react-statics.cjs.js":{"id":326,"buildMeta":{"providedExports":true}},"../node_modules/react/cjs/react.production.min.js":{"id":456,"buildMeta":{"providedExports":true}},"../node_modules/react-dom/cjs/react-dom.production.min.js":{"id":466,"buildMeta":{"providedExports":true}},"../node_modules/scheduler/index.js":{"id":467,"buildMeta":{"providedExports":true}},"../node_modules/scheduler/cjs/scheduler.production.min.js":{"id":468,"buildMeta":{"providedExports":true}},"../node_modules/react-is/cjs/react-is.production.min.js":{"id":469,"buildMeta":{"providedExports":true}},"../node_modules/prop-types/factoryWithThrowingShims.js":{"id":470,"buildMeta":{"providedExports":true}},"../node_modules/prop-types/lib/ReactPropTypesSecret.js":{"id":471,"buildMeta":{"providedExports":true}},"../node_modules/mini-create-react-context/dist/esm/index.js":{"id":650,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/path-to-regexp/index.js":{"id":651,"buildMeta":{"providedExports":true}},"../node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js":{"id":1198,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/resolve-pathname/esm/resolve-pathname.js":{"id":1199,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/value-equal/esm/value-equal.js":{"id":1200,"buildMeta":{"exportsType":"namespace","providedExports":["default"]}},"../node_modules/react-router-dom/esm/react-router-dom.js":{"id":1785,"buildMeta":{"exportsType":"namespace","providedExports":["MemoryRouter","Prompt","Redirect","Route","Router","StaticRouter","Switch","generatePath","matchPath","useHistory","useLocation","useParams","useRouteMatch","withRouter","BrowserRouter","HashRouter","Link","NavLink"]}},"../node_modules/path-to-regexp/node_modules/isarray/index.js":{"id":1786,"buildMeta":{"providedExports":true}}}}
\ No newline at end of file \ No newline at end of file
libs/report.js
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/report.manifest.json
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/ui.js
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/ui.manifest.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/common/Layout/Header/index.js
...@@ -4,12 +4,14 @@ import PropTypes from "prop-types"; ...@@ -4,12 +4,14 @@ import PropTypes from "prop-types";
import { Tooltip, Dropdown, Menu, Icon, Layout, Avatar } from "antd"; import { Tooltip, Dropdown, Menu, Icon, Layout, Avatar } from "antd";
import classnames from "classnames"; import classnames from "classnames";
import styles from "./Header.less"; import styles from "./Header.less";
import SelectLang from "./SelectLang";{/* bug-11961-cwj暂时注释 2期上 */} import SelectLang from "./SelectLang";
{
/* bug-11961-cwj暂时注释 2期上 */
}
import HeaderDropdown from "./HeaderDropdown"; import HeaderDropdown from "./HeaderDropdown";
// import cookie from "react-cookies";bug-12952-cwj // import cookie from "react-cookies";bug-12952-cwj
import headerLogo from "../../../static/imgs/headerLogo.png"; import headerLogo from "../../../static/imgs/headerLogo.png";
class Header extends PureComponent { class Header extends PureComponent {
constructor(props) { constructor(props) {
super(props); super(props);
...@@ -55,10 +57,10 @@ class Header extends PureComponent { ...@@ -55,10 +57,10 @@ class Header extends PureComponent {
</Menu> </Menu>
); );
// 是否开通了社群 // 是否开通了社群
let associationButton = false let associationButton = false;
let hasAssociation = menus.filter(item => item.name === '社群'); let hasAssociation = menus.filter(item => item.name === "社群");
if(hasAssociation.length > 0){ if (hasAssociation.length > 0) {
associationButton = true associationButton = true;
} }
return ( return (
...@@ -70,7 +72,7 @@ class Header extends PureComponent { ...@@ -70,7 +72,7 @@ class Header extends PureComponent {
id="layoutHeader" id="layoutHeader"
> >
<div> <div>
{collapsed && {collapsed && (
<div <div
className={styles.button} className={styles.button}
onClick={onCollapseChange.bind(this, !collapsed)} onClick={onCollapseChange.bind(this, !collapsed)}
...@@ -81,9 +83,13 @@ class Header extends PureComponent { ...@@ -81,9 +83,13 @@ class Header extends PureComponent {
"menu-fold": !collapsed, "menu-fold": !collapsed,
})} })}
/> />
</div>} </div>
)}
<div className={styles.logo}> <div className={styles.logo}>
<img className={styles.image} src={nav.logo ? nav.logo : headerLogo} /> <img
className={styles.image}
src={nav.logo ? nav.logo : headerLogo}
/>
</div> </div>
</div> </div>
<div className={styles.rightContainer}> <div className={styles.rightContainer}>
...@@ -92,12 +98,14 @@ class Header extends PureComponent { ...@@ -92,12 +98,14 @@ class Header extends PureComponent {
{/* 语言 */} {/* 语言 */}
{/* bug-11961-cwj暂时注释 2期上 */} {/* bug-11961-cwj暂时注释 2期上 */}
{/* <SelectLang className={styles.action} /> */} {/* <SelectLang className={styles.action} /> */}
{associationButton && {/* {associationButton && (
<a className={styles.assDiv} onClick={onToAss.bind(this)}> <a className={styles.assDiv} onClick={onToAss.bind(this)}>
<div className={styles.iconDiv}><Icon style={{ color: 'white' }} type="home" /></div> <div className={styles.iconDiv}>
<Icon style={{ color: "white" }} type="home" />
</div>
<div className={styles.assText}>社群平台</div> <div className={styles.assText}>社群平台</div>
</a> </a>
} )} */}
<Tooltip title={"使用帮助"}> <Tooltip title={"使用帮助"}>
<a <a
target="_blank" target="_blank"
...@@ -109,7 +117,11 @@ class Header extends PureComponent { ...@@ -109,7 +117,11 @@ class Header extends PureComponent {
</a> </a>
</Tooltip> </Tooltip>
<Tooltip title={"站点切换"}> <Tooltip title={"站点切换"}>
<Dropdown overlay={siteMenu} style={{ zIndex: 1200 }} trigger={['click']}> <Dropdown
overlay={siteMenu}
style={{ zIndex: 1200 }}
trigger={["click"]}
>
<a className="ant-dropdown-link"> <a className="ant-dropdown-link">
{nav.siteName} {nav.siteName}
<Icon type="down" /> <Icon type="down" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment