Skip to content

X
xiaomai-cloud-class-web
Commit d9c39f70 by zhangleyuan
Options

feat:解决合并代码后的冲突

parents 4a75d531 8b9d6df5
Showing with 75 additions and 50 deletions
package.json
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
"react-dev-utils": "^10.2.1", "react-dev-utils": "^10.2.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-infinite-scroller": "^1.2.4", "react-infinite-scroller": "^1.2.4",
"react-lottie": "^1.2.3",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-sortable-hoc": "^1.11.0", "react-sortable-hoc": "^1.11.0",
"resolve": "1.15.0", "resolve": "1.15.0",
......
src/bu-components/ChooseMembersModal.jsx
...@@ -203,8 +203,10 @@ class ChooseMembersModal extends React.Component { ...@@ -203,8 +203,10 @@ class ChooseMembersModal extends React.Component {
title: '全选', // 实际为头像，但在表格上这行要求显示为全选 title: '全选', // 实际为头像，但在表格上这行要求显示为全选
key: 'avatar', key: 'avatar',
dataIndex: 'avatar', dataIndex: 'avatar',
width: '30px', width: '40%',
render: (value, record) => { render: (value, record) => {
const { adminName } = record;
return ( return (
<div className='avatar'> <div className='avatar'>
{ {
...@@ -212,23 +214,12 @@ class ChooseMembersModal extends React.Component { ...@@ -212,23 +214,12 @@ class ChooseMembersModal extends React.Component {
[<img className='avatar-img' src={ value } key='avatar' alt=""/>] [<img className='avatar-img' src={ value } key='avatar' alt=""/>]
: [<img className='avatar-img' src='https://image.xiaomaiketang.com/xm/dEyxDRKwFw.png' key='avatar' alt=""/>] : [<img className='avatar-img' src='https://image.xiaomaiketang.com/xm/dEyxDRKwFw.png' key='avatar' alt=""/>]
} }
<span className='userImg'>
{ adminName }
</span>
</div> </div>
) )
} }
},{
title: '',
key: 'adminNameLeft',
dataIndex: 'adminName',
width: '30%',
align: 'left',
render: (value, record) => {
const { adminName } = record;
return (
<span className='userImg'>
{ adminName }
</span>
)
}
} }
] ]
return selectColumns return selectColumns
...@@ -309,7 +300,7 @@ class ChooseMembersModal extends React.Component { ...@@ -309,7 +300,7 @@ class ChooseMembersModal extends React.Component {
// bordered={true} // bordered={true}
size={'small'} size={'small'}
rowSelection={{ rowSelection={{
columnWidth : 30, columnWidth : 24,
selectedRowKeys, selectedRowKeys,
onChange : this.onChangeRow, onChange : this.onChangeRow,
getCheckboxProps : this.getCheckboxProps, getCheckboxProps : this.getCheckboxProps,
......
src/bu-components/ChooseMembersModal.less
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
height: 23px; height: 23px;
width: 23px; width: 23px;
border-radius: 50%; border-radius: 50%;
margin-right: 8px;
} }
} }
} }
...@@ -68,9 +69,9 @@ ...@@ -68,9 +69,9 @@
.span-right{ .span-right{
float: right; float: right;
margin-right: 10px; margin-right: 10px;
color:#5289FA; color: #999;
.span-right-l{ .span-right-l{
color: #FD9A6A; color: #5289FA;
cursor: pointer; cursor: pointer;
} }
} }
......
src/bu-components/CopyFileModal.jsx
...@@ -251,12 +251,6 @@ class CopyFileModal extends React.Component { ...@@ -251,12 +251,6 @@ class CopyFileModal extends React.Component {
</Button> </Button>
]} ]}
> >
{/* <div className='copy-header'>
<Radio.Group>
<Radio.Button value={'MYSELF'} onClick={() => this.getFileList('MYSELF')}>我的文件</Radio.Button>
<Radio.Button onClick={() => this.getFileList('COMMON')}>公共文件</Radio.Button>
</Radio.Group>
</div> */}
<div className='copy-body'> <div className='copy-body'>
{/* 面包屑 */} {/* 面包屑 */}
<div className="bread-crumbs"> <div className="bread-crumbs">
......
src/bu-components/CopyFileModal.less
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
.lottie-box { .lottie-box {
border:1px solid #E8E8E8; border:1px solid #E8E8E8;
border-radius:4px; border-radius:4px;
height: 320px;
} }
.lottie-icon{ .lottie-icon{
......
src/bu-components/ManagingMembersModal.jsx
...@@ -194,7 +194,7 @@ class ManagingMembersModal extends React.Component { ...@@ -194,7 +194,7 @@ class ManagingMembersModal extends React.Component {
title : '头像', title : '头像',
key : 'avatar', key : 'avatar',
dataIndex : 'avatar', dataIndex : 'avatar',
width : '20%', width : '8%',
align : 'right', align : 'right',
render : (value, record) => { render : (value, record) => {
return ( return (
...@@ -224,7 +224,7 @@ class ManagingMembersModal extends React.Component { ...@@ -224,7 +224,7 @@ class ManagingMembersModal extends React.Component {
title : '权限', title : '权限',
key : 'rights', key : 'rights',
dataIndex : 'rights', dataIndex : 'rights',
width : '40%', width : '50%',
align :'right', align :'right',
render : (value, record) => { render : (value, record) => {
const imgSrcList = ['https://image.xiaomaiketang.com/xm/Th5cKisf6f.png', 'https://image.xiaomaiketang.com/xm/nzAcc6ryTp.png']; const imgSrcList = ['https://image.xiaomaiketang.com/xm/Th5cKisf6f.png', 'https://image.xiaomaiketang.com/xm/nzAcc6ryTp.png'];
......
src/bu-components/ManagingMembersModal.less
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.managing-right{ .managing-right{
float: right; float: right;
color: #FFB714; color: #5289FA;
cursor: pointer; cursor: pointer;
.tool-tip-right{ .tool-tip-right{
margin-right: 4px; margin-right: 4px;
......
src/bu-components/SelectPrepareFileModal.less
...@@ -50,9 +50,14 @@ ...@@ -50,9 +50,14 @@
} }
.file-list { .file-list {
// border: 1px solid #E8E8E8;
// border-radius: 4px;
height: 100%;
border-top: 1px solid #E8E8E8;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border: 1px solid #E8E8E8; border: 1px solid #E8E8E8;
border-radius: 4px; overflow: auto;
.file-item { .file-item {
display: flex; display: flex;
align-items: center; align-items: center;
......
src/core/antd.less
...@@ -641,4 +641,8 @@ mr0 { ...@@ -641,4 +641,8 @@ mr0 {
.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
{ {
border-right:none !important; border-right:none !important;
}
.ant-table tbody tr:nth-child(2n) td{
background: #FAFAFA !important;
} }
\ No newline at end of file
src/core/global.less
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
html { html {
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
p { p {
margin-bottom: 0px; margin-bottom: 0px;
} }
body {
font-family: 'PingFang SC', 'Source Han Sans', 'Microsoft YaHei', 'Alibaba Sans';
}
} }
span { span {
......
src/modules/course-manage/AddLive.less
.add-live-page { .add-live-page {
position:relative !important;
.box { .box {
margin-bottom: 66px !important; margin-bottom: 66px !important;
} }
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
} }
.add-live__intro-info { .add-live__intro-info {
margin-left: 0; margin-left: 0;
padding-left: 24px; padding-left: 16px;
.label { .label {
width: 100px; width: 100px;
text-align: right; text-align: right;
......
src/modules/course-manage/modal/ManageCoursewareModal.jsx
...@@ -312,16 +312,17 @@ class ManageCoursewareModal extends React.Component { ...@@ -312,16 +312,17 @@ class ManageCoursewareModal extends React.Component {
> >
{_.isEmpty(_list) ? {_.isEmpty(_list) ?
<div className="empty-body"> <div className="empty-body">
{/* <img className="empty-image" src="https://image.xiaomaiketang.com/xm/s8xkAPCDex.png" alt="" /> */} <div id="lottie-box" className="empty-image">
<div id="lottie-box" className="empty-image"></div> </div>
<Button <Button
className="empty-button" className="empty-button"
type="primary" type="primary"
onClick={() => this.addFile()} onClick={() => this.addFile()}
>上传课件</Button> >上传课件</Button>
<p className="empty-tip">提前上传直播需要的课件和素材，直播将会变得更便捷！</p> <p className="empty-tip">提前上传直播需要的课件和素材，直播将会变得更便捷！</p>
</div> </div>
: <div className="manage-body"> : <div className="manage-body">
<div id="lottie-box" className="empty-image" style={{display:'none'}}></div>
<div className="header"> <div className="header">
<Button <Button
className="header-button" className="header-button"
......
src/modules/course-manage/video-course/AddVideoCourse.less
.add-video-course-page { .add-video-course-page {
position:relative !important;
.box{ .box{
margin-bottom:16px !important; margin-bottom:66px !important;
} }
.ant-radio-group { .ant-radio-group {
display: flex; display: flex;
......
src/modules/course-manage/video-course/components/AddVideoIntro.jsx
...@@ -192,8 +192,8 @@ class AddVideoIntro extends React.Component { ...@@ -192,8 +192,8 @@ class AddVideoIntro extends React.Component {
</div> </div>
<div> <div>
<div className="desc"> <div className="desc">
<div>开启：允许未绑定手机号的用户进入直播间观看直播</div> <div>开启：允许未绑定手机号的用户观看</div>
<div>关闭：仅限绑定了手机号的用户可以进入直播间观看直播</div> <div>关闭：仅限绑定了手机号的用户可以进入观看视频</div>
</div> </div>
</div> </div>
</div> </div>
......
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-25 20:44:48 * @LastEditTime: 2021-01-27 18:11:12
* @Description: 视频课-列表模块 * @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -136,7 +136,7 @@ class VideoCourseList extends React.Component { ...@@ -136,7 +136,7 @@ class VideoCourseList extends React.Component {
}, },
{ {
title: "观看用户数", title: "观看用户数",
width: "10%", width: 110,
key: "watchUserCount", key: "watchUserCount",
dataIndex: "watchUserCount", dataIndex: "watchUserCount",
render: (val, item) => { render: (val, item) => {
...@@ -169,7 +169,7 @@ class VideoCourseList extends React.Component { ...@@ -169,7 +169,7 @@ class VideoCourseList extends React.Component {
title: '操作', title: '操作',
key: 'operate', key: 'operate',
dataIndex: 'operate', dataIndex: 'operate',
width: 256, width: 210,
fixed: 'right', fixed: 'right',
render: (val, record) => { render: (val, record) => {
return ( return (
......
src/modules/course-manage/video-course/components/VideoCourseList.less
.video-course-list { .video-course-list {
margin-top: 12px; margin-top: 12px;
.watchUserCount{
text-align:right;
padding:16px;
}
.operate-text { .operate-text {
color: #5289FA; color: #5289FA;
cursor: pointer; cursor: pointer;
} }
.operate { .operate {
display: flex; display: flex;
......
src/modules/course-manage/video-course/modal/WatchDataModal.jsx
...@@ -20,7 +20,7 @@ class WatchDataModal extends React.Component { ...@@ -20,7 +20,7 @@ class WatchDataModal extends React.Component {
this.state = { this.state = {
visible:true, visible:true,
dataSource:[], dataSource:[],
size:10, size:1,
query: { query: {
current: 1, current: 1,
}, },
...@@ -129,7 +129,7 @@ class WatchDataModal extends React.Component { ...@@ -129,7 +129,7 @@ class WatchDataModal extends React.Component {
maskClosable={false} maskClosable={false}
className="watch-data-modal" className="watch-data-modal"
closable={true} closable={true}
width={720} width={800}
> >
<div className="search-container"> <div className="search-container">
<Search placeholder="搜索用户姓名/手机号" style={{ width: 200 }} onChange={(e) => { this.handleChangNickname(e.target.value)}} onSearch={ () => { this.handleFetchDataList()}} /> <Search placeholder="搜索用户姓名/手机号" style={{ width: 200 }} onChange={(e) => { this.handleChangNickname(e.target.value)}} onSearch={ () => { this.handleFetchDataList()}} />
......
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: wufan * @LastEditors: wufan
* @LastEditTime: 2021-01-12 17:25:20 * @LastEditTime: 2021-01-25 20:40:53
* @Description: * @Description:
*/ */
import React, { useContext, useEffect, useState } from "react"; import React, { useContext, useEffect, useState } from "react";
...@@ -163,9 +163,7 @@ function Header(props) { ...@@ -163,9 +163,7 @@ function Header(props) {
</div> </div>
</div> </div>
<div className="share" onClick={handleCopy}> <div className="share" onClick={handleCopy}>
<Tooltip title="分享店铺" placement="bottom"> <span className="icon iconfont tool-tip-right">&#xe85e;</span>
<span className="icon iconfont tool-tip-right">&#xe85e;</span>
</Tooltip>
<div className="text">分享店铺</div> <div className="text">分享店铺</div>
</div> </div>
......
src/modules/store-manage/EmployeeAddOrEditModal.less
.employee-add-modal { .employee-add-modal {
.mt-4 {
margin-bottom:-6px !important
}
.mt-10 {
margin-bottom:-10px !important
}
.mt-26 {
margin-bottom:-26px !important
}
.mb10 {
margin-top: 5px !important;
}
.radio-tip { .radio-tip {
padding-left: 24px; padding-left: 24px;
font-size: 14px; font-size: 14px;
......
src/modules/store-manage/EmployeeAddOrEditModal.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-27 16:21:49 * @Date: 2020-11-27 16:21:49
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2021-01-09 16:32:41 * @LastEditTime: 2021-01-25 21:14:48
* @Description: Description * @Description: Description
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -223,6 +223,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) { ...@@ -223,6 +223,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
rules={[{ required: true }]} rules={[{ required: true }]}
validateStatus={nameStatus} validateStatus={nameStatus}
help={nameErrorMsg} help={nameErrorMsg}
style={{marginBottom:'-2px !important'}}
className="mt-4"
> >
<Input <Input
style={{ width: 200 }} style={{ width: 200 }}
...@@ -236,6 +238,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) { ...@@ -236,6 +238,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
<Form.Item <Form.Item
label="企业微信账号" label="企业微信账号"
name="weChatAccount" name="weChatAccount"
style={{marginBottom:'-2px !important'}}
className="mt-10"
> >
<div>{props.choosedItem.weChatAccount}</div> <div>{props.choosedItem.weChatAccount}</div>
</Form.Item> </Form.Item>
...@@ -246,6 +250,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) { ...@@ -246,6 +250,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
rules={[{ required: true }]} rules={[{ required: true }]}
validateStatus={phoneStatus} validateStatus={phoneStatus}
help={phoneErrorMessage} help={phoneErrorMessage}
style={{marginBottom:'-2px !important'}}
className="mt-10"
> >
<Input <Input
style={{ width: 200 }} style={{ width: 200 }}
...@@ -268,13 +274,17 @@ function AddEmployeeModal(props: AddEmployeeModalProps) { ...@@ -268,13 +274,17 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
label="员工身份" label="员工身份"
name="role" name="role"
rules={[{ required: false }]} rules={[{ required: false }]}
style={{marginBottom:'-2px !important'}}
className="mt-26"
> >
<RadioGroup <RadioGroup
onChange={(e) => { onChange={(e) => {
handleChangeValues("role", e.target.value); handleChangeValues("role", e.target.value);
}} }}
className="mt5"
> >
<Radio value={"CloudLecturer"}> <Radio value={"CloudLecturer"} className="mt-4"
>
<span style={{ color: "#333" }}>普通讲师</span> <span style={{ color: "#333" }}>普通讲师</span>
<p className="radio-tip"> <p className="radio-tip">
仅可查看/使用与自己相关的文件和课表，并进行上课 仅可查看/使用与自己相关的文件和课表，并进行上课
......
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