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

after-sale/ETC-log-off/upload-card.vue

@@ -133,7 +133,6 @@
 			navTo("/pages/bluetooth/bluetooth?routeType=5");
 
 		} else {
-
 			queryCardSignCancellation(0, 0, 0).then((item: any) => {
 				queryConfirmSignCancellation(0).then((val: any) => {
 					console.log(val)

after-sale/replace-equipment/form.vue

@@ -4,14 +4,14 @@
 	<view class="oderPage">
 		<view class="addr-box">
 			<view class="addr-box-left">
-				<view class="text-image">{{form.customerName.charAt(0)}} </view>
+				<view class="text-image">{{form.consignee.charAt(0)}} </view>
 				<view class="content">
 					<view class="">
-						<text class="item1">{{form.customerName}}</text>
-						<text class="item2">{{form.customerTel}}</text>
+						<text class="item1">{{form.consignee}}</text>
+						<text class="item2">{{form.consigneeTel}}</text>
 						<text class="item3">默认</text>
 					</view>
-					<view class=""> {{form.area +form.address}}</view>
+					<view class=""> {{form.region +form.address}}</view>
 				</view>
 			</view>
 			<view class="edit">
@@ -36,9 +36,9 @@
 				<u-form-item prop="logistics" v-if="form.sendStatusName == '寄回'">
 					<view class="from_item">
 						<text><text style="color: red">*</text>退货物流公司：</text>
-						<view style="display: flex" @click="showPicker">
-							<u-input v-model="form.courierCompany" class="input" disabled placeholder="请选择" />
-							<u-icon name="arrow-right" style="margin-left: 10px"></u-icon>
+						<view style="display: flex" >
+							<u-input v-model="form.courierCompany" class="input" @click="showPicker" placeholder="请选择" />
+							<u-icon name="arrow-right" style="margin-left: 10px;display: flex;"></u-icon>
 						</view>
 					</view>
 				</u-form-item>
@@ -129,10 +129,10 @@
 	}); //地址list
 
 	const form = reactive({
-		customerName: '',
-		customerTel: '',
+		consignee: '',
+		consigneeTel: '',
 		address: '',
-		area: '',
+		region: '',
 		sendStatusName: '寄回',
 		sendStatus: '1', //0 --- 不邮寄 1 --- 邮寄
 		courierCompany: '',
@@ -185,9 +185,9 @@
 			name: "不邮寄",
 			disabled: false,
 		},
-	]);
-	
-	
+	]);
+
+
 	let showApplyRes = ref(false);
 
 	// 打开物流先择器
@@ -262,10 +262,10 @@
 			address.list = data.data;
 			if (address.list.length > 0) {
 				var defaultAddress = address.list[0]
-				form.customerName = defaultAddress.consignee
-				form.customerTel = defaultAddress.consigneeTel
+				form.consignee = defaultAddress.consignee
+				form.consigneeTel = defaultAddress.consigneeTel
 				form.address = defaultAddress.address
-				form.area = defaultAddress.region
+				form.region = defaultAddress.region
 				form.postCode = defaultAddress.postalCode
 			}
 		});
@@ -296,12 +296,12 @@
 			courierCompany: form.courierCompany,
 			courierOrderId: form.courierOrderId,
 			receiveMethod: form.receiveMethod,
-			customerName: form.customerName,
-			customerTel: form.customerTel,
+			consignee: form.consignee,
+			consigneeTel: form.consigneeTel,
 			address: form.address,
-			area: form.area,
-			postCode: form.postCode,
-			applyRes:form.applyRes
+			region: form.region,
+			postCode: form.postCode,
+			applyRes: form.applyRes
 		};
 		const options = {
 			type: 2,

after-sale/replace-equipment/verification.vue

@@ -26,7 +26,7 @@
 						</u-radio-group>
 					</view>
 				</u-form-item>
-				
+
 				<u-form-item prop="phone">
 					<view class="from_item" style="background-color: #f7f7f7">
 						<text><text style="color: red"></text>手机号：</text>
@@ -47,8 +47,10 @@
 				</u-form-item>
 			</view>
 		</u-form>
-		<button class="submit" @click="toPage()">下一步</button>
-	
+		<button style="margin-top: 50rpx;" class="submit" v-if="apply.data.status === 'APPLY'||!apply.data.status"
+			@click="toPage()">下一步填写资料</button>
+		<button style="margin-top: 30rpx;" class="submit" v-if="apply.data.status" @click="changeCardQueryCancleAction()">撤回申请</button>
+
 	</view>
 </template>
 
@@ -74,7 +76,9 @@
 	import {
 		sendCode,
 		checkCode,
-		changeCardApply
+		changeCardApply,
+		changeCardQuery,
+		changeCardQueryCancle
 	} from "@/utils/network/api.js";
 	import {
 		stringToJson
@@ -93,6 +97,13 @@
 		code: '',
 		applyRes: ''
 	});
+	const apply = reactive({
+		data: {
+			status: undefined,
+			id: ''
+		}
+
+	});
 
 	//入参
 	const params = reactive({
@@ -167,6 +178,14 @@
 		form.mobile = option.mobile
 		params.cardId = option.cardId
 		params.orderId = option.orderId
+		changeCardQueryAction().then(val => {
+			apply.data = val
+			apply.data.status = val.status;
+
+
+		})
+
+
 	});
 
 	const getCode = () => {
@@ -192,6 +211,48 @@
 			});
 	}
 
+	//查询申请单
+	const changeCardQueryAction = () => {
+		var data = {
+			orderId: params.orderId,
+		};
+		const options = {
+			type: 2,
+			data: data,
+			method: "POST",
+			showLoading: true,
+		};
+		return new Promise(async (resolve, reject) => {
+			const res = await request(changeCardQuery, options);
+			const data = stringToJson(res.bizContent);
+			resolve(data);
+		}).catch((error) => {
+			reject(error);
+		});
+	}
+
+	//撤销订单
+	const changeCardQueryCancleAction = () => {
+		var data = {
+			id: apply.data.id,
+			cancelRes: '取消申请单'
+		};
+		const options = {
+			type: 2,
+			data: data,
+			method: "POST",
+			showLoading: true,
+		};
+		return new Promise(async (resolve, reject) => {
+			const res = await request(changeCardQueryCancle, options);
+			const data = stringToJson(res.bizContent);
+			msg('取消申请成功');
+			uni.navigateBack()
+		}).catch((error) => {
+			reject(error);
+		});
+	}
+
 	//申请
 	const queryCckChangejzCardAction = () => {
 		var data = {
@@ -229,24 +290,30 @@
 				};
 				request(checkCode, options)
 					.then(() => {
-						if (form.applyTypeName === '卡') {
-							form.applyType = 'EXCHANGE_CARD'
-						} else if (form.applyTypeName === 'OBU') {
-							form.applyType = 'EXCHANGE_OBU'
-						} else if (form.applyTypeName === '卡和OBU') {
-							form.applyType = 'EXCHANGE_ALL'
-						}
-						if (form.damageModeName === '人为损坏') {
-							form.damageMode = '0'
-						} else if (form.damageModeName === '自然损坏') {
-							form.damageMode = '1'
-						}
-
-						queryCckChangejzCardAction().then(val => {
-							navTo(
-								`/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}`
-							)
-						})
+		if (apply.data.status === 'APPLY') {
+			navTo(
+				`/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${apply.data.id}`
+			)
+		} else {
+			if (form.applyTypeName === '卡') {
+				form.applyType = 'EXCHANGE_CARD'
+			} else if (form.applyTypeName === 'OBU') {
+				form.applyType = 'EXCHANGE_OBU'
+			} else if (form.applyTypeName === '卡和OBU') {
+				form.applyType = 'EXCHANGE_ALL'
+			}
+			if (form.damageModeName === '人为损坏') {
+				form.damageMode = '0'
+			} else if (form.damageModeName === '自然损坏') {
+				form.damageMode = '1'
+			}
+
+			queryCckChangejzCardAction().then(val => {
+				navTo(
+					`/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}`
+				)
+			})
+		}
 
 					})
 					.catch((err) => {
@@ -399,10 +466,6 @@
 		height: 80rpx;
 		color: #fff;
 		border-radius: 100rpx;
-		position: fixed;
-		left: 50%;
-		transform: translate(-50%);
-		bottom: 60rpx;
 		font-size: 32rpx;
 	}
 </style>

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%;

utils/network/api.js

@@ -113,6 +113,9 @@ export const cckChangejzCardJY = '92' //8.133.ASS-卡签注销验证接口
 
 export const cckChangejzCardInfo = '95' //8.107.ASS-储值卡转记账卡填写信息接口
 export const changeCardApply = '888' //换货/换卡签申请接口
+export const changeCardQuery = '885' //换货/换卡签查询接口
+export const changeCardQueryCancle = '884' //换货/换卡签取消查询接口
+
 export const changeCardInfo = '887' //换货/换卡/填写信息接口
 export const queryRefund= '924' //储值卡注销退费查询接口
 export const queryRefundApply= '918' //储值卡注销余额补领申请接口