From 34b6e0548fb7f3d88842914db89d7cd603a5e531 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 01 八月 2024 23:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
sub_pages/supplier/print/print-list.vue | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index 66c3832..7df8f6b 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)
+ 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 || '-'))
}
},
@@ -281,9 +306,17 @@
wx.hideLoading()
wx.stopPullDownRefresh()
},
+ fail(e) {
+ that.$message.showToast('获取蓝牙设备出错：' + (e || ''))
+
+ }
})
}, 3000) //到这里 都是三秒后执行的内容
},
+ fail(e) {
+ that.$message.showToast('扫描蓝牙报错：' + (e || ''))
+
+ }
})
},
--
Gitblit v1.9.3