Merge remote-tracking branch 'origin/main'

xuxy

2024-08-01 34b6e0548fb7f3d88842914db89d7cd603a5e531

 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 || ''))

               }
            })
         },