提交

components/search-picker/search-picker.vue

@@ -120,7 +120,8 @@
 		width: 100%;
 		top: 0rpx;
 		background: rgba(0, 0, 0, .5);
-		height: calc(100% - 500rpx);
+		/* height: calc(100% - 500rpx); */
+		height: 100vh;
 	}
 
 	.chaxunjieguo {
@@ -143,7 +144,10 @@
 		overflow: hidden;
 		background: #fff;
 		bottom: 0;
-		/* z-index: 1000; */
+		top: 0;
+		left: 0;
+		right: 0;
+		margin: auto;
 	}
 
 	.date-confirm {

pages.json

@@ -294,6 +294,12 @@
 						"navigationBarTitleText": "OBU重新激活"
 					}
 				},
+				{
+					"path": "activation-once-again/activation-once-again-record",
+					"style": {
+						"navigationBarTitleText": "OBU重新激活记录"
+					}
+				},
 				{
 					"path": "activation-once-again/select-car",
 					"style": {

pages/recharge/recharge-weixin.vue

@@ -19,15 +19,10 @@
 			<view class="tips">最低充值金额不小于10元</view>
 		</view>
 		<view class="tabs">
-			<view class="tab-tit as-gravity-center-start">充值方式
-				<!-- <radio-group @change="radioChange" style="flex: 1;display:flex;margin-right: 30rpx;">
-					<radio class="as-weight as-gravity-center" value="blu" :checked="state.transWay === 'blu'">蓝牙
-					</radio>
-					<radio class="as-weight" value="nfc" :checked="state.transWay === 'nfc'">NFC</radio>
-				</radio-group> -->
+			<!-- <view class="tab-tit as-gravity-center-start">充值方式
 				<u-input @click="state.transWayTypeShow = true" inputAlign="center" v-model="state.transWayName"
 					type="select" />
-			</view>
+			</view> -->
 
 			<view class="tab-tit">在线充值</view>
 			<view class="tab">
@@ -39,7 +34,6 @@
 
 	</view>
 	<u-select v-model="state.transWayTypeShow" :list="state.transWayTypeList" @confirm="selectConfirm"></u-select>
-	<!-- <bluetooth :routeType="2" :cardId="state.cardId"  v-if="state.isShowBlue" @submit="getParams"></bluetooth> -->
 </template>
 
 <script setup lang="ts">
@@ -202,14 +196,12 @@
 							state.orderNum = checkResult.orders[0].orderNum;
 							setItem("orderNum", state.orderNum);
 							// 检测用户是否存在有半条流水
-							// go()
 						} else {
 							console.log('没有可修复的流水')
 						}
 					});
 				} else {
 					// 检测用户是否存在有半条流水
-					// go()
 				}
 			});
 		}
@@ -234,42 +226,34 @@
 			success: (res) => {
 				if (res.confirm) {
 					//走蓝牙进行修复
-					quanCheckActionTrue().then((val : any) => {
-						console.log("圈层检测val", val)
-						//如果 圈层检测正常
-						if (val.chargeStatus === 1) {
-							console.log(`进行充值检测`);
-							czCheckAction().then((checkResult : any) => {
-								//判断订单逻辑如果有订单充值 则直接拿到订单去链接蓝牙
-								if (checkResult.orders && checkResult.orders.length > 0) {
-									//拿到订单,存起来
-									state.orderNum = checkResult.orders[0].orderNum;
-									setItem("orderNum", state.orderNum);
-									// 检测用户是否存在有半条流水
-									getCardId()
-								} else {
-									console.log('没有可修复的流水')
-								}
-							});
-						} else {
+					// quanCheckActionTrue().then((val : any) => {
+					// 	console.log("圈层检测val", val)
+					// 	//如果 圈层检测正常
+					// 	if (val.chargeStatus === 1) {
+					console.log(`进行充值检测`);
+					czCheckAction().then((checkResult : any) => {
+						//判断订单逻辑如果有订单充值 则直接拿到订单去链接蓝牙
+						if (checkResult.orders && checkResult.orders.length > 0) {
+							//拿到订单,存起来
+							state.orderNum = checkResult.orders[0].orderNum;
+							setItem("orderNum", state.orderNum);
 							// 检测用户是否存在有半条流水
-							// go()
+							getCardId()
+						} else {
+							console.log('没有可修复的流水')
 						}
 					});
-					// 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}`,
-					// 	});
+					// 	// 检测用户是否存在有半条流水
+					// 	let fixFee = val.fixFee / 100
+					// 	console.log("fixFee", fixFee)
+					// 	go(fixFee)
 					// }
+					// });
 				} else if (res.cancel) {
 					console.log('用户点击取消');
 				}
 
-				// state.isShowBlue=true;
 				console.log("state.isShowBlue", state.isShowBlue)
 			},
 			fail: () => {
@@ -332,7 +316,10 @@
 							});
 						} else {
 							//走蓝牙进行修复
-							go()
+							// 圈存检测异常,继续上次圈存 chargeStatus==2
+							let fixFee = val.fixFee / 100
+							console.log("fixFee", fixFee)
+							go(fixFee)
 						}
 					});
 				}
@@ -880,15 +867,6 @@
 			const data = stringToJson(res.bizContent);
 			if (data.tradeState === "SUCCESS") {
 				getCardId();
-				// 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}`,
-				// 	});
-				// }
 			}
 			console.log(data);
 		});

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

@@ -0,0 +1,109 @@
+<template>
+	<view class="selectCar-box">
+		<view v-if="state.list.length > 0" class="item" v-for="(item, i) in state.list" :key="i">
+			<view class="details-item">
+				<view> 卡号： </view>
+				<text>{{ item.cardId }}</text>
+			</view>
+			<view class="details-item">
+				<view> 签号： </view>
+				<text>{{ item.obuId }}</text>
+			</view>
+			<view class="details-item">
+				<view> 激活时间： </view>
+				<text>{{ item.insertTime }}</text>
+			</view>
+
+		</view>
+		<view v-else class="flex"> 暂无OBU重新激活记录 </view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import { reactive, ref } from "vue";
+	import { navTo } from "@/utils/utils";
+	import { onLoad, onShow } from "@dcloudio/uni-app";
+	import { activationRecordApi } from "@/utils/network/api.js";
+	import { request } from "@/utils/network/request.js";
+	import { msg } from "@/utils/utils";
+	import { getItem, StorageKeys, setItem } from "@/utils/storage";
+	import { stringToJson } from "@/utils/network/encryption";
+
+	const state = reactive({
+		list: [],
+		cardId: "",
+		obuId: ""
+	});
+	onLoad((options) => {
+		console.log("iooooo", options)
+		state.cardId = options.cardId
+		state.obuId = options.obuId
+		activationRecordQuery().then((item : any) => {
+			state.list = item.data
+			console.log(item);
+		});
+	});
+	// 查询重新激活记录
+	const activationRecordQuery = () => {
+		const options = {
+			type: 2,
+			data: {
+				cardId: state.cardId,
+				obuId: state.obuId,
+			},
+			method: "POST",
+			showLoading: true,
+		};
+
+		return new Promise(async (resolve, reject) => {
+			const res = await request(activationRecordApi, options);
+			const data = stringToJson(res.bizContent);
+			resolve(data);
+		}).catch((error) => {
+			reject(error);
+		});
+	}
+</script>
+
+<style>
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #eef7f7;
+	}
+</style>
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		justify-content: center;
+	}
+
+	.selectCar-box {
+		height: 100%;
+		padding: 30rpx;
+
+		.item {
+			padding: 20rpx;
+			background: #ffffff;
+			box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
+			border-radius: 20rpx;
+			margin-bottom: 30rpx;
+		}
+	}
+
+	.details-item {
+		display: flex;
+		font-size: 26rpx;
+		font-family: Noto Sans S Chinese;
+		font-weight: 400;
+		color: #999999;
+		margin-bottom: 30rpx;
+
+		text {
+			font-size: 26rpx;
+			font-family: Noto Sans S Chinese;
+			font-weight: 400;
+			color: #333333;
+		}
+	}
+</style>

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

@@ -32,6 +32,11 @@
 				<view> 收费车型： </view>
 				<text>{{ orderInfos.vehicleType }}</text>
 			</view>
+			<view class="details-item">
+				<view> 重新激活次数： </view>
+				<text>{{ state.activationNum }}次</text>
+				<text class="record" style="color:#00b38b" @click="goActivationRecord">OBU重新激活记录</text>
+			</view>
 		</view>
 		<view class="title"> 卡信息 </view>
 		<view class="card">
@@ -164,7 +169,8 @@
 			vehPosImgUrl: "",
 			vehNegImgUrl: "",
 			vehicleIdNum: ""
-		}
+		},
+		activationNum: "",//激活次数
 	})
 
 	//订单
@@ -300,6 +306,11 @@
 			orderInfos.approvedCount = orderInfo.vehicleApprovedCount;
 			orderInfos.vehicleVin = orderInfo.vehicleVin;
 			orderInfos.vehicleEngineNum = orderInfo.vehicleEngineNum;
+			activationRecordQuery().then((val) => {
+				console.log("jihuo", val)
+				state.activationNum = val.num
+			});
+
 		});
 	};
 
@@ -536,6 +547,11 @@
 			console.log("提交车辆信息成功")
 		});
 	}
+	const goActivationRecord = () => {
+		uni.navigateTo({
+			url: `/subpackage/after-sale/activation-once-again/activation-once-again-record?obuId=${orderInfos.obuId}&&cardId=${orderInfos.cardId}`
+		})
+	}
 </script>
 
 <style>
@@ -813,4 +829,16 @@
 		top: 0;
 		z-index: 11111;
 	}
+
+	.record {
+		height: 40rpx;
+		background: #d3f2ef;
+		border-radius: 6rpx;
+		font-size: 20rpx;
+		font-family: Noto Sans S Chinese;
+		font-weight: 400;
+		color: #0a8f8a;
+		padding: 5rpx 10rpx;
+		margin-left: 60rpx;
+	}
 </style>