修改代码

pages/nfc/nfc.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="devices">
 		<view class="hint">
-			<view class="orange-txt as-layout-horizontal as-gravity-center-start">
+			<view class="orange-txt as-layout-horizontal as-gravity-center-start tishi">
 				<image :src="`${$imgUrl}common/icon-hint.png`" mode="aspectFill"></image>
 				<view>温馨提示：</view>
 			</view>
@@ -24,6 +24,9 @@
 		ref,
 		reactive
 	} from "vue";
+	import {
+		login
+	} from "../../utils/network/api";
 	const tools = require("../../static/etcUtil/tools.js");
 	const NFCAPI = require('../../static/nfc/NFCAPI.js');
 	const cmd = require("../../static/etcUtil/cmdConfig.js");
@@ -94,6 +97,7 @@
 
 	function getCardId(resultCmdArr: any, callback: any) {
 		var that = this;
+		console.log(resultCmdArr, '==============')
 		if (resultCmdArr.length == 4) {
 			var str = resultCmdArr[2].substring(resultCmdArr[2].length - 4, resultCmdArr[2].length); //判断是否为9000
 			var str3 = resultCmdArr[3].substring(resultCmdArr[3].length - 4, resultCmdArr[3].length); //判断是否为9000
@@ -152,5 +156,18 @@
 	image {
 		width: 40rpx;
 		height: 40rpx;
+		margin-right: 20rpx;
+	}
+
+	.devices {
+		padding: 30rpx;
+	}
+
+	.btn {
+		margin-top: 30rpx;
+	}
+
+	.tishi {
+		margin-bottom: 20rpx;
 	}
 </style>

pages/recharge/recharge.vue

@@ -212,14 +212,14 @@
 							state.orderNum = checkResult.orders[0].orderNum;
 							setItem("orderNum", state.orderNum);
 							// 检测用户是否存在有半条流水
-							go()
+							// go()
 						} else {
 							console.log('没有可修复的流水')
 						}
 					});
 				} else {
 					// 检测用户是否存在有半条流水
-					go()
+					// go()
 				}
 			});
 		}
@@ -234,15 +234,29 @@
 		uni.showModal({
 			title: '提示',
 			content: '待消费订单',
-			success: () => {
-				//走蓝牙进行修复
-				uni.redirectTo({
-					url: `/pages/bluetooth/bluetooth?routeType=2&&cardId=${state.cardId}&&fee=${state.fee}`,
-				});
+			showCancel: false,
+			success: (res) => {
+				if (res.confirm) {
+					//走蓝牙进行修复
+					if (state.transWay == 'blu') {
+						uni.redirectTo({
+							url: `/pages/bluetooth/bluetooth?routeType=2&&cardId=${state.cardId}&&fee=${state.fee}`,
+						});
+					} else {
+						uni.redirectTo({
+							url: `/pages/nfc/nfc?routeType=2&&cardId=${state.cardId}&&fee=${state.fee}`,
+						});
+					}
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+
 				// state.isShowBlue=true;
 				console.log("state.isShowBlue", state.isShowBlue)
 			},
-			fail: () => { }
+			fail: () => {
+
+			}
 		})
 	}
 

pages/user/user.vue

@@ -169,7 +169,7 @@
 						</view>
 					</view>
 					<view class="car-item" v-for="(item,index) in state.list">
-						<image :src="`${$imgUrl}che.png`" class="car-pic"></image>
+						<image :src="`${$imgUrl}che.png`" class="car-pic" mode="aspectFill"></image>
 						<view class="car-info">
 							<view class="car-no"><text class="no">{{item.vehiclePlate}}</text><text
 									class="color">{{item.color}}</text></view>

static/nfc/NFCManagerTool.js

@@ -7,13 +7,13 @@ var isFirst = false;
 
 export function startScanNfcDevice(callBack) {
 	isFirst = false;
-	initNfcAdapter(function (res) {
+	initNfcAdapter(function(res) {
 		if (res.code == successCode) {
 			console.log('初始化NFC适配器实例成功', res)
 			//注册贴卡监听回调
-			nfcAdapter.onDiscovered(function (res) {
+			nfcAdapter.onDiscovered(function(res) {
 				console.log('监听回调到卡片了', res);
-				if(!isFirst) {
+				if (!isFirst) {
 					if (res.techs.includes(nfcAdapter.tech.isoDep)) { //获取isoDep实例
 						console.log('发现' + nfcAdapter.tech.isoDep + '卡');
 						isoDep = nfcAdapter.getIsoDep();
@@ -28,10 +28,10 @@ export function startScanNfcDevice(callBack) {
 			});
 			//开始监听贴卡
 			nfcAdapter.startDiscovery({
-				success: function (res) {
+				success: function(res) {
 					console.log('监听贴卡成功', res)
 				},
-				fail: function (err) {
+				fail: function(err) {
 					console.log('监听贴卡失败', err)
 					var msg = "";
 					if (err) {
@@ -59,6 +59,7 @@ export function offDiscovered(callBack) {
 	//注册贴卡监听回调
 	nfcAdapter.offDiscovered(discoverHandler);
 }
+
 function discoverHandler(res, callBack) {
 	if (res.techs.includes(nfcAdapter.tech.isoDep)) { //获取isoDep实例
 		console.log('发现' + nfcAdapter.tech.isoDep + '卡');
@@ -73,10 +74,10 @@ function discoverHandler(res, callBack) {
 export function startDiscovery(callBack) {
 	//开始监听贴卡
 	nfcAdapter.startDiscovery({
-		success: function (res) {
+		success: function(res) {
 			console.log('监听贴卡成功', res)
 		},
-		fail: function (err) {
+		fail: function(err) {
 			console.log('监听贴卡失败', err)
 			var msg = "";
 			if (err) {
@@ -94,14 +95,14 @@ export function startDiscovery(callBack) {
 export function stopScanNfcDevice(callBack) {
 	if (nfcAdapter != null) {
 		nfcAdapter.stopDiscovery({
-			success: function (res) {
+			success: function(res) {
 				callBack.call(this, {
 					code: successCode,
 					msg: "停止扫描成功",
 					data: null
 				})
 			},
-			fail: function (err) {
+			fail: function(err) {
 				var msg = "";
 				if (err) {
 					msg = nfcErrMsg(err.errCode)
@@ -124,7 +125,7 @@ export function stopScanNfcDevice(callBack) {
 export function connectDevice(callBack) {
 	if (isoDep != null) {
 		isoDep.connect({
-			success: function (res) {
+			success: function(res) {
 				console.log('连接卡片成功', res)
 				callBack.call(this, {
 					code: successCode,
@@ -132,12 +133,12 @@ export function connectDevice(callBack) {
 					data: null
 				})
 			},
-			fail: function (err) {
+			fail: function(err) {
 				var msg = "";
 				if (err) {
 					msg = nfcErrMsg(err.errCode)
 				}
-				console.log("链接卡片失败：",err.errCode)
+				console.log("链接卡片失败：", err.errCode)
 				callBack.call(this, {
 					code: errorCode,
 					msg: msg,
@@ -156,14 +157,14 @@ export function connectDevice(callBack) {
 export function disConnectDevice(callBack) {
 	if (isoDep != null) {
 		isoDep.close({
-			success: function (res) {
+			success: function(res) {
 				callBack.call(this, {
 					code: successCode,
 					msg: "断开卡片成功",
 					data: null
 				})
 			},
-			fail: function (err) {
+			fail: function(err) {
 				var msg = "";
 				if (err) {
 					msg = nfcErrMsg(err.errCode)
@@ -197,7 +198,7 @@ export function sendMessageToDevice(cmdArr, callBack) {
 		var sendbuf = hexStringToArrayBuffer(cmdArr[i]);
 		isoDep.transceive({
 			data: sendbuf,
-			success: function (res) {
+			success: function(res) {
 				var resultCmd = arrayBufferToHexString(res.data);
 				resultCmdArr.push(resultCmd);
 				if (resultCmdArr.length == cmdArr.length) {
@@ -208,7 +209,7 @@ export function sendMessageToDevice(cmdArr, callBack) {
 					})
 				}
 			},
-			fail: function (err) {
+			fail: function(err) {
 				if (i == 0) {
 					console.log('发送数据失败', err);
 					var msg = "";
@@ -233,7 +234,7 @@ export function removeObj() {
 
 
 function initNfcAdapter(callBack) {
-	nfcAdapter = uni.getNFCAdapter() //获取NFC适配器实例
+	nfcAdapter = wx.getNFCAdapter() //获取NFC适配器实例
 	console.log("获取NFC适配器实例:", nfcAdapter);
 	if (nfcAdapter != null) {
 		callBack.call(this, {
@@ -253,7 +254,7 @@ function initNfcAdapter(callBack) {
 //十六进制字符串转字节数组
 function hexStringToArrayBuffer(str) {
 	var hex = str;
-	return new Uint8Array(hex.match(/[\da-f]{2}/gi).map(function (h) {
+	return new Uint8Array(hex.match(/[\da-f]{2}/gi).map(function(h) {
 		return parseInt(h, 16)
 	})).buffer;
 };