Skip to content

X
xiaomai-cloud-class-web
Commit 843b8102 by zhangleyuan
Options

style:修改UI样式

parent 7ce64130
Showing with 43 additions and 22 deletions
src/core/antd.less
...@@ -636,6 +636,11 @@ mr0 { ...@@ -636,6 +636,11 @@ mr0 {
.ant-select-dropdown .rc-virtual-list-scrollbar .rc-virtual-list-scrollbar-thumb{ .ant-select-dropdown .rc-virtual-list-scrollbar .rc-virtual-list-scrollbar-thumb{
background: #D6D6D6 !important; background: #D6D6D6 !important;
width:6px !important;
height:80px !important;
}
.ant-select-dropdown .rc-virtual-list-scrollbar .rc-virtual-list-scrollbar-thumb:hover{
background: #ADADAD !important;
} }
.ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table > thead > tr > .ant-table-cell-fix-right-first::after, .ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table > thead > tr > .ant-table-cell-fix-right-first::after,
.ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table > tbody > tr > .ant-table-cell-fix-right-first::after .ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table > tbody > tr > .ant-table-cell-fix-right-first::after
......
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-27 19:52:58 * @LastEditTime: 2021-01-28 16:28:08
* @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/common/DateRangePicker.jsx
...@@ -27,7 +27,7 @@ class DateRangePicker extends React.Component { ...@@ -27,7 +27,7 @@ class DateRangePicker extends React.Component {
this.props.onChange(date) this.props.onChange(date)
}} }}
{...showTime} {...showTime}
suffixIcon={<span class="icon iconfont">&#xe838;</span>} suffixIcon={<span className="icon iconfont">&#xe838;</span>}
/> />
) )
} }
......
src/modules/course-manage/components/AddLiveBasic.jsx
...@@ -306,6 +306,7 @@ class AddLiveBasic extends React.Component { ...@@ -306,6 +306,7 @@ class AddLiveBasic extends React.Component {
onCancel={() => { onCancel={() => {
this.setState({ visible: false }); this.setState({ visible: false });
}} }}
zIndex={10001}
footer={[ footer={[
<Button <Button
key="back" key="back"
......
src/modules/course-manage/components/AddLiveClass.jsx
...@@ -103,13 +103,15 @@ class AddLiveClass extends React.Component { ...@@ -103,13 +103,15 @@ class AddLiveClass extends React.Component {
handleScrollTeacherList = (e) => { handleScrollTeacherList = (e) => {
const { hasNext } = this.state; const { hasNext } = this.state;
const container = e.target; const container = e.target;
//判定元素是否滚动到底部
const scrollToBottom = container && container.scrollHeight <= container.clientHeight + container.scrollTop; const scrollToBottom = container && container.scrollHeight <= container.clientHeight + container.scrollTop;
if (scrollToBottom && hasNext) { if (scrollToBottom && hasNext) {
const { teacherQuery } = this.state; const { teacherQuery } = this.state;
let _teacherQuery = teacherQuery; let _teacherQuery = teacherQuery;
_teacherQuery.current = _teacherQuery.current + 1 _teacherQuery.current = _teacherQuery.current + 1
this.setState({ this.setState({
assistantQuery:{..._teacherQuery} teacherQuery:{..._teacherQuery}
},()=>{this.getTeacherList(_teacherQuery.current)}) },()=>{this.getTeacherList(_teacherQuery.current)})
} }
} }
...@@ -118,6 +120,8 @@ class AddLiveClass extends React.Component { ...@@ -118,6 +120,8 @@ class AddLiveClass extends React.Component {
handleScrollAssistantList = (e) => { handleScrollAssistantList = (e) => {
const { assistantHasNext } = this.state; const { assistantHasNext } = this.state;
const container = e.target; const container = e.target;
//判定元素是否滚动到底部
const scrollToBottom = container && container.scrollHeight <= container.clientHeight + container.scrollTop; const scrollToBottom = container && container.scrollHeight <= container.clientHeight + container.scrollTop;
if (scrollToBottom && assistantHasNext) { if (scrollToBottom && assistantHasNext) {
const { assistantQuery } = this.state; const { assistantQuery } = this.state;
......
src/modules/course-manage/components/LiveCourseFilter.jsx
...@@ -187,6 +187,7 @@ class LiveCourseFilter extends React.Component { ...@@ -187,6 +187,7 @@ class LiveCourseFilter extends React.Component {
allowClear allowClear
filterOption={(input, option) => option} filterOption={(input, option) => option}
onPopupScroll={this.handleScrollTeacherList} onPopupScroll={this.handleScrollTeacherList}
suffixIcon={<span className="icon iconfont" style={{fontSize:'12px',color:'#BFBFBF'}}>&#xe835;</span>}
value={teacherId} value={teacherId}
onChange={(value) => { onChange={(value) => {
this.handleChangeQuery('teacherId', value); this.handleChangeQuery('teacherId', value);
......
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -262,7 +262,8 @@ class LiveCourseList extends React.Component { ...@@ -262,7 +262,8 @@ class LiveCourseList extends React.Component {
<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'}}>&#xe61d;</i></Tooltip>
</span>, </span>,
width: "9%", width: "9%",
dataIndex: "courseware", key: "shelfState",
dataIndex: "shelfState",
render: (val, item, index) => { render: (val, item, index) => {
return ( return (
<Switch defaultChecked={item.shelfState==="YES"?true:false} onChange={()=>this.changeShelfState(item)}/> <Switch defaultChecked={item.shelfState==="YES"?true:false} onChange={()=>this.changeShelfState(item)}/>
......
src/modules/course-manage/components/liveCourseOpt.less
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
} }
.ant-btn { .ant-btn {
margin-right: 12px; margin-right: 8px;
} }
} }
\ No newline at end of file
src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:11:57 * @Date: 2020-08-05 10:11:57
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-01-15 13:52:10 * @LastEditTime: 2021-01-28 18:06:34
* @Description: 视频课-搜索模块 * @Description: 视频课-搜索模块
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -154,6 +154,7 @@ class VideoCourseFilter extends React.Component { ...@@ -154,6 +154,7 @@ class VideoCourseFilter extends React.Component {
allowClear allowClear
filterOption={(input, option) => option} filterOption={(input, option) => option}
onPopupScroll={this.handleScrollTeacherList} onPopupScroll={this.handleScrollTeacherList}
suffixIcon={<span className="icon iconfont" style={{fontSize:'12px',color:'#BFBFBF'}}>&#xe835;</span>}
value={operatorId} value={operatorId}
onChange={(value) => { onChange={(value) => {
this.handleChangeQuery('operatorId', value) this.handleChangeQuery('operatorId', value)
......
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-27 19:53:30 * @LastEditTime: 2021-01-28 16:28:24
* @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 {
......
src/modules/root/Header.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2019-09-10 18:26:03 * @Date: 2019-09-10 18:26:03
* @LastEditors: wufan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-01-25 20:40:53 * @LastEditTime: 2021-01-28 15:24:43
* @Description: * @Description:
*/ */
import React, { useContext, useEffect, useState } from "react"; import React, { useContext, useEffect, useState } from "react";
...@@ -116,8 +116,7 @@ function Header(props) { ...@@ -116,8 +116,7 @@ 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>
<img src={logoImg} className="logo" alt="" /> {menuType ? <img src='https://image.xiaomaiketang.com/xm/4swGidkYR6.png' className="logo" alt="" />:<img src={logoImg} className="logo" alt="" />}
{menuType && <span className="logo-name">小麦企培</span>}
</div> </div>
{menuType ? ( {menuType ? (
<span <span
......
src/modules/root/Login.jsx
...@@ -3,7 +3,7 @@ import { ...@@ -3,7 +3,7 @@ import {
withRouter withRouter
} from 'react-router-dom'; } from 'react-router-dom';
import './Login.less'; import './Login.less';
import { Input, Popover, message, Tabs } from 'antd'; import { Input, Popover, message, Tabs ,Button} from 'antd';
import CheckBeforeSendCode from '../../components/CheckBeforeSendCode'; import CheckBeforeSendCode from '../../components/CheckBeforeSendCode';
import User from '@/common/js/user'; import User from '@/common/js/user';
import WechatLogin from './WechatLogin' import WechatLogin from './WechatLogin'
...@@ -194,7 +194,7 @@ function Login(props) { ...@@ -194,7 +194,7 @@ function Login(props) {
</div> </div>
<div className="submit"> <div className="submit">
<div className="btn"> <div className="btn">
<button id='loginIn' onClick={() => { handleSubmit() }} >登录</button> <span id='loginIn' onClick={() => { handleSubmit() }} >登录</span>
</div> </div>
</div> </div>
</div> </div>
......
src/modules/root/Login.less
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
display: none; display: none;
} }
.ant-tabs-tab { .ant-tabs-tab {
width: 105px;
text-align: center; text-align: center;
margin:0;
} }
.ant-tabs > .ant-tabs-nav .ant-tabs-nav-list { .ant-tabs > .ant-tabs-nav .ant-tabs-nav-list {
margin: 0 auto; margin: 0 auto;
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
flex: 1; flex: 1;
-webkit-flex: 1; -webkit-flex: 1;
height: 100%; height: 100%;
padding: 30px; padding: 24px;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
&.show-qrcode { &.show-qrcode {
...@@ -433,14 +433,14 @@ ...@@ -433,14 +433,14 @@
} }
} }
.btn { .btn {
button { #loginIn {
display: block; display: block;
width: 100%; width: 100%;
background: @primary; background: @primary;
color: #fff; color: #fff;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400 !important;
line-height: 40px; line-height: 40px !important;
border-radius: 4px; border-radius: 4px;
-webkit-transition: all 0.3s; -webkit-transition: all 0.3s;
-moz-transition: all 0.3s; -moz-transition: all 0.3s;
...@@ -449,6 +449,7 @@ ...@@ -449,6 +449,7 @@
transition: all 0.3s; transition: all 0.3s;
cursor: pointer; cursor: pointer;
border: none; border: none;
text-align:center;
&:hover { &:hover {
opacity: 0.7; opacity: 0.7;
background: linear-gradient(90deg, #ffb714 0%, #ffad34 100%); background: linear-gradient(90deg, #ffb714 0%, #ffad34 100%);
......
src/modules/root/Menu.less
...@@ -101,6 +101,13 @@ ...@@ -101,6 +101,13 @@
padding-left: 22px; padding-left: 22px;
padding-right: 0; padding-right: 0;
width: 117px; width: 117px;
margin-bottom:0 !important;
&:first-child{
margin-top:8px !important;
}
&:last-child{
margin-bottom:8px !important;
}
} }
.listType { .listType {
......
src/modules/root/WechatLogin.tsx
...@@ -26,7 +26,7 @@ export default function WechatLogin(props: any) { ...@@ -26,7 +26,7 @@ export default function WechatLogin(props: any) {
if (status === 0) { if (status === 0) {
Service.Hades("anon/hades/getTicket", {}).then((res: any) => { Service.Hades("anon/hades/getTicket", {}).then((res: any) => {
setTicket(res.result) setTicket(res.result)
const redirect = `${location.origin + location.pathname.replace('index.html', '') + 'h5.html'}?ticket=${res.result}&appTermEnum=XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN&env=${process.env.DEPLOY_ENV || 'prod'}` const redirect = `${location.origin + location.pathname.replace('index.html', '') + 'h5.html'}?ticket=${res.result}&appTermEnum=XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN&env=${process.env.DEPLOY_ENV || 'dev'}`
// console.log(redirect) // console.log(redirect)
// const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww409ccf9c6e31f19e&redirect_uri=${encodeURIComponent(redirect)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect` // const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww409ccf9c6e31f19e&redirect_uri=${encodeURIComponent(redirect)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
// console.log(url) // console.log(url)
......
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