Commit 24ede8d8 by zhangleyuan

feat:将是否上下架改成店铺展示

parent 81c5d800
@font-face {
font-family: 'iconfont'; /* project id 2223403 */
src: url('//at.alicdn.com/t/font_2223403_how93r9yw6h.eot');
src: url('//at.alicdn.com/t/font_2223403_how93r9yw6h.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_2223403_how93r9yw6h.woff2') format('woff2'),
url('//at.alicdn.com/t/font_2223403_how93r9yw6h.woff') format('woff'),
url('//at.alicdn.com/t/font_2223403_how93r9yw6h.ttf') format('truetype'),
url('//at.alicdn.com/t/font_2223403_how93r9yw6h.svg#iconfont') format('svg');
src: url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.eot');
src: url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.woff2') format('woff2'),
url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.woff') format('woff'),
url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.ttf') format('truetype'),
url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.svg#iconfont') format('svg');
}
.iconfont{
font-family:"iconfont" !important;
......
/*
* @Author: 陈剑宇
* @Date: 2020-05-07 14:43:01
* @LastEditTime: 2020-12-22 15:39:08
* @LastEditTime: 2020-12-22 16:24:25
* @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 || 'rc';
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/',
......
......@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-08-24 12:20:57
* @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-22 15:38:46
* @LastEditTime: 2020-12-22 16:49:48
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
-->
......@@ -25,7 +25,7 @@
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_how93r9yw6h.css">
<link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_s8xyuagw3n.css">
<!--
Notice the use of %PUBLIC_URL% in the tags above.
......
......@@ -175,9 +175,9 @@ class AddLive extends React.Component {
endTime,
}
liveCourseMediaRequests = liveCourseMediaRequests.length
? [...liveCourseMediaRequests]
: [{ contentType:"INTRO",mediaType: 'TEXT', mediaContent: '', key: window.random_string(16) }, ...liveCourseMediaRequests];
// liveCourseMediaRequests = liveCourseMediaRequests.length
// ? [...liveCourseMediaRequests]
// : [{ contentType:"INTRO",mediaType: 'TEXT', mediaContent: '', key: window.random_string(16) }, ...liveCourseMediaRequests];
const addLiveIntroInfo = {
liveCourseWarmMedia,
......@@ -374,7 +374,7 @@ handleChangeBasicInfo = (field, value) => {
if(type === 'add') {
const { startTime, endTime } = addLiveClassInfo;
if(calendarTime.length && calendarTime.length === 0) {
if(calendarTime.length === 0) {
message.warning('请选择上课日期');
resolve(false);
return;
......
......@@ -67,6 +67,7 @@ class AddLiveBasic extends React.Component {
}
catalogChange= (value) => {
console.log('111');
const changeValueLength = value.length;
switch (changeValueLength){
case 1:
......@@ -76,6 +77,7 @@ class AddLiveBasic extends React.Component {
this.props.onChange('categoryId',value[1]);
break;
default:
this.props.onChange('categoryId',null);
break;
}
}
......
......@@ -76,7 +76,8 @@ class AddLiveClass extends React.Component {
StoreService.getEmployeeList( _query).then((res) => {
const { result = {} } = res;
const { records = [], total = 0, hasNext} = result;
const list = current > 1 ? assistantList.concat(records) : records;
const { teacherId } = this.props.data
let list = current > 1 ? assistantList.concat(records) : records;
this.setState({
assistantHasNext:hasNext,
assistantList: list,
......@@ -344,9 +345,12 @@ class AddLiveClass extends React.Component {
}}
>
{_.map(assistantList, (item, index) => {
return (
<Select.Option value={item.userId} key={item.userId}>{item.nickName}</Select.Option>
);
if(item.userId !== teacherId){
return (
<Select.Option value={item.userId} key={item.userId}>{item.nickName}</Select.Option>
);
}
})}
</Select>
</div>
......
......@@ -239,8 +239,8 @@ class AddLiveIntro extends React.Component {
render() {
const {liveType, isXiaomai, isEdit, data: { introduction, needRecord,whetherVisitorsJoin,liveCourseMediaRequests = [], liveCourseWarmMedia = {} } } = this.props;
console.log("whetherVisitorsJoin",whetherVisitorsJoin);
const { showCutModal, warmUrl, showSelectFileModal, diskList, imageFile } = this.state
console.log('liveCourseMediaRequests',liveCourseMediaRequests);
return (
<div className="add-live__intro-info">
<div className="playback">
......@@ -333,7 +333,7 @@ class AddLiveIntro extends React.Component {
liveCourseMediaRequests.map((item, index) => {
if (item.mediaType === 'TEXT') {
return (
<div className="intro-list__item" key={item.key}>
<div className="intro-list__item" key={index}>
<EditorBox
detail={{
content: item.mediaContent
......
......@@ -7,7 +7,7 @@
*/
import React from 'react';
import { Table, Modal, message, Dropdown, Button,Switch} from 'antd';
import { Table, Modal, message, Dropdown, Button,Switch,Tooltip} from 'antd';
import { Route, withRouter } from 'react-router-dom';
// import Bus from '@/core/bus';
// import User from "@/core/user";
......@@ -233,7 +233,10 @@ class LiveCourseList extends React.Component {
},
},
{
title: "上架状态",
title: <span>
<span>店铺展示</span>
<Tooltip title="开启后,用户可在店铺内查看到此课程。若课程“未成功开课”,则系统会自动“关闭”店铺展示。关闭后,店铺内不再展示此课程,但用户仍可通过分享的海报/链接查看此课程。"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
</span>,
width: "7%",
dataIndex: "courseware",
render: (val, item, index) => {
......
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