提交

subpackage/after-sale/activation-once-again/activation-once-again.vue

@@ -284,14 +284,6 @@
 			orderInfos.cardStatus = orderInfo.cardStatus;
 			orderInfos.obuId = orderInfo.obuId;
 			orderInfos.obuStatus = orderInfo.obuStatus;
-			// let arr = orderInfo.vehicleDimensions.split("X");
-			// orderInfos.outlineL = parseInt(arr[0]); //外廓 长
-			// orderInfos.outlineW = parseInt(arr[1]); //外廓 宽
-			// if(arr[2].indexOf('mm')){
-			// 	orderInfos.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-			// }else{
-			// 	orderInfos.outlineH = arr[2] //外廓 高
-			// }
 			orderInfos.type = orderInfo.type;
 			orderInfos.axleCount = orderInfo.vehicleAxleCount;
 			orderInfos.approvedCount = orderInfo.vehicleApprovedCount;

subpackage/after-sale/card-Renewal/renewal-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>
@@ -172,7 +172,7 @@
 	let cmdRandNum = '';
 	const orderInfos = reactive({
 		orderId: "",
-		ownerName: "",
+		customerName: "",
 		ownerIdtype: "",
 		ownerIdnum: "",
 		vehiclePlate: "",
@@ -258,7 +258,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 = orderInfo.ownerIdnum;
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;
@@ -576,15 +576,15 @@
 					fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
 					console.log("车辆信息", orderInfo)
 					fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
-					let arr = orderInfo.vehicleDimensions.split("X");
-					console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
-					fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
-					fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
-					if(arr[2].indexOf('mm')){
-						fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-					}else{
-						fileDataStrings.outlineH = arr[2] //外廓 高
-					}
+					// let arr = orderInfo.vehicleDimensions.split("X");
+					// console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
+					// fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
+					// fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
+					// if(arr[2].indexOf('mm')){
+					// 	fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+					// }else{
+					// 	fileDataStrings.outlineH = arr[2] //外廓 高
+					// }
 					fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
 					fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
 						.vehiclePlateColor);

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -125,7 +125,7 @@
 				<view class="cell-left">版本号</view>
 				<view class="cell-right">{{ obu.version }}</view>
 			</view>
-			<view class="cell">
+			<view class="cell" v-if="state.obuStatus">
 				<view class="cell-left">签状态</view>
 				<view class="cell-right">{{getCodeName('OBU_STATE_TYPE',state.obuStatus)}}</view>
 			</view>
@@ -462,7 +462,7 @@
 			tools.hideLoadingAlert();
 			let result = stringToJson(res.bizContent);
 			console.log("153", result)
-			state.obuStatus = result.data[0].obuStatus
+			state.obuStatus = result.data[0]?result.data[0].obuStatus:""
 		})
 	}
 </script>

subpackage/personal-center/car-message-change.vue

@@ -421,7 +421,12 @@
 		let arr = allData['vehicleDimensions'].split("X");
 		state.outlineL = parseInt(arr[0]); //外廓 长
 		state.outlineW = parseInt(arr[1]); //外廓 宽
-		state.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+		console.log("arr[2]",arr[2])
+		if(arr[2].indexOf('mm')){
+			state.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+		}else{
+			state.outlineH = parseInt(arr[2]); //外廓 高
+		}
 		state.form.totalMassShow = allData['totalMass']
 		state.form.totalMass = allData['totalMass']
 		state.form.axleCount = allData['axleCount'] ? allData['axleCount'] : 2

subpackage/personal-center/install-activation-order.vue

@@ -46,7 +46,7 @@
 	import { stringToJson } from "@/utils/network/encryption";
 	import { onLoad, onUnload, onReachBottom, onPullDownRefresh } from "@dcloudio/uni-app";
 	import { getItem, StorageKeys } from "@/utils/storage";
-	import { hasLogin, msg, getOrderStatusName, getOrderTypeName } from "@/utils/utils";
+	import { hasLogin, msg, getOrderStatusName, getOrderTypeName,navTo} from "@/utils/utils";
 	import { noActivationOrder } from "@/utils/network/api";
 	import { PageData } from "@/datas/enum";
 	import useOrderSkip from "@/composables/order/useOrderSkip";
@@ -148,11 +148,23 @@
 	}
 
 	onLoad(() => {
+		if (!hasLogin()) {
+			uni.showModal({
+				title: '提示',
+				content: '您还未登录小程序,请先登录小程序',
+				showCancel: false,
+				success: function (res) {
+					if (res.confirm) {
+						navTo(`/login/login?back=1`)
+					}
+				}
+			});
+		}
 		//监听订单刷新信息
 		uni.$on('refreshOrder', (data) => {
 			refreshList();
 		});
-console.log("guoliale ")
+console.log("guoliale")
 		refreshList();
 	});