租车订单交车样式修改

src/views/order/modal/rentOrderDetailModal.vue

@@ -154,7 +154,7 @@
 						<p v-else>无</p>
 					</td>
 					<td>
-						<p v-if="form.rentVehiclePriceVO && form.damageSafeAmount > 0">
+						<p v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.damageSafeAmount > 0">
 							¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天
 						</p>
 						<p v-else>
@@ -170,7 +170,7 @@
 						</p>
 					</td>
 					<td>
-						<p v-if='form.rentVehiclePriceVO && form.driverAmount > 0'>
+						<p v-if='form.rentVehiclePriceVO && form.rentVehiclePriceVO.driverAmount > 0'>
 							¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天
 						</p>
 						<p v-else>

src/views/order/rentVehicleInfo/index.vue

@@ -279,38 +279,23 @@
 					<el-form-item label="实退押金:">
 						<span>{{orderReturnVehicleCrosstown.restDeposit}}</span>
 					</el-form-item>
-					<!-- {{orderReturnVehicleCrosstown.violateDetailList != ''}} -->
 					<div v-show="orderReturnVehicleCrosstown.violateDetailList != ''">
-					<!-- <div> -->
 						<el-form-item label="消费超额:">
 							<span
 								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
 								:key="index"
 							>{{item.excessCost}}</span>
 						</el-form-item>
-						<el-form-item label="违约赔款:">
-							<span
-								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
-								:key="index"
-							>{{item.cost}}</span>
-						</el-form-item>
-						<el-form-item label="违约类型:">
-							<span
-								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
-								:key="index"
-							>{{item.statusName}}</span>
-						</el-form-item>
-						<el-form-item label="赔款备注:">
-							<span
-								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
-								:key="index"
-							>{{item.deductions}}</span>
+
+						<el-form-item label="违约赔款:" v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList" :key="index">
+							<span>{{item.statusName}}</span><span style="margin-left:10px">{{item.cost}}</span>元<br/>
+							<span style="color:#999">{{item.deductions}}</span>
 						</el-form-item>
 						<el-form-item label="优惠券返还:">
 							<span
 								v-for="(item,index) in orderReturnVehicleCrosstown.backCoupons"
 								:key="index"
-							>{{item.title}} {{item.usedAmount}}</span>
+							>{{item.title}} 价值{{item.usedAmount}}元</span>
 						</el-form-item>
 					</div>
 				</div>
@@ -344,9 +329,9 @@
 						</el-col>
 						<el-col :span="10">
 							<el-form-item label="交车时间:">
-								<!-- <span
+								<span
 									class="label-text"
-								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime) : ''}}</span>-->
+								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime) : ''}}</span>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -387,9 +372,9 @@
 						</el-col>
 						<el-col :span="10">
 							<el-form-item label="收车时间:">
-								<!-- <span
+								<span
 									class="label-text"
-								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime): ''}}</span>-->
+								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime): ''}}</span>
 							</el-form-item>
 						</el-col>
 					</el-row>