From 1b78e33e0d0340f3d45f87160abcb0f13f013774 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 02 八月 2024 00:10:56 +0800
Subject: [PATCH] fix bug

---
 sub_pages/supplier/print/print-list.vue |   68 +++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index 7df8f6b..431f6a0 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -227,19 +227,19 @@
 				} else if (platform == "android") {
 					// uni.getDeviceInfo().platform = "android"
 					console.log(uni.getDeviceInfo()) //这里是拿到安卓的系统版本名 如:Android 9
-					systemVersion = 10
-					try {
-						var s = '' + (uni.getDeviceInfo().system || '')
-						console.log('输出系统版本号', s.substring(s.length - (
-								s.length -
-								8), s.length - (s.length - 8) +
-							1)) //这里为了获取到系统的版本号,如 9
-						systemVersion = s.substring(s.length - (s.length -
-							8), s.length - (s.length - 8) + 1)
-					} catch (e) {
-						that.$message.showToast('获取系统版本错误,版本号:' + s)
-						systemVersion = 10
-					}
+					var systemVersion = 10
+					// try {
+					// 	var s = '' + (uni.getDeviceInfo().system || '')
+					// 	console.log('输出系统版本号', s.substring(s.length - (
+					// 			s.length -
+					// 			8), s.length - (s.length - 8) +
+					// 		1)) //这里为了获取到系统的版本号,如 9
+					// 	systemVersion = s.substring(s.length - (s.length -
+					// 		8), s.length - (s.length - 8) + 1)
+					// } catch (e) {
+					// 	that.$message.showToast('获取系统版本错误,版本号:' + s)
+					// 	systemVersion = 10
+					// }
 					if (systemVersion > 5) {
 						wx.getSetting({
 							success: function(res) {
@@ -300,7 +300,7 @@
 										}
 									}
 									// 数据赋值 关闭刷新
-									that.list = devices
+									that.list = devices || []
 									that.isScanning = false
 
 									wx.hideLoading()
@@ -308,7 +308,7 @@
 								},
 								fail(e) {
 									that.$message.showToast('获取蓝牙设备出错:' + (e || ''))
-								
+
 								}
 							})
 						}, 3000) //到这里 都是三秒后执行的内容
@@ -610,22 +610,32 @@
 							wx.showToast({
 								title: '已打印第' + currentPrint + '张',
 							})
-							if (currentPrint == printNum) {
-								that.looptime = 0
-								that.lastData = 0
-								that.currentTime = 1
-								that.isReceiptSend = false
-								that.isLabelSend = false
-								that.currentPrint = 1
+							// if (currentPrint == printNum) {
+							that.looptime = 0
+							that.lastData = 0
+							that.currentTime = 1
+							that.isReceiptSend = false
+							that.isLabelSend = false
+							that.currentPrint = 1
+							try {
+								wx.closeBLEConnection({
+									deviceId: that.deviceId,
+									success: function(res) {
+										console.log("关闭蓝牙成功")
+									},
+								})
+							} catch (e) {
 
-							} else {
-								currentPrint++
-
-								that.currentPrint = currentPrint
-								that.currentTime = 1
-
-								that.Send(buff)
 							}
+
+							// } else {
+							// 	currentPrint++
+
+							// 	that.currentPrint = currentPrint
+							// 	that.currentTime = 1
+
+							// 	that.Send(buff)
+							// }
 						}
 					}
 				})

--
Gitblit v1.9.3