Skip to content

X
xiaomai-cloud-class-web
Commit 9417fce0 by guomingpang
Options

Merge branch 'master' into rc

parents 8ac4b55e b6e69746
Showing with 634 additions and 532 deletions
config/webpack.config.js
...@@ -124,8 +124,8 @@ module.exports = function (webpackEnv) { ...@@ -124,8 +124,8 @@ module.exports = function (webpackEnv) {
options: { options: {
lessOptions: { lessOptions: {
modifyVars: { modifyVars: {
'primary-color': 'rgba(255, 183, 20, 1)', 'primary-color': '#2966FF',
'border-radius-base': '4px' 'border-radius-base': '2px',
}, },
javascriptEnabled: true javascriptEnabled: true
} }
......
src/bu-components/ChooseMembersModal.less
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
.span-left{ .span-left{
margin-left: 10px; margin-left: 10px;
.span-left-l{ .span-left-l{
color: #ffb714; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
margin-right: 10px; margin-right: 10px;
color: #999; color: #999;
.span-right-l{ .span-right-l{
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
......
src/bu-components/CopyFileModal.less
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
.bread:hover{ .bread:hover{
color: #5289FA; color: #2966FF;
} }
} }
......
src/bu-components/ManagingMembersModal.less
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.managing-right{ .managing-right{
float: right; float: right;
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
.tool-tip-right{ .tool-tip-right{
margin-right: 4px; margin-right: 4px;
......
src/bu-components/SelectPrepareFileModal.less
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
&:not(:last-child) { &:not(:last-child) {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #5289FA; color: #2966FF;
} }
&::before { &::before {
content: '/'; content: '/';
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
} }
.footer__left { .footer__left {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
......
src/bu-components/ShareLiveModal.less
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
margin-top: 40px; margin-top: 40px;
.content { .content {
color: #FF7519; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
......
src/bu-components/ShowTip.less
.xm-show-tip { .xm-show-tip {
position: relative; position: relative;
min-height:32px; min-height:32px;
background:#FFF4DD; background:#E9EFFF;
border-radius:4px; border-radius:4px;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
padding: 0 12px; padding: 0 12px;
line-height: 32px; line-height: 32px;
span.icon { span.icon {
color:#FF9D14; color:#2966FF;
line-height: 20px; line-height: 20px;
} }
p { p {
......
src/bu-components/UploadProgressModal.jsx
...@@ -316,7 +316,7 @@ class UploadProgressModal extends React.Component { ...@@ -316,7 +316,7 @@ class UploadProgressModal extends React.Component {
return ( return (
<div <div
className="file-item" className={`file-item ${file.status === 'fail' ? 'fail':''}`}
key={`file-item${index}`} key={`file-item${index}`}
> >
......
src/bu-components/UploadProgressModal.less
...@@ -54,6 +54,9 @@ ...@@ -54,6 +54,9 @@
line-height: 50px; line-height: 50px;
padding: 0 24px; padding: 0 24px;
position: relative; position: relative;
&.fail {
background-color: rgba(255, 79, 79, 0.06);
}
&:not(:last-child) { &:not(:last-child) {
margin-bottom: 4px; margin-bottom: 4px;
......
src/common/js/axios.ts
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-31 09:34:31 * @Date: 2020-08-31 09:34:31
* @LastEditors: zhangleyuan * @LastEditors: wufan
* @LastEditTime: 2021-04-27 16:59:07 * @LastEditTime: 2021-05-27 10:42:12
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
import qs from 'qs';
import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosPromise, AxiosError } from 'axios'; import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosPromise, AxiosError } from 'axios';
import { message } from 'antd'; import { message } from 'antd';
......
src/components/Breadcrumbs.less
@import "../core/variables.less"; @import "../core/variables.less";
.xm-breadCrumb { .xm-breadCrumb{
margin-left: 16px; padding-left: 16px;
color: #989898; color: #989898;
margin-top: 10px; padding-top: 16px;
margin-bottom: 10px; padding-bottom: 8px;
+ .statistic-tips { background: #fff;
width: calc(100vw - 218px);
+.statistic-tips{
position: relative; position: relative;
top: -8px; top: -8px;
margin-bottom: 0px !important; margin-bottom: 0px !important;
......
src/components/CheckBeforeSendCode.less
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
color: #666; color: #666;
} }
.nc_iconfont { .nc_iconfont {
color: #FFB714; color: #2966FF;
font-weight: bold; font-weight: bold;
border-color: #e8e8e8; border-color: #e8e8e8;
height: 40px; height: 40px;
...@@ -26,11 +26,12 @@ ...@@ -26,11 +26,12 @@
box-sizing: border-box; box-sizing: border-box;
} }
.nc_scale .nc_ok, .nc_scale .nc_bg { .nc_scale .nc_ok, .nc_scale .nc_bg {
background: #FFB714; background: #2966FF;
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
opacity: 0.3;
} }
.nc_scale .btn_ok { .nc_scale .btn_ok {
color: #FFB714; color: #2966FF;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
box-sizing: border-box; box-sizing: border-box;
...@@ -42,7 +43,7 @@ ...@@ -42,7 +43,7 @@
.nc-lang-cnt { .nc-lang-cnt {
color: #666; color: #666;
a { a {
color: #FFB714; color: #2966FF;
} }
} }
} }
......
src/components/MultipleDatePicker.less
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.multiple-calendar { .multiple-calendar {
width: 295px; width: 295px;
border: 1px solid #e8e8e8; border: 1px solid #e8e8e8;
border-radius: 4px; border-radius: 2px;
ul { ul {
list-style: none; list-style: none;
} }
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
cursor: default; cursor: default;
&:hover { &:hover {
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 2px;
} }
} }
.self { .self {
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
cursor: pointer; cursor: pointer;
vertical-align: top; vertical-align: top;
&:hover { &:hover {
background: rgba(255, 183, 20,.2); background: rgba(41, 102, 255, .1);
border-radius:4px; border-radius:2px;
} }
&.before-disabled { &.before-disabled {
color: #e8e8e8; color: #e8e8e8;
...@@ -81,11 +81,11 @@ ...@@ -81,11 +81,11 @@
&.active { &.active {
background: @xm-color-primary; background: @xm-color-primary;
color: #fff; color: #fff;
border-radius: 4px; border-radius: 2px;
} }
&.today { &.today {
border: 1px solid @xm-color-primary; border: 1px solid @xm-color-primary;
border-radius: 5px; border-radius: 2px;
} }
} }
} }
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
border-radius: none; border-radius: none;
span { span {
background: @xm-color-primary; background: @xm-color-primary;
border-radius: 4px; border-radius: 2px;
} }
&:hover { &:hover {
span { span {
...@@ -164,13 +164,13 @@ ...@@ -164,13 +164,13 @@
border-radius: none; border-radius: none;
span { span {
border: 1px solid @xm-color-primary; border: 1px solid @xm-color-primary;
border-radius: 5px; border-radius: 2px;
} }
} }
&.past { &.past {
span { span {
background:rgba(255,133,52,0.1); background:rgba(255,133,52,0.1);
border-radius: 4px; border-radius: 2px;
color:rgba(0,0,0,0.25); color:rgba(0,0,0,0.25);
} }
} }
......
src/components/ShowTips.less
.xm-show-tip { .xm-show-tip {
position: relative; position: relative;
min-height:32px; min-height:32px;
background:#FFF4DD; background:#E9EFFF;
border-radius:4px; border-radius:4px;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
padding: 0 12px; padding: 0 12px;
line-height: 32px; line-height: 32px;
.icon { .icon {
color:#FF9D14; color:#2966FF;
font-size:14px; font-size:14px;
} }
p { p {
......
src/components/TableSelectedData.less
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
min-width: 186px; min-width: 186px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
background: #FFF4DD; background: #E9EFFF;
padding: 0px 16px; padding: 0px 16px;
border-radius:4px; border-radius:4px;
margin: 16px 10px 13px 0; margin: 16px 10px 13px 0;
.iconfont { .iconfont {
color: #FF9D14; color: #2966FF;
} }
.selected-text { .selected-text {
margin-left: 10px; margin-left: 10px;
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.click-clear { .click-clear {
float: right; float: right;
cursor: pointer; cursor: pointer;
color: #5289FA; color: #2966FF;
&:hover { &:hover {
color: rgba(85, 168, 253, 0.8); color: rgba(85, 168, 253, 0.8);
} }
......
src/core/antd.less
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
@import './variables.less'; @import './variables.less';
@active-color: #2966ff; @active-color: #2966FF;
// 消息提示框 // 消息提示框
.ant-message { .ant-message {
...@@ -233,6 +233,10 @@ ...@@ -233,6 +233,10 @@
} }
} }
.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
font-weight: 500!important;
}
.ant-tabs-nav .ant-tabs-tab-active { .ant-tabs-nav .ant-tabs-tab-active {
color: @active-color !important; color: @active-color !important;
} }
...@@ -260,7 +264,7 @@ ...@@ -260,7 +264,7 @@
position: absolute; position: absolute;
width: 30px; width: 30px;
height: 4px; height: 4px;
background: #2966ff !important; background: #2966FF !important;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
...@@ -335,14 +339,14 @@ mr0 { ...@@ -335,14 +339,14 @@ mr0 {
background: #f3f6fa; background: #f3f6fa;
.ant-select-selected-icon { .ant-select-selected-icon {
color: #2966ff !important; color:#2966FF !important;
} }
} }
.ant-select-dropdown-menu-item-selected { .ant-select-dropdown-menu-item-selected {
background: none; background: none;
font-weight: 400 !important; font-weight: 400 !important;
color: #2966ff; color:#2966FF;
} }
.ant-select-open .ant-select-selection { .ant-select-open .ant-select-selection {
...@@ -440,7 +444,7 @@ mr0 { ...@@ -440,7 +444,7 @@ mr0 {
.ant-modal { .ant-modal {
.ant-input { .ant-input {
&:focus { &:focus {
border: 1px solid #2966ff !important; border: 1px solid #2966FF !important;
} }
} }
} }
...@@ -453,8 +457,8 @@ mr0 { ...@@ -453,8 +457,8 @@ mr0 {
.ant-calendar-footer-extra { .ant-calendar-footer-extra {
.ant-tag-blue { .ant-tag-blue {
background: #fff; background: #fff;
color: #2966ff; color: #2966FF;
border-color: #2966ff; border-color: #2966FF;
} }
} }
} }
...@@ -470,7 +474,7 @@ mr0 { ...@@ -470,7 +474,7 @@ mr0 {
} }
.ant-modal-confirm-info .ant-modal-confirm-body > .anticon { .ant-modal-confirm-info .ant-modal-confirm-body > .anticon {
color: #2966ff !important; color: #2966FF!important;
} }
.ant-breadcrumb > span:last-child .ant-breadcrumb-separator { .ant-breadcrumb > span:last-child .ant-breadcrumb-separator {
...@@ -498,7 +502,7 @@ mr0 { ...@@ -498,7 +502,7 @@ mr0 {
font-size: 22px !important; font-size: 22px !important;
line-height: 22px !important; line-height: 22px !important;
float: left !important; float: left !important;
color: #2966ff !important; color:#2966FF !important;
margin-right: 16px !important; margin-right: 16px !important;
&.blue { &.blue {
color: #5cbaff !important; color: #5cbaff !important;
...@@ -523,8 +527,8 @@ mr0 { ...@@ -523,8 +527,8 @@ mr0 {
float: left; float: left;
margin-right: 16px; margin-right: 16px;
} }
> .confirm-icon { >.confirm-icon{
color: #2966ff; color: #2966FF;
} }
.ant-modal-confirm-content { .ant-modal-confirm-content {
margin-left: 38px; margin-left: 38px;
...@@ -590,9 +594,9 @@ mr0 { ...@@ -590,9 +594,9 @@ mr0 {
// background: #FAFAFA !important; // background: #FAFAFA !important;
// } // }
.ant-table-thead > tr > th { .ant-table-thead > tr > th{
font-weight: bold !important; font-weight:bold !important;
color: #333 !important; color:#333 !important;
} }
td.ant-table-column-sort { td.ant-table-column-sort {
background: none; background: none;
...@@ -653,12 +657,11 @@ td.ant-table-column-sort { ...@@ -653,12 +657,11 @@ td.ant-table-column-sort {
border-color: @xm-color-text-select-primary !important; border-color: @xm-color-text-select-primary !important;
border: none !important; border: none !important;
&:hover { &:hover {
background-color: #2966ff !important; background-color: #2966FF !important;
opacity: 0.8 !important; opacity: 0.8 !important;
} }
&:focus, &:active{
&:active { background-color:#5C8AFF !important;
background-color: #5c8aff !important;
} }
} }
...@@ -716,9 +719,10 @@ td.ant-table-column-sort { ...@@ -716,9 +719,10 @@ td.ant-table-column-sort {
box-shadow: none !important; box-shadow: none !important;
border-right: 0px !important; border-right: 0px !important;
} }
.ant-input-search > .ant-input-group > .ant-input-group-addon:last-child .ant-input-search-button span {
color: #bfbfbf !important; .ant-input-search > .ant-input-group > .ant-input-group-addon:last-child .ant-input-search-button span{
font-size: 12px; color:#bfbfbf !important;
font-size:12px;
} }
.ant-modal-footer { .ant-modal-footer {
...@@ -769,3 +773,4 @@ td.ant-table-column-sort { ...@@ -769,3 +773,4 @@ td.ant-table-column-sort {
.ant-table-column-sorter-full { .ant-table-column-sorter-full {
margin-top: -0.32rem !important; margin-top: -0.32rem !important;
} }
src/core/global.less
...@@ -1602,7 +1602,7 @@ input:focus { ...@@ -1602,7 +1602,7 @@ input:focus {
font-size: 22px !important; font-size: 22px !important;
line-height: 22px !important; line-height: 22px !important;
float: left !important; float: left !important;
color: #FFB714 !important; color: #2966FF !important;
margin-right: 16px !important; margin-right: 16px !important;
} }
...@@ -1678,11 +1678,11 @@ input:focus { ...@@ -1678,11 +1678,11 @@ input:focus {
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
.operate-text { .operate-text {
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.operate__item { .operate__item {
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
&.split { &.split {
margin: 0 8px; margin: 0 8px;
...@@ -1690,7 +1690,7 @@ input:focus { ...@@ -1690,7 +1690,7 @@ input:focus {
} }
} }
.more{ .more{
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
cursor: pointer; cursor: pointer;
} }
......
src/core/page.less
...@@ -7,26 +7,25 @@ ...@@ -7,26 +7,25 @@
left: 0px; left: 0px;
right: 0; right: 0;
bottom: 0; bottom: 0;
z-index: 101; 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;
min-height: 100%;
.page { .page {
position: fixed; position: fixed;
top: 50px; top: 60px;
left: 180px; left: 180px;
right: 0; right: 0;
bottom: 0; bottom: 0;
z-index: 102; z-index: 102;
overflow: auto; overflow: auto;
.box { margin:0 16px;
&:first-child { .box{
&:first-child{
margin-bottom: 8px; margin-bottom: 8px;
} }
& + .box { &:last-child{
margin: 8px 16px;
}
&:last-child {
margin-bottom: 16px; margin-bottom: 16px;
} }
} }
...@@ -47,13 +46,12 @@ ...@@ -47,13 +46,12 @@
line-height: 30px; line-height: 30px;
} }
.content-header { .content-header {
padding: 16px 16px; padding: 16px 16px 8px 16px;
line-height: 30px; line-height: 30px;
background: #fff; font-size:24px;
margin: 16px 16px 0; color:#333;
font-size: 24px; font-weight:bold;
color: #333; background: #FFF;
font-weight: 500;
h1 { h1 {
font-weight: normal; font-weight: normal;
display: inline-block; display: inline-block;
...@@ -62,9 +60,8 @@ ...@@ -62,9 +60,8 @@
.box { .box {
padding: 16px; padding: 16px;
margin: 0 16px;
background: #ffffff; background: #ffffff;
// min-height: 400px; // min-height: calc(100vh - 126px);
.box-header { .box-header {
line-height: 30px; line-height: 30px;
padding-bottom: 12px; padding-bottom: 12px;
...@@ -91,16 +88,7 @@ ...@@ -91,16 +88,7 @@
.box-footer { .box-footer {
margin-top: 16px; margin-top: 16px;
} }
&:first-child {
margin-bottom: 8px;
}
& + .box {
margin: 8px 16px;
}
} }
// .ant-calendar-picker{
// top:-1px;
// }
} }
.box-header { .box-header {
......
src/core/variables.less
@sunLight: #FED951; @sunLight: #FED951;
@sun: #FFB714; @sun: #2966FF;
@sunDark: #FFB714; @sunDark: #2966FF;
@orangeLight: #FDBB70; @orangeLight: #FDBB70;
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
//old //old
//color //color
@xm-color-primary:#FFB714; @xm-color-primary:#2966FF;
@xm-color-primary_active: #020201; @xm-color-primary_active: #020201;
@xm-color-primary-darker: #ff8534; @xm-color-primary-darker: #ff8534;
@xm-color-selected: #F58E2C; @xm-color-selected: #F58E2C;
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
@xm-color-secondary-light: #e28534; @xm-color-secondary-light: #e28534;
@xm-color-secondary: #ff8534; @xm-color-secondary: #ff8534;
@xm-color-secondary-darker: #D65E30; @xm-color-secondary-darker: #D65E30;
@xm-color-text-select-primary:#FFB714; @xm-color-text-select-primary:#2966FF;
@xm-color-text-select-warning:#ec4b35; @xm-color-text-select-warning:#ec4b35;
@xm-color-info: #45b2ff; @xm-color-info: #45b2ff;
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
@xm-table-tbody-color:#666; @xm-table-tbody-color:#666;
//侧边栏宽度 //侧边栏宽度
@xm-left-width:180px; @xm-left-width:180px;
@xm-left-min-width:64px; @xm-left-min-width:56px;
@xm-color-text-menu:#9a9dA7; @xm-color-text-menu:#9a9dA7;
// 下拉框 // 下拉框
......
src/h5.html
<!-- <!--
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-24 12:20:57 * @Date: 2020-08-24 12:20:57
* @LastEditors: zhangleyuan * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-05-10 13:41:44 * @LastEditTime: 2021-05-26 16:26:17
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
--> -->
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
--> -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_e0vkqcd8igi.css"> <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_oqqm4z9s35j.css">
<!-- <!--
Notice the use of %PUBLIC_URL% in the tags above. Notice the use of %PUBLIC_URL% in the tags above.
......
src/index.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-24 12:20:57 * @Date: 2020-08-24 12:20:57
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2021-05-17 19:53:24 * @LastEditTime: 2021-05-27 10:24:06
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
--> -->
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
--> -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_e0vkqcd8igi.css"> <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_oqqm4z9s35j.css">
<!-- <!--
Notice the use of %PUBLIC_URL% in the tags above. Notice the use of %PUBLIC_URL% in the tags above.
......
src/modules/college-manage/EmployeeManage.less
.employee-manage-page{
.box-header{
margin-bottom:4px;
}
.add-show-btn{
margin-top:12px;
}
}
\ No newline at end of file
src/modules/college-manage/EmployeeManage.tsx
...@@ -263,7 +263,7 @@ function EmployeeManage() { ...@@ -263,7 +263,7 @@ function EmployeeManage() {
} }
return ( return (
<div className=" page employee-manage-page"> <div className="page employee-manage-page">
<div className="content-header">员工管理</div> <div className="content-header">员工管理</div>
<div className="box"> <div className="box">
<div className="box-header"> <div className="box-header">
...@@ -272,7 +272,7 @@ function EmployeeManage() { ...@@ -272,7 +272,7 @@ function EmployeeManage() {
display: "flex", display: "flex",
alignItems: "center", alignItems: "center",
justifyContent: "flex-start", justifyContent: "flex-start",
padding: "0px 0 16px", padding: "0px 0 4px",
}} }}
> >
<div> <div>
......
src/modules/college-manage/UserManagePage.less
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
.box-header { .box-header {
display: flex; display: flex;
width: calc(100% - 80px); width: calc(100% - 80px);
margin-bottom: 16px; margin-bottom: 4px;
.header-item { .header-item {
width: 30%; width: 30%;
margin-right: 3%; margin-right: 3%;
display: flex; display: flex;
.item-name { .item-name {
width: 80px;
flex-shrink: 0; flex-shrink: 0;
} }
} }
......
src/modules/college-manage/UserManagePage.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-30 10:47:38 * @Date: 2020-11-30 10:47:38
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2021-05-13 17:45:53 * @LastEditTime: 2021-05-30 15:57:40
* @Description: 学员管理页面 * @Description: 学员管理页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -68,7 +68,7 @@ function UserManagePage() { ...@@ -68,7 +68,7 @@ function UserManagePage() {
<span className="title">{val}</span> <span className="title">{val}</span>
<span <span
className="tag" className="tag"
style={{ color: item.sourceEnum === 'WORK_WE_CHAT' ? '#FFB714' : '#1DCC65'}} style={{ color: item.sourceEnum === 'WORK_WE_CHAT' ? '#2966FF' : '#1DCC65'}}
>{item.sourceEnum === 'WORK_WE_CHAT' ? '@企业微信' : '@微信'}</span> >{item.sourceEnum === 'WORK_WE_CHAT' ? '@企业微信' : '@微信'}</span>
</div> </div>
); );
......
src/modules/college-manage/modal/ChooseMembersModal.less
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
line-height: 45px; line-height: 45px;
margin-left: 10px; margin-left: 10px;
.span-left-l{ .span-left-l{
color: #ffb714; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
margin-right: 10px; margin-right: 10px;
color: #999; color: #999;
.span-right-l{ .span-right-l{
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
......
src/modules/college-manage/modal/SetEmployeeModal.less
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
padding: 0 8px; padding: 0 8px;
border: 1px solid #FFB714; border: 1px solid #2966FF;
border-radius: 9px; border-radius: 9px;
color: #FFB714; color: #2966FF;
margin-top: 13px; margin-top: 13px;
font-size: 12px; font-size: 12px;
flex-shrink: 0; flex-shrink: 0;
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
left: 0; left: 0;
height: 100%; height: 100%;
width: 4px; width: 4px;
background: #FFB714; background: #2966FF;
} }
} }
} }
......
src/modules/common/TeacherSelect.tsx
...@@ -58,6 +58,7 @@ export default function ExaminationManager(props: any) { ...@@ -58,6 +58,7 @@ export default function ExaminationManager(props: any) {
onPopupScroll={handleScrollTeacherList} onPopupScroll={handleScrollTeacherList}
suffixIcon={<span className="icon iconfont" style={{ fontSize: '12px', color: '#BFBFBF' }}>&#xe835;</span>} suffixIcon={<span className="icon iconfont" style={{ fontSize: '12px', color: '#BFBFBF' }}>&#xe835;</span>}
value={props.val || null} value={props.val || null}
filterOption={(input: any, option: any) => option}
onChange={(value) => { onChange={(value) => {
props.onChange(value) props.onChange(value)
}} }}
......
src/modules/course-manage/AddLive.jsx
...@@ -27,7 +27,7 @@ import _ from "underscore"; ...@@ -27,7 +27,7 @@ import _ from "underscore";
import $ from 'jquery'; import $ from 'jquery';
import './AddLive.less'; import './AddLive.less';
const defaultCover = 'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'; const defaultCover = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
const defaultBasicInfo = { const defaultBasicInfo = {
courseName: null, // 课程名称 courseName: null, // 课程名称
coverUrl: defaultCover, coverUrl: defaultCover,
...@@ -578,7 +578,7 @@ handleChangeBasicInfo = (field, value) => { ...@@ -578,7 +578,7 @@ handleChangeBasicInfo = (field, value) => {
</div> </div>
</div> </div>
<div className="footer"> <div className="footer shrink-footer">
<Button onClick={this.handleGoBack}>取消</Button> <Button onClick={this.handleGoBack}>取消</Button>
<Button onClick={this.handleShowPreviewModal}>预览</Button> <Button onClick={this.handleShowPreviewModal}>预览</Button>
<Button type="primary" onClick={_.debounce(() => this.handleSubmit(), 3000, true)}>保存</Button> <Button type="primary" onClick={_.debounce(() => this.handleSubmit(), 3000, true)}>保存</Button>
......
src/modules/course-manage/AddLive.less
.add-live-page { .add-live-page {
position:relative !important; position:relative !important;
.box { .box {
margin-bottom: 66px !important; margin-bottom: 52px !important;
} }
.add-live-page__form { .add-live-page__form {
margin-top: 16px; margin-top: 16px;
...@@ -44,17 +44,34 @@ ...@@ -44,17 +44,34 @@
text-align: right; text-align: right;
} }
} }
.basic-info__wrap, .class-info__wrap, .intro-info__wrap {
.title {
position: relative;
padding-left: 14px;
&::before {
content: "";
position: absolute;
left: 0px;
top: 50%;
transform: translateY(-50%);
width: 4px;
height: 10px;
background: #2966FF;
}
}
}
} }
.footer { .footer {
position: fixed; position: fixed;
left: 196px;
bottom: 0; bottom: 0;
height: 58px; height: 58px;
width: 100%; width: ~'calc(100% - 218px)';
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
padding-right: 252px; padding-right: 72px;
background: #fff; background: #fff;
border-top: 1px solid #E8E8E8; border-top: 1px solid #E8E8E8;
z-index: 9999; z-index: 9999;
......
src/modules/course-manage/DataList/DataList.less
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
} }
.handel-btn { .handel-btn {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.split { .split {
...@@ -41,6 +41,18 @@ ...@@ -41,6 +41,18 @@
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-bottom: 16px; margin-bottom: 16px;
position: relative;
padding-left: 14px;
&::before {
content: "";
position: absolute;
left: 0px;
top: 50%;
transform: translateY(-50%);
width: 4px;
height: 10px;
background: #2966FF;
}
} }
.select-course { .select-course {
width: 300px; width: 300px;
...@@ -119,7 +131,7 @@ ...@@ -119,7 +131,7 @@
height: 37px; height: 37px;
font-size: 26px; font-size: 26px;
font-weight: 500; font-weight: 500;
color: #5289fa; color: #2966FF;
line-height: 37px; line-height: 37px;
&.can-click { &.can-click {
cursor: pointer; cursor: pointer;
......
src/modules/course-manage/components/AddLiveBasic.jsx
...@@ -17,7 +17,7 @@ import Upload from '@/core/upload'; ...@@ -17,7 +17,7 @@ import Upload from '@/core/upload';
import './AddLiveBasic.less'; import './AddLiveBasic.less';
const defaultCover = 'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'; const defaultCover = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
const fieldNames = { label: 'categoryName', value: 'id', children: 'sonCategoryList' }; const fieldNames = { label: 'categoryName', value: 'id', children: 'sonCategoryList' };
let cutFlag = false; let cutFlag = false;
let timer = null let timer = null
......
src/modules/course-manage/components/AddLiveBasic.less
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: contain; object-fit: contain;
border: 1px solid #E8e8e8; border-radius: 4px;
} }
} }
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
.default-btn { .default-btn {
margin-left: 16px; margin-left: 16px;
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
&.disabled { &.disabled {
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
} }
.ant-cascader-menu-item-active:not(.ant-cascader-menu-item-disabled){ .ant-cascader-menu-item-active:not(.ant-cascader-menu-item-disabled){
font-weight:normal !important; font-weight:normal !important;
color:#FF9D14 !important; color:#2966FF !important;
} }
#imgCutModalNew { #imgCutModalNew {
width: 500px; width: 500px;
......
src/modules/course-manage/components/AddLiveClass.less
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
.select-day { .select-day {
margin-bottom: 4px; margin-bottom: 4px;
.mark-day { .mark-day {
color: #5289FA; color: #2966FF;
} }
} }
} }
......
src/modules/course-manage/components/AddLiveIntro.less
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
} }
.checkExample { .checkExample {
width: 60px; width: 60px;
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.warmup { .warmup {
......
src/modules/course-manage/components/GraphicsEditor.jsx
...@@ -36,8 +36,8 @@ class GraphicsEditor extends React.Component { ...@@ -36,8 +36,8 @@ class GraphicsEditor extends React.Component {
resetIndex = (bool) => { resetIndex = (bool) => {
const topDom = document.querySelector('.top-container'); const topDom = document.querySelector('.top-container');
const leftDom = document.querySelector('.left-container'); const leftDom = document.querySelector('.left-container');
topDom.style.zIndex = bool ? 'auto' : 112; // topDom.style.zIndex = bool ? 'auto' : 112;
leftDom.style.zIndex = bool ? 'auto' : 2; // leftDom.style.zIndex = bool ? 'auto' : 2;
} }
renderEditor() { renderEditor() {
......
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -32,7 +32,7 @@ const courseStateShow = { ...@@ -32,7 +32,7 @@ const courseStateShow = {
UN_START: { UN_START: {
code: 1, code: 1,
title: "待开课", title: "待开课",
color: "#FFB714", color: "#FFB129",
}, },
STARTING: { STARTING: {
code: 2, code: 2,
...@@ -166,7 +166,7 @@ class LiveCourseList extends React.Component { ...@@ -166,7 +166,7 @@ class LiveCourseList extends React.Component {
}) })
} }
{ !hasCover && { !hasCover &&
<img className="course-cover" src={'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'} /> <img className="course-cover" src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} />
} }
<div> <div>
{ record.courseName.length > 17? { record.courseName.length > 17?
...@@ -262,7 +262,7 @@ class LiveCourseList extends React.Component { ...@@ -262,7 +262,7 @@ class LiveCourseList extends React.Component {
{ {
title: <span> title: <span>
<span>学院展示</span> <span>学院展示</span>
<Tooltip title={<div>开启后，学员可在学院内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip> <Tooltip title={<div>开启后，学员可在学院内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:'normal'}}>&#xe61d;</i></Tooltip>
</span>, </span>,
width: "9%", width: "9%",
key: "shelfState", key: "shelfState",
...@@ -360,7 +360,7 @@ class LiveCourseList extends React.Component { ...@@ -360,7 +360,7 @@ class LiveCourseList extends React.Component {
<span className="operate-text">更多</span> <span className="operate-text">更多</span>
<span <span
className="iconfont icon" className="iconfont icon"
style={{ color: "#5289FA" }} style={{ color: "#2966FF" }}
> >
&#xe824; &#xe824;
</span> </span>
...@@ -400,7 +400,7 @@ class LiveCourseList extends React.Component { ...@@ -400,7 +400,7 @@ class LiveCourseList extends React.Component {
}) })
} }
{ !hasCover && { !hasCover &&
<img className="course-cover" src={'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'} /> <img className="course-cover" src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} />
} }
<div> <div>
{ record.courseName.length > 17? { record.courseName.length > 17?
......
src/modules/course-manage/components/LiveCourseList.less
...@@ -83,13 +83,13 @@ ...@@ -83,13 +83,13 @@
} }
.courseware{ .courseware{
font-size: 14px; font-size: 14px;
color: #5289FA; color: #2966FF;
line-height: 20px; line-height: 20px;
text-align:right; text-align:right;
cursor:pointer; cursor:pointer;
} }
.quota-icon{ .quota-icon{
color:#5289FA; color:#2966FF;
cursor:pointer; cursor:pointer;
} }
.operate { .operate {
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
.operate__item { .operate__item {
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
&.split { &.split {
margin: 0 8px; margin: 0 8px;
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
} }
} }
.operate-text { .operate-text {
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.course-start-end { .course-start-end {
......
src/modules/course-manage/graphics-course/AddGraphicsCourse.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:07:47 * @Date: 2020-08-05 10:07:47
* @LastEditors: zhangleyuan * @LastEditors: wufan
* @LastEditTime: 2021-05-10 10:15:31 * @LastEditTime: 2021-05-27 16:37:28
* @Description: 图文课新增/编辑页 * @Description: 图文课新增/编辑页
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -33,7 +33,7 @@ const fieldNames = { label: 'categoryName', value: 'id', children: 'sonCategory ...@@ -33,7 +33,7 @@ const fieldNames = { label: 'categoryName', value: 'id', children: 'sonCategory
//添加课程时课程默认的一些值 //添加课程时课程默认的一些值
const defaultShelfState = 'YES'; const defaultShelfState = 'YES';
const whetherVisitorsJoin = 'NO' const whetherVisitorsJoin = 'NO'
const defaultCoverUrl = 'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'; const defaultCoverUrl = 'https://image.xiaomaiketang.com/xm/wFnpZtp2yB.png';
let cutFlag = false; let cutFlag = false;
class AddGraphicsCourse extends React.Component { class AddGraphicsCourse extends React.Component {
...@@ -530,7 +530,7 @@ class AddGraphicsCourse extends React.Component { ...@@ -530,7 +530,7 @@ class AddGraphicsCourse extends React.Component {
const courseWareIcon = FileVerifyMap[videoType] ? FileTypeIcon[FileVerifyMap[videoType].type] : FileTypeIcon[videoType]; const courseWareIcon = FileVerifyMap[videoType] ? FileTypeIcon[FileVerifyMap[videoType].type] : FileTypeIcon[videoType];
return ( return (
<div className="page add-video-course-page"> <div className="page add-graphics-course-page">
<Breadcrumbs <Breadcrumbs
navList={pageType === "add" ? "新建图文课" : "编辑图文课"} navList={pageType === "add" ? "新建图文课" : "编辑图文课"}
goBack={this.handleGoBack} goBack={this.handleGoBack}
...@@ -596,7 +596,7 @@ class AddGraphicsCourse extends React.Component { ...@@ -596,7 +596,7 @@ class AddGraphicsCourse extends React.Component {
</div> </div>
</div> </div>
<div className="footer"> <div className="footer shrink-footer">
<Button onClick={this.handleGoBack}>取消</Button> <Button onClick={this.handleGoBack}>取消</Button>
<Button onClick={this.handleShowPreviewModal}>预览</Button> <Button onClick={this.handleShowPreviewModal}>预览</Button>
<Button type="primary" onClick={_.debounce(() => this.handleSubmit(), 3000, true)}>保存</Button> <Button type="primary" onClick={_.debounce(() => this.handleSubmit(), 3000, true)}>保存</Button>
......
src/modules/course-manage/graphics-course/AddGraphicsCourse.less
.add-video-course-page { .add-graphics-course-page {
position:relative !important; position:relative !important;
.box{ .box{
margin-bottom:66px !important; margin-bottom:52px !important;
} }
.ant-radio-group { .ant-radio-group {
display: flex; display: flex;
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: contain; object-fit: contain;
border-radius: 4px;
} }
} }
.empty-img { .empty-img {
...@@ -129,13 +130,14 @@ ...@@ -129,13 +130,14 @@
.footer { .footer {
position: fixed; position: fixed;
left: 196px;
bottom: 0; bottom: 0;
height: 58px; height: 58px;
width: 100%; width: ~'calc(100% - 218px)';
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
padding-right: 252px; padding-right: 72px;
background: #fff; background: #fff;
border-top: 1px solid #E8E8E8; border-top: 1px solid #E8E8E8;
z-index: 999; z-index: 999;
......
src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:12:45 * @Date: 2020-08-05 10:12:45
* @LastEditors: wufan * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-05-13 16:32:38 * @LastEditTime: 2021-05-27 20:13:53
* @Description: 视频课-列表模块 * @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -25,7 +25,7 @@ import User from '@/common/js/user' ...@@ -25,7 +25,7 @@ import User from '@/common/js/user'
import './GraphicsCourseList.less'; import './GraphicsCourseList.less';
const ENV = process.env.DEPLOY_ENV || 'dev'; const ENV = process.env.DEPLOY_ENV || 'dev';
const defaultCoverUrl = 'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'; const defaultCoverUrl = 'https://image.xiaomaiketang.com/xm/wFnpZtp2yB.png';
class GraphicsCourseList extends React.Component { class GraphicsCourseList extends React.Component {
...@@ -137,7 +137,7 @@ class GraphicsCourseList extends React.Component { ...@@ -137,7 +137,7 @@ class GraphicsCourseList extends React.Component {
{ {
title: <span> title: <span>
<span>学院展示</span> <span>学院展示</span>
<Tooltip title={<div>开启后，学员可在学院内查看到此课程。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip> <Tooltip title={<div>开启后，学员可在学院内查看到此课程。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:'normal'}}>&#xe61d;</i></Tooltip>
</span>, </span>,
width: 120, width: 120,
dataIndex: "courseware", dataIndex: "courseware",
...@@ -218,7 +218,7 @@ class GraphicsCourseList extends React.Component { ...@@ -218,7 +218,7 @@ class GraphicsCourseList extends React.Component {
<span className="operate-text">更多</span> <span className="operate-text">更多</span>
<span <span
className="iconfont icon" className="iconfont icon"
style={{ color: "#5289FA" }} style={{ color: "#2966FF" }}
> >
&#xe824; &#xe824;
</span> </span>
......
src/modules/course-manage/graphics-course/components/GraphicsCourseList.less
...@@ -28,14 +28,14 @@ ...@@ -28,14 +28,14 @@
padding: 16px; padding: 16px;
} }
.operate-text { .operate-text {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.operate { .operate {
display: flex; display: flex;
&__item { &__item {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
&.split { &.split {
...@@ -51,12 +51,11 @@ ...@@ -51,12 +51,11 @@
display: flex; display: flex;
.course-cover { .course-cover {
min-width: 97px; width: 97px;
max-width: 97px;
height: 50px; height: 50px;
border-radius: 2px; border-radius: 2px;
margin-right: 8px; margin-right: 8px;
// background-color: #666; object-fit: contain;
} }
.course-name { .course-name {
......
src/modules/course-manage/modal/ManageCoursewareModal.jsx
...@@ -284,7 +284,7 @@ class ManageCoursewareModal extends React.Component { ...@@ -284,7 +284,7 @@ class ManageCoursewareModal extends React.Component {
onCancel={() => { }} onCancel={() => { }}
> >
<span style={{ <span style={{
color: '#5289FA', color: '#2966FF',
cursor: 'pointer' cursor: 'pointer'
}}>删除</span> }}>删除</span>
</Popconfirm> </Popconfirm>
......
src/modules/course-manage/modal/ManageCoursewareModal.less
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
} }
&:hover { &:hover {
.name { .name {
color: #FFB714; color: #2966FF;
} }
} }
} }
......
src/modules/course-manage/modal/PreviewGraphicsModal.jsx
...@@ -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">
......
src/modules/course-manage/modal/PreviewGraphicsModal.less
.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,21 +54,20 @@ ...@@ -55,21 +54,20 @@
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;
cursor: pointer; cursor: pointer;
} }
.selected { .selected {
color: #FFB714; color: #2966FF;
&::after { &::after {
content: ''; content: '';
position: absolute; position: absolute;
bottom: -4px; bottom: -4px;
width: 20px; width: 20px;
height: 1px; height: 1px;
background: #FFB714; background: #2966FF;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
......
src/modules/course-manage/modal/RelatedPlanModal.less
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.select-container{ .select-container{
margin-bottom:12px; margin-bottom:12px;
.con{ .con{
background: #FFF4DD; background: #E9EFFF;
border-radius: 4px; border-radius: 4px;
padding:6px 16px; padding:6px 16px;
display: inline-flex; display: inline-flex;
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
justify-content: space-between; justify-content: space-between;
.tip{ .tip{
font-size:14px; font-size:14px;
color:#FF9D14; color:#2966FF;
margin-right:8px; margin-right:8px;
} }
.text{ .text{
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
margin-right:30px; margin-right:30px;
} }
.clear{ .clear{
color:#5289FA; color:#2966FF;
font-size:14px; font-size:14px;
} }
......
src/modules/course-manage/modal/ShareLiveModal.less
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
margin-bottom: 40px; margin-bottom: 40px;
.content { .content {
color:rgba(82, 137, 250, 1); color:#2966FF;
cursor: pointer; cursor: pointer;
} }
} }
......
src/modules/course-manage/offline-course/AddOfflineCourse.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:07:47 * @Date: 2020-08-05 10:07:47
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2021-05-25 20:00:18 * @LastEditTime: 2021-05-27 19:25:48
* @Description: 线下课新增/编辑页 * @Description: 线下课新增/编辑页
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -41,7 +41,7 @@ import MultipleDatePicker from '@/components/MultipleDatePicker'; ...@@ -41,7 +41,7 @@ import MultipleDatePicker from '@/components/MultipleDatePicker';
import './AddOfflineCourse.less'; import './AddOfflineCourse.less';
const { Option } = Select; const { Option } = Select;
const defaultCoverUrl = 'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'; const defaultCoverUrl = 'https://image.xiaomaiketang.com/xm/pxbWKsYA87.png';
let cutFlag = false; let cutFlag = false;
const unitList = [ const unitList = [
{ key: 'HOUR', value: '小时' }, { key: 'HOUR', value: '小时' },
...@@ -1046,8 +1046,8 @@ class AddOfflineCourse extends React.Component { ...@@ -1046,8 +1046,8 @@ class AddOfflineCourse extends React.Component {
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(1, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(1, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#2966FF',
border: '1px solid #FFB714', border: '1px solid #2966FF',
padding: '2px 8px', padding: '2px 8px',
borderRadius: '2px', borderRadius: '2px',
marginRight: 8, marginRight: 8,
...@@ -1056,8 +1056,8 @@ class AddOfflineCourse extends React.Component { ...@@ -1056,8 +1056,8 @@ class AddOfflineCourse extends React.Component {
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(2, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(2, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#2966FF',
border: '1px solid #FFB714', border: '1px solid #2966FF',
padding: '2px 8px', padding: '2px 8px',
borderRadius: '2px', borderRadius: '2px',
marginRight: 8, marginRight: 8,
...@@ -1066,8 +1066,8 @@ class AddOfflineCourse extends React.Component { ...@@ -1066,8 +1066,8 @@ class AddOfflineCourse extends React.Component {
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(3, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(3, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#2966FF',
border: '1px solid #FFB714', border: '1px solid #2966FF',
padding: '2px 8px', padding: '2px 8px',
borderRadius: '2px', borderRadius: '2px',
marginRight: 8, marginRight: 8,
......
src/modules/course-manage/offline-course/AddOfflineCourse.less
.add-offline-course-page { .add-offline-course-page {
position:relative !important; position:relative !important;
.box{ .box{
margin-bottom:66px !important; margin-bottom:52px !important;
} }
.ant-radio-group { .ant-radio-group {
display: flex; display: flex;
...@@ -36,6 +36,18 @@ ...@@ -36,6 +36,18 @@
line-height: 22px; line-height: 22px;
margin-bottom: 16px; margin-bottom: 16px;
margin-left: -16px; margin-left: -16px;
position: relative;
padding-left: 14px;
&::before {
content: "";
position: absolute;
left: 0px;
top: 50%;
transform: translateY(-50%);
width: 4px;
height: 10px;
background: #2966FF;
}
} }
} }
.label{ .label{
...@@ -98,7 +110,7 @@ ...@@ -98,7 +110,7 @@
.select-day { .select-day {
margin-bottom: 4px; margin-bottom: 4px;
.mark-day { .mark-day {
color: #FFB714; color: #2966FF;
} }
} }
} }
...@@ -165,7 +177,6 @@ ...@@ -165,7 +177,6 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: contain; object-fit: contain;
border: 1px solid #E8e8e8;
} }
} }
...@@ -173,7 +184,7 @@ ...@@ -173,7 +184,7 @@
.default-btn { .default-btn {
margin-left: 16px; margin-left: 16px;
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
&.disabled { &.disabled {
...@@ -219,11 +230,11 @@ ...@@ -219,11 +230,11 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
height: 58px; height: 58px;
width: 100%; width: ~'calc(100% - 218px)';
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
padding-right: 252px; padding-right: 72px;
background: #fff; background: #fff;
border-top: 1px solid #E8E8E8; border-top: 1px solid #E8E8E8;
z-index: 999; z-index: 999;
......
src/modules/course-manage/offline-course/OfflineCourseData.less
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
width: 4px; width: 4px;
height: 16px; height: 16px;
content: ''; content: '';
background: #FFB714; background: #2966FF;
left: 0; left: 0;
top: 5px; top: 5px;
} }
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
} }
} }
.calendar-text { .calendar-text {
color: #FF9D14; color: #2966FF;
line-height: 20px; line-height: 20px;
margin: 0 44px; margin: 0 44px;
} }
...@@ -85,7 +85,8 @@ ...@@ -85,7 +85,8 @@
cursor: pointer; cursor: pointer;
} }
&.selected { &.selected {
background: rgba(255, 183, 20, 0.06); background: #E9EFFF;
color: #2966FF;
} }
} }
} }
......
src/modules/course-manage/offline-course/components/OfflineCourseList.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:12:45 * @Date: 2020-08-05 10:12:45
* @LastEditors: zhangleyuan * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-03-27 16:24:47 * @LastEditTime: 2021-05-27 20:14:01
* @Description: 视频课-列表模块 * @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -123,7 +123,7 @@ class OfflineCourseList extends React.Component { ...@@ -123,7 +123,7 @@ class OfflineCourseList extends React.Component {
{ {
title: <span> title: <span>
<span>学院展示</span> <span>学院展示</span>
<Tooltip title={<div>开启后，学员可在学院内查看到此课程。若课程“取消”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip> <Tooltip title={<div>开启后，学员可在学院内查看到此课程。若课程“取消”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:'normal'}}>&#xe61d;</i></Tooltip>
</span>, </span>,
width: 120, width: 120,
dataIndex: "courseware", dataIndex: "courseware",
...@@ -200,7 +200,7 @@ class OfflineCourseList extends React.Component { ...@@ -200,7 +200,7 @@ class OfflineCourseList extends React.Component {
<span className="operate-text">更多</span> <span className="operate-text">更多</span>
<span <span
className="iconfont icon" className="iconfont icon"
style={{ color: "#5289FA" }} style={{ color: "#2966FF" }}
> >
&#xe824; &#xe824;
</span> </span>
......
src/modules/course-manage/offline-course/components/OfflineCourseList.less
...@@ -28,14 +28,14 @@ ...@@ -28,14 +28,14 @@
padding:16px; padding:16px;
} }
.operate-text { .operate-text {
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.operate { .operate {
display: flex; display: flex;
&__item { &__item {
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
&.split { &.split {
......
src/modules/course-manage/offline-course/modal/PreviewOfflineModal.jsx
...@@ -87,8 +87,8 @@ class PreviewOfflineModal extends React.Component { ...@@ -87,8 +87,8 @@ class PreviewOfflineModal extends React.Component {
signOutEndTimeUnit, signOutEndTimeUnit,
} = this.state; } = this.state;
const unit = (signInTimeUnit || '').toLocaleLowerCase() + 's'; const unit = (signInTimeUnit || '').toLocaleLowerCase() + 's';
const time = (signInType == 'START_AGO' ? startTime : endTime) && moment(signInType == 'START_AGO' ? startTime : endTime).subtract(signInTimeNum, unit); const time = (signInType === 'START_AGO' ? startTime : endTime) && moment(signInType === 'START_AGO' ? startTime : endTime).subtract(signInTimeNum, unit);
const signInTime = (time && signInTimeNum) && `${moment(time).format('HH:mm')} ~ ${moment(signInType == 'START_AGO' ? startTime : endTime).format('HH:mm')}`; const signInTime = (time && signInTimeNum) && `${moment(time).format('HH:mm')} ~ ${moment(signInType === 'START_AGO' ? startTime : endTime).format('HH:mm')}`;
const endUnit = (signOutEndTimeUnit || '').toLocaleLowerCase() + 's'; const endUnit = (signOutEndTimeUnit || '').toLocaleLowerCase() + 's';
const end = (endTime && signOutEndTimeNum) && moment(endTime).add(signOutEndTimeNum, endUnit); const end = (endTime && signOutEndTimeNum) && moment(endTime).add(signOutEndTimeNum, endUnit);
let startUnit = ''; let startUnit = '';
...@@ -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">
......
src/modules/course-manage/offline-course/modal/PreviewOfflineModal.less
.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;
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
content: ''; content: '';
width: 2px; width: 2px;
height: 14px; height: 14px;
background: #FFB714; background: #2966FF;
left: 0; left: 0;
top: 2px; top: 2px;
} }
......
src/modules/course-manage/video-course/AddVideoCourse.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:07:47 * @Date: 2020-08-05 10:07:47
* @LastEditors: fusanqiasng * @LastEditors: wufan
* @LastEditTime: 2021-05-24 21:04:03 * @LastEditTime: 2021-05-30 20:35:49
* @Description: 视频课新增/编辑页 * @Description: 视频课新增/编辑页
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -684,7 +684,7 @@ class AddVideoCourse extends React.Component { ...@@ -684,7 +684,7 @@ class AddVideoCourse extends React.Component {
</div> </div>
</div> </div>
<div className='footer'> <div className="footer shrink-footer">
<Button onClick={this.handleGoBack}>取消</Button> <Button onClick={this.handleGoBack}>取消</Button>
<Button onClick={this.handleShowPreviewModal}>预览</Button> <Button onClick={this.handleShowPreviewModal}>预览</Button>
<Button type='primary' onClick={_.debounce(() => this.handleSubmit(), 3000, true)}> <Button type='primary' onClick={_.debounce(() => this.handleSubmit(), 3000, true)}>
......
src/modules/course-manage/video-course/AddVideoCourse.less
.add-video-course-page { .add-video-course-page {
position:relative !important; position:relative !important;
.box{ .box{
margin-bottom:66px !important; margin-bottom:52px !important;
} }
.ant-radio-group { .ant-radio-group {
display: flex; display: flex;
...@@ -129,13 +129,14 @@ ...@@ -129,13 +129,14 @@
.footer { .footer {
position: fixed; position: fixed;
left: 196px;
bottom: 0; bottom: 0;
height: 58px; height: 58px;
width: 100%; width: ~'calc(100% - 218px)';
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
padding-right: 252px; padding-right: 72px;
background: #fff; background: #fff;
border-top: 1px solid #E8E8E8; border-top: 1px solid #E8E8E8;
z-index: 999; z-index: 999;
......
src/modules/course-manage/video-course/components/VideoCourseList.less
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
padding: 16px; padding: 16px;
} }
.operate-text { .operate-text {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.operate { .operate {
display: flex; display: flex;
&__item { &__item {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
&.split { &.split {
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
height: 50px; height: 50px;
border-radius: 2px; border-radius: 2px;
margin-right: 8px; margin-right: 8px;
// background-color: #666;
} }
.course-name { .course-name {
......
src/modules/home/Home.jsx
...@@ -189,13 +189,13 @@ class Home extends React.Component { ...@@ -189,13 +189,13 @@ class Home extends React.Component {
} }
} }
}) })
this._chart.line().position('time*studyNum').color('#5289FA').tooltip('time*studyNum', function( time, studyNum){ this._chart.line().position('time*studyNum').color('#2966FF').tooltip('time*studyNum', function( time, studyNum){
return { return {
name: '学习人数', name: '学习人数',
value: studyNum + '人' value: studyNum + '人'
} }
}); });
this._chart.line().position('time*studyTime').color('#FFB714').tooltip('time*studyTime', function( time, studyTime){ this._chart.line().position('time*studyTime').color('#FFBB54').tooltip('time*studyTime', function( time, studyTime){
return { return {
name: '人均学习时长', name: '人均学习时长',
value: studyTime + '分钟' value: studyTime + '分钟'
...@@ -265,8 +265,9 @@ class Home extends React.Component { ...@@ -265,8 +265,9 @@ class Home extends React.Component {
}; };
return ( return (
<div className="home-page"> <div className="home-page">
<div className="home-title">数据概况</div> <div className="data-wrap">
<div className="data-box"> <div className="home-title">数据概况</div>
<div className="data-box">
<div className="data-item"> <div className="data-item">
<div className="header"> <div className="header">
<img className="header-icon" src="https://image.xiaomaiketang.com/xm/wAaFtjeRsM.png" /> <img className="header-icon" src="https://image.xiaomaiketang.com/xm/wAaFtjeRsM.png" />
...@@ -364,65 +365,67 @@ class Home extends React.Component { ...@@ -364,65 +365,67 @@ class Home extends React.Component {
</div> </div>
</div> </div>
</div> </div>
<div className="home-title">学习概况</div> </div>
<div className="study-box"> <div className="study-wrap">
<div className="study-item"> <div className="home-title">学习概况</div>
<div className="study-title">课程学习排行榜</div> <div className="study-box">
<div className="study-header"> <div className="study-item">
<div className="study-tab"> <div className="study-title">课程学习排行榜</div>
<span <div className="study-header">
className={`tab${scheduleType === 'LIVE' ? ' selected' : ''}`} <div className="study-tab">
onClick={() => this.setState({ scheduleType: 'LIVE' }, () => this.getHotCourse())} <span
>直播课</span> className={`tab${scheduleType === 'LIVE' ? ' selected' : ''}`}
<span onClick={() => this.setState({ scheduleType: 'LIVE' }, () => this.getHotCourse())}
className={`tab${scheduleType === 'VOICE' ? ' selected' : ''}`} >直播课</span>
onClick={() => this.setState({ scheduleType: 'VOICE' }, () => this.getHotCourse())} <span
>视频课</span> className={`tab${scheduleType === 'VOICE' ? ' selected' : ''}`}
<span onClick={() => this.setState({ scheduleType: 'VOICE' }, () => this.getHotCourse())}
className={`tab${scheduleType === 'PICTURE' ? ' selected' : ''}`} >视频课</span>
onClick={() => this.setState({ scheduleType: 'PICTURE' }, () => this.getHotCourse())} <span
>图文课</span> className={`tab${scheduleType === 'PICTURE' ? ' selected' : ''}`}
</div> onClick={() => this.setState({ scheduleType: 'PICTURE' }, () => this.getHotCourse())}
<div className="study-select"> >图文课</span>
<span className="select-word">（{moment().subtract(timeRange - 1, 'day').format('MM.DD')} ~ {moment().format('MM.DD')}）</span> </div>
<Select <div className="study-select">
style={{ width: 88 }} <span className="select-word">（{moment().subtract(timeRange - 1, 'day').format('MM.DD')} ~ {moment().format('MM.DD')}）</span>
value={timeRange} <Select
onChange={(value) => { style={{ width: 88 }}
this.setState({ timeRange: value }, () => this.getHotCourse()); value={timeRange}
}} onChange={(value) => {
> this.setState({ timeRange: value }, () => this.getHotCourse());
<Option value="7">近7天</Option> }}
<Option value="15">近15天</Option> >
<Option value="30">近30天</Option> <Option value="7">近7天</Option>
</Select> <Option value="15">近15天</Option>
</div> <Option value="30">近30天</Option>
</div> </Select>
{_.isEmpty(list) ? </div>
<div className="study-empty">
<img src="https://image.xiaomaiketang.com/xm/52dmait5Bx.png" />
<div>暂无课程上榜</div>
</div> </div>
: list.map((item, index) => ( {_.isEmpty(list) ?
<div className={`table-item${index % 2 ? '' : ' odd'}`} key={item.id}> <div className="study-empty">
{index < 3 ? <img src="https://image.xiaomaiketang.com/xm/52dmait5Bx.png" />
<span className="table-number"><img src={this.showNumber(index)} className="table-image" /></span> <div>暂无课程上榜</div>
: <span className="table-number">{index + 1}</span> </div>
} : list.map((item, index) => (
<div className="table-data"> <div className={`table-item${index % 2 ? '' : ' odd'}`} key={item.id}>
<div className="table-name"> {index < 3 ?
<Tooltip title={item.courseName}> <span className="table-number"><img src={this.showNumber(index)} className="table-image" /></span>
{item.courseName} : <span className="table-number">{index + 1}</span>
</Tooltip> }
<div className="table-data">
<div className="table-name">
<Tooltip title={item.courseName}>
{item.courseName}
</Tooltip>
</div>
<div className="table-tag">{item.categoryName}</div>
</div> </div>
<div className="table-tag">{item.categoryName}</div> <span className="table-study">{item.studyNum || 0}人已学习</span>
</div> </div>
<span className="table-study">{item.studyNum || 0}人已学习</span> ))
</div> }
)) </div>
} <div className="study-item">
</div>
<div className="study-item">
<div className="study-title">培训计划完成情况 <div className="study-title">培训计划完成情况
<Tooltip overlayClassName="data-plan-tooltip" title="若某人加入多个培训计划，则需完成所有已加入的培训计划后，才视为已完成培训"> <Tooltip overlayClassName="data-plan-tooltip" title="若某人加入多个培训计划，则需完成所有已加入的培训计划后，才视为已完成培训">
<span className="iconfont icon">&#xe61d;</span> <span className="iconfont icon">&#xe61d;</span>
...@@ -461,7 +464,7 @@ class Home extends React.Component { ...@@ -461,7 +464,7 @@ class Home extends React.Component {
<Geom <Geom
type="intervalStack" type="intervalStack"
position="percent" position="percent"
color={['item', ['#FDB513', '#5289FA']]} color={['item', ['#FFBB54', '#2966FF']]}
tooltip={[ tooltip={[
"item*percent", "item*percent",
(item, percent) => { (item, percent) => {
...@@ -504,6 +507,7 @@ class Home extends React.Component { ...@@ -504,6 +507,7 @@ class Home extends React.Component {
<div className="word">完成培训</div> <div className="word">完成培训</div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div className="study-chart"> <div className="study-chart">
<div className="study-title">学习人数与时长 <div className="study-title">学习人数与时长
......
src/modules/knowledge-base/ENUM.js
...@@ -12,7 +12,7 @@ const ENUM = { ...@@ -12,7 +12,7 @@ const ENUM = {
UN_START: { UN_START: {
code: 1, code: 1,
title: "待开课", title: "待开课",
color: "#FFB714", color: "#2966FF",
}, },
STARTING: { STARTING: {
code: 2, code: 2,
......
src/modules/knowledge-base/components/Classification.jsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-19 18:05:23 * @Date: 2021-03-19 18:05:23
* @LastEditors: yuananting * @LastEditors: wufan
* @LastEditTime: 2021-04-15 21:46:41 * @LastEditTime: 2021-05-30 16:48:46
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -193,10 +193,10 @@ class Classification extends Component { ...@@ -193,10 +193,10 @@ class Classification extends Component {
className="sider-search" className="sider-search"
placeholder="搜索名称分类" placeholder="搜索名称分类"
onSearch={(value) => { onSearch={(value) => {
// TODO 调用查询分类接口
this.queryCategoryTree(value); this.queryCategoryTree(value);
}} }}
enterButton={<span className="icon iconfont">&#xe832;</span>} enterButton={<span className="icon iconfont">&#xe832;</span>}
style={{width: 230}}
/> />
<div className="sider-btn"> <div className="sider-btn">
<Button <Button
......
src/modules/knowledge-base/components/Classification.less
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-19 18:16:58 * @Date: 2021-03-19 18:16:58
* @LastEditors: zangsuyun * @LastEditors: wufan
* @LastEditTime: 2021-03-25 19:13:06 * @LastEditTime: 2021-05-30 10:19:47
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
} }
.sider-tree { .sider-tree {
width: 266px; width: 244px;
overflow: scroll; overflow: scroll;
height: ~'calc(100vh - 300px)'; height: ~'calc(100vh - 300px)';
.empty-tree-tip { .empty-tree-tip {
text-align: center; text-align: center;
margin-top: 100%; margin-top: 100%;
.empty-tree-btn { .empty-tree-btn {
color: #ffb714; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
width: 260px; width: 234px;
.anticon { .anticon {
color: #666666; color: #666666;
} }
...@@ -52,12 +52,12 @@ ...@@ -52,12 +52,12 @@
white-space: nowrap; white-space: nowrap;
} }
.ant-tree-node-content-wrapper.ant-tree-node-selected { .ant-tree-node-content-wrapper.ant-tree-node-selected {
color: #666666; color: #2966FF;
} }
} }
.ant-tree-treenode-selected:hover::before, .ant-tree-treenode-selected:hover::before,
.ant-tree-treenode-selected::before { .ant-tree-treenode-selected::before {
background: #fffbf1; background: rgba(238, 243, 255, 1);
} }
} }
} }
......
src/modules/knowledge-base/components/KnowledgeBaseList.less
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
} }
.courseware { .courseware {
font-size: 14px; font-size: 14px;
color: #5289fa; color: #2966FF;
line-height: 20px; line-height: 20px;
text-align: right; text-align: right;
cursor: pointer; cursor: pointer;
} }
.quota-icon { .quota-icon {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.operate { .operate {
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
.operate__item { .operate__item {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
&.split { &.split {
margin: 0 8px; margin: 0 8px;
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
} }
} }
.operate-text { .operate-text {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.course-start-end { .course-start-end {
......
src/modules/knowledge-base/components/WatchData.jsx
...@@ -39,7 +39,7 @@ class WatchData extends React.Component { ...@@ -39,7 +39,7 @@ class WatchData extends React.Component {
<WatchDataHeader <WatchDataHeader
type={ENUM.CourseTypeEnum[type]} type={ENUM.CourseTypeEnum[type]}
courseName={localStorage.getItem("WatchData_CourseName")} courseName={localStorage.getItem("WatchData_CourseName")}
color="#FFB714" color="#2966FF"
/> />
<div className="box"> <div className="box">
......
src/modules/knowledge-base/index.jsx
...@@ -2,24 +2,19 @@ ...@@ -2,24 +2,19 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-12 10:43:10 * @Date: 2021-03-12 10:43:10
<<<<<<< HEAD * @LastEditors: wufan
* @LastEditors: fusanqiasng * @LastEditTime: 2021-05-30 20:36:42
* @LastEditTime: 2021-05-28 13:33:07
=======
* @LastEditors: fusanqiasng
* @LastEditTime: 2021-05-27 13:51:42
>>>>>>> 4399d60 (fix:修复外部课程相关模块bug)
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
import React from 'react' import React from "react"
import KnowledgeBaseFilter from './components/KnowledgeBaseFilter' import KnowledgeBaseFilter from "./components/KnowledgeBaseFilter"
import KnowledgeBaseOpt from './components/KnowledgeBaseOpt' import KnowledgeBaseOpt from "./components/KnowledgeBaseOpt"
import KnowledgeBaseList from './components/KnowledgeBaseList' import KnowledgeBaseList from "./components/KnowledgeBaseList"
import Classification from './components/Classification' import Classification from "./components/Classification"
import KnowledgeAPI from '@/data-source/knowledge/request-api' import KnowledgeAPI from "@/data-source/knowledge/request-api"
import User from '@/common/js/user' import User from "@/common/js/user"
export default class KnowledgeBase extends React.Component { export default class KnowledgeBase extends React.Component {
constructor(props) { constructor(props) {
...@@ -29,12 +24,12 @@ export default class KnowledgeBase extends React.Component { ...@@ -29,12 +24,12 @@ export default class KnowledgeBase extends React.Component {
size: 10, size: 10,
current: 1, current: 1,
storeId: User.getStoreId(), storeId: User.getStoreId(),
categoryId: 0, categoryId: 0
}, },
dataSource: [], // 知识库列表 dataSource: [], // 知识库列表
totalCount: 0, // 知识库数据总条数 totalCount: 0, // 知识库数据总条数
categoryId: '0', categoryId: "0",
updateCategoryFlag: false, updateCategoryFlag: false
} }
} }
...@@ -45,7 +40,7 @@ export default class KnowledgeBase extends React.Component { ...@@ -45,7 +40,7 @@ export default class KnowledgeBase extends React.Component {
} }
getSelectedCategoryId = (categoryId) => { getSelectedCategoryId = (categoryId) => {
this.setState({ this.setState({
categoryId, categoryId
}) })
this.handleFetchScheduleList({ categoryId, current: 1 }) this.handleFetchScheduleList({ categoryId, current: 1 })
} }
...@@ -53,14 +48,14 @@ export default class KnowledgeBase extends React.Component { ...@@ -53,14 +48,14 @@ export default class KnowledgeBase extends React.Component {
// 更新分类树 // 更新分类树
updateCategoryTree = () => { updateCategoryTree = () => {
this.setState({ this.setState({
updateCategoryFlag: !this.state.updateCategoryFlag, updateCategoryFlag: !this.state.updateCategoryFlag
}) })
} }
// 获取知识库列表 // 获取知识库列表
handleFetchScheduleList = (_query = {}, flag = true) => { handleFetchScheduleList = (_query = {}, flag = true) => {
const query = { const query = {
...this.state.query, ...this.state.query,
..._query, ..._query
} }
// 更新请求参数 // 更新请求参数
...@@ -73,7 +68,7 @@ export default class KnowledgeBase extends React.Component { ...@@ -73,7 +68,7 @@ export default class KnowledgeBase extends React.Component {
const { records = [], total = 0 } = result const { records = [], total = 0 } = result
this.setState({ this.setState({
dataSource: records, dataSource: records,
totalCount: Number(total), totalCount: Number(total)
}) })
}) })
} }
...@@ -84,17 +79,20 @@ export default class KnowledgeBase extends React.Component { ...@@ -84,17 +79,20 @@ export default class KnowledgeBase extends React.Component {
<div className='page'> <div className='page'>
<div className='content-header'>知识库</div> <div className='content-header'>知识库</div>
<div className='box' style={{ display: 'flex' }}> <div className='box' style={{ display: "flex" }}>
{/* 搜索模块 */} {/* 搜索模块 */}
<div className='left' style={{ width: 245 }}> <div className='left' style={{ width: 245 }}>
<Classification updateCategoryFlag={updateCategoryFlag} categoryId={categoryId} getSelectedCategoryId={this.getSelectedCategoryId} /> <Classification updateCategoryFlag={updateCategoryFlag} categoryId={categoryId} getSelectedCategoryId={this.getSelectedCategoryId} />
</div> </div>
<div className='liner' style={{ backgroundColor: 'rgb(238, 238, 238)', width: 0.5, margin: '1px 16px 1px 2px' }}></div> <div
<div className='right' style={{ width: 'calc(100% - 285px)' }}> className="liner"
style={{ backgroundColor: "rgb(238, 238, 238)", width: 0.5, margin: "1px 16px 1px 2px" }}
></div>
<div className="right" style={{ width: "calc(100% - 265px)" }}>
<KnowledgeBaseFilter onChange={this.handleFetchScheduleList} /> <KnowledgeBaseFilter onChange={this.handleFetchScheduleList} />
{/* 操作模块 */} {/* 操作模块 */}
{categoryId !== '0' && ( {categoryId !== "0" && (
<KnowledgeBaseOpt onChange={this.handleFetchScheduleList} updateCategoryTree={this.updateCategoryTree} categoryId={categoryId} /> <KnowledgeBaseOpt onChange={this.handleFetchScheduleList} updateCategoryTree={this.updateCategoryTree} categoryId={categoryId} />
)} )}
......
src/modules/knowledge-base/modal/LiveList.jsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-13 14:38:49 * @Date: 2021-03-13 14:38:49
* @LastEditors: zangsuyun * @LastEditors: wufan
* @LastEditTime: 2021-03-16 15:20:51 * @LastEditTime: 2021-05-30 10:08:02
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -22,7 +22,7 @@ const courseStateShow = { ...@@ -22,7 +22,7 @@ const courseStateShow = {
UN_START: { UN_START: {
code: 1, code: 1,
title: "待开课", title: "待开课",
color: "#FFB714", color: "#FFB129",
}, },
STARTING: { STARTING: {
code: 2, code: 2,
...@@ -107,6 +107,7 @@ class LiveList extends React.Component { ...@@ -107,6 +107,7 @@ class LiveList extends React.Component {
cursor: "pointer", cursor: "pointer",
color: "#bfbfbf", color: "#bfbfbf",
fontSize: "14px", fontSize: "14px",
fontWeight:"400"
}} }}
> >
&#xe61d; &#xe61d;
......
src/modules/knowledge-base/modal/LiveList.less
...@@ -71,13 +71,13 @@ ...@@ -71,13 +71,13 @@
} }
.courseware { .courseware {
font-size: 14px; font-size: 14px;
color: #2966ff; color: #2966FF;
line-height: 20px; line-height: 20px;
text-align: right; text-align: right;
cursor: pointer; cursor: pointer;
} }
.quota-icon { .quota-icon {
color: #2966ff; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.operate { .operate {
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
.operate__item { .operate__item {
color: #2966ff; color: #2966FF;
cursor: pointer; cursor: pointer;
&.split { &.split {
margin: 0 8px; margin: 0 8px;
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
} }
} }
.operate-text { .operate-text {
color: #2966ff; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.course-start-end { .course-start-end {
......
src/modules/knowledge-base/modal/VideoList.jsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-13 11:48:24 * @Date: 2021-03-13 11:48:24
* @LastEditors: zangsuyun * @LastEditors: wufan
* @LastEditTime: 2021-04-01 11:58:46 * @LastEditTime: 2021-05-30 10:08:09
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -105,6 +105,7 @@ class VideoList extends React.Component { ...@@ -105,6 +105,7 @@ class VideoList extends React.Component {
cursor: "pointer", cursor: "pointer",
color: "#bfbfbf", color: "#bfbfbf",
fontSize: "14px", fontSize: "14px",
fontWeight:"400"
}} }}
> >
&#xe61d; &#xe61d;
......
src/modules/personalInfo/index.less
.personal-info-page{ .personal-info-page{
.box{ .box{
padding: 60px 60px 60px 40px !important; padding: 24px 60px 60px 40px !important;
} }
.label{ .label{
width:84px; width:84px;
...@@ -57,4 +57,8 @@ ...@@ -57,4 +57,8 @@
margin-left:20px; margin-left:20px;
} }
} }
.save-btn {
margin-left: 92px;
}
} }
\ No newline at end of file
src/modules/personalInfo/index.tsx
/* /*
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31 * @Date: 2020-11-27 15:06:31
* @LastEditors: zangsuyun * @LastEditors: wufan
* @LastEditTime: 2021-03-22 13:55:24 * @LastEditTime: 2021-05-28 15:31:06
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -181,7 +181,7 @@ console.log('User.getStoreType()',User.getStoreType()); ...@@ -181,7 +181,7 @@ console.log('User.getStoreType()',User.getStoreType());
</Button> </Button>
</div> </div>
)} )}
<div> <div className="save-btn">
<Button <Button
type="primary" type="primary"
onClick={() => { onClick={() => {
......
src/modules/plan-manage/AddPlan.jsx
/* /*
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:13:39 * @Date: 2021-02-20 16:13:39
* @LastEditors: fusanqiasng * @LastEditors: wufan
* @LastEditTime: 2021-05-24 00:00:31 * @LastEditTime: 2021-05-30 20:39:16
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -17,7 +17,7 @@ import PlanService from '@/domains/plan-domain/planService' ...@@ -17,7 +17,7 @@ import PlanService from '@/domains/plan-domain/planService'
import User from '@/common/js/user' import User from '@/common/js/user'
import _ from 'underscore' import _ from 'underscore'
import './AddPlan.less' import './AddPlan.less'
const defaultCover = 'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png' const defaultCover = 'https://image.xiaomaiketang.com/xm/rEAetaTEh3.png';
const defaultBasicData = { const defaultBasicData = {
planName: '', planName: '',
coverUrl: defaultCover, coverUrl: defaultCover,
...@@ -286,7 +286,7 @@ function AddPlan() { ...@@ -286,7 +286,7 @@ function AddPlan() {
)} )}
</div> </div>
</div> </div>
<div className='footer'> <div className='footer shrink-footer'>
<Button onClick={handleGoBack}>取消</Button> <Button onClick={handleGoBack}>取消</Button>
<Button type='primary' onClick={submitInfo} disabled={submitDisabled}> <Button type='primary' onClick={submitInfo} disabled={submitDisabled}>
保存 保存
......
src/modules/plan-manage/AddPlan.less
.add-plan-page { .add-plan-page {
position:relative !important; position:relative !important;
.box { .box {
margin-bottom: 66px !important; margin-bottom: 52px !important;
padding-bottom: 40px!important;
.add-plan-page__form { .add-plan-page__form {
margin-top: 16px; margin-top: 16px;
.title { .title {
...@@ -18,13 +19,14 @@ ...@@ -18,13 +19,14 @@
} }
.footer { .footer {
position: fixed; position: fixed;
left: 196px;
bottom: 0; bottom: 0;
height: 58px; height: 58px;
width: 100%; width: ~'calc(100% - 218px)';
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
padding-right: 252px; padding-right: 72px;
background: #fff; background: #fff;
border-top: 1px solid #E8E8E8; border-top: 1px solid #E8E8E8;
z-index: 9999; z-index: 9999;
......
src/modules/plan-manage/LearningData.jsx
...@@ -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) {
......
src/modules/plan-manage/LearningData.less
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
font-weight:normal; font-weight:normal;
} }
.plan-info{ .plan-info{
margin:16px; margin-bottom:8px;
padding:16px; padding:16px;
background: #FFF; background: #FFF;
display:flex; display:flex;
......
src/modules/plan-manage/components/BasicInfo.less
...@@ -40,13 +40,12 @@ ...@@ -40,13 +40,12 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: contain; object-fit: contain;
border: 1px solid #E8e8e8;
} }
} }
.opt-btns{ .opt-btns{
.default-btn { .default-btn {
margin:0 8px; margin:0 8px;
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
&.disabled { &.disabled {
color: #CCC; color: #CCC;
......
src/modules/plan-manage/components/EmployeeShareData.jsx
...@@ -134,6 +134,7 @@ class EmployeeShareData extends React.Component { ...@@ -134,6 +134,7 @@ class EmployeeShareData extends React.Component {
) )
} }
}, },
//产品暂时性隐藏
// { // {
// title: '手机号', // title: '手机号',
// key: 'storeUserPhone', // key: 'storeUserPhone',
......
src/modules/plan-manage/components/EmployeeShareData.less
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
} }
.operate-item{ .operate-item{
font-size:14px; font-size:14px;
color:#5289FA; color:#2966FF;
cursor: pointer; cursor: pointer;
} }
.learn-num{ .learn-num{
......
src/modules/plan-manage/components/PlanList.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:46:46 * @Date: 2021-02-20 16:46:46
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2021-05-13 16:36:43 * @LastEditTime: 2021-05-14 18:12:50
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -131,7 +131,7 @@ function PlanList(props) { ...@@ -131,7 +131,7 @@ function PlanList(props) {
<span className="operate-text">更多</span> <span className="operate-text">更多</span>
<span <span
className="iconfont icon" className="iconfont icon"
style={{ color: "#5289FA" }} style={{ color: "#2966FF" }}
> >
&#xe824; &#xe824;
</span> </span>
......
src/modules/plan-manage/components/PlanList.less
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.operate-text { .operate-text {
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
.operate { .operate {
display: flex; display: flex;
&__item { &__item {
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
&.split { &.split {
......
src/modules/plan-manage/components/TrainingTask.less
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
font-size:14px; font-size:14px;
} }
.add-task-btn{ .add-task-btn{
color: #5289FA; color: #2966FF;
font-size:14px; font-size:14px;
} }
} }
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
.course-box{ .course-box{
.add-course-con{ .add-course-con{
padding:16px 51px; padding:16px 51px;
color: #5289FA; color: #2966FF;
font-size:14px; font-size:14px;
.add-course-btn-disabled{ .add-course-btn-disabled{
font-size:14px; font-size:14px;
......
src/modules/plan-manage/components/UserLearningData.jsx
...@@ -194,16 +194,10 @@ class UserLearningData extends React.Component { ...@@ -194,16 +194,10 @@ class UserLearningData extends React.Component {
}, },
}, },
{ {
title: ( title: <span>
<span> <span>负责人</span>
<span>负责人</span> <Tooltip title="培训计划的分享者/跟进人"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:"400"}}>&#xe61d;</i></Tooltip>
<Tooltip title='培训计划的分享者/跟进人'> </span>,
<i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px' }}>
&#xe61d;
</i>
</Tooltip>
</span>
),
key: 'userNameList', key: 'userNameList',
dataIndex: 'userNameList', dataIndex: 'userNameList',
render: (val, record) => { render: (val, record) => {
...@@ -241,17 +235,10 @@ class UserLearningData extends React.Component { ...@@ -241,17 +235,10 @@ class UserLearningData extends React.Component {
}, },
}, },
{ {
title: ( title: <span>
<span> <span>学习进度</span>
<span>学习进度</span> <Tooltip title="学员培训计划中达到“已完成”状态的课程数/总课程数"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px', fontWeight:"400"}}>&#xe61d;</i></Tooltip>
<Tooltip title='学员培训计划中达到“已完成”状态的课程数/总课程数'> </span>,
<i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px' }}>
&#xe61d;
</i>
</Tooltip>
</span>
),
key: 'learnNum', key: 'learnNum',
dataIndex: 'learnNum', dataIndex: 'learnNum',
width: 130, width: 130,
......
src/modules/plan-manage/components/UserLearningDataFilter.less
...@@ -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;
......
src/modules/plan-manage/modal/SharePlanModal.less
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
margin-bottom: 40px; margin-bottom: 40px;
.content { .content {
color:rgba(82, 137, 250, 1); color:#2966FF;
cursor: pointer; cursor: pointer;
} }
} }
......
src/modules/plan-manage/modal/relatedCourseModal.less
.related-course-modal { .related-course-modal {
.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn { .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
font-weight: normal; font-weight: 500;
} }
// .ant-tabs-nav .ant-tabs-tab { .link-create-course{
// padding: 6px 12px !important; color:#666666;
// margin: 0; font-size:14px;
// border: 1px solid #e8e8e8; width:638px;
// font-size: 14px !important; text-align:left;
// color: #999; display:inline-block;
span{
// &:nth-child(1) { color:#2966FF;
// border-radius: 4px 0px 0px 4px; }
// } }
// &:nth-child(2) { .search-container{
// border-radius: 0px 4px 4px 0px; margin-bottom:16px;
// }
// }
// .ant-tabs-nav .ant-tabs-tab-active {
// // border: 1px solid #ffb714;
// color: #ffb714;
// }
// .ant-tabs-top .ant-tabs-ink-bar-animated:after {
// height: 0;
// }
.ant-modal-footer {
display: flex;
}
.link-create-course {
color: #666666;
font-size: 14px;
width: 638px;
text-align: left;
display: inline-block;
span {
color: #5289fa;
} }
.select-area{
margin-bottom:12px;
display:flex;
justify-content:space-between;
.select-box{
display:inline-box;
width: 186px;
background: #E9EFFF;
border-radius: 4px;
padding:6px 16px;
margin-right:8px;
display: flex;
justify-content: space-between;
.tip-icon{
color:#2966FF;
font-size:14px;
margin-right:4px;
}
.select-num{
color:#666666;
font-size:14px;
}
.clear-btn{
text-align:right;
color:#2966FF;
font-size:14px;
}
}
.related-box{
padding:6px 16px;
background: #E9EFFF;
border-radius: 4px;
flex:1;
color:#666666;
font-size:14px;
}
} }
.search-container { .search-container {
margin-bottom: 16px; margin-bottom: 16px;
...@@ -48,14 +62,14 @@ ...@@ -48,14 +62,14 @@
.select-box { .select-box {
display: inline-box; display: inline-box;
width: 186px; width: 186px;
background: #fff4dd; background: #e9efff;
border-radius: 4px; border-radius: 4px;
padding: 6px 16px; padding: 6px 16px;
margin-right: 8px; margin-right: 8px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.tip-icon { .tip-icon {
color: #ff9d14; color: #2966ff;
font-size: 14px; font-size: 14px;
margin-right: 4px; margin-right: 4px;
} }
...@@ -71,7 +85,7 @@ ...@@ -71,7 +85,7 @@
} }
.related-box { .related-box {
padding: 6px 16px; padding: 6px 16px;
background: #fff4dd; background: #e9efff;
border-radius: 4px; border-radius: 4px;
flex: 1; flex: 1;
color: #666666; color: #666666;
......
src/modules/prepare-lesson/index.less
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
} }
&:hover { &:hover {
background: rgba(255,133,52,0.06); background: rgba(41, 102, 255, 0.06);
} }
&.active { &.active {
background: rgba(255,133,52,0.06); background: rgba(41, 102, 255, 0.06);
.iconfont, .disk-name { .iconfont, .disk-name {
font-weight: 500; font-weight: 500;
} }
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
&:not(:last-child) { &:not(:last-child) {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #5289FA; color: #2966FF;
} }
&::before { &::before {
content: '/'; content: '/';
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
} }
.file-path { .file-path {
cursor: pointer; cursor: pointer;
color: #5289FA; color: #2966FF;
} }
.ant-dropdown-trigger { .ant-dropdown-trigger {
cursor: pointer; cursor: pointer;
......
src/modules/prepare-lesson/modal/SelectPrepareFileModal.less
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
&:not(:last-child) { &:not(:last-child) {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #5289FA; color: #2966FF;
} }
&::before { &::before {
content: '/'; content: '/';
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
color: #BFBFBF; color: #BFBFBF;
font-size:12px; font-size:12px;
&.correct { &.correct {
color: #FFB714; color: #2966FF;
} }
} }
} }
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
} }
.footer__left { .footer__left {
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
......
src/modules/resource-disk/index.less
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
} }
&:hover { &:hover {
background: rgba(255, 183, 20, 0.05); background: rgba(41, 102, 255, 0.06);
} }
&.active { &.active {
background: rgba(255, 183, 20, 0.05); background: rgba(41, 102, 255, 0.06);
.iconfont, .disk-name { .iconfont, .disk-name {
font-weight: 500; font-weight: 500;
} }
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
right: 0; right: 0;
width: 4px; width: 4px;
height: 100%; height: 100%;
background-color: #FFB714; background-color: #2966FF;
} }
} }
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
position: absolute; position: absolute;
left: 33px; left: 33px;
bottom: 24px; bottom: 24px;
color: #5289FA; color: #2966FF;
} }
} }
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
&:not(:last-child) { &:not(:last-child) {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #5289FA; color: #2966FF;
} }
&::before { &::before {
content: '/'; content: '/';
...@@ -204,12 +204,12 @@ ...@@ -204,12 +204,12 @@
} }
&__text:hover { &__text:hover {
color: #5289FA; color: #2966FF;
} }
} }
.file-path { .file-path {
cursor: pointer; cursor: pointer;
color: #5289FA; color: #2966FF;
} }
.ant-dropdown-trigger { .ant-dropdown-trigger {
cursor: pointer; cursor: pointer;
......
src/modules/root/App.tsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2019-07-10 10:30:49 * @Date: 2019-07-10 10:30:49
* @LastEditors: wufan * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-03-26 16:13:48 * @LastEditTime: 2021-05-24 16:29:05
* @Description: * @Description:
*/ */
import React, { useContext, useEffect, useState } from 'react'; import React, { useContext, useEffect, useState } from 'react';
...@@ -127,7 +127,7 @@ const App: React.FC = (props: any) => { ...@@ -127,7 +127,7 @@ const App: React.FC = (props: any) => {
<ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}> <ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
<Main menuType={menuType} /> <Main menuType={menuType} />
</ConfigProvider> </ConfigProvider>
<Menu menuType={menuType} /> <Menu menuType={menuType} handleMenuType={handleMenuType}/>
</div> </div>
) )
} }
......
src/modules/root/CollegeManagePage.less
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
background: #fff; background: #fff;
z-index: 999;
.box { .box {
height: 60px; height: 60px;
width: 1280px; width: 1280px;
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
} }
.logout { .logout {
font-size: 14px; font-size: 14px;
color: #5289FA; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
...@@ -102,8 +103,8 @@ ...@@ -102,8 +103,8 @@
padding: 0 8px; padding: 0 8px;
line-height: 18px; line-height: 18px;
border-radius: 9px; border-radius: 9px;
border: 1px solid #5289FA; border: 1px solid #2966FF;
color: #5289FA; color: #2966FF;
font-size: 12px; font-size: 12px;
} }
} }
...@@ -124,7 +125,7 @@ ...@@ -124,7 +125,7 @@
left: 50%; left: 50%;
top: 50%; top: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
color: #5289FA; color: #2966FF;
font-size: 16px; font-size: 16px;
} }
.control-box { .control-box {
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
.control-button { .control-button {
margin-left: 10px; margin-left: 10px;
cursor: pointer; cursor: pointer;
color: #5289FA; color: #2966FF;
} }
.disable-button { .disable-button {
display: none; display: none;
...@@ -171,14 +172,14 @@ ...@@ -171,14 +172,14 @@
} }
.disable-button { .disable-button {
display: block; display: block;
color: #5289FA; color: #2966FF;
} }
} }
} }
} }
} }
.college-create { .college-create {
border: 1px dashed #5289FA; border: 1px dashed #2966FF;
} }
} }
} }
......
src/modules/root/CreateCollege.jsx
...@@ -190,12 +190,14 @@ export default class CreateCollege extends React.Component { ...@@ -190,12 +190,14 @@ export default class CreateCollege extends React.Component {
<img className="box-image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png" /> <img className="box-image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png" />
</div> </div>
</div> </div>
<Breadcrumbs <div className="breadcrumb-wrap">
navList="创建企学院" <Breadcrumbs
goBack={() => { navList="创建企学院"
window.RCHistory.goBack(); goBack={() => {
}} window.RCHistory.goBack();
/> }}
/>
</div>
<div className="create-box"> <div className="create-box">
<div className="image-box"> <div className="image-box">
<img className="image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png"/> <img className="image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png"/>
......
src/modules/root/CreateCollege.less
.college-manage-page { .college-manage-page {
.breadcrumb-wrap {
margin-left: 57px;
}
.create-box { .create-box {
padding-top: 108px; padding-top: 108px;
margin: 0 auto; margin: 0 auto;
......
src/modules/root/Header.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2019-09-10 18:26:03 * @Date: 2019-09-10 18:26:03
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-05-12 17:30:25 * @LastEditTime: 2021-05-27 19:44:42
* @Description: * @Description:
*/ */
import React, { useRef, useContext, useEffect, useState } from "react"; import React, { useRef, useContext, useEffect, useState } from "react";
...@@ -219,23 +219,8 @@ function Header(props) { ...@@ -219,23 +219,8 @@ function Header(props) {
<div id="top-container" className="top-container"> <div id="top-container" className="top-container">
<div className="top top-nav"> <div className="top top-nav">
<div> <div>
{menuType ? <img src='https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png' className="logo" alt="" />:<img src="https://image.xiaomaiketang.com/xm/c4KiP2epBP.png" className="logo" alt="" />} <img src='https://image.xiaomaiketang.com/xm/WEsMPAYxAs.png' className="logo" alt="" />
</div> </div>
{menuType ? (
<span
className="icon iconfont cursor ml20 handLike"
onClick={handleMenu}
>
&#xe83d;
</span>
) : (
<span
className="icon iconfont cursor ml20 handLike"
onClick={handleMenu}
>
&#xe615;
</span>
)}
<div className="message-help"> <div className="message-help">
{list.length ? ( {list.length ? (
<ClickOutside <ClickOutside
...@@ -313,10 +298,15 @@ function Header(props) { ...@@ -313,10 +298,15 @@ function Header(props) {
</div> </div>
)} )}
<div className="right-box"> <div className="right-box">
<div className="right-bg-img">
<img src="https://image.xiaomaiketang.com/xm/WCwjyyXYda.png"></img>
</div>
<div className="link-to-store"> <div className="link-to-store">
<div className="link"> <div className="link">
<span className="icon iconfont tool-tip-right">&#xe85d;</span> <span className="link-btn">
<div className="text">前往学院</div> <span className="icon iconfont tool-tip-right">&#xe85d;</span>
<span className="text">前往学院</span>
</span>
<div className="store-popover"> <div className="store-popover">
<div className="pc-url"> <div className="pc-url">
<div className="name">网页端学院</div> <div className="name">网页端学院</div>
...@@ -337,8 +327,10 @@ function Header(props) { ...@@ -337,8 +327,10 @@ function Header(props) {
</div> </div>
</div> </div>
<div className="share" onClick={handleCopy}> <div className="share" onClick={handleCopy}>
<span className="icon iconfont tool-tip-right">&#xe85e;</span> <span className="share-btn">
<div className="text">分享学院</div> <span className="icon iconfont tool-tip-right">&#xe85e;</span>
<span className="text">分享学院</span>
</span>
</div> </div>
</div> </div>
<Dropdown overlay={userMenu()} arrow> <Dropdown overlay={userMenu()} arrow>
......
src/modules/root/Header.less
@import "../../core/variables.less"; @import "../../core/variables.less";
@top-height: 50px; @top-height: 60px;
@icon-color: #939393; @icon-color: #939393;
.top-container { .top-container {
position: absolute; position: absolute;
...@@ -7,8 +7,17 @@ ...@@ -7,8 +7,17 @@
left: 0; left: 0;
right: 0; right: 0;
height: @top-height; height: @top-height;
background-color: #fff; background-color: #2966FF;
z-index: 112; // z-index:2;
&::after{
content:'';
width:100%;
height:60px;
background: linear-gradient(180deg, #2966FF 0%, rgba(41, 102, 255, 0.82) 29%, rgba(41, 102, 255, 0.58) 55%, rgba(41, 102, 255, 0.27) 77%, rgba(7, 78, 255, 0) 100%);
position:absolute;
z-index:2;
top:59px;
}
.logo { .logo {
display: inline-block; display: inline-block;
height: 30px; height: 30px;
...@@ -17,7 +26,7 @@ ...@@ -17,7 +26,7 @@
.logo-name { .logo-name {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #ffb714; color: #2966FF;
line-height: 20px; line-height: 20px;
vertical-align: middle; vertical-align: middle;
font-weight: bold; font-weight: bold;
...@@ -177,7 +186,7 @@ ...@@ -177,7 +186,7 @@
flex: 1; flex: 1;
-webkit-flex: 1; -webkit-flex: 1;
justify-content: space-between; justify-content: space-between;
margin-left: 54px; margin-left: 62px;
.college-container { .college-container {
position: relative; position: relative;
width: 360px; width: 360px;
...@@ -195,7 +204,7 @@ ...@@ -195,7 +204,7 @@
cursor: pointer; cursor: pointer;
} }
.college-name { .college-name {
color: #666; color:#FFFFFF;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
...@@ -204,9 +213,9 @@ ...@@ -204,9 +213,9 @@
.icon { .icon {
font-size: 14px; font-size: 14px;
margin-left: 8px; margin-left: 8px;
color: #8c8e93; color: #FFF;
&:hover { &:hover {
color: #555; color:#FFF;
} }
} }
} }
...@@ -274,9 +283,9 @@ ...@@ -274,9 +283,9 @@
align-items: center; align-items: center;
.store-name { .store-name {
font-size: 14px; font-size: 14px;
color: #666; color: #FFF;
line-height: 49px; line-height: 49px;
margin-left: 36px; margin-left: 8px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
...@@ -294,26 +303,36 @@ ...@@ -294,26 +303,36 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.right-bg-img{
img{
width:277px;
height:60px;
}
}
.link-to-store { .link-to-store {
display: flex; display: flex;
height: 49px; height: 49px;
line-height: 49px; line-height: 49px;
.text { .text {
font-size: 14px; font-size: 14px;
color: #666; color: #FFF;
line-height: 49px; line-height: 49px;
margin-left: 7px; margin-left: 7px;
} }
.iconfont { .iconfont {
color: #8c8e93; color: #FFF;
&:hover {
color: #555;
}
} }
.link { .link {
display: flex;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
.link-btn{
padding:3px 12px;
border: 1px solid rgba(255, 255, 255, 0.5);
border-radius: 4px;
&:hover{
border: 1px solid rgba(255, 255, 255, 1);
}
}
.store-popover { .store-popover {
display: none; display: none;
} }
...@@ -343,7 +362,7 @@ ...@@ -343,7 +362,7 @@
line-height: 20px; line-height: 20px;
} }
.url-link { .url-link {
color: #5289fa; color: #2966FF;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
} }
...@@ -374,8 +393,15 @@ ...@@ -374,8 +393,15 @@
} }
.share { .share {
cursor: pointer; cursor: pointer;
display: flex;
margin-left: 16px; margin-left: 16px;
.share-btn{
padding:3px 12px;
border: 1px solid rgba(255, 255, 255, 0.5);
border-radius: 4px;
&:hover{
border: 1px solid rgba(255, 255, 255, 1);
}
}
} }
} }
.drop-menu { .drop-menu {
...@@ -503,6 +529,7 @@ ...@@ -503,6 +529,7 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color:#FFF;
} }
} }
} }
......
src/modules/root/Login.jsx
...@@ -147,20 +147,19 @@ function Login(props) { ...@@ -147,20 +147,19 @@ function Login(props) {
} }
return ( return (
<div className='login-page'> <div className="login-page" >
<div className='login-main'> <div className="logo-img-box"><img src="https://image.xiaomaiketang.com/xm/6k8PPCmywG.png" className="logo-img"/></div>
<div className='left-banner'> <div className="login-main">
<div> <div className="left-banner">
<img src='https://image.xiaomaiketang.com/xm/Newk4NrxKC.png' alt='' style={{ width: 60, height: 61 }} /> <div className="img-box"><img src="https://image.xiaomaiketang.com/xm/CDCcdAdaPs.png" alt="" /></div>
</div>
<div className='name'>小麦企学院</div>
<div className='desc'>一键开启直播授课 让知识更有价值</div>
</div> </div>
<div className='login-box'> <div className="login-box">
<div className='login'> <div className="left-top-block color-block"></div>
<div className='r'> <div className="right-bottom-block color-block"></div>
<Tabs defaultActiveKey='1'> <div className="login">
<TabPane tab='企业微信登录' key='1'> <div className="r">
<Tabs defaultActiveKey="1">
<TabPane tab="企业微信登录" key="1">
<WechatLogin></WechatLogin> <WechatLogin></WechatLogin>
</TabPane> </TabPane>
<TabPane tab='手机号登录' key='2'> <TabPane tab='手机号登录' key='2'>
...@@ -172,7 +171,7 @@ function Login(props) { ...@@ -172,7 +171,7 @@ function Login(props) {
autoComplete='off' autoComplete='off'
name='account' name='account'
maxLength={11} maxLength={11}
placeholder='手机号' placeholder="请输入手机号"
value={phone} value={phone}
onChange={(e) => { onChange={(e) => {
setPhone(e.target.value) setPhone(e.target.value)
...@@ -182,11 +181,11 @@ function Login(props) { ...@@ -182,11 +181,11 @@ function Login(props) {
<div className='error-message'></div> <div className='error-message'></div>
<div className='phoneverify'> <div className='phoneverify'>
<Input <Input
type='text' type="text"
id='phoneverify' id="phoneverify"
name='phoneverify' name="phoneverify"
placeholder='验证码' placeholder="请输入验证码"
autoComplete='off' autoComplete="off"
value={phoneverify} value={phoneverify}
maxLength={4} maxLength={4}
onChange={(e) => { onChange={(e) => {
......
src/modules/root/Login.less
...@@ -4,49 +4,61 @@ ...@@ -4,49 +4,61 @@
font-family: "微软雅黑"; font-family: "微软雅黑";
padding: 0; padding: 0;
min-width: 1200px; min-width: 1200px;
background: #21242e; background: #F4F6FA;
height: 100%; height: 100%;
overflow-y: hidden;
.logo-img-box{
position: absolute;
top:24px;
right:32px;
z-index:1;
.logo-img{
width:120px;
display: inline-block;
}
}
.login-main { .login-main {
min-width: 1200px; min-width: 1200px;
display: flex;
} }
.left-banner { .left-banner {
position: fixed; position: relative;
min-width: 315px; width: 540px;
text-align: center; height: 100vh;
top: 50%; .img-box {
left: 30%; background: #2966FF;
-webkit-transform: translate(-50%, -50%); width: 540px;
-moz-transform: translate(-50%, -50%); height: 100vh;
-ms-transform: translate(-50%, -50%); img {
-o-transform: translate(-50%, -50%); width: 540px;
transform: translate(-50%, -50%); height: 800px;
.name { position: absolute;
font-size: 30px; left: 50%;
font-weight: 500; top: 50%;
color: #ffffff; transform: translate(-50%,-50%);
line-height: 42px; }
margin-top: 11px;
}
.desc {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 20px;
margin-top: 10px;
} }
} }
.login-box { .login-box {
min-width: 360px; min-width: 740px;
height: 340px; height: 100vh;
position: fixed; width: calc(100vw - 500px);
top: 50%; position: relative;
left: 70%; .color-block {
-webkit-transform: translate(-50%, -50%); width: 256px;
-moz-transform: translate(-50%, -50%); height: 256px;
-ms-transform: translate(-50%, -50%); background: rgba(41, 102, 255, 0.05);
-o-transform: translate(-50%, -50%); position: absolute;
transform: translate(-50%, -50%); top:0;
left: 0;
&.right-bottom-block {
top:auto;
left: auto;
bottom: 0;
right: 0;
}
}
.go-to-site { .go-to-site {
position: absolute; position: absolute;
bottom: -80px; bottom: -80px;
...@@ -74,15 +86,18 @@ ...@@ -74,15 +86,18 @@
display: -webkit-flex; display: -webkit-flex;
flex-direction: row; flex-direction: row;
-webkit-flex-direction: row; -webkit-flex-direction: row;
height: 100%; width: 420px;
height: 420px;
position: absolute;
left: 50%;
top:50%;
transform: translate(-50%,-50%);
overflow: hidden; overflow: hidden;
background-color: #ffffff; background-color: #ffffff;
border-radius: 4px; //box-shadow: 0 0 17px @sun; border-radius: 4px;
.ant-tabs-tab-btn { .ant-tabs-tab-btn {
color: #999999; color: #999999;
font-size: 16px; font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
line-height: 25px; line-height: 25px;
&.ant-tabs-tab-active { &.ant-tabs-tab-active {
color: #333333; color: #333333;
...@@ -92,6 +107,7 @@ ...@@ -92,6 +107,7 @@
.ant-tabs-tab-active { .ant-tabs-tab-active {
.ant-tabs-tab-btn { .ant-tabs-tab-btn {
color: #333333; color: #333333;
font-weight:500!important;
} }
} }
.ant-tabs-nav::before { .ant-tabs-nav::before {
...@@ -165,7 +181,7 @@ ...@@ -165,7 +181,7 @@
flex: 1; flex: 1;
-webkit-flex: 1; -webkit-flex: 1;
height: 100%; height: 100%;
padding: 24px; padding: 40px;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
&.show-qrcode { &.show-qrcode {
...@@ -181,6 +197,9 @@ ...@@ -181,6 +197,9 @@
} }
} }
} }
.login-form{
margin-top:32px;
}
.qrcode { .qrcode {
display: none; display: none;
text-align: center; text-align: center;
...@@ -364,9 +383,9 @@ ...@@ -364,9 +383,9 @@
border-radius: 3px; border-radius: 3px;
margin-top: 60px; margin-top: 60px;
font-size: 14px; // font-weight: 300; font-size: 14px; // font-weight: 300;
color:#5289FA; color:#2966FF;
&:hover { &:hover {
color: #ffb714; color: #2966FF;
} }
&::before { &::before {
content: ""; content: "";
...@@ -397,7 +416,7 @@ ...@@ -397,7 +416,7 @@
} }
.refresh { .refresh {
font-size: 14px; font-size: 14px;
color: #5289fa; color: #2966FF;
cursor: pointer; cursor: pointer;
} }
} }
...@@ -411,7 +430,7 @@ ...@@ -411,7 +430,7 @@
} }
} }
.submit { .submit {
margin-top: 11px; margin-top: 24px;
button { button {
// font-weight: 300; // font-weight: 300;
} }
...@@ -450,7 +469,7 @@ ...@@ -450,7 +469,7 @@
text-align:center; text-align:center;
&:hover { &:hover {
opacity: 0.7; opacity: 0.7;
background: linear-gradient(90deg, #ffb714 0%, #ffad34 100%); background: #5C8AFF;
} }
} }
} }
......
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