diff --git a/components/appointItem-operate/appointItem-operate.vue b/components/appointItem-operate/appointItem-operate.vue index 9cb9cd0..aad6450 100644 --- a/components/appointItem-operate/appointItem-operate.vue +++ b/components/appointItem-operate/appointItem-operate.vue @@ -63,7 +63,7 @@ props: ['item'], data() { return { - subjectTxt: ['不限', '科目二', '科目三'],//:0：不限；2：科目二；3：科目三 + subjectTxt: ['不限', '', '科目二', '科目三'],//:0：不限；2：科目二；3：科目三 loginStatusTxt: ['未签到', '已签到', '已签退', '已过期', '已取消'],//0：未签到，1：已签到，2：已签退，3：已过期，9：已取消 } } diff --git a/config/api.js b/config/api.js index 909532a..280bd90 100644 --- a/config/api.js +++ b/config/api.js @@ -1,4 +1,4 @@ - 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,}}) + 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/coach/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,}}) // 录入签名 export const addSign = (data) => http.post('business/coach/addSign', data) // 获得学员动态 diff --git a/manifest.json b/manifest.json index 970699e..a272e88 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "recruitStudent", + "name" : "洛阳驾校端", "appid" : "__UNI__BD23957", "description" : "", "versionName" : "1.0.0", @@ -86,7 +86,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.43:8318/", + "target" : "http://192.168.1.38:8318/", // "target" : "http://work.lyjppt.com:8099/", "changeOrigin" : true, "secure" : true, diff --git a/pages/recordEntry/student/studentDetail/comp/info.vue b/pages/recordEntry/student/studentDetail/comp/info.vue index ded43a9..d05435f 100644 --- a/pages/recordEntry/student/studentDetail/comp/info.vue +++ b/pages/recordEntry/student/studentDetail/comp/info.vue @@ -19,7 +19,7 @@ 学车班型 - {{info.a}} + {{info.className}} 学车教练 @@ -31,47 +31,47 @@ 是否异地转入 - xxx + {{ info.transfer==1?'是': '否'}} 报名支付 - + + 费用总计 - xxx + {{$u.utils.priceTo(info.totalAmount)}} 创建时间 - xxx + {{ $u.timeFormat(info.createTime, 'yyyy-mm-dd hh:MM:ss')}} 支付时间 - xxx + {{info.payTime}} 支付方式 - xxx + {{ payTypeTxt[info.payType]}} 支付订单号 - xxx + {{info.orderNo}} 报名流水号 - xxx + {{info.tradeNo}} - + @@ -83,7 +83,8 @@ props: ['id'], data() { return { - info: {} + info: {}, + payTypeTxt: ['', '支付宝', '微信', '银联', 'applypay'],//1：支付宝，2：微信，3：银联，4：applypay，5：数字人民币 } }, mounted() { @@ -91,7 +92,7 @@ }, methods: { async studentDetailFn() { - const {data: res} = await studentDetail({id: this.id, userId: this.vuex_loginInfo.userId}) + const {data: res} = await studentDetail({studentId: this.id, }) this.info = res } } @@ -99,12 +100,15 @@