From 2ca9e9d6495feed9c75d59de4a7e6c151d834ec8 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 4 Sep 2024 22:14:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/booksubmit/index.vue |   2 +-
 packages/mybook/detail.vue    | 169 ++++++++++++++++++++++++++--------
 pages/me/index.vue            | 111 ++++++++++++++++++----
 3 files changed, 226 insertions(+), 56 deletions(-)

diff --git a/packages/booksubmit/index.vue b/packages/booksubmit/index.vue
index 878ba6a..4155b93 100644
--- a/packages/booksubmit/index.vue
+++ b/packages/booksubmit/index.vue
@@ -59,7 +59,7 @@
 
 		<u-picker @confirm="dateConfirm" mode="time" v-model="dateShow" :params="dateParams"></u-picker>
 		<timeSlot ref="timeslot" :title="'选择时间段'" :min="hMin" :max="hMax" @confirm="confirmTime"></timeSlot>
-		<u-picker @confirm="siteConfirm" v-model="siteShow" :range="siteList" range-key="name"
+		<u-picker @confirm="siteConfirm" v-model="siteShow" :range="siteList" range-key="real_name"
 			mode="selector"></u-picker>
 
 		<!-- 新增车牌 -->
diff --git a/packages/mybook/detail.vue b/packages/mybook/detail.vue
index 75f375f..19c49f7 100644
--- a/packages/mybook/detail.vue
+++ b/packages/mybook/detail.vue
@@ -46,36 +46,65 @@
 					<text>审核意见</text>
 					<text>{{info.reason}}</text>
 				</view>
-			</view>
-			
-			<view v-if="info.status===1" class="wrap-code">
-				<view  style="display: flex;justify-content: center;margin-top:40rpx">
-					<uqrcode ref="uqrcode" canvas-id="qrcode" :value="info.code" :sizeUnit="'rpx'" :size="400"
-						:options="{ 
-						margin: 10,
-						foregroundImageSrc: '/static/index_icon1.png',
-					 }"></uqrcode>
-				</view>
+			</view>
+
+			<view v-if="info.status===1" class="wrap-code">
+				<view style="display: flex;justify-content: center;margin-top:40rpx" @click="showBigCode">
+					<uqrcode ref="uqrcode" canvas-id="qrcode" :value="code" :sizeUnit="'rpx'" :size="400" :options="{ 
+						margin: 10,
+						foregroundImageSrc: '/static/index_icon1.png',
+					 }"></uqrcode>
+				</view>
+				<view class="modal-xyk-item-reload" @click="refreshCode(book_id)">
+					<!-- <image :src="base.imgHost('me-reload.png')"></image> -->
+					<view>点击刷新二维码</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="bigCode" class="big">
+			<view class="big-wrap">
+				<view class="big-close" @click='bigCode=false'>X</view>
+				<uqrcode ref="uqrcode" canvas-id="qrcode" :value="code" :sizeUnit="'rpx'" :size="500" :options="{ 
+					margin: 10,
+					foregroundImageSrc: '/static/index_icon1.png',
+				 }"></uqrcode>
 			</view>
 		</view>
 	</view>
 </template>
 
-<script>
-	import uqrcode from '@/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.vue'
-	
-	export default {
-		components: {
-			uqrcode
+<script>
+	import uqrcode from '@/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.vue'
+
+	export default {
+		components: {
+			uqrcode
 		},
 		data() {
 			return {
-				info: {},
-				passcode:''
+				info: {},
+				passcode: '',
+				book_id: '',
+				code: '',
+				bigCode: false,
+				timer:null
 			}
 		},
-		onLoad(options) {
-			this.getBookDetail(options.id)
+		onLoad(options) {
+			let that = this
+			this.book_id = options.id
+			this.getBookDetail(options.id)
+			if(!this.timer){
+				this.timer = setInterval(function(){
+					that.refreshCode(that.book_id)
+				},3*60*1000)
+			}
+		},
+		onUnload() {
+			if(this.timer){
+				clearInterval(this.timer)
+				this.timer = null
+			}
 		},
 		methods: {
 			async getBookDetail(id) {
@@ -83,6 +112,22 @@
 					id: id
 				})
 				this.info = res
+				this.code = res.qrcode
+			},
+			async refreshCode(id) {
+				uni.showLoading({
+					title: '...'
+				})
+				const res = await this.$u.api.scheduleDetail({
+					id: id
+				})
+				this.code = res.qrcode
+				setTimeout(function() {
+					uni.hideLoading()
+				}, 500)
+			},
+			showBigCode() {
+				this.bigCode = true
 			},
 			formatTime(val) {
 				if (val) {
@@ -117,24 +162,76 @@
 			&-item {
 				border-radius: 20rpx;
 				background-color: #fff;
-				padding: 30rpx;
-				margin-bottom:30rpx;
-				&>view{
-					font-size: 28rpx;
-					color:#666666;
-					margin-bottom:30rpx;
-					display: flex;
-					&>text:first-child{
-						color:#333;
-						width:180rpx;
-						display: inline-block;
-						font-weight: bold;
-					}
-					&>text:last-child{
-						width: calc(100% - 180rpx);
-					}
+				padding: 30rpx;
+				margin-bottom: 30rpx;
+
+				&>view {
+					font-size: 28rpx;
+					color: #666666;
+					margin-bottom: 30rpx;
+					display: flex;
+
+					&>text:first-child {
+						color: #333;
+						width: 180rpx;
+						display: inline-block;
+						font-weight: bold;
+					}
+
+					&>text:last-child {
+						width: calc(100% - 180rpx);
+					}
 				}
 			}
 		}
+
+		.modal-xyk-item-reload {
+			display: flex;
+			align-items: center;
+			padding: 30rpx 40rpx;
+			font-size: 40rpx;
+			justify-content: center;
+
+			image {
+				width: 27rpx;
+				height: 25rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.big {
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100vh;
+			background-color: rgba(0, 0, 0, 0.7);
+			overflow: scroll;
+
+			&-wrap {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 500rpx;
+				text-align: center;
+				display: flex;
+				justify-content: center;
+				flex-wrap: wrap;
+			}
+
+			&-close {
+				width: 80rpx;
+				height: 80rpx;
+				text-align: center;
+				line-height: 80rpx;
+				color: #fff;
+				background: #6e6e77;
+				border-radius: 80rpx;
+				position: absolute;
+				top: -80rpx;
+				right: 0;
+			}
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 8d7997a..ca21242 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -18,8 +18,8 @@
 									<text>{{course_signs[0]['course'].year?course_signs[0]['course'].year+'年':''}}{{course_signs[0]['course'].type_detail?course_signs[0]['course']['type_detail'].name+"|":''}}{{course_signs[0]['course'].name}}</text>
 								</view>
 							</view>
-							<view class="usercode">
-								<uqrcode ref="uqrcode" canvas-id="qrcode" :value="userInfo.code" :sizeUnit="'rpx'"
+							<view class="usercode" @click="showBigCode=true">
+								<uqrcode v-if="myQrcode" ref="uqrcode" canvas-id="qrcode" :value="myQrcode" :sizeUnit="'rpx'"
 									:size="160" :options="{ 
 									margin: 10,
 									foregroundImageSrc: '/static/index_icon1.png',
@@ -96,8 +96,8 @@
 					<!-- <view style="margin-bottom:40rpx;text-align: center;">电子校园卡</view> -->
 					<view class="modal-xyk-between">
 						<view class="modal-xyk-item">
-							<view style="display: flex;justify-content: center;" @click="refreshCode">
-								<uqrcode ref="uqrcode" canvas-id="qrcode" :value="userInfo.code" :sizeUnit="'rpx'"
+							<view style="display: flex;justify-content: center;" @click="bigCode">
+								<uqrcode v-if="myQrcode" ref="uqrcode" canvas-id="qrcode" :value="myQrcode" :sizeUnit="'rpx'"
 									:size="160" :options="{ 
 									margin: 10,
 									foregroundImageSrc: '/static/index_icon1.png',
@@ -116,7 +116,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="modal-xyk-item-reload" @click="refreshCode">
+					<view class="modal-xyk-item-reload" @click="getQrCode" v-if="myQrcode">
 						<image :src="base.imgHost('me-reload.png')"></image>
 						<view>点击二维码刷新</view>
 					</view>
@@ -152,7 +152,15 @@
 
 			</u-popup>
 		</view>
-
+		<view v-if="showBigCode" class="big">
+			<view class="big-wrap">
+				<view class="big-close" @click='showBigCode=false'>X</view>
+				<uqrcode  v-if="myQrcode" ref="uqrcode" canvas-id="qrcode" :value="myQrcode" :sizeUnit="'rpx'" :size="500" :options="{ 
+					margin: 10,
+					foregroundImageSrc: '/static/index_icon1.png',
+				 }"></uqrcode>
+			</view>
+		</view>
 		<tabbar :currentPage="3"></tabbar>
 	</view>
 </template>
@@ -173,7 +181,10 @@
 				showCard: false,
 				userInfo: {},
 				hasMobile: false,
-				course_signs: []
+				course_signs: [],
+				showBigCode:false,
+				myQrcode:'',
+				timer:null
 			}
 		},
 		onShareAppMessage() {
@@ -190,9 +201,29 @@
 		},
 		onShow() {
 			this.showRegister = false
-			this.getUserInfo()
+			this.getUserInfo()
+			let that = this
+			if(!this.timer){
+				this.timer = setInterval(function(){
+					that.getQrCode()
+				},3*60*1000)
+			}
+		},
+		onLoad() {
+			
+		},
+		onUnload() {
+			if(this.timer){
+				clearInterval(this.timer)
+				this.timer = null
+			}
+		},
+		onHide() {
+			if(this.timer){
+				clearInterval(this.timer)
+				this.timer = null
+			}
 		},
-		onLoad() {},
 		methods: {
 			refreshCode() {
 				if (!this.hasMobile) {
@@ -201,14 +232,10 @@
 					return
 				}
 				this.showCard = true
-				this.$refs.uqrcode.make({
-					success: () => {
-						console.log('生成成功');
-					},
-					fail: err => {
-						console.log(err)
-					}
-				});
+			},
+			bigCode(){
+				this.showCard = false
+				this.showBigCode = true
 			},
 			toUrl(type) {
 				if (type === 1 || type === 2 || type === 3) {
@@ -245,7 +272,8 @@
 					console.log("res", res)
 					this.$u.vuex('vuex_user', res.user)
 					this.userInfo = res.user
-					this.course_signs = res.user.course_signs ? res.user.course_signs : []
+					this.course_signs = res.user.course_signs ? res.user.course_signs : [],
+					this.myQrcode = res.course_signs?res.course_signs.qrcode:''
 					if (this.base.isNull(res.user.mobile)) {
 						this.showRegister = true
 						this.hasMobile = false
@@ -254,6 +282,17 @@
 						this.hasMobile = true
 					}
 				})
+			},
+			getQrCode(){
+				uni.showLoading({
+					title: '...'
+				})
+				this.$u.api.user().then(res => {
+					this.myQrcode = res.course_signs?res.course_signs.qrcode:''
+					setTimeout(function() {
+						uni.hideLoading()
+					}, 500)
+				})
 			},
 			// 去绑定登录
 			goBind() {
@@ -521,7 +560,7 @@
 
 				&>view {
 					text-align: left;
-					margin-bottom: 20rpx;
+					// margin-bottom: 20rpx;
 				}
 
 				&-course {
@@ -536,6 +575,40 @@
 					}
 				}
 			}
+		}
+		.big {
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100vh;
+			background-color: rgba(0, 0, 0, 0.7);
+			overflow: scroll;
+		
+			&-wrap {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 500rpx;
+				text-align: center;
+				display: flex;
+				justify-content: center;
+				flex-wrap: wrap;
+			}
+		
+			&-close {
+				width: 80rpx;
+				height: 80rpx;
+				text-align: center;
+				line-height: 80rpx;
+				color: #fff;
+				background: #6e6e77;
+				border-radius: 80rpx;
+				position: absolute;
+				top: -80rpx;
+				right: 0;
+			}
 		}
 	}
 </style>
\ No newline at end of file