From 9698aae28bbb9063a5ef17987acec92c204f64a8 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Thu, 2 Nov 2023 19:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=A2=84=E7=BA=A6=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cancelReservation/cancelReservation.vue |   4 +-
 config/api.js                                      |   8 ++-
 pages.json                                         |   2 +-
 .../carEntry/simulateAppointment/comp/pickDate.vue |   8 ++-
 pages/carEntry/simulateAppointment/comp/step3.vue  |   8 +--
 .../simulateAppointment/simulateAppointment.vue    |   2 +-
 pages/indexEntry/enroll/enroll.vue                 |   2 +-
 pages/indexEntry/enroll/realName/realName.vue      |   7 ++-
 pages/mineEntry/myAppointment/comp/comp.scss       |   2 +-
 pages/mineEntry/myAppointment/comp/examin.vue      |   4 +-
 pages/mineEntry/myAppointment/comp/imitate.vue     |  22 ++++---
 pages/mineEntry/myAppointment/detail/detail.vue    |  28 +++++++--
 pages/mineEntry/myAppointment/detail/examin.vue    |   4 +-
 pages/mineEntry/myAppointment/detail/imitate.vue   |  30 ++++++----
 pages/mineEntry/myAppointment/myAppointment.vue    |  63 ++++++++++++++-------
 pages/tabbar/index/index.vue                       |   2 +-
 static/images/car/carIcon.png                      | Bin 0 -> 1258 bytes
 static/images/car/listIcon.png                     | Bin 0 -> 403 bytes
 static/images/car/newSatus.png                     | Bin 0 -> 501 bytes
 static/images/car/site.png                         | Bin 0 -> 1353 bytes
 store/modules/user.js                              |   3 +-
 21 files changed, 133 insertions(+), 66 deletions(-)
 create mode 100644 static/images/car/carIcon.png
 create mode 100644 static/images/car/listIcon.png
 create mode 100644 static/images/car/newSatus.png
 create mode 100644 static/images/car/site.png

diff --git a/components/cancelReservation/cancelReservation.vue b/components/cancelReservation/cancelReservation.vue
index c769b6e..d4b15ae 100644
--- a/components/cancelReservation/cancelReservation.vue
+++ b/components/cancelReservation/cancelReservation.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="popupCon">
 		<view class="h2">确定取消预约？</view>
-		<view class="txt">某个训练预约取消规则</view>
+		<!-- <view class="txt">某个训练预约取消规则</view> -->
 		<view class="btnBox">
 			<view class="btn" @click="$emit('popupBtnClick',0)">取消</view>
 			<view class="btn right" @click="$emit('popupBtnClick',1)">确定</view>
@@ -23,7 +23,7 @@
 			color: #333;
 			font-weight: 600;
 			text-align: center;
-			padding: 90rpx 0 0rpx 0;
+			padding: 60rpx 0 50rpx 0;
 		}
 
 		.txt {
diff --git a/config/api.js b/config/api.js
index 209afc4..dd56ea0 100644
--- a/config/api.js
+++ b/config/api.js
@@ -26,8 +26,8 @@ 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 getStudentinfo = (params) => http.get('business/appcomplain/getStudentinfo', {params: params})
+// 获得学员档案记录
+export const getStudentinfo = () => http.get('app/student-record/get',  )
 // 驾校评论分页
 export const getSchoolListComment = (params) => http.get('business/school/getListComment', {params: params})
 // 教练评价分页
@@ -108,6 +108,10 @@ export const simulationDevices = (params) => http.get('business/booking/simulati
 export const simulationCreate = (data) => http.post('business/booking/simulation-record/create', data)
 // 5获得模拟预约记录
 export const simulationPage = (params) => http.get('business/booking/simulation-record/page', {params}) 
+// 6获得模拟详情
+export const simulationDetail = (params) => http.get('business/booking/simulation-record/get', {params}) 
+// 7取消模拟预约
+export const cancelSimulationDevice = (params) => http.put('business/booking/simulation-record/cancelSimulation?id='+ params.id,) 
 // 1新增实操预约记录
 export const masterCreate = (data) => http.post('business/booking/master/create', data)
 // 1获得考场
diff --git a/pages.json b/pages.json
index 2312474..d03df73 100644
--- a/pages.json
+++ b/pages.json
@@ -392,7 +392,7 @@
 					"style": {
 						"navigationBarTitleText": "我的预约",
 						"navigationStyle": "custom",
-						"enablePullDownRefresh": false,
+						"enablePullDownRefresh": true,
 						"backgroundTextStyle": "dark" 
 					}
 				},
diff --git a/pages/carEntry/simulateAppointment/comp/pickDate.vue b/pages/carEntry/simulateAppointment/comp/pickDate.vue
index ed8e76d..fc8206c 100644
--- a/pages/carEntry/simulateAppointment/comp/pickDate.vue
+++ b/pages/carEntry/simulateAppointment/comp/pickDate.vue
@@ -57,11 +57,12 @@
 					</view>
 				</view>
 			</view>
+			<view class="card" v-if="!timerArr2.length&&!timerArr.length">
+				<nodata>暂无预约排课</nodata>
+			</view>
 		</view>
 		
-		<view class="card" v-if="!timerArr2.length&&!timerArr.length">
-			<nodata>暂无预约排课</nodata>
-		</view>
+		
 		
 		<u-datetime-picker
 				:show="show"
@@ -70,6 +71,7 @@
 				:maxDate="maxDate"
 				mode="year-month"
 				@confirm="changeMonth"
+				@cancel="show=false"
 		></u-datetime-picker>
 	</view>
 </template>
diff --git a/pages/carEntry/simulateAppointment/comp/step3.vue b/pages/carEntry/simulateAppointment/comp/step3.vue
index 1aebbd0..2e74bc2 100644
--- a/pages/carEntry/simulateAppointment/comp/step3.vue
+++ b/pages/carEntry/simulateAppointment/comp/step3.vue
@@ -2,7 +2,7 @@
 	<view class="step3">
 		<view class="card">
 			<view class="list">
-				<view class="listItem" v-for="(item,index) in list" :key="index" :class="{active: FormData.deviceNum==item.id}" @click="chooseDevice(item)">
+				<view class="listItem" v-for="(item,index) in list" :key="index" :class="{active: FormData.deviceNum==item.seq}" @click="chooseDevice(item)">
 					{{ item.seq }}</view>
 			</view>
 		</view>
@@ -30,7 +30,7 @@
 					</view>
 					<view class="row">
 						<view class="lab">预约模拟器</view>
-						<view class="val">{{ FormData.deviceName}}</view>
+						<view class="val">{{ FormData.deviceNum}}</view>
 					</view>
 				</view>
 				<view class="btn_row">
@@ -67,8 +67,8 @@
 				
 			},
 			chooseDevice(item) {
-				this.FormData.deviceNum = item.id
-				this.FormData.deviceName = item.seq
+				this.FormData.deviceNum = item.seq
+				// this.FormData.deviceName = item.seq
 				
 			},
 			confirmClick(item) {
diff --git a/pages/carEntry/simulateAppointment/simulateAppointment.vue b/pages/carEntry/simulateAppointment/simulateAppointment.vue
index 29e509e..0ea25ad 100644
--- a/pages/carEntry/simulateAppointment/simulateAppointment.vue
+++ b/pages/carEntry/simulateAppointment/simulateAppointment.vue
@@ -56,7 +56,7 @@
 		created() {
 			this.simulationPointFn()
 			this.FormData.trainType = this.vuex_userInfo.trainType
-			this.FormData.studentId = this.userId
+			this.FormData.studentId = this.vuex_userInfo.id
 		},
 		methods: {
 			 changeStep(num) {
diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue
index 65c7a9a..419aa13 100644
--- a/pages/indexEntry/enroll/enroll.vue
+++ b/pages/indexEntry/enroll/enroll.vue
@@ -94,7 +94,7 @@
 				this.showType = false
 			},
 			async getpersonfaceFn() {
-				const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: 'http://192.168.1.44:8001/h5/#/pages/indexEntry/enroll/realName/realName'})
+				const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: 'http://192.168.1.44:8003/h5/#/pages/indexEntry/enroll/realName/realName'})
 				let obj = JSON.parse(res)
 				this.link = obj.Url
 				this.$store.commit('updateBizToken', obj.BizToken)
diff --git a/pages/indexEntry/enroll/realName/realName.vue b/pages/indexEntry/enroll/realName/realName.vue
index cb07e03..63bb0dd 100644
--- a/pages/indexEntry/enroll/realName/realName.vue
+++ b/pages/indexEntry/enroll/realName/realName.vue
@@ -21,7 +21,7 @@
 				})
 				let obj = {
 					ruleId: 1,
-					redirectUrl: 'http://192.168.1.44:8001/h5/#/pages/indexEntry/enroll/registInfo/registInfo',
+					redirectUrl: 'http://192.168.1.44:8003/h5/#/pages/indexEntry/enroll/registInfo/registInfo',
 					bizToken: this.$store.state.school.BizToken,
 					userId: this.userId
 				}
@@ -34,8 +34,9 @@
 				}
 			
 				// console.log(obj2)
-				// alert('请求结果来了')
-				// alert(obj2.Text.name)
+				alert('请求结果来了')
+				alert(obj2.Text.ErrMsg)
+				alert(obj2.Text.name)
 				// uni.setStorageSync(obj2)
 			},
 		}
diff --git a/pages/mineEntry/myAppointment/comp/comp.scss b/pages/mineEntry/myAppointment/comp/comp.scss
index 34523db..bfe0a65 100644
--- a/pages/mineEntry/myAppointment/comp/comp.scss
+++ b/pages/mineEntry/myAppointment/comp/comp.scss
@@ -39,7 +39,7 @@
 		}
 
 		.target {
-			border-bottom: 2rpx dashed #E8E9EC;
+			// border-bottom: 2rpx dashed #E8E9EC;
 		}
 
 		.row {
diff --git a/pages/mineEntry/myAppointment/comp/examin.vue b/pages/mineEntry/myAppointment/comp/examin.vue
index b40e6e3..0204d36 100644
--- a/pages/mineEntry/myAppointment/comp/examin.vue
+++ b/pages/mineEntry/myAppointment/comp/examin.vue
@@ -35,11 +35,11 @@
 				<view class="name">{{item.classTime}}</view>
 			</view>
 		</view>
-		<view class="border_bottom">
+		<view class="border_bottom" v-if="item.writtenoffStatus==1||item.recordStatus==9">
 			<view class="dateBox">
 				
 				<!-- <view class="date">完成时间：2022-01-04</view> -->
-				<view class="date" v-if="item.cancelTime&&item.recordStatus==9">取消时间：{{ item.cancelTime }}</view>
+				<view class="date"v-if="item.recordStatus==9&&item.cancelTime">取消时间：{{ $u.timeFormat(item.cancelTime, 'yyyy-mm-dd hh:MM:ss')}}</view>
 				<!-- <view class="date">处理时间：2022-01-04</view> -->
 			</view>
 			<view class="btnBg" @click.stop="$goPage('/pages/carEntry/evaluate/evaluate')" v-if="item.writtenoffStatus==1">去评价</view>
diff --git a/pages/mineEntry/myAppointment/comp/imitate.vue b/pages/mineEntry/myAppointment/comp/imitate.vue
index 3e45ed1..16060fc 100644
--- a/pages/mineEntry/myAppointment/comp/imitate.vue
+++ b/pages/mineEntry/myAppointment/comp/imitate.vue
@@ -4,10 +4,11 @@
 		<view class="top_row">
 			<view class="flex">
 				<view class="tag">模拟器</view>
-				<view class="schoolName">xxx模拟驾驶馆</view>
+				<view class="schoolName">{{item.name}}</view>
 			</view>
 			<view class="status">
-				<view class="text">待处理</view>
+				<view class="text" v-if="item.recordStatus==9">已取消</view>
+				<view class="text" v-else>{{statusTxt[item.recordStatus]}}</view>
 				<view class="icon">
 					<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
 				</view>
@@ -21,7 +22,7 @@
 					</view>
 					<view class="lab">模拟器编号</view>
 				</view>
-				<view class="name">000001</view>
+				<view class="name">{{item.deviceNum}}</view>
 			</view>
 			<view class="row">
 				<view class="leftLab">
@@ -30,13 +31,12 @@
 					</view>
 					<view class="lab">预约时间</view>
 				</view>
-				<view class="name">2023/08/08 10:00:00</view>
+				<view class="name">{{item.classTime}}</view>
 			</view>
 		</view>
-		<view class="border_bottom">
+		<view class="border_bottom" v-if="item.recordStatus==2">
 			<view class="dateBox">
-				<view class="date">完成时间：2022-01-04</view>
-				<!-- <view class="date">处理时间：2022-01-04</view> -->
+				<view class="date" >完成时间：{{$u.timeFormat(item.signOutTime, 'yyyy-mm-dd hh:MM:ss')}}</view>
 			</view>
 			<view class="btnBg" @click.stop="$goPage('/pages/carEntry/evaluate/evaluate')">去评价</view>
 		</view>
@@ -44,6 +44,14 @@
 </template>
 
 <script>
+	export default {
+		props: ['item'],
+		data() {
+			return {
+				statusTxt: ['未签到','已签到','已签退','旷课','已取消',''],//0：未签到，1：已签到，2：已签退，3：旷课，9：已取消
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/mineEntry/myAppointment/detail/detail.vue b/pages/mineEntry/myAppointment/detail/detail.vue
index f808e3e..4145db6 100644
--- a/pages/mineEntry/myAppointment/detail/detail.vue
+++ b/pages/mineEntry/myAppointment/detail/detail.vue
@@ -4,8 +4,8 @@
 		<!-- 详情 -->
 		<view class="pad">
 			<view class="card">
-				<imitate v-if="type==1"/>
-				<opera  v-else-if="type==2"/>
+				<imitate v-if="type==1" :info="info"/>
+				<opera  v-else-if="type==2" :info="info"/>
 				<examin v-else-if="type==3" :info="info"/>
 			</view>
 			
@@ -25,7 +25,7 @@
 	import imitate from './imitate'
 	import opera from './opera'
 	import examin from './examin'
-	import { examSimulationGet, cancelSimulation } from "@/config/api.js"
+	import { examSimulationGet, cancelSimulation, simulationDetail, cancelSimulationDevice } from "@/config/api.js"
 	export default {
 		components: { imitate,  opera, examin},
 		data() {
@@ -41,13 +41,21 @@
 			this.id = options.id
 			if(this.type==3) {
 				this.examSimulationGetFn()
+			}else if(this.type==1) {
+				this.simulationDetailFn()
 			}
 		},
 		methods: {
+			// 获得考场模拟详情
 			async examSimulationGetFn() {
 				const {data: res} = await examSimulationGet({id: this.id})
 				this.info = res
 			},
+			// 获得模拟预约详情
+			async simulationDetailFn(item) {
+				const {data: res} = await simulationDetail({id: this.id})
+				this.info = res
+			},
 			// 取消考场模拟预约
 			async cancelSimulationFn() {
 				const res = await cancelSimulation({id: this.id})
@@ -58,10 +66,20 @@
 					this.examSimulationGetFn()
 				// }
 			},
+			// 取消模拟预约
+			async cancelSimulationDeviceFn() {
+				const {data: res} = await cancelSimulationDevice({id: this.id})
+				this.$u.toast('取消成功')
+				this.simulationDetailFn()
+			},
 			// 取消预约事件
 			popupBtnClick(val) {
 				if(val==1) {
-					this.cancelSimulationFn()
+					if(this.type==1) {
+						this.cancelSimulationDeviceFn()
+					}else if(this.type==3) {
+						this.cancelSimulationFn()
+					}
 				}
 				this.show = false
 				console.log(val)
@@ -72,7 +90,7 @@
 
 <style lang="scss" scoped>
 	.card {
-		padding: 24rpx;
+		padding: 0 24rpx;
 	}
 	.btnCon {
 		display: flex;
diff --git a/pages/mineEntry/myAppointment/detail/examin.vue b/pages/mineEntry/myAppointment/detail/examin.vue
index 8704b8c..eb541b4 100644
--- a/pages/mineEntry/myAppointment/detail/examin.vue
+++ b/pages/mineEntry/myAppointment/detail/examin.vue
@@ -34,8 +34,8 @@
 		</view>
 		<view class="border_bottom">
 			<view class="dateBox">
-				<view class="date">提交预约时间：{{ $u.timeFormat(info.createTime, 'yyyy-mm-dd')}}</view>
-				<view class="date" v-if="info.cancelTime">取消时间：{{ $u.timeFormat(info.cancelTime, 'yyyy-mm-dd')}}</view>
+				<view class="date">提交预约时间：{{ $u.timeFormat(info.createTime, 'yyyy-mm-dd hh:MM:ss')}}</view>
+				<view class="date" v-if="info.cancelTime">取消时间：{{ $u.timeFormat(info.cancelTime, 'yyyy-mm-dd hh:MM:ss')}}</view>
 			</view>
 		</view>
 	</view>
diff --git a/pages/mineEntry/myAppointment/detail/imitate.vue b/pages/mineEntry/myAppointment/detail/imitate.vue
index 04d3293..afce70f 100644
--- a/pages/mineEntry/myAppointment/detail/imitate.vue
+++ b/pages/mineEntry/myAppointment/detail/imitate.vue
@@ -4,24 +4,25 @@
 		<view class="top_row">
 			<view class="flex">
 				<view class="tag">模拟器</view>
-				<view class="schoolName">xx模拟驾驶馆</view>
+				<view class="schoolName">{{info.name}}</view>
 			</view>
 			<view class="status">
-				<view class="text">待处理</view>
-				<view class="icon">
+				<view class="text" v-if="info.recordStatus==9">已取消</view>
+				<view class="text" v-else>{{statusTxt[info.recordStatus]}}</view>
+				<!-- <view class="icon">
 					<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="target">
 			<view class="row">
 				<view class="leftLab">
 					<view class="icon">
-						<image src="@/static/images/index/edit.png" mode=""></image>
+						<image src="@/static/images/car/ic_banxing.png" mode=""></image>
 					</view>
 					<view class="lab">模拟器编号</view>
 				</view>
-				<view class="name">000001</view>
+				<view class="name">{{info.deviceNum}}</view>
 			</view>
 			<view class="row">
 				<view class="leftLab">
@@ -30,20 +31,29 @@
 					</view>
 					<view class="lab">预约时间</view>
 				</view>
-				<view class="name">2023/08/08 10:00:00</view>
+				<view class="name">{{info.classTime}}</view>
 			</view>
 		</view>
 		<view class="border_bottom">
 			<view class="dateBox">
-				<view class="date">提交预约时间：2022-01-04</view>
-				<view class="date">完成时间：2022-01-04</view>
-				<view class="date">核销人员：某某一号考场</view>
+				<view class="date">提交预约时间：{{$u.timeFormat(info.createTime, 'yyyy-mm-dd hh:MM:ss')}}</view>
+				<view class="date" v-if="info.cancelTime&&info.recordStatus==9">取消时间：{{ $u.timeFormat(info.cancelTime, 'yyyy-mm-dd hh:MM:ss')}}</view>
+				<view class="date" v-if="info.recordStatus==2">完成时间：{{$u.timeFormat(info.signOutTime, 'yyyy-mm-dd hh:MM:ss')}}</view>
+				<view class="date" v-if="info.recordStatus==2">核销人员：目前没有字段</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	export default {
+		props: ['info'],
+		data() {
+			return {
+				statusTxt: ['未签到','已签到','已签退','旷课','已取消',''],//0：未签到，1：已签到，2：已签退，3：旷课，9：已取消
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/mineEntry/myAppointment/myAppointment.vue b/pages/mineEntry/myAppointment/myAppointment.vue
index 44adee0..9cf4f92 100644
--- a/pages/mineEntry/myAppointment/myAppointment.vue
+++ b/pages/mineEntry/myAppointment/myAppointment.vue
@@ -3,7 +3,7 @@
 		<topNavbar title="我的预约"></topNavbar>
 		<view class="pad">
 			<view class="searcBox">
-				<searchRow placeholder="搜索考场名称、车牌号"/>
+				<searchRow placeholder="搜索考场名称、车牌号" @searchFn="searchFn" ref="searchRef"/>
 			</view>
 			<view class="tabs">
 				<view class="tab" v-for="(item,index) in tabList" :key="index" :class="{active: currentTab==item.id}" @click="changeTab(item)">{{ item.text }}</view>
@@ -14,7 +14,7 @@
 			<view class="recordTotal" v-if="total">{{total}}条记录</view>
 			
 			<view class="tabCon" v-show="currentTab==1">
-				<view class="card" v-for="(item,index) in examList" :key="index" @click="$goPage('/pages/mineEntry/myAppointment/detail/detail')">
+				<view class="card" v-for="(item,index) in list" :key="index" @click="$goPage('/pages/mineEntry/myAppointment/detail/detail?type=1&id='+item.id)">
 					<imitate :item="item"></imitate>
 				</view>
 			</view>
@@ -26,11 +26,15 @@
 			</view>
 			
 			<view class="tabCon" v-if="currentTab==3">
-				<view class="card" v-for="(item,index) in examList" :key="index"  @click="$goPage('/pages/mineEntry/myAppointment/detail/detail?type=3&id='+item.id)">
+				<view class="card" v-for="(item,index) in list" :key="index"  @click="$goPage('/pages/mineEntry/myAppointment/detail/detail?type=3&id='+item.id)">
 					<examin :item="item"></examin>
 				</view>
 			</view>
 			
+			<view style="padding: 10rpx 0 20rpx 0;" v-if="list.length">
+				<u-loadmore :status="status" />
+			</view>
+			<nodata v-if="!list.length&&status=='nomore'"></nodata>
 		</view>
 		
 	</view>
@@ -60,20 +64,24 @@
 				// 0：未签到，1：已签到，2：已签退，3：旷课，9：已取消
 				currentTab: 3,
 				currentNav: 0,
-				examParams: {  "pageNo": 1,  "pageSize": 10,  "keyWord": "",  "status": '0',studentId: ''},
-				examList: [],
-				total: 20
+				params: {  "pageNo": 1,  "pageSize": 10,  "keyWord": "",  "status": '0',studentId: '', keyWord: ''},
+				list: [],
+				total: 20,
+				status: 'loading'
 			}
 		},
 		onLoad(options) {
 			if(options.currentTab) this.currentTab = options.currentTab
-			this.examParams.studentId = this.userId
+			this.params.studentId = this.vuex_userInfo.id
+			this.inintList()
+		},
+		onPullDownRefresh() {
 			this.inintList()
 		},
 		methods: {
 			inintList() {
-				this.examParams.pageNo = 1
-				this.examList = []
+				this.params.pageNo = 1
+				this.list = []
 				if(this.currentTab==3) {
 					this.examSimulationRecordFn()
 				}else if(this.currentTab==1) {
@@ -81,33 +89,48 @@
 				}
 			},
 			changeTab(item) {
+				this.params.keyWord = ''
 				this.currentTab = item.id
+				this.$refs.searchRef.keyword = ''
 				this.inintList()
 			},
 			changeNav(item) {
 				this.currentNav = item.id
-				this.examList = []
-				this.examParams.pageNo = 1
+				this.list = []
+				this.params.pageNo = 1
 				if(item.id==-1) {
-					this.examParams.status = ''
+					this.params.status = ''
 				}else {
-					this.examParams.status = this.currentNav
+					this.params.status = this.currentNav
 				}
-				this.examSimulationRecordFn()
+				this.inintList()
 			},
 			// 考场预约
 			async examSimulationRecordFn() {
-				const {data: res} = await examSimulationRecord(this.examParams)
-				this.examParams.pageNo ++
-				this.examList.push(...res.list)
+				const {data: res} = await examSimulationRecord(this.params)
+				this.params.pageNo ++
+				this.list.push(...res.list)
 				this.total = res.total
+				if(this.list.length>=this.total) this.status = 'nomore'
 			},
 			// 模拟器预约记录
 			async simulationPageFn() {
-				const {data: res} = await simulationPage(this.examParams)
-				this.examParams.pageNo ++
-				this.examList.push(...res.list)
+				let obj = {}
+				for(let k in this.params) {
+					if(this.params[k]!=='') {
+						obj[k] = this.params[k]
+					}
+				}
+				const {data: res} = await simulationPage(obj)
+				this.params.pageNo ++
+				this.list.push(...res.list)
 				this.total = res.total
+				if(this.list.length>=this.total) this.status = 'nomore'
+			},
+			// 搜索
+			searchFn(val) {
+				this.params.keyWord = val
+				this.inintList()
 			}
 		}
 	}
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 91b23b3..8cf40c1 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -283,11 +283,11 @@
 			if(!this.$store.state.user.vuex_cityInfo.lat) {
 				await this.$store.dispatch('getCity')
 			}
-			this.$store.dispatch('getUserInfo')
 			// console.log(this.$store.state.user.vuex_cityInfo)
 		},
 
 		onShow() {
+			this.$store.dispatch('getUserInfo')
 		},
 		computed: {
 			// joe() {
diff --git a/static/images/car/carIcon.png b/static/images/car/carIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..93e0486ca7510d8f5b0b13201f474aa44ea05ad2
GIT binary patch
literal 1258
zcmV<G1Qq*<P)<h;3K|Lk000e1NJLTq001BW000~a1^@s60K&Z@00001b5ch_0Itp)
z=>Px(q)9|UR7gwhS6yfvRTMtw&SaCNF51*qv2C<1C~TULojbENRWa5ID)m8ZKq(@9
z5NSd1!B_EF6!FFMLBt3D3aJXVRTR{%2*S?2yGhhQZE7?%3O1FbtKDRG=N>uh3{2L|
zZqnw_`*io-bHDk{|5=1K%XQt|M06)2-UI-4T%3pq0Ine7WdNA2R;!ca<KwgKFyr^w
zO4xPX2LNF2S^$aYoMl;`<@5PVt9iE~0nhVx648?($fY0%CT!a-H&_6PXaf;#M#No+
znBaRNS`32V!?CfkbL~j1NWgX7#{ghA09>A*pC6f;np$cFCZ+5ULhL1?yV+Gl6c}UP
zE*6Www0hTyz%u}FvoS^&3WZaRAlYnoQ>9Yb&gY3l;zDF{&-1nu(GviW<oF<>*R|GH
zRwB{L1xMMmMD(rJ`tt}N)btS|>RT2}h~F7wPHL^I>^@`6Aw(2Jq_ozj*NuSdx{m|E
z9V-ByRZ1P_JJ0i&q{FUArBbita=FE3Z`Nc1DP<2L9u9#x^>Sg*-G_*&aQ~LpdZxFx
zw>z0kJ{!t@tduHVGXc-@?j@oj1`<NNpU>xi<b5`qz1<kYeg{O%`M!UK_fpEEh{zdI
z@O}T}st61Z4_h-cGaG8P+Ea+w9ghLe^X?C$9D*QtqgX8d#-N!@<`&Dco(>6o<NN*>
zymwvqAOQ3Nz^|5NjrR2P{5?848Z<3L{r&x05{bk<0N53;cnt)4iHJdYO_xfgk9d<x
zr5*)<9U*}ezVH7K5_pIW6#HNe0M1t`l`khICjO|)hk_hb47{w=hCYpFffbsyyO}wO
z=ufTn2msWz^gQoDBHGhLmWiBDN}a{NzP^o}ot;MjpaTG^tg&TTv$a~ygc{9jt>+?;
zOeVA0vaCY@aD4;tLJ$P+7K_D;(YciJMk2a_f7`Y#YPH%nA;e&)Xmx36=@>eWb3h0o
zIb8tYO|A9s&9sZ3rPJv|GMUUEV!aR%(S>rkT%4Soth9SOI5@bqQmGt9M2m|Yx~}_N
zsEx0b`lKDedfZ1!1Hb}GDPQ1<WsEshC=~R1e4ri1z`%fK+xEjmWY_{Ph7VRO7VQAn
zdha-n6ha)R$JqY_ViuSqqQBN^&a06R`^Kh57hDb2HNW937>-bQyb?m(8s_$*5MtIC
zvkehD!?T}x$Y}RfMBEw`Dk8dwh}?>!n!%IR`3PfKJC;)JK}0T}#<Hvto^rUF0l*PX
zRRH)@DV1+WKuXE-TL9oErPMoIt31!!PegYycDY=BDJoja2sn<jPY7`j5tX#ouf|I1
z^N7g9=hs^6uU0{zE)M`_lv4GX!F65kH$2R6<$O(Ry-<&VIGE!&{Xz)tY~1fp2SG57
zh#3IjuEy&FrPTMUAi%BsHX@og#=I8<!Ih4Vj)URZqSpFl0Qk4p#KDG!hU`+Q#6!f!
z#*c8POQllBa=9FLvX(18pfn1`2bTX3-~;wKBC@IKX~N4GGiTfO@zws>2yr-`_D3xq
z5s90R)|&eb|D&p}m1aUArQE@-6cM={Pe&$er+xfBolalZ)z!6A2w@2!W|}GR4+xWE
UOlNcR(EtDd07*qoM6N<$f|tiy!T<mO

literal 0
HcmV?d00001

diff --git a/static/images/car/listIcon.png b/static/images/car/listIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1921a3788a67f2964eb1e433180632c653c8992f
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001HY0015c1^@s6N&n0g00001b5ch_0Itp)
z=>Px$O-V#SR9HvtmqAX2Fc5}kf*ZE#MsDB*e4d6C>6n;!1GVZAjEe#%@FYGD;1P%m
zS-LSoO<!2>cu+b#7L5<K{b%~k%-@tEc=Dkq9KZrmO1&9yBDx$afTK0JxFEU#8I4m)
zIcs}Cq?AWd6y0jAuL0nsseEm^&`#b|yz1$UP5T1?uVENo#c}-Ij@_v&P16Uh^<8I!
zxj;5)5%F0FabpEhN|gX`90b8CNs{-rm^1f2ZI)%{bzOe|z$X!%je)RcJ7(JM`jB^a
zM#DAP;ec=}<?4xOYZ`;2;U?zlok6-n?nXoU#jOAD_*(81j%_wqgbA4J5pO^^WxHr6
zcf=(*N3(#;c6_}tt2ZDVBf4l8v+iToFY}D(`+0V0y-kzn`9)P#YXB&T=yb|+Vqb=>
xctm^@Lfl(H1|C>*fs}~&QWV9Ll=8Qo^bd=kDK2oU+d2RM002ovPDHLkV1lX*u8{x$

literal 0
HcmV?d00001

diff --git a/static/images/car/newSatus.png b/static/images/car/newSatus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fc6c712bec660be2aff8591ddad67be71386d77
GIT binary patch
literal 501
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1&TfmH9gB0%lVEGHEEZ)<_F+@Xj
zZs10*BMu^aa(s3uwf2VJ<WhRXACs(T7Ny0d>8xkgHMh6x9(#<#7LP@q+8uLmbc+3A
zRLV%y&QOe)p~ZP|<_wwYK*yLFZ)R5-SI+ib{PFzKKU27y60FXDR{qu^FfI3Xc<KG^
z2_mkCJtx^{brt<<Y(20iQ6hO+=Dw4Oio(}2XT3}4HuWtoiH&#sD|g&*Yon>b#m{>R
zOWqsgO72)L?5y69EK|wlUbo`X*G@gA>vR2{i`?JgxM5k_hUnHE-<xNcvD>X)^~y@x
zfV-)5<=H86Uh$3`Qa-i{8+2Z8d*RU^WWA*QUY)=pEf4PFH>dpB6SycMbv^4QH^-Jl
z3#LNp7gl|rqjr2aaQa(E*Jk#8-20C9oY=I6`xDcfaJ6?kW|$d7UgkS6f2QD!Egh@h
zJ?veXbEw{?xlS?ri$n3m$bg#r`(27fp17I)4ST#J_scw&%{OD53YijL=r5Q)(|^IN
ViPsO+sci-Yxu>h2%Q~loCIDOIzHtBm

literal 0
HcmV?d00001

diff --git a/static/images/car/site.png b/static/images/car/site.png
new file mode 100644
index 0000000000000000000000000000000000000000..12baa242a18db18c1a4c47858e0db97cc6b6aedc
GIT binary patch
literal 1353
zcmV-P1-AN$P)<h;3K|Lk000e1NJLTq001BW000~a1^@s60K&Z@00001b5ch_0Itp)
z=>Px)14%?dR7gw3muqZPRS?JjbG94nQf)P&(4d0i0|66!kjO(Ki7%3>2-Jv8P3b*z
z3VuP+XduFdha^Ue8jE|+S+WsAR1|}tMkQ*Li19_DD54<5N7`sa6bUxj_KrDCTWjgP
zyB|zENk4UF?(fXZ`Ohrje?BzS_nmXoMPws@(J_2o0CpZfetb?QlNqIy+Db$dL}aLV
z5fOc=l$zb#+}u7m-jD#++K&NTT}E;miD;ULa2dAinEAev0EI%KvREu013>9?`n0B|
zrq01m*4j1zivZjMU>blsiD<so`nkcj&bgT)@-`8DsI{I_62MyPZ|*a&mzggg>Sos3
z4FDDZXcm!aMASq?3$)gS!S?IduRo)rqT&b<ov5y^uCA}I?;dD#QVGH^G(?mGu#uVX
zj_HxjA~Ih@?joY8J{v@|NNfE}4DcZUW1=V;-_p{uFA>06>p$)x?$ug95d*MQL~aM*
z|9lC2ZI>`}YYf0k0OkN_VCKz<0M5COL}ap3YDN$Q@5cmu9l*^1X7!d}sfa8y#yk=O
zyi7z^6Vc;Z>-%E?ve|4!ZEfwJ08YtdGBphi4ZayqI@a2E09+>`GnG>Q6|5AIRmPa*
zF#sO)H3082^UPR)FbpRW(H8&?GV?`oPs=&CTSTsjqG*az>M8(F0r(EUH$(XlQI&{X
z3t&GpkBbFx&NYh2vjDa*^BoBQdqiXsfJsF3tB8CC;OsKA;9+K7odmE>L>2>B%FJuy
z0$OXo25_l}j5EgUFBA$BySlm_1dxgI5s?le+NQPMnFR1&Z>nx$<~QSlg<*J@h(>pJ
zcaH&3Or=s^0;nk?1K#8@W`3a0wqFOljyvam2XK0KclS997cTrIp#&WwGNM>4j!dW1
zvjA)mk$pt;L7Wc}k%%+{IMLqTUX#sc{X9WGKt7)z8%5Cp06#JFxk<ON)*kgY7Lghv
zss~_2#2RBvlAm+#fQXD$N=*!cz-R3r0Bfxe^a2s>&|2S80>ICQQ#w04D=RB2y`P_)
zo0z$=1i%&%nFpYenK%6lz&W>8L>>aLl9^W|G?Oot*K=X!R2YWyh{y+i(HP@lVvlpq
z3)UK?RBI3fO9p4)4FES1(QR7mSK^|ywzi&HRaJEYz+cRq$>nl&N~!H4vcnitDsx^v
zy^8h=QhyIvYkkuV7m@RgF+aos^iH?m032oJGjqAz^-8I?{DQ*FHzZ}CP$>Au?dbFE
z&wz7ol!*K&B1eodXC(y*!*C=K`OT(-nQMEuCqFZGF|${@#N(Xnc|k;Uf!6wPPX_Y&
zd|ebp+lgqW);jSP&bcuna)^iyX{|3Dus?jl%#%w2SZjL*SrkQcT3T9O?g0qHa0L-%
z0X)jgUeRJtE|<GZDfJbAeat*QpU+Q-qG)f@0y8j}b8d}@EG42<TI=OK0M^=V0B-fG
z6*E6yq6AkEk=On`%zWhl{W!qP7njO_b8fDGF#uj==DI$B?*W_#;1Xv3wuA=wz0ND%
zZf2g^*FWV5n2+1m);2bsPWKC5AApzOY5;z{j*<XG#815$BC^dGGuuDQVZ(+U^L|7W
z`+Nt)^pZRmz#q(9(*xj~ds;;NhFk6_0;ua7SOd1?a{ayClgzxh2fz=aTrM|5DK)%Q
z1b<Vd)aOAE930eK)1xRFQOe){Kb1=T90b8G|LGxrn3NObzq0uomM&;JU06lW00000
LNkvXXu0mjfzHnXU

literal 0
HcmV?d00001

diff --git a/store/modules/user.js b/store/modules/user.js
index 3313f7b..0cdd306 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -72,7 +72,8 @@ const user = {
 		async getUserInfo({state, commit}) {
 			const http = uni.$u.http
 			let config =  { custom: { auth: false }, header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'} }
-			const res = await http.get('app/student-record/get?id='+state.vuex_loginInfo.userId,config)
+			const res = await http.get('app/student-record/get')
+			// const res = await http.get('app/student-record/get?id='+state.vuex_loginInfo.userId,config)
 			commit('update_vuex_userInfo',res.data)
 		},
 		// 刷新token