Merge remote-tracking branch 'origin/base-modify' into base-modify-hf

# Conflicts:
#	src/views/order/modal/rentOrderDetailModal.vue

src/views/order/modal/rentOrderDetailModal.vue

@@ -39,6 +39,7 @@
               <span v-if="orderDetailInfo.jobTitle">{{orderDetailInfo. jobTitle}}</span>
               <span v-else>普通用户</span>
             </span>
+						<span v-if="orderDetailInfo != undefined && orderDetailInfo.memberLevel">{{orderDetailInfo.memberName}}/{{orderDetailInfo. positionName}}</span>
 						<span v-else>无</span>
 					</el-form-item>
 				</el-col>

src/views/order/rentVehicleInfo/index.vue

@@ -635,6 +635,7 @@ export default {
 				endTime: undefined,
 				orderAmount: undefined,
 				orderOrigin: undefined,
+				positionName:undefined,
 				orderVehicleCrosstownDto: {
 					licenseIdCard: '',
 					licenseImg: '',
@@ -796,6 +797,7 @@ export default {
 				no: undefined,
 				orderAmount: undefined,
 				orderOrigin: undefined,
+				positionName:undefined,
         // useAmountList:undefined,
 				orderRentVehicleDetail: {
 					bookRecordId: undefined,
@@ -1054,7 +1056,6 @@ export default {
 					if(this.orderDetailInfo.costDetail.paramJson) {
 							this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(this.orderDetailInfo.costDetail.paramJson)
 					}
-
 					if(this.orderDetailInfo.items) {
 						for (var i = 0;i< this.orderDetailInfo.items.length;i++) {
 							if(this.orderDetailInfo.items[i].type == 104) {
@@ -1062,6 +1063,11 @@ export default {
 							}
 						}
 					}
+					if (this.form.positionName) {
+						this.orderDetailInfo.positionName = this.form.positionName
+					} else {
+						this.orderDetailInfo.positionName ='普通用户'
+					}
 					if (this.orderDetailInfo.status == 2) {
 						this.orderDetailInfo.ststusName = '取消'
 					}
@@ -1081,7 +1087,6 @@ export default {
 						this.orderDetailInfo.ststusName = '已完成'
 					}
 				}
-          console.log(this.orderDetailInfo)
 				this.rentDialogVisible = true
 
 			})