修改

cc0d1193 · yanglang123 · a86074d6 · cc0d1193 · cc0d1193 · cc0d1193
Commit cc0d1193 authored Jan 21, 2025 by yanglang123
31 changed files
--- a/src/common/footer/footer.css
+++ b/src/common/footer/footer.css
+.common-footer-daying {
+  width: 100%;
+  height: 100px;
+  position: relative;
+  padding-top: 49px;
+  background-color: #f4f4f4;
+}
+.common-footer-daying .footer-line {
+  width: 340px;
+  height: 2px;
+  background-color: #ddd;
+  margin: 0 auto;
+}
+.common-footer-daying .footer-text {
+  font-size: 24px;
+  color: #929292;
+  height: 36px;
+  position: absolute;
+  top: 32px;
+  background-color: #f4f4f4;
+  left: 42%;
+  padding-left: 20px;
+  padding-right: 20px;
+}
--- a/src/common/footer/footer.less
+++ b/src/common/footer/footer.less
@@ -17,7 +17,7 @@
    position: absolute;
    top: 32px;
    background-color: #f4f4f4;
-    left: 50%;
+    left: 42%;
    padding-left: 20px;
    padding-right: 20px;
  }

--- a/src/components/AllDescribe/index.jsx
+++ b/src/components/AllDescribe/index.jsx
@@ -28,7 +28,8 @@ class AllDescribe extends Component {
  }
  render() {
-    let { id, type } = this.props.location.query;
+    let { id, bizType } = this.props.location.query;
+    let type = bizType == 2 ? "投票" : "问卷";
    const { list } = this.state;
    return (
      <div className="describe-out">
@@ -63,7 +64,7 @@ class AllDescribe extends Component {
          <div
            className="describe-btn"
            onClick={() => {
-              this.handleTo(id, type, list);
+              this.handleTo(id, bizType, list);
            }}
          >
            立即{type}
@@ -75,21 +76,17 @@ class AllDescribe extends Component {
  // 跳转到投票
  handleTo = (id, type, list) => {
    //pageMode（呈现样式：1逐题呈现 2整页呈现，3，投票单选）
-    if (type == "投票") {
+    if (type == 2) {
-      if (list.pageMode == 1) {
      hashHistory.push({
-          pathname: func.routerBefore() + "/SurveyDetails",
+        pathname: func.routerBefore() + "/vote",
        query: { id: id },
      });
-      }
+    } else {
-      if (list.pageMode == 3) {
      hashHistory.push({
-          pathname: func.routerBefore() + "/vote",
+        pathname: func.routerBefore() + "/SurveyDetails",
        query: { id: id },
      });
    }
-    }
  };
 }
 const mapStateToProps = (state) => {

--- a/src/components/Mailbox/index.jsx
+++ b/src/components/Mailbox/index.jsx
@@ -65,7 +65,7 @@ class ContributeDetail extends Component {
      ossPicUrl: JSON.stringify(imgs),
      ossVideoUrl: JSON.stringify(videos),
      remark: this.state.remark,
-      targetFrom: this.state.targetFrom ? this.state.targetFrom : "意见建议",//来信目的
+      targetFrom: this.state.targetFrom ? this.state.targetFrom : "意见建议", //来信目的
      anonymousFlag: this.state.anonymousFlag, //是否匿名：1是，0否
    };
    if (!this.state.titleValue) {
@@ -78,7 +78,7 @@ class ContributeDetail extends Component {
      return Toast.info("请输入期望结果");
    }
    if (location.hash.indexOf("committeeMailbox") != -1) {
-      this.props.systemMailboxApi(params, (response) => {
+      this.props.dwsystemMailboxApi(params, (response) => {
        console.log(response);
        if (response.code == 1000) {
          Toast.info("提交成功");
@@ -88,7 +88,7 @@ class ContributeDetail extends Component {
        }
      });
    } else {
-      this.props.dwsystemMailboxApi(params, (response) => {
+      this.props.systemMailboxApi(params, (response) => {
        if (response.code == 1000) {
          Toast.info("提交成功");
          setTimeout(() => {

--- a/src/components/Training/TrainingSteps/TrainingReview.jsx
+++ b/src/components/Training/TrainingSteps/TrainingReview.jsx
--- a/src/components/Training/TrainingSteps/TrainingSteps.jsx
+++ b/src/components/Training/TrainingSteps/TrainingSteps.jsx
--- a/src/components/Training/TrainingSteps/index.css
+++ b/src/components/Training/TrainingSteps/index.css
@@ -12,7 +12,7 @@
 }
 .train-info-view {
  background-color: #fff;
-  padding: 15px 0;
+  padding: 15px 30px;
 }
 .train-info-view .tp-icon {
  width: 24px !important;
@@ -251,6 +251,7 @@
 }
 .train-footer-box {
  display: flex;
+  align-items: center;
  border-top: solid 1px #dddddd;
  position: fixed;
  left: 0;
@@ -261,45 +262,12 @@
  overflow: hidden;
  z-index: 999;
 }
-.train-footer-box div {
+.train-footer-box .cell-left-icon {
-  height: 0.6rem;
+  height: 43px;
-  -webkit-box-flex: 6;
+  margin-left: 9px;
-  -webkit-flex: 6;
+  margin-right: 15px;
-  -ms-flex: 6;
+  width: auto;
-  flex: 6;
+  margin-top: 5px;
-}
-.train-footer-box input {
-  margin: auto;
-  height: 0.6rem;
-  background-color: #f5f5f5;
-  border-radius: 0.3rem;
-  display: inline-block;
-  border: none;
-  padding-left: 0.3rem !important;
-  font-size: 0.25rem;
-  color: #333333;
-}
-.train-footer-box .enroll-submit {
-  -webkit-box-flex: 2;
-  -webkit-flex: 2;
-  -ms-flex: 2;
-  flex: 2;
-  border: 0;
-  border-radius: 0;
-  font-size: 0.25rem;
-}
-.train-footer-box .enroll-submitInfo {
-  -webkit-box-flex: 3;
-  -webkit-flex: 3;
-  -ms-flex: 3;
-  flex: 3;
-  color: white;
-  font-size: 0.28rem;
-  border-radius: 0;
-  border: 0;
-  background-color: #4285f4;
-  padding: 0;
-  margin: 0;
 }
 .header {
  display: flex;
@@ -399,7 +367,6 @@
  margin: 0 auto;
  border-radius: 12px;
  padding-top: 30px;
-  padding-bottom: 30px;
 }
 .train-up-info {
  font-size: 0.31rem;
@@ -490,7 +457,6 @@
  display: flex;
  flex-direction: column;
  justify-content: space-between;
-  padding-left: 40px;
 }
 .train-info p {
  color: #fff;
@@ -533,6 +499,11 @@
  padding: 0 !important;
  color: #4a4a4a !important;
 }
+.train-info .train-info-contain span {
+  font-size: 30px !important;
+  padding: 0 !important;
+  color: #4a4a4a !important;
+}
 .product-rule {
  padding: 0.2rem 0.4rem;
 }
@@ -689,21 +660,24 @@
  flex-direction: column;
  width: 92%;
  margin: 0 auto;
-  transform: translateY(-80px);
 }
 .train-comment > p {
  background-color: white;
 }
 .train-comment .train-comment-contain {
+  position: fixed;
+  bottom: 0;
+  left: 0;
  background-color: white;
-  height: 162px;
+  padding: 20px 40px;
-  padding: 58px 54px 58px 26px;
+  display: flex;
  align-items: center;
-  border-bottom: solid 1px #e4e4e4;
+  width: 100%;
 }
 .train-comment .train-comment-contain .cell-left-icon {
  height: 43px;
  margin-left: 9px;
+  margin-right: 15px;
  width: auto;
  margin-top: 5px;
 }
@@ -721,11 +695,21 @@
  float: right;
 }
 .comment-body {
-  height: 2.5rem;
+  width: 90%;
-  border-top: 2px solid #eee;
+  margin-left: 15px;
-  overflow: scroll;
+  margin-right: 15px;
-  background-color: #f4f4f4;
+  background: #fff;
-  border-radius: 2px;
+  height: 60px !important;
+}
+.comment-body .am-list-item {
+  border-radius: 10px;
+  min-height: 60px !important;
+}
+.comment-body .am-textarea-control {
+  padding: 0 !important;
+}
+.comment-body .am-textarea-control textarea {
+  font-size: 28px !important;
 }
 .signup-button {
  display: block;

--- a/src/components/Training/TrainingSteps/index.less
+++ b/src/components/Training/TrainingSteps/index.less
@@ -9,7 +9,7 @@
 }
 .train-info-view {
  background-color: #fff;
-  padding: 15px 0;
+  padding: 15px 30px;
  .tp-icon {
    width: 24px !important;
    height: 24px;
@@ -390,6 +390,7 @@
 .train-footer-box {
  display: flex;
+  align-items: center;
  border-top: solid 1px rgb(221, 221, 221);
  position: fixed;
  left: 0;
@@ -399,49 +400,12 @@
  background-color: #fff;
  overflow: hidden;
  z-index: 999;
+  .cell-left-icon {
-  div {
+    height: 43px;
-    height: 0.6rem;
+    margin-left: 9px;
-    -webkit-box-flex: 6;
+    margin-right: 15px;
-    -webkit-flex: 6;
+    width: auto;
-    -ms-flex: 6;
+    margin-top: 5px;
-    flex: 6;
-  }
-  input {
-    margin: auto;
-    height: 0.6rem;
-    background-color: rgb(245, 245, 245);
-    border-radius: 0.3rem;
-    display: inline-block;
-    border: none;
-    padding-left: 0.3rem !important;
-    font-size: 0.25rem;
-    color: #333333;
-  }
-  .enroll-submit {
-    -webkit-box-flex: 2;
-    -webkit-flex: 2;
-    -ms-flex: 2;
-    flex: 2;
-    border: 0;
-    border-radius: 0;
-    font-size: 0.25rem;
-  }
-  .enroll-submitInfo {
-    -webkit-box-flex: 3;
-    -webkit-flex: 3;
-    -ms-flex: 3;
-    flex: 3;
-    color: white;
-    font-size: 0.28rem;
-    border-radius: 0;
-    border: 0;
-    background-color: @themeColor;
-    padding: 0;
-    margin: 0;
  }
 }
@@ -559,11 +523,6 @@
  margin: 0 auto;
  border-radius: 12px;
  padding-top: 30px;
-  padding-bottom: 30px;
-  .video-my-play {
-    // height: 350px !important;
-    // padding-top: 0% !important;
-  }
 }
 .train-up-info {
  font-size: 0.31rem;
@@ -634,7 +593,6 @@
  display: flex;
  flex-direction: column;
  justify-content: space-between;
-  padding-left: 40px;
  p {
    color: #fff;
@@ -675,6 +633,11 @@
      padding: 0 !important;
      color: #4a4a4a !important;
    }
+    span {
+      font-size: 30px !important;
+      padding: 0 !important;
+      color: #4a4a4a !important;
+    }
  }
 }
@@ -858,21 +821,23 @@
  flex-direction: column;
  width: 92%;
  margin: 0 auto;
-  transform: translateY(-80px);
  > p {
    background-color: white;
  }
  .train-comment-contain {
+    position: fixed;
+    bottom: 0;
+    left: 0;
    background-color: white;
-    height: 162px;
+    padding: 20px 40px;
-    padding: 58px 54px 58px 26px;
+    display: flex;
    align-items: center;
-    border-bottom: solid 1px #e4e4e4;
+    width: 100%;
    .cell-left-icon {
      height: 43px;
      margin-left: 9px;
+      margin-right: 15px;
      width: auto;
      margin-top: 5px;
    }
@@ -894,11 +859,22 @@
 }
 .comment-body {
-  height: 2.5rem;
+  width: 90%;
-  border-top: 2px solid #eee;
+  margin-left: 15px;
-  overflow: scroll;
+  margin-right: 15px;
-  background-color: #f4f4f4;
+  background: #fff;
-  border-radius: 2px;
+  height: 60px !important;
+  .am-list-item {
+    border-radius: 10px;
+    min-height: 60px !important;
+  }
+  .am-textarea-control {
+    padding: 0 !important;
+  }
+  .am-textarea-control textarea {
+    font-size: 28px !important;
+  }
 }
 .signup-button {

--- a/src/components/Training/TrainingSteps/send-icon.png
+++ b/src/components/Training/TrainingSteps/send-icon.png
--- a/src/components/common/listview/secListView.jsx
+++ b/src/components/common/listview/secListView.jsx
@@ -53,10 +53,8 @@ export default class SecListView extends Component {
    willreceiveprops(props){
        console.log('list是否有状态变化',props);
    }
    render() {
        const { dataSource, renderRow, isLoading, secHeader,renderHeader,footText,hasMore,className } = this.props;
-        console.log(footText);
        let page = this.props.page,listStyle = this.props.listStyle;
         /*
         dataSource:    ListView.dataSource数据

--- a/src/components/exam/MyExam.jsx
+++ b/src/components/exam/MyExam.jsx
@@ -171,7 +171,7 @@ class MyExam extends Component {
      },
      {
        key: "2",
-        title: <span className="tabspan">考试</span>,
+        title: <span className="tabspan">测试</span>,
      },
    ];

--- a/src/components/exam/showAnwser/ShowAnswer.jsx
+++ b/src/components/exam/showAnwser/ShowAnswer.jsx
@@ -111,7 +111,7 @@ class ShowAnswer extends Component {
    );
    return (
      <div className="exam-question">
-        <div className="top-header1" style={{ marginTop: "-40px" }}>
+        <div className="top-header1">
          <div className="finish-answer-header1">
            <div
              className="paperName"

--- a/src/components/menutrain/MenuTrain.css
+++ b/src/components/menutrain/MenuTrain.css
 .train-index-container {
  width: 100%;
  height: 100%;
-  overflow-x: hidden;
-  overflow-y: auto;
 }
 .train-index-container .train-container {
  flex: 1;
@@ -51,13 +49,13 @@
  white-space: nowrap;
  overflow: hidden;
  font-size: 0.28rem;
-  color: #4A4A4A;
+  color: #4a4a4a;
 }
 .train-index-container .train-container .train-item-card-time {
  margin-top: 0.1rem;
  height: 0.32rem;
  margin-left: 0.16rem;
-  color: #9B9B9B;
+  color: #9b9b9b;
 }
 .train-index-container .train-container .train-item-cardt {
  margin-left: 0.3rem;
@@ -72,7 +70,7 @@
 .train-index-container .train-container .moreBtn {
  width: 100%;
  height: 0.4rem;
-  font-Size: 0.12rem;
+  font-size: 0.12rem;
  background-color: #00aaff;
  color: #fff;
 }
--- a/src/components/menutrain/MenuTrain.jsx
+++ b/src/components/menutrain/MenuTrain.jsx
@@ -11,8 +11,7 @@ import func from "../../util/commonFunc";
 //列表卡片
 import { connect } from "react-redux";
 import * as MenuTrainAction from "./MenuTrainAction";
-import moment from "moment";
+import "./../newsList/style.less";
-import "./style.less";
 import "./MenuTrain.less";
 import TaskCalendar from "./TaskCalendar/index";
 import intl from "react-intl-universal";
@@ -37,7 +36,7 @@ class MenuTrain extends Component {
      refreshList: "",
      activeId: "",
      activeList: [],
-      taskList:[],
+      taskList: [],
      nowData: "",
    };
  }
@@ -68,7 +67,7 @@ class MenuTrain extends Component {
    this.setState({
      isLoading: true,
    });
-    this.props.trainListData(params, false, () => {
+    this.props.trainListData(params, () => {
      const { MenuTrainReducer } = _this.props;
      _this.setState({
        isLoading: false,
@@ -89,7 +88,6 @@ class MenuTrain extends Component {
    );
  };
  newsClassifyClick = (data) => {
-    console.log(data, "点击情况~~~~~~~~~");
    const { activeId } = this.state;
    let _this = this;
    if (activeId != data.activityType) {
@@ -116,7 +114,7 @@ class MenuTrain extends Component {
          activityName: intl.get("AllActive"),
        });
      }
-      this.setState({ activeList: allClassify,taskList:taskList });
+      this.setState({ activeList: allClassify, taskList: taskList });
    });
  };
  //更改日期,每次更改日期去获取新的任务列表,默认打开课程，第一页
@@ -182,19 +180,27 @@ class MenuTrain extends Component {
    return thisMonth;
  };
  render() {
-    let { trainDataList,taskList, isLoading, refreshList, activeList, activeId } =
+    let {
-      this.state;
+      trainDataList,
+      taskList,
+      isLoading,
+      refreshList,
+      activeList,
+      activeId,
+    } = this.state;
    return (
      <div className="train-index-container" onScroll={this.listScroll}>
        <div className="train-container" id="train-scroll-listen-container">
          {/* 滚动页签 */}
-          <div>
+          <div className="news-list-page-container">
+            <div className="news-list-page-scroll-container ">
              <NewsClassifyList
                list={activeList}
                activeId={activeId}
                onClick={this.newsClassifyClick}
              />
            </div>
+          </div>
          {/* 日历 */}
          <div className="taskView" style={{ backgroundColor: "#fff" }}>
            <div className={"taskCalendarView moveDown"} id="taskCalendarView">
@@ -208,7 +214,7 @@ class MenuTrain extends Component {
            </div>
          </div>
          {/* 数据列表 */}
-          <div style={{marginTop:'20px'}}>
+          <div style={{ marginTop: "20px" }}>
            <TrainIndexList
              key={refreshList}
              list={trainDataList}
@@ -256,7 +262,6 @@ export default connect((state) => {
 const NewsClassifyList = ({ list, activeId, onClick }) => {
  return (
    <div className="news-classify-list-container">
-      <div className="news-classify-list-container-bg"></div>
      <div
        className="news-classify-list-scroll-container"
        id={"news-classify-list-scroll-id"}
@@ -279,9 +284,7 @@ const NewsClassifyItem = ({ data, isActive, onClick }) => {
  return (
    <div className="news-classify-item-container" onClick={onClick}>
      {isActive ? <span>{data.activityName}</span> : data.activityName}
-      {
+      {isActive ? <div className="active"></div> : ""}
-        isActive ? <div className="active"></div> :''
-      }
    </div>
  );
 };
--- a/src/components/menutrain/MenuTrain.less
+++ b/src/components/menutrain/MenuTrain.less
 .train-index-container {
  width: 100%;
  height: 100%;
-  overflow-x: hidden;
-  overflow-y: auto;
  .train-container {
    flex: 1;
    width: 100%;
@@ -12,7 +9,7 @@
      padding: 0;
    }
-    overflow-y:auto;
+    overflow-y: auto;
    .my-carousel {
      .slider-frame {
@@ -20,7 +17,6 @@
      }
    }
    .am-list-view-scrollview-content {
      position: static !important;
    }
@@ -43,8 +39,8 @@
    }
    .train-item-card {
-      margin-left: 0.20rem;
+      margin-left: 0.2rem;
-      height: 3.20rem;
+      height: 3.2rem;
      width: 45.333%;
      float: left;
    }
@@ -63,20 +59,20 @@
      text-overflow: ellipsis;
      white-space: nowrap;
      overflow: hidden;
-      font-size: .28rem;
+      font-size: 0.28rem;
-      color: #4A4A4A;
+      color: #4a4a4a;
    }
    .train-item-card-time {
-      margin-top: 0.10rem;
+      margin-top: 0.1rem;
      height: 0.32rem;
      margin-left: 0.16rem;
-      color: #9B9B9B;
+      color: #9b9b9b;
    }
    .train-item-cardt {
-      margin-left: 0.30rem;
+      margin-left: 0.3rem;
-      height: 3.20rem;
+      height: 3.2rem;
      width: 45.333%;
      float: left;
    }
@@ -89,12 +85,9 @@
    .moreBtn {
      width: 100%;
      height: 0.4rem;
-      font-Size: 0.12rem;
+      font-size: 0.12rem;
      background-color: #00aaff;
      color: #fff;
    }
  }
 }
--- a/src/components/menutrain/style.css
+++ b/src/components/menutrain/style.css
-.singleLineOverflow {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  word-break: break-all;
-}
-.news-banner-carsouel-container {
-  width: 100%;
-  padding: 24px 30px;
-}
-.news-classify-list-container {
-  width: 100%;
-  height: 90px;
-  background-color: #fff;
-  overflow-y: hidden;
-  overflow-x: auto;
-}
-.news-classify-list-container .news-classify-list-container-bg {
-  width: 100%;
-  height: 90px;
-  position: absolute;
-  left: 0;
-  top: 0;
-  background-color: #d23a29;
-  z-index: 1;
-}
-.news-classify-list-container .news-classify-list-scroll-container {
-  width: max-content;
-  height: 90px;
-  position: relative;
-  z-index: 2;
-  padding: 0 10px;
-}
-.news-classify-list-container .news-classify-list-scroll-container .news-classify-item-container {
-  max-width: 364px;
-  height: 90px;
-  line-height: 90px;
-  text-align: center;
-  margin: 0 25px;
-  display: inline-block;
-  vertical-align: middle;
-  font-size: 32px;
-  color: #fff;
-  font-weight: 400;
-}
-.news-classify-list-container .news-classify-list-scroll-container .news-classify-item-container span {
-  padding-bottom: 12px;
-  font-size: 36px;
-}
-.news-classify-list-container .news-classify-list-scroll-container .news-classify-item-container .active {
-  width: 65%;
-  margin: 0 auto;
-  margin-top: -13px;
-  height: 5px;
-  background-color: #fff;
-  border-radius: 5px;
-}
-.news-classify-list-container .news-third-classify-list-scroll-container {
-  width: max-content;
-  height: 60px;
-  position: relative;
-  z-index: 2;
-  padding: 0 10px;
-}
-.news-classify-list-container .news-third-classify-list-scroll-container .news-third-classify-item-container {
-  max-width: 324px;
-  height: 60px;
-  line-height: 60px;
-  text-align: center;
-  margin: 0 25px;
-  display: inline-block;
-  vertical-align: middle;
-  font-size: 30px;
-  color: #666;
-  font-weight: 400;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  word-break: break-all;
-}
-.news-classify-list-container .news-third-classify-list-scroll-container .news-third-classify-item-container span {
-  color: #4285f4;
-}
-.news-item-list-container {
-  width: 100%;
-}
--- a/src/components/menutrain/style.less
+++ b/src/components/menutrain/style.less
-@import "../../static/theme.less";
-.news-banner-carsouel-container {
-  width: 100%;
-  padding: 24px 30px;
-}
-.news-classify-list-container {
-  width: 100%;
-  height: 90px;
-  background-color: #fff;
-  overflow-y: hidden;
-  overflow-x: auto;
-  .news-classify-list-container-bg {
-    width: 100%;
-    height: 90px;
-    position: absolute;
-    left: 0;
-    top: 0;
-    background-color: #d23a29;
-    z-index: 1;
-  }
-  .news-classify-list-scroll-container {
-    width: max-content;
-    height: 90px;
-    position: relative;
-    z-index: 2;
-    padding: 0 10px;
-    .news-classify-item-container {
-      max-width: 364px;
-      height: 90px;
-      line-height: 90px;
-      text-align: center;
-      margin: 0 25px;
-      display: inline-block;
-      vertical-align: middle;
-      font-size: 32px;
-      color: #fff;
-      font-weight: 400;
-      span {
-        padding-bottom: 12px;
-        font-size: 36px;
-      }
-      .active {
-        width: 65%;
-        margin: 0 auto;
-        margin-top: -13px;
-        height: 5px;
-        background-color: #fff;
-        border-radius: 5px;
-      }
-    }
-  }
-  .news-third-classify-list-scroll-container {
-    width: max-content;
-    height: 60px;
-    position: relative;
-    z-index: 2;
-    padding: 0 10px;
-    .news-third-classify-item-container {
-      max-width: 324px;
-      height: 60px;
-      line-height: 60px;
-      text-align: center;
-      margin: 0 25px;
-      display: inline-block;
-      vertical-align: middle;
-      font-size: 30px;
-      color: #666;
-      font-weight: 400;
-      .singleLineOverflow;
-      span {
-        color: @themeColor;
-      }
-    }
-  }
-}
-.news-item-list-container {
-  width: 100%;
-}
--- a/src/components/myLeaveMessage/index.jsx
+++ b/src/components/myLeaveMessage/index.jsx
@@ -61,6 +61,9 @@ class MyLeaveMessage extends Component {
    }
    if (!this.state.contentValue) {
      return Toast.info("请输入问题或建议");
+    }1
+    if (this.state.contentValue.length<10) {
+      return Toast.info("最少输入10字或以上内容");
    }
    let params = {
      name: this.state.titleValue,
@@ -118,7 +121,7 @@ class MyLeaveMessage extends Component {
        <div className="contribute-detail-box">
          <div className="top-tit">
            问题或建议<span className="red-star">*</span>
-            <span>(10-500个字)</span>
+            <span>(10-500字)</span>
          </div>
          <TextArea
            value={this.state.contentValue}
@@ -127,6 +130,7 @@ class MyLeaveMessage extends Component {
            }
            placeholder="请填写您的问题或建议"
            rows={8}
+            maxLength={500}
          />
        </div>
        <div className="contribute-detail-box">

--- a/src/components/mycontribute/contributeDetail.jsx
+++ b/src/components/mycontribute/contributeDetail.jsx
@@ -61,8 +61,14 @@ class ContributeDetail extends Component {
    if (!this.state.titleValue) {
      return Toast.info("请输入标题");
    }
-    if (imgs.length == 0) {
+    if (!this.state.contentValue) {
-      return Toast.info("请上传图片或视频");
+      return Toast.info("请输入内容");
+    }
+    if (!this.state.authValue) {
+      return Toast.info("请输入作者");
+    }
+    if (!this.state.delValue) {
+      return Toast.info("请输入支部和部室");
    }
    this.props.commitContributeApi(params, (response) => {
      console.log(response);
@@ -94,7 +100,7 @@ class ContributeDetail extends Component {
          />
        </div>
        <div className="contribute-detail-box">
-          <div className="top-tit">正文</div>
+          <div className="top-tit">正文<span className="red-star">*</span></div>
          <TextArea
            value={this.state.contentValue}
            onChange={(event) =>
@@ -105,7 +111,7 @@ class ContributeDetail extends Component {
          />
        </div>
        <div className="contribute-detail-box">
-          <div className="top-tit">图片或视频上传<span className="red-star">*</span></div>
+          <div className="top-tit">图片或视频上传</div>
          <PostUploadFile
            acceptFileType="image/*,video/*"
            maxSize={{ image: 10 }}
@@ -118,7 +124,7 @@ class ContributeDetail extends Component {
        <div className="contribute-detail-box">
          <div className="user-tit">以下为公开信息，将会在稿件中显示</div>
          <div className="userinfo-box">
-            <div className="userinfo-name">作者</div>
+            <div className="userinfo-name">作者<span style={{color:'red'}}>*</span></div>
            <Input
              value={this.state.authValue}
              onChange={(event) =>
@@ -129,7 +135,7 @@ class ContributeDetail extends Component {
            />
          </div>
          <div className="userinfo-box">
-            <div className="userinfo-name">支部和部室</div>
+            <div className="userinfo-name">支部和部室<span style={{color:'red'}}>*</span></div>
            <Input
              value={this.state.delValue}
              onChange={(event) =>

--- a/src/components/mycontribute/index.jsx
+++ b/src/components/mycontribute/index.jsx
@@ -52,7 +52,7 @@ class Mycontribute extends Component {
      _this.setState({
        activeId: index,
        activeTwoId: null,
-        typeOne: data.id,
+        typeOne: data.value,
        typeTwo: null,
        activeThreeId: null,
        typeThree: null,
@@ -76,7 +76,7 @@ class Mycontribute extends Component {
      _this.setState({
        activeTwoId: index,
        activeThreeId: null,
-        typeTwo: data.id,
+        typeTwo: data.value,
        typeThree: null,
      });
    }
@@ -87,7 +87,7 @@ class Mycontribute extends Component {
    if (activeThreeId != index) {
      _this.setState({
        activeThreeId: index,
-        typeThree: data.id,
+        typeThree: data.value,
      });
    }
  };

--- a/src/components/mysurvey/SurveyAnswer.js
+++ b/src/components/mysurvey/SurveyAnswer.js
--- a/src/components/mysurvey/less/examquestion.css
+++ b/src/components/mysurvey/less/examquestion.css
+.exam-question1 {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(0deg, #ff9286 0%, #d23a29), linear-gradient(180deg, rgba(255, 255, 255, 0) 59%, #f5f5f5 100%), linear-gradient(0deg, rgba(210, 58, 41, 0) 0%, #d23a29);
+}
+.exam-question1 .top-header {
+  width: 100%;
+  text-align: center;
+  height: 88px;
+  line-height: 88px;
+  font-size: 32px;
+  background: linear-gradient(90deg, rgba(255, 151, 130, 0), #ff9782 53%, rgba(255, 151, 130, 0) 100%);
+  color: #fff;
+}
+.answer-list .am-list-body {
+  border-radius: 30px;
+}
+.answer-list .question-block {
+  padding-top: 0 !important;
+  transform: translateY(0) !important;
+}
+.question-topic {
+  width: 100%;
+  padding: 0.1rem 0.3rem;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.question-topic h4 {
+  margin-bottom: 32px;
+  font-size: 0.34rem;
+  padding-top: 0.3rem;
+  color: #030303;
+}
--- a/src/components/mysurvey/less/examquestion.less
+++ b/src/components/mysurvey/less/examquestion.less
-@import "config";
+.exam-question1 {
-.load-more{
-  border:0;
-  width:100%;
-  height:0.7rem;
-  background-color:#f6f6f6;
-  color:#999;
-  font-size:0.26rem;
-  line-height:0.7rem;
-  text-align:center;
-}
-.exam-question{
  width: 100%;
-  .header{
+  height: 100%;
+  background: linear-gradient(0deg, #ff9286 0%, #d23a29),
+    linear-gradient(180deg, rgba(255, 255, 255, 0) 59%, #f5f5f5 100%),
+    linear-gradient(0deg, rgba(210, 58, 41, 0) 0%, #d23a29);
+  .top-header {
    width: 100%;
-    height: 44*@len;
-    position: fixed;
-    left: 0;
-    top: 0;
    text-align: center;
-    line-height: 44*@len;
+    height: 88px;
-    font-size: 15*@len;
+    line-height: 88px;
-    color: #4a4a4a;
+    font-size: 32px;
-    border-bottom: 1px solid #eee;
+    background: linear-gradient(
-    z-index: 100;
+      90deg,
-    background: #fff;
+      rgba(255, 151, 130, 0),
-    span{
+      #ff9782 53%,
-      color: #000;
+      rgba(255, 151, 130, 0) 100%
+    );
+    color: #fff;
  }
+}
+.answer-list {
+  .am-list-body {
+    border-radius: 30px;
  }
-  .count-time{
+  .question-block {
-    font-size: 15*@len;
+    padding-top: 0 !important;
-    line-height: 44*@len;
+    transform: translateY(0) !important;
-    color: #dd4457;
-    height: 44*@len;
-    position: fixed;
-    top: 0;
-    right: 10*@len;
-    z-index: 101;
  }
-  .occupy{
+}
+.question-topic {
  width: 100%;
-    height: 44*@len;
+  padding: 0.1rem 0.3rem;
+  // text-align: justify; //bug-15038
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  h4 {
+    margin-bottom: 32px;
+    font-size: 0.34rem;
+    padding-top: 0.3rem;
+    color: #030303;
  }
 }
--- a/src/components/mysurvey/list.jsx
+++ b/src/components/mysurvey/list.jsx
@@ -73,11 +73,19 @@ class list extends Component {
        ref="inEaxmRef"
        className="list-view-box"
        dataSource={inExamList}
-        renderHeader={() => (
+        renderHeader={() => {
-          <div style={{ width: "96%", margin: "0 auto", marginBottom: "60px" }}>
+          if (bannerList?.bannerPath) {
-            <img style={{ width: "100%" }} src={bannerList.bannerPath} alt="" />
+            <div
-          </div>
+              style={{ width: "96%", margin: "0 auto", marginBottom: "60px" }}
-        )}
+            >
+              <img
+                style={{ width: "100%" }}
+                src={bannerList.bannerPath}
+                alt=""
+              />
+            </div>;
+          }
+        }}
        renderFooter={() => (
          <FooterLine
            onlyText={true}
@@ -208,7 +216,7 @@ class list extends Component {
    hashHistory.push({
      pathname: func.routerBefore() + "/allDescribe",
      // pathname:func.routerBefore()+'/InvestigateFinish',
-      query: { id: item.id, type: "投票" },
+      query: { id: item.id, bizType: item.bizType},
    });
    // if (item.finishState != 3 || item.finishState != 0) {
    //   if (item.finishState == 1) {

--- a/src/components/newsMessage/NewsMessageCss.css
+++ b/src/components/newsMessage/NewsMessageCss.css
@@ -167,7 +167,7 @@
  line-height: 48px;
 }
 .news-item2-content .news-item2-box .title-p {
-  width: 100%;
+  width: max-content;
  color: #ABABAB;
  background-position: center;
  background-size: 100%;

--- a/src/components/newsMessage/NewsMessageCss.less
+++ b/src/components/newsMessage/NewsMessageCss.less
@@ -195,7 +195,7 @@
    }
    .title-p{
-      width: 100%;
+      width: max-content;
      color: #ABABAB;
      background-position: center;
      background-size: 100%;

--- a/src/components/newsMessage/NewsMessageResult.css
+++ b/src/components/newsMessage/NewsMessageResult.css
@@ -91,7 +91,7 @@
  top: 0.26rem;
 }
 .list-item-box .smallDian {
-  background: #D2D2D2;
+  background: #d2d2d2;
 }
 .list-item-box .activeDian {
  background-color: #4285f4;
@@ -105,11 +105,11 @@
 .list-item-div {
  display: flex;
  overflow: hidden;
-  padding: 0.2rem 0.2rem 0.2rem 0;
+  padding: 0.2rem;
  flex-direction: row;
  flex: 1;
  margin-left: 0.2rem;
-  border-bottom: solid 1px #F6F6F6;
+  border-bottom: solid 1px #f6f6f6;
 }
 .list-item-div .list-item-img-box {
  width: 0.6rem;
@@ -180,7 +180,7 @@
  flex-direction: row;
  justify-content: center;
  align-items: center;
-  font-Size: 0.24rem;
+  font-size: 0.24rem;
  color: #ccc;
 }
 .list-item-div .list-item-content .item-header-box .item-zhan-style .item-zhan-icon-active {
@@ -374,7 +374,7 @@
 }
 .train-up-info {
  font-size: 0.31rem;
-  color: #9B9B9B;
+  color: #9b9b9b;
  padding: 0.22rem 0.3rem;
  width: 100%;
  background-color: #fff;
@@ -393,12 +393,12 @@
  overflow: hidden;
  /** 隐藏超出的内容 **/
  font-size: 24px;
-  color: #4A4A4A;
+  color: #4a4a4a;
  display: block;
 }
 .train-info {
  font-size: 0.31rem;
-  color: #9B9B9B;
+  color: #9b9b9b;
  padding: 0.2rem auto;
  width: 100%;
  padding-left: 40px;
@@ -421,13 +421,13 @@
  overflow: hidden;
  /** 隐藏超出的内容 **/
  font-size: 40px;
-  color: #4A4A4A;
+  color: #4a4a4a;
 }
 .train-info .descr p {
  -webkit-line-clamp: unset;
 }
 .train-info div {
-  color: #9B9B9B;
+  color: #9b9b9b;
  font-size: 0.24rem;
 }
 .train-info .train-info-contain audio {
@@ -446,7 +446,7 @@
 .train-info .train-info-contain p {
  font-size: 32px !important;
  padding: 0 !important;
-  color: #4A4A4A !important;
+  color: #4a4a4a !important;
 }
 .product-rule {
  padding: 0.2rem 0.4rem;
@@ -473,7 +473,7 @@
  width: 100%;
  word-wrap: normal;
  height: auto;
-  color: #4A4A4A;
+  color: #4a4a4a;
 }
 .train-contain-header div:nth-child(2) {
  font-size: 24px !important;
@@ -502,7 +502,7 @@
 .am-accordion-header {
  height: auto !important;
  line-height: inherit !important;
-  background-color: #F4F4F4 !important;
+  background-color: #f4f4f4 !important;
 }
 .train-content-cell {
  width: 100%;
@@ -513,7 +513,7 @@
  padding-right: 0.2rem;
  padding-top: 0.1rem;
  padding-bottom: 0.1rem;
-  border-bottom: solid 1px #F6F6F6;
+  border-bottom: solid 1px #f6f6f6;
  height: 1rem;
  position: relative;
 }
@@ -541,7 +541,7 @@
  width: 32px;
  height: 32px;
  border-radius: 100%;
-  background-color: #ECF3FF;
+  background-color: #ecf3ff;
  position: absolute;
  top: -14px;
  right: 22px;
@@ -606,21 +606,23 @@
 .train-comment > p {
  background-color: white;
 }
-.train-comment .train-comment-contain {
+.train-comment-contain {
+  position: fixed;
+  bottom: 0px;
  background-color: white;
-  height: 162px;
+  padding: 20px 40px;
-  padding: 58px 54px 58px 26px;
+  display: flex;
  align-items: center;
-  border-bottom: solid 1px #e4e4e4;
+  width: 100%;
 }
-.train-comment .train-comment-contain .cell-left-icon {
+.train-comment-contain .cell-left-icon {
  height: 43px;
  margin-left: 9px;
  width: auto;
  margin-top: 5px;
 }
-.train-comment .train-comment-contain .comment-slider {
+.train-comment-contain .comment-slider {
-  background: #F4F4F4;
+  background: #f4f4f4;
  border-radius: 23px;
  width: 90%;
  height: 60px;
@@ -632,13 +634,6 @@
  letter-spacing: 0.1px;
  float: right;
 }
-.comment-body {
-  height: 2.5rem;
-  border-top: 2px solid #eee;
-  overflow: scroll;
-  background-color: #F4F4F4;
-  border-radius: 2px;
-}
 .signup-button {
  display: block;
  width: 100%;
@@ -700,7 +695,7 @@
 }
 .train-comment-replay {
  width: 100%;
-  background-color: #F4F4F4;
+  background-color: #f4f4f4;
  display: flex;
  flex-direction: column;
  padding: 15px;
@@ -709,7 +704,7 @@
 .train-comment-replay > div:nth-child(1) {
  font-family: PingFangSC-Regular;
  font-size: 0.21rem;
-  color: #4A90E2;
+  color: #4a90e2;
 }
 .train-comment-replay > div:nth-child(2) {
  padding: 10px 0px;
@@ -737,7 +732,7 @@
  flex-direction: row;
  justify-content: center;
  align-items: center;
-  font-Size: 0.24rem;
+  font-size: 0.24rem;
  color: #ccc;
 }
 .item-footer-box .item-zhan-style img {
@@ -880,15 +875,21 @@
 .train-comment-input .am-modal-button-group-h .am-modal-button:first-child {
  color: #000;
 }
-.train-comment-input .comment-body {
+.comment-body {
+  width: 90%;
+  margin-left: 15px;
  background: #fff;
+  height: 60px !important;
 }
-.train-comment-input .comment-body .am-list-item {
+.comment-body .am-list-item {
-  padding-left: 22px;
+  border-radius: 10px;
-  padding-right: 22px;
+  min-height: 60px !important;
 }
-.train-comment-input .comment-body .am-textarea-control textarea {
+.comment-body .am-textarea-control {
-  font-size: 28px;
+  padding: 0 !important;
+}
+.comment-body .am-textarea-control textarea {
+  font-size: 28px !important;
 }
 .train-contain .am-tabs-tab div div {
  padding-bottom: 0px !important;

--- a/src/components/newsMessage/NewsMessageResult.js
+++ b/src/components/newsMessage/NewsMessageResult.js
--- a/src/components/newsMessage/NewsMessageResult.less
+++ b/src/components/newsMessage/NewsMessageResult.less
--- a/src/components/newsMessage/NewsMessageResultAction.jsx
+++ b/src/components/newsMessage/NewsMessageResultAction.jsx
@@ -99,10 +99,6 @@ export const getReviewListData=(params, isUpData,callBack)=>{
        }
        NetWork.get(urlParams,
            response=>{
-                console.log('评论');
-                console.log(response);
                try{
                    if(String(response.code)==="1000"){
                        let reviewPageNo=Number.parseInt(response.data.current)+1;
@@ -127,7 +123,7 @@ export const getReviewListData=(params, isUpData,callBack)=>{
            })
    };
 };
-//评论
+//评论d
 export const commitVerb=(params,callBack)=>{
    return dispatch=>{
        NetWork.post(API.reviewCommit, params, response=>{

--- a/src/components/newsMessage/send-icon.png
+++ b/src/components/newsMessage/send-icon.png