Skip to content

X
xiaomai-cloud-class-web
Commit 00785b96 by zhangleyuan
Options

style:按照UI规范修改样式

parent 5cf1384a
Showing with 37 additions and 24 deletions
src/core/antd.less
...@@ -689,6 +689,15 @@ mr0 { ...@@ -689,6 +689,15 @@ mr0 {
border:none !important; border:none !important;
} }
//disabled的按钮的样式
.ant-btn-primary[disabled], .ant-btn-primary[disabled]:hover, .ant-btn-primary[disabled]:focus, .ant-btn-primary[disabled]:active{
background: #F7F8F9 !important;
border: 1px solid #E8E8E8 !important;
color: #CCCCCC !important;
span{
color: #CCCCCC !important;
}
}
//时间选择器后的按钮样式 //时间选择器后的按钮样式
.ant-picker-ok{ .ant-picker-ok{
.ant-btn{ .ant-btn{
......
src/modules/course-manage/AddLive.jsx
...@@ -187,9 +187,6 @@ class AddLive extends React.Component { ...@@ -187,9 +187,6 @@ class AddLive extends React.Component {
assistantStoreUserId assistantStoreUserId
} }
// liveCourseMediaRequests = liveCourseMediaRequests.length
// ? [...liveCourseMediaRequests]
// : [{ contentType:"INTRO",mediaType: 'TEXT', mediaContent: '', key: window.random_string(16) }, ...liveCourseMediaRequests];
const addLiveIntroInfo = { const addLiveIntroInfo = {
liveCourseWarmMedia, liveCourseWarmMedia,
...@@ -242,15 +239,15 @@ handleChangeBasicInfo = (field, value) => { ...@@ -242,15 +239,15 @@ handleChangeBasicInfo = (field, value) => {
}); });
// 批量开始时间改变，结束时间自动同步一致 // 批量开始时间改变，结束时间自动同步一致
if (field === 'startTime') { // if (field === 'startTime') {
this.setState({ // this.setState({
addLiveClassInfo: { // addLiveClassInfo: {
...this.state.addLiveClassInfo, // ...this.state.addLiveClassInfo,
[field]: _value, // [field]: _value,
endTime: _value, // endTime: _value,
} // }
}); // });
} // }
} }
// 修改简介 // 修改简介
...@@ -359,9 +356,6 @@ handleChangeBasicInfo = (field, value) => { ...@@ -359,9 +356,6 @@ handleChangeBasicInfo = (field, value) => {
updateUserId:User.getUserId(), updateUserId:User.getUserId(),
liveCourseId: id, liveCourseId: id,
} }
// if(params.liveCourseWarmMedia && !params.liveCourseWarmMedia.mediaUrl) {
// delete params.liveCourseWarmMedia
// }
CourseService.updateLiveCloudCourse(params).then((res) => { CourseService.updateLiveCloudCourse(params).then((res) => {
if (res.success){ if (res.success){
message.success("更新成功"); message.success("更新成功");
......
src/modules/course-manage/components/AddLiveClass.jsx
...@@ -196,25 +196,27 @@ class AddLiveClass extends React.Component { ...@@ -196,25 +196,27 @@ class AddLiveClass extends React.Component {
<div className="hour" id="hour"> <div className="hour" id="hour">
<span className="label"><span className="require">*</span>上课时间：</span> <span className="label"><span className="require">*</span>上课时间：</span>
<TimePicker <TimePicker
className="time-picker"
format="HH:mm" format="HH:mm"
value={startTime ? moment(startTime) : null} value={startTime ? moment(startTime) : null}
placeholder="开始时间" placeholder="开始时间"
showNow={false}
style={{ width: 100, minWidth: 100}} style={{ width: 100, minWidth: 100}}
onChange={(time) => { onSelect={(time) => {
console.log('startTime',time);
this.props.onChange('startTime', time); this.props.onChange('startTime', time);
}} }}
getPopupContainer={() => getPopupContainer={() =>
document.getElementById("hour") document.getElementById("hour")
} }
/>&nbsp;&nbsp;~&nbsp;&nbsp; />&nbsp;&nbsp;~&nbsp;&nbsp;
<TimePicker <TimePicker
className="time-picker"
format="HH:mm" format="HH:mm"
value={endTime ? moment(endTime) : null} value={endTime ? moment(endTime) : null}
placeholder="结束时间" placeholder="结束时间"
showNow={false}
style={{ width: 100, minWidth: 100 }} style={{ width: 100, minWidth: 100 }}
onChange={(time) => { onSelect={(time) => {
this.props.onChange('endTime', time) this.props.onChange('endTime', time)
}} }}
getPopupContainer={() => getPopupContainer={() =>
...@@ -251,7 +253,8 @@ class AddLiveClass extends React.Component { ...@@ -251,7 +253,8 @@ class AddLiveClass extends React.Component {
getPopupContainer={() => getPopupContainer={() =>
document.getElementById("time") document.getElementById("time")
} }
onChange={(time) => { this.props.onChange('timeHorizonStart', time) }} onSelect={(time) => { this.props.onChange('timeHorizonStart', time) }}
showNow={false}
/> />
<TimePicker <TimePicker
disabled={!isEdit} disabled={!isEdit}
...@@ -263,7 +266,8 @@ class AddLiveClass extends React.Component { ...@@ -263,7 +266,8 @@ class AddLiveClass extends React.Component {
getPopupContainer={() => getPopupContainer={() =>
document.getElementById("time") document.getElementById("time")
} }
onChange={(time) => { this.props.onChange('timeHorizonEnd', time) }} onSelect={(time) => { this.props.onChange('timeHorizonEnd', time) }}
showNow={false}
/> />
</div> </div>
......
src/modules/course-manage/components/AddLiveClass.less
...@@ -204,4 +204,9 @@ ...@@ -204,4 +204,9 @@
.multiple-calendar { .multiple-calendar {
line-height: 40px; line-height: 40px;
} }
.ant-picker-dropdown{
.ant-picker-footer{
display:none !important;
}
}
} }
\ No newline at end of file
src/modules/root/App.tsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2019-07-10 10:30:49 * @Date: 2019-07-10 10:30:49
* @LastEditors: wufan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-01-18 21:22:33 * @LastEditTime: 2021-02-02 16:42:04
* @Description: * @Description:
*/ */
import React, { useContext, useEffect, useState } from 'react'; import React, { useContext, useEffect, useState } from 'react';
...@@ -77,7 +77,7 @@ const App: React.FC = (props: any) => { ...@@ -77,7 +77,7 @@ const App: React.FC = (props: any) => {
return ( return (
<div id="home"> <div id="home">
<Header handleMenuType={handleMenuType} menuType={menuType} /> <Header handleMenuType={handleMenuType} menuType={menuType} />
<ConfigProvider locale={zhCN} > <ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
<Main menuType={menuType} /> <Main menuType={menuType} />
</ConfigProvider> </ConfigProvider>
<Menu menuType={menuType} /> <Menu menuType={menuType} />
......
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