From 16bad4b6fb6c9e94ec91164d8fcfc7b7d41af2d3 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 2 Dec 2024 15:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/main/order/src/order.vue |  1 -
 h5/pages/user/fenzhen/fenzhen.vue | 36 +++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index a074468..8dbe701 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -141,7 +141,6 @@
 				  code: show_erweima_text,
 				}"></w-qrcode>
 			</view>
-			
 		</uni-popup>
 		<view v-if="!!order_info" class="order_wrapper">
 			<view class="order_status_wrapper" :class="[`status${order_info.status}`]">
diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue
index fefd8ca..755e651 100644
--- a/h5/pages/user/fenzhen/fenzhen.vue
+++ b/h5/pages/user/fenzhen/fenzhen.vue
@@ -26,7 +26,7 @@
 			default: "0",
 		},
 	});
-
+    let erweima_popup=ref(null)
 	const fenzhen_list = ref(false);
 	const check_tip_show = ref(false);
 	const checkTipShow = (show) => {
@@ -45,12 +45,12 @@
 	}
 	const getFenzhenList = async (loading = true) => {
 		if (!!loading) {
-			uni.showLoading();
+		//	uni.showLoading();
 		}
 		const response = await $api("FenzhenList", {
 			id: $props.id,
 		});
-		uni.hideLoading();
+		//uni.hideLoading();
 		$response(response, () => {
 			fenzhen_list.value = response.data;
 			if (!check_tip_show.value) {
@@ -63,7 +63,10 @@
 			setTimeout(() => {
 				if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen') &&
 					!window.location.href.includes('192.168.31.84:5173')) {
-					getFenzhenList(false)
+						if(erweimaText.value==''){
+							getFenzhenList(false)
+						}
+					
 				}
 			}, 1000 * 10)
 		});
@@ -148,6 +151,15 @@
 	const useTimeShow = (time) => {
 		return Math.ceil(Number(time))
 	}
+	let erweimaText=ref('');
+	const erweima_click=(text)=>{
+		erweimaText.value=text
+		erweima_popup.value.open()
+	}
+	const MaskClickFunc=()=>{
+		erweimaText.value=''
+		console.log(erweimaText.value)
+	}
 
 	onShow(() => {
 		if (!!config_ref.value) {
@@ -158,6 +170,16 @@
 <template>
 	<DraggableButton />
 	<view>
+		<uni-popup ref="erweima_popup" type="center" :animation="false" @maskClick="MaskClickFunc()">
+			<view style="background-color: #fff;padding: 20rpx;border-radius: 10rpx;">
+				<view>扫码预约取号</view>
+				<w-qrcode :options="{
+				  level: 4,
+				  size: 460,
+				  code: erweimaText,
+				}"></w-qrcode>
+			</view>
+		</uni-popup>
 		<view v-if="!!$store.config">
 			<view :ref="configRef"></view>
 		</view>
@@ -171,11 +193,11 @@
 		</view>
 		<view v-if="!!fenzhen_list">
 			<view class="order_info_wrapper relative">
-				<w-qrcode v-if="fenzhen_list.info.qrcode" class="absolute top-20rpx right-15rpx b-1 b-dashed b-#000 p-8rpx"
+				<w-qrcode v-if="fenzhen_list.info.qrcode" @click="erweima_click(fenzhen_list.info.kahao)" class="absolute top-20rpx right-15rpx b-1 b-dashed b-#000 p-8rpx"
 					:options="{
 						level: 4,
             size: 130,
-            code: fenzhen_list.info.qrcode,
+            code: fenzhen_list.info.kahao,
           }"></w-qrcode>
 				<view class="person_name_wrapper">
 					<view class="person_name_text_wrapper">{{
@@ -544,7 +566,7 @@
 		line-height: 55rpx;
 		text-align: center;
 		position: relative;
-		z-index: 99;
+		z-index: 20;
 	}
 
 	.time_line_item_time_wrapper {