From 47e479ba348dd7daff2aa929ee86c3ff6508cd6b Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 19 Aug 2024 13:53:31 +0800
Subject: [PATCH] uu

---
 components/tpx-bluetooth-native/tpx-bluetooth-native.vue  | 3 +++
 components/tpx-bluetooth-print/render-template-native.vue | 5 ++++-
 components/tpx-bluetooth-print/tpx-bluetooth-print.vue    | 8 +++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/components/tpx-bluetooth-native/tpx-bluetooth-native.vue b/components/tpx-bluetooth-native/tpx-bluetooth-native.vue
index 31f398f..99d2b0c 100644
--- a/components/tpx-bluetooth-native/tpx-bluetooth-native.vue
+++ b/components/tpx-bluetooth-native/tpx-bluetooth-native.vue
@@ -194,6 +194,9 @@ export default {
 			this.deviceName = item.name
 			//连接蓝牙
 			let bl = await this.connect(this.deviceId)
+			if(bl) {
+				this.$emit('onConnected')
+			}
 		},
 		async connect (deviceId) {
 			var _this = this
diff --git a/components/tpx-bluetooth-print/render-template-native.vue b/components/tpx-bluetooth-print/render-template-native.vue
index ac9c6e0..98e8ffe 100644
--- a/components/tpx-bluetooth-print/render-template-native.vue
+++ b/components/tpx-bluetooth-print/render-template-native.vue
@@ -1,5 +1,5 @@
 <template>
-	<tpx-bluetooth-native ref="curBlueTooth">
+	<tpx-bluetooth-native ref="curBlueTooth" @onConnected="handleConnected">
 		<template v-slot:content></template>
 	</tpx-bluetooth-native>
 	
@@ -130,6 +130,9 @@ export default {
 				hideLoading()
 			}
 			return cBl
+		},
+		handleConnected(){
+			this.$emit('onConnected')
 		}
 	}
 }
diff --git a/components/tpx-bluetooth-print/tpx-bluetooth-print.vue b/components/tpx-bluetooth-print/tpx-bluetooth-print.vue
index 1dbe27a..f2ac7cf 100644
--- a/components/tpx-bluetooth-print/tpx-bluetooth-print.vue
+++ b/components/tpx-bluetooth-print/tpx-bluetooth-print.vue
@@ -34,7 +34,7 @@
 		title="打印设备"
 	>	
 		<view style="height: calc(75vh);">
-			<render-template ref="curPrint" @autoConnectCallback="autoConnectCallback"></render-template>
+			<render-template ref="curPrint" @autoConnectCallback="autoConnectCallback" @onConnected="handleConnected"></render-template>
 		</view>
 	</tpx-dialog>
 	
@@ -128,6 +128,7 @@ export default {
 			})
 		},
 		async confirmPrint(){
+			// 触发打印
 			let res = await this.$refs.curPrint.callPrint({
 				imgsRes: this.allImgRes,
 				paperWidth: this.paperWidth,
@@ -137,6 +138,11 @@ export default {
 		autoConnectCallback(bl){
 			// 如果打印设备连接失败 需要显示打印设备弹框
 			this.printModel.show = !bl
+		},
+		// 蓝牙手动连接成功后，触发打印
+		handleConnected() {
+			this.printModel.show = false
+			this.confirmPrint()
 		}
 	}
 }