From 39a47d3a76c5c43497769ffe10dad883d7eb7427 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 23 Jun 2024 12:09:19 +0800
Subject: [PATCH] uu

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

diff --git a/components/tpx-bluetooth-native/tpx-bluetooth-native.vue b/components/tpx-bluetooth-native/tpx-bluetooth-native.vue
index 166d470..76643c9 100644
--- a/components/tpx-bluetooth-native/tpx-bluetooth-native.vue
+++ b/components/tpx-bluetooth-native/tpx-bluetooth-native.vue
@@ -3,9 +3,9 @@
 		<template v-slot:header>
 			<view class="blcok-white" style="margin-top: 0;padding-top: 0;padding-bottom: 0;">
 				<view >
-					<u-row custom-style="gap: 10rpx;">
+					<u-row custom-style="gap: 15rpx;">
 						<u-button @click="discoveryPrinter">
-							{{searchLoading?'搜索中...':'搜索周边设备'}}
+							{{searchLoading?'搜索中...':'搜索设备'}}
 							
 						</u-button>
 						<u-button @click="stopDiscoveryPrinter">停止搜索</u-button>
@@ -200,6 +200,7 @@ export default {
 			console.log("连接蓝牙 设备=====", deviceId)
 			let bl = await new Promise((resolve)=> {
 				bluetoothTool.connDevice(deviceId,(result) => {
+					console.log('bluetoothTool.connDevice result ====== ', result)
 					let lb = !!result
 					_this.isStateOn = lb
 					resolve(lb)
diff --git a/components/tpx-bluetooth-print/render-template-native.vue b/components/tpx-bluetooth-print/render-template-native.vue
index 45b7c41..caff791 100644
--- a/components/tpx-bluetooth-print/render-template-native.vue
+++ b/components/tpx-bluetooth-print/render-template-native.vue
@@ -4,7 +4,6 @@
 			<u-button @click="handlePrint" type="primary">确认打印</u-button>
 		</template>
 		<template v-slot:content>
-			<view class="pt-20 pb-10">打印内容</view>
 			<view class="canvas-con">
 				<canvas :canvas-id="canvasId" :style="{width:canvasWidth + 'px', height: canvasHeight + 'px'}"></canvas>
 			</view>			
@@ -154,12 +153,11 @@ export default {
 <style scoped lang="scss">
 	.canvas-con{
 		width: 100%;
-		overflow: auto;
 	}
 	/*图片隐藏到窗口外*/
 	canvas {
-		// position: absolute;
-		// z-index: -999;
-		// top: -999px;
+		position: absolute;
+		z-index: -999;
+		top: -999px;
 	}
 </style>
\ No newline at end of file
diff --git a/components/tpx-bluetooth/tpx-bluetooth.vue b/components/tpx-bluetooth/tpx-bluetooth.vue
index 3567cac..e4e25d8 100644
--- a/components/tpx-bluetooth/tpx-bluetooth.vue
+++ b/components/tpx-bluetooth/tpx-bluetooth.vue
@@ -3,9 +3,9 @@
 		<template v-slot:header>
 			<view class="blcok-white" style="margin-top: 0;">
 				<view >
-					<u-row custom-style="gap: 10rpx;">
+					<u-row custom-style="gap: 15rpx;">
 						<u-button @click="discoveryPrinter">
-							{{searchLoading?'搜索中...':'搜索周边设备'}}
+							{{searchLoading?'搜索中...':'搜索设备'}}
 							
 						</u-button>
 						<u-button @click="stopDiscoveryPrinter">停止搜索</u-button>