From 016718f3e280a76d687758d77ced0541fd956cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Fri, 1 Jul 2022 20:50:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/competition/refer/ccks.jsx | 2 +- .../task/components/itemListTask/index.jsx | 4 +++- .../task/components/itemListTask/index.scss | 22 +++++++++++++++++++ src/military/task/image/chuangke_icon.svg | 13 +++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/military/task/image/chuangke_icon.svg diff --git a/src/military/competition/refer/ccks.jsx b/src/military/competition/refer/ccks.jsx index 515f76d2..4953bdaf 100644 --- a/src/military/competition/refer/ccks.jsx +++ b/src/military/competition/refer/ccks.jsx @@ -172,7 +172,7 @@ function Introduce({ form, showNotification, match, history, enrollStatus, curre cancelText="" >
确定提交作品
- 可重复提交，每天最多可提交三次作品! + 可重复提交，每天最多可提交一次作品! ) diff --git a/src/military/task/components/itemListTask/index.jsx b/src/military/task/components/itemListTask/index.jsx index 4ba7a79e..6626ee5c 100644 --- a/src/military/task/components/itemListTask/index.jsx +++ b/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) => {
{ itemClick(item.id) }}> + {/* {item.enterpriseName=="taohuayuan" ||item.enterpriseName=="军工企业" &&
创客行动-2022
} */} + {item.enterpriseName=="taohuayuan" && }
{item.name}
{/* 为创客行动特地加的标签，以后会去除 */} - {item.enterpriseName=="taohuayuan"&& 创客行动-2022} {item.status && {item.exceptClosedBoolean ? '已关闭' : statusArr[item.status]}} {(item.status !== 8) && item.delayTime.indexOf('延期') > -1 ? 延期中 : diff --git a/src/military/task/components/itemListTask/index.scss b/src/military/task/components/itemListTask/index.scss index 7accfd22..611912fb 100644 --- a/src/military/task/components/itemListTask/index.scss +++ b/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; } } + diff --git a/src/military/task/image/chuangke_icon.svg b/src/military/task/image/chuangke_icon.svg new file mode 100644 index 00000000..18b9a37f --- /dev/null +++ b/src/military/task/image/chuangke_icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + +