更换设备激活修改73(卡签接口)报错问题

datas/enum.ts

@@ -53,30 +53,17 @@ export enum OrderStatus {
 	'换货-设备已回收' = 18,
 }
 
-//订单类型
-// export enum OrderTypes {
-// 	'新办发行' = 'ISSUE',
-// 	'储值卡转记账卡' = 'EXCHANGE_CARD_TYPE',
-// 	'更换卡' = 'REPLACEMENT_CARD',
-// 	'更换签' = 'REPLACEMENT_SIGNATURE',
-// 	'增补OBU' = 'SUPPLEMENT_OBU',	
-// 	'公务车增补OBU' = 'OFFICAL_SUPPLEMENT_OBU',
-// 	'同时换卡换签' = '暂无同时换卡换签枚举',
-// 	'ETC注销' = '暂无ETC注销枚举',
-// 	'车辆信息变更' = '暂无车辆信息变更枚举',
-// 	'解除车牌占用' = '暂无车辆信息变更枚举',
-// }
-
 //订单类型
 export enum OrderTypes {
 	'ISSUE' = '新办发行',
-	'EXCHANGE_CARD_TYPE' = '储值卡转记账卡',
-	'REPLACEMENT_CARD' = '更换卡',
-	'REPLACEMENT_SIGNATURE' = '更换签',
+	'VALUE_TO_ACCOUNT' = '储值卡转记账卡',
 	'SUPPLEMENT_OBU' = '增补OBU',
 	'OFFICAL_SUPPLEMENT_OBU' = '公务车增补OBU',
-	'同时换卡换签' = '暂无同时换卡换签枚举',
-	'ETC注销' = '暂无ETC注销枚举',
-	'车辆信息变更' = '暂无车辆信息变更枚举',
-	'解除车牌占用' = '暂无车辆信息变更枚举',
+	'EXCHANGE_CARD' = '更换卡',
+	'EXCHANGE_OBU' = '更换签',
+	'EXCHANGE_ALL' = '更换全部',
+	'TRANSFER' = '过户'
+	// 'ETC注销' = '暂无ETC注销枚举',
+	// '车辆信息变更' = '暂无车辆信息变更枚举',
+	// '解除车牌占用' = '暂无车辆信息变更枚举',
 }

subpackage/after-sale/activation/activate.vue

@@ -172,8 +172,9 @@
 		if (state.transfer) {
 			// 获取cardId
 			getCardId()
-			// 过户激活  0
-			// 1. 过户激活申请  2.设备升级  3.过户升级确认
+			// 过户激活  1
+			// 1. 过户激活申请  2.设备升级  3.过户升级（跟过户升级一样）    4.79(BDS-安装申请)(后台数据)-
+			// >76(VFJ-OBU在线激活)(指令接口)->80(BDS-安装确认)->73(BDS-卡签绑定)(指令接口)->51(BDS-写卡指令返回)(指令接口)
 		} else {
 			console.log("=================================")
 			if (orderInfo) {
@@ -612,7 +613,7 @@
 						tools.hideLoadingAlert();
 						if (res[0] == "9000") {
 							if (!state.transfer) {
-								// 正常激活 不走obu发行
+								// 正常激活 走obu发行
 								getObuConfirm();
 							} else {
 								if (state.transfer) {
@@ -779,7 +780,7 @@
 			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
 			data: {
 				obuId: obu.obuId,
-				cardId: card.cardId,
+				cardId: card.cardId ? card.cardId : fileDataStrings.cardId,
 			}, //请求参数
 			method: "POST", //提交方式(默认POST)
 			showLoading: true, //是否显示加载中(默认显示)
@@ -810,7 +811,7 @@
 		let options = {
 			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
 			data: {
-				cardId: card.cardId,
+				cardId: card.cardId ? card.cardId : fileDataStrings.cardId,
 				orderId: fileDataStrings.orderId,
 				command: command,
 				response: response,

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

@@ -100,8 +100,9 @@
 			<view class="">
 				<u-form label-width="200" :model="state.form" ref="uForm">
 					<u-form-item label="车牌号">
-						<car-number-input @numberInputResult="carNumber"
-							:defaultStr="state.form.vehicleIdNum"></car-number-input>
+						<!-- 	<car-number-input @numberInputResult="carNumber"
+							:defaultStr="state.form.vehicleIdNum" ></car-number-input> -->
+						<u-input inputAlign="right" placeholder="请输入车牌号" v-model="state.form.vehicleIdNum" disabled />
 					</u-form-item>
 
 					<u-form-item label="所有人">

utils/utils.ts

@@ -221,7 +221,7 @@ export const getOrderStatusName = (status) => {
 }
 
 //根据订单类型获取订单类型文字
-export const getOrderTypeName = (orderType = 'ISSUE') => {
+export const getOrderTypeName = (orderType) => {
 	return OrderTypes[orderType];
 	// switch (orderType) {
 	// 	case OrderTypes.REPLACEMENT_SIGNATURE: