productDev/parkBike.git

			@@ -35,6 +35,18 @@
			value-format="yyyy-MM-dd HH:mm:ss"
			></el-date-picker>
			</el-form-item>
			<el-form-item label="订单类型" prop="bikeType">
			<el-select v-model="searchForm.bikeType" placeholder="请选择">
			<el-option
			label="单车类型"
			:value="3">
			</el-option>
			<el-option
			label="电车类型"
			:value="4">
			</el-option>
			</el-select>
			</el-form-item>
			<section>
			<el-button type="primary" @click="search">搜索</el-button>
			<el-button @click="reset">重置</el-button>
			@@ -53,10 +65,17 @@
			>
			<el-table-column prop="openid" label="用户" min-width="225px" align="center"></el-table-column>
			<el-table-column prop="id" label="订单编号" min-width="235px" align="center"></el-table-column>
			<el-table-column label="订单类型" min-width="100px" align="center">
			<template slot-scope="{row}">
			<span v-if="row.bikeType === 3">单车类型</span>
			<span v-if="row.bikeType === 4">电车类型</span>
			</template>
			</el-table-column>
			<el-table-column prop="onlineOrderid" label="交易单号" min-width="225px" align="center"></el-table-column>
			<el-table-column prop="money" label="押金(元)" min-width="80px" align="center"></el-table-column>
			<el-table-column prop="payDate" label="交押金时间" min-width="145px" align="center"></el-table-column>
			<el-table-column prop="refundMoney" label="退押金(元）" min-width="90px" align="center"></el-table-column>
			<el-table-column prop="discountMoney" label="优惠金额" min-width="90px" align="center"></el-table-column>
			<el-table-column prop="closeMoney" label="结算金额(元）" min-width="100px" align="center">
			<template slot-scope="{row}">
			<span v-if="row.closeMoney > row.money">{{row.money}}</span>
			@@ -146,8 +165,12 @@
			closeMoney: '',
			startDate: '',
			endDate: '',
			<<<<<<< HEAD
			bikeType: ''
			=======
			type: 0

			>>>>>>> 32dbee794a7f1b0e407eaf8aa17fa55d9c4f6883
			},
			value1: [new Date(), new Date()]
			}