会员订单管理详情

src/views/order/memberOrderInfo/index.vue

@@ -199,7 +199,7 @@
 			</el-table-column>
 			<el-table-column align="center" label="操作" >
 			<template scope="scope">
-			<el-button size="small" type="text" @click="handleBuy(scope.row)">订单详情</el-button>
+			<el-button size="small" type="text" @click="handleBuy(scope.row)">用户详情</el-button>
 			</template>
 			</el-table-column>
 		</el-table>
@@ -253,7 +253,7 @@
 				<el-row>
 				<el-col :span="6">
 					<el-form-item label="注册终端:">
-					<span>{{userDetails.channel}}</span>
+					<span>{{userDetails.channel == 1 ? 'app' : '小程序'}}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -288,7 +288,7 @@
 			</el-col>
 			<el-col :span="6">
 				<el-form-item label="性别: ">
-				<span>{{userDetails.sex}}</span>
+				<span>{{userDetails.sex == 1 ? '女' : '男'}}</span>
 				</el-form-item>
 			</el-col>
 			</el-row>
@@ -303,7 +303,7 @@
 			</el-col>
 			<el-col :span="6">
 				<el-form-item label="有效期:">
-				<span>{{userDetails.validTime}}</span>
+				<span>{{userDetails.validTime == '0' ? '永久' : '无'}}</span>
 				</el-form-item>
 			</el-col>
 			<el-col :span="6">
@@ -341,7 +341,7 @@
 			<el-row>
 			<el-col :span="6">
 				<el-form-item label="来源:">
-				<span>{{userDetails.source}}</span>
+				<span>{{userDetails.source == 0 ? '自来' : '用户邀请'}}</span>
 				</el-form-item>
 			</el-col>
 			<el-col :span="6">
@@ -557,7 +557,6 @@ export default {
 			// let type = this.listQuery.type
 			// window.location.href=process.env.BASE_API+'/api/order/orderMember/app/unauth/export'+'?isExport='+isExport
 			
-
 			orderMemberExcel(this.listQuery,{responseType: 'arraybuffer'}).then(res => {
 				this.listQuery.isExport = false;
 				const content = res
@@ -584,6 +583,7 @@ export default {
 			user_info(row.userId).then(data=>{
 				if (data.status == 200) {
 					this.userDetails = data.data
+					this.userDetails.recentRecharge = !!row.payTime ? this.timestamp(new Date(row.payTime)) : ''
 					this.getBoolean(this.userDetails.certificationStatus)
 				}
 			})

src/views/order/rentVehicleInfo/index.vue

@@ -362,9 +362,12 @@
 							:src="orderReturnVehicleCrosstown.licenseImg"
 							style="width: 100px; height: 100px;margin-left:110px;"
 							@click="lookPic(orderReturnVehicleCrosstown.licenseImg)"
-						/> -->
+						/>-->
 						<viewer>
-							<img :src="orderReturnVehicleCrosstown.licenseImg"  style="width: 100px; height: 100px;margin-left:110px;">
+							<img
+								:src="orderReturnVehicleCrosstown.licenseImg"
+								style="width: 100px; height: 100px;margin-left:110px;"
+							/>
 						</viewer>
 					</div>
 
@@ -376,11 +379,16 @@
 							:src="item"
 							:key="index"
 							style="width: 100px; height: 100px;margin-left:110px;"
-              	@click="lookPic(item)"
-						/> -->
+              				@click="lookPic(item)"
+						/>-->
 
 						<viewer :images="otherImg">
-							<img v-for="src in otherImg" :src="src" :key="src" style="width: 100px; height: 100px;margin-left:110px;">
+							<img
+								v-for="src in otherImg"
+								:src="src"
+								:key="src"
+								style="width: 100px; height: 100px;margin-left:110px;"
+							/>
 						</viewer>
 
 						<!-- 	<img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/>
@@ -396,11 +404,13 @@
 							:src="orderReturnVehicleCrosstown.mileageImg"
 							style="width: 100px; height: 100px;margin-left:110px;"
               	@click="lookPic(orderReturnVehicleCrosstown.mileageImg)"
-						/> -->
+						/>-->
 						<viewer>
-							<img :src="orderReturnVehicleCrosstown.mileageImg"  style="width: 100px; height: 100px;margin-left:110px;">
+							<img
+								:src="orderReturnVehicleCrosstown.mileageImg"
+								style="width: 100px; height: 100px;margin-left:110px;"
+							/>
 						</viewer>
-
 					</div>
 					<div v-if="returnVehicle">
 						<span class="label-text">钥匙照片*:</span>
@@ -409,9 +419,12 @@
 							:src="orderReturnVehicleCrosstown.vehicleKey"
 							style="width: 100px; height: 100px;margin-left:110px;"
               	@click="lookPic(orderReturnVehicleCrosstown.vehicleKey)"
-						/> -->
+						/>-->
 						<viewer>
-							<img :src="orderReturnVehicleCrosstown.vehicleKey"  style="width: 100px; height: 100px;margin-left:110px;">
+							<img
+								:src="orderReturnVehicleCrosstown.vehicleKey"
+								style="width: 100px; height: 100px;margin-left:110px;"
+							/>
 						</viewer>
 					</div>
 					<div v-if="returnVehicle">
@@ -428,21 +441,25 @@
 			</el-form>
 		</el-dialog>
 
-			<el-dialog title="取消订单" :visible.sync="showDialog">
-			  <el-form>
-				<el-form-item label="违约金金额:" >
-				  <el-input v-model="violateAmount" type="number" @blur="checkViolateAmount()" auto-complete="off"></el-input>
+		<el-dialog title="取消订单" :visible.sync="showDialog">
+			<el-form>
+				<el-form-item label="违约金金额:">
+					<el-input
+						v-model="violateAmount"
+						type="number"
+						@blur="checkViolateAmount()"
+						auto-complete="off"
+					></el-input>
 				</el-form-item>
 				<el-form-item>
 					<span class="label-text">实际违约金是{{changeViolateAmount}}元</span>
 				</el-form-item>
-			  </el-form>
-			  <div slot="footer" class="dialog-footer">
-				<el-button @click = "handleCancelDialog()">取 消</el-button>
-				<el-button type="primary" @click = "handleConfirm()">确 定</el-button>
-			  </div>
-			</el-dialog>
-	
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="handleCancelDialog()">取 消</el-button>
+				<el-button type="primary" @click="handleConfirm()">确 定</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 
@@ -487,10 +504,10 @@ export default {
 			depositRefundRecord: [],
 			dedTotal: '',
 			Tel: '',
-			showDialog:false,
-			changeViolateAmount:null,
+			showDialog: false,
+			changeViolateAmount: null,
 			violateAmount: null,
-			row:null,
+			row: null,
 			topAmount: null,
 			form: {
 				couponAmount: undefined,
@@ -715,7 +732,7 @@ export default {
 	methods: {
 		//取消订单
 		cancel(row, changeViolateAmount) {
-			let that = this;
+			let that = this
 			if (changeViolateAmount == null || changeViolateAmount == 0) {
 				this.$confirm('此操作将取消该订单, 是否继续?', '提示', {
 					confirmButtonText: '确定',
@@ -761,19 +778,18 @@ export default {
 				//   this.$message({
 				// 	type: 'info',
 				// 	message: '取消输入'
-				//   });       
+				//   });
 				// });
 				that.showDialog = true
 				that.changeViolateAmount = changeViolateAmount
 				that.violateAmount = changeViolateAmount
 				that.row = row
 			}
-			
 		},
 		checkViolateAmount() {
 			console.log(this.topAmount)
 			console.log(this.violateAmount)
-			if(this.topAmount < this.violateAmount) {
+			if (this.topAmount < this.violateAmount) {
 				this.$notify({
 					title: '失败',
 					message: '违约金额不能大于最高限制金额' + this.topAmount,
@@ -812,15 +828,15 @@ export default {
 			this.showDialog = false
 		},
 		handleViolatePrice(row) {
-			let that = this;
+			let that = this
 			let params = {
 				cancelReason: '后台取消',
 				appUserId: row.userId
 			}
 			getViolatePrice(row.no).then(data => {
 				if (data.status == 200) {
-					that.topAmount = data.data.topAmount;
-					that.cancel(row, data.data.cutAmount);
+					that.topAmount = data.data.topAmount
+					that.cancel(row, data.data.cutAmount)
 				} else {
 					this.$notify({
 						title: '失败',