m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
video_transcode
杨树林 5 years ago
parent b00cec8a60 c1cd5965e9
commit ed00a8c377
6 changed files with 1088 additions and 1177 deletions
Show Stats Download Patch File Download Diff File

46
public/react/src/common/mediator.js
Unescape View File

@ -0,0 +1,46 @@
function Mediator(obj) {
const channels = {}
const mediator = {
subscribe: function (channel, cb) {
if (!channels[channel]) {
channels[channel] = []
}
channels[channel].push(cb)
return this.unsubscribe.bind(null, channel, cb)
},
unsubscribe: function (channel, cb) {
let rs = channels[channel]
let index = -1
if (rs) {
for (let i = 0; i < rs.length; i++) {
if (rs[i].name === cb.name) {
index = i
break
}
}
if (index >= 0) {
channels[channel].splice(index, 1)
return true
}
}
return false
},
publish: function (channel) {
if (!channels[channel]) {
return false
}
const args = Array.prototype.slice.call(arguments, 1)
channels[channel].forEach(subscription => {
subscription.apply(null, args)
})
return this
},
}
return obj ? Object.assign(obj, mediator) : mediator
}
const mediator = new Mediator()
export default mediator

223
public/react/src/modules/courses/coursesHome/CoursesHome.js
Unescape View File

@ -1,118 +1,117 @@
import React, { Component } from 'react';
import {getImageUrl} from 'educoder';
import React, { Component, Fragment } from 'react';
import { getImageUrl } from 'educoder';
import CoursesHomeCard from "./CoursesHomeCard.js"
import axios from 'axios';
import {Input,Tooltip} from 'antd';
import { Pagination } from 'antd';
import LoadingSpin from '../../../common/LoadingSpin';
import UpgradeModals from '../../modals/UpgradeModals';
import './css/CoursesHome.css';
import Pagination from '@icedesign/base/lib/pagination';
import '@icedesign/base/lib/pagination/style.js';
import '../../tpm/shixuns/shixun-keyword-list.scss';
import btnNew from './btn-new.png'
import btnJoin from './btn-join.png'
const Search = Input.Search;
class CoursesHome extends Component{
class CoursesHome extends Component {
constructor(props) {
super(props)
this.state = {
limit:16,
page:1,
order:"created_at",
coursesHomelist:undefined,
search:"",
limit: 16,
page: 1,
order: "created_at",
coursesHomelist: undefined,
search: "",
}
}
//切换列表状态
changeStatus=(value)=>{
changeStatus = (value) => {
this.setState({
order:value,
page:1,
coursesHomelist:undefined
order: value,
page: 1,
coursesHomelist: undefined
})
this.searchcourses(16,1,value,"")
this.searchcourses(16, 1, value, "")
}
//搜索输入
inputSearchValue=(e)=>{
inputSearchValue = (e) => {
this.setState({
search:e.target.value,
page:1
search: e.target.value,
page: 1
})
}
//搜索
searchValue=(e)=>{
let { search ,order}=this.state;
searchValue = (e) => {
let { search, order } = this.state;
this.setState({
order:order,
page:1
order: order,
page: 1
})
this.searchcourses(16,1,order,search)
this.searchcourses(16, 1, order, search)
}
componentDidMount(){
document.title="教学课堂";
const upsystem=`/users/system_update.json`;
axios.get(upsystem).then((response)=>{
let updata=response.data;
this.setState({
updata:updata
})
}).catch((error)=>{
console.log(error);
})
this.searchcourses(16,1,"all","")
componentDidMount() {
document.title = "教学课堂";
const upsystem = `/users/system_update.json`;
axios.get(upsystem).then((response) => {
let updata = response.data;
this.setState({
updata: updata
})
}).catch((error) => {
console.log(error);
})
this.searchcourses(16, 1, "all", "")
}
onChange=(pageNumber)=> {
onChange = (pageNumber) => {
this.setState({
page:pageNumber
page: pageNumber
})
let {limit,order,search}=this.state;
let { limit, order, search } = this.state;
this.searchcourses(limit,pageNumber,order,search)
this.searchcourses(limit, pageNumber, order, search)
}
searchcourses=(limit,page,order,search)=>{
let url="/courses.json";
axios.get(url,{
searchcourses = (limit, page, order, search) => {
let url = "/courses.json";
axios.get(url, {
params: {
limit:limit,
page:page,
order:order,
search:search
limit: limit,
page: page,
order: order,
search: search
}
}).then((result)=>{
if(result.data.status===401){
}).then((result) => {
if (result.data.status === 401) {
}else{
} else {
this.setState({
coursesHomelist:result.data
coursesHomelist: result.data
})
}
}).catch((error)=>{
console.log(error);
})
}).catch((error) => {
console.log(error);
})
}
getUser=(url,type)=>{
if(this.props.checkIfLogin()===false){
getUser = (url, type) => {
if (this.props.checkIfLogin() === false) {
this.props.showLoginDialog()
return
}
if(this.props.checkIfProfileCompleted()===false){
if (this.props.checkIfProfileCompleted() === false) {
this.props.showProfileCompleteDialog()
return
}
if(url !== undefined || url!==""){
if (url !== undefined || url !== "") {
this.props.history.push(url);
}
@ -120,79 +119,71 @@ class CoursesHome extends Component{
}
render() {
let { order,search,page,coursesHomelist }=this.state;
//console.log(this.props)
const { order, page, coursesHomelist } = this.state;
const { user, tojoinclass } = this.props
console.log(tojoinclass, '--------------s')
return (
<div>
{this.state.updata===undefined?"":<UpgradeModals
{...this.state}
/>}
<div>
{this.state.updata === undefined ? "" : <UpgradeModals
{...this.state}
/>}
<div className="newMain clearfix">
<style>
{
` ::-webkit-scrollbar {
<style>
{
` ::-webkit-scrollbar {
width: 0px !important;
}
.courses-head{
width: 100%;
height: 300px;
background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ?`images/educoder/courses/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.course_banner_url)});
background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ? `images/educoder/courses/courses.jpg` : this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url)});
background-color: #081C4B;
background-position: center;
background-repeat: no-repeat;
}
`
}
</style>
<div className="courses-head pr" >
<div className="edu-txt-center pathNavLine">
<div className="inline path-nav">
</div>
</div>
}
</style>
<div className="courses-head pr" >
<div className="edu-txt-center pathNavLine">
<div className="inline path-nav">
</div>
</div>
<div className="mt20 educontent mb20 clearfix">
{/*<a className={ order == "all" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"}*/}
{/*onClick={ () => this.changeStatus("all")}>全部</a>*/}
{/*<a className={ order == "mine" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"}*/}
{/*onClick={ () => this.changeStatus("mine")}>我的</a>*/}
<a className={ order == "created_at" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"}
onClick={ () => this.changeStatus("created_at")}>最新</a>
<a className={ order == "visits" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"}
onClick={ () => this.changeStatus("visits")}>最热</a>
{this.props.user&&this.props.user.user_identity==="学生"?"":<span className={ "fr font-16 bestChoose color-blue" } onClick={(url)=>this.getUser("/courses/new")}>+新建教学课堂</span>}
{/*<div className="fr mr5 search-new">*/}
{/*/!* <Search*/}
{/*placeholder="课堂名称/教师姓名/学校名称"*/}
{/*id="subject_search_input"*/}
{/*value={search}*/}
{/*onInput={this.inputSearchValue}*/}
{/*onSearch={this.searchValue}*/}
{/*autoComplete="off"*/}
{/*></Search> *!/*/}
{/*</div>*/}
</div>
<div className="wrapper">
<div className="educontent search-keyword-container" style={{ padding: '20px 0 0 0' }}>
<div className="btn-groups">
<a id='new' className={order === 'created_at' ? 'active' : ''} onClick={() => this.changeStatus("created_at")} title='最新'>最新</a>
<a id='hot' className={order === 'visits' ? 'active' : ''} onClick={() => this.changeStatus("visits")} title='最热'>最热</a>
</div>
</div>
{coursesHomelist===undefined?<LoadingSpin/>:<CoursesHomeCard {...this.props} {...this.state}
coursesHomelist={coursesHomelist}></CoursesHomeCard>}
{coursesHomelist===undefined?"":coursesHomelist.courses.length===0?<div className="edu-tab-con-box clearfix edu-txt-center mb50">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>:""}
{
coursesHomelist===undefined?"":coursesHomelist.courses_count > 16?
<div className="educontent mb80 edu-txt-center mt10">
<Pagination current={page} total={ coursesHomelist.courses_count || 1299 } type="mini" pageSize={16} onChange={this.onChange} />
</div>:""
{user && user.user_identity !== '学生' ?
<Fragment>
<a className="btn-new" style={{ top: '67px' }} onClick={() => { this.getUser("/courses/new") }} > <img src={btnNew} width={40} alt="创建教学课堂" /> </a>
<a className="btn-join" style={{ top: '123px' }} onClick={() => { window._header_componentHandler.tojoinclass() }} > <img src={btnJoin} width={40} alt="加入教学课堂" /> </a>
</Fragment> : null
}
</div>
{coursesHomelist === undefined ? <LoadingSpin /> : <CoursesHomeCard {...this.props} {...this.state}
coursesHomelist={coursesHomelist}></CoursesHomeCard>}
{coursesHomelist === undefined ? "" : coursesHomelist.courses.length === 0 ? <div className="edu-tab-con-box clearfix edu-txt-center mb50">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")} />
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div> : ""}
{
coursesHomelist === undefined ? "" : coursesHomelist.courses_count > 16 ?
<div className="educontent mb80 edu-txt-center mt10">
<Pagination current={page} total={coursesHomelist.courses_count || 1299} type="mini" pageSize={16} onChange={this.onChange} />
</div> : ""
}
</div>
</div>
</div>
)
}
}

BIN
public/react/src/modules/courses/coursesHome/btn-join.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
public/react/src/modules/courses/coursesHome/btn-new.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

1986
public/react/src/modules/tpm/NewHeader.js
View File

File diff suppressed because it is too large Load Diff

10
public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss
Unescape View File

@ -65,6 +65,14 @@
position: absolute;
width: 40px;
right: 39px;
top: 76px;
top: 77px;
z-index: 10;
}
.btn-join {
position: absolute;
width: 40px;
right: 39px;
top: 133px;
z-index: 10;
}
Write Preview
Loading…
Cancel
Save