From e8c632ef681ecc12fce24bfa3d1e6cc69d655df5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 24 十一月 2025 16:06:04 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 components/labelPrinterComponent/labelPrinterComponent.vue |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/components/labelPrinterComponent/labelPrinterComponent.vue b/components/labelPrinterComponent/labelPrinterComponent.vue
index c177e24..2c408c5 100644
--- a/components/labelPrinterComponent/labelPrinterComponent.vue
+++ b/components/labelPrinterComponent/labelPrinterComponent.vue
@@ -73,6 +73,7 @@
 				let vm = this;
 				let binarys = [];
 				for (let command of commandList) {
+                    console.log('command: ',command);
 					switch (vm.printMode) {
 						case "tspl":
 							let tspl = await vm.$printer.tspl().clear();
@@ -99,21 +100,13 @@
 							})
 					}
 				}
-				
+				let sendSuccess = false
 				for(let binary of binarys){
+                    
                     try{
-                        let sendSuccess = await this.$refs.bt2.sendMessage(binary);
-                        console.log("鍙戦�佹槸鍚︽垚鍔燂細 ", sendSuccess)
-                        if(sendSuccess === false) {
-                            // 鏂紑钃濈墮杩炴帴
-                            this.$refs.bt2.closeBluetooth()
-                        	return
-                        }else {
-                            return uni.showToast({
-                                icon: 'none',
-                                title: '鎵撳嵃鎴愬姛'
-                            })
-                        }
+                        sendSuccess = await this.$refs.bt2.sendMessage(binary);
+                        console.log("褰撳墠鍙戦�佹槸鍚︽垚鍔燂細 ", sendSuccess)
+                        
                     }catch(e) {
                         uni.showToast({
                             icon: 'none',
@@ -126,6 +119,15 @@
                     }
 					
 				}
+                
+                if(sendSuccess === false) {
+                	return
+                }else {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鎵撳嵃鎴愬姛'
+                    })
+                }
 			},
 			async execPrint() {
 				// 妫�鏌ヨ摑鐗欒繛鎺�

--
Gitblit v1.9.1