|
|
@ -1,14 +1,14 @@
|
|
|
|
import React, { Component } from 'react';
|
|
|
|
import React, { Component } from 'react';
|
|
|
|
import {getImageUrl} from 'educoder';
|
|
|
|
import {getImageUrl} from 'educoder';
|
|
|
|
import {Tooltip,Modal,Icon,Spin,message} from 'antd';
|
|
|
|
import {Tooltip,Modal,Icon,Spin,message} from 'antd';
|
|
|
|
import '../../paths/ShixunPaths.css';
|
|
|
|
|
|
|
|
import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
|
|
|
|
import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
|
|
|
|
import DetailCardsEditAndEdit from './DetailCardsEditAndEdit';
|
|
|
|
import DetailCardsEditAndEdit from './DetailCardsEditAndEdit';
|
|
|
|
|
|
|
|
import AccountProfile from"../user/AccountProfile";
|
|
|
|
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
|
|
|
|
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
|
|
|
|
import axios from 'axios';
|
|
|
|
import axios from 'axios';
|
|
|
|
import { DragDropContext , Draggable, Droppable} from 'react-beautiful-dnd';
|
|
|
|
import { DragDropContext , Draggable, Droppable} from 'react-beautiful-dnd';
|
|
|
|
import Modals from '../../modals/Modals';
|
|
|
|
import Modals from '../../modals/Modals';
|
|
|
|
|
|
|
|
import '../../paths/ShixunPaths.css';
|
|
|
|
const $ = window.$
|
|
|
|
const $ = window.$
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// //a little function to help us with reordering the result
|
|
|
|
// //a little function to help us with reordering the result
|
|
|
@ -193,7 +193,12 @@ class DetailCards extends Component{
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
startgameid=(id)=>{
|
|
|
|
startgameid=(id)=>{
|
|
|
|
|
|
|
|
if(this.props.current_user&&this.props.current_user.profile_completed===false){
|
|
|
|
|
|
|
|
this.setState({
|
|
|
|
|
|
|
|
AccountProfiletype:true
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
let url = "/shixuns/" + id + "/shixun_exec.json";
|
|
|
|
let url = "/shixuns/" + id + "/shixun_exec.json";
|
|
|
|
axios.get(url).then((response) => {
|
|
|
|
axios.get(url).then((response) => {
|
|
|
|
|
|
|
|
|
|
|
@ -292,10 +297,16 @@ class DetailCards extends Component{
|
|
|
|
startshixunCombattype:false
|
|
|
|
startshixunCombattype:false
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
hideAccountProfile=()=>{
|
|
|
|
|
|
|
|
this.setState({
|
|
|
|
|
|
|
|
AccountProfiletype:false
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
render(){
|
|
|
|
render(){
|
|
|
|
let { pathCardsList,
|
|
|
|
let { pathCardsList,
|
|
|
|
dropid,
|
|
|
|
dropid,
|
|
|
|
dropidtype,
|
|
|
|
AccountProfiletype,
|
|
|
|
idsum,
|
|
|
|
idsum,
|
|
|
|
pathCardsedittype,
|
|
|
|
pathCardsedittype,
|
|
|
|
pathlistedit,
|
|
|
|
pathlistedit,
|
|
|
@ -317,6 +328,12 @@ class DetailCards extends Component{
|
|
|
|
|
|
|
|
|
|
|
|
return(
|
|
|
|
return(
|
|
|
|
<div>
|
|
|
|
<div>
|
|
|
|
|
|
|
|
{AccountProfiletype===true?<AccountProfile
|
|
|
|
|
|
|
|
hideAccountProfile={()=>this.hideAccountProfile()}
|
|
|
|
|
|
|
|
{...this.state}
|
|
|
|
|
|
|
|
{...this.props}
|
|
|
|
|
|
|
|
/>:""}
|
|
|
|
|
|
|
|
|
|
|
|
<Modals
|
|
|
|
<Modals
|
|
|
|
modalsType={Modalstype}
|
|
|
|
modalsType={Modalstype}
|
|
|
|
modalsTopval={Modalstopval}
|
|
|
|
modalsTopval={Modalstopval}
|
|
|
|