Skip to content

X
xiaomai-cloud-class-web
Commit 61e216b1 by zhangleyuan
Options

Merge branch 'feature/zhangleyuan/20200119/style-optimize' into 'master' 

Feature/zhangleyuan/20200119/style optimize

See merge request !5
parents c7521890 05eabeab
Showing with 42 additions and 104 deletions
CHANGE_LOG.md
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2020-12-15 19:58:31 * @Date: 2020-12-15 19:58:31
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-01-04 20:10:06 * @LastEditTime: 2021-01-27 19:54:58
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
--> -->
...@@ -18,4 +18,8 @@ ...@@ -18,4 +18,8 @@
`2020-01-04` `2020-01-04`
+ 播种计划一期第二阶段初上线
`2021-01-27`
+ 播种计划一期第二阶段初上线 + 播种计划一期第二阶段初上线
\ No newline at end of file
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/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/domains/basic-domain/constants.ts
/* /*
* @Author: 陈剑宇 * @Author: 陈剑宇
* @Date: 2020-05-07 14:43:01 * @Date: 2020-05-07 14:43:01
* @LastEditTime: 2021-01-25 20:05:28 * @LastEditTime: 2021-01-27 19:52:58
* @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 || 'rc'; const ENV: string = process.env.DEPLOY_ENV || 'prod';
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
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-20 09:21:40 * @Date: 2020-08-20 09:21:40
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-01-25 20:04:20 * @LastEditTime: 2021-01-27 19:53:17
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
import { MapInterface } from '@/domains/basic-domain/interface' import { MapInterface } from '@/domains/basic-domain/interface'
const ENV: string = process.env.DEPLOY_ENV || 'rc'; const ENV: string = process.env.DEPLOY_ENV || 'prod';
const appIdMap: MapInterface = { const appIdMap: MapInterface = {
dev: 'wx3ea60e78ddfa277e', dev: 'wx3ea60e78ddfa277e',
......
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/components/AddLiveIntro.jsx
...@@ -82,19 +82,7 @@ class AddLiveIntro extends React.Component { ...@@ -82,19 +82,7 @@ class AddLiveIntro extends React.Component {
} }
} }
// 获取机构可见的磁盘
// handleFetchDiskList = () => {
// axios.Apollo('public/apollo/getUserDisk', {}).then((res) => {
// const { result = [] } = res;
// const diskList = result.map((item) => {
// return {
// ...item,
// folderName: DISK_MAP[item.disk]
// }
// });
// this.setState({ diskList });
// });
// }
// 删除简介 // 删除简介
handleDeleteIntro = (index) => { handleDeleteIntro = (index) => {
...@@ -174,56 +162,6 @@ class AddLiveIntro extends React.Component { ...@@ -174,56 +162,6 @@ class AddLiveIntro extends React.Component {
showSelectFileModal: true, showSelectFileModal: true,
selectType:'INTRO' selectType:'INTRO'
}) })
// 最多添加九图片
// const { liveCourseMediaRequests } = this.props.data;
// const list = _.filter(liveCourseMediaRequests, (item) => {
// return item.mediaType == "PICTURE";
// });
// if (list.length > 8) {
// message.warning("最多添加9张图片");
// return;
// }
// const { instId } = window.currentUserInstInfo;
// const { name, size } = Blob;
// const resourceName = window.random_string(16) + name.slice(name.lastIndexOf('.'));
// const params = {
// resourceName,
// accessTypeEnum: 'PUBLIC',
// bizCode: 'LIVE_COURSE_MEDIA',
// instId:User.getStoreId(),
// }
// Service.Hades("public/hades/commonOssAuthority", params).then((res) => {
// const { resourceId } = res.result;
// const signInfo = res.result;
// // 构建上传的表单
// const xhr = new XMLHttpRequest();
// const formData = new FormData();
// formData.append("OSSAccessKeyId", signInfo.accessId);
// formData.append("policy", signInfo.policy);
// formData.append("callback", signInfo.callback);
// formData.append("Signature", signInfo.signature);
// formData.append("key", signInfo.key);
// formData.append("file", Blob);
// formData.append("success_action_status", 200);
// xhr.open("POST", signInfo.host);
// xhr.onload = () => {
// liveCourseMediaRequests.push({
// size,
// mediaName: name,
// mediaContent: resourceId,
// mediaType: 'PICTURE',
// mediaUrl: window.URL.createObjectURL(Blob),
// });
// this.props.onChange('liveCourseMediaRequests', liveCourseMediaRequests);
// };
// xhr.onerror = () => {
// xhr.abort();
// };
// xhr.send(formData);
// this.setState({ xhr })
// });
} }
whetherVisitorsJoinChange = ()=>{ whetherVisitorsJoinChange = ()=>{
if(this.props.data.whetherVisitorsJoin==="NO"){ if(this.props.data.whetherVisitorsJoin==="NO"){
...@@ -233,12 +171,8 @@ class AddLiveIntro extends React.Component { ...@@ -233,12 +171,8 @@ class AddLiveIntro extends React.Component {
} }
} }
componentWillMount() { componentWillMount() {
// this.handleFetchDiskList();
} }
// componentWillUnmount() {
// const { xhr } = this.state;
// xhr && xhr.abort();
// }
render() { render() {
const {liveType, isXiaomai, isEdit, data: { introduction, needRecord,whetherVisitorsJoin,liveCourseMediaRequests = [], liveCourseWarmMedia = {} } } = this.props; const {liveType, isXiaomai, isEdit, data: { introduction, needRecord,whetherVisitorsJoin,liveCourseMediaRequests = [], liveCourseWarmMedia = {} } } = this.props;
...@@ -370,19 +304,6 @@ class AddLiveIntro extends React.Component { ...@@ -370,19 +304,6 @@ class AddLiveIntro extends React.Component {
<span className="icon iconfont">&#xe63b;</span> <span className="icon iconfont">&#xe63b;</span>
<span className="text">图片</span> <span className="text">图片</span>
</div> </div>
{/* <Upload
fileList={[]}
accept="image/jpeg, image/png, image/jpg, image/gif"
beforeUpload={(Blob) => {
this.handleUpload(Blob);
return false;
}}
>
<div className="operate__item">
<span className="icon iconfont">&#xe63b;</span>
<span className="text">图片</span>
</div>
</Upload> */}
</div> </div>
<div className="tips"> <div className="tips">
• 图片支持jpeg、jpg、png、gif格式 • 图片支持jpeg、jpg、png、gif格式
......
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:12:47 * @LastEditTime: 2021-01-27 19:53:30
* @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 || 'rc'; const ENV = process.env.DEPLOY_ENV || 'prod';
class VideoCourseList extends React.Component { class VideoCourseList extends React.Component {
...@@ -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.less
...@@ -251,7 +251,6 @@ ...@@ -251,7 +251,6 @@
} }
.url-link { .url-link {
color: #5289fa; color: #5289fa;
width: 70px;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
} }
......
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 || 'rc'}` 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'}`
// 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