From 4893e338b6e129aa6c2c2599e08fcb08e3bcc3a7 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Wed, 19 Jun 2024 19:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BB=B7=E6=8C=89?=
 =?UTF-8?q?=E6=89=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/api.js                           |  2 +-
 config/request.js                       |  2 --
 pages/tabbar/learnCar/comp/subject2.vue | 21 ++++++++++++++++++---
 pages/tabbar/learnCar/comp/subject3.vue |  1 +
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/config/api.js b/config/api.js
index c0e619c..d8a63c5 100644
--- a/config/api.js
+++ b/config/api.js
@@ -25,7 +25,7 @@ export const addSchoolComment = (data={}) => http.post('business/appcomplain/add
 // 创建教练评价
 export const addCoachComment = (data={}) => http.post('business/appcomplain/addCoachComment', data,)
 // 我的评价
-export const getUsersCommentById = (params) => http.get('business/appcomplain/getUsersById', {params: params})
+export const getUsersCommentById = (data) => http.post('business/appcomplain/getUsersById', data)
 // 获得学员档案记录
 export const getStudentinfo = () => http.get('app/student-record/get',  )
 // 驾校评论分页
diff --git a/config/request.js b/config/request.js
index 50e7334..2c3e160 100644
--- a/config/request.js
+++ b/config/request.js
@@ -27,14 +27,12 @@ module.exports = (vm) => {
 	    // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
 	    config.data = config.data || {}
 		// 根据custom参数中配置的是否需要token，添加对应的请求头
-		console.log('--------------')
 		config.data['timestamp'] = Date.now()
 		let jsonString = JSON.stringify(config.data)
 		let strSecretKey = jsonString + secretKey
 		let hash = md5(strSecretKey)
 		config.header['Signature'] = hash
 		config.data = jsonString
-		console.log(config.data)
 		let token = vm.$store.state.user.vuex_loginInfo.accessToken
 		if(token) {
 			config.header.Authorization = 'Bearer ' + token
diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue
index a7203fd..2ea53cd 100644
--- a/pages/tabbar/learnCar/comp/subject2.vue
+++ b/pages/tabbar/learnCar/comp/subject2.vue
@@ -4,7 +4,7 @@
 		<!-- 学习状态 -->
 		<view class="learnStatus">
 			<!-- v-if="vuex_userInfo.trainProcess" -->
-			<view class="card mt20" >
+			<view class="card mt20" v-if="vuex_userInfo.trainProcess">
 				<view class="flex-b">
 					<view class="lab">实操预约</view>
 					<view class="link-arrow"
@@ -16,6 +16,19 @@
 				</view>
 			</view>
 			<view class="h1"><text class="active">学习状态</text></view>
+			<!-- 评价 -->
+			<view class="card mb20" v-if="info.studentExamVO&&info.studentExamVO.canComment" style="margin: 20rpx 0;">
+				<view class="flex-b">
+					<view class="lab">学员评价</view>
+					<view class="link-arrow"
+						@click.stop="$goPage('/pages/carEntry/evaluate/evaluate?subject=2&coachType=1')">
+						<view class="txt">去评价</view>
+						<u-icon name="arrow-right" color="#3776FF" :size="16"></u-icon>
+					</view>
+					<!-- <view class="btn" @click.stop="$goPage('/pages/carEntry/evaluate/evaluate?subject=2&coachType=1')">去学习</view> -->
+				</view>
+			</view>
+			
 			<!-- 考试结果 -->
 			<view class="exam" v-if="showExam">
 				<view class="card" v-if="info.studentExamVO.pass">
@@ -25,12 +38,12 @@
 							{{ $u.timeFormat(info.studentExamVO.examTime, 'yyyy-mm-dd hh:MM:ss') }}
 						</view>
 					</view>
-					<view class="flex-b bg">
+					<!-- <view class="flex-b bg">
 						<view class="row">
 							<view class="text">考试成绩：{{ info.studentExamVO.examResult }}分</view>
 							<view class="btn" @click="$goPage('/pages/carEntry/evaluate/evaluate?subject=2&coachType=1')"  v-if="!info.studentExamVO.canComment">去评价</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 
 				<view class="card" v-else>
@@ -163,9 +176,11 @@
 				if (studentExamVO.pass) {
 					// 如果通过了考试
 					this.changeStep('showExam')
+					// 学时达标
 				} else if (res.studentClassHourVO.classHourReachStatus) {
 					// 如果学时达标，
 					let ExamVOTime = studentExamVO.examTime
+					// 预约考试时间
 					let ExamReservationVOTime = examReservationVO.examTime
 					// 如果没有预约考试时间也没有考试时间  去预约考试
 					if (!ExamVOTime && !ExamReservationVOTime) this.changeStep('showAppointmentExam')
diff --git a/pages/tabbar/learnCar/comp/subject3.vue b/pages/tabbar/learnCar/comp/subject3.vue
index 0d04262..d698b72 100644
--- a/pages/tabbar/learnCar/comp/subject3.vue
+++ b/pages/tabbar/learnCar/comp/subject3.vue
@@ -3,6 +3,7 @@
 		
 		<!-- 学习状态 -->
 		<view class="learnStatus">
+			<!-- v-if="vuex_userInfo.trainProcess" -->
 			<view class="card mt20" v-if="vuex_userInfo.trainProcess">
 				<view class="flex-b" >
 					<view class="lab">实操预约</view>