From 44c6d5af60bed61dc6e1fac1acf4d3e5be2afae3 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 01 八月 2024 23:08:40 +0800
Subject: [PATCH] 1

---
 sub_pages/supplier/supplier-info/supplier-info.vue |   10 ++++-
 sub_pages/supplier/print/print-list.vue            |   51 +++++++++++++++++++++----
 manifest.json                                      |    2 
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/manifest.json b/manifest.json
index 2848179..f2448bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1441324401626290",
+        "appid" : "wx3203fd935a6ffe09",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
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 || ''))
+
+					}
 				})
 			},
 
diff --git a/sub_pages/supplier/supplier-info/supplier-info.vue b/sub_pages/supplier/supplier-info/supplier-info.vue
index b2a196c..e7a2c08 100644
--- a/sub_pages/supplier/supplier-info/supplier-info.vue
+++ b/sub_pages/supplier/supplier-info/supplier-info.vue
@@ -120,11 +120,17 @@
 						</u-radio>
 					</u-radio-group> -->
 					<view>
-						<radio :checked="dto.idcardType==='身份证'" @click="dto.idcardType='身份证'">
+						<radio :checked="dto.idcardType==='身份证'" @click="()=>{
+							dto.idcardType='身份证';
+							$forceUpdate()
+						}">
 						</radio>身份证
 					</view>
 					<view class="m-l-10">
-						<radio :checked="dto.idcardType==='营业执照'" @click="dto.idcardType='营业执照'">
+						<radio :checked="dto.idcardType==='营业执照'" @click="()=>{
+							dto.idcardType='营业执照';
+							$forceUpdate()
+						}">
 						</radio>营业执照
 					</view>
 				</view>

--
Gitblit v1.9.3