租车订单管理

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.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(小威)
+  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/api/admin/userManagement/index.js

@@ -4,6 +4,7 @@ export function appPage(obj) {
   return fetch({
     url: '/api/admin/appUsersManage/findAll',
     method: 'post',
+    timeout: '30000',
     data: obj
   });
 }

src/views/order/modal/rentOrderDetailModal.vue

@@ -27,12 +27,14 @@
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="姓名/手机号:">
-						<span>{{form.realName}}/{{form.telephone}}</span>
+						<span v-if="form.realName">{{form.realName}}/{{form.telephone}}</span>
+						<span v-else>无</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="会员等级/身份:">
-						<span>{{form.memberName}}/{{form. jobTitle}}</span>
+						<span v-if='form.memberName'>{{form.memberName}}/{{form. jobTitle}}</span>
+						<span v-else>无</span>
 					</el-form-item>
 				</el-col>
 				<!-- <el-col :span="8">
@@ -106,10 +108,11 @@
 					<th>专职司机服务费</th>
 				</tr>
 				<tr>
-					<td>{{form.name}}</td>
+					<td>{{form.name}}{{form.vehicleNumberPlat}}{{form.vehicleCode ? (form.vehicleCode) : ''}}</td>
 					<td>
 						<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
 						<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
+						<p v-show="form.orderRentVehicleDetail.dayNum">租借天数{{form.orderRentVehicleDetail.dayNum}}天</p>
 					</td>
 					<td>{{form.startCompanyName}}</td>
 					<td>{{form.endCompanyName}}</td>
@@ -136,7 +139,6 @@
 					</td>
 					<td>
 						<p v-if="form.couponList">
-							优惠券:
 							<span
 								v-for="(item,index) in form.couponList"
 								:key="index"
@@ -183,7 +185,7 @@
 							@click="resetReturn = true"
 						>更换</el-button>
 					</td>
-					<td colspan="6">{{form.payWay == 1 ? '微信公众号支付' : form.payWay == 2 ? '支付宝即时支付' : form.payWay == 3 ? '银联支付' : ''}} 共计:￥{{form.realAmount}}</td>
+					<td colspan="6">{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信公支付'}} 共计:￥{{form.realAmount}}</td>
 				</tr>
 			</table>
 
@@ -486,6 +488,9 @@ export default {
 	width: 50px;
 	height: 50px;
 }
+.order-details .el-dialog--small{
+	width: 1100px !important;
+}
 .order-details .el-form-item {
 	margin-bottom: 10px !important;
 }