diff --git a/pages.json b/pages.json
index 044d69f..a8946eb 100644
--- a/pages.json
+++ b/pages.json
@@ -77,13 +77,13 @@
{
"path": "pages/YNEduApp/learnProj/learnProj",
"style": {
- "navigationBarTitleText": "学习项目"
+ "navigationStyle": "custom"
}
},
{
"path": "pages/YNEduApp/learnProj/learnProjDetail",
"style": {
- "navigationBarTitleText": "学习项目"
+ "navigationStyle": "custom"
}
},
{
@@ -113,7 +113,7 @@
{
"path": "pages/YNEduApp/exam/exam",
"style": {
- "navigationBarTitleText": "考试"
+ "navigationStyle": "custom"
}
},
{
diff --git a/pages/YNEduApp/exam/beforeExam.vue b/pages/YNEduApp/exam/beforeExam.vue
index f4fb4d6..a340c65 100644
--- a/pages/YNEduApp/exam/beforeExam.vue
+++ b/pages/YNEduApp/exam/beforeExam.vue
@@ -10,7 +10,7 @@
考试时长
@@ -31,7 +31,14 @@
-
+
@@ -51,17 +58,17 @@ export default {
count: '不限次',
// 切屏次数
switchCount: '不限次',
- content: '是否确认进入考试?'
+ content: '是否确认进入考试?'
}
},
methods: {
- openModal() {
- this.showModal = true
- },
+ openModal() {
+ this.showModal = true
+ },
// 进入考试
handleEnterExam() {
uni.navigateTo({
- url: '/pages/YNEduApp/exam/examination'
+ url: '/pages/YNEduApp/exam/examination'
})
}
}
diff --git a/pages/YNEduApp/exam/exam.vue b/pages/YNEduApp/exam/exam.vue
index 7df32a1..7dfcca1 100644
--- a/pages/YNEduApp/exam/exam.vue
+++ b/pages/YNEduApp/exam/exam.vue
@@ -1,5 +1,6 @@
+
@@ -111,6 +112,13 @@ export default {
uni.navigateTo({
url: '/pages/YNEduApp/exam/beforeExam'
})
+ uni.removeStorageSync('from')
+ uni.setStorageSync('from', '/pages/YNEduApp/exam/exam')
+ },
+ leftClick() {
+ uni.navigateTo({
+ url: '/pages/YNEduApp/index/index'
+ })
}
}
}
diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue
index eb52156..c788901 100644
--- a/pages/YNEduApp/exam/examination.vue
+++ b/pages/YNEduApp/exam/examination.vue
@@ -97,18 +97,26 @@
{{ unDoCount }}
题尚未完成
- 确定交卷
+ 确定交卷?
+
+
@@ -139,6 +148,12 @@ export default {
flex-direction: column;
justify-content: flex-start;
align-items: center;
+ .arrow-left {
+ position: fixed;
+ top: 50px;
+ left: 20px;
+ z-index: 99;
+ }
.result {
overflow: hidden;
@@ -250,17 +265,17 @@ export default {
align-items: center;
font-size: 13px;
color: #333;
- margin: 20px 10px;
+ margin: 20px 10px;
> div {
width: 25%;
text-align: center;
}
- .icon {
- display: flex;
- justify-content: center;
- align-items: center;
- }
+ .icon {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
}
}
diff --git a/pages/YNEduApp/exam/examinationResultDetails.vue b/pages/YNEduApp/exam/examinationResultDetails.vue
index 9088128..4cdf986 100644
--- a/pages/YNEduApp/exam/examinationResultDetails.vue
+++ b/pages/YNEduApp/exam/examinationResultDetails.vue
@@ -88,7 +88,7 @@
-
解析
+
解析
{{ item.analysis }}
@@ -199,7 +199,7 @@ export default {
}
],
rightAnswer: 'A',
- userAnswer: 'B',
+ userAnswer: 'A',
analysis: '解析'
},
{
@@ -466,6 +466,9 @@ export default {
item.isWrong = true
item.options.forEach(option => {
option.isError = option.value === item.userAnswer
+ if (option.value === item.rightAnswer) {
+ option.isRight = true
+ }
})
}
}
@@ -712,6 +715,8 @@ export default {
font-size: 14px;
color: #333333;
font-weight: 800;
+ display: flex;
+ justify-content: flex-start;
}
.analysis-item {
height: 100px;
diff --git a/pages/YNEduApp/learnProj/learnProj.vue b/pages/YNEduApp/learnProj/learnProj.vue
index 3abcdac..94f46f0 100644
--- a/pages/YNEduApp/learnProj/learnProj.vue
+++ b/pages/YNEduApp/learnProj/learnProj.vue
@@ -1,5 +1,6 @@
+
-
+
+
这是标题
- 合格标准:学习进度完成100%,考试及格一场,练习通过一场
+ 合格标准:学习进度完成100%,考试及格一场,练习通过一场
@@ -32,24 +33,22 @@
-
- 已开启进度同步,其他途径的学习进度已自动同步
-
+ 已开启进度同步,其他途径的学习进度已自动同步
-