Commit 39f35e25 by wufan

style:UI验收3优化

parent 0db8cc95
...@@ -8,9 +8,10 @@ ...@@ -8,9 +8,10 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
z-index:3; z-index:3;
background-color: #F0F2F5; background-color: #fff;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
height: 100%;
.page { .page {
position: fixed; position: fixed;
top: 60px; top: 60px;
...@@ -24,9 +25,6 @@ ...@@ -24,9 +25,6 @@
&:first-child{ &:first-child{
margin-bottom: 8px; margin-bottom: 8px;
} }
// &+.box{
// margin: 8px 16px;
// }
&:last-child{ &:last-child{
margin-bottom: 16px; margin-bottom: 16px;
} }
......
...@@ -27,7 +27,7 @@ class PreviewGraphicsModal extends React.Component { ...@@ -27,7 +27,7 @@ class PreviewGraphicsModal extends React.Component {
footer={null} footer={null}
maskClosable={false} maskClosable={false}
closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>} closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
className="preview-live-graphics-modal" className="preview-graphics-modal"
> >
<div className="container__wrap"> <div className="container__wrap">
<div className="container"> <div className="container">
......
.preview-live-graphics-modal { .preview-graphics-modal {
.ant-modal-body { .ant-modal-body {
background-image: url('https://image.xiaomaiketang.com/xm/xZWdziTCAf.png'); background-image: url('https://image.xiaomaiketang.com/xm/xZWdziTCAf.png');
background-size: 100% 100%; background-size: 100% 100%;
...@@ -13,13 +13,12 @@ ...@@ -13,13 +13,12 @@
} }
.container { .container {
overflow: scroll; overflow: auto;
height: 100%;; height: 100%;;
.course-cover, .course-url { .course-cover, .course-url {
width: 100%; width: 100%;
height: 141px; height: 141px;
background: #000;
} }
&__body { &__body {
...@@ -55,7 +54,6 @@ ...@@ -55,7 +54,6 @@
font-size: 12px; font-size: 12px;
color: #333333; color: #333333;
padding: 0 10px; padding: 0 10px;
border-bottom: 1px solid #E8E8E8;
.title-word { .title-word {
position: relative; position: relative;
margin-right: 15px; margin-right: 15px;
......
...@@ -108,7 +108,7 @@ class PreviewOfflineModal extends React.Component { ...@@ -108,7 +108,7 @@ class PreviewOfflineModal extends React.Component {
footer={null} footer={null}
maskClosable={false} maskClosable={false}
closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>} closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
className="preview-live-graphics-modal" className="preview-offline-modal"
> >
<div className="container__wrap"> <div className="container__wrap">
<div className="container"> <div className="container">
......
.preview-live-graphics-modal { .preview-offline-modal {
.ant-modal-body { .ant-modal-body {
background-image: url('https://image.xiaomaiketang.com/xm/xZWdziTCAf.png'); background-image: url('https://image.xiaomaiketang.com/xm/xZWdziTCAf.png');
background-size: 100% 100%; background-size: 100% 100%;
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
} }
.container { .container {
overflow: scroll; overflow: auto;
height: 100%;; height: 100%;;
&__header { &__header {
position: relative; position: relative;
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
.data-box { .data-box {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-left: 10px;
.data-item { .data-item {
position: relative; position: relative;
height: 156px; height: 156px;
...@@ -131,6 +132,7 @@ ...@@ -131,6 +132,7 @@
.study-box { .study-box {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-left: 10px;
.study-item { .study-item {
position: relative; position: relative;
height: 414px; height: 414px;
...@@ -311,8 +313,7 @@ ...@@ -311,8 +313,7 @@
width: 100%; width: 100%;
height: 432px; height: 432px;
background: #fff; background: #fff;
padding: 16px; padding: 16px 16px 32px 26px;
padding-bottom: 32px;
.study-title { .study-title {
font-size: 14px; font-size: 14px;
color: #333; color: #333;
......
...@@ -10,7 +10,7 @@ import Bus from '@/core/bus'; ...@@ -10,7 +10,7 @@ import Bus from '@/core/bus';
import './LearningData.less'; import './LearningData.less';
const userRole = User.getUserRole(); const userRole = User.getUserRole();
const defaultCover = 'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'; const defaultCover = 'https://image.xiaomaiketang.com/xm/rEAetaTEh3.png';
class LearningData extends React.Component { class LearningData extends React.Component {
constructor(props) { constructor(props) {
......
...@@ -182,7 +182,7 @@ class UserLearningData extends React.Component { ...@@ -182,7 +182,7 @@ class UserLearningData extends React.Component {
{ {
title: <span> title: <span>
<span>负责人</span> <span>负责人</span>
<Tooltip title="培训计划的分享者/跟进人"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip> <Tooltip title="培训计划的分享者/跟进人"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:"400"}}>&#xe61d;</i></Tooltip>
</span>, </span>,
key: 'userNameList', key: 'userNameList',
dataIndex: 'userNameList', dataIndex: 'userNameList',
...@@ -225,7 +225,7 @@ class UserLearningData extends React.Component { ...@@ -225,7 +225,7 @@ class UserLearningData extends React.Component {
{ {
title: <span> title: <span>
<span>学习进度</span> <span>学习进度</span>
<Tooltip title="学员培训计划中达到“已完成”状态的课程数/总课程数"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip> <Tooltip title="学员培训计划中达到“已完成”状态的课程数/总课程数"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px', fontWeight:"400"}}>&#xe61d;</i></Tooltip>
</span>, </span>,
key: 'learnNum', key: 'learnNum',
dataIndex: 'learnNum', dataIndex: 'learnNum',
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
margin-bottom: 12px; margin-bottom: 12px;
.label{ .label{
font-size:14px; font-size:14px;
color:#666; color:#333;
vertical-align: middle; vertical-align: middle;
width:70px; width:70px;
text-align:right; text-align:right;
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
.ant-tabs-tab-active { .ant-tabs-tab-active {
.ant-tabs-tab-btn { .ant-tabs-tab-btn {
color: #333333; color: #333333;
font-weight:bold; font-weight:500!important;
} }
} }
.ant-tabs-nav::before { .ant-tabs-nav::before {
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
display: -webkit-flex; display: -webkit-flex;
flex-direction: column; flex-direction: column;
-webkit-flex-direction: column; -webkit-flex-direction: column;
height: 100%;
.nav { .nav {
-webkit-flex: 1; -webkit-flex: 1;
......
...@@ -37,7 +37,8 @@ export default function WechatLogin(props: any) { ...@@ -37,7 +37,8 @@ export default function WechatLogin(props: any) {
text: redirect, text: redirect,
correctLevel: 2, correctLevel: 2,
size: 180, size: 180,
image: 'https://image.xiaomaiketang.com/xm/Newk4NrxKC.png', // image: 'https://image.xiaomaiketang.com/xm/Newk4NrxKC.png',
image: 'https://image.xiaomaiketang.com/xm/bFkRBz7teA.png',
imageSize: 50 imageSize: 50
}); });
qrcodeWrapDom.innerHTML = ''; qrcodeWrapDom.innerHTML = '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment