Merge pull request '修改图标' (#414) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military

src/military/competition/refer/ccks.jsx

@@ -172,7 +172,7 @@ function Introduce({ form, showNotification, match, history, enrollStatus, curre
                 cancelText=""
             >
                 <div className="tips mb10"><i className="iconfont icon-shanchu_tc_icon1 font-24 mr10" style={{ color: '#ffa13a' }}></i><span className="tipTitle font-16">确定提交作品</span></div>
-                <span>可重复提交，每天最多可提交三次作品!</span>
+                <span>可重复提交，每天最多可提交一次作品!</span>
             </Modal>
         </div>
     )

src/military/task/components/itemListTask/index.jsx

@@ -4,6 +4,7 @@ import { getImageUrl } from 'educoder';
 import Nodata from 'forge/Nodata';
 import { taskStatusAllArr } from '../../static';
 import Loading from "src/Loading";
+import chuangke_icon from '../../image/chuangke_icon.svg';
 import './index.scss';
 
 const statusArr = [];
@@ -31,9 +32,10 @@ export default (props) => {
               <div className="list-box" key={item.id}>
                 <div className="list-content">
                   <div className="list-title mb10" onClick={() => { itemClick(item.id) }}>
+                    {/* {item.enterpriseName=="taohuayuan" ||item.enterpriseName=="军工企业" && <div className="chuangke_icon">创客行动-2022</div>} */}
+                    {item.enterpriseName=="taohuayuan" && <img className="chuangke_icon" src={chuangke_icon}/>}
                     <div className="title-content text-ellipsis">{item.name}</div>
                     {/* 为创客行动特地加的标签，以后会去除 */}
-                    {item.enterpriseName=="taohuayuan"&& <span className="list-red">创客行动-2022</span>}
                     {item.status && <span className={classArr[item.status]}>{item.exceptClosedBoolean ? '已关闭' : statusArr[item.status]}</span>}
                     {(item.status !== 8) && item.delayTime.indexOf('延期') > -1 ? <span className="list-yellow">延期中</span>
                       : <React.Fragment>

src/military/task/components/itemListTask/index.scss

@@ -32,6 +32,27 @@
     display: inline-block;
     max-width: 80%;
   }
+  .chuangke_icon{
+    position: relative;
+    top:-10px;
+  }
+  // .chuangke_icon{
+  //   position: relative;
+  //   top:-8px;
+  //   background-image: url("../../image/chuangke_icon.png");
+  //   width: 140px;
+  //   height: 46px;
+  //   background-size: 100% 100%;
+  //   font-size: 14px;
+  //   color: #fff;
+  //   display: flex;
+  //   transform: scale(0.75);
+  //   justify-content: center;
+  //   align-items: center;
+  //   padding-left: 10px;
+  //   margin-right: -15px;
+  //   margin-left: -27px;
+  // }
 }
 .list-title:hover {
   color: #4154f1;
@@ -55,3 +76,4 @@
     margin-right: 5px;
   }
 }
+