From 2e54024b4aa1eb7398e995ecf9f59896e8051ffc Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Thu, 21 Mar 2024 15:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=88=A0=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appointItem-operate/appointItem-operate.vue    |   4 +-
 pages.json                                         |  11 +-
 .../comp/pickDateTimer/pickDateTimer.vue           |   1 +
 .../operate/mySchedule/detail/detail.vue           |   8 +-
 pages/tabbar/mine/index.vue                        |  11 +-
 pages/tabbar/operateTrain/index.vue                |  10 +-
 pages/tabbar/statistics/comp/operateCoach.vue      |   6 +-
 pages/userCenter/scanCode/scanCode - 副本.vue    | 111 ---------------------
 pages/userCenter/scanCode/scanCodeSchool.vue       |  93 +++++++++++++++++
 9 files changed, 128 insertions(+), 127 deletions(-)
 delete mode 100644 pages/userCenter/scanCode/scanCode - 副本.vue
 create mode 100644 pages/userCenter/scanCode/scanCodeSchool.vue

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 @@
 			</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>
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 @@
 <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>
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 @@
 					<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'},
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 @@
 		<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">
diff --git a/pages/userCenter/scanCode/scanCode - 副本.vue b/pages/userCenter/scanCode/scanCode - 副本.vue
deleted file mode 100644
index 4cf4373..0000000
--- a/pages/userCenter/scanCode/scanCode - 副本.vue	
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-	<view class="pageBgImg">
-		<topNavbar title="个人二维码"></topNavbar>
-		<view class="pad">
-			<view class="card">
-				<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 class="qcode">
-					<canvas id="qrcode" canvas-id="qrcode" style="width: 200px;height: 200px;"></canvas>
-				</view>
-			</view>
-			<view class="card">
-				<user-info/>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import UQRCode from 'uqrcodejs';
-	var qr = new UQRCode();
-	export default {
-		data() {
-			return {
-				timer: null
-			}
-		},
-		onShow() {
-			this.$nextTick(()=>{
-				this.refresh()
-			})
-			
-		},
-		// 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
-				// 设置二维码内容
-				qr.data = JSON.stringify({
-							  coachId,
-							  schoolId,
-							  nickname: encodeURIComponent(name),
-							  timer: Date.now(),
-							  schoolName: encodeURIComponent(schoolName),
-				})
-						
-				// 设置二维码大小，必须与canvas设置的宽高一致
-				qr.size = 200;
-				qr.margin = 10;
-				qr.errorCorrectLevel = UQRCode.errorCorrectLevel.L
-				// 调用制作二维码方法
-				qr.make()
-				qr.foregroundImageSrc = require('./coach.png')
-				// 获取canvas上下文
-				var canvasContext = uni.createCanvasContext('qrcode', this); // 如果是组件，this必须传入
-				// 设置uQRCode实例的canvas上下文
-				qr.canvasContext = canvasContext;
-				// 调用绘制方法将二维码图案绘制到canvas上
-				qr.drawCanvas();
-				this.timer = setTimeout(()=>{
-					console.log('刷新了')
-					this.refresh()
-				},1000*20)
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.qcode {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 50rpx 0;
-	}
-	.card {
-		padding: 28rpx;
-		margin-bottom: 24rpx;
-	}
-	.refresh_row {
-		display: flex;
-		justify-content: flex-end;
-		align-items: center;
-		padding: 10rpx 0;
-		.text {
-			color: $themC;
-			font-size: 28rpx;
-		}
-		.icon {
-		  width: 24rpx;
-		  height: 24rpx;
-		  margin-left: 6rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/userCenter/scanCode/scanCodeSchool.vue b/pages/userCenter/scanCode/scanCodeSchool.vue
new file mode 100644
index 0000000..6e3b36a
--- /dev/null
+++ b/pages/userCenter/scanCode/scanCodeSchool.vue
@@ -0,0 +1,93 @@
+<template>
+	<view class="pageBgImg">
+		<topNavbar title="驾校二维码"></topNavbar>
+		<view class="pad">
+			<view class="card">
+				<!-- <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 class="qcode">
+					<canvas id="qrcode" canvas-id="qrcode" style="width: 200px;height: 200px;"></canvas>
+				</view>
+			</view>
+			<view class="card">
+				<user-info/>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import UQRCode from 'uqrcodejs';
+	var qr = new UQRCode();
+	export default {
+		data() {
+			return {
+			}
+		},
+		onShow() {
+			this.$nextTick(()=>{
+				this.refresh()
+			})
+			
+		},
+		methods: {
+			refresh() {
+				let { schoolId,   schoolName} =  this.vuex_userInfo
+				// 设置二维码内容
+				qr.data = JSON.stringify({
+							  schoolId,
+							  schoolName: encodeURIComponent(schoolName),
+							  QrType: 1
+				})
+						
+				// 设置二维码大小，必须与canvas设置的宽高一致
+				qr.size = 200;
+				qr.margin = 10;
+				qr.errorCorrectLevel = UQRCode.errorCorrectLevel.L
+				// 调用制作二维码方法
+				qr.make()
+				qr.foregroundImageSrc = require('./coach.png')
+				// 获取canvas上下文
+				var canvasContext = uni.createCanvasContext('qrcode', this); // 如果是组件，this必须传入
+				// 设置uQRCode实例的canvas上下文
+				qr.canvasContext = canvasContext;
+				// 调用绘制方法将二维码图案绘制到canvas上
+				qr.drawCanvas();
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.qcode {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 50rpx 0;
+	}
+	.card {
+		padding: 28rpx;
+		margin-bottom: 24rpx;
+	}
+	.refresh_row {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		padding: 10rpx 0;
+		.text {
+			color: $themC;
+			font-size: 28rpx;
+		}
+		.icon {
+		  width: 24rpx;
+		  height: 24rpx;
+		  margin-left: 6rpx;
+		}
+	}
+</style>
\ No newline at end of file