From a2d1b9886b00b5f4d4722c3379d3bd4f2f94b421 Mon Sep 17 00:00:00 2001
From: LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
Date: Mon, 09 Mar 2020 17:02:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/page/SignIn.jsx | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/SunshineIns/src/page/SignIn.jsx b/SunshineIns/src/page/SignIn.jsx
index 539dd09..c6a8bd5 100644
--- a/SunshineIns/src/page/SignIn.jsx
+++ b/SunshineIns/src/page/SignIn.jsx
@@ -56,17 +56,18 @@
return (
<div className="app-page">
<Spin spinning={loading}>
- <Affix style={{ position: 'absolute', top: 520, right: 20 }}>
+ {/* <Affix style={{ position: 'absolute', top: 520, right: 20 }}>
<Card>
< img style={{ width: '150px', height: '150px' }} src={`data:image/png;base64,${code}`} alt=""></img>
</Card>
- </Affix>
+ </Affix> */}
<Card style={{ margin: "8%" }}>
<div>
- <Row type="flex" justify="center" align="middle" style={{ borderBottom: '1px solid #D8D8D8' }}>
- <Col style={{ color: '#3D444D', fontSize: 26, fontWeight: 'bold', lineHeight: '75px' }}>
- {activityName}
+ <Row type="flex" align="middle" style={{ borderBottom: '1px solid #D8D8D8' }}>
+ <Col span={20} style={{ color: '#3D444D', fontSize: 26, fontWeight: 'bold', lineHeight: '75px' }}>
+ 活动标题：{activityName}
</Col>
+ <Col>< img style={{ width: '150px', height: '150px' }} src={`data:image/png;base64,${code}`} alt=""></img></Col>
</Row>
</div>
@@ -85,7 +86,7 @@
<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>
- )) : <span>暂无数据</span>
+ )) : <div style={{height:'150px'}}>暂无人员签到</div>
}
</div>
</Card>
--
Gitblit v1.8.0