diff --git a/src/assets/image/return.png b/src/assets/image/return.png
new file mode 100644
index 0000000..4e9e5f8
Binary files /dev/null and b/src/assets/image/return.png differ
diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue
index 1cd6a0e..f545439 100644
--- a/src/views/ballot/BallotPage.vue
+++ b/src/views/ballot/BallotPage.vue
@@ -7,13 +7,23 @@
{{ sName }}
/
投票详情
-
+
+
+
+

+
返回
+
+
【投票】{{ dataInfo?.voteName }}
@@ -217,7 +227,16 @@ const submitVote = () => {
line-height: 24px;
position: relative;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.preNext {
position: absolute;
right: 0px;
diff --git a/src/views/debate/DebatePage.vue b/src/views/debate/DebatePage.vue
index 4c04cc0..5ccbcc0 100644
--- a/src/views/debate/DebatePage.vue
+++ b/src/views/debate/DebatePage.vue
@@ -7,12 +7,22 @@
{{ sName }}
/
辩论详情
+
+
+
+

+
返回
+
+
@@ -107,7 +117,16 @@ const handleClick = (id) => {};
line-height: 24px;
position: relative;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.preNext {
position: absolute;
right: 0px;
diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue
index 15874fc..348f48b 100644
--- a/src/views/discuss/DiscussPage.vue
+++ b/src/views/discuss/DiscussPage.vue
@@ -11,6 +11,7 @@
/
讨论详情
+
+
+
+

+
返回
+
+
@@ -159,7 +169,16 @@ function collection(d) {
font-size: 14px;
line-height: 24px;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.prevnext {
display: flex;
align-items: center;
diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue
index 78530f3..76b0e38 100644
--- a/src/views/discussdetail/DiscussDetail.vue
+++ b/src/views/discussdetail/DiscussDetail.vue
@@ -10,7 +10,8 @@
{{ sName }}
/
讨论详情
-
+
+
+
+
+
+

+
返回
+
+
【调研】管理者进阶腾飞班 - 班内成员讨论
@@ -389,7 +400,16 @@ function submitReplayComment() {
font-size: 14px;
line-height: 24px;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.prevnext {
display: flex;
align-items: center;
diff --git a/src/views/examination/ExamPage.vue b/src/views/examination/ExamPage.vue
index 9e3dc3b..19ed6e1 100644
--- a/src/views/examination/ExamPage.vue
+++ b/src/views/examination/ExamPage.vue
@@ -11,6 +11,7 @@
/
考试详情
+
+
+
+

+
返回
+
+
@@ -133,7 +143,16 @@ const { data } = useRequest(EXAMINATION_QUERY(159), {});
font-size: 14px;
line-height: 24px;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.prevnext {
display: flex;
align-items: center;
diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 9243d07..01a483c 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -7,13 +7,23 @@
{{ sName }}
/
作业详情
-
+
+
+
+
+

+
返回
+
+
@@ -309,7 +319,16 @@ function reUpload(i) {
line-height: 24px;
position: relative;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.preNext {
position: absolute;
right: 0px;
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index 5220402..96040ae 100644
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -7,14 +7,23 @@
{{ sName }}
/
直播详情
-
+
+ 2022-12-15注释 李晓鸽 后面打开 -->
-
+
+ -->
+
+
+

+
返回
+
+
@@ -218,7 +227,16 @@ function showClick() {
line-height: 24px;
position: relative;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.preNext {
position: absolute;
right: 0px;
diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue
index fe0ac90..44a26cb 100644
--- a/src/views/moreActive/MoreActive.vue
+++ b/src/views/moreActive/MoreActive.vue
@@ -7,13 +7,22 @@
{{ sName }}
/
活动详情
-
+
+
+
+

+
返回
+
+
@@ -165,7 +174,16 @@ const signClick = (tab, event) => {
line-height: 24px;
position: relative;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.preNext {
position: absolute;
right: 0px;
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 73f80ed..f171351 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -392,7 +392,7 @@ function toFinish(d) {
}
}
function whiteTypes(type){
- return import.meta.env.VITE_TASK_WHITE_TYPE.includes(type+'')
+ return import.meta.env.VITE_TASK_WHITE_TYPE.includes('-' + type +'-')
}
diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue
index acf6501..cf21dcf 100644
--- a/src/views/roadmap/LearnPath.vue
+++ b/src/views/roadmap/LearnPath.vue
@@ -179,7 +179,7 @@ async function gofun({routerId, name: routerName}) {
import.meta.env.MODE === 'development' ? router.push({
path: "/pathdetails",
query: {routerId, routerName}
- }) : window.open(`http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails¶ms=${encodeURIComponent(`routerId=${routerId}&routerName=${routerName}`)}`)
+ }) : window.open(`http://localhost:5173/fe-student/pathdetails¶ms=${encodeURIComponent(`routerId=${routerId}&routerName=${routerName}`)}`)
}
function toUnTask() {
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 4ae928f..d501694 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -65,7 +65,7 @@
当前进度
@@ -152,7 +152,8 @@
{{ data.remark || '暂无公告' }}
-
+
@@ -174,7 +175,8 @@
-
+
+
@@ -383,11 +385,11 @@ const types = ref({
toName: {
1: "去上课",
2: "去上课",
- 3: "案例",
+ 3: "去阅读",
4: "去完成",
5: "去完成",
- 6: "去签到",
- 7: "查看",
+ 6: "去观看",
+ 7: "去查看",
8: "去讨论",
9: "去签到",
10: "去完成",
@@ -433,7 +435,8 @@ function toFinish(d, sName) {
}
function whiteTypes(type) {
- return import.meta.env.VITE_TASK_WHITE_TYPE.includes(type + '')
+ console.log('-'+ type + '-',import.meta.env.VITE_TASK_WHITE_TYPE.includes('-'+ type + '-'));
+ return import.meta.env.VITE_TASK_WHITE_TYPE.includes('-'+ type + '-')
}
diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index 561a9ad..22272b9 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -11,6 +11,7 @@
/
调研详情
+
+
+
+

+
返回
@@ -201,7 +210,16 @@ function submit() {
font-size: 14px;
line-height: 24px;
}
-
+ .return{
+ position: absolute;
+ right: 10%;
+ .text{
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+ }
.prevnext {
display: flex;
align-items: center;