'2023年5月17日18:45:07'

pages/recharge/recharge.vue

@@ -145,7 +145,6 @@
 	const rechargeAction = () => {
 		state.fee = state.money * 100; //元换成分
 
-
 		wx.showModal({
 			title: '圈存确认',
 			content: '您确定要充值圈存吗',
@@ -163,7 +162,6 @@
 									//拿到订单,存起来
 									state.orderNum = checkResult.orders[0].orderNum;
 									setItem("orderNum", state.orderNum);
-
 									//链接蓝牙
 									uni.navigateTo({
 										url: `/pages/bluetooth/bluetooth?routeType=2&&cardId=${state.cardId}`,
@@ -175,8 +173,7 @@
 										state.orderNum = applyResult.orderNum;
 										setItem("orderNum", state.orderNum);
 										//如果订单没有支付 走支付
-										if (applyResult.orderStatus ===
-											"ORDER_NOT_PAY") {
+										if (applyResult.orderStatus === "ORDER_NOT_PAY") {
 											//走支付
 											console.log("走支付");
 											wxPayment();
@@ -191,12 +188,9 @@
 							});
 						}
 					});
-
 				}
 			}
 		});
-
-
 	};
 
 	/*读卡*/
@@ -330,10 +324,7 @@
 						} else if (fixStatus === 2) {
 							uanConfirmSucessAction(value).then((confirmResult) => {
 								msg("充值成功");
-								navTo(
-									`/pages/recharge/result`)
-
-
+								navTo(`/pages/recharge/result`)
 							});
 						} else if (fixStatus === 1) {
 							quanCheckActionTrue().then((val) => {

subpackage/after-sale/activation/activate.vue

@@ -163,6 +163,7 @@
 			const obuId = orderInfo.obuId;
 			const obuStatus = orderInfo.obuStatus != null ? orderInfo.obuStatus : '9'
 			console.log('当前卡签状态', cardId, obuId, cardStatus, obuStatus)
+			console.log('输出内容', obu.obuId, '=======', fileDataStrings.obuId)
 			if (obu.obuId != fileDataStrings.obuId) {
 				tools.showModalAlert("订单设备号信息与当前设备号信息不符!");
 				return
@@ -197,7 +198,7 @@
 		};
 		request(IFCODE.orderDetail, options).then((res) => {
 			orderInfo = JSON.parse(res.bizContent);
-			console.log("orderInfo",orderInfo);
+			console.log("orderInfo", orderInfo);
 			if (orderInfo) {
 				fileDataStrings.userType = orderInfo.userType; //用户类型
 				fileDataStrings.approvedCount = parseInt(orderInfo.vehicleApprovedCount); //核载人数
@@ -348,6 +349,7 @@
 				tools.hideLoadingAlert();
 				let result = stringToJson(res.bizContent);
 				tools.showLoadingAlert("执行指令中");
+				console.log('写卡指令', result.command)
 				bluetoothUtil.transCmd(result.command.split(","), "10", function(res) {
 					tools.hideLoadingAlert();
 					getCommandBack(result.command, result.cosRecordId, res.toString());
@@ -497,7 +499,8 @@
 						if (res[0] == "9000") {
 							tools.showLoadingAlert("执行指令");
 							//再次获取随机数
-							let cmdArr = [cmd.HOME_DIRECTORY, cmd.OBU_DF01, cmd.OBU_EF01, cmd.RANDOM_NUMBER];
+							let cmdArr = [cmd.HOME_DIRECTORY, cmd.OBU_DF01, cmd.OBU_EF01, cmd
+								.RANDOM_NUMBER];
 							bluetoothUtil.transCmd(cmdArr, '20', function(res) {
 								var str = res[3].substring(res[3].length - 4, res[3].length);
 								if (str == "9000") {
@@ -801,4 +804,4 @@
 		font-size: 34rpx;
 		border-radius: 20rpx;
 	}
-</style>
+</style>

utils/network/api.js

@@ -6,8 +6,8 @@ export const URL = "192.168.100.63";
 export const envs = {
 	//开发环境配置
 	development: {
-		baseUrl: "192.168.100.63:8087",
-		// baseUrl: "222.85.144.89:19002",
+		// baseUrl: "192.168.100.63:8087",
+		baseUrl: "222.85.144.89:19002",
 	},
 	//生产环境配置
 	production: {