xxq250
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request '修复推荐创客的状态控制' (#321) from tongChong/forgeplus-react:feature_jk_homepage into pre_dev_military

This commit is contained in:
xxq250 2021-12-16 15:59:58 +08:00
parent 7ee151e652 c14ee5c359
commit 070f869aa6
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/home/SecondSection/index.jsx
View File

@ -84,13 +84,13 @@ function SecondSection({ second ,main_web_site_url}) {
<div className="home-second-section-slide">
<Slider {...setting}>
{
list.map((item, i) => {
list&&list.map((item, i) => {
return (
<div className="news-slide-item" key={i}>
<div className="slide-title" onClick={() => { goDetail(item.fake_id) }}>
<div className="slide-title" >
<span className="order-num">{i + 1}</span>
<h3 className="slide-title-content ellipsis-1 link">{item.title}</h3>
<span className={`slide-tag slide-tag-${item.type}`}>{item.tag}</span>
<h3 className="slide-title-content ellipsis-1 link" onClick={() => { goDetail(item.fake_id) }}>{item.title}</h3>
<span className="slide-tag">{item.tag}</span>
</div>
<p className="ellipsis-2">{item.content}</p>
<span className="news-time">{item.created_time && item.created_time.split(' ')[0]}</span>

23
src/home/SecondSection/index.scss
View File

@ -134,18 +134,6 @@
border-radius: .2em;
}
.slide-tag-1{
background: #586dff;
}
.slide-tag-2 {
background: #e53939;
}
.slide-tag-3 {
background: #ff7300;
}
.news-time {
font-size: .95em;
@ -164,4 +152,15 @@
margin-left: 100px;
}
.slick-slide:nth-child(n) .slide-tag{
background: #586dff;
}
.slick-slide:nth-child(2n) .slide-tag{
background: #e53939;
}
.slick-slide:nth-child(3n) .slide-tag{
background: #ff7300;
}
}

4
src/home/SeventhSection/index.jsx
View File

@ -56,7 +56,7 @@ function SeventhSection({ main_web_site_url }) {
<Line />
<div className="clients">
{
list.map((item, i) => {
list&& list.map((item, i) => {
return (<img className="client link" key={i} src={getTestImage(item.image_url)} onClick={() => { goDetail(item.fake_login) }} alt="images-not_found" />)
})
}
@ -66,7 +66,7 @@ function SeventhSection({ main_web_site_url }) {
</div>
<Slider {...setting}>
{
list.map((item, i) => {
list&& list.map((item, i) => {
return (<div className="issue-item" key={i} >
<img className="author-head link" src={getTestImage(item.image_url)} onClick={() => { goDetail(item.fake_login) }} alt="images-not_found" />
<span className="issue-author link" onClick={() => { goDetail(item.fake_login) }}>{item.name}</span>

9
src/military/task/taskAdmin/index.jsx
View File

@ -59,7 +59,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
}
setLoading(false);
})
}, [statusString, order, sort, publishMode, showUserMode, curPage, searchObj, isDelete, reload ,recommend]);
}, [statusString, order, sort, publishMode, showUserMode, curPage, searchObj, isDelete, reload, recommend]);
const helper = useCallback(
@ -212,8 +212,11 @@ export default Form.create()(({ form, showNotification, match, history }) => {
}
{
record.recommend ? <Button className="mr5 font-12" type="danger" size="small" onClick={() => { recommendItem(record.id, '0') }}>撤销推荐</Button>
: <Button className="mr5 font-12" type="primary" size="small" onClick={() => { recommendItem(record.id, '1') }}>首页推荐</Button>
!record.recommend && [3, 4, 5, 6, 7, 8].includes(record.status) && <Button className="mr5 font-12" type="primary" size="small" onClick={() => { recommendItem(record.id, '1') }}>首页推荐</Button>
}
{
record.recommend && <Button className="mr5 font-12" type="danger" size="small" onClick={() => { recommendItem(record.id, '0') }}>撤销推荐</Button>
}
{/* <Link className="line_1 color-grey3" to={`/task/taskDetail/${record.taskId}`}>查看</Link> */}