diff --git a/common/js/mixins.js b/common/js/mixins.js index 1e41859..8c2016c 100644 --- a/common/js/mixins.js +++ b/common/js/mixins.js @@ -7,9 +7,9 @@ export default { identity: state=> state.user.identity, role: state=>state.user.vuex_userInfo.roles, vuex_userInfo: state=>state.user.vuex_userInfo, - vuex_deptId: state=>state.user.vuex_userInfo.user.deptId, - vuex_coachId: state=>state.user.vuex_userInfo.user.coachId, - vuex_schoolId: state=>state.user.vuex_userInfo.user.schoolId, + vuex_deptId: state=>state.user.vuex_userInfo.user.deptId||'', + vuex_coachId: state=>state.user.vuex_userInfo.user.coachId||'', + vuex_schoolId: state=>state.user.vuex_userInfo.user.schoolId||'', vuex_loginInfo: state=>state.user.vuex_loginInfo, }), diff --git a/components/UserTab/UserTab.vue b/components/UserTab/UserTab.vue index 17a18f7..ffc5785 100644 --- a/components/UserTab/UserTab.vue +++ b/components/UserTab/UserTab.vue @@ -43,21 +43,10 @@ // uni.reLaunch({url:url}) }, initTabbar() { - if (uni.getStorageSync('identity') == '实操教练') { + 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/examSimulation/index", - // "text": "考场模拟", - // "iconPath": require("../../static/images/tabbar/kc.png"), - // "selectedIconPath": require("../../static/images/tabbar/kcActive.png") - // }, + { "pagePath": "/pages/tabbar/student/index", "text": "学员", @@ -77,7 +66,7 @@ "selectedIconPath": require("../../static/images/tabbar/wdActive.png") } ] - } else if(uni.getStorageSync('identity') == '校长') { + } else if(this.identity == '校长'|| this.identity == '驾校财务') { //校长 this.list = [{ "pagePath": "/pages/tabbar/statistics/index", @@ -98,7 +87,7 @@ "selectedIconPath": require("../../static/images/tabbar/wdActive.png") } ] - }else if(uni.getStorageSync('identity') == '考场模拟教练'){ + }else if(this.identity == '考场模拟教练'){ this.list = [{ "pagePath": "/pages/tabbar/statistics/index", "text": "统计", @@ -117,7 +106,7 @@ "iconPath": require("../../static/images/tabbar/wd.png"), "selectedIconPath": require("../../static/images/tabbar/wdActive.png") }] - }else if(uni.getStorageSync('identity') == '模拟器老师'){ + }else if(this.identity == '模拟器老师'){ this.list = [ { "pagePath": "/pages/tabbar/examSimulation/index", diff --git a/components/appointItem/appointItem.vue b/components/appointItem/appointItem.vue index 130d58b..b58cdec 100644 --- a/components/appointItem/appointItem.vue +++ b/components/appointItem/appointItem.vue @@ -1,47 +1,50 @@ @@ -50,7 +53,7 @@ props: ['item'], data() { return { - statusTxt: ['未签到', '已签到', '已签退', '旷课'],//0：未签到，1：已签到，2：已签退，3：旷课，9：已取消,示例值(1) + statusTxt: ['未签到', '已签到', '已签退', '旷课'], //0：未签到，1：已签到，2：已签退，3：旷课，9：已取消,示例值(1) } } } @@ -58,58 +61,66 @@ \ No newline at end of file diff --git a/components/timeScreen/timeScreen.vue b/components/timeScreen/timeScreen.vue deleted file mode 100644 index 25ebe92..0000000 --- a/components/timeScreen/timeScreen.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/user-info/user-info.vue b/components/user-info/user-info.vue index 685c724..0107023 100644 --- a/components/user-info/user-info.vue +++ b/components/user-info/user-info.vue @@ -14,10 +14,11 @@ - 暂时没有返回字段 - 驾校校长 - 合作教练 + 没有返回字段 + + {{identity}} @@ -43,7 +44,7 @@ .name_row { display: flex; align-items: center; - padding: 6rpx 20rpx 28rpx 0; + padding: 6rpx 20rpx 0rpx 0; .name { font-size: 48rpx; @@ -61,7 +62,7 @@ .school_row { display: flex; align-items: center; - + padding: 16rpx 0; .icon { width: 28rpx; height: 28rpx; @@ -70,20 +71,21 @@ .schoolName { font-size: 28rpx; padding: 0rpx 20rpx; + width: 0; + flex: 1; } - - .tag { - height: 44rpx; - padding: 0 10rpx; - background: rgba(25, 137, 250, 0.1); - border-radius: 22rpx; - font-size: 20rpx; - line-height: 44rpx; - text-align: center; - color: $themC; - white-space: nowrap; - width: fit-content; - } + } + .tag { + height: 44rpx; + padding: 0 20rpx; + background: rgba(25, 137, 250, 0.1); + border-radius: 22rpx; + font-size: 24rpx; + line-height: 44rpx; + text-align: center; + color: $themC; + white-space: nowrap; + width: fit-content; } } } diff --git a/config/api.js b/config/api.js index 736c70b..979635c 100644 --- a/config/api.js +++ b/config/api.js @@ -72,6 +72,15 @@ export const businessSitePage = (params) => http.get('business/site/page', {para 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('business/student-record/owner', {params}) +// 获得学员档案记录列表 +export const studentList = (params) => http.get('business/student-record/page', {params}) + + + diff --git a/config/site.config.js b/config/site.config.js index aec4aaf..b35fde8 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -3,7 +3,7 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.39:48080/',//非代理地址 - TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.26:48082/', + TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.39:48082/', httpPrefix: 'admin-api/', imgUrl: 'http://jxtemp.oss-cn-hangzhou.aliyuncs.com/defaultImages/admin/bigImg/' }; diff --git a/pages/login/login.vue b/pages/login/login.vue index df70428..6630f3b 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -79,41 +79,15 @@ // alert(item.name) }, chooseIdentity(name) { - // let val = '' - // if(this.FormData.username=='18267103167') { - // val = '实操教练' - // }else if(this.FormData.username=='18267103168') { - // val = '校长' - // }else if (this.FormData.username=='18267103169'){ - // val = '考场模拟教练' - // }else { - // val = '模拟器老师' - // this.$store.commit('upDateIdentity', val) - // uni.reLaunch({ - // url: '/pages/tabbar/examSimulation/index' - // }) - // return false - // } - // if(this.FormData.username=='18267103167') { - // val = '实操教练' - // }else if(this.FormData.username=='18267103168') { - // val = '校长' - // }else if (this.FormData.username=='18267103169'){ - // val = '考场模拟教练' - // }else { - // val = '模拟器老师' - - // } - // if(name=='模拟器老师') { - // this.$store.commit('upDateIdentity', val) - // uni.reLaunch({ - // url: '/pages/tabbar/examSimulation/index' - // }) - // return false - // } + let url = '/pages/tabbar/statistics/index' this.$store.commit('upDateIdentity', name) + if(name=='实操教练') { + url = '/pages/tabbar/student/index' + }else if(name=='模拟器老师') { + url = '/pages/tabbar/examSimulation/index' + } uni.reLaunch({ - url: '/pages/tabbar/statistics/index' + url }) }, confirmArea(val) { diff --git a/pages/recordEntry/student/addStudent/addStudent.vue b/pages/recordEntry/student/addStudent/addStudent.vue index 0e4f99e..8a67825 100644 --- a/pages/recordEntry/student/addStudent/addStudent.vue +++ b/pages/recordEntry/student/addStudent/addStudent.vue @@ -6,12 +6,12 @@ - + - 大乔啊{{index}} + {{item.name}} @@ -26,10 +26,32 @@