Merge branch 'master' of http://192.168.40.220/dmc/jz_applet

after-sale/replace-equipment/form.vue

 			name: "不邮寄",
 			disabled: false,
 		},
-	]);
-
+	]);
+	
+	
 	let showApplyRes = ref(false);
 
 	// 打开物流先择器
 		queryCckChangejzCardInfo().then(val => {
 			console.log(val)
 			navTo(
-				`/after-sale/to-bookkeeping-card/result`
+				`/after-sale/replace-equipment/result`
 			)
 		})
 	};

after-sale/replace-equipment/result.vue

-<template>
-	<view class="oderPage">
-		<view class="content">
-			<image :src="`${$imgUrl}ETCcancellation/bg1.png`" mode=""></image>
-			<view class="title">
-				办理成功
-			</view>
-			<view class="">
-				您办理的更换ETC设备业务已生成订单
-			</view>
-		</view>
-	</view>
-	<button class="submit" @click="submit">查看订单</button>
-</template>
-
-<script setup lang="ts">
-	import navBar from "./components/nav-bar.vue"
-	import {
-		ref,
-		reactive
-	} from "vue";
-	import {
-		navTo
-	} from "@/utils/utils"
-	let model1 = reactive({
-		uname: '输入验证码',
-		phone: '135****9090',
-		code: ''
-	})
-
-	const getCode = () => {
-		console.log(123);
-	}
-
-	const submit = () => {
-		console.log(11);
-		uni.reLaunch({
-			url: '/pages/service/service'
-		});
-	}
-</script>
-
-
-<style>
-	page {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-	}
-</style>
-<style lang="scss" scoped>
-	.oderPage {
-		flex: 1;
-		width: 100%;
-
-		.content {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			padding: 130rpx;
-
-			image {
-				width: 390rpx;
-				height: 307rpx;
-				margin-bottom: 20rpx;
-			}
-
-			.title {
-				font-size: 38rpx;
-				font-weight: 600;
-				font-size: 40rpx;
-				font-family: Microsoft YaHei UI;
-				color: #2A2A2A;
-			}
-
-			view {
-				margin: 15rpx 0;
-				font-size: 28rpx;
-				font-family: Microsoft YaHei UI;
-				font-weight: 400;
-				color: #717171;
-			}
-		}
-	}
-
-	.submit {
-		background: linear-gradient(to left, #43A1E0 0%, #13E7C1 100%);
-		width: 670rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		font-size: 32rpx;
-		color: #fff;
-		border-radius: 100rpx;
-		position: fixed;
-		bottom: 60rpx;
-		left: 50%;
-		transform: translate(-50%);
-	}
+<template>
+	<view class="oderPage">
+		<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>
+</template>
+
+<script setup lang="ts">
+	const submit = () => {
+		let routes = getCurrentPages();
+		uni.navigateBack({
+			delta: routes.length - 2
+		});
+	}
+</script>
+
+
+<style>
+	page {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+</style>
+<style lang="scss" scoped>
+	.oderPage {
+		flex: 1;
+		width: 100%;
+
+		.content {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			padding: 130rpx;
+
+			image {
+				width: 390rpx;
+				height: 307rpx;
+				margin-bottom: 20rpx;
+			}
+
+			.title {
+				font-size: 38rpx;
+				font-weight: 600;
+				font-size: 40rpx;
+				font-family: Microsoft YaHei UI;
+				color: #2A2A2A;
+			}
+
+			view {
+				margin: 15rpx 0;
+				font-size: 28rpx;
+				font-family: Microsoft YaHei UI;
+				font-weight: 400;
+				color: #717171;
+			}
+		}
+	}
+
+	.submit {
+		background: linear-gradient(to left, #43A1E0 0%, #13E7C1 100%);
+		width: 670rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		font-size: 32rpx;
+		color: #fff;
+		border-radius: 100rpx;
+		position: fixed;
+		bottom: 60rpx;
+		left: 50%;
+		transform: translate(-50%);
+	}
 </style>

after-sale/replace-equipment/select-car.vue

 <template>
 	<view class="selectCar-box">
-		<view v-if="state.list.length>0" @click="choose(i,item)" class="item" v-for="(item,i) in state.list" :key="i">
+		<view v-if="state.list&&state.list.length>0" @click="choose(i,item)" class="item" v-for="(item,i) in state.list"
+			:key="i">
 			<view class="iten-left">
 				<image :src="`${$imgUrl}che.png`" mode=""></image>
 				<text>{{item.vehiclePlate}}</text>
 				</view>
 			</view>
 		</view>
-		<view v-else class="flex">
-			暂无车辆订单信息
+
+		<view v-else>
+			<empty title='暂无找到相关车辆信息' />
 		</view>
 	</view>
 </template>
 
 <script lang="ts" setup>
+	import empty from "@/components/empty/empty.vue";
 	import {
 		reactive,
 		ref
 	} from "@/utils/utils"
 	import {
 		onLoad,
-		onShow
 	} from "@dcloudio/uni-app";
 	import {
 		orderList
 	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: []
+		list: [] //车辆list
 	});
+	const flag = ref('0') //默认选择0
+
 	onLoad(() => {
 		quanCheckActionTrue().then((item: any) => {
 			state.list = item.data
-			console.log(item)
 		})
 	});
+
 	const quanCheckActionTrue = () => {
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT',
-			tabIndex: '0',
-			orderStep: '11',
-			isValueCard: '2'
+			source: 'WECHAT', //渠道为小程序
+			tabIndex: '0', //0全部
+			orderStep: '11', //11 为已完成”
 		};
 		const options = {
 			type: 2,
 			reject(error);
 		});
 	}
-	const flag = ref('0')
 
 	const choose = (i, item) => {
+		flag.value = i
 		navTo(`/after-sale/replace-equipment/replace-equipment-confirm?id=${item.id}`)
-	}
-	
+	}
 </script>
 
 <style>