会员订单管理

config/dev.env.js

 module.exports = {
-  NODE_ENV: '"development"',
-    BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+    NODE_ENV: '"development"',
+  BASE_API:'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/views/order/modal/rentOrderDetailModal.vue

 <template>
 	<el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details">
-		<el-form :model="form" ref="form" label-width="120px">
+		<el-form :model="form" ref="form" label-width="110px">
 			<el-row>
 				<el-col :span="8">
 					<el-form-item label="订单号:">
@@ -8,14 +8,14 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
-					<el-form-item label="订单创建时间:">
-						<span></span>
+					<el-form-item label="创建订单时间:">
+						<span>{{form.crtTime}}</span>
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="8">
 					<el-form-item label="实际支付时间:">
-						<span>{{form.crtTime}}</span>
+						<span>{{!!form.payTime ? timestamp(new Date(form.payTime)) : '无'}}</span>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -32,7 +32,7 @@
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="会员等级/身份:">
-						<span></span>
+						<span>{{form.memberName}}/{{form. jobTitle}}</span>
 					</el-form-item>
 				</el-col>
 				<!-- <el-col :span="8">
@@ -48,7 +48,7 @@
 							@click="resetCar"
 						>重新配车</el-button>
 					</el-form-item>
-				</el-col> -->
+				</el-col>-->
 			</el-row>
 			<!-- <el-row>
 				<el-col :span="8">
@@ -66,7 +66,7 @@
 						<span>{{form.startCompanyName}}</span>
 					</el-form-item>
 				</el-col>
-			</el-row> -->
+			</el-row>-->
 			<!-- <el-row>
 				<el-col :span="8">
 					<el-form-item label="还车:">
@@ -90,32 +90,50 @@
 						>更换</el-button>
 					</el-form-item>
 				</el-col>
-			</el-row> -->
+			</el-row>-->
 			<table class="orderDetail">
 				<tr>
 					<th>房车</th>
 					<th>取/还时间</th>
 					<th>交车公司</th>
 					<th>还车公司</th>
-					<th>费用明细</th>
+					<th>免费天数</th>
+					<th>车辆租赁费</th>
+					<th>优惠券</th>
+					<th>不计免赔</th>
+					<th>租房车押金</th>
 				</tr>
 				<tr>
-					<!-- {{rentCostDetail}} -->
 					<td>{{form.name}}</td>
 					<td>
 						<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
 						<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
-						<p>租借天数:{{form.orderRentVehicleDetail.dayNum}}</p>
 					</td>
 					<td>{{form.startCompanyName}}</td>
 					<td>{{form.endCompanyName}}</td>
+					<td></td>
+					<td></td>
+					<td>
+						<p v-if="form.couponList">
+							优惠券:
+							<span
+								v-for="(item,index) in form.couponList"
+								:key="index"
+							>{{item.title}}-{{item.usedAmount}}元</span>
+						</p>
+						<p v-else>优惠券:无</p>
+					</td>
+					<td></td>
 					<td>
-						<p>车辆租赁费:</p>
-						<p>免费天数:</p>
-						<p>不计免赔:</p>
-						<p>租房车押金:</p>
-						<p>优惠券:</p>
+						<!-- {{form.orderRentVehicleDetail.costDetail.children}} -->
+						<!-- <div v-show="form.orderRentVehicleDetail.costDetail">
+							<p
+								v-for="(item,index) in JSON.parse(form.orderRentVehicleDetail.costDetail).children"
+								:key="index"
+							>{{item.key}}:{{item.detail || '无'}}</p>
+						</div> -->
 					</td>
+					
 				</tr>
 				<tr>
 					<td>
@@ -128,36 +146,47 @@
 							v-show="form.status == 4 || form.status == 5"
 							size="mini"
 							type="text"
-							style="padding: 7px 9px;"
 							@click="resetReturn = true"
 						>更换</el-button>
 					</td>
-					<td>共计:￥{{form.realAmount}}</td>
+					<td colspan="5">{{form.payWay == 1 ? '微信公众号支付' : form.payWay == 2 ? '支付宝即时支付' : form.payWay == 3 ? '银联支付' : ''}} 共计:￥{{form.realAmount}}</td>
 				</tr>
 			</table>
 
-			<p>额外随车物品:11111</p>
-			<p>内部邀请人:11111</p>
-			<p>驾驶证:11111</p>
-
-
-			<div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
+			<p>
+				<b>额外随车物品:</b>
+				<span
+					v-for="(item,index) in JSON.parse(this.form.carArticlesJson)"
+					:key="index"
+					style="margin-right:10px"
+				>{{item.name || '无'}}</span>
+			</p>
+			<p>
+				<b>内部邀请人:</b>
+				<span>{{form.facilitatePhone || '无'}}</span>
+			</p>
+			<p>
+				<b>驾驶证:</b>
+				<span
+					v-if="form.orderVehicleCrosstownDto"
+				>{{form.orderVehicleCrosstownDto.licenseName}} {{form.orderVehicleCrosstownDto.licensePhone}} {{form.orderVehicleCrosstownDto.licenseIdCard}}</span>
+				<span v-else>无</span>
+			</p>
+			<!-- <div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
 				<span style="font-size: 18px;font-weight: bold;">驾驶人信息</span>
-			</div>
-			<table class="orderDetail" v-if="form.orderVehicleCrosstownDto">
+			</div>-->
+			<!-- <table class="orderDetail" v-if="form.orderVehicleCrosstownDto">
 				<tr>
 					<th>姓名</th>
 					<th>手机号</th>
 					<th>身份证号</th>
-					<!-- <th>驾照</th>-->
 				</tr>
 				<tr>
 					<td>{{form.orderVehicleCrosstownDto.licenseName}}</td>
 					<td>{{form.orderVehicleCrosstownDto.licensePhone}}</td>
 					<td>{{form.orderVehicleCrosstownDto.licenseIdCard}}</td>
-					<!-- <td><img style="width: 140px;height: 140px;" :src="form.orderVehicleCrosstownDto?form.orderVehicleCrosstownDto.licenseImg:'https://xxtest.upyuns.com/image/app/default_%20avatar.png'"></td>-->
 				</tr>
-			</table>
+			</table>-->
 		</el-form>
 		<div class="modal_modal" v-show="resetCarVisible"></div>
 		<!-- 重新配车 -->
@@ -215,6 +244,7 @@ export default {
 			updateNumberPlat: false, //是否重新配车
 			dialogVisible: false,
 			resetCarVisible: false,
+			goods: [],
 			resetCarForm: {
 				no: '',
 				numberPlate: '' //重新配车车牌号
@@ -248,7 +278,7 @@ export default {
 		}
 	},
 	mounted() {
-		console.log(this.form)
+		
 		this.dialogVisible = true
 		if (this.form.status == 2) {
 			this.form.ststusName = '取消'
@@ -268,6 +298,32 @@ export default {
 		this.getAllFn()
 	},
 	methods: {
+		timestamp(now) {
+			var year = now.getFullYear()
+			var month = now.getMonth() + 1
+			var date = now.getDate()
+			var Hours = now.getHours()
+			var Minutes = now.getMinutes()
+			var Seconds = now.getSeconds()
+			month = month.toString().length == 1 ? '0' + month : month
+			date = date.toString().length == 1 ? '0' + date : date
+			Hours = Hours.toString().length == 1 ? '0' + Hours : Hours
+			Minutes = Minutes.toString().length == 1 ? '0' + Minutes : Minutes
+			Seconds = Seconds.toString().length == 1 ? '0' + Seconds : Seconds
+			return (
+				year +
+				'-' +
+				month +
+				'-' +
+				date +
+				' ' +
+				Hours +
+				':' +
+				Minutes +
+				':' +
+				Seconds
+			)
+		},
 		getAllFn() {
 			let _this = this
 			getAll().then(data => {

src/views/vehicleType/priceList.vue

@@ -308,8 +308,6 @@ export default {
 								: Number(this.setForm.price)
 						defaults.freeDays = Number(this.setForm.freeDays)
 						defaults.level = this.setForm.level
-						console.log(defaults);
-						
 						params.push(defaults)
 					})
 				}