修改展示确认页面卡类型

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

@@ -53,7 +53,7 @@
 							{{state.data.cardId}}
 						</view>
 						<view class="tips">
-							<text>储蓄卡</text>
+							<text>{{state.cardType=="23"?'记账卡':'储值卡'}}</text>
 							<text class="tips-card">{{getCodeName('CARD_STATE_TYPE',state.data.cardStatus)}}</text>
 						</view>
 					</view>
@@ -72,7 +72,6 @@
 							{{state.data.obuId}}
 						</view>
 						<view class="tips">
-							<!-- <text>储蓄卡</text> -->
 							<text class="tips-card">{{getCodeName('OBU_STATE_TYPE',state.data.obuStatus)}}</text>
 						</view>
 					</view>
@@ -104,14 +103,9 @@
 	} from "@/utils/network/request.js";
 	import {
 		orderDetail,
-		CardlossStatus,
 		cckChangejzCardJY
 	} from "@/utils/network/api.js";
 
-	import {
-		msg
-	} from "@/utils/utils";
-
 	import {
 		stringToJson
 	} from "@/utils/network/encryption";
@@ -121,7 +115,8 @@
 			cardStatus: undefined,
 			obuStatus: undefined,
 		},
-		type: undefined
+		type: undefined,
+		cardType:""
 	});
 
 	/*视图进入后操作*/
@@ -129,6 +124,7 @@
 		queryOrderDetail(option.id).then((val : any) => {
 			console.log("option", val)
 			state.data = val
+			state.cardType=val.cardId.substring(8,10)
 		})
 
 	});
@@ -137,16 +133,7 @@
 	});
 	/*下一步*/
 	const nextACtion = () => {
-
 		queryCckChangejzCardJY().then(val => {
-			// if (state.data.cardId.length > 0 && state.data.obuId.length < 1) {
-			// 	state.type = 1 //只有卡
-
-			// } else if (state.data.cardId.length < 1 && state.data.obuId.length > 0) {
-			// 	state.type = 2 //只有设备
-			// } else if (state.data.cardId.length > 0 && state.data.obuId.length > 0) {
-			// 	state.type = 3 //两者都有
-			// }
 			let obj = {
 				type: state.type,
 				customerIdnum: state.data.customerIdnum,
@@ -161,11 +148,9 @@
 				`/subpackage/after-sale/ETC-log-off/etc-log-off?params=${params}`
 			)
 		})
-
 	}
 
 	const queryCckChangejzCardJY = () => {
-
 		return new Promise(async (resolve, reject) => {
 			const res = await request(cckChangejzCardJY, {
 				type: 2,
@@ -210,10 +195,7 @@
 </style>
 <style lang="scss" scoped>
 	.selectCar-box {
-		// width: 100%;
-		// height: 100%;
 		padding: 30rpx;
-
 		.title {
 			font-size: 30rpx;
 			font-family: Microsoft YaHei UI;

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

@@ -300,10 +300,16 @@
 			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]); //外廓 宽
-			orderInfos.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+			if(orderInfo.vehicleDimensions){
+				let arr = orderInfo.vehicleDimensions.split("X");
+				orderInfos.outlineL = parseInt(arr[0]); //外廓 长
+				orderInfos.outlineW = parseInt(arr[1]); //外廓 宽
+				if(arr[2].includes('mm')){
+					orderInfos.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+				}else{
+					orderInfos.outlineH = parseInt(arr[2]); //外廓 高
+				}
+			}
 
 			orderInfos.type = orderInfo.type;
 			orderInfos.axleCount = orderInfo.vehicleAxleCount;

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

@@ -45,7 +45,7 @@
 				<view class="card-center">
 					<view class="card-center-head"> {{orderInfos.cardId}} </view>
 					<view class="tips">
-						<text>储蓄卡</text>
+						<!-- <text>储蓄卡</text> -->
 						<text class="tips-card">{{getCodeName('CARD_STATE_TYPE',orderInfos.cardStatus)}}</text>
 					</view>
 				</view>
@@ -287,8 +287,11 @@
 			let arr = orderInfo.vehicleDimensions.split("X");
 			orderInfos.outlineL = parseInt(arr[0]); //外廓 长
 			orderInfos.outlineW = parseInt(arr[1]); //外廓 宽
-			orderInfos.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-
+			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/additional-equipment/additional-equipment-confirm.vue

@@ -72,7 +72,6 @@
 							{{state.data.obuId}}
 						</view>
 						<view class="tips">
-							<!-- <text>储蓄卡</text> -->
 							<text class="tips-card">{{getObuStatus(state.data.obuStatus)}}</text>
 						</view>
 					</view>

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

@@ -52,7 +52,7 @@
 						{{state.data.cardId}}
 					</view>
 					<view class="tips">
-						<text>储蓄卡</text>
+						<text>{{state.cardType=="23"?'记账卡':'储值卡'}}</text>
 						<text class="tips-card">{{getCodeName('CARD_STATE_TYPE',state.data.cardStatus)}}</text>
 					</view>
 				</view>
@@ -118,16 +118,6 @@
 	import {
 		msg
 	} from "@/utils/utils";
-	import {
-		getCredentialType
-	} from "@/datas/credentialType.js";
-
-	import {
-		getEtcCardStatus
-	} from "@/datas/etcCardStatus.js";
-	import {
-		getObuStatus
-	} from "@/datas/obuStatus.js";
 
 	import {
 		stringToJson
@@ -139,7 +129,8 @@
 			cardStatus: undefined,
 			obuStatus: undefined,
 		},
-		successTip: ""  //成功提示
+		successTip: ""  ,//成功提示
+		cardType:""
 	});
 	const flag = reactive([])
 	const type = ref('')
@@ -147,6 +138,8 @@
 	onShow(() => {
 		queryOrderDetail(state.id).then((val : any) => {
 			state.data = val
+			state.cardType=val.cardId.substring(8,10)
+			console.log(state.cardType)
 		})
 	})
 	onLoad((option) => {

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

@@ -55,7 +55,6 @@
 				<view class="card-center">
 					<view class="card-center-head"> {{orderInfos.obuId}} </view>
 					<view class="tips">
-						<!-- <text>储蓄卡</text> -->
 						<text class="tips-card">{{getCodeName('OBU_STATE_TYPE',orderInfos.obuStatus)}}</text>
 					</view>
 					<view class="choose-item"> 有效期：{{orderInfos.obuExpireTime }} </view>

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

@@ -53,7 +53,7 @@
 							{{state.data.cardId}}
 						</view>
 						<view class="tips">
-							<text>储蓄卡</text>
+							<text>{{state.cardType=="23"?'记账卡':'储值卡'}}</text>
 							<text class="tips-card">{{getEtcCardStatus(state.data.cardStatus)}}</text>
 						</view>
 					</view>
@@ -72,7 +72,6 @@
 							{{state.data.obuId}}
 						</view>
 						<view class="tips">
-							<!-- <text>储蓄卡</text> -->
 							<text class="tips-card">{{getObuStatus(state.data.obuStatus)}}</text>
 						</view>
 					</view>
@@ -100,13 +99,8 @@
 	} from "@/utils/network/request.js";
 	import {
 		orderDetail,
-		CardlossStatus,
 		changeCardQuery
 	} from "@/utils/network/api.js";
-
-	import {
-		msg
-	} from "@/utils/utils";
 	import {
 		getCredentialType
 	} from "@/datas/credentialType.js";
@@ -127,7 +121,8 @@
 			cardStatus: undefined,
 			obuStatus: undefined,
 		},
-		type: undefined
+		type: undefined,
+		cardType:""
 	});
 	const apply = reactive({
 		data: {
@@ -142,6 +137,7 @@
 		queryOrderDetail(option.id).then((val : any) => {
 			console.log("val", val)
 			state.data = val
+			state.cardType=val.cardId.substring(8,10)
 		})
 
 	});

subpackage/after-sale/to-bookkeeping-card/confirm.vue

@@ -53,7 +53,7 @@
 							{{state.data.cardId}}
 						</view>
 						<view class="tips">
-							<text>储蓄卡</text>
+							<text>{{state.cardType=="23"?'记账卡':'储值卡'}}</text>
 							<text class="tips-card">{{getCodeName('CARD_STATE_TYPE',state.data.cardStatus)}}</text>
 						</view>
 					</view>
@@ -81,14 +81,9 @@
 	} from "@/utils/network/request.js";
 	import {
 		orderDetail,
-		CardlossStatus,
 		cckChangejzCard
 	} from "@/utils/network/api.js";
 
-	import {
-		msg
-	} from "@/utils/utils";
-
 	import {
 		getCodeName
 	} from "@/datas/queryKey.js";
@@ -102,7 +97,8 @@
 			cardStatus: undefined,
 			obuStatus: undefined,
 		},
-		type: undefined
+		type: undefined,
+		cardType:""
 	});
 
 	/*视图进入后操作*/
@@ -110,6 +106,7 @@
 		queryOrderDetail(option.id).then((val : any) => {
 			console.log("订单详情", val)
 			state.data = val
+			state.cardType=val.cardId.substring(8,10)
 		})
 	});
 	/*下一步*/

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

@@ -52,7 +52,7 @@
 						{{state.data.cardId}}
 					</view>
 					<view class="tips">
-						<text>储蓄卡</text>
+						<text>{{state.cardType=="23"?'记账卡':'储值卡'}}</text>
 						<text class="tips-card">{{getCodeName('CARD_STATE_TYPE',state.data.cardStatus)}}</text>
 					</view>
 				</view>
@@ -70,7 +70,6 @@
 						{{state.data.obuId}}
 					</view>
 					<view class="tips">
-						<!-- <text>储蓄卡</text> -->
 						<text class="tips-card">{{getCodeName('OBU_STATE_TYPE',state.data.obuStatus)}}</text>
 					</view>
 				</view>
@@ -100,10 +99,6 @@
 		orderDetail,
 		queryGuoHu
 	} from "@/utils/network/api.js";
-
-	import {
-		msg
-	} from "@/utils/utils";
 	import {
 		getCodeName
 	} from "@/datas/queryKey.js";
@@ -120,13 +115,15 @@
 			cardStatus: undefined,
 			obuStatus: undefined,
 			orderId: undefined,
-		}
+		},
+		cardType:""
 	});
 
 	/*视图进入后操作*/
 	onLoad((option) => {
 		queryOrderDetail(option.id).then((val : any) => {
 			state.data = val
+			state.cardType=val.cardId.substring(8,10)
 		})
 		/*监听手机号验证后的回调*/
 		uni.$on('queryCardlossStatus', function (type) {

subpackage/after-sale/unsuspend/unsuspend-confirm.vue

@@ -59,7 +59,6 @@
 				<view class="card-center">
 					<view class="card-center-head"> {{orderInfos.obuId}} </view>
 					<view class="tips">
-						<!-- <text>储蓄卡</text> -->
 						<text class="tips-card">{{getCodeName('OBU_STATE_TYPE',orderInfos.obuStatus)}}</text>
 					</view>
 					<view class="choose-item1"> 有效期：{{orderInfos.obuExpireTime }} </view>

utils/network/request.js

@@ -70,8 +70,8 @@ export function request(code, options = {}, start = false) {
 
 	}
 
-	options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
-	// options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
+	// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
+	options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
 	//默认json数据格式提交`
 	let contentType = 'application/x-www-form-urlencoded'