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
@@ -22,8 +22,8 @@ class EditBanner extends Component {
      useRatio: [],
      moduleType: {},
      selecteditem: {},
-      recordLink4: '',
+      recordLink4: "",
-      currentTerminalData:[],
+      currentTerminalData: [],
    };
    this.columns = [
      {
@@ -35,51 +35,53 @@ class EditBanner extends Component {
  }
  componentDidMount() {
-    const { currentModule, currentRecord } = this.props
+    const { currentModule, currentRecord } = this.props;
-    this.getList(currentModule.moduleName , currentRecord);
+    this.getList(currentModule.moduleName, currentRecord);
    this.switchRatio();
    this.initModuleType();
  }
-  getList = (bannerName , currentRecord) => {
+  getList = (bannerName, currentRecord) => {
-    let prodectType="";
+    let prodectType = "";
-    let {checkValue}=this.state;
+    let { checkValue } = this.state;
    this.setState({
-      recordLink4:currentRecord.homeType
+      recordLink4: currentRecord.homeType,
-    })
+    });
-    if(bannerName=="项目"){
+    if (bannerName == "项目") {
-        prodectType=3
+      prodectType = 3;
-    }else if(bannerName=="课程"){
+    } else if (bannerName == "课程") {
-        prodectType=1
+      prodectType = 1;
-    }else if(bannerName=="新闻资讯"){
+    } else if (bannerName == "新闻资讯") {
-        prodectType=5
+      prodectType = 5;
-    }else if(bannerName=="营销"){
+    } else if (bannerName == "营销") {
-        prodectType=6
+      prodectType = 6;
-    }else if(bannerName=="专辑"){
+    } else if (bannerName == "专辑") {
-        prodectType=7
+      prodectType = 7;
-    }else if(bannerName=="首页"){
+    } else if (bannerName == "首页") {
-        if(checkValue){
+      if (checkValue) {
-            prodectType=checkValue;
+        prodectType = checkValue;
-        }else if(currentRecord.homeType){
+      } else if (currentRecord.homeType) {
-                prodectType=currentRecord.homeType
+        prodectType = currentRecord.homeType;
-            }
+      } else {
-        else{
+        prodectType = 8; //类型8 是根据后台商量类型8（属于首页没有选择类型传递8，后台会归类到外链类型）
-            prodectType=8//类型8 是根据后台商量类型8（属于首页没有选择类型传递8，后台会归类到外链类型）
      }
    }
-    this.props.getBannerContent({"type": prodectType},(res)=>{
+    this.props.getBannerContent({ type: prodectType }, res => {
-        let bannerOnRow="";
+      let bannerOnRow = "";
-        bannerOnRow=res.records.find(item=>{
+      bannerOnRow = res.records.find(item => {
-            return item.id==currentRecord.linkUrl
+        return item.id == currentRecord.linkUrl;
-        })
+      });
-        this.setState({
+      this.setState(
-            selectedRowKeys:[currentRecord.linkUrl],
+        {
-            bannerType:currentRecord.homeType,
+          selectedRowKeys: [currentRecord.linkUrl],
-            bannerOnRow:bannerOnRow
+          bannerType: currentRecord.homeType,
-        },()=>{
+          bannerOnRow: bannerOnRow,
-            console.log('344444 ',this.state.bannerOnRow );
+        },
-        })
+        () => {
-    })
+          console.log("344444 ", this.state.bannerOnRow);
        }
+      );
+    });
+  };
  initModuleType = () => {
    let { currentModule = {}, editType, currentRecord } = this.props;
    if (editType == "look" || editType == "edit") {
@@ -143,27 +145,38 @@ class EditBanner extends Component {
      if (err) {
        return;
      }
-      let { imgTitle, logoUrl, homeType, linkUrl, addTime } = values;
+      let {
+        imgTitle,
+        imgTitleSub,
+        imgSource,
+        logoUrl,
+        homeType,
+        linkUrl,
+        addTime,
+      } = values;
      let param = {
-        addTime: moment(addTime).toJSON(),
+        // addTime: moment(addTime).toJSON(),
        bannerName: currentModule.moduleName,
        bannerPath: logoUrl,
-        homeType: homeType,
+        // homeType: homeType,
        imgTitle: imgTitle,
-        linkUrl: linkUrl || this.state.selectedRows&&this.state.selectedRows[0]["id"], //bug-liyuan 当类型不是外链时，此字段为业务id
+        imgTitleSub: imgTitleSub,
+        imgSource: imgSource,
+        linkUrl:
+          linkUrl ||
+          (this.state.selectedRows && this.state.selectedRows[0]["id"]), //bug-liyuan 当类型不是外链时，此字段为业务id
        logoUrl: logoUrl,
        terminalId: terminalId,
      };
      if (editType == "edit") {
        param.id = currentRecord.id;
        this.props.updateBanner(param, () => {
          this.props.reGetBannerList();
          this.props.cancelEditBanner();
        });
      } else {
+        param.id = currentRecord.id;
        this.props.addBanner(param, () => {
          this.props.reGetBannerList();
          this.props.cancelEditBanner();
@@ -217,7 +230,7 @@ class EditBanner extends Component {
      // pageNo:pageNo, 接目前口不支持分页20200529
      // pageSize: pageSize
    };
-    this.props.getBannerContent(param)
+    this.props.getBannerContent(param);
  };
  // 关联内容改变
@@ -226,12 +239,12 @@ class EditBanner extends Component {
      selecteditem: record,
    });
  };
-  onSelectChange = (selectedRowKeys,selectedRows) => {
+  onSelectChange = (selectedRowKeys, selectedRows) => {
-    this.setState({selectedRowKeys,selectedRows: selectedRows})
+    this.setState({ selectedRowKeys, selectedRows: selectedRows });
-  }
+  };
  //使用递归的方式实现数组、对象的深拷贝
- deepClone=(obj)=> {
+  deepClone = obj => {
    //判断拷贝的要进行深拷贝的是数组还是对象，是数组的话进行数组拷贝，对象的话进行对象拷贝
    var objClone = Array.isArray(obj) ? [] : {};
    //进行深拷贝的不能为空，并且是对象或者是
@@ -247,7 +260,7 @@ class EditBanner extends Component {
      }
    }
    return objClone;
-}
+  };
  render() {
    console.log("this.props=EditBanner=", this.props);
    console.log("this.state=EditBanner=", this.state);
@@ -260,8 +273,13 @@ class EditBanner extends Component {
      bannerContentList,
      bannerContentTotal,
    } = this.props;
-    console.log("currentElaine:",currentTerminal)
+    console.log("currentElaine:", currentTerminal);
-    let { useRatio = [], moduleType = {}, selectedRowKeys ,currentTerminalData} = this.state;
+    let {
+      useRatio = [],
+      moduleType = {},
+      selectedRowKeys,
+      currentTerminalData,
+    } = this.state;
    const { getFieldDecorator } = form;
    const formItemLayout = {
      labelCol: {
@@ -280,14 +298,14 @@ class EditBanner extends Component {
    const rowSelection = {
      type: "radio",
      onChange: this.onSelectChange,
-      selectedRowKeys:selectedRowKeys,
+      selectedRowKeys: selectedRowKeys,
-    }
+    };
-    console.log(moduleType+'moduleTypemoduleType')
+    console.log(moduleType + "moduleTypemoduleType");
    currentTerminalData = this.deepClone(currentTerminal);
    //bug 12862 与令业约定-1为空选项
-    if(currentTerminal.modules[0].id!==-1){
+    if (currentTerminal.modules[0].id !== -1) {
-      currentTerminalData.modules.unshift({"id":-1,"moduleName":"请选择类型"})
+      currentTerminalData.modules.unshift({ id: -1, moduleName: "请选择类型" });
    }
    return (
      <Modal
@@ -312,9 +330,21 @@ class EditBanner extends Component {
                  required: true,
                  message: "请输入图片标题",
                },
-                { max: 10, message: "图片标题对多10个字符！" },
+                { max: 20, message: "图片标题最多20个字符！" },
              ],
-            })(<Input maxLength={10} disabled={editType == "look"} />)}
+            })(<Input maxLength={20} disabled={editType == "look"} />)}
+          </FormItem>
+          <FormItem label="副标题：" {...formItemLayout}>
+            {getFieldDecorator("imgTitleSub", {
+              initialValue: currentRecord.imgTitleSub,
+              rules: [
+                {
+                  required: true,
+                  message: "请输入副标题",
+                },
+                { max: 20, message: "图片副标题最多20个字符！" },
+              ],
+            })(<Input maxLength={20} disabled={editType == "look"} />)}
          </FormItem>
          <FormItem label="选择缩略图：" {...formItemLayoutImg}>
            {getFieldDecorator("logoUrl", {
@@ -331,7 +361,18 @@ class EditBanner extends Component {
              />
            )}
          </FormItem>
+          <FormItem label="图片来源：" {...formItemLayout}>
+            {getFieldDecorator("imgSource", {
+              initialValue: currentRecord.imgSource,
+              rules: [
+                {
+                  required: false,
+                  message: "请输入图片来源",
+                },
+                { max: 10, message: "图片来源最多10个字符！" },
+              ],
+            })(<Input maxLength={10} disabled={editType == "look"} />)}
+          </FormItem>
          {moduleType.id === 4 && (
            <FormItem label="链接地址：" {...formItemLayout}>
              {getFieldDecorator("linkUrl", {
@@ -348,7 +389,7 @@ class EditBanner extends Component {
              })(<Input disabled={editType == "look"} />)}
            </FormItem>
          )}
-          <FormItem label="指定上架时间：" {...formItemLayout}>
+          {/* <FormItem label="指定上架时间：" {...formItemLayout}>
            {getFieldDecorator("addTime", {
              initialValue: moment(currentRecord.addTime),
              rules: [{ required: true, message: "请选择指定上架时间！" }],
@@ -392,9 +433,11 @@ class EditBanner extends Component {
                </Option>
              </Select>
            )}
-          </FormItem>
+          </FormItem> */}
        </Form>
-        {moduleType.id!==0 && moduleType.id!=-1 &&moduleType.moduleName &&
+        {moduleType.id !== 0 &&
+          moduleType.id != -1 &&
+          moduleType.moduleName &&
          moduleType.id !== 4 &&
          editType !== "look" && (
            <div>
@@ -414,12 +457,12 @@ class EditBanner extends Component {
              />
            </div>
          )}
-            {
+        {editType == "look" && this.state.recordLink4 != "4" && (
-              editType=="look"&&this.state.recordLink4 != "4"&&<p style={{marginLeft:"40px"}}>
+          <p style={{ marginLeft: "40px" }}>
-                <h5 style={{display:"inline-block"}}>已选择: </h5>{this.state.bannerOnRow?this.state.bannerOnRow.name:'上线啦'}
+            <h5 style={{ display: "inline-block" }}>已选择: </h5>
+            {this.state.bannerOnRow ? this.state.bannerOnRow.name : "上线啦"}
          </p>
-            }
+        )}
      </Modal>
    );
  }

--- 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