修改bug

pages/recharge/recharge-pay.vue

@@ -21,6 +21,12 @@
 				</radio-group>
 			</view>
 		</view>
+		<!-- <view @click="goRecord">
+			<view style="display: flex;align-items: center;">
+				<image class="photo" :src="fileURL + 'image/index/consumptionDetails.png'"></image>充值明细
+			</view>
+			<image class="photo1" src="../../static/image/icon-back.png" mode="widthFix"></image>
+		</view> -->
 	</view>
 	<view class="tips" v-if="source=='WECHAT'">温馨提示: <text class="red">NFC充值</text>仅支持在<text
 			class="red">安卓手机</text>进行ETC储值卡充值!</view>

pages/recharge/recharge-weixin.vue

@@ -496,7 +496,7 @@
 								getCardId(1)
 								setTimeout(() => {
 									msg("充值成功");
-									navTo(`/pages/recharge/result`)
+									navTo(`/pages/recharge/result?cardId=${card.cardId}`)
 								}, 2000)
 							});
 						} else if (fixStatus === 1) {
@@ -660,7 +660,7 @@
 					getCardId(1)
 					setTimeout(() => {
 						msg("充值成功");
-						navTo(`/pages/recharge/result`)
+						navTo(`/pages/recharge/result?cardId=${card.cardId}`)
 					}, 2000)
 				}).catch((error) => {
 					console.log('输出内容', error)

pages/recharge/result.vue

@@ -1,13 +1,54 @@
 <template>
 	<view class="wrapper">
 		<image :src="`${$imgUrl}common/reharge-success.png`" class="pic-status" mode="widthFix"></image>
-		<view class="text-result">充值成功</view>
-		<view class="sub-text">您办理的账户充值业务已生成订单</view>
+		<view class="sub-text"><text>圈存前余额：</text><text>￥{{state.preBalance/100}}</text></view>
+		<view class="sub-text"><text>圈存金额：</text><text>￥{{state.rechargeAmount/100}}</text></view>
+		<view class="sub-text"><text>圈存后余额：</text><text>￥{{state.afterMoney/100}}</text></view>
 		<view class="btn btn-primary" @click="view">返回查看</view>
 	</view>
 </template>
 
 <script lang="ts" setup>
+	import { reactive } from "vue";
+	import {
+		rechargeMoneyApi
+	} from "@/utils/network/api.js";
+	import {
+		onLoad
+	} from "@dcloudio/uni-app";
+	import {
+		request
+	} from "@/utils/network/request.js";
+	import {
+		stringToJson
+	} from "@/utils/network/encryption.js";
+	const state = reactive({
+		cardId: "",
+		preBalance: 0,  //充值前余额
+		rechargeAmount: 0,//充值金额
+		afterMoney: 0  //充值后金额
+	})
+	onLoad((option) => {
+		state.cardId = option.cardId
+		money()
+	})
+	const money = () => {
+		const options = {
+			type: 2,
+			data: {
+				"cardId": state.cardId,
+			},
+			method: 'POST',
+			showLoading: true,
+		}
+		request(rechargeMoneyApi, options).then((res) => {
+			const data = stringToJson(res.bizContent);
+			state.preBalance = data.preBalance
+			state.rechargeAmount = data.rechargeAmount
+			state.afterMoney = Number(data.rechargeAmount) + Number(data.preBalance)
+			console.log("圈存金额查询2", data)
+		})
+	}
 	const view = () => {
 		uni.navigateBack()
 	}
@@ -18,7 +59,6 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-		text-align: center;
 	}
 
 	.text-result {
@@ -28,10 +68,16 @@
 	}
 
 	.sub-text {
-		font-size: 26rpx;
+		font-size: 30rpx;
 		font-weight: 400;
-		color: #999999;
+		color: black;
 		padding-top: 40rpx;
+		margin-left: 250rpx;
+	}
+
+	.sub-text>text:first-child {
+		width: 36%;
+		display: inline-block;
 	}
 
 	.pic-status {

pages/user/user.vue

@@ -790,7 +790,6 @@
 	.cars .car-info {
 		display: flex;
 		flex-direction: column;
-		/* flex: 1; */
 		color: #999;
 		font-size: 22rpx;
 		width: 56%;
@@ -834,7 +833,6 @@
 
 	.menu {
 		background: #ffffff;
-		/* border-radius: 30rpx 30rpx 0 0; */
 		padding: 0 30rpx;
 		margin: 0 30rpx 30rpx;
 		border-radius: 20rpx;
@@ -856,7 +854,6 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		/* border-bottom: 1px solid #dcdcdc; */
 		padding: 20rpx 0;
 	}
 

subpackage/after-sale/activation/operation-tips.vue

@@ -32,7 +32,8 @@
 <script setup lang="ts">
 	import {
 		msg,
-		navTo
+		navTo,
+		noticeUser
 	} from '@/utils/utils';
 	import { setItem } from "@/utils/storage";
 	import { onLoad } from "@dcloudio/uni-app";
@@ -55,24 +56,25 @@
 	})
 
 	const gotoNextStep = () => {
-		uni.openBluetoothAdapter()
-		/* 判断是否打开蓝牙 */
-		uni.getBluetoothAdapterState({
-			success(res) {
-				//如果res.avaliable==false 说明没打开蓝牙 反之则打开
-				if (res.available == false) {
-					uni.showToast({
-						title: '请打开手机蓝牙',
-						icon: "error",
-						duration: 2000
-					})
-					return
-				} else {
-					navTo(`/subpackage/after-sale/activation/operation-upload?transfer=${transfer}`)
+		noticeUser(() => {
+			uni.openBluetoothAdapter()
+			/* 判断是否打开蓝牙 */
+			uni.getBluetoothAdapterState({
+				success(res) {
+					//如果res.avaliable==false 说明没打开蓝牙 反之则打开
+					if (res.available == false) {
+						uni.showToast({
+							title: '请打开手机蓝牙',
+							icon: "error",
+							duration: 2000
+						})
+						return
+					} else {
+						navTo(`/subpackage/after-sale/activation/operation-upload?transfer=${transfer}`)
+					}
 				}
-			}
-		})
-
+			})
+		});
 	}
 </script>
 

subpackage/after-sale/progress-query/progress-query-business-details.vue

@@ -6,7 +6,6 @@
 			<view v-if="state.params['cardId']"><text>卡号：</text><text>{{state.params['cardId']}}</text></view>
 			<view v-if="state.params['obuId']"><text>OBU号：</text><text>{{state.params['obuId']}}</text></view>
 			<view><text>订单ID：</text><text>{{state.params['orderId']}}</text></view>
-			<view><text>工单ID：</text><text>{{state.params['workOrderId']}}</text></view>
 			<view><text>业务类型：</text><text>{{state.params['businessTypeC']}}</text></view>
 			<view><text>用户名称：</text><text>{{state.params['customerName']}}</text></view>
 			<view><text>是否逾期：</text><text>{{state.params['over']?'逾期':"未逾期"}}</text>
@@ -35,9 +34,7 @@
 	});
 	onLoad((options) => {
 		state.params = JSON.parse(decodeURIComponent(options.params))
-		// state.promoteId = state.params.promoteId
 		console.log("options.promoteId", state.params)
-		// query();
 	})
 	const query = () => {
 		const options = {

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

@@ -23,13 +23,6 @@
 				<u-form-item prop="cardState">
 					<view class="from_item">
 						<text><text style="color: red">*</text>是否寄回设备：</text>
-						<!-- <u-radio-group v-model="form.sendStatusName">
-							<u-radio :customStyle="{ marginBottom: '8px' }" activeColor="#2CE242"
-								v-for="(item, index) in radiolist1" :key="index" :label="item.disabled"
-								:name="item.name">
-								{{ item.name }}
-							</u-radio>
-						</u-radio-group> -->
 						<radio-group @change="sendChange" class="radios">
 							<block v-for="(item, index) in radiolist1" :key="item.val">
 								<view class="radio-box">
@@ -60,13 +53,6 @@
 				<u-form-item prop="cardState">
 					<view class="from_item">
 						<text><text style="color: red">*</text>收货方式：</text>
-						<!-- <u-radio-group v-model="form.receiveMethodName">
-							<u-radio :customStyle="{ marginBottom: '8px' }" activeColor="#2CE242"
-								v-for="(item, index) in radiolist2" :key="index" :label="item.disabled"
-								:name="item.name">
-								{{ item.name }}
-							</u-radio>
-						</u-radio-group> -->
 						<radio-group @change="receiveChange" class="radios">
 							<block v-for="(item, index) in radiolist2" :key="item.val">
 								<view class="radio-box">
@@ -143,7 +129,6 @@
 </template>
 
 <script setup lang="ts">
-	// import navBar from "../ETCcancellation/components/nav-bar.vue";
 	import {
 		reactive,
 		ref
@@ -178,7 +163,7 @@
 
 	} from "@/utils/network/api";
 	import {
-		msg
+		msg, noticeUser
 	} from "@/utils/utils";
 	const list = reactive([]); //物流数据
 	const apply = reactive({
@@ -189,7 +174,6 @@
 
 	});
 
-
 	const address = reactive({
 		list: [],
 		show: false
@@ -214,8 +198,6 @@
 
 	//入参
 	const params = reactive({
-		/* cardId: '',
-		obuId: '', */
 		orderId: '',
 		id: '',
 	});
@@ -236,20 +218,12 @@
 		name: "寄回",
 		val: "1",
 	},
-		// {
-		// 	name: "不寄回",
-		// 	val: "0",
-		// },
 	]);
 
 	const radiolist2 = reactive([{
 		name: "邮寄",
 		val: "1",
 	},
-		// {
-		// 	name: "不邮寄",
-		// 	val: "0",
-		// },
 	]);
 
 	const goToAddAddress = () => {
@@ -265,11 +239,6 @@
 
 	const addressSelected = (val : any) => {
 		console.log(val);
-		// state.data = {
-		// 	...state.data,
-		// 	...val,
-		// };
-		// state.show = false;
 		form.consignee = val.consignee
 		form.consigneeTel = val.consigneeTel
 		form.address = val.address
@@ -353,11 +322,7 @@
 		//参数说明
 		let options = {
 			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
-			data: {
-				// opId: getItem("openId"),
-				// source: "WECHAT",
-				// tabIndex: "0",
-			}, //请求参数
+			data: {}, //请求参数
 			method: "POST", //提交方式(默认POST)
 			showLoading: true, //是否显示加载中(默认显示)
 		};
@@ -365,7 +330,6 @@
 		//调用方式
 		request(getLogistics, options)
 			.then((res) => {
-				// stringToJson(res.bizContent)
 				console.log("物流", res)
 				stringToJson(res.bizContent).forEach((item) => {
 					list.push({
@@ -404,12 +368,14 @@
 		});
 	};
 	const submit = () => {
-		queryCckChangejzCardInfo().then(val => {
-			console.log("queryCckChangejzCardInfo", val)
-			navTo(
-				`/subpackage/after-sale/replace-equipment/result`
-			)
-		})
+		noticeUser(() => {
+			queryCckChangejzCardInfo().then(val => {
+				console.log("queryCckChangejzCardInfo", val)
+				navTo(
+					`/subpackage/after-sale/replace-equipment/result`
+				)
+			})
+		});
 	};
 	const queryCckChangejzCardInfo = () => {
 		if (!form.address) {

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

@@ -3,10 +3,10 @@
 		<view class="content">
 			<image :src="`${$imgUrl}ETCcancellation/bg1.png`" mode=""></image>
 			<view class="title">
-				办理成功
+				待审核
 			</view>
 			<view class="">
-				您办理的更换卡签业务已完成
+				请到【查询服务】的【业务审核查询】查看进度
 			</view>
 		</view>
 	</view>
@@ -41,7 +41,8 @@
 			flex-direction: column;
 			justify-content: center;
 			align-items: center;
-			padding: 130rpx;
+			padding: 130rpx 0;
+
 
 			image {
 				width: 390rpx;
@@ -80,4 +81,4 @@
 		left: 50%;
 		transform: translate(-50%);
 	}
-</style>
+</style>

subpackage/after-sale/rescind-carId/rescind-carId-select.vue

@@ -1,25 +1,4 @@
 <template>
-	<!-- 	<view class="content-wrap">
-				<view @click="tabChange(true)">
-			<view :class="state.isMyPeopple ? 'big' : 'nomal'"> 本人车辆 </view>
-			<view :class="state.isMyPeopple ? 'tip' : ''"> </view>
-		</view>
-		<view @click="tabChange(false)" style="margin-left: 60rpx" class="">
-			<view :class="state.isMyPeopple ? 'nomal' : 'big'"> 他人车辆 </view>
-			<view :class="state.isMyPeopple ? '' : 'tip'"> </view>
-		</view>
-	</view> -->
-	<!-- 	<view v-if="state.isMyPeopple" class="content">
-		<view class="item" v-for="(item, i) in list" :key="i">
-			<view class="iten-left">
-				<image :src="`${$imgUrl}che.png`" mode=""></image>
-				<text>{{ item.name }}</text>
-			</view>
-			<view class="choose-item" @click="choose(i, item)">
-				<view class="active" v-if="flag == i"> </view>
-			</view>
-		</view>
-	</view> -->
 
 	<view class="content">
 		<view class="title"> 车主信息 </view>
@@ -56,27 +35,6 @@
 			</view>
 		</view>
 
-		<view class="shibie-wrapper">
-			<!-- 			<view class="title"> 识别内容如下 </view>
-			<u-form label-width="200" :model="state.form" ref="uForm">
-				<u-form-item label="姓名">
-					<u-input v-model="state.form.userName" />
-				</u-form-item>
-
-				<u-form-item label="性别">
-					<u-input v-model="state.form.gender" type="select" />
-				</u-form-item>
-				<u-form-item label="身份证号">
-					<u-input v-model="state.form.userIdNum" />
-				</u-form-item>
-				<u-form-item label="证件有效期">
-					<u-input v-model="state.form.tmerValidity" type="select" />
-				</u-form-item>
-				<u-form-item label="地址">
-					<u-input v-model="state.form.address" />
-				</u-form-item>
-			</u-form> -->
-		</view>
 		<view style="margin-top: 30rpx" class="title"> 行驶证信息 </view>
 		<view class="item-tips">
 			<view class="title"> 上传后请核对识别信息 </view>
@@ -161,40 +119,6 @@
 				<u-form-item label="车牌颜色">
 					<u-input v-model="state.form.caridCorlor" type="select" @click="show1 = true" />
 				</u-form-item>
-				<!-- 				<u-form-item label="所有人">
-					<u-input v-model="state.form.man" />
-				</u-form-item>
-				<u-form-item label="车辆类型">
-					<u-input v-model="state.form.vehicleType" />
-				</u-form-item>
-				<u-form-item label="使用性质">
-					<u-input v-model="state.form.character" />
-				</u-form-item>
-				<u-form-item label="车辆识别代码">
-					<u-input v-model="state.form.vin" />
-				</u-form-item>
-				<u-form-item label="发动机号码">
-					<u-input v-model="state.form.engineNum" />
-				</u-form-item>
-
-				<u-form-item label="注册日期">
-					<u-input v-model="state.form.register" />
-				</u-form-item>
-				<u-form-item label="发证日期">
-					<u-input v-model="state.form.issueDate" />
-				</u-form-item>
-				<u-form-item label="核定载人数">
-					<u-input v-model="state.form.approvedCount" />
-				</u-form-item>
-				<u-form-item label="整备质量">
-					<u-input v-model="state.form.maintenaceMass" />
-				</u-form-item>
-				<u-form-item label="外廓尺寸">
-					<u-input v-model="state.form.vehicleDimensions" />
-				</u-form-item>
-				<u-form-item label="总质量">
-					<u-input v-model="state.form.totalMass" />
-				</u-form-item> -->
 			</u-form>
 		</view>
 
@@ -435,37 +359,7 @@
 		});
 	};
 
-	// //tab切换
-	// const tabChange = (val: any) => {
-	// 	if (val) {
-	// 		state.isMyPeopple = true;
-	// 	} else {
-	// 		state.isMyPeopple = false;
-	// 	}
-	// 	state.form = {
-	// 		orderId: state.orderId, //订单ID
-	// 		userName: "", //开户人姓名
-	// 		userIdType: "101", //用户证件类型 101//身份证
-	// 		userIdNum: "", //用户证件号码
-	// 		userPosImgUrl: "", //身份证正面
-	// 		userNegImgUrl: "", //身份证反面
-	// 		tel: "", //开户人手机号
-	// 		address: "", //开户人地址
-	// 		sceneType: "", //用户协议支撑服务场景（发行服务机构和用户签订的协议）
-	// 		channelId: "", //渠道id
-	// 		gender: "",
-	// 		customerIdVld: "",
-	// 		agentName: "",
-	// 		agentgender: "",
-	// 		agentIdType: "101",
-	// 		agentIdNum: "",
-	// 		agentPosImgUrl: "",
-	// 		agentNegImgUrl: "",
-	// 		proxyUrl: "",
-	// 		agentAddress: "",
-	// 		tmerValidity: "",
-	// 	};
-	// };
+
 	onLoad((option : any) => {
 		state.form.orderId = option.orderId;
 		state.orderId = option.orderId;

subpackage/after-sale/rescind-carId/result.vue

@@ -3,14 +3,14 @@
 		<view class="content">
 			<image :src="`${$imgUrl}ETCcancellation/bg1.png`" mode=""></image>
 			<view class="title">
-				办理成功
+				待审核
 			</view>
 			<view class="">
-				您的车辆{{}}解除车牌占用申请已提交
+				您的车辆{{}}解除车牌占用申请已提交，请到【查询服务】的【业务审核查询】查看进度
 			</view>
 		</view>
 	</view>
-	<button class="submit" @click="submit">返回更多</button>
+	<button class="submit" @click="submit">返回</button>
 </template>
 
 <script setup lang="ts">

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

@@ -3,10 +3,10 @@
 		<view class="content">
 			<image :src="`${$imgUrl}ETCcancellation/bg1.png`" mode=""></image>
 			<view class="title">
-				办理成功
+				待审核
 			</view>
 			<view class="">
-				您办理的业务已经办理成功
+				请到【查询服务】的【业务审核查询】查看进度
 			</view>
 		</view>
 	</view>
@@ -22,15 +22,6 @@
 	import {
 		navTo
 	} from "@/utils/utils"
-	let model1 = reactive({
-		uname: '输入验证码',
-		phone: '135****9090',
-		code: ''
-	})
-
-	const getCode = () => {
-		console.log(123);
-	}
 
 	const submit = () => {
 		console.log(11);

subpackage/orders/apply-ex-goods.vue

@@ -475,7 +475,7 @@
 				console.log("提交数据", options);
 				request(orderExchange, options).then((res) => {
 					confirm(
-						"您申办的ETC订单已申请换货",
+						"您申办的ETC订单已申请换货,待审核，请到【查询服务】的【业务审核查询】查看进度",
 						() => {
 							uni.$emit("refreshOrder");
 							uni.navigateBack({

subpackage/orders/apply-return-goods.vue

@@ -204,10 +204,9 @@
 
 				request(orderReturn, options).then((res) => {
 					confirm(
-						"您申办的ETC订单已申请退货",
+						"您申办的ETC订单已申请退货,待审核，请到【查询服务】的【业务审核查询】查看进度",
 						() => {
 							uni.$emit("refreshOrder");
-							// uni.navigateBack();
 							uni.switchTab({
 								url: "/pages/order/order"
 							})

subpackage/orders/essential-information.vue

@@ -126,7 +126,7 @@
 	} from "@/utils/network/api.js";
 	import { request } from "@/utils/network/request.js";
 	import { reactive, ref } from "vue";
-	import { msg } from "@/utils/utils";
+	import { msg, noticeUser } from "@/utils/utils";
 	// import  amap from "../../lib/amap-uni.130.js";//引入高德地图小程序插件
 	const scrollTop = ref(0);
 	const state = reactive({
@@ -261,15 +261,9 @@
 		state.show = false;
 	};
 	const nextAction = () => {
-		uni.requestSubscribeMessage({
-			tmplIds: ['Uo2y_eF53CZt7vffE-5ktKQ7WxUhX8n5GVqVlmykmDE'],
-			complete(res) {
-				console.log("通知用户消息订阅", res)
-				nextActionRequest()
-			}
-		})
-
-
+		noticeUser(() => {
+			nextActionRequest()
+		});
 	};
 	const nextActionRequest = () => {
 		if (!state.data.vehiclePlate) {

subpackage/orders/order-details-new.vue

@@ -153,7 +153,7 @@
 								<text class="d-value">{{state.orderInfo.cardId ?state.orderInfo.cardId: ''}}</text>
 							</view>
 
-							<view class="d-row">
+							<view class="d-row" v-if="state.orderInfo.cardStatus">
 								<text class="d-label">卡 状 态：</text>
 								<text class="d-value">{{getETCStatusName(state.orderInfo.cardStatus)}}</text>
 							</view>
@@ -162,7 +162,7 @@
 								<text class="d-value">{{state.orderInfo.obuId ?state.orderInfo.obuId: ''}}</text>
 							</view>
 
-							<view class="d-row">
+							<view class="d-row" v-if="state.orderInfo.obuStatus">
 								<text class="d-label">OBU状态：</text>
 								<text class="d-value">{{getOBUStatusName(state.orderInfo.obuStatus)}}</text>
 							</view>
@@ -209,7 +209,7 @@
 								<text class="d-value">{{state.orderInfo.cardId ?state.orderInfo.cardId: ''}}</text>
 							</view>
 
-							<view class="d-row">
+							<view class="d-row" v-if="state.orderInfo.cardStatus">
 								<text class="d-label">卡 状 态：</text>
 								<text class="d-value">{{getETCStatusName(state.orderInfo.cardStatus)}}</text>
 							</view>
@@ -218,7 +218,7 @@
 								<text class="d-value">{{state.orderInfo.obuId ?state.orderInfo.obuId: ''}}</text>
 							</view>
 
-							<view class="d-row">
+							<view class="d-row" v-if="state.orderInfo.obuStatus">
 								<text class="d-label">OBU状态：</text>
 								<text class="d-value">{{getOBUStatusName(state.orderInfo.obuStatus)}}</text>
 							</view>

subpackage/personal-center/consumption-record.vue

@@ -43,7 +43,6 @@
 	onLoad((option : any) => {
 		console.log("option", option)
 		state.cardId = option.cardId;
-		getList();
 	})
 	onShow(() => {
 		state.pageNo = 1
@@ -122,9 +121,7 @@
 			const data = stringToJson(res.bizContent);
 			console.log("data", data)
 			if (data.refundStatus == "SUCCESS") {
-				// 刷新列表
-				state.pageNo == 1
-				getList();
+
 			} else if (data.refundStatus == "CLOSED") {
 				msg('退款关闭')
 			} else if (data.refundStatus == "HANDLING") {
@@ -132,6 +129,13 @@
 			} else if (data.refundStatus == "EXCEPTION") {
 				msg('退款异常')
 			}
+			setTimeout(() => {
+				console.log("刷新")
+				// 刷新列表
+				state.pageNo == 1
+				getList();
+			}, 1500)
+
 		})
 	}
 	// 退款代码完成

utils/network/api.js

@@ -288,4 +288,5 @@ export const appPage = "608fc3bddd3e4d7b8667b71b743f1b52" //app分页
 export const noActivationOrder = "fa0ef243d4044a96b5fb0186081baf20" //所有待激活订单
 export const accountMoneyApi = "7c0846300c6f490abd35120931fcd663" //对公账户余额
 export const addProductInterestApi = "aa7ce8d0b64a4396a42c57bac6cd2433" //权益产品评价完成调用
-export const cancellRefoundApi = "441ea77c279046d192bc3c6abf07c952" //注销退费查询
+export const cancellRefoundApi = "441ea77c279046d192bc3c6abf07c952" //注销退费查询
+export const rechargeMoneyApi = "9d6c8c65490b426ca65e8add1aa977da" //查询充值成功后的金额

utils/utils.ts

@@ -643,12 +643,12 @@ export function subscribeMessages() {
 	})
 }
 // 通知用户消息订阅
-export function noticeUser() {
+export const noticeUser = (callback : Function) => {
 	uni.requestSubscribeMessage({
-		tmplIds: [''],
-		success(res) {
+		tmplIds: ['Uo2y_eF53CZt7vffE-5ktKQ7WxUhX8n5GVqVlmykmDE'],
+		complete(res) {
 			console.log("通知用户消息订阅", res)
-			return true
+			callback()
 		}
 	})
 }