From 12e9a4001d693505cc044fe2df0614257c26d535 Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Sat, 14 Mar 2020 21:40:31 +0800
Subject: [PATCH] bug修复
---
SunshineIns/src/page/SignIn.jsx | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/SunshineIns/src/page/SignIn.jsx b/SunshineIns/src/page/SignIn.jsx
index c6a8bd5..b1c8084 100644
--- a/SunshineIns/src/page/SignIn.jsx
+++ b/SunshineIns/src/page/SignIn.jsx
@@ -17,6 +17,7 @@
{ name: '六号' },
{ name: '七号' },
]
+const { Meta } = Card;
export default class SignIn extends React.Component {
constructor(props) {
super(props);
@@ -63,7 +64,7 @@
</Affix> */}
<Card style={{ margin: "8%" }}>
<div>
- <Row type="flex" align="middle" style={{ borderBottom: '1px solid #D8D8D8' }}>
+ <Row type="flex" align="middle" style={{ borderBottom: '1px solid #D8D8D8' }}>
<Col span={20} style={{ color: '#3D444D', fontSize: 26, fontWeight: 'bold', lineHeight: '75px' }}>
活动标题：{activityName}
</Col>
@@ -71,24 +72,39 @@
</Row>
</div>
- <div style={{ display: 'flex' }}>
+ <div style={{ display: 'flex', }}>
{
personList.length > 0 ? personList.map((item, index) => (
- <div style={{ display: 'flex', flexWrap: 'wrap', flexDirection: 'column', width: '168px', height: '168px', justifyContent: 'center', alignItems: 'center',color:'#fff',textAlign:'center',lineHeight:'150px' }} key={index}>
- <img src={item.imgUrl} style={{ width: '150px', height: '150px' }} />
- {
- item.signStatus !== 3 ?
- <div style={{ width: '150px', height: '150px', backgroundColor: '#000', opacity: '0.2', position: 'absolute' }}>未签到</div> : ''
- }
+ <div style={{ border: '1px solid #eee', borderRadius: '4px', margin: '6px 0', padding: '6px 0' }} key={index}>
+ <div style={{ display: 'flex', flexWrap: 'wrap', flexDirection: 'column', width: '168px', height: '168px', justifyContent: 'center', alignItems: 'center', color: '#fff', textAlign: 'center', lineHeight: '150px' }} >
+ <img src={item.imgUrl} style={{ width: '150px', height: '150px' }} />
+ {
+ item.signStatus !== 3 ?
+ <div style={{ width: '150px', height: '150px', backgroundColor: '#000', opacity: '0.2', position: 'absolute' }}>未签到</div> : ''
+ }
+ {
+ item.signStatus == 3 ?
+ // <div style={{ width: '150px', height: '50px', color:'#000', position: 'absolute' }}>签到时间：{moment(item.updateTime).format(format)}</div> : ''
+ <div style={{ width: '150px', height: '150px', color: '#000', position: 'absolute', display: 'flex', justifyContent: 'flex-end' }}><Icon type="check-circle" style={{ fontSize: '32px' }} theme="twoTone" twoToneColor="#52c41a" /></div> : ''
+ }
+ </div>
{
item.signStatus == 3 ?
- // <div style={{ width: '150px', height: '50px', color:'#000', position: 'absolute' }}>签到时间：{moment(item.updateTime).format(format)}</div> : ''
- <div style={{ width: '150px', height: '150px', color:'#000', position: 'absolute', display:'flex',justifyContent:'flex-end' }}><Icon type="check-circle" style={{fontSize:'32px'}} theme="twoTone" twoToneColor="#52c41a" /></div> : ''
+ <div style={{ padding: '0 12px',width:'168px' }}>
+ <div>签到人：{item.proposerName}</div>
+ <div>签到时间：{moment(item.updateTime).format(format)}</div>
+ </div> : ''
}
+ {/* <Card hoverablestyle={{ width: 240 }} cover={<img alt='example' src={item.imgUrl} />}>
+ <Meta title={item.proposerName} description={item.updatetime} />
+ </Card> */}
</div>
- )) : <div style={{height:'150px'}}>暂无人员签到</div>
+
+ )) : <div style={{ height: '150px' }}>暂无人员签到</div>
}
</div>
+
+
</Card>
</Spin>
</div>
--
Gitblit v1.8.0