提交

subpackage/after-sale/activation/operation-tips.vue

@@ -66,55 +66,48 @@
 	})
 
 	const gotoNextStep = () => {
-		uni.getSetting({
+		uni.openBluetoothAdapter({
 			success(res) {
-				console.log(res.authSetting)
-				if (res.authSetting['scope.bluetooth'] == true) {
-					uni.openBluetoothAdapter()
-					noticeUser(() => {
-						console.log("11111")
-						/* 判断是否打开蓝牙 */
-						uni.getBluetoothAdapterState({
-							success(res) {
-								console.log("2222", res)
-								//如果res.avaliable==false 说明没打开蓝牙 反之则打开
-								if (res.available == false) {
-									uni.showToast({
-										title: '请打开手机蓝牙',
-										icon: "error",
-										duration: 2000
-									})
-									return
-								} else {
-									navTo(`/subpackage/after-sale/activation/operation-upload?transfer=${transfer}`)
-								}
+				noticeUser(() => {
+					console.log("11111")
+					/* 判断是否打开蓝牙 */
+					uni.getBluetoothAdapterState({
+						success(res) {
+							console.log("2222", res)
+							//如果res.avaliable==false 说明没打开蓝牙 反之则打开
+							if (res.available == false) {
+								uni.showToast({
+									title: '请打开手机蓝牙',
+									icon: "error",
+									duration: 2000
+								})
+								return
+							} else {
+								navTo(`/subpackage/after-sale/activation/operation-upload?transfer=${transfer}`)
 							}
-						})
-					});
-				}else{
-						uni.showModal({
-							title: '提示',
-							content: '请打开蓝牙权限',
-							success: function (res) {
-								if (res.confirm) {
-									uni.openSetting({
-									  success(res) {
-										  console.log("2222")
-									    console.log(res.authSetting)
-									  }
-									});
-								} else if (res.cancel) {
-									console.log('用户点击取消');
-								}
-							}
-						});
-					
-					
-				}
+						}
+					})
+				});
+			},
+			fail(err){
+				uni.showModal({
+					title: '提示',
+					content: '请打开蓝牙权限',
+					success: function (res) {
+						if (res.confirm) {
+							uni.openSetting({
+							  success(res) {
+								  console.log("2222")
+								console.log(res.authSetting)
+							  }
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
 			}
 		})
-
-
 	}
 </script>
 

subpackage/after-sale/card-deactivation-activation/deactivation-activation-confirm.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="details-item">
 				<view> 用户名称： </view>
-				<text>{{ orderInfos.ownerName }}</text>
+				<text>{{ orderInfos.customerName }}</text>
 			</view>
 			<view class="details-item">
 				<view> 用户证件类型： </view>
@@ -113,7 +113,7 @@
 	})
 	const orderInfos = reactive({
 		orderId: "",
-		ownerName: "",
+		customerName: "",
 		ownerIdtype: "",
 		ownerIdnum: "",
 		vehiclePlate: "",
@@ -165,7 +165,7 @@
 			let orderInfo = JSON.parse(res.bizContent);
 			console.log("获取订单详情", orderInfo);
 			orderInfos.orderId = orderInfo.orderId;
-			orderInfos.ownerName = orderInfo.ownerName;
+			orderInfos.customerName = orderInfo.customerName;
 			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
 			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;

subpackage/after-sale/equipment-upgrade/upgrade-confirm.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="details-item">
 				<view> 用户名称： </view>
-				<text>{{ orderInfos.ownerName }}</text>
+				<text>{{ orderInfos.customerName }}</text>
 			</view>
 			<view class="details-item">
 				<view> 用户证件类型： </view>
@@ -130,7 +130,7 @@
 	})
 	const orderInfos = reactive({
 		orderId: "",
-		ownerName: "",
+		customerName: "",
 		ownerIdtype: "",
 		ownerIdnum: "",
 		vehiclePlate: "",
@@ -213,7 +213,7 @@
 			let orderInfo = JSON.parse(res.bizContent);
 			console.log(orderInfo);
 			orderInfos.orderId = orderInfo.orderId;
-			orderInfos.ownerName = orderInfo.ownerName;
+			orderInfos.customerName = orderInfo.customerName;
 			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
 			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;

subpackage/after-sale/pin-code-deblocking/pin-code-confirm.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="details-item">
 				<view> 用户名称： </view>
-				<text>{{ orderInfos.ownerName }}</text>
+				<text>{{ orderInfos.customerName }}</text>
 			</view>
 			<view class="details-item">
 				<view> 用户证件类型： </view>
@@ -119,7 +119,7 @@
 	})
 	const orderInfos = reactive({
 		orderId: "",
-		ownerName: "",
+		customerName: "",
 		ownerIdtype: "",
 		ownerIdnum: "",
 		vehiclePlate: "",
@@ -165,7 +165,7 @@
 			let orderInfo = JSON.parse(res.bizContent);
 			console.log("orderInfo", orderInfo);
 			orderInfos.orderId = orderInfo.orderId;
-			orderInfos.ownerName = orderInfo.ownerName;
+			orderInfos.customerName = orderInfo.customerName;
 			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
 			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;

subpackage/orders/order-detail-logistics.vue

@@ -52,7 +52,7 @@
 	import popupBottom from "./components/popup-bottom.vue";
 	import { msg, getOrderTypeName, getCarTypeName, getOrderStatusName, getOrderTime } from "@/utils/utils";
 	import { onLoad } from "@dcloudio/uni-app";
-
+	import {getCodeName} from "@/datas/queryKey.js";
 	const state = reactive({
 		orderInfo: "",
 		//是否显示更多订单信息
@@ -161,7 +161,7 @@
 
 		state.orderShowInfo[6].value = getOrderTime(state.orderInfo['insertTime'])
 		state.orderShowInfo[7].value = state.orderInfo['trackingNumber']
-		state.orderShowInfo[8].value = state.orderInfo['courierCompany']
+		state.orderShowInfo[8].value = getCodeName('快递物流公司',state.orderInfo.courierCompany)
 	})
 </script>