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

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

Browse Source 
# Conflicts:
#	public/react/src/search/SearchPage.js
dev_forum
hjm 5 years ago
parent cfddbc2899 055f000f67
commit 07853ba374
20 changed files with 200 additions and 114 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/App.js
Unescape View File

@ -15,6 +15,7 @@ import '@icedesign/base/index.scss';
import LoginDialog from './modules/login/LoginDialog'
import Notcompletedysl from './modules/user/Notcompletedysl'
import Trialapplicationysl from './modules/login/Trialapplicationysl'
import Trialapplication from './modules/login/Trialapplication'
import NotFoundPage from './NotFoundPage'
@ -266,6 +267,7 @@ class App extends Component {
<MuiThemeProvider theme={theme}>
<LoginDialog {...this.props} {...this.state}></LoginDialog>
<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
<Trialapplicationysl {...this.props} {...this.state}></Trialapplicationysl>
{/*{*/}
{/* isRender === true?*/}
{/* <LoginDialog></LoginDialog> : ""*/}

18
public/react/src/AppConfig.js
Unescape View File

@ -12,17 +12,9 @@ broadcastChannelOnmessage('refreshPage', () => {
function locationurl(list){
if (window.location.port === "3007") {
} else {
if(list===402){
SetAppModel(402)
}else if(list===407){
} else {
window.location.replace(list)
}
}
}
// TODO 开发期多个身份切换
@ -153,11 +145,11 @@ export function initAxiosInterceptors(props) {
locationurl('/500');
}
if (response.data.status === 402) {
console.log(response.data.status);
console.log(response.data);
// locationurl(402);
}
// if (response.data.status === 402) {
// console.log(response.data.status);
// console.log(response.data);
// // locationurl(402);
// }
if (response.data.status === 401) {

20
public/react/src/modules/courses/coursesPublic/ShixunModal.js
Unescape View File

@ -146,19 +146,12 @@ class ShixunModal extends Component{
}
savecouseShixunModal=()=>{
this.setState({
hometypepvisible:true
})
let {coursesId,patheditarry,datas}=this.props;
let{category_id}=this.state;
if (this.props.chooseShixun) {
this.props.chooseShixun(patheditarry)
this.setState({
hometypepvisible:false
})
return;
}
if(patheditarry.length===0){
this.setState({
shixunmodelchke:true,
@ -168,6 +161,15 @@ class ShixunModal extends Component{
return
}
if (this.props.chooseShixun) {
this.props.chooseShixun(patheditarry)
this.setState({
hometypepvisible:false
})
return;
}
let url="/courses/"+coursesId+"/homework_commons/create_shixun_homework.json";
axios.post(url, {
category_id:this.props.category_id===null||this.props.category_id===undefined?undefined:parseInt(this.props.category_id),
@ -378,7 +380,7 @@ class ShixunModal extends Component{
</div>
</div>
</Spin>
<span className={this.state.shixunmodelchke===true?"none":"color-red"}>{this.state.chekicmessage}</span>
<span className={this.state.shixunmodelchke===true?"color-red":"none"}>{this.state.chekicmessage}</span>
<div className="mt20 marginauto clearfix edu-txt-center">
<a className="pop_close task-btn mr30 margin-tp26" onClick={this.hidecouseShixunModal}>取消</a>
<a className="task-btn task-btn-orange margin-tp26" id="submit_send_shixun" onClick={this.savecouseShixunModal}>确定</a>

8
public/react/src/modules/courses/new/CoursesNew.js
Unescape View File

@ -257,7 +257,13 @@ class CoursesNew extends Component {
}
goback = () => {
window.history.go(-1)
if(this.props.match.params.coursesId===undefined){
this.props.history.push("/courses");
}else{
this.props.history.push(`/courses/${this.props.match.params.coursesId}`);
}
// window.history.go(-1)
}
onCheckAllChange = (e) => {

5
public/react/src/modules/courses/shixunHomework/Challenges.css
Unescape View File

@ -22,3 +22,8 @@
.mtf3{
margin-top: -3px;
}
.ysltable{
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap
}

42
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -24,6 +24,7 @@ import moment from 'moment';
import '../css/members.css'
import '../css/busyWork.css'
import '../poll/pollStyle.css'
import './Challenges.css'
import {getImageUrl} from 'educoder';
import TraineetraininginformationModal from "./TraineetraininginformationModal";
import DownloadMessageysl from '../../modals/DownloadMessageysl';
@ -182,7 +183,7 @@ class Listofworksstudentone extends Component {
className:'font-14',
render: (text, record) => (
<span>
<span style={{
<span className="ysltable" style={{
"color": '#9A9A9A',
"text-align": "center"
}}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
@ -418,7 +419,7 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
<span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
)
},
{
@ -680,7 +681,7 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
<span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
)
},
{
@ -899,9 +900,23 @@ class Listofworksstudentone extends Component {
},
],
}
//
console.log("902");
console.log("902");
console.log(this.props);
}
componentDidCatch(error, info){
console.log("-----------------------------905错误信息");
console.log(error);
console.log(info);
}
componentWillReceiveProps(nextProps) {
console.log("+++++++++913");
console.log("+++++++++915");
console.log("+++++++++916");
console.log(nextProps);
}
componentDidMount() {
console.log("componentDidMount");
if(this.props.isAdmin() === true){
@ -954,7 +969,6 @@ class Listofworksstudentone extends Component {
// console.log("951");
// console.log(result);
// debugger
if (result.status === 200) {
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
@ -976,7 +990,6 @@ class Listofworksstudentone extends Component {
this.seacthdatas(result.data, result.data.student_works);
}
}
}).catch((error) => {
console.log(error);
})
@ -1008,7 +1021,7 @@ class Listofworksstudentone extends Component {
limit: limit,
}
axios.post(urll, data).then((result) => {
if (result.status === 200) {
if (result) {
// console.log("学生未截至未公开的作品列表")
// console.log(JSON.stringify(result))
this.setState({
@ -1268,7 +1281,7 @@ class Listofworksstudentone extends Component {
// console.log(JSON.stringify(this.props.user))
var url = `/student_works/${userids}/shixun_work.json`;
axios.get(url).then((result) => {
if (result.status === 200) {
if (result) {
// console.log("Listofworksstudentone.js")
// console.log(JSON.stringify(result))
let datalist = [];
@ -1484,7 +1497,6 @@ class Listofworksstudentone extends Component {
limit:20,
}
axios.post(urll, data).then((result) => {
debugger
if (result) {
// console.log(url)
// console.log("作品列表6789077")
@ -1916,7 +1928,7 @@ class Listofworksstudentone extends Component {
// console.log(JSON.stringify(this.props.user))
var url = `/student_works/${userids}/shixun_work.json`;
axios.get(url).then((result) => {
if (result.status === 200) {
if (result) {
// console.log("TraineetraininginformationModal.js")
// console.log(JSON.stringify(result))
let datalist = [];
@ -2033,7 +2045,7 @@ class Listofworksstudentone extends Component {
group_ids: course_groupslist,
end_time:endtime,
}).then((result) => {
if (result.status === 200) {
if (result) {
if (result.data.status === 0) {
notification.open({
message: "提示",
@ -2337,7 +2349,7 @@ class Listofworksstudentone extends Component {
(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
计算成绩
</div>:""):
teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
计算成绩
</div>:"")
@ -2456,7 +2468,7 @@ class Listofworksstudentone extends Component {
<div className="mh650 edu-back-white">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb30">没有数据可以显示！</p>
<p className="edu-nodata-p mb30">没有数据可以显示.！</p>
</div>
</div>
@ -2628,7 +2640,7 @@ class Listofworksstudentone extends Component {
</div>
:"")
:
(teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
this.props.isNotMember()===false?
<div className={"computeTimes font-13"}>
计算成绩
@ -2793,7 +2805,7 @@ class Listofworksstudentone extends Component {
(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
计算成绩
</div>:""):
teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
计算成绩
</div>:"")

2
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -24,7 +24,7 @@ class ShixunHomeworkPage extends Component {
super(props);
// this.answerMdRef = React.createRef();
this.state = {
tab: ["0"],
tab: 0,
jobsettingsdata: undefined,
teacherdata: undefined,
code_review: false,

16
public/react/src/modules/home/shixunsHome.js
Unescape View File

@ -361,7 +361,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span>
<span className="task-hide rankName">{item.username}</span>
</a>
</li>
)
@ -375,7 +375,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span>
<span className="task-hide rankName">{item.username}</span>
</a>
</li>
)
@ -389,7 +389,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span>
<span className="task-hide rankName">{item.username}</span>
</a>
</li>
)
@ -405,7 +405,7 @@ class ShixunsHome extends Component {
<li key={key}>
<a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url}/>
<span className="task-hide rankName">{item.name}</span>
<span className="task-hide rankName">{item.username}</span>
</a>
</li>
)
@ -437,7 +437,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span>
<span className="task-hide rankName">{item.username}</span>
</a>
</li>
)
@ -451,7 +451,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span>
<span className="task-hide rankName">{item.username}</span>
</a>
</li>
)
@ -465,7 +465,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span>
<span className="task-hide rankName">{item.username}</span>
</a>
</li>
)
@ -481,7 +481,7 @@ class ShixunsHome extends Component {
<li key={key}>
<a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url}/>
<span className="task-hide rankName">{item.name}</span>
<span className="task-hide rankName">{item.username}</span>
</a>
</li>
)

48
public/react/src/modules/login/Trialapplicationysl.js
Unescape View File

@ -30,7 +30,7 @@ class Trialapplicationysl extends Component {
Phonenumberisnotco: undefined,
Phonenumberisnotcobool: false,
readonlyInput: true,
user_phone_binded: props.user_phone_binded,
user_phone_binded: undefined,
showTrial: false,
user: undefined,
borredss:"bor-reds",
@ -42,37 +42,51 @@ class Trialapplicationysl extends Component {
}
Cancel = () => {
this.props.Cancel()
// this.props.Cancel()
}
componentWillReceiveProps(nextProps) {
// console.log("46");
// console.log(nextProps);
// console.log(this.props);
if (nextProps.user != this.props.user) {
// console.log("50");
// console.log(nextProps.user);
if (nextProps.user !== undefined) {
// console.log("53");
// console.log(nextProps.user);
this.setState({
user_phone_binded: nextProps.user.user_phone_binded,
})
}
// if (nextProps.user != this.props.user) {
// // console.log("50");
// // console.log(nextProps.user);
// if (nextProps.user !== undefined) {
// // console.log("53");
// // console.log(nextProps.user);
// this.setState({
// user_phone_binded: nextProps.user.user_phone_binded,
// })
// }
//
//
// }
}
getipthon=()=>{
// console.log("Trialapplicationysl");
// console.log("70");
let url = `/users/get_user_info.json`
axios.get(url).then((result)=> {
console.log(result);
if(result){
this.setState({
user_phone_binded:result.data.user_phone_binded,
})
}
}).catch((error)=>{
console.log(error)
})
}
//初始化数据
componentDidMount() {
// console.log("53");
//
// console.log(this.props.isRenders);
this.getipthon();
if (this.props.isRenders != undefined) {
this.setState({
isRenders: this.props.isRenders
@ -88,9 +102,11 @@ class Trialapplicationysl extends Component {
axios.interceptors.response.use((response) => {
if (response != undefined)
if (response && response.data.status === 407) {
this.getipthon();
this.setState({
isRenders: true
})
}
return response;
}, (error) => {

28
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -562,7 +562,13 @@ submittojoinclass=(value)=>{
cancelModulationModels = () => {
this.setState({isRenders: false})
}
inputjoinclassvalue=(e)=>{
this.setState({
tojoinclasstitle:e.target.value
})
}
render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match ,} = this.props;
@ -609,6 +615,7 @@ submittojoinclass=(value)=>{
// rolearr:["",""],
// console.log("618");
// console.log(user_phone_binded);
return (
<div className="newHeader" id="nHeader">
@ -629,7 +636,7 @@ submittojoinclass=(value)=>{
{/* />*/}
{/* :""*/}
{/*}*/}
<Trialapplicationysl {...this.state} {...this.props} Cancel={() => this.cancelModulationModels()} ></Trialapplicationysl>
{/*<Trialapplicationysl {...this.state} {...this.props} Cancel={() => this.cancelModulationModels()} ></Trialapplicationysl>*/}
<div className="educontent clearfix">
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
<a href="/">
@ -676,9 +683,14 @@ submittojoinclass=(value)=>{
</li>
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a></li>
<li className="">
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
<img className="roundedRectangles"
src={require('./roundedRectangle.png')}
/>
</li>
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li>
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}>众包社区</a></li>
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}>众包创新</a></li>
<li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></li>
<li
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}}
@ -710,7 +722,7 @@ submittojoinclass=(value)=>{
// onSearch={value => console.log(value)}
onPressEnter={this.onKeywordSearchKeyDown}
style={{ width: 295 }}
style={{ width: 300 }}
/>
</div>
@ -736,11 +748,11 @@ submittojoinclass=(value)=>{
<%= link_to '注册', user_join_path, :className => "ml5" %>
</span>*/}
{ user===undefined?
<span className="font-15 fr mt17">
<span className="font-15 fr mt17 ml20">
<a onClick={()=>this.educoderlogin()} className="mr5 color-white">登录</a>
<em className="vertical-line"></em>
<a href={"/register"} className="mr5 color-white">注册</a>
</span> :user.login===""?<span className="font-15 fr mt17">
</span> :user.login===""?<span className="font-15 fr mt17 ml20">
<a onClick={()=>this.educoderlogin()} className="mr5 color-white">登录</a>
<em className="vertical-line"></em>
<a href={"/register"} className="mr5 color-white">注册</a>
@ -773,7 +785,7 @@ submittojoinclass=(value)=>{
</div>
}
{/*href="https://www.educoder.net/login"*/}
{ user===undefined?"":user.login===""?"":<div className="fr head-right">
<div className="fr head-right ">
{ loadHeader()}
<a id="search-open" className="fl mr30 headIcon">
{/*"/images/educoder/icon/search.svg"
@ -904,7 +916,7 @@ submittojoinclass=(value)=>{
</div>
</Modal>
</div>}
</div>
</div>
</div>

19
public/react/src/modules/tpm/TPMBanner.js
Unescape View File

@ -39,7 +39,7 @@ class TPMBanner extends Component {
this.state={
Forkvisible: false,
Senttothetype:false,
Senttothevcalue:1,
Senttothevcalue:undefined,
courses_count:1,
course_list:[],
pagenum:1,
@ -62,6 +62,7 @@ class TPMBanner extends Component {
isIE:false,
Forkvisibletype: false,
isSpin:false,
Senttothevcaluetype:false
}
}
@ -233,12 +234,21 @@ class TPMBanner extends Component {
});
}
sendeSenttothevcalue=()=>{
let {Senttothevcalue}=this.state;
if(Senttothevcalue===undefined){
this.setState({
Senttothevcaluetype:true
})
return
}
let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/send_to_course.json";
axios.post(url,{
course_id:Senttothevcalue
}).then((response) => {
this.props.showSnackbar(response.data.message);
this.setState({
Senttothetype:false,
@ -466,6 +476,7 @@ class TPMBanner extends Component {
shixunsreplace,
hidestartshixunsreplacevalue,
Forkvisibletype,
Senttothevcaluetype,
isIE} = this.state;
let {shixunsDetails, shixunId, star_info, star_infos} = this.props;
let challengeBtnTipText = '';
@ -839,7 +850,7 @@ class TPMBanner extends Component {
/>
</div>
<div id="search_course_list" className={courses_count > 12?"cdefault mb20":"cdefault mb50"}>
<div id="search_course_list" className={courses_count > 12?"cdefault ":"cdefault "}>
<div className="clearfix mb5 edu-bg-light-blue edu-h315">
<ul>
<RadioGroup onChange={this.onChangeSenttothevcalue} value={Senttothevcalue}>
@ -855,8 +866,8 @@ class TPMBanner extends Component {
</ul>
</div>
</div>
<div className="mt40 marginauto">
{this.state.Senttothevcaluetype===true?<div className={"color-red"}>请选择你要发送的课堂</div>:""}
<div className="mt10 marginauto">
<Pagination size="small" style={{display: courses_count > 12 ? "block" : "none"}}
showQuickJumper defaultCurrent={1} current={pages} pageSize={12}
total={courses_count} onChange={this.onChangesendeSenttothe}/>

6
public/react/src/modules/tpm/TPMIndex.css
Unescape View File

@ -192,3 +192,9 @@ body>.-task-title {
.HeaderSearch .ant-input-search .ant-input-suffix{
background: transparent !important;
}
.roundedRectangles{
position: absolute;
top: 10px;
right: -22px;
}

BIN
public/react/src/modules/tpm/roundedRectangle.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 720 B

6
public/react/src/modules/user/FindPasswordComponent.js
Unescape View File

@ -505,7 +505,7 @@ class LoginRegisterComponent extends Component {
// height: 346px;
return (
<div className="login_register_content" style={{height: "520px"}}>
<div className="login_register_content" style={{height: "470px"}}>
<ReadPassword
modalsType={this.state.modalsType}
StudyMakeMoney={()=>this.StudyMakeMoney()}
@ -537,8 +537,8 @@ class LoginRegisterComponent extends Component {
`}</style>
<div className="login_section">
<div className="section_header font-18" style={{color:"#05101A"}}>
<div className="login_sectionysl">
<div className="section_header font-18" style={{color:"#05101A",marginTop:"10px"}}>
找回密码
</div>
<div style={{width: '340px'}}>

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

@ -205,6 +205,9 @@ class LoginRegisterComponent extends Component {
//是否验证通过
dragOkCallback = () => {
console.log(this.state.logins);
this.setState({
Phonenumberisnotcosytdhk:undefined,
})
this.Emailphonenumberverification(this.state.logins, 2)
}

6
public/react/src/modules/user/common.css
Unescape View File

@ -32,6 +32,12 @@
align-items: center;
flex-direction: column;
}
.login_sectionysl{
width: 100%;
display:flex;
align-items: center;
flex-direction: column;
}
.loginInput {
width: 100%;
margin-bottom: 16px;

16
public/react/src/modules/user/usersInfo/Infos.js
Unescape View File

@ -225,24 +225,32 @@ class Infos extends Component{
<div className="inline">
<div className="fl headtab">
<span>{is_current ? "我":"TA"}的经验值</span>
<a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}>{data && data.experience}</a>
<a
// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}
>{data && data.experience}</a>
</div>
<em className="v-h-line fl"></em>
<div className="fl headtab">
<span>{is_current ? "我":"TA"}的金币</span>
<a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`} id="user_code">{data && data.grade}</a>
<a
// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`}
id="user_code">{data && data.grade}</a>
</div>
<div className="headphoto mt14">
<img alt="头像" id="user_avatar_show" nhname="avatar_image" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/>
</div>
<div className="fl headtab">
<span>{is_current ? "我":"TA"}的粉丝</span>
<a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`} id="user_h_fan_count">{data && data.fan_count}</a>
<a
// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`}
id="user_h_fan_count">{data && data.fan_count}</a>
</div>
<em className="v-h-line fl"></em>
<div className="fl headtab">
<span>{is_current ? "我":"TA"}的关注</span>
<a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}>{data && data.follow_count}</a>
<a
// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}
>{data && data.follow_count}</a>
</div>
<span className="clearfix"></span>
<span className="myName">{data && data.name}</span>

2
public/react/src/modules/user/usersInfo/InfosProject.js
Unescape View File

@ -84,7 +84,7 @@ class InfosProject extends Component{
// 进入项目
turnToCourses=(url,flag)=>{
if(flag){
this.props.history.push(url);
window.location.href=url;
}
}

2
public/react/src/search/SearchPage.js
Unescape View File

@ -305,10 +305,10 @@ class SearchPage extends Component{
<i className="iconfont icon-chengyuan ziticor"></i>
<span>
学习人数:<span className="ml10 ziticor">{item.study_count===undefined?0:item.study_count}</span></span></span> */}
</div>
</div>
</div>
</div>
</a>
)

5
public/react/src/search/searchc.css
Unescape View File

@ -127,3 +127,8 @@
color: #777777;
font-size: 13px;
}
.foohter{
margin-top: 20px;
display: flex;
flex-direction:row;
}
Write Preview
Loading…
Cancel
Save