From 62a922d6aa605883ed22ddcee10676bc2e15209d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 15 Nov 2022 13:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client_mp/pages.json            | 19 +++++++++----------
 client_mp/pages/exam/result.vue | 20 +++++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/client_mp/pages.json b/client_mp/pages.json
index 047e8a1..52a5514 100644
--- a/client_mp/pages.json
+++ b/client_mp/pages.json
@@ -11,15 +11,6 @@
 	// 	}]
 	// },
 	"pages": [
-		{
-		    "path" : "pages/login/login",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "验证码登录",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
 		{
 		    "path" : "pages/home/home",
 		    "style" :                                                                                    
@@ -27,8 +18,16 @@
 		        "navigationBarTitleText": "",
 		        "enablePullDownRefresh": false
 		    }
-		    
 		},
+		{
+		    "path" : "pages/login/login",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "验证码登录",
+		        "enablePullDownRefresh": false
+		    }
+		},
+		
 	    {
             "path" : "pages/my/my",
             "style" :                                                                                    
diff --git a/client_mp/pages/exam/result.vue b/client_mp/pages/exam/result.vue
index 6501a9a..4a71fcc 100644
--- a/client_mp/pages/exam/result.vue
+++ b/client_mp/pages/exam/result.vue
@@ -1,14 +1,12 @@
 <template>
 	<view>
-		<image class="examImage" :src="imageSrc" mode="aspectFit"></image>
-		<view class="finishText">
-			恭喜您完成考试！
-		</view>
+		<image v-if="currentExam.is_pass" class="examImage" :src="imageSrcPass" mode="aspectFit"></image>
+		<image v-else class="examImage" :src="imageSrc" mode="aspectFit"></image>
+		<view v-if="currentExam.is_pass" class="finishText">恭喜您完成考试！</view>
+		<view v-else class="finishText">很遗憾，本次考试您未达标！</view>
 		<view class="finishText">
 			<view><text>{{currentExam.name}}</text></view>
-			<!-- 练习类型{{paperRecord.paperName}} -->
 			<view>总分：<text>{{currentExam.total_score}}</text>分</view>
-			<!-- <view>答对：<text>{{paperRecord.rightQueNum}}</text>题</view> -->
 			<view>得分：<text>{{currentExam.score}}</text> 分 </view>
 		</view>
 		<view class="btnArea">
@@ -22,7 +20,8 @@
 	export default {
 		data() {
 			return {
-				imageSrc: '/static/exam/result.png',
+				imageSrcPass: '/static/exam/result.png',
+				imageSrc: '/static/exam/error.png',
 				currentExam:{}
 			}
 		},
@@ -33,7 +32,7 @@
 					uni.setStorageSync('currentExam', res.data);
 					debugger;
 					if (res.data.questions_.length>0){
-						uni.redirectTo({
+						uni.navigateTo({
 							url:'/pages/exam/detail?examrecord='+res.data.id
 						})
 					}
@@ -49,13 +48,16 @@
 			},
 			backToHome(){
 				uni.reLaunch({
-					url:'/pages/index/index'
+					url:'/pages/exam/index'
 				})
 			}
 		},
 		onLoad(options){
 			this.currentExam = uni.getStorageSync('currentExam');
 		},
+		beforeRouteUpdate(){
+			uni.removeStorageSync('currentExam');
+		},
 		
 	}
 </script>