准备删除多余字段

components/appointItem-operate/appointItem-operate.vue

@@ -33,11 +33,11 @@
 			</view>
 			<view class="row">
 				<view class="iconImg">
-					<image src="@/static/images/index/carIcon.png" mode=""></image>
+					<image src="@/static/images/index/timerIcon.png" mode=""></image>
 				</view>
 				<view class="name">预约时间：{{item.classDate}}</view>
 			</view>
-			<view class="row" style="align-items: flex-start;">
+			<view class="row" style="align-items: flex-start;" v-if="item.bookingDetailRespVOS&&item.bookingDetailRespVOS.length">
 				<view class="leftBox">
 					<view class="iconImg">
 						<image src="@/static/images/index/timerIcon.png" mode=""></image>

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": "学员评价",

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)

pages/recordEntry/operate/mySchedule/detail/detail.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="pageBgImg">
-		<topNavbar title="我的排课详情"></topNavbar>
+	<view class="pageBg">
+		<!-- <topNavbar title="我的排课详情"></topNavbar> -->
 		<view class="pad">
 			<view class="card">
 				<view class="info">
@@ -12,10 +12,10 @@
 						<view class="lab">预约车辆：</view>
 						<view class="val">{{ info.carNumber }}</view>
 					</view>
-					<view class="row">
+					<!-- <view class="row">
 						<view class="lab">开放范围：</view>
 						<view class="val">{{ info.openRange==0?'自己的学员': '所有学员'}}</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view class="h1">预约学员</view>

pages/tabbar/mine/index.vue

@@ -11,7 +11,7 @@
 					<view class="cut_text">切换身份</view>
 				</view>
 			</view>
-			<view class="qcode" @click="$goPage('/pages/userCenter/scanCode/scanCode')" >
+			<view class="qcode" @click="goSanCode" >
 				<image src="@/static/images/coach/ic_erweima.png" mode=""></image>
 			</view>
 			<user-info/>
@@ -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'},

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,

pages/tabbar/statistics/comp/operateCoach.vue

@@ -3,13 +3,13 @@
 		<view class="status_bar"></view>
 		<view class="" style="height: 30rpx;"></view>
 		<view class="userInfo">
-			<view class="tit">Hi,大乔教练</view>
+			<view class="tit">Hi,{{ vuex_userInfo.name }}教练</view>
 			<view class="flex userRow">
 				<view class="schoolIcon">
 					<image src="@/static/images/index/ic_jiaxiao.png" mode=""></image>
 				</view>
-				<view class="schoolName oneRowText">翔力驾校</view>
-				<view class="tag">合作教练</view>
+				<view class="schoolName oneRowText">{{  vuex_userInfo.schoolName }}</view>
+				<!-- <view class="tag">合作教练</view> -->
 			</view>
 		</view>
 		<view class="card priceBox">

pages/userCenter/scanCode/scanCode - 副本.vue → pages/userCenter/scanCode/scanCodeSchool.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="pageBgImg">
-		<topNavbar title="个人二维码"></topNavbar>
+		<topNavbar title="驾校二维码"></topNavbar>
 		<view class="pad">
 			<view class="card">
-				<view class="refresh_row" @click="refresh">
+				<!-- <view class="refresh_row" @click="refresh">
 					<view class="text">刷新二维码</view>
 					<view class="icon">
 						<image src="@/static/images/index/ic_shuaxin.png" mode=""></image>
 					</view>
-				</view>
+				</view> -->
 				<view class="qcode">
 					<canvas id="qrcode" canvas-id="qrcode" style="width: 200px;height: 200px;"></canvas>
 				</view>
@@ -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)
 				
 			}
 		}