From a265b2daf74e378e5337689a14e170e2000b1cb1 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Wed, 5 Jun 2024 11:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E6=A0=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/UserTab/UserTab.vue | 12 ++--- config/api.js | 7 ++- manifest.json | 2 +- pages.json | 10 ++++ pages/login/comp/privacyRadion.vue | 4 +- pages/login/login.vue | 8 +-- pages/tabbar/mine/index.vue | 4 +- pages/tabbar/statistics/comp/columnChart.vue | 5 +- pages/tabbar/statistics/comp/comp.scss | 10 ++-- pages/tabbar/statistics/comp/tabDate.vue | 1 - pages/tabbar/statistics/index.vue | 79 +++++++++++++++++++--------- pages/tabbar/student/index.vue | 22 +++++++- pages/userCenter/personaInfo/personaInfo.vue | 19 +++++-- pages/userCenter/signature/signature.vue | 2 +- 14 files changed, 130 insertions(+), 55 deletions(-) diff --git a/components/UserTab/UserTab.vue b/components/UserTab/UserTab.vue index 77eb3c6..867f822 100644 --- a/components/UserTab/UserTab.vue +++ b/components/UserTab/UserTab.vue @@ -46,12 +46,12 @@ if (this.identity == '实操教练') { //教练 this.list = [ - { - "pagePath": "/pages/tabbar/statistics/index", - "text": "统计", - "iconPath": require("../../static/images/tabbar/tj.png"), - "selectedIconPath": require("../../static/images/tabbar/tjActive.png") - }, + // { + // "pagePath": "/pages/tabbar/statistics/index", + // "text": "统计", + // "iconPath": require("../../static/images/tabbar/tj.png"), + // "selectedIconPath": require("../../static/images/tabbar/tjActive.png") + // }, { "pagePath": "/pages/tabbar/student/index", "text": "学员", diff --git a/config/api.js b/config/api.js index 6adcfc1..28fcb03 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/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,}}) + var http = uni.$u.http // 隐私政策 export const getAgreement = (params, config = {}) => http.get('app/student-record/getAgreement', {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) // 获得学员动态 @@ -17,6 +17,11 @@ export const updateRefundStatusOut = (params) => http.get('app/refund/updateRefundStatusOut', {params}) // 学车数据 export const getDrivingLearningData = () => http.get('business/coach/getDrivingLearningData', ) + // 获得最近几日结算统计 + export const getDaySettlement = (data) => http.post('business/coach/getDaySettlement', data) + // 获得过去半年结算统计 + export const getMonthSettlement = (data) => http.post('business/coach/getMonthSettlement', data) + diff --git a/manifest.json b/manifest.json index f25e218..3e98f23 100644 --- a/manifest.json +++ b/manifest.json @@ -86,7 +86,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.40:8318/", + "target" : "http://192.168.1.43:8318/", // "target" : "http://123.6.232.1:8099", "changeOrigin" : true, "secure" : true, diff --git a/pages.json b/pages.json index 3468660..fd203e7 100644 --- a/pages.json +++ b/pages.json @@ -10,6 +10,16 @@ } }, { + "path": "pages/login/privacyAgreement/privacyAgreement", + "style": { + "navigationBarTitleText": "", + // "navigationStyle": "custom", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" + } + }, + + { "path": "pages/tabbar/statistics/index", "style": { "navigationBarTitleText": "首页", diff --git a/pages/login/comp/privacyRadion.vue b/pages/login/comp/privacyRadion.vue index 698e015..df1d380 100644 --- a/pages/login/comp/privacyRadion.vue +++ b/pages/login/comp/privacyRadion.vue @@ -17,8 +17,8 @@ console.log(val) this.$emit('changeRadio', val) }, - async goPage(type) { - this.$goPage('/pages/userCenter/login/privacyAgreement/privacyAgreement?type='+ type) + goPage(type) { + this.$goPage('/pages/login/privacyAgreement/privacyAgreement?type='+ type) } } diff --git a/pages/login/login.vue b/pages/login/login.vue index 90eff8c..8958841 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -111,8 +111,8 @@ mobile: this.FormData.phone, code: this.FormData.code } - const res = await coachSmsLogin(obj) - this.$store.commit('update_vuex_loginInfo',res.data) + const {data: res} = await coachSmsLogin(obj) + this.$store.commit('update_vuex_loginInfo',res) await this.$store.dispatch('getUserInfo') if(res.userType==5) { this.showRole = true @@ -120,7 +120,7 @@ if(res.userType==3) this.$store.commit('upDateIdentity', '实操教练') if(res.userType==4) this.$store.commit('upDateIdentity', '校长') uni.switchTab({ - url: '/pages/tabbar/statistics/index' + url: '/pages/tabbar/student/index' }) } }, @@ -128,7 +128,7 @@ this.showRole = false this.$store.commit('upDateIdentity', item.name) uni.switchTab({ - url: '/pages/tabbar/statistics/index' + url: '/pages/tabbar/student/index' }) // alert(item.name) } diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 4278c23..2aebb26 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -96,7 +96,7 @@ {text: '学员评价', icon: require('../../../static/images/coach/ic_pingjia.png'), id: 5, url: '/pages/userCenter/studentComment/studentComment'}, {text: '教学数据', icon: require('../../../static/images/coach/ic_shuju.png'), id: 6, url: '/pages/userCenter/teachingData/teachingData'}, // {text: '我的签名', icon: require('../../../static/images/coach/ic_daijiesuan.png'), id: 1, url: '/pages/userCenter/signature/signature'}, - {text: '学员退款', icon: require('../../../static/images/coach/ic_tuikuan.png'), id: 7, url: '/pages/userCenter/refund/refund'}, + // {text: '学员退款', icon: require('../../../static/images/coach/ic_tuikuan.png'), id: 7, url: '/pages/userCenter/refund/refund'}, ] }else if(this.identity=='校长'||this.identity=='驾校财务') { @@ -104,7 +104,7 @@ {text: '我的车辆', icon: require('../../../static/images/coach/ic_cheliang.png'), id: 3, url: '/pages/userCenter/myCar/myCar'}, {text: '驾校场地', icon: require('../../../static/images/coach/site.png'), id: 7, url: '/pages/userCenter/schoolSite/schoolSite'}, {text: '驾校教练', icon: require('../../../static/images/coach/coach.png'), id: 7, url: '/pages/userCenter/schoolCoach/schoolCoach'}, - {text: '教学数据', icon: require('../../../static/images/coach/ic_shuju.png'), id: 6, url: '/pages/userCenter/teachingData/teachingData'}, + // {text: '教学数据', icon: require('../../../static/images/coach/ic_shuju.png'), id: 6, url: '/pages/userCenter/teachingData/teachingData'}, {text: '学员评价', icon: require('../../../static/images/coach/ic_pingjia.png'), id: 5, url: '/pages/userCenter/studentComment/studentComment'}, {text: '学员退款', icon: require('../../../static/images/coach/ic_tuikuan.png'), id: 7, url: '/pages/userCenter/refund/refund'}, diff --git a/pages/tabbar/statistics/comp/columnChart.vue b/pages/tabbar/statistics/comp/columnChart.vue index f6217a0..ea9493f 100644 --- a/pages/tabbar/statistics/comp/columnChart.vue +++ b/pages/tabbar/statistics/comp/columnChart.vue @@ -10,9 +10,10 @@