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

after-sale/replace-equipment/verification.vue

@@ -277,19 +277,19 @@
 
 	//下一步
 	const toPage = () => {
-		// myForm.value.validate((valid) => {
-		// 	if (valid) {
-		// 		const options = {
-		// 			type: 2,
-		// 			data: {
-		// 				mobile: form.mobile,
-		// 				code: form.code
-		// 			},
-		// 			method: "POST",
-		// 			showLoading: true,
-		// 		};
-		// 		request(checkCode, options)
-		// 			.then(() => {
+		myForm.value.validate((valid) => {
+			if (valid) {
+				const options = {
+					type: 2,
+					data: {
+						mobile: form.mobile,
+						code: form.code
+					},
+					method: "POST",
+					showLoading: true,
+				};
+				request(checkCode, options)
+					.then(() => {
 		if (apply.data.status === 'APPLY') {
 			navTo(
 				`/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${apply.data.id}`
@@ -315,14 +315,14 @@
 			})
 		}
 
-		// 			})
-		// 			.catch((err) => {
-		// 				console.log(err);
-		// 			});
-		// 	} else {
-		// 		console.log("验证未通过");
-		// 	}
-		// });
+					})
+					.catch((err) => {
+						console.log(err);
+					});
+			} else {
+				console.log("验证未通过");
+			}
+		});
 	};
 </script>
 

invoice/invoiceApply/invoiceList.vue

@@ -3,7 +3,7 @@
 		<view class="card-no-active">
 			<view class="head">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" mode=""></image>
-				<text>谋产品A</text>
+				<text>新办订单</text>
 			</view>
 			<view class="content">
 				<view class="row">
@@ -27,7 +27,7 @@
 		<view class="card-active">
 			<view class="head">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" mode=""></image>
-				<text>谋产品A</text>
+				<text>售后订单</text>
 				<view class="status">
 					已开票
 				</view>

pages/recharge/select-car.vue

@@ -1,22 +1,25 @@
 <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 class="choose-item" >
+			<view class="choose-item">
 				<view class="active" v-if="flag==i">
 				</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
@@ -26,7 +29,6 @@
 	} from "@/utils/utils"
 	import {
 		onLoad,
-		onShow
 	} from "@dcloudio/uni-app";
 	import {
 		orderList
@@ -34,35 +36,31 @@
 	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,
@@ -70,6 +68,7 @@
 			method: "POST",
 			showLoading: true,
 		};
+
 		return new Promise(async (resolve, reject) => {
 			const res = await request(orderList, options);
 			const data = stringToJson(res.bizContent);
@@ -78,20 +77,9 @@
 			reject(error);
 		});
 	}
-	const list = reactive([{
-			name: "A12345"
-		},
-		{
-			name: "B12345"
-		},
-		{
-			name: "C12345"
-		},
-	])
-	const flag = ref('0')
-
-	const choose = (i, item) => {
-		console.log(item.cardId)
+
+	const choose = (i, item) => {
+		flag.value = i
 		navTo(`/pages/recharge/recharge?cardId=${item.cardId}`)
 	}
 </script>
@@ -103,11 +91,12 @@
 		background-color: #EEF7F7;
 	}
 </style>
-<style lang="scss" scoped>
-	.flex{
-		display: flex;
-		justify-content: center;
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		justify-content: center;
 	}
+
 	.selectCar-box {
 		// width: 100%;
 		height: 100%;