diff --git a/components/appointItem-operate/appointItem-operate.vue b/components/appointItem-operate/appointItem-operate.vue
index 8248cf0..9cb9cd0 100644
--- a/components/appointItem-operate/appointItem-operate.vue
+++ b/components/appointItem-operate/appointItem-operate.vue
@@ -33,11 +33,11 @@
-
+
预约时间:{{item.classDate}}
-
+
diff --git a/pages.json b/pages.json
index 067dac7..c8b4433 100644
--- a/pages.json
+++ b/pages.json
@@ -170,7 +170,7 @@
"path": "operate/mySchedule/detail/detail",
"style": {
"navigationBarTitleText": "我的排课详情",
- "navigationStyle": "custom",
+ // "navigationStyle": "custom",
"enablePullDownRefresh": true,
"backgroundTextStyle": "dark"
}
@@ -287,6 +287,15 @@
}
},
{
+ "path": "scanCode/scanCodeSchool",
+ "style": {
+ "navigationBarTitleText": "驾校二维码",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+ {
"path": "studentComment/studentComment",
"style": {
"navigationBarTitleText": "学员评价",
diff --git a/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
index 0ca8de5..f9ecd3a 100644
--- a/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
+++ b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
@@ -230,6 +230,7 @@
if(this.currentDay==this.dateArr.length-1&&num==1) return this.$u.toast('已是可选最大日期')
this.currentDay = this.currentDay + num
this.chooseDay = this.dateArr[this.currentDay][0].date
+ this.scheduleClassGetFn()
},
chooseCourse(item) {
// this.$goPage('/pages/recordEntry/operate/mySchedule/detail/detail?id='+ item.id)
diff --git a/pages/recordEntry/operate/mySchedule/detail/detail.vue b/pages/recordEntry/operate/mySchedule/detail/detail.vue
index 74c0287..96d1fa4 100644
--- a/pages/recordEntry/operate/mySchedule/detail/detail.vue
+++ b/pages/recordEntry/operate/mySchedule/detail/detail.vue
@@ -1,6 +1,6 @@
-
-
+
+
@@ -12,10 +12,10 @@
预约车辆:
{{ info.carNumber }}
-
+
预约学员
diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue
index 2e461f6..a066f3f 100644
--- a/pages/tabbar/mine/index.vue
+++ b/pages/tabbar/mine/index.vue
@@ -11,7 +11,7 @@
切换身份
-
+
@@ -60,7 +60,16 @@
// }
this.$goPage(item.url)
},
+ // 点击扫码小图标
+ goSanCode() {
+ if(this.identity=='校长') {
+ this.$goPage('/pages/userCenter/scanCode/scanCodeSchool')
+ }else if(this.identity=='实操教练') {
+ this.$goPage('/pages/userCenter/scanCode/scanCode')
+ }
+ },
initMenu() {
+
if(this.identity=='实操教练') {
this.tabData = [
{text: '上课学员', icon: require('../../../static/images/coach/ic_zhibiao.png'), id: 2, url: '/pages/recordEntry/operate/todayStudent/todayStudent'},
diff --git a/pages/tabbar/operateTrain/index.vue b/pages/tabbar/operateTrain/index.vue
index 85b240e..0fe1c05 100644
--- a/pages/tabbar/operateTrain/index.vue
+++ b/pages/tabbar/operateTrain/index.vue
@@ -77,16 +77,16 @@
data() {
return {
tabArr: [{
- text: '待上课',
+ text: '未签到',
id: 0
},
{
- text: '已完成',
- id: 2
+ text: '已签到',
+ id: 1
},
{
- text: '已取消',
- id: 9
+ text: '已签退',
+ id: 2
},
],//状态:0:未签到,1:已签到,2:已签退,3:已过期,9:已取消,示例值(2)
currentTab: 1,
diff --git a/pages/tabbar/statistics/comp/operateCoach.vue b/pages/tabbar/statistics/comp/operateCoach.vue
index 5b2425f..0a8c9f6 100644
--- a/pages/tabbar/statistics/comp/operateCoach.vue
+++ b/pages/tabbar/statistics/comp/operateCoach.vue
@@ -3,13 +3,13 @@
- Hi,大乔教练
+ Hi,{{ vuex_userInfo.name }}教练
- 翔力驾校
- 合作教练
+ {{ vuex_userInfo.schoolName }}
+
diff --git a/pages/userCenter/scanCode/scanCode - 副本.vue b/pages/userCenter/scanCode/scanCodeSchool.vue
similarity index 74%
rename from pages/userCenter/scanCode/scanCode - 副本.vue
rename to pages/userCenter/scanCode/scanCodeSchool.vue
index 4cf4373..6e3b36a 100644
--- a/pages/userCenter/scanCode/scanCode - 副本.vue
+++ b/pages/userCenter/scanCode/scanCodeSchool.vue
@@ -1,14 +1,14 @@
-
+
-
+
@@ -26,7 +26,6 @@
export default {
data() {
return {
- timer: null
}
},
onShow() {
@@ -35,27 +34,14 @@
})
},
- // onHide() {
- // console.log('清除了')
- // clearTimeout(this.timer)
- // this.timer = null
-
- // },
- beforeDestroy() {
- clearTimeout(this.timer)
- this.timer = null
- // this.refresh = null
- },
methods: {
refresh() {
- let {coachId, name, schoolId, tenantId, schoolName} = this.vuex_userInfo
+ let { schoolId, schoolName} = this.vuex_userInfo
// 设置二维码内容
qr.data = JSON.stringify({
- coachId,
schoolId,
- nickname: encodeURIComponent(name),
- timer: Date.now(),
schoolName: encodeURIComponent(schoolName),
+ QrType: 1
})
// 设置二维码大小,必须与canvas设置的宽高一致
@@ -71,10 +57,6 @@
qr.canvasContext = canvasContext;
// 调用绘制方法将二维码图案绘制到canvas上
qr.drawCanvas();
- this.timer = setTimeout(()=>{
- console.log('刷新了')
- this.refresh()
- },1000*20)
}
}