Skip to content

S
sass-admin
Commit 1a57bc75 by 潘本斌
Options

1

parent 7618c2ba
Showing with 85 additions and 28 deletions
src/common/Layout/Header/index.js
...@@ -10,7 +10,7 @@ import SelectLang from "./SelectLang"; ...@@ -10,7 +10,7 @@ import SelectLang from "./SelectLang";
} }
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/1logo.png";
class Header extends PureComponent { class Header extends PureComponent {
constructor(props) { constructor(props) {
...@@ -88,7 +88,8 @@ class Header extends PureComponent { ...@@ -88,7 +88,8 @@ class Header extends PureComponent {
<div className={styles.logo}> <div className={styles.logo}>
<img <img
className={styles.image} className={styles.image}
src={nav.logo ? nav.logo : headerLogo} // src={nav.logo ? nav.logo : headerLogo}
src={headerLogo}
/> />
</div> </div>
</div> </div>
......
src/pages/SystemManagement/Banner/index.jsx
...@@ -37,24 +37,24 @@ class Banner extends React.PureComponent { ...@@ -37,24 +37,24 @@ class Banner extends React.PureComponent {
terminalName: "移动端", terminalName: "移动端",
modules: [ modules: [
{ moduleName: "首页", id: 0 }, { moduleName: "首页", id: 0 },
{ moduleName: "项目", id: 3 }, // { moduleName: "项目", id: 3 },
{ moduleName: "课程", id: 1 }, // { moduleName: "课程", id: 1 },
{ moduleName: "新闻资讯", id: 5 }, // { moduleName: "新闻资讯", id: 5 },
{ moduleName: "营销", id: 6 }, // { moduleName: "营销", id: 6 },
{ moduleName: "专辑", id: 7 }, // { moduleName: "专辑", id: 7 },
],
},
{
id: 2,
terminalName: "PC",
modules: [
{ moduleName: "首页", id: 0 },
{ moduleName: "项目", id: 3 },
{ moduleName: "课程", id: 1 },
{ moduleName: "新闻资讯", id: 5 },
{ moduleName: "专辑", id: 7 },
], ],
}, },
// {
// id: 2,
// terminalName: "PC",
// modules: [
// { moduleName: "首页", id: 0 },
// { moduleName: "项目", id: 3 },
// { moduleName: "课程", id: 1 },
// { moduleName: "新闻资讯", id: 5 },
// { moduleName: "专辑", id: 7 },
// ],
// },
]; ];
this.state = { this.state = {
listRecords: [], listRecords: [],
...@@ -85,6 +85,20 @@ class Banner extends React.PureComponent { ...@@ -85,6 +85,20 @@ class Banner extends React.PureComponent {
}, },
}, },
{ {
title: "副标题",
dataIndex: "imgTitleSub",
key: "imgTitleSub",
// width: 300,
align: "left",
render: text => {
return (
<div title={text} style={{ ...textOver, maxWidth: 300 }}>
{text}
</div>
);
},
},
{
title: "图片", title: "图片",
dataIndex: "bannerPath", dataIndex: "bannerPath",
key: "bannerPath", key: "bannerPath",
......
src/pages/SystemManagement/Information/index.jsx
...@@ -785,9 +785,50 @@ class Information extends React.Component { ...@@ -785,9 +785,50 @@ class Information extends React.Component {
render() { render() {
//树形控件 //树形控件
const loopss = data =>
data.map(item => {
if (item.childClassifyNews && item.childClassifyNews.length) {
return (
<TreeNode
key={item.key + item.id}
className={Styles.treeTtitle}
title={
<Item
data={item}
type={""}
parentID={this.state.ificationList}
postAddNewsLists={this.AddNewsList}
postEditNewsLists={this.EditNewsLists}
newsDelete={this.onNewsDelete}
onTableList={this.onTableList}
/>
}
>
{loopss(item.childClassifyNews)}
</TreeNode>
);
}
return (
<TreeNode
className={Styles.treeTtitle}
key={item.key + item.id}
title={
<Item
data={item}
type={""}
parentID={this.state.ificationList}
postAddNewsLists={this.AddNewsList}
postEditNewsLists={this.EditNewsLists}
newsDelete={this.onNewsDelete}
onTableList={this.onTableList}
/>
}
/>
);
});
const loops = data => const loops = data =>
data.map(item => { data.map(item => {
if (item.data && item.data.length) { if (item.childClassifyNews && item.childClassifyNews.length) {
return ( return (
<TreeNode <TreeNode
key={item.key + item.id} key={item.key + item.id}
...@@ -804,7 +845,7 @@ class Information extends React.Component { ...@@ -804,7 +845,7 @@ class Information extends React.Component {
/> />
} }
> >
{loops(item.data)} {loopss(item.childClassifyNews)}
</TreeNode> </TreeNode>
); );
} }
...@@ -833,6 +874,7 @@ class Information extends React.Component { ...@@ -833,6 +874,7 @@ class Information extends React.Component {
<TreeNode <TreeNode
className={Styles.treeTtitle} className={Styles.treeTtitle}
key={item.key + item.id} key={item.key + item.id}
// chaildren={item.childClassifyNews}
title={ title={
<Item <Item
data={item} data={item}
...@@ -984,7 +1026,7 @@ class Information extends React.Component { ...@@ -984,7 +1026,7 @@ class Information extends React.Component {
<Row> <Row>
<Col <Col
span={6} span={8}
style={{ style={{
padding: "20px", padding: "20px",
border: "1px solid #d9d9d9", border: "1px solid #d9d9d9",
...@@ -1002,7 +1044,7 @@ class Information extends React.Component { ...@@ -1002,7 +1044,7 @@ class Information extends React.Component {
{loop(this.state.ificationList)} {loop(this.state.ificationList)}
</Tree> </Tree>
</Col> </Col>
<Col span={18} style={{ paddingLeft: "20px" }}> <Col span={16} style={{ paddingLeft: "20px" }}>
<Table <Table
dataSource={this.state.record.records} dataSource={this.state.record.records}
columns={columns} columns={columns}
......
src/pages/SystemManagement/Site/Door/indexPage/mobilePlugin/AddMenu.jsx
...@@ -147,6 +147,7 @@ class AddMenu extends Component { ...@@ -147,6 +147,7 @@ class AddMenu extends Component {
showName: values.showName, showName: values.showName,
relationFuncName: values.relationFuncName, relationFuncName: values.relationFuncName,
relationFuncCode: dicItem.length > 0 ? dicItem[0].code : "", relationFuncCode: dicItem.length > 0 ? dicItem[0].code : "",
relationId: dicItem.length > 0 ? dicItem[0].id : "",
// relationFuncName: this.props.firstItem[this.state.value1].name, // relationFuncName: this.props.firstItem[this.state.value1].name,
relationFuncUrl: relationFuncUrl:
values.relationFuncName === "外链" ? values.relationFuncUrl : "", //schiffer.ji values.relationFuncName === "外链" ? values.relationFuncUrl : "", //schiffer.ji
...@@ -155,7 +156,7 @@ class AddMenu extends Component { ...@@ -155,7 +156,7 @@ class AddMenu extends Component {
imgPath: this.state.imgPath, imgPath: this.state.imgPath,
homeId: "", //没有取得在classify 组件128行取添加 homeId: "", //没有取得在classify 组件128行取添加
// relationId:this.state.id, // relationId:this.state.id,
relationId: values.relationId ? values.relationId : this.state.id, // relationId: values.relationId ? values.relationId : this.state.id,
relationNum: values.rankType ? values.rankType.join(",") : "", relationNum: values.rankType ? values.rankType.join(",") : "",
// relationFuncCode:this.props.firstItem[this.state.value1].code?this.props.firstItem[this.state.value1].code:this.props.curNaviObj.relationFuncCode, // relationFuncCode:this.props.firstItem[this.state.value1].code?this.props.firstItem[this.state.value1].code:this.props.curNaviObj.relationFuncCode,
}; };
...@@ -191,7 +192,6 @@ class AddMenu extends Component { ...@@ -191,7 +192,6 @@ class AddMenu extends Component {
// let form = this.props.form; // let form = this.props.form;
// form.setFieldsValue({ showName: e, relationFuncUrl: '' }); // form.setFieldsValue({ showName: e, relationFuncUrl: '' });
// } // }
console.log("e月eeeeeeeeeeeeeeee", e);
this.setState({ this.setState({
selectFlag: true, selectFlag: true,
value1: op.key, value1: op.key,
...@@ -341,7 +341,7 @@ class AddMenu extends Component { ...@@ -341,7 +341,7 @@ class AddMenu extends Component {
})( })(
// <div>11</div> // <div>11</div>
<Select <Select
key={'all'} key={"all"}
onChange={key => { onChange={key => {
console.log("926", key); console.log("926", key);
this.setState({ CaseLibraryId: key }); this.setState({ CaseLibraryId: key });
......
src/pages/SystemManagement/Site/Door/previewIndexPage/mobile.jsx
...@@ -154,7 +154,7 @@ class Mobile extends Component { ...@@ -154,7 +154,7 @@ class Mobile extends Component {
{/*配置底部导航*/} {/*配置底部导航*/}
{/* bug-12135-cwj 暂时注释 */} {/* bug-12135-cwj 暂时注释 */}
{/* <FooterNav disabled/> */} {/* <FooterNav disabled/> */}
</div> </div>
</div> </div>
); );
......
src/services/serve.js
...@@ -5,8 +5,8 @@ let baseUrl = ""; ...@@ -5,8 +5,8 @@ let baseUrl = "";
if (location.host.includes("localhost")) { if (location.host.includes("localhost")) {
// baseUrl = IP + '/admin'; // baseUrl = IP + '/admin';
baseUrl = "http://10.23.1.180:8090"; // baseUrl = "http://10.23.1.180:8090";
// baseUrl="http://dev.mg.kmelearning.com"; baseUrl = "http://192.168.1.106:8090";
} }
const service = { const service = {
......
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