From e05c10156abdac3f09fe58ad00bb4884bfa5cbf6 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Mon, 11 Mar 2024 15:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E8=BD=A6=E5=8A=A8=E6=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=89=E6=B2=A1=E6=9C=89=E8=AF=84=E8=AE=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/request.js                                  |  3 +-
 .../enroll/registInfo/chooseCoach/chooseCoach.vue  |  6 ++--
 pages/tabbar/index/index.vue                       |  2 --
 pages/tabbar/learnCar/comp/subject2.vue            |  4 +--
 pages/tabbar/learnCar/comp/subject3.vue            |  4 +--
 pages/tabbar/learnCar/comp/topInfo.vue             |  4 +--
 pages/tabbar/learnCar/index.vue                    | 14 ++++++----
 pages/userCenter/login/login.vue                   | 32 ++++++++++++++++------
 store/modules/user.js                              | 23 +++++++++++++---
 9 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/config/request.js b/config/request.js
index ef8a7e3..55a484e 100644
--- a/config/request.js
+++ b/config/request.js
@@ -57,7 +57,8 @@ module.exports = (vm) => {
 			}
 		}
 		if(data.code==401) {
-			vm.$store.commit('goLogin')
+			
+			vm.$store.commit('goLogin', true)
 		}
 		
 		// 自定义参数
diff --git a/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue b/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue
index 7f8a107..276ccf5 100644
--- a/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue
+++ b/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="main">
+	<view class="pageBg">
 		<u-sticky>
 			<view class="searchBox">
 				<u-search placeholder="请输入教练姓名" v-model="params.name"  :show-action="false" @search="searchFn"> </u-search>
@@ -12,6 +12,7 @@
 				<view class="rigthT">{{item.mobile}}</view>
 			</view>
 		</view>
+		<nodata v-if="!list.length&&status=='nomore'"></nodata>
 		<u-loadmore :status="status"  v-if="list.length>30" :icon-type="'flower'" />
 	</view>
 </template>
@@ -72,8 +73,7 @@
 </script>
 
 <style lang="scss" scoped>
-	.main {
-		background-color: #f8f8f8;
+	.pageBg {
 		.searchBox {
 			background-color: #fff;
 			padding: 16rpx 32rpx;
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 72321f8..19db78e 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -208,8 +208,6 @@
 			this.initApi()
 		},
 		onShow() {
-			
-			
 			// if(!this.vuex_cityInfo.lat) {
 			// 	this.$store.dispatch('getCity')
 			// }
diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue
index 0910103..99efa45 100644
--- a/pages/tabbar/learnCar/comp/subject2.vue
+++ b/pages/tabbar/learnCar/comp/subject2.vue
@@ -16,14 +16,14 @@
 			<view class="h1"><text class="active">学习状态</text></view>
 			<!-- 考试结果 -->
 			<view class="exam"  v-if="showExam">
-				<view class="card" v-if="info.studentExamVO.examResult>89">
+				<view class="card" v-if="info.studentExamVO.pass">
 					<view class="flex-b padTb">
 						<view class="lab">科目二考试成绩已通过</view>
 						<view class="date">
 							{{ $u.timeFormat(info.studentExamVO.examTime, 'yyyy-mm-dd hh:MM:ss') }}
 						</view>
 					</view>
-					<view class="flex-b bg">
+					<view class="flex-b bg" v-if="!info.studentExamVO.canComment">
 						<view class="row">
 							<view class="text">考试成绩：{{ info.studentExamVO.examResult }}分</view>
 							<view class="btn" @click="$goPage('/pages/carEntry/evaluate/evaluate?subject=2&coachType=1')">去评价</view>
diff --git a/pages/tabbar/learnCar/comp/subject3.vue b/pages/tabbar/learnCar/comp/subject3.vue
index 6e64777..9cded3b 100644
--- a/pages/tabbar/learnCar/comp/subject3.vue
+++ b/pages/tabbar/learnCar/comp/subject3.vue
@@ -16,14 +16,14 @@
 			<view class="h1"><text class="active">学习状态</text></view>
 			<!-- 考试结果 -->
 			<view class="exam"  v-if="showExam">
-				<view class="card" v-if="info.studentExamVO.examResult>89">
+				<view class="card" v-if="info.studentExamVO.pass">
 					<view class="flex-b padTb">
 						<view class="lab">科目三考试成绩已通过</view>
 						<view class="date">
 							{{ $u.timeFormat(info.studentExamVO.examTime, 'yyyy-mm-dd hh:MM:ss') }}
 						</view>
 					</view>
-					<view class="flex-b bg">
+					<view class="flex-b bg" v-if="!info.studentExamVO.canComment">
 						<view class="row">
 							<view class="text">考试成绩：{{ info.studentExamVO.examResult }}分</view>
 							<view class="btn" @click="$goPage('/pages/carEntry/evaluate/evaluate?subject=3&coachType=1')">去评价</view>
diff --git a/pages/tabbar/learnCar/comp/topInfo.vue b/pages/tabbar/learnCar/comp/topInfo.vue
index 1841828..b93efc8 100644
--- a/pages/tabbar/learnCar/comp/topInfo.vue
+++ b/pages/tabbar/learnCar/comp/topInfo.vue
@@ -17,14 +17,14 @@
 				<view class="row">
 					<view class="timeItem">
 						<view class="flex">
-							<view class="time">{{dynamics.ValidTtime||0}}</view>
+							<view class="time">{{dynamics.validTime||0}}</view>
 							<view class="uni">分钟</view>
 						</view>
 						<view class="lab">已完成学时</view>
 					</view>
 					<view class="timeItem">
 						<view class="flex">
-							<view class="time">{{dynamics.TotalTime||0}}</view>
+							<view class="time">{{dynamics.classHour||0}}</view>
 							<view class="uni">分钟</view>
 						</view>
 						<view class="lab">应完成学时</view>
diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue
index 988f614..1356912 100644
--- a/pages/tabbar/learnCar/index.vue
+++ b/pages/tabbar/learnCar/index.vue
@@ -4,7 +4,7 @@
 		<view class="" style="height: 100rpx;"></view>
 		<!-- <u-button @click="requestSingleFreshLocationFn">单次定位</u-button> -->
 		<!-- <u-button @click="getInitFaceVerifyFn">人脸核身</u-button> -->
-		<topInfo :carType="curObject.name" @changeSubject="changeSubject" :dynamics="dynamics"></topInfo>
+		<topInfo :carType="curObject.name" @changeSubject="changeSubject" :dynamics="subjectStatus.studentClassHourVO"></topInfo>
 		<subject1 v-if="curObject.id==1"></subject1>
 		<subject2 v-if="curObject.id==2" :subjectStatus="subjectStatus"></subject2>
 		<subject3 v-if="curObject.id==3" :subjectStatus="subjectStatus"></subject3>
@@ -28,7 +28,9 @@
 					id: 2,
 				},
 				dynamics: {},
-				subjectStatus: {}
+				subjectStatus: {
+					studentClassHourVO: {}
+				}
 			}
 		},
 		onLoad() {
@@ -40,14 +42,14 @@
 		},
 		onShow() {
 			this.getStudentSubject1StatusFn()
-			this.getStudentProcessFn()
+			// this.getStudentProcessFn()
 		},
 		methods: {
 			// 切换科目
 			changeSubject(val) {
 				console.log(val)
 				this.curObject = val
-				this.getStudentProcessFn()
+				// this.getStudentProcessFn()
 				this.getStudentSubject1StatusFn()
 			},
 			
@@ -58,7 +60,8 @@
 				let arrFn = [getStudentSubject1Status, getStudentSubject2Status, getStudentSubject3Status, getStudentSubject4Status]
 				const {data: res} = await arrFn[this.curObject.id-1]({studentId: this.studentId})
 				this.subjectStatus = res
-				console.log(res)
+				// console.log(res)
+				console.log(this.subjectStatus.studentClassHourVO)
 			},
 			async getStudentProcessFn() {
 				const {data: res} = await getStudentProcess({studentId: this.studentId})
@@ -77,7 +80,6 @@
 					obj.TotalTime = res.subjectFourTotalTime
 				}
 				this.dynamics = obj
-				console.log(this.dynamics)
 			}
 		}
 	}
diff --git a/pages/userCenter/login/login.vue b/pages/userCenter/login/login.vue
index 21dc72f..00d62b1 100644
--- a/pages/userCenter/login/login.vue
+++ b/pages/userCenter/login/login.vue
@@ -5,7 +5,7 @@
 				<u-icon name="arrow-left" color="#333" size="28"></u-icon>
 			</view>
 		</view> -->
-		<u-navbar title=" " :bgColor="bgColor" :autoBack="true"></u-navbar>
+		<u-navbar title=" " :bgColor="bgColor" :autoBack="true" :leftIcon="autoBack"></u-navbar>
 		<view class="title">短信验证码登录</view>
 		<view class="form">
 			<view class="form-item">
@@ -49,11 +49,15 @@
 				codeText: '获取验证码',
 				FormData: {},
 				codeOn: false,
-				bgColor: 'transparent'
+				bgColor: 'transparent',
+				autoBack:'arrow-left'
 			}
 		},
 		onLoad(options) {
 			this.isCheck = options.isCheck=='true'?true:false
+			// alert(options.autoBack)
+			if(options.autoBack) this.autoBack = ''
+			console.log(this.autoBack)
 		},
 		computed: {
 			isPhone() {
@@ -81,7 +85,7 @@
 					scene: 1,
 					mobile: FormData.phone,
 				}).then(()=>{
-					var time = 30;
+					var time = 60;
 					this.codeText = time + "秒后重新发送"
 					var timer = setInterval(() => {
 						time--;
@@ -107,16 +111,28 @@
 				}
 				const res = await loginSMS(obj)
 				this.$store.commit('update_vuex_loginInfo',res.data)
-				this.$store.dispatch('getUserInfo')
-				// this.$goPage('/pages/userCenter/login/face')
-				uni.switchTab({
-					url: '/pages/tabbar/index/index'
-				})
+				await this.$store.dispatch('getUserInfo')
+				let login_front = uni.getStorageSync('login_front')
+				if(login_front) {
+					let switchBar = ['/pages/tabbar/index/index', '/pages/tabbar/learnCar/index', '/pages/tabbar/mine/index']
+					if(switchBar.includes('login_front')) {
+						uni.switchTab({
+							url: login_front
+						})
+					}else {
+						this.$goPage(login_front)
+					}
+				}else {
+					uni.switchTab({
+						url: '/pages/tabbar/index/index'
+					})
+				}
 			}
 		}
 	}
 </script>
 
+
 <style lang="scss" scoped>
 	
 	.main {
diff --git a/store/modules/user.js b/store/modules/user.js
index 0e38da2..1bcaa70 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -31,13 +31,28 @@ const user = {
 		update_apiOk(state, payload) {
 			state.apiOk = payload
 		},
-		goLogin(state) {
+		goLogin(state, type) {
 			uni.clearStorageSync()
 			state.vuex_loginInfo = {}
 			state.vuex_userInfo = {}
-			uni.navigateTo({
-				url: '/pages/userCenter/login/login'
-			})
+			const pages = getCurrentPages();
+			const page = pages[pages.length - 1].$page.fullPath; //完整路由地址
+			console.log(pages)
+			let url = '/pages/userCenter/login/login'
+			if(page!= url) {
+				console.log('当前页面')
+				console.log(type)
+				
+				if(type) {
+					url = url+'?autoBack=yes'
+					// uni.redirectTo({
+					// 	url
+					// })
+				}
+				uni.navigateTo({
+					url
+				})
+			}
 		},
 		
 		// 为非平台学员开一条路