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

merge

Browse Source
dev_home
cxt 5 years ago
parent 68adeeb544 6fefbfa427
commit 1947daa40e
25 changed files with 285 additions and 218450 deletions
Show Stats Download Patch File Download Diff File

1
public/assets/.sprockets-manifest-24666da656f929c54857463c5d45f3cb.json
View File

File diff suppressed because one or more lines are too long

1
public/assets/.sprockets-manifest-8ed95151377eb83d15f75549fe7af507.json
View File

File diff suppressed because one or more lines are too long

87
public/assets/admin-6f7c31128bac38d4ecd54d3354b74bc84300ffd6b4c13b140abf2302df3fd62d.css → public/assets/admin-25fddd68d59f6cc99ff0033a0da6bb6c45f2da9f7550b22bc01420aac8681622.css
Unescape View File

@ -26254,19 +26254,26 @@ input.form-control {
overflow-y: scroll;
}
/* line 9, app/assets/stylesheets/admins/sidebar.scss */
/* line 11, app/assets/stylesheets/admins/sidebar.scss */
#sidebar .sidebar-header .sidebar-header-logo img {
max-width: 130px !important;
max-height: 40px !important;
overflow: hidden;
}
/* line 18, app/assets/stylesheets/admins/sidebar.scss */
#sidebar::-webkit-scrollbar {
display: none;
}
/* line 13, app/assets/stylesheets/admins/sidebar.scss */
/* line 22, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active {
min-width: 60px;
max-width: 60px;
text-align: center;
}
/* line 18, app/assets/stylesheets/admins/sidebar.scss */
/* line 27, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active .sidebar-header {
padding: 10px;
display: -webkit-box;
@ -26276,18 +26283,18 @@ input.form-control {
flex-direction: column;
}
/* line 23, app/assets/stylesheets/admins/sidebar.scss */
/* line 32, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active .sidebar-header-logo {
overflow: hidden;
margin-bottom: 10px;
}
/* line 27, app/assets/stylesheets/admins/sidebar.scss */
/* line 36, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active .sidebar-header-logo > .logo-label {
display: none;
}
/* line 33, app/assets/stylesheets/admins/sidebar.scss */
/* line 42, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul li a {
padding: 10px;
text-align: center;
@ -26298,12 +26305,12 @@ input.form-control {
justify-content: center;
}
/* line 40, app/assets/stylesheets/admins/sidebar.scss */
/* line 49, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul li a span {
display: none;
}
/* line 42, app/assets/stylesheets/admins/sidebar.scss */
/* line 51, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul li a i {
margin-right: 0;
display: block;
@ -26313,7 +26320,7 @@ input.form-control {
height: 20px;
}
/* line 52, app/assets/stylesheets/admins/sidebar.scss */
/* line 61, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active .dropdown-toggle::after {
top: auto;
bottom: 10px;
@ -26322,17 +26329,17 @@ input.form-control {
transform: translateX(50%);
}
/* line 61, app/assets/stylesheets/admins/sidebar.scss */
/* line 70, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul ul a {
padding: 10px !important;
}
/* line 64, app/assets/stylesheets/admins/sidebar.scss */
/* line 73, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul ul a span {
display: none;
}
/* line 66, app/assets/stylesheets/admins/sidebar.scss */
/* line 75, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul ul a i {
margin-left: 0px;
display: block;
@ -26341,7 +26348,7 @@ input.form-control {
height: 10px;
}
/* line 76, app/assets/stylesheets/admins/sidebar.scss */
/* line 85, app/assets/stylesheets/admins/sidebar.scss */
#sidebar .sidebar-header {
padding: 20px;
background: #272822;
@ -26354,7 +26361,7 @@ input.form-control {
justify-content: space-between;
}
/* line 83, app/assets/stylesheets/admins/sidebar.scss */
/* line 92, app/assets/stylesheets/admins/sidebar.scss */
#sidebar .sidebar-header-logo {
display: -webkit-box;
display: flex;
@ -26364,20 +26371,20 @@ input.form-control {
align-items: center;
}
/* line 88, app/assets/stylesheets/admins/sidebar.scss */
/* line 97, app/assets/stylesheets/admins/sidebar.scss */
#sidebar .sidebar-header-logo > img {
width: 40px;
height: auto;
}
/* line 93, app/assets/stylesheets/admins/sidebar.scss */
/* line 102, app/assets/stylesheets/admins/sidebar.scss */
#sidebar .sidebar-header-logo > .logo-label {
font-size: 18px;
color: darkgrey;
margin-left: 10px;
}
/* line 101, app/assets/stylesheets/admins/sidebar.scss */
/* line 110, app/assets/stylesheets/admins/sidebar.scss */
#sidebar #sidebarCollapse {
display: -webkit-box;
display: flex;
@ -26389,7 +26396,7 @@ input.form-control {
text-align: right;
}
/* line 108, app/assets/stylesheets/admins/sidebar.scss */
/* line 117, app/assets/stylesheets/admins/sidebar.scss */
#sidebar #sidebarCollapse.active {
width: 40px;
height: 30px;
@ -26398,27 +26405,27 @@ input.form-control {
border-radius: 3px;
}
/* line 115, app/assets/stylesheets/admins/sidebar.scss */
/* line 124, app/assets/stylesheets/admins/sidebar.scss */
#sidebar #sidebarCollapse.active i.fold {
display: none;
}
/* line 116, app/assets/stylesheets/admins/sidebar.scss */
/* line 125, app/assets/stylesheets/admins/sidebar.scss */
#sidebar #sidebarCollapse.active i.unfold {
display: block;
}
/* line 119, app/assets/stylesheets/admins/sidebar.scss */
/* line 128, app/assets/stylesheets/admins/sidebar.scss */
#sidebar #sidebarCollapse i.fold {
display: block;
}
/* line 122, app/assets/stylesheets/admins/sidebar.scss */
/* line 131, app/assets/stylesheets/admins/sidebar.scss */
#sidebar #sidebarCollapse i.unfold {
display: none;
}
/* line 125, app/assets/stylesheets/admins/sidebar.scss */
/* line 134, app/assets/stylesheets/admins/sidebar.scss */
#sidebar a, #sidebar a:hover, #sidebar a:focus {
color: inherit;
text-decoration: none;
@ -26426,25 +26433,25 @@ input.form-control {
transition: all 0.3s;
}
/* line 131, app/assets/stylesheets/admins/sidebar.scss */
/* line 140, app/assets/stylesheets/admins/sidebar.scss */
#sidebar > ul > li > a > i {
width: 14px;
height: 14px;
}
/* line 137, app/assets/stylesheets/admins/sidebar.scss */
/* line 146, app/assets/stylesheets/admins/sidebar.scss */
#sidebar ul.components {
padding: 20px 0;
border-bottom: 1px solid #3f3f3f;
}
/* line 142, app/assets/stylesheets/admins/sidebar.scss */
/* line 151, app/assets/stylesheets/admins/sidebar.scss */
#sidebar ul p {
color: #fff;
padding: 10px;
}
/* line 147, app/assets/stylesheets/admins/sidebar.scss */
/* line 156, app/assets/stylesheets/admins/sidebar.scss */
#sidebar ul li > a {
padding: 10px;
font-size: 1em;
@ -26452,25 +26459,25 @@ input.form-control {
text-align: left;
}
/* line 153, app/assets/stylesheets/admins/sidebar.scss */
/* line 162, app/assets/stylesheets/admins/sidebar.scss */
#sidebar ul li > a i {
margin-right: 10px;
font-size: 1em;
margin-bottom: 5px;
}
/* line 161, app/assets/stylesheets/admins/sidebar.scss */
/* line 170, app/assets/stylesheets/admins/sidebar.scss */
#sidebar ul li a:hover, #sidebar ul li a.active {
color: #fff;
background: #276891;
}
/* line 167, app/assets/stylesheets/admins/sidebar.scss */
/* line 176, app/assets/stylesheets/admins/sidebar.scss */
#sidebar ul li.active > a, #sidebar ul a[aria-expanded="true"] {
color: #fff;
}
/* line 172, app/assets/stylesheets/admins/sidebar.scss */
/* line 181, app/assets/stylesheets/admins/sidebar.scss */
#sidebar ul ul a {
font-size: 0.9em !important;
padding-left: 30px !important;
@ -26478,7 +26485,7 @@ input.form-control {
}
@media (max-width: 768px) {
/* line 182, app/assets/stylesheets/admins/sidebar.scss */
/* line 191, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active {
padding: 10px 5px;
min-width: 40px;
@ -26488,39 +26495,39 @@ input.form-control {
-webkit-transform: none;
transform: none;
}
/* line 190, app/assets/stylesheets/admins/sidebar.scss */
/* line 199, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active .sidebar-header {
padding: 0px;
}
/* line 193, app/assets/stylesheets/admins/sidebar.scss */
/* line 202, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active .sidebar-header .sidebar-header-logo {
display: none;
}
/* line 197, app/assets/stylesheets/admins/sidebar.scss */
/* line 206, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active .sidebar-header #sidebarCollapse {
width: 30px;
height: 20px;
}
/* line 203, app/assets/stylesheets/admins/sidebar.scss */
/* line 212, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul li a {
padding: 10px;
font-size: 0.85em;
}
/* line 207, app/assets/stylesheets/admins/sidebar.scss */
/* line 216, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul li a i {
margin-right: 0;
display: block;
margin-bottom: 5px;
}
/* line 214, app/assets/stylesheets/admins/sidebar.scss */
/* line 223, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active > ul > li > a > i {
font-size: 1.8em;
}
/* line 218, app/assets/stylesheets/admins/sidebar.scss */
/* line 227, app/assets/stylesheets/admins/sidebar.scss */
#sidebar.active ul ul a {
padding: 10px !important;
}
/* line 227, app/assets/stylesheets/admins/sidebar.scss */
/* line 236, app/assets/stylesheets/admins/sidebar.scss */
.dropdown-toggle::after {
top: auto;
bottom: 10px;

BIN
public/assets/admin-6f7c31128bac38d4ecd54d3354b74bc84300ffd6b4c13b140abf2302df3fd62d.css.gz → public/assets/admin-25fddd68d59f6cc99ff0033a0da6bb6c45f2da9f7550b22bc01420aac8681622.css.gz
View File

Binary file not shown.

26788
public/assets/admin-42927f17a5efeb0a10a9c0b6aa8a73e48d4339832b631dbf4b94354fb552b5eb.css
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/admin-42927f17a5efeb0a10a9c0b6aa8a73e48d4339832b631dbf4b94354fb552b5eb.css.gz
View File

Binary file not shown.

11976
public/assets/application-8c9d6bb61c50908f584b3070c79aeb95f25c1166d39e07da5e95438b39ca0de9.css
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/application-8c9d6bb61c50908f584b3070c79aeb95f25c1166d39e07da5e95438b39ca0de9.css.gz
View File

Binary file not shown.

17366
public/assets/college-a14be76ebc459e3bedd86e64c62b07c2dfc7ce632d73b86a7270b17462e5b746.css
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/college-a14be76ebc459e3bedd86e64c62b07c2dfc7ce632d73b86a7270b17462e5b746.css.gz
View File

Binary file not shown.

136452
public/assets/cooperative-1f1978c54acc447dc1a6bff614bbf934ada5029f08b7d93cdfc0b41758940664.js
View File

File diff suppressed because one or more lines are too long

BIN
public/assets/cooperative-1f1978c54acc447dc1a6bff614bbf934ada5029f08b7d93cdfc0b41758940664.js.gz
View File

Binary file not shown.

25787
public/assets/cooperative-4240d8b0ca009b90ac3bc60f9e74d483adc9b95100d84d80042a00e620359f24.css
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/cooperative-4240d8b0ca009b90ac3bc60f9e74d483adc9b95100d84d80042a00e620359f24.css.gz
View File

Binary file not shown.

BIN
public/assets/cooperative-bbf9b1ef14747d17410f2f38a6f308697335f86d4525ed6a5579905efc314ef3.js.gz
View File

Binary file not shown.

144
public/assets/cooperative-2dc3977e2e426d2426b26811213b3ed0e3715bb92c548de8d635c33426369e07.css → public/assets/cooperative-f16d25edcc79c0e41048dfacae580b0ef077a1e42dd52bd2b81a8fd812f2e880.css
Unescape View File

@ -25149,6 +25149,150 @@ input.form-control {
background: #fff;
}
/* line 3, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .competition-mode-container .row {
height: 35px;
}
/* line 7, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .competition-mode-container .des-row {
height: auto;
}
/* line 11, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .competition-mode-container .form-control {
font-size: 14px;
}
/* line 22, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .col-md-label {
-webkit-box-flex: 0;
flex: 0 0 10%;
max-width: 10%;
min-width: 30px;
padding-right: 15px;
padding-left: 15px;
position: relative;
}
/* line 31, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .col-md-label-s {
-webkit-box-flex: 0;
flex: 0 0 30px;
padding-right: 15px;
padding-left: 15px;
position: relative;
}
/* line 38, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .setBtn_s {
height: 35px;
line-height: 20px;
}
/* line 43, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .sponsor_label {
border: 1px solid #4CACFF;
border-radius: 5px;
background-color: rgba(76, 172, 255, 0.3);
color: #333;
padding: 0px 4px;
height: 30px;
line-height: 30px;
float: left;
margin: 4px 5px;
}
/* line 54, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .sponsor_label span {
display: block;
float: left;
height: 28px;
line-height: 28px;
margin-right: 5px;
}
/* line 62, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .sponsor_label a {
font-size: 18px;
float: left;
height: 28px;
line-height: 28px;
}
/* line 70, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel {
padding: 0px 15px;
}
/* line 73, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .large_panel_part {
border-top: 1px solid #eaeaea;
}
/* line 76, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .large_panel_part:first-child {
border: none;
}
/* line 80, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .large_panel_part > .row, .cooperative-competition-settings-index-page .large_panel .small_panel > .row {
border-bottom: 1px solid #eaeaea;
padding: 20px 0px;
}
/* line 84, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .small_panel {
margin-left: 20px;
}
/* line 87, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .row:last-child {
border: none;
}
/* line 91, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .task_Input_div:nth-child(3n-2) > span.col-4 {
-webkit-box-flex: 0;
flex: 0 0 81px;
max-width: 81px;
}
/* line 95, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .task_Input_div:nth-child(3n-2) {
-webkit-box-flex: 0;
flex: 0 0 50%;
max-width: 50%;
}
/* line 99, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .task_Input_div:nth-child(3n-1) {
-webkit-box-flex: 0;
flex: 0 0 25%;
max-width: 25%;
}
/* line 103, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .task_Input_div:nth-child(3n) {
-webkit-box-flex: 0;
flex: 0 0 25%;
max-width: 25%;
}
/* line 107, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .task_Input_div:nth-child(3n) > span.col-4 {
-webkit-box-flex: 0;
flex: 0 0 33.3%;
max-width: 33.3%;
}
/* line 111, app/assets/stylesheets/cooperative/competition_settings.scss */
.cooperative-competition-settings-index-page .large_panel .task_Input_div:nth-child(3n) > div.col-6 {
-webkit-box-flex: 0;
flex: 0 0 50%;
max-width: 50%;
}
/* line 3, app/assets/stylesheets/cooperative/laboratory_settings.scss */
.cooperative-laboratory-settings-edit-page .edit-laboratory-setting-container .logo-item, .cooperative-laboratory-settings-update-page .edit-laboratory-setting-container .logo-item {
display: -webkit-box;

BIN
public/assets/cooperative-2dc3977e2e426d2426b26811213b3ed0e3715bb92c548de8d635c33426369e07.css.gz → public/assets/cooperative-f16d25edcc79c0e41048dfacae580b0ef077a1e42dd52bd2b81a8fd812f2e880.css.gz
View File

Binary file not shown.

29
public/react/src/common/LoadingSpin.js
Unescape View File

@ -0,0 +1,29 @@
import React, { Component } from 'react';
import {Spin} from 'antd';
class LoadingSpin extends Component{
constructor(props) {
super(props)
}
render(){
const { style } = this.props;
return(
<div className="edu-tab-con-box clearfix edu-txt-center" style={style}>
<style>
{`
.edu-tab-con-box{
padding:100px 0px;
}
.ant-modal-body .edu-tab-con-box{
padding:0px!important;
}
img.edu-nodata-img{
margin: 40px auto 20px;
}
`}
</style>
<Spin tip="正在获取相关数据..."/>
</div>
)
}
}
export default LoadingSpin;

6
public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
Unescape View File

@ -5,6 +5,7 @@ import {getImageUrl} from 'educoder';
import axios from 'axios';
import './Competitionsindex.css';
import NoneData from "../../courses/coursesPublic/NoneData";
import LoadingSpin from '../../../common/LoadingSpin';
class CompetitionsIndex extends Component{
constructor(props) {
@ -48,6 +49,7 @@ class CompetitionsIndex extends Component{
handleClick = e => {
this.setState({
current: e.key,
datas:undefined
});
let{category,page}=this.state;
this.getdata(e.key,page)
@ -193,7 +195,7 @@ class CompetitionsIndex extends Component{
}
/>}
{count===undefined?"":count >15 ?<div className="mb40 edu-txt-center padding20-30"
{datas===undefined?"":count===undefined?"":count >15 ?<div className="mb40 edu-txt-center padding20-30"
>
<Pagination
@ -208,7 +210,7 @@ class CompetitionsIndex extends Component{
</div>:""}
{
datas===undefined?"":datas && datas.length===0? <NoneData></NoneData>:""
datas===undefined?<LoadingSpin/>:datas && datas.length===0? <NoneData></NoneData>:""
}
</div>

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

@ -3,6 +3,7 @@ import {getImageUrl} from 'educoder';
import CoursesHomeCard from "./CoursesHomeCard.js"
import axios from 'axios';
import {Input,Tooltip} from 'antd';
import LoadingSpin from '../../../common/LoadingSpin';
import UpgradeModals from '../../modals/UpgradeModals';
import './css/CoursesHome.css';
import Pagination from '@icedesign/base/lib/pagination';
@ -25,7 +26,8 @@ class CoursesHome extends Component{
changeStatus=(value)=>{
this.setState({
order:value,
page:1
page:1,
coursesHomelist:undefined
})
this.searchcourses(16,1,value,"")
@ -156,8 +158,8 @@ class CoursesHome extends Component{
</div>
<CoursesHomeCard {...this.props} {...this.state}
coursesHomelist={coursesHomelist}></CoursesHomeCard>
{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")}/>

14
public/react/src/modules/moop_cases/CaseList.js
Unescape View File

@ -26,7 +26,7 @@ class CaseList extends Component{
pageSize:20,
libraries:undefined,
totalCount:undefined,
isSpin:false
isSpin:true
}
}
@ -51,9 +51,16 @@ class CaseList extends Component{
totalCount:result.data.count,
isSpin:false
})
}else{
this.setState({
isSpin:false
})
}
}).catch((error)=>{
console.log(error);
this.setState({
isSpin:false
})
})
}
@ -61,7 +68,8 @@ class CaseList extends Component{
changeType = (type) =>{
this.setState({
type,
page:1
page:1,
isSpin:true
})
let { search , page , pageSize } = this.state;
this.InitList(type,search,page,pageSize);
@ -141,7 +149,7 @@ class CaseList extends Component{
</div>
</div>
</div>
<Spin size="large" spinning={this.state.isSpin}>
<Spin size="large" spinning={this.state.isSpin} tip="正在获取相关数据...">
{
libraries && libraries.length > 0 && <CaseItem {...this.props} {...this.state} libraries={libraries}></CaseItem>
}

7
public/react/src/modules/paths/ShixunPathCard.js
Unescape View File

@ -1,8 +1,8 @@
import React, { Component } from 'react';
import {getImageUrl , setImagesUrl } from 'educoder';
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
import { Tooltip } from 'antd';
import axios from 'axios';
import { Tooltip} from 'antd';
import LoadingSpin from '../../common/LoadingSpin';
class ShixunPathCard extends Component{
@ -15,7 +15,8 @@ class ShixunPathCard extends Component{
<div className="educontent" id="subjects_list_content">
{
pathList && pathList.length > 0 ?
pathList===null?<LoadingSpin/>
: pathList && pathList.length > 0 ?
(
<div className="square-list clearfix">
{

14
public/react/src/modules/paths/ShixunPathSearch.js
Unescape View File

@ -16,13 +16,18 @@ class ShixunPathSearch extends Component{
select:undefined,
search:"",
page:1,
pathList:'',
pathList:null,
sortList:'',
total_count:0
}
}
//切换列表状态
changeStatus=(value)=>{
this.setState(
{
pathList:null
}
)
let {select,search}=this.state;
this.setState({
order:value,
@ -56,6 +61,11 @@ class ShixunPathSearch extends Component{
//顶部分类
changeSelect=(tag_id)=>{
this.setState(
{
pathList:null
}
)
let { order,search }=this.state;
this.setState({
select:tag_id
@ -172,7 +182,7 @@ class ShixunPathSearch extends Component{
</div>
<PathCard {...this.props} {...this.state}></PathCard>
{
total_count > 16 &&
this.state.pathList===null?"":total_count > 16 &&
<div className="educontent mb80 edu-txt-center mt10">
<Pagination current={page} total={ total_count || 1299 } type="mini" pageSize={16} onChange={this.onChange} />
</div>

38
public/react/src/modules/tpm/shixuns/ShixunCard.js
Unescape View File

@ -9,10 +9,10 @@ import classNames from 'classnames';
import { Rating ,Pagination} from "@icedesign/base";
import {getImageUrl,setImagesUrl, toPath} from 'educoder';
import {getImageUrl,setImagesUrl, toPath,getUrl} from 'educoder';
import { Spin,Icon,Tooltip ,Rate} from 'antd';
import LoadingSpin from '../../../common/LoadingSpin';
import './shixunCss/shixunCard.css';
// 引入业务组件样式
@ -58,24 +58,26 @@ class ShixunCard extends Component {
return (
<div className="educontent mb80">
<Spin spinning={typepvisible} size="large" style={{marginTop:'15%'}}>
<div id="shixun_list_content"
style={{display: middleshixundata === undefined || middleshixundata.length === 0 ? "block" : "none"}}>
<div className="square-list clearfix">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<Spin spinning={typepvisible} tip="正在获取相关数据..." size="large" style={{marginTop:'15%'}}>
{ middleshixundata === undefined?"":middleshixundata.length === 0 ?<div className="edu-tab-con-box clearfix edu-txt-center">
<style>
{`
.edu-tab-con-box{
padding:100px 0px;
}
.ant-modal-body .edu-tab-con-box{
padding:0px!important;
}
img.edu-nodata-img{
margin: 40px auto 20px;
}
`}
</style>
<img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div>
<div className="educontent edu-txt-center mb80">
<div className="inline pages_user_show">
<ul>
</div>:""}
</ul>
<div className="cl"></div>
</div>
</div>
</div>
<div className="mt10 mb20 clearfix"
// style={{display: middleshixundata === undefined || middleshixundata.length === 0 ? "none" : "block"}}

7
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -968,7 +968,6 @@ class LoginRegisterComponent extends Component {
// window.location.href='http://www.cnblogs.com/a-cat/';
}
return (
<div className="login_register_content login_register_contents"
@ -1242,15 +1241,15 @@ class LoginRegisterComponent extends Component {
: <div style={{height:"25px"}}></div>
}
<Checkbox onChange={this.onChange}
{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<Checkbox onChange={this.onChange}
checked={Agreetotheterms}
><span className="font-14 " style={{
color: '#676767',
}}>我已阅读并同意
<span>
<a href={'https://forge.educoder.net/help?index=4'} target="_blank" className={"color-blue"}>《服务协议条款》</a>
</span></span></Checkbox>
<Button className=" font-16 mb20" type="primary" style={{height:"46px", width: "100%",marginTop:"26px"}} onClick={() => this.postregistered()}
</span></span></Checkbox>:""}
<Button className=" font-16 mb20" type="primary" style={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?{height:"46px", width: "100%",marginTop:"26px"}:{height:"46px", width: "100%"}} onClick={() => this.postregistered()}
size={"large"}>注册</Button>
{this.props.user&&this.props.user.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">

Write Preview
Loading…
Cancel
Save