diff --git a/config/api.js b/config/api.js
index d907426..28d95b7 100644
--- a/config/api.js
+++ b/config/api.js
@@ -1 +1,3 @@
-



var http = uni.$u.http



// 隐私政策

export const getAgreement = (params, config = {}) => http.post('/util/manage/getAgreement.do', params, config)

// 验证码登录

export const loginPwd = (data) => http.post('system/auth/login', data, { custom: { noToken: true , 'Tenant-Id': data['Tenant-Id']}})

// 获取个人信息

export const getUserInfo = (data) => http.post('member/user/get', {header: {'contentType': 1}})

// 退出登录

export const logOut = (data={}) => http.post('member/auth/logout', data, { custom: { noToken: true }})

// 驾校列表分页

export const schoolPage = (params) => http.get('business/school/page', {params: params})

// 获得租户分页

export const tenantPage = (params) => http.get('system/tenant/pages', {params: params, custom: { noToken: true }})

// 实操预约记录分页

export const bookingMasterPage = (params) => http.get('business/booking/master/pageadmin', {params: params, header: {'contentType': 3} })

// 实操预约详情

export const bookingMasterDetail = (params) => http.get('business/booking/master/getadmin', {params: params, header: {'contentType': 3} })

// 获得我的排课详情

export const scheduleClassGetById = (params) => http.get('business/booking/schedule-class/getById', {params: params, })

// 获得我的排课详情预约记录

export const getBookingDetailByClassId = (params) => http.get('business/booking/master/getBookingDetailByClassId', {params: params, })

// 获得排课

export const scheduleClassGet = (params) => http.get('business/booking/schedule-class/getadmin', {params: params, })

// 发布排课计划

export const scheduleClassCreate = (data) => http.post('business/booking/schedule-class/create', data)

// 根据时间段发布排课计划

export const scheduleClassCreateByTime = (data) => http.post('business/booking/schedule-class/createByTime', data)

// 获取排课日期范围

export const getClassDateLimit = (params) => http.get('business/booking/global-config/getClassDateLimitadmin', {params} ,)

// 获取排课时间段范围

export const getClassTimeLimt = (params) => http.get('business/booking/global-config/getClassTimeLimt', {params} ,)

// 创建排课模板

export const getClassCreate = (data) => http.post('business/booking/schedule-template/create', data ,)

// 排课模板分页

export const scheduleTemplatePage = (params) => http.get('business/booking/schedule-template/page', {params} ,)

// 更新排课模版

export const scheduleTemplateUpdate = (data) => http.put('business/booking/schedule-template/update', data ,)

// 获取排课模版

export const scheduleTemplateGet = (params) => http.get('business/booking/schedule-template/get', {params} ,)

// 训练场地

export const trainingSiteList = (params) => http.get('business/training-site/list', {params} ,)

// 获得考场模拟预约记录分页

export const examSimulationPages = (params) => http.get('business/exam-simulation-record/pageadmin', {params} ,)

// 已报名学员

export const studentRecordPage = (params) => http.get('app/student-record/page', {params} ,)

// 驾校班型

export const schoolClass = (params) => http.get('business/school-class/getSchoolByClass', {params} ,)

// 获得学员档案记录

export const studentDetail = (params) => http.get('business/student-record/getStudent', {params} ,)

// 获得教练车信息分页

export const carPage = (params) => http.get('business/car/page', {params} ,)

// 驾校场地分页

export const sitePage = (params) => http.get('business/training-site/page', {params} ,)

// 驾校教练分页

export const coachPage = (params) => http.get('business/coach/pageadmin', {params})

// 驾校教练详情

export const coachDetail = (params) => http.get('business/coach/getadmin', {params})

// 教练评价列表分页

export const coachCommentPage = (params) => http.get('business/appcomplain/pageCoachComment', {params})

// 获得教练员评价条数

export const pageCoachCommentTotal = (params) => http.get('business/appcomplain/pageCoachCommentTotal', {params})

// 获得驾校评价

export const schoolCommentPage = (params) => http.get('business/school-comment/page', {params})

// 获取驾校评价条数

export const commentPagetotal = (params) => http.get('business/school-comment/pagetotal', { params }) 

// 修改用户密码

export const updatePassword = (data) => http.put('system/user/profile/update-password', data)

// 获得考场分页

export const simulationPage = (params) => http.get('business/booking/simulation-record/pageadmin', {params}) 

// 获得考场列分页

export const businessSitePage = (params) => http.get('business/site/page', {params}) 

// 教练绑定教练车

export const coachBinding = (data) => http.post('business/coach/binding', data) 

// 取消绑定教练车

export const coachUnbinding = (data) => http.put('business/coach/unbinding', data) 

// 获得考场车辆管理分页

export const siteCarPage = (params) => http.get('business/site-car/page', {params}) 

// 我的学员(累计学员、今日新增学员、等)

export const studentOwner = (params) => http.get('app/student-record/owner', {params}) 

// 获得学员档案记录列表

export const studentList = (params) => http.get('app/student-record/pageadmin', {params}) 

// 绑定教练

export const studentBindCoach = (data) => http.post('business/student-record/bindCoach', data)

 // 教练二维码生成

 export const getQR = (data) => http.post('business/coach/sign/getQR', data)

 // 获取学习中的学员

 export const signStudentList = (data) => http.post('business/coach/sign/studentList', data)

 // 切换学员计时

 export const changeStudent = (data) => http.post('business/coach/sign/changeStudent', data)

 

 export const getLoginCode = (data) => http.post('member/auth/send-sms-code', data,  { custom: { noToken: true, catch: true,}})

 // 驾校教练使用手机 + 验证码登录

 export const coachSmsLogin = (data) => http.post('member/auth/coach_sms-login', data,  { custom: { noToken: true, catch: true,}})

 















































































\ No newline at end of file
+



var http = uni.$u.http
// 隐私政策
export const getAgreement = (params, config = {}) => http.post('/util/manage/getAgreement.do', params, config)
// 验证码登录
export const loginPwd = (data) => http.post('system/auth/login', data, { custom: { noToken: true , 'Tenant-Id': data['Tenant-Id']}})
// 获取个人信息
export const getUserInfo = (data) => http.post('member/user/get', {header: {'contentType': 1}})
// 退出登录
export const logOut = (data={}) => http.post('member/auth/logout', data, { custom: { noToken: true }})
// 驾校列表分页
export const schoolPage = (params) => http.get('business/school/page', {params: params})
// 获得租户分页
export const tenantPage = (params) => http.get('system/tenant/pages', {params: params, custom: { noToken: true }})
// 实操预约记录分页
export const bookingMasterPage = (params) => http.get('business/booking/master/pageadmin', {params: params, header: {'contentType': 3} })
// 实操预约详情
export const bookingMasterDetail = (params) => http.get('business/booking/master/getadmin', {params: params, header: {'contentType': 3} })
// 获得我的排课详情
export const scheduleClassGetById = (params) => http.get('business/booking/schedule-class/getById', {params: params, })
// 获得我的排课详情预约记录
export const getBookingDetailByClassId = (params) => http.get('business/booking/master/getBookingDetailByClassId', {params: params, })
// 获得排课
export const scheduleClassGet = (params) => http.get('business/booking/schedule-class/getadmin', {params: params, })
// 发布排课计划
export const scheduleClassCreate = (data) => http.post('business/booking/schedule-class/create', data)
// 根据时间段发布排课计划
export const scheduleClassCreateByTime = (data) => http.post('business/booking/schedule-class/createByTime', data)
// 获取排课日期范围
export const getClassDateLimit = (params) => http.get('business/booking/global-config/getClassDateLimitadmin', {params} ,)
// 获取排课时间段范围
export const getClassTimeLimt = (params) => http.get('business/booking/global-config/getClassTimeLimt', {params} ,)
// 创建排课模板
export const getClassCreate = (data) => http.post('business/booking/schedule-template/create', data ,)
// 排课模板分页
export const scheduleTemplatePage = (params) => http.get('business/booking/schedule-template/page', {params} ,)
// 更新排课模版
export const scheduleTemplateUpdate = (data) => http.put('business/booking/schedule-template/update', data ,)
// 获取排课模版
export const scheduleTemplateGet = (params) => http.get('business/booking/schedule-template/get', {params} ,)
// 训练场地
export const trainingSiteList = (params) => http.get('business/training-site/list', {params} ,)
// 获得考场模拟预约记录分页
export const examSimulationPages = (params) => http.get('business/exam-simulation-record/pageadmin', {params} ,)
// 已报名学员
export const studentRecordPage = (params) => http.get('app/student-record/page', {params} ,)
// 驾校班型
export const schoolClass = (params) => http.get('business/school-class/getSchoolByClass', {params} ,)
// 获得学员档案记录
export const studentDetail = (params) => http.get('business/student-record/getStudent', {params} ,)
// 获得教练车信息分页
export const carPage = (params) => http.get('business/car/page', {params} ,)
// 驾校场地分页
export const sitePage = (params) => http.get('business/training-site/page', {params} ,)
// 驾校教练分页
export const coachPage = (params) => http.get('business/coach/pageadmin', {params})
// 驾校教练详情
export const coachDetail = (params) => http.get('business/coach/getadmin', {params})
// 教练评价列表分页
export const coachCommentPage = (params) => http.get('business/appcomplain/pageCoachComment', {params})
// 获得教练员评价条数
export const pageCoachCommentTotal = (params) => http.get('business/appcomplain/pageCoachCommentTotal', {params})
// 获得驾校评价
export const schoolCommentPage = (params) => http.get('business/school-comment/page', {params})
// 获取驾校评价条数
export const commentPagetotal = (params) => http.get('business/school-comment/pagetotal', { params }) 
// 修改用户密码
export const updatePassword = (data) => http.put('system/user/profile/update-password', data)
// 获得考场分页
export const simulationPage = (params) => http.get('business/booking/simulation-record/pageadmin', {params}) 
// 获得考场列分页
export const businessSitePage = (params) => http.get('business/site/page', {params}) 
// 教练绑定教练车
export const coachBinding = (data) => http.post('business/coach/binding', data) 
// 取消绑定教练车
export const coachUnbinding = (data) => http.put('business/coach/unbinding', data) 
// 获得考场车辆管理分页
export const siteCarPage = (params) => http.get('business/site-car/page', {params}) 
// 我的学员(累计学员、今日新增学员、等)
export const studentOwner = (params) => http.get('app/student-record/owner', {params}) 
// 获得学员档案记录列表
export const studentList = (params) => http.get('app/student-record/pageadmin', {params}) 
// 绑定教练
export const studentBindCoach = (data) => http.post('app/student-record/bindCoach', data)
// 教练二维码生成
 export const getQR = (data) => http.post('business/coach/sign/getQR', data)
 // 获取学习中的学员
 export const signStudentList = (data) => http.post('business/coach/sign/studentList', data)
 // 切换学员计时
 export const changeStudent = (data) => http.post('business/coach/sign/changeStudent', data)
// 发送验证码
 export const getLoginCode = (data) => http.post('member/auth/send-sms-code', data,  { custom: { noToken: true, catch: true,}})
 // 驾校教练使用手机 + 验证码登录
 export const coachSmsLogin = (data) => http.post('member/auth/coach_sms-login', data,  { custom: { noToken: true, catch: true,}})
+ 
+ 

 















































































\ No newline at end of file
diff --git a/pages/recordEntry/operate/mySchedule/comp/mySchedulePopup.vue b/pages/recordEntry/operate/mySchedule/comp/mySchedulePopup.vue
index 800d136..7c798d5 100644
--- a/pages/recordEntry/operate/mySchedule/comp/mySchedulePopup.vue
+++ b/pages/recordEntry/operate/mySchedule/comp/mySchedulePopup.vue
@@ -25,12 +25,12 @@
 				<myRadio :radioData="radioData3" :value="form.appointmentSumCount"  @changeRadio="(val)=>{form.appointmentSumCount=val}"/>
 			</view>
 		</view>
-		<view class="item">
+		<!-- <view class="item">
 			<view class="lab">开放范围</view>
 			<view class="val">
 				<myRadio :radioData="radioData4" :value="form.openRange"  @changeRadio="(val)=>{form.openRange=val}"/>
 			</view>
-		</view>
+		</view> -->
 		<view class="btn_row">
 			<view class="btnBorder btn" @click="confirmPopup(0)">取消</view>
 			<view class="btnBg btn"  @click="confirmPopup(1)">确认</view>
diff --git a/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
index e843781..0ca8de5 100644
--- a/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
+++ b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
@@ -33,7 +33,7 @@
 				<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="flex"  v-if="item.status==0||item.status==3">
 							<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>
@@ -46,7 +46,7 @@
 				<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="flex"  v-if="item.status==0||item.status==3">
 							<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>
@@ -236,8 +236,8 @@
 				// return
 				if(this.step!=2) {
 					// 如果有预约
-					console.log(item)
-					if(item.appointmentAlreadyCount&&item.status==0) {
+					console.log('如果有预约')
+					if(item.appointmentAlreadyCount) {
 						this.$goPage('/pages/recordEntry/operate/mySchedule/detail/detail?id='+ item.id)
 					}
 				}else {
diff --git a/pages/recordEntry/operate/mySchedule/plan/plan.vue b/pages/recordEntry/operate/mySchedule/plan/plan.vue
index e5302d2..66e3e12 100644
--- a/pages/recordEntry/operate/mySchedule/plan/plan.vue
+++ b/pages/recordEntry/operate/mySchedule/plan/plan.vue
@@ -75,12 +75,12 @@
 						</view>
 					</view>
 				</view>
-				<view class="row">
+				<!-- <view class="row">
 					<view class="lab">开放范围</view>
 					<view class="rightCon">
 						<myRadio @changeRadio="changeRadioOpenRange"  :radioData="radiolist3" :radioVal="{value: form.openRange}"></myRadio>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			
 			<view class="btnBg" @click="scheduleClassCreateFn">确认发布</view>
@@ -113,7 +113,7 @@
 					classDate: '',
 					carNumber: '',
 					subject: 0, //科目类别:0：不限；2：科目二；3：科目三
-					openRange: '1', //开放范围：0：自己的学员；1：绑定的驾校的学员
+					openRange: '0', //开放范围：0：自己的学员；1：绑定的驾校的学员
 					siteName: '',
 					siteId: ''
 				},
@@ -218,9 +218,9 @@
 			changeRadio(val) {
 				console.log(val)
 			},
-			changeRadioOpenRange(val) {
-				this.form.openRange = val
-			},
+			// changeRadioOpenRange(val) {
+			// 	this.form.openRange = val
+			// },
 			// 选择科目
 			changeRadioSubject(val) {
 				this.form.subject  = val
diff --git a/pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue b/pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue
index d438117..ccba62c 100644
--- a/pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue
+++ b/pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue
@@ -6,15 +6,15 @@
 				<view class="schoolName">{{item.studentName}} <text style="margin-left: 6px;">{{ item.studentPhone}}</text></view>
 			</view>
 			<view class="status">
-				<view class="text" v-if="item.isOnTime">正在计时...</view>
-				<view class="changeBtn btnBg" v-else-if="item.loginStatus==1">计时切换</view>
-				<view class="" v-else>{{loginStatusTxt[item.loginStatus]}}</view>
+				<view class="text" v-if="item.studyStatus=='计时中'">正在计时...</view>
+				<view class="changeBtn btnBg" v-else-if="item.studyStatus=='已签到'">计时切换</view>
+				<view class="" v-else>{{ item.studyStatus }}</view>
 			</view>
 		</view>
 		<view class="target">
-			<view class="row" v-if="item.isOnTime">
+			<view class="row" >
 				<view class="iconImg">
-					<image src="@/static/images/index/timerIcon.png" mode=""></image>
+					<image src="@/static/images/index/home_icon_zhuangtai@2x.png" mode="" style="width: 28rpx;height: 28rpx;"></image>
 				</view>
 				<view class="name" style="color: red;">计时开始时间：14: 50</view>
 			</view>
@@ -22,13 +22,13 @@
 				<view class="iconImg">
 					<image src="@/static/images/index/listIcon.png" mode=""></image>
 				</view>
-				<view class="name">训练科目：{{ subjectTxt[item.subject] }}</view>
+				<view class="name">训练科目：{{ item.subject }}</view>
 			</view>
 			<view class="row">
 				<view class="iconImg">
 					<image src="@/static/images/index/site.png" mode=""></image>
 				</view>
-				<view class="name">预约场地：{{item.siteName}}</view>
+				<view class="name">预约场地：{{item.address}}</view>
 			</view>
 			<view class="row">
 				<view class="iconImg">
@@ -40,7 +40,9 @@
 				<view class="iconImg">
 					<image src="@/static/images/index/timerIcon.png" mode=""></image>
 				</view>
-				<view class="name">预约时间： 14:00 <text>-</text>  18:00</view>
+				<!-- <view class="name">预约时间： 14:00 <text>-</text>  18:00</view> -->
+				<view class="name">预约时间： {{ item.bookingTimeStr }}</view>
+				
 				<!-- <view class="name">预约时间：{{item.classDate}} {{$u.timeFormat(item.startTime, 'hh:MM')}} <text>-</text>  {{$u.timeFormat(item.endTime, 'hh:MM')}}</view> -->
 			</view>
 		</view>
diff --git a/pages/recordEntry/operate/todayStudent/todayStudent.vue b/pages/recordEntry/operate/todayStudent/todayStudent.vue
index 58da2d9..2848fe7 100644
--- a/pages/recordEntry/operate/todayStudent/todayStudent.vue
+++ b/pages/recordEntry/operate/todayStudent/todayStudent.vue
@@ -11,55 +11,14 @@
 
 <script>
 	import appointItem from './comp/appointItem-operate'
-	import { signStudentList, changeStudent  } from '@/config/api.js'
+	import { signStudentList, changeStudent,   } from '@/config/api.js'
 	export default {
 		components: {
 			appointItem
 		},
 		data() {
 			return {
-				list: [
-					{
-						studentName: '王一一',
-						studentPhone: '18267103166',
-						loginStatus: '0',
-						subject: '2',
-						siteName: '长红驾校一号场地',
-						carNumber: '豫A888666',
-						classDate: '2024/02/28',
-						isOnTime: false
-					},
-					{
-						studentName: '王二二',
-						studentPhone: '18267103166',
-						loginStatus: '1',
-						subject: '2',
-						siteName: '长红驾校一号场地',
-						carNumber: '豫A888666',
-						classDate: '2024/02/28',
-						isOnTime: true
-					},
-					{
-						studentName: '王三三',
-						studentPhone: '18267103166',
-						loginStatus: '1',
-						subject: '2',
-						siteName: '长红驾校一号场地',
-						carNumber: '豫A888666',
-						classDate: '2024/02/28',
-						isOnTime: false
-					},
-					{
-						studentName: '王四四',
-						studentPhone: '18267103166',
-						loginStatus: '2',
-						subject: '2',
-						siteName: '长红驾校一号场地',
-						carNumber: '豫A888666',
-						classDate: '2024/02/28',
-						isOnTime: false
-					}
-				]
+				list: []
 			}
 		},
 		onLoad() {
@@ -71,7 +30,7 @@
 		methods: {
 			async signStudentListFn() {
 				const {data: res} = await signStudentList()
-				console.log(res)
+				this.list = res
 			}
 		}
 	}
diff --git a/pages/tabbar/statistics/comp/topUserInfo.vue b/pages/tabbar/statistics/comp/topUserInfo.vue
index c46a738..2a32a12 100644
--- a/pages/tabbar/statistics/comp/topUserInfo.vue
+++ b/pages/tabbar/statistics/comp/topUserInfo.vue
@@ -34,7 +34,6 @@
 	    .schoolName {
 				font-size: 28rpx;
 				padding: 20rpx;
-				max-width: 420rpx;
 				color: #fff;
 	    }
 		
diff --git a/pages/userCenter/scanCode/scanCode.vue b/pages/userCenter/scanCode/scanCode.vue
index a86a412..391ee22 100644
--- a/pages/userCenter/scanCode/scanCode.vue
+++ b/pages/userCenter/scanCode/scanCode.vue
@@ -40,10 +40,11 @@
 			}
 		},
 		onShow() {
-			this.$nextTick(()=>{
-				this.refresh()
-			})
-			this.test()
+			this.refresh()
+			// this.test()
+		},
+		onPullDownRefresh() {
+			this.refresh()
 		},
 		onHide() {
 			console.log('清除了')
diff --git a/static/images/index/home_icon_zhuangtai@2x.png b/static/images/index/home_icon_zhuangtai@2x.png
new file mode 100644
index 0000000..ba1b2d6
Binary files /dev/null and b/static/images/index/home_icon_zhuangtai@2x.png differ