优化蓝牙不能读取2x版本设备展示问题

login/login.vue

@@ -67,6 +67,19 @@
 			</view>
 		</view>
 	</view>
+	<!-- <view class="mask">
+		<view class="uni-list">
+			<checkbox-group @change="checkboxChangeLogin">
+				<label class="uni-list-cell uni-list-cell-pd" v-for="item in state.items" :key="item.value">
+					<view>
+						<checkbox :value="item.value" :checked="item.checked" />
+					</view>
+					<view>{{item.name}}</view>
+				</label>
+			</checkbox-group>
+			<submit-button title="确定" @submit="sure"></submit-button>
+		</view>
+	</view> -->
 </template>
 
 <script setup lang="ts">
@@ -89,7 +102,18 @@
 		password: "", //密码
 		code: "", //验证码
 		back: 0,  //从app扫码看协议过来  登录了 还需要回到手机号验证页面   0 是原本的登录  1 要回去的登录(从哪来回哪去)  2运维跳转过来得中转页
-		params:{}
+		params:{},
+		items: [{
+				value: '1',
+				name: '个人',
+				checked: 'true'
+			},
+			{
+				value: '2',
+				name: '单位',
+				
+			},
+		]
 	});
 
 	onLoad((option) => {
@@ -112,7 +136,21 @@
 		console.log(e);
 		state.checked = !state.checked;
 	};
-
+	const checkboxChangeLogin = (e) => {
+		console.log(e);
+		var values = e.detail.value;
+		for (var i = 0; i < state.items.length;i++) {
+			const item = state.items[i]
+			if(values.includes(item.value)){
+				state.items[i]['checked']=true
+			}else{
+				state.items[i]['checked']=false
+			}
+		}
+	};
+   const sure=()=>{
+	   
+   }
 	// 去协议页面 
 	const toRead = () => {
 		navTo("/login/agreement")
@@ -322,4 +360,18 @@
 			}
 		}
 	}
+	.mask{
+		width: 100%;
+		height:100vh;
+		background:rgba(0,0,0,0.63);
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 999;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 </style>

pages/bluetooth/bluetooth.vue

@@ -32,7 +32,7 @@
 
 <script setup lang="ts">
 	import { ref, reactive } from "vue";
-	import { onLoad, onReady } from "@dcloudio/uni-app";
+	import { onLoad, onReady,onShow } from "@dcloudio/uni-app";
 	import { fileURL } from "@/datas/fileURL.js";
 	const cmd = require("../../static/etcUtil/cmdConfig.js");
 
@@ -99,7 +99,8 @@
 		vehNegImgUrl: "",
 		isAfter: '',
 		backIndex:"",//1返回首页(卡签信息查询) ""返回订单列表 其他
-		cardNo:""
+		cardNo:"",
+		isIOS:false
 	});
 	const deviceList = ref([]);
 	const connectPrefixName = ref(null);
@@ -121,6 +122,18 @@
 	onReady(() => {
 		load();
 	});
+	onShow(()=>{
+		 uni.getSystemInfo({
+		        success:function(res){
+		            console.log(res)
+		            if(res.platform=="ios"){
+		                    state.isIOS=true
+		            }else {
+		                state.isIOS=false
+		            }
+		        }
+		    });
+	})
 	onLoad((option) => {
 		routeType.value = option.routeType ? option.routeType : "1";
 		state.cardId = option.cardId;
@@ -269,7 +282,12 @@
 						uni.onBluetoothDeviceFound(function (res) {
 							console.log('监听寻找到新设备的事件', res, res.devices);
 							for (let i = 0; i < res.devices.length; i++) {
-								let name = res.devices[i]["name"];
+								 var name = '';
+								if (state.isIOS) {
+									name = res.devices[i]['localName'];
+								} else {
+									name = res.devices[i]['name'];
+								}
 								let prefixName = "";
 								let deviceId = res.devices[i]["deviceId"];
 								console.log("res.devices[i]", res.devices[i]["name"]);

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -264,6 +264,7 @@
 						card.type = "--";
 						card.color =parseInt(res[2].substring(82, 84), 16)
 						card.colorStr = getVehiclePlateColor(parseInt(res[2].substring(82, 84), 16))
+						card.typeStr = getVehicleType(parseInt(res[2].substring(84, 86), 16));
 					}
 					state.vehicleId = card.vehiclePlate + "_" + parseInt(res[2].substring(82, 84), 16)
 					// 读卡信息

subpackage/orders/opening-account-people.vue

@@ -93,7 +93,7 @@
 							他人车辆
 						</view>
 					</view>
-					<view class="title"> 车主信息 </view>
+					<view class="title"> 开户人信息 </view>
 					<view class="item-tips">
 						<view class="title"> 上传后请核对识别信息 </view>
 						<view class="tip"> 如有错误请及时手动修改 </view>
@@ -154,7 +154,7 @@
 				</view>
 				<view class="card-box">
 
-					<view class="title"> 代办人信息 </view>
+					<view class="title"> 车主信息 </view>
 					<view class="item-tips">
 						<view class="title">上传后请核对识别信息</view>
 						<view class="tip">如有错误请及时手动修改</view>
@@ -212,16 +212,16 @@
 				<view class="shibie-wrapper">
 					<view class="title"> 识别内容如下 </view>
 					<u-form label-width="200" :model="state.form" ref="uForm">
-						<u-form-item label="经办人姓名" :left-icon='`${$imgUrl}issuance/point-form.png`' :left-icon-style='leftIcon'>
-							<u-input inputAlign="right" placeholder='请输入经办人姓名' v-model="state.form.agentName"
+						<u-form-item label="车主姓名" :left-icon='`${$imgUrl}issuance/point-form.png`' :left-icon-style='leftIcon'>
+							<u-input inputAlign="right" placeholder='请输入车主姓名' v-model="state.form.agentName"
 								:disabled="state.isEnableOCRData" maxlength="20" />
 						</u-form-item>
-						<u-form-item label="身份证号" :left-icon='`${$imgUrl}issuance/point-form.png`' :left-icon-style='leftIcon'>
-							<u-input inputAlign="right" placeholder='请输入身份证号' v-model="state.form.agentIdNum"
+						<u-form-item label="车主身份证号" :left-icon='`${$imgUrl}issuance/point-form.png`' :left-icon-style='leftIcon'>
+							<u-input inputAlign="right" placeholder='请输入车主身份证号' v-model="state.form.agentIdNum"
 								:disabled="state.isEnableOCRData" maxlength="18" type="idcard" />
 						</u-form-item>
-						<u-form-item label="联系方式" :left-icon='`${$imgUrl}issuance/point-form.png`' :left-icon-style='leftIcon'>
-							<u-input inputAlign="right" placeholder='请输入联系方式' v-model="state.form.agentTel" type="number"
+						<u-form-item label="车主联系方式" :left-icon='`${$imgUrl}issuance/point-form.png`' :left-icon-style='leftIcon'>
+							<u-input inputAlign="right" placeholder='请输入车主联系方式' v-model="state.form.agentTel" type="number"
 								maxlength="11" />
 						</u-form-item>
 					</u-form>