+
关卡数
@@ -468,7 +471,8 @@ class PathDetailIndex extends Component{
已学 {progress.learned}%
学习耗时{this.timeStamp(progress.time)}
-
+
+
注: “我的进展”以已发布的实训详情关卡数为准。
}
From 9b5a9485e0853446988c7b584b1711cdd50d2d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 12 Sep 2019 09:09:52 +0800
Subject: [PATCH 12/79] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/courses/coursesPublic/NewShixunModel.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 393d714b3..9c0ddd36f 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -48,6 +48,7 @@ class NewShixunModel extends Component{
this.setState({
shixun_list:response.data.shixun_list,
shixuns_count:response.data.shixuns_count,
+ Grouplist:[],
isspinning:false
})
}
@@ -414,7 +415,7 @@ class NewShixunModel extends Component{
{item.challenge_names.length===0?"":
{item.challenge_names.map((item,key)=>{
return(
- {item}
+ 第{key+1}关：{item}
)
})}
}
From 70ad1b51edb4599731e8c86a67887ec6aa344d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 12 Sep 2019 09:11:53 +0800
Subject: [PATCH 13/79] b
---
.../react/src/modules/courses/coursesPublic/NewShixunModel.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 9c0ddd36f..021b21127 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -30,7 +30,7 @@ class NewShixunModel extends Component{
this.getdatalist(page,type,status,search,order,diff,limit)
}
- getdatalist=(page,type,status,search,order,diff,limit)=>{
+ getdatalist=(page,type,status,search,order,diff,limit,pagetype)=>{
this.setState({
isspinning:true
})
@@ -122,7 +122,7 @@ class NewShixunModel extends Component{
}
let{type,status,search,order,diff,limit}=this.state;
- this.getdatalist(pageNumber,type,status,search,order,diff,limit)
+ this.getdatalist(pageNumber,type,status,search,order,diff,limit,"pagetype")
this.setState({
page:pageNumber,
allGrouplist:newallGrouplist
From 85e5ea80d2b26e43ce74ba214252898a0f854ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 12 Sep 2019 09:13:52 +0800
Subject: [PATCH 14/79] b
---
.../courses/coursesPublic/NewShixunModel.js | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 021b21127..0e36d3dc6 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -45,12 +45,21 @@ class NewShixunModel extends Component{
limit
}}).then((response) => {
if(response.data){
- this.setState({
- shixun_list:response.data.shixun_list,
- shixuns_count:response.data.shixuns_count,
- Grouplist:[],
- isspinning:false
- })
+ if(pagetype===undefined){
+ this.setState({
+ shixun_list:response.data.shixun_list,
+ shixuns_count:response.data.shixuns_count,
+ Grouplist:[],
+ isspinning:false
+ })
+ }else{
+ this.setState({
+ shixun_list:response.data.shixun_list,
+ shixuns_count:response.data.shixuns_count,
+ isspinning:false
+ })
+ }
+
}
}).catch((error) => {
this.setState({
From 5efc5d7faf2d94aece43bae9ebfaec23b139ca0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 12 Sep 2019 09:48:26 +0800
Subject: [PATCH 15/79] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/coursesPublic/NewShixunModel.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 0e36d3dc6..d0ba33cb3 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -490,10 +490,11 @@ class NewShixunModel extends Component{
:shixun_list.length===0?
:""
}
-
+ {
+ shixun_list===undefined?"":shixun_list.length===0?"":
-
+
}