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 |  122 ++++++++++++++++++++++++++++------------
 1 files changed, 84 insertions(+), 38 deletions(-)

diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index d7351d4..431f6a0 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -199,6 +199,12 @@
 									})
 								}
 							},
+							fail: function() {
+								wx.showModal({
+									title: '提示',
+									content: '蓝牙状态获取失败',
+								})
+							}
 						})
 					},
 					fail: function() {
@@ -221,13 +227,19 @@
 				} else if (platform == "android") {
 					// uni.getDeviceInfo().platform = "android"
 					console.log(uni.getDeviceInfo()) //这里是拿到安卓的系统版本名 如:Android 9
-					console.log('输出系统版本号', uni.getDeviceInfo().system.substring(uni.getDeviceInfo().system.length - (
-							uni.getDeviceInfo().system.length -
-							8), uni.getDeviceInfo().system.length - (uni.getDeviceInfo().system.length - 8) +
-						1)) //这里为了获取到系统的版本号,如 9
-					var systemVersion = uni.getDeviceInfo().system.substring(uni.getDeviceInfo().system.length - (uni
-						.getDeviceInfo().system.length -
-						8), uni.getDeviceInfo().system.length - (uni.getDeviceInfo().system.length - 8) + 1)
+					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) {
@@ -237,14 +249,27 @@
 										scope: 'scope.userLocation',
 										complete: function(res) {
 											that.getBluetoothDevices()
-										}
+										},
+										fail: function(res) {
+											that.$message.showToast('获取蓝牙系统位置信息错误')
+
+										},
 									})
 								} else {
 									that.getBluetoothDevices()
 								}
-							}
+							},
+							fail: function(res) {
+								that.$message.showToast('获取系统设置错误' + (res || ''))
+
+							},
 						})
+					} else {
+						that.$message.showToast('获取系统版本过低,版本号:' + systemVersion)
+
 					}
+				} else {
+					that.$message.showToast('未知平台:' + (platform || '-'))
 				}
 			},
 
@@ -275,15 +300,23 @@
 										}
 									}
 									// 数据赋值 关闭刷新
-									that.list = devices
+									that.list = devices || []
 									that.isScanning = false
 
 									wx.hideLoading()
 									wx.stopPullDownRefresh()
 								},
+								fail(e) {
+									that.$message.showToast('获取蓝牙设备出错:' + (e || ''))
+
+								}
 							})
 						}, 3000) //到这里 都是三秒后执行的内容
 					},
+					fail(e) {
+						that.$message.showToast('扫描蓝牙报错:' + (e || ''))
+
+					}
 				})
 			},
 
@@ -448,34 +481,37 @@
 				var that = this;
 
 				var command = tsc.jpPrinter.createNew()
-				command.setSize(48, 96)
+				command.setSize(48, 60)
 				command.setGap(0)
 				command.setCls()
 				// command.setText(0, 30, "TSS24.BF2", 1, 1, "图片")
 				// command.setQR(40, 120, "L", 5, "A", "www.smarnet.cc佳博智汇")
-				command.setText(60, 20, "TSS24.BF2", 1, 1, "单号:" + (that.item.orderNo || '-'))
+				// command.setText(60, 20, "TSS24.BF2", 1, 1, "单号:" + (that.item.orderNo || '-'))
 				if (that.item.warehouseName)
-					command.setText(10, 60, "TSS24.BF2", 1, 1, "仓库: " + that.item.warehouseName)
+					command.setText(10, 20, "TSS24.BF2", 1, 1, "仓库: " + that.item.warehouseName)
 				if (that.item.warehouseLocationCode)
-					command.setText(200, 60, "TSS24.BF2", 1, 1, "库位: " + that.item.warehouseLocationCode)
+					command.setText(200, 20, "TSS24.BF2", 1, 1, "库位: " + that.item.warehouseLocationCode)
 
 				// command.setText(170, 50, "TSS24.BF2", 1, 1, "小程序测试")
 				// command.setText(170, 90, "TSS24.BF2", 1, 1, "测试数字12345678")
 				// command.setText(170, 120, "TSS24.BF2", 1, 1, "测试英文abcdefg")
 				// command.setText(170, 150, "TSS24.BF2", 1, 1, "测试符号/*-+!@#$")
-				command.setText(10, 100, "TSS24.BF2", 1, 1, "供应商: " + (that.item.supplierName || '-'))
-				command.setText(10, 140, "TSS24.BF2", 1, 1, "商品名称: " + (that.item.flowerName || '-'))
-				command.setText(10, 180, "TSS24.BF2", 1, 1, "等级: " + (that.item.flowerLevelStr || '-'))
-				command.setText(200, 180, "TSS24.BF2", 1, 1, "颜色: " + (that.item.flowerColor || '-'))
-				command.setText(10, 220, "TSS24.BF2", 1, 1, "价格: ¥ " + (that.item.price || '-'))
-				command.setText(200, 220, "TSS24.BF2", 1, 1, "数目: x " + (that.item.num || '0'))
-				command.setText(10, 260, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
-				command.setText(10, 300, "TSS24.BF2", 1, 1, "花满芫")
-				command.setText(170, 300, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
+				command.setText(10, 60, "TSS24.BF2", 1, 1, "供应商: " + (that.item.supplierName || '-'))
+				command.setText(10, 100, "TSS24.BF2", 1, 1, "商品名称: " + (that.item.flowerName || '-'))
+				command.setText(10, 140, "TSS24.BF2", 1, 1, "等级: " + (that.item.flowerLevelStr || '-'))
+				command.setText(200, 140, "TSS24.BF2", 1, 1, "颜色: " + (that.item.flowerColor || '-'))
+				// command.setText(10, 220, "TSS24.BF2", 1, 1, "价格: ¥ " + (that.item.price || '-'))
+				command.setText(10, 180, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
+				command.setText(200, 180, "TSS24.BF2", 1, 1, "数目: x " + (that.item.num || '0'))
+				// command.setText(10, 300, "TSS24.BF2", 1, 1, "花满芫")
+				command.setText(100, 220, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
 				if (that.item.params) {
 					var addnum = 0
-					var hlen = 300
+					var hlen = 220
 					for (var p of that.item.params) {
+						if (p.name !== '枝长' && p.name !== '成熟度') {
+							continue
+						}
 						if (p.value) {
 							var lef = 10
 							if (addnum % 2 == 1) {
@@ -574,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