修改诺德Bug

manifest.json

@@ -73,7 +73,7 @@
 		"requiredPrivateInfos": ["chooseLocation", "getLocation", "chooseAddress"],
 		"plugins": {
 		  "issuer-plugin": {
-		   "version": "dev-0ad154db3153bbeeb43fbf55b2012846",
+		   "version": "dev-07f01f43a2c98f29fd406c2906ed3d1b",
 		   "provider": "wxa2d9acdd1054e69b"
 		  }
 		 }

pages/index/index.vue

@@ -222,7 +222,6 @@
 	} from "@/datas/fileURL.js";
 	import {
 		navTo,
-		confirm,
 		msg,
 		noticeUser
 	} from "@/utils/utils";

subpackage/after-sale/ETC-log-off/log-off-confirm.vue

@@ -26,7 +26,7 @@
 				<view>
 					用户证件号：
 				</view>
-				<text>{{state.data.customerIdnum}}</text>
+				<text>{{desensitization(state.data.customerIdnum)}}</text>
 			</view>
 			<view class="details-item">
 				<view>
@@ -92,7 +92,7 @@
 		ref
 	} from "vue"
 	import {
-		navTo
+		navTo,desensitization
 	} from "@/utils/utils"
 	import {
 		onLoad,

subpackage/after-sale/ETC-log-off/upload-card.vue

@@ -355,16 +355,16 @@
 			sourceType: ["album"], //从相册选择
 			success: function (res) {
 				console.log("tempFilePaths[0].startsWith('file://')", res.tempFilePaths[0], res.tempFilePaths[0].startsWith('file://'))
-				compressImage(res.tempFilePaths[0], (res) => {
+				// compressImage(res.tempFilePaths[0], (res) => {
 					console.log("过来了", res)
 					if (state.choiceIndex == 3 || state.choiceIndex == 4) {
 						state.showImg = false
-						state.images = res.tempFilePath
+						state.images = res.tempFilePaths[0]
 						state.phoneType = state.choiceIndex
 						state.isTakePhotoModeShow = false
 						return
 					}
-				})
+				// })
 			},
 		})
 	}

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

@@ -221,18 +221,6 @@
 		ids = option.id;
 		//请求订单详情
 		queryOrderDetail(option.id);
-		// uni.$on('bluetoothLink', res => {
-		// 	console.log(res,'===========123');
-		// 	if (res.status) {
-		// 		// getCardRenewal()
-		// 		setTimeout(()=>{
-		// 			getObuId()
-		// 		})
-		// 	}
-		// 	//移除监听
-		// 	console.log('======移除监听======', res)
-		// 	// uni.$off('bluetoothLink')
-		// })
 
 		if (opn.state) {
 			getObuId()

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

@@ -122,14 +122,11 @@
 		ref
 	} from "vue";
 	import {
-		formatTime,
-		expireDate,
-		expireDate2,
-		getFormatDate,
 		msg,
 		navTo,
 		strReplace,
-		uploadFile
+		uploadFile,
+		desensitization
 	} from "@/utils/utils";
 	import {
 		onLoad, onShow
@@ -241,8 +238,8 @@
 			return;
 		}
 		console.log("state.form.vehicleIdNum", state.form.vehicleIdNum, state.form.vehicleIdNumB, orderInfos.vehiclePlate)
-		if (state.form.vehicleIdNum == orderInfos.vehiclePlate) {
-			if (state.form.vehicleIdNumB == orderInfos.vehiclePlate) {
+		// if (state.form.vehicleIdNum == orderInfos.vehiclePlate) {
+		// 	if (state.form.vehicleIdNumB == orderInfos.vehiclePlate) {
 				activationRecordQuery().then((val) => {
 					console.log("激活次数", val)
 					if (val.limit) {
@@ -251,12 +248,12 @@
 						msg("一年内到达激活次数上限5次")
 					}
 				});
-			} else {
-				msg("请上传正确行驶证副页")
-			}
-		} else {
-			msg("请上传正确行驶证")
-		}
+		// 	} else {
+		// 		msg("请上传正确行驶证副页")
+		// 	}
+		// } else {
+		// 	msg("请上传正确行驶证")
+		// }
 	};
 
 	//获取订单详情
@@ -275,7 +272,7 @@
 			orderInfos.orderId = orderInfo.orderId;
 			orderInfos.customerName = orderInfo.customerName;
 			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
-			orderInfos.ownerIdnum = orderInfo.ownerIdnum;
+			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;
 			orderInfos.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 			orderInfos.vehiclePlateColor = orderInfo.vehiclePlateColor;

subpackage/after-sale/activation/activate.vue

@@ -22,6 +22,10 @@
 				<text>OBU号</text>
 				<text>{{ fileDataStrings.obuId }}</text>
 			</view>
+			<view class="info_plate">
+				<text>收费车型</text>
+				<text>{{ fileDataStrings.vehicleClassStr }}</text>
+			</view>
 		</view>
 		<view class="up_btn" v-if="state.showBtn">
 			<button aria-disabled="true" @click="btn" v-if="!state.isSuccess" :disabled="!state.disabled"
@@ -172,7 +176,8 @@
 		vehiclePlateColorStr: "",
 		customerTel: "",
 		customerId: "",
-		orderId: ""
+		orderId: "",
+		vehicleClassStr:""
 	});
 	
 	function cmdResult() {
@@ -229,12 +234,12 @@
 					console.log("在线激活 请求",datas);
 					tools.showLoadingAlert("执行指令");
 					if (datas.stepNo == 100) {
-						msg("激活成功")
+						msg("激活成功",{'icon':'success','duration':2000})
 						setTimeout(() => {
 							uni.navigateTo({
 								url: "/subpackage/after-sale/deviceInfo/deviceInfo",
 							});
-						}, 3000)
+						}, 2000)
 					} else {
 						console.log("datas.stepNo",datas.stepNo)
 						bluetoothUtil.transCmd(datas.cmd.split(','), datas.cmdType=='CARD'?'10':'20', function(res) {
@@ -322,6 +327,7 @@
 				fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
 					.vehiclePlateColor);
 				fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
+				fileDataStrings.vehicleClassStr = orderInfo.vehicleClassStr;
 				// let vehicleId = orderInfo.vehiclePlate + "_" + orderInfo.vehiclePlateColor
 				// searchVehicleInfoQuery(vehicleId).then((orderInfo) => {
 				// 	console.log("orderInfo1111", orderInfo)
@@ -1007,7 +1013,7 @@
 
 
 					// #ifdef MP-WEIXIN
-					msg("激活成功")
+					msg("激活成功",{'icon':'success','duration':2000})
 					setTimeout(() => {
 						uni.navigateTo({
 							url: "/subpackage/after-sale/deviceInfo/deviceInfo",

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

@@ -4,7 +4,7 @@
 		<view class="item-row">
 			<view class="item-left">
 				<view class="title">车头照</view>
-				<view class="desc">上传汽车的车头照片</view>
+				<view class="desc">上传汽车的45度车头照片</view>
 				<view class="flag"><text>拍摄示例</text> </view>
 			</view>
 			<view class="item-right" @click="chooseImage(1)">

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

@@ -26,7 +26,7 @@
 				<view>
 					用户证件号：
 				</view>
-				<text>{{state.data.customerIdnum}}</text>
+				<text>{{desensitization(state.data.customerIdnum)}}</text>
 			</view>
 			<view class="details-item">
 				<view>
@@ -88,7 +88,7 @@
 		ref
 	} from "vue"
 	import {
-		navTo
+		navTo,desensitization
 	} from "@/utils/utils"
 	import {
 		onLoad,

subpackage/after-sale/additional-equipment/car-change.vue

@@ -37,7 +37,7 @@
 			<view class="bg">
 				<view class="">
 					<view class="name"> 车头照 </view>
-					<view class="value"> 上传汽车的车头照片 </view>
+					<view class="value"> 上传汽车的45度车头照片 </view>
 					<view class="tip">
 						<view class="tip-value"> 拍摄规范 </view>
 					</view>

subpackage/after-sale/card-Renewal/renewal-confirm.vue

@@ -96,7 +96,7 @@
 		ref
 	} from "vue";
 	import {
-		navTo
+		navTo,desensitization
 	} from "@/utils/utils";
 	import {
 		onLoad,
@@ -262,7 +262,7 @@
 			orderInfos.orderId = orderInfo.orderId;
 			orderInfos.customerName = orderInfo.customerName;
 			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
-			orderInfos.ownerIdnum = orderInfo.ownerIdnum;
+			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;
 			orderInfos.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 			orderInfos.vehiclePlateColor = orderInfo.vehiclePlateColor;

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

@@ -80,7 +80,7 @@
 		reactive
 	} from "vue";
 	import {
-		navTo
+		navTo,desensitization
 	} from "@/utils/utils";
 	import {
 		onLoad,
@@ -167,7 +167,7 @@
 			orderInfos.orderId = orderInfo.orderId;
 			orderInfos.ownerName = orderInfo.ownerName;
 			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
-			orderInfos.ownerIdnum = orderInfo.ownerIdnum;
+			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;
 			orderInfos.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 			orderInfos.vehiclePlateColor = orderInfo.vehiclePlateColor;

subpackage/after-sale/card-loss-reporting/cardloss-confirm.vue

@@ -26,7 +26,7 @@
 				<view>
 					用户证件号：
 				</view>
-				<text>{{state.data.customerIdnum}}</text>
+				<text>{{desensitization(state.data.customerIdnum)}}</text>
 			</view>
 			<view class="details-item">
 				<view>
@@ -100,7 +100,7 @@
 		ref
 	} from "vue"
 	import {
-		navTo
+		navTo,desensitization
 	} from "@/utils/utils"
 	import {
 		onLoad,

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -352,17 +352,20 @@
 									obu.axleDistance = HexToInt(res.substring(44, 48));
 									obu.engineNum = HexToStrig(res.substring(86, 118));
 									obu.type = getVehicleType(HexToInt(res.substring(28, 30)));
-									obu.userType = HexToInt(res.substring(30, 32)) == 1 ? "个人用户" :
-										"单位用户";
+									if(HexToInt(res.substring(30, 32)) == 0){
+										obu.userType = "普通车" ;
+									}else if(HexToInt(res.substring(30, 32)) == 6){
+										obu.userType = "公务车" ;
+									}
 									obu.vehiclePlate = HexToStrig(res.substring(0, 24), 2);
 									//获取车牌颜色
 									obu.vehiclePlateColor = getVehiclePlateColor(HexToInt(res
 										.substring(24, 28)));
 									obu.vin = HexToStrig(res.substring(54, 86));
 									obu.wheelCount = HexToInt(res.substring(40, 42));
-									obu.outsideDimensions = HexToInt(res.substring(32, 36)) + "x" +
-										HexToInt(res.substring(36, 38)) + "x" + HexToInt(res
-											.substring(38, 40))
+									obu.outsideDimensions = HexToInt(res.substring(32, 36))*100 + "x" +
+										HexToInt(res.substring(36, 38))*100 + "x" + HexToInt(res
+											.substring(38, 40))*100
 									getObuList();
 
 									tools.hideLoadingAlert();

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

@@ -82,7 +82,8 @@
 	} from "vue";
 	import {
 		navTo,
-		getFormatDate
+		getFormatDate,
+		desensitization
 	} from "@/utils/utils";
 	import {
 		onLoad,
@@ -214,7 +215,7 @@
 			orderInfos.orderId = orderInfo.orderId;
 			orderInfos.ownerName = orderInfo.ownerName;
 			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
-			orderInfos.ownerIdnum = orderInfo.ownerIdnum;
+			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;
 			orderInfos.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 			orderInfos.vehiclePlateColor = orderInfo.vehiclePlateColor;

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

@@ -75,7 +75,8 @@
 	} from "vue";
 	import {
 		navTo,
-		getFormatDate
+		getFormatDate,
+		desensitization
 	} from "@/utils/utils";
 	import {
 		onLoad,
@@ -166,7 +167,7 @@
 			orderInfos.orderId = orderInfo.orderId;
 			orderInfos.ownerName = orderInfo.ownerName;
 			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
-			orderInfos.ownerIdnum = orderInfo.ownerIdnum;
+			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;
 			orderInfos.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 			orderInfos.vehiclePlateColor = orderInfo.vehiclePlateColor;

subpackage/after-sale/replace-equipment/car-change.vue

@@ -37,7 +37,7 @@
 			<view class="bg">
 				<view class="">
 					<view class="name"> 车头照 </view>
-					<view class="value"> 上传汽车的车头照片 </view>
+					<view class="value"> 上传汽车的45度车头照片 </view>
 					<view class="tip">
 						<view class="tip-value"> 拍摄规范 </view>
 					</view>

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

@@ -26,7 +26,7 @@
 				<view>
 					用户证件号：
 				</view>
-				<text>{{state.data.customerIdnum}}</text>
+				<text>{{desensitization(state.data.customerIdnum)}}</text>
 			</view>
 			<view class="details-item">
 				<view>
@@ -88,7 +88,7 @@
 		ref
 	} from "vue"
 	import {
-		navTo
+		navTo,desensitization
 	} from "@/utils/utils"
 	import {
 		onLoad,

subpackage/after-sale/rescind-carId/car-change.vue

@@ -37,7 +37,7 @@
 			<view class="bg">
 				<view class="">
 					<view class="name"> 车头照 </view>
-					<view class="value"> 上传汽车的车头照片 </view>
+					<view class="value"> 上传汽车的45度车头照片 </view>
 					<view class="tip">
 						<view class="tip-value"> 拍摄规范 </view>
 					</view>

subpackage/after-sale/to-bookkeeping-card/car-change.vue

@@ -37,7 +37,7 @@
 			<view class="bg">
 				<view class="">
 					<view class="name"> 车头照 </view>
-					<view class="value"> 上传汽车的车头照片 </view>
+					<view class="value"> 上传汽车的45度车头照片 </view>
 					<view class="tip">
 						<view class="tip-value"> 拍摄规范 </view>
 					</view>

subpackage/after-sale/transfer-ownership/transfer-confirm.vue

@@ -26,7 +26,7 @@
 				<view>
 					用户证件号：
 				</view>
-				<text>{{state.data.customerIdnum}}</text>
+				<text>{{desensitization(state.data.customerIdnum)}}</text>
 			</view>
 			<view class="details-item">
 				<view>
@@ -86,7 +86,7 @@
 		ref
 	} from "vue"
 	import {
-		navTo
+		navTo,desensitization
 	} from "@/utils/utils"
 	import {
 		onLoad,

subpackage/orders/car-release.vue

@@ -39,7 +39,7 @@
 			<view class="bg">
 				<view class="">
 					<view class="name"> 车头照 </view>
-					<view class="value"> 上传汽车的车头照片 </view>
+					<view class="value"> 上传汽车的45度车头照片 </view>
 					<view class="tip">
 						<view class="tip-value"> 拍摄规范 </view>
 					</view>
@@ -742,16 +742,16 @@
 			sourceType: ["album"], //从相册选择
 			success: function (res) {
 				console.log("tempFilePaths[0].startsWith('file://')", res.tempFilePaths[0], res.tempFilePaths[0].startsWith('file://'))
-				compressImage(res.tempFilePaths[0], (res) => {
+				// compressImage(res.tempFilePaths[0], (res) => {
 					console.log("过来了", res)
 					if (state.choiceIndex == 3 || state.choiceIndex == 4) {
 						state.showImg = false
-						state.images = res.tempFilePath
+						state.images =res.tempFilePaths[0]
 						state.phoneType = state.choiceIndex
 						state.isTakePhotoModeShow = false
 						return
 					}
-				})
+				// })
 			},
 		})
 	}

subpackage/orders/opening-account-people.vue

@@ -538,20 +538,13 @@
 			sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
 			sourceType: ["album"], //从相册选择
 			success: function (res) {
-				compressImage(res.tempFilePaths[0], (res) => {
+				// compressImage(res.tempFilePaths[0], (res) => {
 					console.log("过来了", res)
-					// if (state.choiceIndex == 3 || state.choiceIndex == 4) {
-					// 	state.showImg = false
-					// 	state.images = res.tempFilePath
-					// 	state.phoneType = state.choiceIndex
-					// 	state.isTakePhotoModeShow = false
-					// 	return
-					// }
 					state.showImg = false
-					state.images = res.tempFilePath
+					state.images = res.tempFilePaths[0]
 					state.phoneType = state.choiceIndex
 					state.isTakePhotoModeShow = false
-				})
+				// })
 
 				console.log("tempFilePaths[0].startsWith('file://')", res.tempFilePaths[0], res.tempFilePaths[0].startsWith('file://'))
 

subpackage/orders/opening-account-unit.vue

@@ -337,13 +337,13 @@
 			sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
 			sourceType: ["album"], //从相册选择
 			success: function (res) {
-				compressImage(res.tempFilePaths[0], (res) => {
+				// compressImage(res.tempFilePaths[0], (res) => {
 					console.log("过来了", res)
 					state.showImg = false
-					state.images = res.tempFilePath
+					state.images = res.tempFilePaths[0]
 					state.phoneType = state.choiceIndex
 					state.isTakePhotoModeShow = false
-				})
+				// })
 
 				console.log("tempFilePaths[0].startsWith('file://')", res.tempFilePaths[0], res.tempFilePaths[0].startsWith('file://'))
 			},

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

@@ -87,7 +87,7 @@
 			<view class="bg">
 				<view class="">
 					<view class="name"> 车头照 </view>
-					<view class="value"> 上传汽车的车头照片 </view>
+					<view class="value"> 上传汽车的45度车头照片 </view>
 					<view class="tip">
 						<view class="tip-value"> 拍摄规范 </view>
 					</view>

subpackage/personal-center/operation-upload.vue

@@ -4,7 +4,7 @@
 		<view class="item-row">
 			<view class="item-left">
 				<view class="title">车头照</view>
-				<view class="desc">上传汽车的车头照片</view>
+				<view class="desc">上传汽车的45度车头照片</view>
 				<view class="flag"><text>拍摄示例</text> </view>
 			</view>
 			<view class="item-right" @click="chooseImage(1)">

subpackage/personal-center/setting/car-information/car-change.vue

@@ -37,7 +37,7 @@
 			<view class="bg">
 				<view class="">
 					<view class="name"> 车头照 </view>
-					<view class="value"> 上传汽车的车头照片 </view>
+					<view class="value"> 上传汽车的45度车头照片 </view>
 					<view class="tip">
 						<view class="tip-value"> 拍摄规范 </view>
 					</view>

utils/utils.ts

@@ -223,28 +223,6 @@ export const getOrderStatusName = (status) => {
 //根据订单类型获取订单类型文字
 export const getOrderTypeName = (orderType) => {
 	return OrderTypes[orderType];
-	// switch (orderType) {
-	// 	case OrderTypes.REPLACEMENT_SIGNATURE:
-	// 		return '更换签';
-	// 		break;
-	// 	case OrderTypes.REPLACEMENT_CARD:
-	// 		return '更换卡';
-	// 		break;
-	// 	case OrderTypes.ISSUE:
-	// 		return '新办发行';
-	// 		break;
-	// 	case OrderTypes.SUPPLEMENT_OBU:
-	// 		return '增补OBU';
-	// 		break;
-	// 	case OrderTypes.OFFICAL_SUPPLEMENT_OBU:
-	// 		return '公务车增补OBU';
-	// 		break;
-	// 	case OrderTypes.EXCHANGE_CARD_TYPE:
-	// 		return '储值卡转记账卡';
-	// 		break;
-	// 	default:
-	// 		break;
-	// }
 }
 
 //根据车辆类型获取车辆名称
@@ -354,6 +332,12 @@ export const strReplace = (str : string) => {
 	imgUrl = imgUrl.replace("http://100.64.2.113:9000", envs[process.env.NODE_ENV].baseUrl);
 	return imgUrl;
 }
+// 身份证号脱敏
+export const desensitization = (val) => {
+	if(val){
+		return val.replace(/^\d{14}/,'**************');
+	}
+}
 //查看大图
 export const checkBigImg = (current, urls) => {
 	uni.previewImage({