Skip to content

X
xiaomai-cloud-class-web
Commit 65fd1db4 by zhangleyuan
Options

style:处理UI验收问题

parent d4330b87
Showing with 110 additions and 114 deletions
src/core/antd.less
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
} }
.ant-btn-primary { .ant-btn-primary {
text-shadow: none !important;
box-shadow: none !important;
i { i {
color: #fff !important; color: #fff !important;
} }
...@@ -225,11 +227,7 @@ ...@@ -225,11 +227,7 @@
line-height:20px !important; line-height:20px !important;
font-weight: 400 !important; font-weight: 400 !important;
border: 1px solid #e8e8e8; border: 1px solid #e8e8e8;
&:focus, box-shadow: none !important;
:active {
border: 1px solid #ffb000 !important;
color: #ffb000 !important;
}
} }
.ant-input-search-button { .ant-input-search-button {
...@@ -382,13 +380,6 @@ mr0 { ...@@ -382,13 +380,6 @@ mr0 {
background-color: #fdb089 !important; background-color: #fdb089 !important;
border-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 { span {
color: #fff !important; color: #fff !important;
} }
......
src/domains/basic-domain/constants.ts
/* /*
* @Author: 陈剑宇 * @Author: 陈剑宇
* @Date: 2020-05-07 14:43:01 * @Date: 2020-05-07 14:43:01
* @LastEditTime: 2021-01-18 21:05:12 * @LastEditTime: 2021-01-19 14:32:47
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @Description: * @Description:
* @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
import { MapInterface } from '@/domains/basic-domain/interface' import { MapInterface } from '@/domains/basic-domain/interface'
// 默认是 dev 环境 // 默认是 dev 环境
const ENV: string = process.env.DEPLOY_ENV || 'prod'; const ENV: string = process.env.DEPLOY_ENV || 'dev';
console.log("process.env.DEPLOY_ENV",process) console.log("process.env.DEPLOY_ENV",process)
const BASIC_HOST_MAP: MapInterface = { const BASIC_HOST_MAP: MapInterface = {
dev: 'https://dev-heimdall.xiaomai5.com/', dev: 'https://dev-heimdall.xiaomai5.com/',
......
src/domains/course-domain/constants.ts
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
import { MapInterface } from '@/domains/basic-domain/interface' 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 = { const appIdMap: MapInterface = {
dev: 'wx3ea60e78ddfa277e', dev: 'wx3ea60e78ddfa277e',
......
src/modules/course-manage/components/LiveCourseFilter.less
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
line-height: 20px; line-height: 20px;
.fold-icon { .fold-icon {
font-size: 12px; font-size: 12px;
margin-left:4px;
} }
} }
} }
......
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: "#FDBE31", color: "#FFB714",
}, },
STARTING: { STARTING: {
code: 2, code: 2,
...@@ -259,7 +259,7 @@ class LiveCourseList extends React.Component { ...@@ -259,7 +259,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'}}>&#xe61d;</i></Tooltip> <Tooltip title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
</span>, </span>,
width: "7%", width: "7%",
dataIndex: "courseware", dataIndex: "courseware",
......
src/modules/course-manage/video-course/components/VideoCourseFilter.less
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
line-height: 20px; line-height: 20px;
.fold-icon { .fold-icon {
font-size: 12px; font-size: 12px;
margin-left:4px;
} }
} }
} }
......
src/modules/course-manage/video-course/components/VideoCourseList.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:12:45 * @Date: 2020-08-05 10:12:45
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-01-18 21:03:40 * @LastEditTime: 2021-01-19 15:53:11
* @Description: 视频课-列表模块 * @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -23,7 +23,7 @@ import User from '@/common/js/user' ...@@ -23,7 +23,7 @@ import User from '@/common/js/user'
import './VideoCourseList.less'; import './VideoCourseList.less';
const ENV = process.env.DEPLOY_ENV || 'prod'; const ENV = process.env.DEPLOY_ENV || 'dev';
class VideoCourseList extends React.Component { class VideoCourseList extends React.Component {
...@@ -123,7 +123,7 @@ class VideoCourseList extends React.Component { ...@@ -123,7 +123,7 @@ class VideoCourseList 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'}}>&#xe61d;</i></Tooltip> <Tooltip title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
</span>, </span>,
width: '12%', width: '12%',
dataIndex: "courseware", dataIndex: "courseware",
......
src/modules/root/Login.jsx
...@@ -122,7 +122,7 @@ function Login(props) { ...@@ -122,7 +122,7 @@ function Login(props) {
<div className="login-box"> <div className="login-box">
<div className="login"> <div className="login">
<div className="r"> <div className="r">
<Tabs defaultActiveKey="1" > <Tabs defaultActiveKey="1">
<TabPane tab="企业微信登录" key="1"> <TabPane tab="企业微信登录" key="1">
<WechatLogin></WechatLogin> <WechatLogin></WechatLogin>
</TabPane> </TabPane>
......
src/modules/root/WechatLogin.less
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
margin-top: 12px; margin-top: 12px;
font-size: 14px; font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999; color: #999999;
line-height: 20px; line-height: 20px;
} }
......
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