'2025年6月14日15:33:33'

pages/payment/payment.vue

@@ -10,7 +10,8 @@
 				</view>
 				<view class="container">
 					<template v-for='(item,index) in formData'>
-						<view class="detail-item" :key='index' v-if='item.value !== "" && item.value !== undefined && !item.isHide'>
+						<view class="detail-item" :key='index'
+							v-if='item.value !== "" && item.value !== undefined && !item.isHide'>
 							<text>{{item.label}}</text>
 							<text class="amount">{{item.key === 'amount'? '￥'+ item.value:item.value}}</text>
 						</view>
@@ -21,7 +22,8 @@
 							<text>{{item.label}}</text>
 							<view>
 								<text class="amount">{{'￥'+ item.value}} </text>
-								<text class="status" :class="{amount:item.status==='SUCCESS'}">({{item.statusName}}) </text>
+								<text class="status" :class="{amount:item.status==='SUCCESS'}">{{item.statusName}}
+								</text>
 							</view>
 						</view>
 					</template>
@@ -30,15 +32,15 @@
 						<text class="amount">￥{{amountData.totalFee}} </text>
 					</view>
 				</view>
-				<view class="payment-total" v-if='amountData.actualPayment &&  parseFloat(amountData.actualPayment) !== 0'>
+				<!-- 		<view class="payment-total"
+					v-if='amountData.actualPayment && parseFloat(amountData.actualPayment) !== 0'>
 					<text>待付款</text>
 					<text class="amount">￥{{handleAmount(amountData.actualPayment)}}</text>
-				</view>
+				</view> -->
 				<view class="over-txt">
 					<button type="success" class="btn-txt btn" :class='{disabledBtn:!qdOrderVal.h5ReturnQdUrl}'
-						 :disabled="!qdOrderVal.h5ReturnQdUrl"
-						@click="toNav">用户车辆信息上传完成</button>
-<!-- 					<wx-open-launch-weapp id="launch-btn" appid="wxbd70e25d388d9f46" path="pages/index/index" env-version="trial"
+						:disabled="!qdOrderVal.h5ReturnQdUrl" @click="toNav">用户车辆信息上传完成</button>
+					<!-- 					<wx-open-launch-weapp id="launch-btn" appid="wxbd70e25d388d9f46" path="pages/index/index" env-version="trial"
 						@error="handleErrorFn" @launch="handleLaunchFn" v-else>
 						<div v-is="'script'" type='text/wxtag-template' style="display: block;">
 							<div class="btn">跳转小程序</div>
@@ -108,7 +110,7 @@
 	let formData = reactive < any > ([{
 		label: '产品名',
 		value: '',
-		key: "product",
+		key: "equityName",
 		key1: 'promoteName',
 	}, {
 		label: '订单步骤',
@@ -118,9 +120,17 @@
 		label: '车牌号',
 		key: "vehiclePlate",
 		value: '贵'
+	}, {
+		label: '车牌颜色',
+		key: "vehiclePlateColorStr",
+		value: '贵'
 	}, {
 		label: '车主姓名',
-		key: "ownerName",
+		key: "customerName",
+		value: ''
+	}, {
+		label: '收费车型',
+		key: "vehicleClassStr",
 		value: ''
 	}, {
 		label: '邮寄地址',
@@ -290,8 +300,9 @@
 		requestNew('/iaw/issue/order/orderDetailQuery', options).then((res) => {
 			if (res.code === 0) {
 				let data = res.data.data
-				console.log(data, '订单数据');
-				data.orderStepName = stepOptions.find(item => item.value === data.orderStep)?.label || data.orderStep
+				console.log(data, '订单数据'); //data.releaseProduct.isPay
+				data.orderStepName = stepOptions.find(item => item.value === data.orderStep)?.label || data
+					.orderStep
 				formData.forEach(item => {
 					let itemData = data[item.key]
 					if (typeof itemData === 'object' && itemData) {
@@ -315,6 +326,7 @@
 					}
 					item.value = itemData || item.default
 				})
+				
 				amountData.value.actualPayment = 0
 				amountList.value = data.feeList?.map(item => {
 					if (item.payStatus === 'UNPAY') {
@@ -322,12 +334,17 @@
 					}
 					return {
 						status: item.payStatus,
-						statusName: payMentStatus[item.payStatus],
+						statusName: data.releaseProduct.isPay == 1 ? '' : `(${payMentStatus[item
+							.payStatus]})`,
 						label: payType[item.payType],
 						value: handleAmount(item.fee)
 					}
 				}) || []
 				console.log(amountList.value, 'amountList.value');
+				if (data.releaseProduct.isPay == 1) {
+					amountData.value.totalFee = ''
+					amountList.value = []
+				}
 				isShow.value = true;
 			}
 			console.log(res, '请求订单获取的数据');