diff --git a/components/appointItem-student/appointItem-student.vue b/components/appointItem-student/appointItem-student.vue index c811fbb..0ca7c31 100644 --- a/components/appointItem-student/appointItem-student.vue +++ b/components/appointItem-student/appointItem-student.vue @@ -31,12 +31,12 @@ 报名班型：{{item.className}} - + diff --git a/config/api.js b/config/api.js index 28d95b7..909532a 100644 --- a/config/api.js +++ b/config/api.js @@ -1,3 +1,11 @@ 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,}}) + // 录入签名 + export const addSign = (data) => http.post('business/coach/addSign', data) + // 获得学员动态 + export const getStudentDynamics = (data) => http.post('business/coach/getStudentDynamics', data) + // 登录后查看是不是要签名 + export const needSign = (data) => http.post('business/coach/needSign', data) + + \ No newline at end of file diff --git a/config/site.config.js b/config/site.config.js index e0f9e02..ae290bb 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,8 +2,9 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; // localIp = false module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 - WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.43:8318/',//非代理地址 - TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.39:48082/', + // WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.37:8318/',//非代理地址 + WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',//非代理地址 + // TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.39:48082/', httpPrefix: 'app-api/', imgUrl: 'http://jxtemp.oss-cn-hangzhou.aliyuncs.com/defaultImages/admin/bigImg/' }; diff --git a/config/utils.js b/config/utils.js index 3e30e09..8ffa82c 100644 --- a/config/utils.js +++ b/config/utils.js @@ -1,3 +1,8 @@ +import { WX_API, H5_API, httpPrefix } from './site.config.js'; +var _url = H5_API+ WX_API + httpPrefix + +import store from '@/store/index.js' + export function checkToken(vm) { let expiresTime = vm.$store.state.user.vuex_loginInfo.expiresTime let nowTime = new Date() * 1 @@ -48,4 +53,41 @@ export function getDates(startDate, endDate) { currentDate.setDate(currentDate.getDate() + 1); } return dateRangeFn(dates) -} \ No newline at end of file +} + +export function uploadImgApi(filePath, imgName, imgLink='image') { + console.log(filePath) + let token = 'Bearer '+ store.state.user.vuex_loginInfo.accessToken + let timer = new Date() * 1 + return new Promise((reslove, reject)=>{ + // 上传图片到服务器 + uni.uploadFile({ + url: _url + 'infra/file/upload',//接口 + filePath: filePath,//要上传的图片的本地路径 + name: 'file', + // complain + formData: { + path: imgLink+'/'+ uni.$u.date(timer, 'yyyy-mm-dd')+'/'+timer + '-'+ imgName, + type: 1, + fileSuffix: "png" + }, + header: { + Authorization: token, + // 'tenant-id': '1704459882232553474' + }, + success(res) { + console.log('上传成功??') + console.log(res) + let res2 = JSON.parse(res.data) + reslove(res2.data) + + }, + fail() { + reject(0) + }, + complete: (err)=> { + uni.hideLoading(); + } + }) + }) + } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8f8f08e..970699e 100644 --- a/manifest.json +++ b/manifest.json @@ -87,6 +87,7 @@ "proxy" : { "/api" : { "target" : "http://192.168.1.43:8318/", + // "target" : "http://work.lyjppt.com:8099/", "changeOrigin" : true, "secure" : true, "pathRewrite" : { diff --git a/pages.json b/pages.json index 362bdff..3468660 100644 --- a/pages.json +++ b/pages.json @@ -194,7 +194,15 @@ { "root": "pages/userCenter", "pages": [ - + { + "path": "signature/signature", + "style": { + "navigationBarTitleText": "签名", + // "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, { "path": "forgetPwd/forgetPwd", "style": { @@ -319,7 +327,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "学车小程序", + "navigationBarTitleText": "洛阳学车", "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8" }, @@ -335,12 +343,6 @@ "selectedIconPath": "static/images/tabbar/tjActive.png" }, { - "pagePath": "pages/tabbar/examSimulation/index", - "text": "考场模拟", - "iconPath": "static/images/tabbar/kc.png", - "selectedIconPath": "static/images/tabbar/kcActive.png" - }, - { "pagePath": "pages/tabbar/operateTrain/index", "text": "实操训练", "iconPath": "static/images/tabbar/sc.png", diff --git a/pages/recordEntry/student/studentDetail/comp/list.vue b/pages/recordEntry/student/studentDetail/comp/list.vue index fbd6bd0..4a474c5 100644 --- a/pages/recordEntry/student/studentDetail/comp/list.vue +++ b/pages/recordEntry/student/studentDetail/comp/list.vue @@ -2,34 +2,37 @@ - + + - 模拟器训练已预约 - 2023/08/09 22:52:12 + {{item.dynamicsName}} + {{item.dynamicsTime}} - 模拟驾驶馆：某某模拟驾驶馆 - - - 模拟器编号：00001 + 地点：{{item.examSite}} - 预约时间：2023/08/23 10:00:00 + 时间：{{item.examTime}} + + + + diff --git a/pages/userCenter/scanCode/scanCodeSchool.vue b/pages/userCenter/scanCode/scanCodeSchool.vue index 6e3b36a..defb03b 100644 --- a/pages/userCenter/scanCode/scanCodeSchool.vue +++ b/pages/userCenter/scanCode/scanCodeSchool.vue @@ -41,7 +41,8 @@ qr.data = JSON.stringify({ schoolId, schoolName: encodeURIComponent(schoolName), - QrType: 1 + QrType: 1, + isSchool: 1, }) // 设置二维码大小，必须与canvas设置的宽高一致 diff --git a/pages/userCenter/signature/signature.vue b/pages/userCenter/signature/signature.vue new file mode 100644 index 0000000..fe02a3c --- /dev/null +++ b/pages/userCenter/signature/signature.vue @@ -0,0 +1,253 @@ + + + +