From 52fa595896da71033a8d002c30822cd3c613aef1 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Wed, 1 Nov 2023 19:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=93=8D=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/mixins.js                                |   1 +
 .../appointItem-student/appointItem-student.vue    |  35 +-
 .../pickDateTimer/pickDateTimer - 副本.vue       | 334 ---------------
 components/pickDateTimer/pickDateTimer.vue         | 473 --------------------
 config/api.js                                      |  13 +
 manifest.json                                      |   2 +-
 .../comp/pickDateTimer/pickDateTimer - 副本.vue  | 334 +++++++++++++++
 .../comp/pickDateTimer/pickDateTimer.vue           | 474 +++++++++++++++++++++
 .../operate/mySchedule/mouldEdit/mouldAdd.vue      |   2 +-
 .../recordEntry/operate/mySchedule/mySchedule.vue  |   4 +-
 .../student/studentDetail/comp/info.vue            |  36 +-
 .../student/studentDetail/studentDetail.vue        |   8 +-
 pages/tabbar/student/index.vue                     |  42 +-
 pages/userCenter/myCar/myCar.vue                   |  32 +-
 14 files changed, 945 insertions(+), 845 deletions(-)
 delete mode 100644 components/pickDateTimer/pickDateTimer - 副本.vue
 delete mode 100644 components/pickDateTimer/pickDateTimer.vue
 create mode 100644 pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer - 副本.vue
 create mode 100644 pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue

diff --git a/common/js/mixins.js b/common/js/mixins.js
index 1bb3dee..6241e7a 100644
--- a/common/js/mixins.js
+++ b/common/js/mixins.js
@@ -9,6 +9,7 @@ export default {
 			vuex_userInfo: state=>state.user.vuex_userInfo,
 			vuex_deptId: state=>state.user.vuex_userInfo.user.deptId,
 			vuex_coachId: state=>state.user.vuex_userInfo.user.coachId,
+			vuex_loginInfo: state=>state.user.vuex_loginInfo,
 			
 		}),
 	},
diff --git a/components/appointItem-student/appointItem-student.vue b/components/appointItem-student/appointItem-student.vue
index c0f988f..4edca22 100644
--- a/components/appointItem-student/appointItem-student.vue
+++ b/components/appointItem-student/appointItem-student.vue
@@ -3,7 +3,7 @@
 	<view class="consultItem">
 		<view class="top_row">
 			<view class="flex">
-				<view class="schoolName">张三三 18265468753</view>
+				<view class="schoolName">{{item.name}} <text style="margin-left: 10rpx;">{{item.phone}}</text></view>
 			</view>
 			<view class="status">
 				<!-- <view class="text">待上课</view> -->
@@ -15,27 +15,27 @@
 		<view class="target">
 			<view class="row">
 				<view class="iconImg">
-					<image src="@/static/images/index/radio_nor.png" mode=""></image>
+					<image src="@/static/images/index/timerIcon.png" mode=""></image>
 				</view>
-				<view class="name">报名时间：2023/08/08</view>
+				<view class="name">报名时间：{{$u.timeFormat(item.applyDate, 'yyyy/mm/dd')}}</view>
 			</view>
 			<view class="row">
 				<view class="iconImg">
-					<image src="@/static/images/index/radio_nor.png" mode=""></image>
+					<image src="@/static/images/index/carIcon.png" mode=""></image>
 				</view>
-				<view class="name">学驾车型：C1小型汽车手动挡</view>
+				<view class="name">学驾车型：{{item.trainType}}</view>
 			</view>
 			<view class="row">
 				<view class="iconImg">
-					<image src="@/static/images/index/radio_nor.png" mode=""></image>
+					<image src="@/static/images/index/listIcon.png" mode=""></image>
 				</view>
-				<view class="name">报名班型：C1一对一VIP班</view>
+				<view class="name">报名班型：{{item.className}}</view>
 			</view>
 			<view class="row">
 				<view class="iconImg">
 					<image src="@/static/images/index/radio_nor.png" mode=""></image>
 				</view>
-				<view class="name">最新状态：<text>科目三理论考试已预约</text> </view>
+				<view class="name">最新状态：<text>就先放着不做</text> </view>
 			</view>
 		</view>
 		
@@ -43,6 +43,21 @@
 </template>
 
 <script>
+	export default {
+		props: {
+			item: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -89,8 +104,8 @@
 				display: flex;
 				align-items: center;
 				.iconImg {
-					width: 25rpx;
-					height: 25rpx;
+					width: 32rpx;
+					height: 28rpx;
 				}
 				.name {
 					font-size: 28rpx;
diff --git a/components/pickDateTimer/pickDateTimer - 副本.vue b/components/pickDateTimer/pickDateTimer - 副本.vue
deleted file mode 100644
index feddfd5..0000000
--- a/components/pickDateTimer/pickDateTimer - 副本.vue	
+++ /dev/null
@@ -1,334 +0,0 @@
-<template>
-	<view class="step1">
-		<view class="card">
-			<view class="dateBox">
-				<view class="month-row">
-					<view class="month" @click="show=true">{{ currentMonth }}</view>
-					<view class="arrow">
-						<u-icon name="arrow-down" :size="12" :color="'#1989FA'"></u-icon>
-					</view>
-				</view>
-				<view class="date_row">
-					<view class="icon left" @click="changeDateIndex(-1)">
-						<u-icon name="arrow-left" :size="12" :color="'#fff'"></u-icon>
-					</view>
-					<view class="dateArr" >
-						<view class="dateWidth"  v-for="(item,index) in dateArr[currentDay]" :key="index"  @click="chooseDate(item)" >
-							<view class="date" :class="{active: chooseDay==item.date}">
-								<view class="dian"></view>
-								<view class="week">{{ item.week }}</view>
-								<view class="num">{{ item.num }}</view>
-							</view>
-						</view>
-					</view>
-					<view class="icon right"  @click="changeDateIndex(1)">
-						<u-icon name="arrow-right" :size="12" :color="'#fff'"></u-icon>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<view class="card">
-			<view class="timeCon">
-				<view class="h2">上午</view>
-				<view class="time_box">
-					<view class="time_item" v-for="(item,index) in timerArr" :key="index" @click="chooseTimerClick(item)" :class="{active: item.id==chooseTimerId, disable: item.status!==1}">
-						<view class="lab" v-if="item.status==3">已过期</view>
-						<view class="lab" v-if="item.status==2">已约满</view>
-						<view class="lab" v-if="item.status==1">可预约</view>
-						<view class="time">{{ item.timer }}</view>
-					</view>
-				</view>
-				<view class="h2">下午</view>
-				<view class="time_box">
-					<view class="time_item" v-for="(item,index) in timerArr2" :key="index" @click="chooseTimerClick(item)"  :class="{active: item.id==chooseTimerId,disable: item.status!==1}">
-						<view class="lab" v-if="item.status==3">已过期</view>
-						<view class="lab" v-if="item.status==2">已约满</view>
-						<view class="lab" v-if="item.status==1">可预约</view>
-						<view class="time">{{ item.timer }}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<view class="card">
-			<view class="noDate">
-				<image src="http://192.168.1.20:81/zhili/image/20230927/ad178ebdf5394518b27b020c03ee48ab.png" mode=""></image>
-			</view>
-		</view>
-		
-		<u-datetime-picker
-				:show="show"
-				v-model="chooseMonth"
-				:minDate="minDate"
-				:maxDate="maxDate"
-				mode="year-month"
-				@confirm="changeMonth"
-		></u-datetime-picker>
-	</view>
-</template>
-
-<script>
-	import { getDates, getMonthsBetweenDates } from '@/config/utils.js'
-	import { scheduleClassGetById, scheduleClassGet, getClassDateLimit } from '@/config/api.js'
-	export default {
-		data() {
-			return {
-				maxDate: 0,
-				minDate: 0,
-				monthArr: [],
-				show: false,
-				dateArr: [],
-				currentDay: 0,//当前显示的日期组索引
-				chooseDay: '',
-				chooseMonth: '',
-				timerArr: [
-					{status: 1, timer: '06:00-07:00', id: 1},
-					{status: 2, timer: '06:00-07:00', id: 2},
-					{status: 3, timer: '06:00-07:00', id: 3},
-				],
-				timerArr2: [
-					{status: 1, timer: '06:00-07:00', id: 4},
-					{status: 2, timer: '06:00-07:00', id: 5},
-					{status: 3, timer: '06:00-07:00', id: 6},
-				],
-				chooseTimerId: '',
-				endDate: null,
-				startDate: null,
-			}
-		},
-		mounted() {
-			
-			
-			this.initDate()
-			
-		},
-		computed: {
-			currentMonth() {
-				let tiemr = new Date(this.chooseDay) * 1
-				return this.$u.date(tiemr, 'yyyy.mm')
-			}
-		},
-		methods: {
-			// 获取排课日期范围
-			async getClassDateLimitFn() {
-				let obj = {
-					coachId: this.vuex_coachId
-				}
-				const {data: res} = await getClassDateLimit(obj)
-				this.startDate = res.beginDateLimit
-				this.endDate = res.endDateLimit
-				this.minDate = new Date(res.beginDateLimit)*1 + 86400000
-				this.maxDate = new Date(res.endDateLimit)*1
-			},
-			// 获得排课
-			async scheduleClassGetFn() {
-				let id = this.vuex_userInfo.user.id
-				let coachId = this.vuex_userInfo.user.coachId || '1591015108974329858'
-				let classDate = '2023-10-1'
-				const {data: res} = await scheduleClassGet({id, coachId, classDate: this.chooseDay})
-			},
-			// 初始化日期
-			async initDate() {
-				await this.getClassDateLimitFn()
-				this.dateArr = getDates(this.startDate, this.endDate);
-				console.log('this.dateArr')
-				console.log(this.startDate)
-				console.log(this.endDate)
-				// this.chooseDay = this.dateArr[0][0].date
-				// console.log(this.chooseDay)
-			},
-			// 点击月份
-			changeMonth(val) {
-				let startDate = this.$u.date(val.value, 'yyyy-mm-dd')
-				for(let i=0; i<this.dateArr.length; i++) {
-					for(let j=0; j<this.dateArr[i].length; j++) {
-						let date = this.dateArr[i][j].date
-						if(startDate==date) {
-							this.currentDay = i
-							this.chooseDay = date
-						}
-					}
-				}
-				this.show = false
-			},
-			// 选择时间
-			chooseTimerClick(item) {
-				if(item.status!=1) return this.$u.toast('请选择可预约时间')
-				this.chooseTimerId = item.id
-			},
-			// 选择日期
-			chooseDate(item) {
-				this.chooseDay = item.date
-				this.scheduleClassGetFn()
-				console.log('*****')
-				console.log(this.chooseDay)
-			},
-			changeDateIndex(num) {
-				if(this.currentDay==0&&num==-1) return this.$u.toast('已是可选最小日期')
-				if(this.currentDay==this.dateArr.length-1&&num==1) return this.$u.toast('已是可选最大日期')
-				this.currentDay = this.currentDay + num
-				this.chooseDay = this.dateArr[this.currentDay][0].date
-			},
-			
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.card {
-		width: 100%;
-		margin-bottom: 24rpx;
-		overflow: hidden;
-	  .dateBox {
-		  padding: 36rpx 0 40rpx 0;
-	    .month-row {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-bottom: 36rpx;
-	      .month {
-			font-size: 32rpx;
-			color: $themC;
-	      }
-	
-	      .arrow {
-	       margin-left: 6rpx;
-	      }
-	    }
-	
-	    .date_row {
-			width: 100%;
-			height: 100rpx;
-			position: relative;
-	      .icon {
-			width: 40rpx;
-			height: 40rpx;
-			background: rgba(51,51,51,0.18);
-			backdrop-filter: blur(4rpx);
-			position: absolute;
-			top: 50%;
-			transform: translateY(-50%);
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			border-radius: 50%;
-			&.left {
-				left: 16rpx;
-			}
-			&.right {
-				right: 16rpx;
-			}
-	      }
-	
-	      .dateArr {
-			  display: flex;
-			  padding: 0 70rpx;
-			  // justify-content: space-between;
-			  &.oneDate {
-				  justify-content: center;
-			  }
-			  .dateWidth {
-				  width: 20%;
-				  display: flex;
-				  justify-content: center;
-			  }
-	        .date {
-				width: 74rpx;
-				height: 100rpx;
-				border-radius: 16rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				font-size: 28rpx;
-				color: #333;
-				.dian {
-					width: 12rpx;
-					height: 12rpx;
-					background: #D8D8D8;
-					border-radius: 50%;
-					&.active {
-						background: #1989FA;
-					}
-				}
-				&.active {
-					background: rgba(25,137,250,0.1);
-					border: 2rpx solid #1989FA;
-					color: $themC;
-				}
-	          .week {
-	
-	          }
-	
-	          .num {
-				margin-top: 4rpx;
-	          }
-	        }
-	      }
-	    }
-	  }
-	}
-	
-	.card {
-		.timeCon {
-			padding: 0 24rpx 40rpx 24rpx;
-		}
-	  .h2 {
-			line-height: 90rpx;
-			font-weight: 500;
-			color: #333;
-	  }
-	
-	  .time_box {
-		  display: flex;
-		  flex-wrap: wrap;
-		  justify-content: space-between;
-	    .time_item {
-			width: 30%;
-			height: 120rpx;
-			background: #F8F8F8;
-			border-radius: 12rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			border-radius: 12rpx;
-			color: #333;
-			&.active {
-				background: rgba(25,137,250,0.1);
-				border: 2rpx solid #1989FA;
-				color: $themC;
-			}
-			&.disable {
-				opacity: 0.4;
-			}
-	      .lab {
-			font-size: 28rpx;
-			font-weight: 500;
-	      }
-	
-	      .time {
-			font-size: 24rpx;
-			margin-top: 4rpx;
-	      }
-	    }
-	  }
-	}
-	
-	.btn {
-		width: 47%;
-		height: 72rpx;
-		background: #1989FA;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		color: #fff;
-		text-align: center;
-		line-height: 72rpx;
-		margin: 108rpx auto 50rpx auto;
-	}
-	.noDate {
-		
-	}
-</style>
\ No newline at end of file
diff --git a/components/pickDateTimer/pickDateTimer.vue b/components/pickDateTimer/pickDateTimer.vue
deleted file mode 100644
index 54575ca..0000000
--- a/components/pickDateTimer/pickDateTimer.vue
+++ /dev/null
@@ -1,473 +0,0 @@
-<template>
-	<view class="step1">
-		<view class="card">
-			<view class="dateBox">
-				<view class="month-row">
-					<view class="month" @click="show=true">{{ currentMonth }}</view>
-					<view class="arrow">
-						<u-icon name="arrow-down" :size="12" :color="'#1989FA'"></u-icon>
-					</view>
-				</view>
-				<view class="date_row">
-					<view class="icon left" @click="changeDateIndex(-1)">
-						<u-icon name="arrow-left" :size="12" :color="'#fff'"></u-icon>
-					</view>
-					<view class="dateArr" >
-						<view class="dateWidth"  v-for="(item,index) in dateArr[currentDay]" :key="index"  @click="chooseDate(item)" >
-							<view class="date" :class="{active: chooseDay==item.date}">
-								<!-- <view class="dian"></view> -->
-								<view class="week">{{ item.week }}</view>
-								<view class="num">{{ item.num }}</view>
-							</view>
-						</view>
-					</view>
-					<view class="icon right"  @click="changeDateIndex(1)">
-						<u-icon name="arrow-right" :size="12" :color="'#fff'"></u-icon>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<view class="card">
-			<view class="timeCon">
-				<view class="h2">上午</view>
-				<view class="time_box">
-					<view class="time_item" v-for="(item,index) in timerArr" :key="index" @click="chooseCourse(item)"  :class="{active: courseIds.indexOf(item.classTime)!=-1, disable: item.status==2}" >
-						<view class="flex"  v-if="item.status==0">
-							<view class="lab">{{ item.appointmentAlreadyCount ||0 }} <text>/</text> {{  item.appointmentSumCount}} </view>
-							<view class="iconArrowBg" v-if="item.appointmentAlreadyCount">
-								<u-icon name="arrow-right" :size="10" :color="'#fff'"></u-icon>
-							</view>
-						</view>
-						<view class="lab" v-else>{{ statusTxt[item.status] }}</view>
-						<view class="time">{{ item.classTime }}</view>
-					</view>
-				</view>
-				<view class="h2">下午</view>
-				<view class="time_box">
-					<view class="time_item" v-for="(item,index) in timerArr2" :key="index" @click="chooseCourse(item)"   :class="{active: courseIds.indexOf(item.classTime)!=-1, disable: item.status==2}">
-						<view class="flex"  v-if="item.status==0">
-							<view class="lab">{{ item.appointmentAlreadyCount ||0 }} <text>/</text> {{  item.appointmentSumCount}} </view>
-							<view class="iconArrowBg" v-if="item.appointmentAlreadyCount">
-								<u-icon name="arrow-right" :size="10" :color="'#fff'"></u-icon>
-							</view>
-						</view>
-						<view class="lab" v-else>{{ statusTxt[item.status] }}</view>
-						<view class="time">{{ item.classTime }}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<view class="card">
-			<view class="noDate">
-				<image src="http://192.168.1.20:81/zhili/image/20230927/ad178ebdf5394518b27b020c03ee48ab.png" mode=""></image>
-			</view>
-		</view>
-		
-		<view class="step2" v-if="step==2">
-			<view class="">
-				<u-radio-group
-				    v-model="radioVal"
-				    placement="row"
-					size="14"
-				  >
-				    <u-radio
-				      :customStyle="{marginLeft: '8px'}"
-				      v-for="(item, index) in radioData"
-				      :key="index"
-				      :label="item.name"
-				      :name="item.id"
-					  labelSize="14"
-					  @change="changeRadio"
-				    >
-				    </u-radio>
-				  </u-radio-group>
-			</view>
-			<view class="btnBg" @click="confirmPopup">确认发布</view>
-		</view>
-		
-		<u-datetime-picker
-				:show="show"
-				v-model="chooseMonth"
-				:minDate="minDate"
-				:maxDate="maxDate"
-				mode="year-month"
-				@confirm="changeMonth"
-		></u-datetime-picker>
-	</view>
-</template>
-
-<script>
-	import { getDates, getMonthsBetweenDates } from '@/config/utils.js'
-	import { scheduleClassGetById, scheduleClassGet, getClassDateLimit } from '@/config/api.js'
-	export default {
-		props: ['step'],
-		data() {
-			return {
-				maxDate: 0,
-				minDate: 0,
-				monthArr: [],
-				show: false,
-				dateArr: [],
-				currentDay: 0,//当前显示的日期组索引
-				chooseDay: '',
-				chooseMonth: '',
-				timerArr: [],
-				statusTxt: ['未过期', '未排课', '已过期', '已约满'], //状态0、未过期 1、无排课,2、已过期,3已约满
-				timerArr2: [],
-				chooseTimerId: '',
-				endDate: null,
-				startDate: null,
-				radioData: [
-					{name: '全选', id: 0},
-					{name: '取消选择', id: 1},
-				],
-				courseIds: [],
-				radioVal: '',
-			}
-		},
-		mounted() {
-			this.initDate()
-			// uni.$on('refreshMySchedule',()=>{
-			// 	console.log('没监听到？')
-			// 	this.scheduleClassGetFn()
-			// })
-		},
-		computed: {
-			currentMonth() {
-				let tiemr = new Date(this.chooseDay) * 1
-				return this.$u.date(tiemr, 'yyyy.mm')
-			}
-		},
-		watch: {
-			courseIds: {
-				handler(val) {
-					let allTimer = [...this.timerArr,...this.timerArr2]
-					let total = allTimer.reduce((pre, item)=>{
-						if(item.status==1) {
-							pre.push(item.classTime)
-						}
-						return pre
-					},[])
-					if(total.length==this.courseIds.length) {
-						this.radioVal = 0
-					}
-				}
-			}
-		},
-		methods: {
-			// 获取排课日期范围
-			async getClassDateLimitFn() {
-				let obj = {
-					coachId: this.vuex_coachId
-				}
-				const {data: res} = await getClassDateLimit(obj)
-				this.startDate = new Date(res.beginDateLimit)
-				this.endDate = new Date(res.endDateLimit)
-				this.minDate = new Date(res.beginDateLimit)*1 + 86400000
-				this.maxDate = new Date(res.endDateLimit)*1
-			},
-			// 获得排课
-			async scheduleClassGetFn() {
-				let id = this.vuex_userInfo.user.id
-				let coachId = this.vuex_userInfo.user.coachId
-				let deptId = this.vuex_deptId
-				const {data: res} = await scheduleClassGet({id, coachId, classDate: this.chooseDay, deptId})
-				
-				this.timerArr = res.morningScheduleClass
-				this.timerArr2 = res.afternoonScheduleClass
-				
-				if(this.chooseDay==this.dateArr[0][0].date) {
-					let arr = [...this.timerArr,...this.timerArr2]
-					arr.forEach(item=>{
-						let timer = new Date() * 1
-						let date = this.chooseDay+' '+(item.classTime.split('-')[0])
-						date = date.replace(/-/g,'/'); 
-						let timer2 = new Date(date).getTime();
-						// console.log(timer)
-						// console.log(timer2)
-						// console.log(date)
-						if(timer>timer2) {
-							item.status = 2
-						}
-					})
-				}
-			},
-			// 初始化日期
-			async initDate() {
-				await this.getClassDateLimitFn()
-				this.dateArr = getDates(this.startDate, this.endDate);
-				// let obj = {
-				// 	date: "2023-10-24",
-				// 	num: "24",
-				// 	week: "二"
-				// }
-				// this.dateArr[0][0] = obj
-				this.chooseDay = this.dateArr[0][0].date
-				console.log(this.dateArr)
-				this.scheduleClassGetFn()
-			},
-			// 点击月份
-			changeMonth(val) {
-				let startDate = this.$u.date(val.value, 'yyyy-mm-dd')
-				for(let i=0; i<this.dateArr.length; i++) {
-					for(let j=0; j<this.dateArr[i].length; j++) {
-						let date = this.dateArr[i][j].date
-						if(startDate==date) {
-							this.currentDay = i
-							this.chooseDay = date
-						}
-					}
-				}
-				this.show = false
-			},
-			// 选择日期
-			chooseDate(item) {
-				this.chooseDay = item.date
-				this.scheduleClassGetFn()
-				// console.log('*****')
-				// console.log(this.chooseDay)
-			},
-			changeDateIndex(num) {
-				if(this.currentDay==0&&num==-1) return this.$u.toast('已是可选最小日期')
-				if(this.currentDay==this.dateArr.length-1&&num==1) return this.$u.toast('已是可选最大日期')
-				this.currentDay = this.currentDay + num
-				this.chooseDay = this.dateArr[this.currentDay][0].date
-			},
-			chooseCourse(item) {
-				// this.$goPage('/pages/recordEntry/operate/mySchedule/detail/detail?id='+ item.id)
-				// return
-				if(this.step!=2) {
-					// 如果有预约
-					console.log(item)
-					if(item.appointmentAlreadyCount&&item.status==0) {
-						this.$goPage('/pages/recordEntry/operate/mySchedule/detail/detail?id='+ item.id)
-					}
-				}else {
-					this.radioVal = -1
-					if(item.status!=1) return  this.$u.toast('请选择未排课选项')
-					let index = this.courseIds.indexOf(item.classTime)
-					if(index!==-1) {
-						this.courseIds.splice(index, 1)
-					}else {
-						this.courseIds.push(item.classTime)
-					}
-				}
-				
-			},
-			// 全选
-			changeRadio(val) {
-				if(val==1) {
-					this.courseIds = []
-					this.$emit('cancelChoose')
-					// this.step = 1
-				}else {
-					let allTimer = [...this.timerArr,...this.timerArr2]
-					let total = allTimer.reduce((pre, item)=>{
-						if(item.status==1) {
-							pre.push(item.classTime)
-						}
-						return pre
-					},[])
-					// console.log(total.length)
-					// console.log(this.courseIds.length)
-					if(total.length==this.courseIds.length) {
-						this.courseIds = []
-						// this.$emit('upDateCheck', [])
-					}else {
-						this.courseIds = total
-					}
-				}
-			},
-			// 确认发布
-			confirmPopup() {
-				let pickDate = {
-					timeList: this.courseIds,
-					classDate: this.chooseDay
-				}
-				this.$emit('confirmPopup', pickDate)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.card {
-		width: 100%;
-		margin-bottom: 24rpx;
-		overflow: hidden;
-	  .dateBox {
-		  padding: 36rpx 0 40rpx 0;
-	    .month-row {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-bottom: 36rpx;
-	      .month {
-			font-size: 32rpx;
-			color: $themC;
-	      }
-	
-	      .arrow {
-	       margin-left: 6rpx;
-	      }
-	    }
-	
-	    .date_row {
-			width: 100%;
-			height: 100rpx;
-			position: relative;
-	      .icon {
-			width: 40rpx;
-			height: 40rpx;
-			background: rgba(51,51,51,0.18);
-			backdrop-filter: blur(4rpx);
-			position: absolute;
-			top: 50%;
-			transform: translateY(-50%);
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			border-radius: 50%;
-			&.left {
-				left: 16rpx;
-			}
-			&.right {
-				right: 16rpx;
-			}
-	      }
-	
-	      .dateArr {
-			  display: flex;
-			  padding: 0 70rpx;
-			  // justify-content: space-between;
-			  &.oneDate {
-				  justify-content: center;
-			  }
-			  .dateWidth {
-				  width: 20%;
-				  display: flex;
-				  justify-content: center;
-			  }
-	        .date {
-				width: 74rpx;
-				height: 100rpx;
-				border-radius: 16rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				font-size: 28rpx;
-				color: #333;
-				.dian {
-					width: 12rpx;
-					height: 12rpx;
-					background: #D8D8D8;
-					border-radius: 50%;
-					&.active {
-						background: #1989FA;
-					}
-				}
-				&.active {
-					background: rgba(25,137,250,0.1);
-					border: 2rpx solid #1989FA;
-					color: $themC;
-				}
-	          .week {
-	
-	          }
-	
-	          .num {
-				margin-top: 4rpx;
-	          }
-	        }
-	      }
-	    }
-	  }
-	}
-	
-	.card {
-		.timeCon {
-			padding: 0 24rpx 40rpx 24rpx;
-		}
-	  .h2 {
-			line-height: 90rpx;
-			font-weight: 500;
-			color: #333;
-	  }
-	
-	  .time_box {
-		  display: flex;
-		  flex-wrap: wrap;
-		  justify-content: space-between;
-		  &::after{
-		            display:block;
-					content:"";
-					width: 32%;
-					height:0px;
-		          }
-	    .time_item {
-			width: 30%;
-			height: 120rpx;
-			background: #F8F8F8;
-			border-radius: 12rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			border-radius: 12rpx;
-			margin-bottom: 20rpx;
-			color: #333;
-			&.active {
-				background: rgba(25,137,250,0.1);
-				border: 2rpx solid #1989FA;
-				color: $themC;
-			}
-			&.disable {
-				opacity: 0.4;
-			}
-	      .lab {
-			font-size: 28rpx;
-			font-weight: 500;
-	      }
-	
-	      .time {
-			font-size: 24rpx;
-			margin-top: 4rpx;
-	      }
-	    }
-	  }
-	}
-	
-	.btn {
-		width: 47%;
-		height: 72rpx;
-		background: #1989FA;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		color: #fff;
-		text-align: center;
-		line-height: 72rpx;
-		margin: 108rpx auto 50rpx auto;
-	}
-	.iconArrowBg {
-		background: #D8D8D8;
-		width: 26rpx;
-		height: 26rpx;
-		border-radius: 50%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-left: 4px;
-	}
-	.step2 {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding-bottom: 40px;
-		.btnBg {
-			width: 310rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/config/api.js b/config/api.js
index a74d51a..34bd316 100644
--- a/config/api.js
+++ b/config/api.js
@@ -42,6 +42,19 @@ export const scheduleTemplateGet = (params) => http.get('business/booking/schedu
 export const trainingSiteList = (params) => http.get('business/training-site/list', {params} ,)
 // 获得考场模拟预约记录分页
 export const examSimulationPages = (params) => http.get('business/exam-simulation-record/page', {params} ,)
+// 已报名学员
+export const studentRecordPage = (params) => http.get('business/student-record/page', {params} ,)
+// 驾校班型
+export const schoolClass = (params) => http.get('business/school-class/get', {params} ,)
+// 获得学员档案记录
+export const studentDetail = (params) => http.get('business/student-record/getStudent', {params} ,)
+// 获得教练车信息分页
+export const carPage = (params) => http.get('business/car/page', {params} ,)
+
+
+
+
+
 
 
 
diff --git a/manifest.json b/manifest.json
index 4cdbdbe..de2d416 100644
--- a/manifest.json
+++ b/manifest.json
@@ -82,7 +82,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.1.39:48080/",
+                    "target" : "http://192.168.1.36:48080/",
                     "changeOrigin" : true,
                     "secure" : true,
                     "pathRewrite" : {
diff --git a/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer - 副本.vue b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer - 副本.vue
new file mode 100644
index 0000000..feddfd5
--- /dev/null
+++ b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer - 副本.vue	
@@ -0,0 +1,334 @@
+<template>
+	<view class="step1">
+		<view class="card">
+			<view class="dateBox">
+				<view class="month-row">
+					<view class="month" @click="show=true">{{ currentMonth }}</view>
+					<view class="arrow">
+						<u-icon name="arrow-down" :size="12" :color="'#1989FA'"></u-icon>
+					</view>
+				</view>
+				<view class="date_row">
+					<view class="icon left" @click="changeDateIndex(-1)">
+						<u-icon name="arrow-left" :size="12" :color="'#fff'"></u-icon>
+					</view>
+					<view class="dateArr" >
+						<view class="dateWidth"  v-for="(item,index) in dateArr[currentDay]" :key="index"  @click="chooseDate(item)" >
+							<view class="date" :class="{active: chooseDay==item.date}">
+								<view class="dian"></view>
+								<view class="week">{{ item.week }}</view>
+								<view class="num">{{ item.num }}</view>
+							</view>
+						</view>
+					</view>
+					<view class="icon right"  @click="changeDateIndex(1)">
+						<u-icon name="arrow-right" :size="12" :color="'#fff'"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="card">
+			<view class="timeCon">
+				<view class="h2">上午</view>
+				<view class="time_box">
+					<view class="time_item" v-for="(item,index) in timerArr" :key="index" @click="chooseTimerClick(item)" :class="{active: item.id==chooseTimerId, disable: item.status!==1}">
+						<view class="lab" v-if="item.status==3">已过期</view>
+						<view class="lab" v-if="item.status==2">已约满</view>
+						<view class="lab" v-if="item.status==1">可预约</view>
+						<view class="time">{{ item.timer }}</view>
+					</view>
+				</view>
+				<view class="h2">下午</view>
+				<view class="time_box">
+					<view class="time_item" v-for="(item,index) in timerArr2" :key="index" @click="chooseTimerClick(item)"  :class="{active: item.id==chooseTimerId,disable: item.status!==1}">
+						<view class="lab" v-if="item.status==3">已过期</view>
+						<view class="lab" v-if="item.status==2">已约满</view>
+						<view class="lab" v-if="item.status==1">可预约</view>
+						<view class="time">{{ item.timer }}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="card">
+			<view class="noDate">
+				<image src="http://192.168.1.20:81/zhili/image/20230927/ad178ebdf5394518b27b020c03ee48ab.png" mode=""></image>
+			</view>
+		</view>
+		
+		<u-datetime-picker
+				:show="show"
+				v-model="chooseMonth"
+				:minDate="minDate"
+				:maxDate="maxDate"
+				mode="year-month"
+				@confirm="changeMonth"
+		></u-datetime-picker>
+	</view>
+</template>
+
+<script>
+	import { getDates, getMonthsBetweenDates } from '@/config/utils.js'
+	import { scheduleClassGetById, scheduleClassGet, getClassDateLimit } from '@/config/api.js'
+	export default {
+		data() {
+			return {
+				maxDate: 0,
+				minDate: 0,
+				monthArr: [],
+				show: false,
+				dateArr: [],
+				currentDay: 0,//当前显示的日期组索引
+				chooseDay: '',
+				chooseMonth: '',
+				timerArr: [
+					{status: 1, timer: '06:00-07:00', id: 1},
+					{status: 2, timer: '06:00-07:00', id: 2},
+					{status: 3, timer: '06:00-07:00', id: 3},
+				],
+				timerArr2: [
+					{status: 1, timer: '06:00-07:00', id: 4},
+					{status: 2, timer: '06:00-07:00', id: 5},
+					{status: 3, timer: '06:00-07:00', id: 6},
+				],
+				chooseTimerId: '',
+				endDate: null,
+				startDate: null,
+			}
+		},
+		mounted() {
+			
+			
+			this.initDate()
+			
+		},
+		computed: {
+			currentMonth() {
+				let tiemr = new Date(this.chooseDay) * 1
+				return this.$u.date(tiemr, 'yyyy.mm')
+			}
+		},
+		methods: {
+			// 获取排课日期范围
+			async getClassDateLimitFn() {
+				let obj = {
+					coachId: this.vuex_coachId
+				}
+				const {data: res} = await getClassDateLimit(obj)
+				this.startDate = res.beginDateLimit
+				this.endDate = res.endDateLimit
+				this.minDate = new Date(res.beginDateLimit)*1 + 86400000
+				this.maxDate = new Date(res.endDateLimit)*1
+			},
+			// 获得排课
+			async scheduleClassGetFn() {
+				let id = this.vuex_userInfo.user.id
+				let coachId = this.vuex_userInfo.user.coachId || '1591015108974329858'
+				let classDate = '2023-10-1'
+				const {data: res} = await scheduleClassGet({id, coachId, classDate: this.chooseDay})
+			},
+			// 初始化日期
+			async initDate() {
+				await this.getClassDateLimitFn()
+				this.dateArr = getDates(this.startDate, this.endDate);
+				console.log('this.dateArr')
+				console.log(this.startDate)
+				console.log(this.endDate)
+				// this.chooseDay = this.dateArr[0][0].date
+				// console.log(this.chooseDay)
+			},
+			// 点击月份
+			changeMonth(val) {
+				let startDate = this.$u.date(val.value, 'yyyy-mm-dd')
+				for(let i=0; i<this.dateArr.length; i++) {
+					for(let j=0; j<this.dateArr[i].length; j++) {
+						let date = this.dateArr[i][j].date
+						if(startDate==date) {
+							this.currentDay = i
+							this.chooseDay = date
+						}
+					}
+				}
+				this.show = false
+			},
+			// 选择时间
+			chooseTimerClick(item) {
+				if(item.status!=1) return this.$u.toast('请选择可预约时间')
+				this.chooseTimerId = item.id
+			},
+			// 选择日期
+			chooseDate(item) {
+				this.chooseDay = item.date
+				this.scheduleClassGetFn()
+				console.log('*****')
+				console.log(this.chooseDay)
+			},
+			changeDateIndex(num) {
+				if(this.currentDay==0&&num==-1) return this.$u.toast('已是可选最小日期')
+				if(this.currentDay==this.dateArr.length-1&&num==1) return this.$u.toast('已是可选最大日期')
+				this.currentDay = this.currentDay + num
+				this.chooseDay = this.dateArr[this.currentDay][0].date
+			},
+			
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		width: 100%;
+		margin-bottom: 24rpx;
+		overflow: hidden;
+	  .dateBox {
+		  padding: 36rpx 0 40rpx 0;
+	    .month-row {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-bottom: 36rpx;
+	      .month {
+			font-size: 32rpx;
+			color: $themC;
+	      }
+	
+	      .arrow {
+	       margin-left: 6rpx;
+	      }
+	    }
+	
+	    .date_row {
+			width: 100%;
+			height: 100rpx;
+			position: relative;
+	      .icon {
+			width: 40rpx;
+			height: 40rpx;
+			background: rgba(51,51,51,0.18);
+			backdrop-filter: blur(4rpx);
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border-radius: 50%;
+			&.left {
+				left: 16rpx;
+			}
+			&.right {
+				right: 16rpx;
+			}
+	      }
+	
+	      .dateArr {
+			  display: flex;
+			  padding: 0 70rpx;
+			  // justify-content: space-between;
+			  &.oneDate {
+				  justify-content: center;
+			  }
+			  .dateWidth {
+				  width: 20%;
+				  display: flex;
+				  justify-content: center;
+			  }
+	        .date {
+				width: 74rpx;
+				height: 100rpx;
+				border-radius: 16rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				font-size: 28rpx;
+				color: #333;
+				.dian {
+					width: 12rpx;
+					height: 12rpx;
+					background: #D8D8D8;
+					border-radius: 50%;
+					&.active {
+						background: #1989FA;
+					}
+				}
+				&.active {
+					background: rgba(25,137,250,0.1);
+					border: 2rpx solid #1989FA;
+					color: $themC;
+				}
+	          .week {
+	
+	          }
+	
+	          .num {
+				margin-top: 4rpx;
+	          }
+	        }
+	      }
+	    }
+	  }
+	}
+	
+	.card {
+		.timeCon {
+			padding: 0 24rpx 40rpx 24rpx;
+		}
+	  .h2 {
+			line-height: 90rpx;
+			font-weight: 500;
+			color: #333;
+	  }
+	
+	  .time_box {
+		  display: flex;
+		  flex-wrap: wrap;
+		  justify-content: space-between;
+	    .time_item {
+			width: 30%;
+			height: 120rpx;
+			background: #F8F8F8;
+			border-radius: 12rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			border-radius: 12rpx;
+			color: #333;
+			&.active {
+				background: rgba(25,137,250,0.1);
+				border: 2rpx solid #1989FA;
+				color: $themC;
+			}
+			&.disable {
+				opacity: 0.4;
+			}
+	      .lab {
+			font-size: 28rpx;
+			font-weight: 500;
+	      }
+	
+	      .time {
+			font-size: 24rpx;
+			margin-top: 4rpx;
+	      }
+	    }
+	  }
+	}
+	
+	.btn {
+		width: 47%;
+		height: 72rpx;
+		background: #1989FA;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		color: #fff;
+		text-align: center;
+		line-height: 72rpx;
+		margin: 108rpx auto 50rpx auto;
+	}
+	.noDate {
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
new file mode 100644
index 0000000..1bfa23a
--- /dev/null
+++ b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
@@ -0,0 +1,474 @@
+<template>
+	<view class="step1">
+		<view class="card">
+			<view class="dateBox">
+				<view class="month-row">
+					<view class="month" @click="show=true">{{ currentMonth }}</view>
+					<view class="arrow">
+						<u-icon name="arrow-down" :size="12" :color="'#1989FA'"></u-icon>
+					</view>
+				</view>
+				<view class="date_row">
+					<view class="icon left" @click="changeDateIndex(-1)">
+						<u-icon name="arrow-left" :size="12" :color="'#fff'"></u-icon>
+					</view>
+					<view class="dateArr" >
+						<view class="dateWidth"  v-for="(item,index) in dateArr[currentDay]" :key="index"  @click="chooseDate(item)" >
+							<view class="date" :class="{active: chooseDay==item.date}">
+								<!-- <view class="dian"></view> -->
+								<view class="week">{{ item.week }}</view>
+								<view class="num">{{ item.num }}</view>
+							</view>
+						</view>
+					</view>
+					<view class="icon right"  @click="changeDateIndex(1)">
+						<u-icon name="arrow-right" :size="12" :color="'#fff'"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="card">
+			<view class="timeCon"v-if="timerArr.length||timerArr2.length">
+				<view class="h2" v-if="timerArr.length">上午</view>
+				<view class="time_box">
+					<view class="time_item" v-for="(item,index) in timerArr" :key="index" @click="chooseCourse(item)"  :class="{active: courseIds.indexOf(item.classTime)!=-1, disable: item.status==2}" >
+						<view class="flex"  v-if="item.status==0">
+							<view class="lab">{{ item.appointmentAlreadyCount ||0 }} <text>/</text> {{  item.appointmentSumCount}} </view>
+							<view class="iconArrowBg" v-if="item.appointmentAlreadyCount">
+								<u-icon name="arrow-right" :size="10" :color="'#fff'"></u-icon>
+							</view>
+						</view>
+						<view class="lab" v-else>{{ statusTxt[item.status] }}</view>
+						<view class="time">{{ item.classTime }}</view>
+					</view>
+				</view>
+				<view class="h2" v-if="timerArr2.length">下午</view>
+				<view class="time_box">
+					<view class="time_item" v-for="(item,index) in timerArr2" :key="index" @click="chooseCourse(item)"   :class="{active: courseIds.indexOf(item.classTime)!=-1, disable: item.status==2}">
+						<view class="flex"  v-if="item.status==0">
+							<view class="lab">{{ item.appointmentAlreadyCount ||0 }} <text>/</text> {{  item.appointmentSumCount}} </view>
+							<view class="iconArrowBg" v-if="item.appointmentAlreadyCount">
+								<u-icon name="arrow-right" :size="10" :color="'#fff'"></u-icon>
+							</view>
+						</view>
+						<view class="lab" v-else>{{ statusTxt[item.status] }}</view>
+						<view class="time">{{ item.classTime }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="noDate" v-else>暂无当日计划</view>
+		</view>
+		
+		
+		<view class="step2" v-if="step==2">
+			<view class="">
+				<u-radio-group
+				    v-model="radioVal"
+				    placement="row"
+					size="14"
+				  >
+				    <u-radio
+				      :customStyle="{marginLeft: '8px'}"
+				      v-for="(item, index) in radioData"
+				      :key="index"
+				      :label="item.name"
+				      :name="item.id"
+					  labelSize="14"
+					  @change="changeRadio"
+				    >
+				    </u-radio>
+				  </u-radio-group>
+			</view>
+			<view class="btnBg" @click="confirmPopup">确认发布</view>
+		</view>
+		
+		<u-datetime-picker
+				:show="show"
+				v-model="chooseMonth"
+				:minDate="minDate"
+				:maxDate="maxDate"
+				mode="year-month"
+				@confirm="changeMonth"
+		></u-datetime-picker>
+	</view>
+</template>
+
+<script>
+	import { getDates, getMonthsBetweenDates } from '@/config/utils.js'
+	import { scheduleClassGetById, scheduleClassGet, getClassDateLimit } from '@/config/api.js'
+	export default {
+		props: ['step'],
+		data() {
+			return {
+				maxDate: 0,
+				minDate: 0,
+				monthArr: [],
+				show: false,
+				dateArr: [],
+				currentDay: 0,//当前显示的日期组索引
+				chooseDay: '',
+				chooseMonth: '',
+				timerArr: [],
+				statusTxt: ['未过期', '未排课', '已过期', '已约满'], //状态0、未过期 1、无排课,2、已过期,3已约满
+				timerArr2: [],
+				chooseTimerId: '',
+				endDate: null,
+				startDate: null,
+				radioData: [
+					{name: '全选', id: 0},
+					{name: '取消选择', id: 1},
+				],
+				courseIds: [],
+				radioVal: '',
+			}
+		},
+		mounted() {
+			this.initDate()
+			// uni.$on('refreshMySchedule',()=>{
+			// 	console.log('没监听到？')
+			// 	this.scheduleClassGetFn()
+			// })
+		},
+		computed: {
+			currentMonth() {
+				let tiemr = new Date(this.chooseDay) * 1
+				return this.$u.date(tiemr, 'yyyy.mm')
+			}
+		},
+		watch: {
+			courseIds: {
+				handler(val) {
+					let allTimer = [...this.timerArr,...this.timerArr2]
+					let total = allTimer.reduce((pre, item)=>{
+						if(item.status==1) {
+							pre.push(item.classTime)
+						}
+						return pre
+					},[])
+					if(total.length==this.courseIds.length) {
+						this.radioVal = 0
+					}
+				}
+			}
+		},
+		methods: {
+			// 获取排课日期范围
+			async getClassDateLimitFn() {
+				let obj = {
+					coachId: this.vuex_coachId
+				}
+				const {data: res} = await getClassDateLimit(obj)
+				this.startDate = new Date(res.beginDateLimit)
+				this.endDate = new Date(res.endDateLimit)
+				this.minDate = new Date(res.beginDateLimit)*1 + 86400000
+				this.maxDate = new Date(res.endDateLimit)*1
+			},
+			// 获得排课
+			async scheduleClassGetFn() {
+				let id = this.vuex_userInfo.user.id
+				let coachId = this.vuex_userInfo.user.coachId
+				let deptId = this.vuex_deptId
+				const {data: res} = await scheduleClassGet({id, coachId, classDate: this.chooseDay, deptId})
+				
+				this.timerArr = res.morningScheduleClass
+				this.timerArr2 = res.afternoonScheduleClass
+				
+				if(this.chooseDay==this.dateArr[0][0].date) {
+					let arr = [...this.timerArr,...this.timerArr2]
+					arr.forEach(item=>{
+						let timer = new Date() * 1
+						let date = this.chooseDay+' '+(item.classTime.split('-')[0])
+						date = date.replace(/-/g,'/'); 
+						let timer2 = new Date(date).getTime();
+						// console.log(timer)
+						// console.log(timer2)
+						// console.log(date)
+						if(timer>timer2) {
+							item.status = 2
+						}
+					})
+				}
+			},
+			// 初始化日期
+			async initDate() {
+				await this.getClassDateLimitFn()
+				this.dateArr = getDates(this.startDate, this.endDate);
+				// let obj = {
+				// 	date: "2023-10-24",
+				// 	num: "24",
+				// 	week: "二"
+				// }
+				// this.dateArr[0][0] = obj
+				this.chooseDay = this.dateArr[0][0].date
+				console.log(this.dateArr)
+				this.scheduleClassGetFn()
+			},
+			// 点击月份
+			changeMonth(val) {
+				let startDate = this.$u.date(val.value, 'yyyy-mm-dd')
+				for(let i=0; i<this.dateArr.length; i++) {
+					for(let j=0; j<this.dateArr[i].length; j++) {
+						let date = this.dateArr[i][j].date
+						if(startDate==date) {
+							this.currentDay = i
+							this.chooseDay = date
+						}
+					}
+				}
+				this.show = false
+			},
+			// 选择日期
+			chooseDate(item) {
+				this.chooseDay = item.date
+				this.scheduleClassGetFn()
+				// console.log('*****')
+				// console.log(this.chooseDay)
+			},
+			changeDateIndex(num) {
+				if(this.currentDay==0&&num==-1) return this.$u.toast('已是可选最小日期')
+				if(this.currentDay==this.dateArr.length-1&&num==1) return this.$u.toast('已是可选最大日期')
+				this.currentDay = this.currentDay + num
+				this.chooseDay = this.dateArr[this.currentDay][0].date
+			},
+			chooseCourse(item) {
+				// this.$goPage('/pages/recordEntry/operate/mySchedule/detail/detail?id='+ item.id)
+				// return
+				if(this.step!=2) {
+					// 如果有预约
+					console.log(item)
+					if(item.appointmentAlreadyCount&&item.status==0) {
+						this.$goPage('/pages/recordEntry/operate/mySchedule/detail/detail?id='+ item.id)
+					}
+				}else {
+					this.radioVal = -1
+					if(item.status!=1) return  this.$u.toast('请选择未排课选项')
+					let index = this.courseIds.indexOf(item.classTime)
+					if(index!==-1) {
+						this.courseIds.splice(index, 1)
+					}else {
+						this.courseIds.push(item.classTime)
+					}
+				}
+				
+			},
+			// 全选
+			changeRadio(val) {
+				if(val==1) {
+					this.courseIds = []
+					this.$emit('cancelChoose')
+					// this.step = 1
+				}else {
+					let allTimer = [...this.timerArr,...this.timerArr2]
+					let total = allTimer.reduce((pre, item)=>{
+						if(item.status==1) {
+							pre.push(item.classTime)
+						}
+						return pre
+					},[])
+					// console.log(total.length)
+					// console.log(this.courseIds.length)
+					if(total.length==this.courseIds.length) {
+						this.courseIds = []
+						// this.$emit('upDateCheck', [])
+					}else {
+						this.courseIds = total
+					}
+				}
+			},
+			// 确认发布
+			confirmPopup() {
+				let pickDate = {
+					timeList: this.courseIds,
+					classDate: this.chooseDay
+				}
+				this.$emit('confirmPopup', pickDate)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		width: 100%;
+		margin-bottom: 24rpx;
+		overflow: hidden;
+	  .dateBox {
+		  padding: 36rpx 0 40rpx 0;
+	    .month-row {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-bottom: 36rpx;
+	      .month {
+			font-size: 32rpx;
+			color: $themC;
+	      }
+	
+	      .arrow {
+	       margin-left: 6rpx;
+	      }
+	    }
+	
+	    .date_row {
+			width: 100%;
+			height: 100rpx;
+			position: relative;
+	      .icon {
+			width: 40rpx;
+			height: 40rpx;
+			background: rgba(51,51,51,0.18);
+			backdrop-filter: blur(4rpx);
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border-radius: 50%;
+			&.left {
+				left: 16rpx;
+			}
+			&.right {
+				right: 16rpx;
+			}
+	      }
+	
+	      .dateArr {
+			  display: flex;
+			  padding: 0 70rpx;
+			  // justify-content: space-between;
+			  &.oneDate {
+				  justify-content: center;
+			  }
+			  .dateWidth {
+				  width: 20%;
+				  display: flex;
+				  justify-content: center;
+			  }
+	        .date {
+				width: 74rpx;
+				height: 100rpx;
+				border-radius: 16rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				font-size: 28rpx;
+				color: #333;
+				.dian {
+					width: 12rpx;
+					height: 12rpx;
+					background: #D8D8D8;
+					border-radius: 50%;
+					&.active {
+						background: #1989FA;
+					}
+				}
+				&.active {
+					background: rgba(25,137,250,0.1);
+					border: 2rpx solid #1989FA;
+					color: $themC;
+				}
+	          .week {
+	
+	          }
+	
+	          .num {
+				margin-top: 4rpx;
+	          }
+	        }
+	      }
+	    }
+	  }
+	}
+	
+	.card {
+		.timeCon {
+			padding: 0 24rpx 40rpx 24rpx;
+		}
+	  .h2 {
+			line-height: 90rpx;
+			font-weight: 500;
+			color: #333;
+	  }
+	
+	  .time_box {
+		  display: flex;
+		  flex-wrap: wrap;
+		  justify-content: space-between;
+		  &::after{
+		            display:block;
+					content:"";
+					width: 32%;
+					height:0px;
+		          }
+	    .time_item {
+			width: 30%;
+			height: 120rpx;
+			background: #F8F8F8;
+			border-radius: 12rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			border-radius: 12rpx;
+			margin-bottom: 20rpx;
+			color: #333;
+			&.active {
+				background: rgba(25,137,250,0.1);
+				border: 2rpx solid #1989FA;
+				color: $themC;
+			}
+			&.disable {
+				opacity: 0.4;
+			}
+	      .lab {
+			font-size: 28rpx;
+			font-weight: 500;
+	      }
+	
+	      .time {
+			font-size: 24rpx;
+			margin-top: 4rpx;
+	      }
+	    }
+	  }
+	}
+	
+	.btn {
+		width: 47%;
+		height: 72rpx;
+		background: #1989FA;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		color: #fff;
+		text-align: center;
+		line-height: 72rpx;
+		margin: 108rpx auto 50rpx auto;
+	}
+	.iconArrowBg {
+		background: #D8D8D8;
+		width: 26rpx;
+		height: 26rpx;
+		border-radius: 50%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-left: 4px;
+	}
+	.step2 {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding-bottom: 40px;
+		.btnBg {
+			width: 310rpx;
+		}
+	}
+	.noDate {
+		line-height: 200rpx;
+		text-align: center;
+		font-size: 28rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/recordEntry/operate/mySchedule/mouldEdit/mouldAdd.vue b/pages/recordEntry/operate/mySchedule/mouldEdit/mouldAdd.vue
index 28eb045..799cfb7 100644
--- a/pages/recordEntry/operate/mySchedule/mouldEdit/mouldAdd.vue
+++ b/pages/recordEntry/operate/mySchedule/mouldEdit/mouldAdd.vue
@@ -115,7 +115,7 @@
 				// this.initFormData()
 			},
 			addFn() {
-				let obj = {startTime: '',endTime: '', people: 1, id: new Date() * 1}
+				let obj = {startTime: '',endTime: '', personCount: 1, id: new Date() * 1}
 				this.FormData.scheduleClassTemplateDetailList.push(obj)
 			},
 			deleteFn(id) {
diff --git a/pages/recordEntry/operate/mySchedule/mySchedule.vue b/pages/recordEntry/operate/mySchedule/mySchedule.vue
index 3d52c72..bf81418 100644
--- a/pages/recordEntry/operate/mySchedule/mySchedule.vue
+++ b/pages/recordEntry/operate/mySchedule/mySchedule.vue
@@ -25,9 +25,10 @@
 
 <script>
 	import mySchedulePopup from './comp/mySchedulePopup'
+	import pickDateTimer from './comp/pickDateTimer/pickDateTimer'
 	import { scheduleClassGetById, scheduleClassGet, scheduleClassCreateByTime } from '@/config/api.js'
 	export default {
-		components: { mySchedulePopup },
+		components: { mySchedulePopup,pickDateTimer },
 		data() {
 			return {
 				show: false,
@@ -73,6 +74,7 @@
 				obj.coachId = this.vuex_coachId
 				const res = await scheduleClassCreateByTime(Object.assign(this.pickDate, obj))
 				if(res.code==0)  this.$u.toast('发布排课成功')
+				this.$refs.pickDateRef.courseIds = []
 				// uni.$emit('refreshMySchedule')
 				this.step = 1
 				this.$refs.pickDateRef.scheduleClassGetFn()
diff --git a/pages/recordEntry/student/studentDetail/comp/info.vue b/pages/recordEntry/student/studentDetail/comp/info.vue
index 52b9eaf..ded43a9 100644
--- a/pages/recordEntry/student/studentDetail/comp/info.vue
+++ b/pages/recordEntry/student/studentDetail/comp/info.vue
@@ -3,31 +3,31 @@
 		<view class="card">
 			<view class="li">
 				<view class="val">真实姓名</view>
-				<view class="lab">xxx</view>
+				<view class="lab">{{info.name}}</view>
 			</view>
 			<view class="li">
 				<view class="val">性别</view>
-				<view class="lab">xxx</view>
+				<view class="lab">{{info.sex==1?'男':'女'}}</view>
 			</view>
 			<view class="li">
 				<view class="val">驾名名称</view>
-				<view class="lab">xxx</view>
+				<view class="lab">{{info.schoolName}}</view>
 			</view>
 			<view class="li">
 				<view class="val">学车类型</view>
-				<view class="lab">xxx</view>
+				<view class="lab">{{info.trainType}}</view>
 			</view>
 			<view class="li">
 				<view class="val">学车班型</view>
-				<view class="lab">xxx</view>
+				<view class="lab">{{info.a}}</view>
 			</view>
 			<view class="li">
 				<view class="val">学车教练</view>
-				<view class="lab">xxx</view>
+				<view class="lab">{{info.coachName}}</view>
 			</view>
 			<view class="li">
 				<view class="val">业务类型</view>
-				<view class="lab">xxx</view>
+				<view class="lab">{{info.businessType==0?'初领':info.businessType==1?'增加':'其它'}}</view>
 			</view>
 			<view class="li">
 				<view class="val">是否异地转入</view>
@@ -41,10 +41,6 @@
 				<view class="lab">xxx</view>
 			</view>
 			<view class="li">
-				<view class="val">性别</view>
-				<view class="lab">xxx</view>
-			</view>
-			<view class="li">
 				<view class="val">报名渠道</view>
 				<view class="lab">xxx</view>
 			</view>
@@ -82,6 +78,24 @@
 </template>
 
 <script>
+	import { studentDetail } from '@/config/api.js'
+	export default {
+		props: ['id'],
+		data() {
+			return {
+				info: {}
+			}
+		},
+		mounted() {
+			this.studentDetailFn()
+		},
+		methods: {
+			async studentDetailFn() {
+				const {data: res} = await studentDetail({id: this.id, userId: this.vuex_loginInfo.userId})
+				this.info = res
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/recordEntry/student/studentDetail/studentDetail.vue b/pages/recordEntry/student/studentDetail/studentDetail.vue
index 6844e05..07a520f 100644
--- a/pages/recordEntry/student/studentDetail/studentDetail.vue
+++ b/pages/recordEntry/student/studentDetail/studentDetail.vue
@@ -12,7 +12,7 @@
 				<list></list>
 			</view>
 			<view class="con" v-else>
-				<info/>
+				<info :id="studentId"/>
 			</view>
 		</view>
 	</view>
@@ -67,9 +67,13 @@
 						text: '个人及报名信息',
 						id: 2
 					},
-				]
+				],
+				studentId: ''
 			}
 		},
+		onLoad(options) {
+			this.studentId = options.id
+		},
 		methods: {
 			changeTab(id) {
 				this.currentTab = id
diff --git a/pages/tabbar/student/index.vue b/pages/tabbar/student/index.vue
index 207349c..9957564 100644
--- a/pages/tabbar/student/index.vue
+++ b/pages/tabbar/student/index.vue
@@ -76,8 +76,8 @@
 		</view>
 		
 		<view class="list">
-			<view class="card" @click="$goPage('/pages/recordEntry/student/studentDetail/studentDetail')">
-				<appointItem-student/>
+			<view class="card" @click="$goPage('/pages/recordEntry/student/studentDetail/studentDetail?id='+item.id)" v-for="(item,index) in list" :key="index">
+				<appointItem-student :item="item"/>
 			</view>
 		</view>
 		<UserTab name ='学员'></UserTab>
@@ -85,9 +85,11 @@
 		<u-datetime-picker
 				:show="showDatePicker"
 				mode="date"
+				:minDate="1669341725000"
 				:visibleItemCount="4"
 				:closeOnClickOverlay="false"
 				@confirm="confirmDatePicker"
+				@cancel="showDatePicker=false"
 		></u-datetime-picker>
 		
 		<u-picker :show="showCar" :columns="carArr" keyName="lab" @confirm="confirmCar" @cancel="showCar=false"></u-picker>
@@ -97,6 +99,7 @@
 
 <script>
 	import { imgUrl } from '@/config/site.config'
+	import { studentRecordPage, schoolClass } from '@/config/api.js'
 	import topUserInfo from '../statistics/comp/topUserInfo.vue'
 	export default {
 		components: { topUserInfo },
@@ -124,28 +127,52 @@
 						{lab: 'C2vip',id: 2},
 					]
 				],
+				params: {
+					 "pageNo": 1,  "pageSize": 10,  status: 1, trainType: ''
+				},
+				total: 20,
+				list: []
 			}
 		},
 		onShow() {
 			uni.hideTabBar();
 		},
+		onLoad() {
+			this.studentRecordPageFn()
+			this.schoolClassFn()
+		},
 		methods: {
 			confirmDatePicker(val) {
 				this.showDatePicker = false
-				console.log(val)
-				console.log(uni.$u.date(val.value, 'yyyy-mm-dd'))
-				this.screen.timer = uni.$u.date(val.value, 'yyyy-mm-dd')
-				console.log(this.screen.timer)
+				this.params.applyDate =  this.screen.timer = uni.$u.date(val.value, 'yyyy-mm-dd')
+				this.listInit()
 			},
 			confirmCar(val) {
 				let item = val.value[0]
-				this.screen.car = item.lab
+				this.params.trainType = this.screen.car = item.lab
 				this.showCar = false
+				this.listInit()
 			},
 			confirmClass(val) {
 				let item = val.value[0]
 				this.screen.className = item.lab
+				this.params.schoolClassId = item.id
 				this.showClass = false
+				this.listInit()
+			},
+			// 获取班型
+			async schoolClass() {
+				const {data: res} = await schoolClass({id: this.vuex_userInfo.shoolId})
+			},
+			listInit() {
+				this.params.pageNo = 1
+				this.list = []
+				this.studentRecordPageFn()
+			},
+			async studentRecordPageFn() {
+				const {data: res} = await studentRecordPage(this.params)
+				this.list.push(...res.list)
+				this.total = res.total
 			}
 		}
 	}
@@ -154,6 +181,7 @@
 <style lang="scss" scoped>
 	.pad {
 		min-height: 100vh;
+		padding-bottom: 110rpx;
 	}
 	.card {
 		padding: 0 28rpx;
diff --git a/pages/userCenter/myCar/myCar.vue b/pages/userCenter/myCar/myCar.vue
index ff5e268..aca59b9 100644
--- a/pages/userCenter/myCar/myCar.vue
+++ b/pages/userCenter/myCar/myCar.vue
@@ -12,10 +12,10 @@
 				</view>
 			</view> -->
 			<view class="ul">
-				<view class="card">
-					<view class="li">
-						<view class="plate">浙A.6666</view>
-						<view class="name">大众朗逸</view>
+				<view class="card" v-for="(item,index) in list" :key="index">
+					<view class="li" >
+						<view class="plate">{{item.licnum}}</view>
+						<view class="name">{{item.manufacturer}}</view>
 					</view>
 				</view>
 			</view>
@@ -24,6 +24,29 @@
 </template>
 
 <script>
+	import { carPage } from '@/config/api.js'
+	export default {
+		data() {
+			return {
+				list: [],
+				params: {
+					pageNo: 1,
+					pageSize: 20
+				}
+			}
+		},
+		onLoad() {
+			this.carPageFn()
+		},
+		methods: {
+			async carPageFn() {
+				const {data: res} = await carPage(this.params)
+				this.params.pageNo ++
+				this.list.push(...res.list)
+				console.log(res)
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -53,7 +76,6 @@
 			align-items: center;
 			justify-content: space-between;
 			padding: 0 24rpx;
-			
 			.plate {
 				color: $themC;
 				font-weight: 500;