diff --git a/components/UserTab/UserTab.vue b/components/UserTab/UserTab.vue index f1097d4..8506f0f 100644 --- a/components/UserTab/UserTab.vue +++ b/components/UserTab/UserTab.vue @@ -29,79 +29,82 @@ - if (uni.getStorageSync('identity') == '1') { + if (uni.getStorageSync('identity') == '实操教练') { //教练 _this.list = [{ "pagePath": "/pages/tabbar/statistics/index", "text": "首页", - "iconPath": "../../static/images/tabbar/tj.png", - "selectedIconPath": "../../static/images/tabbar/tjActive.png" + "iconPath": require("../../static/images/tabbar/tj.png"), + "selectedIconPath": require("../../static/images/tabbar/tjActive.png") }, { "pagePath": "/pages/tabbar/examSimulation/index", "text": "考场模拟", - "iconPath": "../../static/images/tabbar/kc.png", - "selectedIconPath": "../../static/images/tabbar/kcActive.png" + "iconPath": require("../../static/images/tabbar/kc.png"), + "selectedIconPath": require("../../static/images/tabbar/kcActive.png") }, { "pagePath": "/pages/tabbar/operateTrain/index", "text": "实操训练", - "iconPath": "../../static/images/tabbar/sc.png", - "selectedIconPath": "../../static/images/tabbar/scActive.png" + "iconPath": require("../../static/images/tabbar/sc.png"), + "selectedIconPath": require("../../static/images/tabbar/scActive.png") }, { "pagePath": "/pages/tabbar/student/index", "text": "学员", - "iconPath": "../../static/images/tabbar/xy.png", - "selectedIconPath": "../../static/images/tabbar/xyActive.png" + "iconPath": require("../../static/images/tabbar/xy.png"), + "selectedIconPath": require("../../static/images/tabbar/xyActive.png") }, { "pagePath": "/pages/tabbar/mine/index", "text": "我的", - "iconPath": "../../static/images/tabbar/wd.png", - "selectedIconPath": "../../static/images/tabbar/wdActive.png" + "iconPath": require("../../static/images/tabbar/wd.png"), + "selectedIconPath": require("../../static/images/tabbar/wdActive.png") } ] - } else if(uni.getStorageSync('identity') == '2') { + } else if(uni.getStorageSync('identity') == '校长') { //校长 _this.list = [{ "pagePath": "/pages/tabbar/statistics/index", "text": "统计", - "iconPath": "../../static/images/tabbar/tj.png", - "selectedIconPath": "../../static/images/tabbar/tjActive.png" + "iconPath": require("../../static/images/tabbar/tj.png"), + "selectedIconPath": require("../../static/images/tabbar/tjActive.png") }, { "pagePath": "/pages/tabbar/student/index", "text": "学员", - "iconPath": "../../static/images/tabbar/xy.png", - "selectedIconPath": "../../static/images/tabbar/xyActive.png" + "iconPath": require("../../static/images/tabbar/xy.png"), + "selectedIconPath": require("../../static/images/tabbar/xyActive.png") }, { "pagePath": "/pages/tabbar/mine/index", "text": "我的", - "iconPath": "../../static/images/tabbar/wd.png", - "selectedIconPath": "../../static/images/tabbar/wdActive.png" + "iconPath": require("../../static/images/tabbar/wd.png"), + "selectedIconPath": require("../../static/images/tabbar/wdActive.png") } ] - }else { + }else if(uni.getStorageSync('identity') == '考场模拟教练'){ _this.list = [{ "pagePath": "/pages/tabbar/statistics/index", "text": "统计", - "iconPath": "../../static/images/tabbar/tj.png", - "selectedIconPath": "../../static/images/tabbar/tjActive.png" + "iconPath": require("../../static/images/tabbar/tj.png"), + "selectedIconPath": require("../../static/images/tabbar/tjActive.png") }, { "pagePath": "/pages/tabbar/examSimulation/index", "text": "预约记录", - "iconPath": "../../static/images/tabbar/kc.png", - "selectedIconPath": "../../static/images/tabbar/kcActive.png" + "iconPath": require("../../static/images/tabbar/kc.png"), + "selectedIconPath": require("../../static/images/tabbar/kcActive.png") }, { "pagePath": "/pages/tabbar/mine/index", "text": "我的", - "iconPath": "../../static/images/tabbar/wd.png", - "selectedIconPath": "../../static/images/tabbar/wdActive.png" + "iconPath": require("../../static/images/tabbar/wd.png"), + "selectedIconPath": require("../../static/images/tabbar/wdActive.png") }] + }else { + // 模拟器老师 + } }, methods: { diff --git a/components/timeScreen/timeScreen.vue b/components/timeScreen/timeScreen.vue index 3bae95f..25ebe92 100644 --- a/components/timeScreen/timeScreen.vue +++ b/components/timeScreen/timeScreen.vue @@ -42,10 +42,16 @@ currentPopTab: 1, showDatePicker: false, value1: '', - currentBtnDate: '' + currentBtnDate: '', + date1: '', + date2: '', + date3: '', } }, methods: { + changePopTab(num) { + this.currentPopTab = num + }, // 1打开时间选择器 showDatePickerFn(num) { this.showDate = false @@ -60,7 +66,27 @@ date = uni.$u.date(val.value, 'yyyy-mm') } this['date'+this.currentBtnDate] = date + this.$emit('confirmDatePicker') }, + // 3确定筛选时间 + selectDateClick() { + let obj = { + date1: this.date1, + date2: this.date2, + date3: this.date3, + } + if(this.currentPopTab==2) { + if(!this.date2) return this.$u.toast('请选择开始时间') + if(!this.date3) return this.$u.toast('请选择结束时间') + if(new Date(this.date2)*1>new Date(this.date3)*1) return this.$u.toast('开始时间不能大于结束时间') + delete obj.date1 + }else { + if(!this.date1) return this.$u.toast('请选择时间') + delete obj.date2 + delete obj.date3 + } + this.$emit('selectDateClick', obj) + } } } diff --git a/components/user-info/user-info.vue b/components/user-info/user-info.vue index 01d517a..b8cef7e 100644 --- a/components/user-info/user-info.vue +++ b/components/user-info/user-info.vue @@ -5,7 +5,7 @@ - 大乔教练 + 大乔{{identity=='校长'?'校长': '教练'}} @@ -15,7 +15,8 @@ 翔力驾校 - 合作教练 + 驾校校长 + 合作教练 diff --git a/pages/tabbar/examSimulation/comp/examSimulation.vue b/pages/tabbar/examSimulation/comp/simulation.vue similarity index 66% rename from pages/tabbar/examSimulation/comp/examSimulation.vue rename to pages/tabbar/examSimulation/comp/simulation.vue index 9218166..b2b03e2 100644 --- a/pages/tabbar/examSimulation/comp/examSimulation.vue +++ b/pages/tabbar/examSimulation/comp/simulation.vue @@ -1,7 +1,7 @@ @@ -43,7 +59,11 @@ {id: 1, text: '全部'}, {id: 2, text: '科目二'}, {id: 3, text: '科目三'}, - ] + ], + showDate: false, + params: { + car: 1, + } } }, methods: { @@ -55,21 +75,57 @@ this.currentNav = item.id }, goPage() { - console.log('------------') this.$goPage('/pages/recordEntry/examine/examineRecord/detail/detail') + }, + confirmDatePicker() { + this.showDate = true + }, + // 选择筛选日期 + selectDateClick(val) { + console.log(val) + this.showDate = false + }, + screenCarFn(num) { + this.params.car = num } } }