From 24e9f3284cd2c522dbc602eeab68c5383215d971 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Tue, 19 Mar 2024 18:52:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=8E=92=E8=AF=BE=E6=97=B6=E5=8F=91=E5=B8=83=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/api.js | 4 +- .../operate/mySchedule/comp/mySchedulePopup.vue | 4 +- .../comp/pickDateTimer/pickDateTimer.vue | 8 ++-- pages/recordEntry/operate/mySchedule/plan/plan.vue | 12 +++--- .../todayStudent/comp/appointItem-operate.vue | 18 ++++---- .../operate/todayStudent/todayStudent.vue | 47 ++------------------- pages/tabbar/statistics/comp/topUserInfo.vue | 1 - pages/userCenter/scanCode/scanCode.vue | 9 ++-- static/images/index/home_icon_zhuangtai@2x.png | Bin 0 -> 597 bytes 9 files changed, 33 insertions(+), 70 deletions(-) create mode 100644 static/images/index/home_icon_zhuangtai@2x.png 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 @@ - + 取消 确认 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 @@ 上午 - + {{ item.appointmentAlreadyCount ||0 }} / {{ item.appointmentSumCount}} @@ -46,7 +46,7 @@ 下午 - + {{ item.appointmentAlreadyCount ||0 }} / {{ item.appointmentSumCount}} @@ -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 @@ - + 确认发布 @@ -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 @@ {{item.studentName}} {{ item.studentPhone}} - 正在计时... - 计时切换 - {{loginStatusTxt[item.loginStatus]}} + 正在计时... + 计时切换 + {{ item.studyStatus }} - + - + 计时开始时间:14: 50 @@ -22,13 +22,13 @@ - 训练科目:{{ subjectTxt[item.subject] }} + 训练科目:{{ item.subject }} - 预约场地:{{item.siteName}} + 预约场地:{{item.address}} @@ -40,7 +40,9 @@ - 预约时间: 14:00 - 18:00 + + 预约时间: {{ item.bookingTimeStr }} + 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 @@