1

1a57bc75 · 潘本斌 · 7618c2ba · 1a57bc75 · 1a57bc75 · 1a57bc75
Commit 1a57bc75 authored Dec 17, 2024 by 潘本斌
9 changed files
--- a/src/common/Layout/Header/index.js
+++ b/src/common/Layout/Header/index.js
@@ -10,7 +10,7 @@ import SelectLang from "./SelectLang";
 }
 import HeaderDropdown from "./HeaderDropdown";
 // 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 {
  constructor(props) {
@@ -88,7 +88,8 @@ class Header extends PureComponent {
          <div className={styles.logo}>
            <img
              className={styles.image}
-              src={nav.logo ? nav.logo : headerLogo}
+              // src={nav.logo ? nav.logo : headerLogo}
+              src={headerLogo}
            />
          </div>
        </div>

--- a/src/pages/SystemManagement/Banner/editBanner.jsx
+++ b/src/pages/SystemManagement/Banner/editBanner.jsx
--- a/src/pages/SystemManagement/Banner/index.jsx
+++ b/src/pages/SystemManagement/Banner/index.jsx
@@ -37,24 +37,24 @@ class Banner extends React.PureComponent {
        terminalName: "移动端",
        modules: [
          { 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 = {
      listRecords: [],
@@ -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: "图片",
        dataIndex: "bannerPath",
        key: "bannerPath",

--- a/src/pages/SystemManagement/Information/index.jsx
+++ b/src/pages/SystemManagement/Information/index.jsx
@@ -785,9 +785,50 @@ class Information extends React.Component {
  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 =>
      data.map(item => {
-        if (item.data && item.data.length) {
+        if (item.childClassifyNews && item.childClassifyNews.length) {
          return (
            <TreeNode
              key={item.key + item.id}
@@ -804,7 +845,7 @@ class Information extends React.Component {
                />
              }
            >
-              {loops(item.data)}
+              {loopss(item.childClassifyNews)}
            </TreeNode>
          );
        }
@@ -833,6 +874,7 @@ class Information extends React.Component {
            <TreeNode
              className={Styles.treeTtitle}
              key={item.key + item.id}
+              // chaildren={item.childClassifyNews}
              title={
                <Item
                  data={item}
@@ -984,7 +1026,7 @@ class Information extends React.Component {
        <Row>
          <Col
-            span={6}
+            span={8}
            style={{
              padding: "20px",
              border: "1px solid #d9d9d9",
@@ -1002,7 +1044,7 @@ class Information extends React.Component {
              {loop(this.state.ificationList)}
            </Tree>
          </Col>
-          <Col span={18} style={{ paddingLeft: "20px" }}>
+          <Col span={16} style={{ paddingLeft: "20px" }}>
            <Table
              dataSource={this.state.record.records}
              columns={columns}

--- a/src/pages/SystemManagement/Site/Door/indexPage/mobile.jsx
+++ b/src/pages/SystemManagement/Site/Door/indexPage/mobile.jsx
@@ -29,7 +29,7 @@ class Mobile extends Component {
      coucedata: [],
    };
  }
-  componentDidMount() { }
+  componentDidMount() {}
  render() {
    let { templateList = [], homeId, siteId } = this.props.homeInfo;
@@ -45,10 +45,10 @@ class Mobile extends Component {
        <div className={Styles.mobileContainer}>
          <Banner terminalId={this.props.terminalId} />
          <Classify />
-          <Announcement />
+          {/* <Announcement /> */}
          {/* 暂时写死 * task915 ； 确认写死...*/}
-          <CalendarTask />
+          {/* <CalendarTask /> */}
-          <UserReport terminalId={this.props.terminalId} />
+          {/* <UserReport terminalId={this.props.terminalId} /> */}
          {// values:首页功能模块列表，课程，项目，讲师
          values.map((key, index) => {
            switch (key.moduleType) {
@@ -174,7 +174,8 @@ class Mobile extends Component {
                );
              }
              case 11:
-                  return <NewsList
+                return (
+                  <NewsList
                    keys={key.moduleType}
                    title={key.moduleName}
                    key={index}
@@ -182,8 +183,10 @@ class Mobile extends Component {
                    isFirst={index == 0 ? true : false}
                    isLast={index == values.length - 1 ? true : false}
                  />
+                );
              case 12:
-                  return <PayContentList
+                return (
+                  <PayContentList
                    keys={key.moduleType}
                    title={key.moduleName}
                    key={index}
@@ -191,6 +194,7 @@ class Mobile extends Component {
                    isFirst={index == 0 ? true : false}
                    isLast={index == values.length - 1 ? true : false}
                  />
+                );
              default:
                //公共模块（专辑或其他类型，和产品商量一下设计一样）
@@ -219,9 +223,9 @@ class Mobile extends Component {
            "Object.keys(this.props.homeData).length",
            Object.keys(this.props.homeData).length
          )}
-          {Object.keys(this.props.homeData).length == 0 && (
+          {/* {Object.keys(this.props.homeData).length == 0 && (
            <AddModule homeId={homeId} siteId={siteId} />
-          )}
+          )} */}
          {/*配置底部导航*/}
          <FooterNav />

--- a/src/pages/SystemManagement/Site/Door/indexPage/mobilePlugin/AddMenu.jsx
+++ b/src/pages/SystemManagement/Site/Door/indexPage/mobilePlugin/AddMenu.jsx
@@ -147,6 +147,7 @@ class AddMenu extends Component {
          showName: values.showName,
          relationFuncName: values.relationFuncName,
          relationFuncCode: dicItem.length > 0 ? dicItem[0].code : "",
+          relationId: dicItem.length > 0 ? dicItem[0].id : "",
          // relationFuncName: this.props.firstItem[this.state.value1].name,
          relationFuncUrl:
            values.relationFuncName === "外链" ? values.relationFuncUrl : "", //schiffer.ji
@@ -155,7 +156,7 @@ class AddMenu extends Component {
          imgPath: this.state.imgPath,
          homeId: "", //没有取得在classify 组件128行取添加
          // 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(",") : "",
          // 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 {
    //     let form = this.props.form;
    //     form.setFieldsValue({ showName: e, relationFuncUrl: '' });
    // }
-    console.log("e月eeeeeeeeeeeeeeee", e);
    this.setState({
      selectFlag: true,
      value1: op.key,
@@ -341,7 +341,7 @@ class AddMenu extends Component {
                })(
                  // <div>11</div>
                  <Select
-                    key={'all'}
+                    key={"all"}
                    onChange={key => {
                      console.log("926", key);
                      this.setState({ CaseLibraryId: key });

--- a/src/pages/SystemManagement/Site/Door/previewIndexPage/mobile.jsx
+++ b/src/pages/SystemManagement/Site/Door/previewIndexPage/mobile.jsx
--- a/src/services/serve.js
+++ b/src/services/serve.js
@@ -5,8 +5,8 @@ let baseUrl = "";
 if (location.host.includes("localhost")) {
  // 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 = {

--- a/src/static/imgs/1logo.png
+++ b/src/static/imgs/1logo.png