Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
65fd1db4
Commit
65fd1db4
authored
Jan 19, 2021
by
zhangleyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style:处理UI验收问题
parent
d4330b87
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
110 additions
and
114 deletions
+110
-114
src/core/antd.less
+3
-12
src/domains/basic-domain/constants.ts
+2
-2
src/domains/course-domain/constants.ts
+1
-1
src/modules/course-manage/components/LiveCourseFilter.less
+1
-0
src/modules/course-manage/components/LiveCourseList.jsx
+2
-2
src/modules/course-manage/video-course/components/VideoCourseFilter.less
+1
-0
src/modules/course-manage/video-course/components/VideoCourseList.jsx
+3
-3
src/modules/root/Login.jsx
+1
-1
src/modules/root/Login.less
+96
-92
src/modules/root/WechatLogin.less
+0
-1
No files found.
src/core/antd.less
View file @
65fd1db4
...
...
@@ -41,6 +41,8 @@
}
.ant-btn-primary {
text-shadow: none !important;
box-shadow: none !important;
i {
color: #fff !important;
}
...
...
@@ -225,11 +227,7 @@
line-height:20px !important;
font-weight: 400 !important;
border: 1px solid #e8e8e8;
&:focus,
:active {
border: 1px solid #ffb000 !important;
color: #ffb000 !important;
}
box-shadow: none !important;
}
.ant-input-search-button {
...
...
@@ -382,13 +380,6 @@ mr0 {
background-color: #fdb089 !important;
border-color: #fdb089 !important;
}
&:focus,
:active {
border: 1px solid @xm-color-text-select-primary !important;
background-color: @xm-color-text-select-primary !important;
}
span {
color: #fff !important;
}
...
...
src/domains/basic-domain/constants.ts
View file @
65fd1db4
/*
* @Author: 陈剑宇
* @Date: 2020-05-07 14:43:01
* @LastEditTime: 2021-01-1
8 21:05:12
* @LastEditTime: 2021-01-1
9 14:32:47
* @LastEditors: zhangleyuan
* @Description:
* @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
...
...
@@ -9,7 +9,7 @@
import
{
MapInterface
}
from
'@/domains/basic-domain/interface'
// 默认是 dev 环境
const
ENV
:
string
=
process
.
env
.
DEPLOY_ENV
||
'
prod
'
;
const
ENV
:
string
=
process
.
env
.
DEPLOY_ENV
||
'
dev
'
;
console
.
log
(
"process.env.DEPLOY_ENV"
,
process
)
const
BASIC_HOST_MAP
:
MapInterface
=
{
dev
:
'https://dev-heimdall.xiaomai5.com/'
,
...
...
src/domains/course-domain/constants.ts
View file @
65fd1db4
...
...
@@ -7,7 +7,7 @@
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
import
{
MapInterface
}
from
'@/domains/basic-domain/interface'
const
ENV
:
string
=
process
.
env
.
DEPLOY_ENV
||
'
prod
'
;
const
ENV
:
string
=
process
.
env
.
DEPLOY_ENV
||
'
dev
'
;
const
appIdMap
:
MapInterface
=
{
dev
:
'wx3ea60e78ddfa277e'
,
...
...
src/modules/course-manage/components/LiveCourseFilter.less
View file @
65fd1db4
...
...
@@ -36,6 +36,7 @@
line-height: 20px;
.fold-icon {
font-size: 12px;
margin-left:4px;
}
}
}
...
...
src/modules/course-manage/components/LiveCourseList.jsx
View file @
65fd1db4
...
...
@@ -32,7 +32,7 @@ const courseStateShow = {
UN_START
:
{
code
:
1
,
title
:
"待开课"
,
color
:
"#F
DBE31
"
,
color
:
"#F
FB714
"
,
},
STARTING
:
{
code
:
2
,
...
...
@@ -259,7 +259,7 @@ class LiveCourseList extends React.Component {
{
title
:
<
span
>
<
span
>
店铺展示
</
span
>
<
Tooltip
title=
{
<
div
>
开启后,用户可在店铺内查看到此课程。若课程“未成功开课”,则系统会自动“关闭”店铺展示。
<
br
/>
关闭后,店铺内不再展示此课程,但用户仍可通过分享的海报/链接查看此课程。
</
div
>
}
><
i
className=
"icon iconfont"
style=
{
{
marginLeft
:
'5px'
,
cursor
:
'pointer'
,
color
:
'#bfbfbf'
}
}
>

</
i
></
Tooltip
>
<
Tooltip
title=
{
<
div
>
开启后,用户可在店铺内查看到此课程。若课程“未成功开课”,则系统会自动“关闭”店铺展示。
<
br
/>
关闭后,店铺内不再展示此课程,但用户仍可通过分享的海报/链接查看此课程。
</
div
>
}
><
i
className=
"icon iconfont"
style=
{
{
marginLeft
:
'5px'
,
cursor
:
'pointer'
,
color
:
'#bfbfbf'
,
fontSize
:
'14px'
}
}
>

</
i
></
Tooltip
>
</
span
>,
width
:
"7%"
,
dataIndex
:
"courseware"
,
...
...
src/modules/course-manage/video-course/components/VideoCourseFilter.less
View file @
65fd1db4
...
...
@@ -37,6 +37,7 @@
line-height: 20px;
.fold-icon {
font-size: 12px;
margin-left:4px;
}
}
}
...
...
src/modules/course-manage/video-course/components/VideoCourseList.jsx
View file @
65fd1db4
...
...
@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-08-05 10:12:45
* @LastEditors: zhangleyuan
* @LastEditTime: 2021-01-1
8 21:03:40
* @LastEditTime: 2021-01-1
9 15:53:11
* @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
...
...
@@ -23,7 +23,7 @@ import User from '@/common/js/user'
import
'./VideoCourseList.less'
;
const
ENV
=
process
.
env
.
DEPLOY_ENV
||
'
prod
'
;
const
ENV
=
process
.
env
.
DEPLOY_ENV
||
'
dev
'
;
class
VideoCourseList
extends
React
.
Component
{
...
...
@@ -123,7 +123,7 @@ class VideoCourseList extends React.Component {
{
title
:
<
span
>
<
span
>
店铺展示
</
span
>
<
Tooltip
title=
{
<
div
>
开启后,用户可在店铺内查看到此课程。若课程“未成功开课”,则系统会自动“关闭”店铺展示。
<
br
/>
关闭后,店铺内不再展示此课程,但用户仍可通过分享的海报/链接查看此课程。
</
div
>
}
><
i
className=
"icon iconfont"
style=
{
{
marginLeft
:
'5px'
,
cursor
:
'pointer'
,
color
:
'#bfbfbf'
}
}
>

</
i
></
Tooltip
>
<
Tooltip
title=
{
<
div
>
开启后,用户可在店铺内查看到此课程。若课程“未成功开课”,则系统会自动“关闭”店铺展示。
<
br
/>
关闭后,店铺内不再展示此课程,但用户仍可通过分享的海报/链接查看此课程。
</
div
>
}
><
i
className=
"icon iconfont"
style=
{
{
marginLeft
:
'5px'
,
cursor
:
'pointer'
,
color
:
'#bfbfbf'
,
fontSize
:
'14px'
}
}
>

</
i
></
Tooltip
>
</
span
>,
width
:
'12%'
,
dataIndex
:
"courseware"
,
...
...
src/modules/root/Login.jsx
View file @
65fd1db4
...
...
@@ -122,7 +122,7 @@ function Login(props) {
<
div
className=
"login-box"
>
<
div
className=
"login"
>
<
div
className=
"r"
>
<
Tabs
defaultActiveKey=
"1"
>
<
Tabs
defaultActiveKey=
"1"
>
<
TabPane
tab=
"企业微信登录"
key=
"1"
>
<
WechatLogin
></
WechatLogin
>
</
TabPane
>
...
...
src/modules/root/Login.less
View file @
65fd1db4
This diff is collapsed.
Click to expand it.
src/modules/root/WechatLogin.less
View file @
65fd1db4
...
...
@@ -7,7 +7,6 @@
margin-top: 12px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999;
line-height: 20px;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment