修改红山开源整体样式以及细节样式

src/App.js

@@ -300,7 +300,8 @@ class App extends Component {
         <ConfigProvider locale={zhCN}>
           <MuiThemeProvider theme={theme}>
             <LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-            <SiderBar />
+            {/* 红山开源项目暂无右下方便捷按钮 */}
+            {/* <SiderBar /> */}
             {/* <Router> */}
             <Switch>
               {/* wiki预览 */}

src/Loading.js

@@ -9,7 +9,20 @@ class Loading extends Component {
 	}
 
 	render() {
-		return ""
+		return (
+			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
+				<style>
+					{
+						`
+						 .margintop{
+						   margin-top:20%;
+						 }
+						`
+					}
+				</style>
+				<Spin size="large" className={"margintop"} />
+			</div>
+		);
 	}
 }
 

src/forge/Main/Index.js

@@ -10,6 +10,7 @@ import ListItem from './IndexItem';
 import axios from 'axios';
 import img_new from '../Images/new.png';
 import img_array from '../Images/array.png';
+import banner from '../Images/banner_list.png';
 import CheckProfile from '../Component/ProfileModal/Profile';
 
 const Search = Input.Search;
@@ -291,9 +292,9 @@ class Index extends Component {
 
     return (
       <div>
-        {/* <p className="t_project_banner">
+        <p className="t_project_banner">
           <img src={banner} width="100%" alt=""/>
-        </p> */}
+        </p>
         {/* {
           recommendOriList && recommendOriList.length>0?
             <Slider {...settings} className="recommandOri">

src/forge/Main/IndexItem.js

@@ -102,18 +102,12 @@ class IndexItem extends Component {
                     }
                   </AlignCenter>
                   <span className="p-r-tags">
-                    {
-                      item.praises_count && item.praises_count>0 ?
                     <span className="pariseTag">
                       <img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}
-                      </span>:""
+                    </span>
-                    }
-                    {
-                      item.forked_count && item.forked_count>0 ?
                     <span>
                       <i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}
-                      </span>:""
+                    </span>
-                    }
                   </span>
                 </div>
                 <p className="break_word task-hide-2 mt10" style={{ maxHeight: "44px",lineHeight:"22px" }}>{item.description}</p>

src/forge/css/index.scss

@@ -2,7 +2,8 @@ ul,ol,dl{
   margin-bottom: 0px;
 }
 .newMain{
-  background-color: #fff;
+  padding-bottom: 110px;
+  background-color: #f5f5f5;
 }
 .newTable{
   background-color: #F0F5FF;

src/military/index.scss

@@ -123,11 +123,11 @@
   max-width: 500px;
 }
 
-.link {
+.link, .link:hover {
-  color: #0089ff;
+  color: #4154f1;
   cursor: pointer;
   &:hover {
-    color: #509eff;
+    opacity: 0.8;
   }
 }
 

src/military/notice/noticeList/index.scss

@@ -41,9 +41,16 @@
     justify-content: space-between;
     padding: .3rem 2rem 1.5rem;
     margin: 0px -1.25rem;
-    // border: 1px solid;
     border-bottom: 1px solid #E0E0E0;
-    // background: #f5f5f5;
+    .ant-input:hover{
+      border-color: #4154f1;
+    }
+    .ant-btn-primary{
+      background-color: #4154f1;
+      &:hover{
+        opacity: 0.8;
+      }
+    }
   }
 
   .notice-center-content{
@@ -66,7 +73,7 @@
       }
       i{
         margin-right: .25em;
-        color: #1890FF;
+        color: #4154f1;
       }
     }
   }
@@ -91,10 +98,10 @@
     color: #333;
     cursor: pointer;
     &:hover{
-      color: #1890FF;
+      color: #4154f1;
     }
     &.active{
-      color: #1890FF;
+      color: #4154f1;
     }
   }
 }
@@ -108,6 +115,9 @@
     margin-right: 20px;
     width: 20.8em;
     caret-color: rgba(0, 0, 0, 0);
+    .menu-ul:last-child{
+      margin-top: 12px;
+    }
   }
 
   .none_p_title{
@@ -135,9 +145,9 @@
     }
 
     span:hover{
-      color: #1484EF;
+      color: #4154f1;
       .iconfont{
-        color: #1484EF !important;
+        color: #4154f1 !important;
       }
     }
   }
@@ -174,7 +184,7 @@
       width: 6px;
       content: '';
       height: 30px;
-      background: #1484EF;
+      background: #4154f1;
     }
   }
 
@@ -186,3 +196,20 @@
 .ant-input-group-addon .ant-btn-lg {
   height: 40px;
 }
+
+.edu-txt-center .ant-pagination {
+  margin: 2rem auto;
+  text-align: center;
+  .ant-pagination-item:focus, .ant-pagination-item:hover, .ant-pagination-item-active, .ant-pagination-prev:hover a, .ant-pagination-next:hover a, .ant-pagination-options-quick-jumper input:focus, .ant-pagination-options-quick-jumper input:hover{
+    border-color: #4154f1;
+  }
+  .ant-pagination-disabled{
+    & a, & :hover a, & :focus a, & .ant-pagination-item-link, &:hover .ant-pagination-item-link , &:focus .ant-pagination-item-link {
+      color: rgba(0, 0, 0, 0.25) !important;
+      border-color: #d9d9d9;
+    }
+  }
+  .ant-pagination-item-active a{
+    color: #4154f1
+  }
+}

src/military/task/index.scss

@@ -90,6 +90,15 @@ span.list-gray {
 .center-content .ant-pagination {
   margin: 2rem auto;
   text-align: center;
+  .ant-pagination-item:focus, .ant-pagination-item:hover, .ant-pagination-item-active, .ant-pagination-prev:hover a, .ant-pagination-next:hover a, .ant-pagination-options-quick-jumper input:focus, .ant-pagination-options-quick-jumper input:hover{
+    border-color: #4154f1;
+  }
+  .ant-pagination-disabled{
+    & a, & :hover a, & :focus a, & .ant-pagination-item-link, &:hover .ant-pagination-item-link , &:focus .ant-pagination-item-link {
+      color: rgba(0, 0, 0, 0.25) !important;
+      border-color: #d9d9d9;
+    }
+  }
 }
 
 .text-ellipsis {
@@ -105,3 +114,18 @@ span.list-gray {
     max-width: 80%;
   }
 }
+
+.demand_submission,.demand_submission:focus,.failByPression .ant-modal-body .ant-btn-primary{
+  background-color: #4154f1;
+  border: none;
+  &:hover{
+    background-color: #4154f1;
+    opacity: 0.8;
+  }
+}
+.center-right-but .ant-input:hover, .center-content .ant-pagination-prev:hover{
+  border-color: #4154f1 !important;
+}
+.failByPression .ant-modal-body .anticon, .center-right-but .ant-input-search-icon:hover, .center-content .ant-pagination-item-active a{
+  color: #4154f1;
+}

src/military/task/taskDetail/index.jsx

@@ -470,7 +470,7 @@ export default Form.create()(
         </div>
 
         {!current_user.enterpriseCertification && <div className="edu-back-white padding30 mt20 font-16 text-center mb50">
-          <a onClick={goUserProfiles} className="color-blue_4C">请先完善主体信息</a>
+          <a onClick={goUserProfiles} className="color-blue_41">请先完善主体信息</a>
         </div>}
 
         {current_user.enterpriseCertification && detailData.status === 3 && (!detailData.exceptClosedBoolean) && signContent()}

src/military/task/taskDetail/index.scss

@@ -21,7 +21,7 @@
   background: #f1f8ff;
   border-radius: 4px;
   float: left;
-  color: #459be6;
+  color: #4154f1;
   height: 1.25rem;
   line-height: 1.25rem;
 }
@@ -61,7 +61,7 @@
 }
 
 .tasks_status li.active {
-  background: #4cacff;
+  background: #4154f1;
   color: #fff;
 }
 
@@ -92,7 +92,7 @@
 }
 
 .tasks_status li.active:after {
-  border-color: transparent transparent #4cacff transparent;
+  border-color: transparent transparent #4154f1 transparent;
   transform: rotate(90deg);
 }
 
@@ -168,3 +168,7 @@ li.except-close{
   background: #fa6400;
   color: #fff;
 }
+
+.color-blue_41{
+  color: #4154f1;
+}

src/military/task/taskList/index.jsx

@@ -163,7 +163,8 @@ export default ({ history, current_user, showLoginDialog, location }) => {
           });
         } else {
           Modal.info({
-            content: '您没有权限需求提报'
+            content: '您没有权限需求提报',
+            className:'failByPression'
           });
         }
       }
@@ -227,7 +228,7 @@ export default ({ history, current_user, showLoginDialog, location }) => {
               onSearch={(value) => { setSearchInput(value); setCurPage(1); }}
             />
 
-            <Button className="mr20 font-12" type="primary" onClick={goAdd}><i className="iconfont icon-zaibianji font-12 mr3"></i>需求提报</Button>
+            <Button className="mr20 font-12 demand_submission" type="primary" onClick={goAdd}><i className="iconfont icon-zaibianji font-12 mr3"></i>需求提报</Button>
 
           </div>
         </div>

src/modules/courses/css/Courses.css

@@ -580,7 +580,7 @@ span.CodeMirror-selectedtext {
 
 
 body #root {
-  background: #fff;
+  background: #f5f5f5;
 }
 
 .newedu-class-leftnav {
@@ -1531,7 +1531,7 @@ samp {
 }
 
 .ant-input-search-icon:hover {
-  color: #4CACFF !important;
+  /* color: #4CACFF !important; */
 }
 
 .coursehomework:hover .activity-title {

src/modules/tpm/TPMIndex.css

@@ -32,7 +32,7 @@ body>.-task-title {
   position: fixed;
   background: #fff;
   color: #333;
-  box-shadow: 0 0 12px rgb(0 ,0 ,0,10%);
+  /* box-shadow: 0 0 12px rgb(0 ,0 ,0,10%); */
 }
 .newHeaders.publicNav{
   position: absolute;
@@ -103,7 +103,7 @@ body>.-task-title {
 }
 
 .newContainer {
-  background: #fff;
+  background: #fafafa;
 }
 
 .ant-modal-title {