Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/api/order/rentVehicle.js

@@ -123,7 +123,7 @@ export function downloadExcel(params) {
   return fetch({
     url: '/api/order/orderStatistics/excel',
     method: 'post',
-    data:params,
+    data: params,
     responseType: 'blob'
   });
 }
@@ -140,7 +140,7 @@ export function pageList(params) {
 //会员订单管理导出
 export function orderMemberExcel(params) {
   return fetch({
-    url: '/api/order/orderMember/page',
+    url: '/api/order/orderMember/export',
     method: 'post',
     data: params,
     responseType: 'blob'

src/views/purseManage/gainRecord.vue

@@ -32,7 +32,7 @@
 				<el-table-column align="center" label="流水类型">
 					<template scope="scope">
 						<span v-if="scope.row.source==0">活动奖励</span>
-						<!-- <span v-if="scope.row.source==1">一级提成</span> -->
+						<span v-if="scope.row.source==1">一级提成</span>
 						<span v-if="scope.row.source==2">会员充值</span>
 						<span v-if="scope.row.source==10">成功提现</span>
 						<span v-if="scope.row.source==11">转账</span>
@@ -55,7 +55,7 @@
 
 				<el-table-column align="center" label="来源">
 					<template scope="scope">
-						<span>{{scope.row.sourceName || '-'}}</span>
+						<span>{{scope.row.sourceUserName || '-'}}</span>
 					</template>
 				</el-table-column>
 

src/views/purseManage/incomeOverview.vue

@@ -4,17 +4,18 @@
 			<div class="filter-container" ref="filter-container">
 				<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
 					<el-row>
-						<el-col :span="8">
+						<el-col :span="5">
 							<el-form-item label="姓名">
 								<el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="8">
+						<el-col :span="5">
 							<el-form-item label="手机号">
 								<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
+						<el-button class="filter-item" type="primary" v-waves icon="search" @click="clearFilter">清除搜索</el-button>
 					</el-row>
 				</el-form>
 			</div>
@@ -31,11 +32,11 @@
 					</template>
 				</el-table-column>
 
-			<el-table-column width="200" align="center" label="佣金比例">
+			<!-- <el-table-column width="200" align="center" label="佣金比例">
 					<template scope="scope">
 						<span>{{scope.row.commissionRate+'%'}}</span>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 
 				<el-table-column width="200" align="center" label="总收益">
 					<template scope="scope">
@@ -71,7 +72,7 @@
 						<span>{{scope.row.balance}}</span>
 					</template>
 				</el-table-column>
-				<el-table-column align="center" label="操作" fixed="right">
+				<!-- <el-table-column align="center" label="操作" fixed="right">
 					<template scope="scope">
 						<el-button
 							size="small"
@@ -79,7 +80,7 @@
 							@click="deposit(scope.row)"
 						>{{scope.row.isFrozen == 0 ? '禁止提现' : '允许提现'}}</el-button>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 			</el-table>
 			<div v-show="!listLoading" class="pagination-container">
 				<el-pagination
@@ -149,6 +150,11 @@ export default {
 		...mapGetters(['elements'])
 	},
 	methods: {
+		//清除搜索
+		clearFilter(){
+			this.listQuery.username = this.listQuery.phone = null;
+			this.getList()
+		},
 		//提现
 		deposit(row) {
 			let titleMsg =

src/views/userManagement/userList/index.vue

@@ -9,21 +9,21 @@
           <el-form-item label="注册终端">
             <el-select class="filter-item" v-model="listQuery.channel" placeholder="请选注册终端">
               <el-option :key="undefined" label="全部" :value="undefined"></el-option>
-              <el-option v-for="(val, key, index) in mobileList " :key="val.id" :label="val.name"
+              <el-option v-for="(val,index) in mobileList " :key="index" :label="val.name"
                          :value="val.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="会员类型">
             <el-select class="filter-item" v-model="listQuery.memberLevel" placeholder="请选会员类型">
               <el-option :key="undefined" label="全部用户" :value="undefined"></el-option>
-              <el-option v-for="(val, key, index) in queryMemberLevelList " :key="val.id" :label="val.name"
+              <el-option v-for="(val,index) in queryMemberLevelList " :key="index" :label="val.name"
                          :value="val.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="用户身份">
             <el-select class="filter-item" v-model="listQuery.postionState" placeholder="选择会员身份">
               <el-option :key="undefined" label="全部" :value="undefined"></el-option>
-              <el-option v-for="(val, key, index) in postionStatelList " :key="val.id" :label="val.name"
+              <el-option v-for="(val,index) in postionStatelList " :key="index" :label="val.name"
                          :value="val.id"></el-option>
             </el-select>
           </el-form-item>
@@ -59,7 +59,7 @@
           <el-form-item label="用户来源">
             <el-select class="filter-item" v-model="listQuery.source" placeholder="请选用户来源">
               <el-option :key="undefined" label="全部" :value="undefined"></el-option>
-              <el-option v-for="(val, key, index) in sourceList" :key="val.id" :label="val.name"
+              <el-option v-for="(val,index) in sourceList" :key="index" :label="val.name"
                          :value="val.id"></el-option>
             </el-select>
           </el-form-item>
@@ -332,7 +332,7 @@
             <el-form-item label="会员等级" prop="memberLevel">
               <el-select class="filter-item" v-model="userMembershipInformation.memberLevel" placeholder="请选择会员等级">
                 <!--                <el-option :key="undefined" label="无" :value="undefined"></el-option>-->
-                <el-option v-for="(val, key, index) in setMemberLevelList " :key="val.id" :label="val.name"
+                <el-option v-for="(val,index) in setMemberLevelList " :key="index" :label="val.name"
                            :value="val.id"></el-option>
               </el-select>
             </el-form-item>
@@ -409,7 +409,7 @@
         <el-form-item label="会员等级">
           <el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员等级">
             <el-option :key="undefined" label="无" :value="undefined"></el-option>
-            <el-option v-for="(val, key, index) in setMemberLevelList " :key="val.id" :label="val.name"
+            <el-option v-for="(val,index) in setMemberLevelList " :key="index" :label="val.name"
                        :value="val.id"></el-option>
           </el-select>
         </el-form-item>
@@ -439,7 +439,7 @@
               <el-form-item label="订单类型">
                 <el-select class="filter-item" v-model="orderQuery.type" placeholder="请选订单状态">
                   <el-option :key="undefined" label="所有订单" :value="undefined"></el-option>
-                  <el-option v-for="(val, key, index) in orderTypeList " :key="val.id" :label="val.name"
+                  <el-option v-for="(val,index) in orderTypeList " :key="index" :label="val.name"
                              :value="val.id"></el-option>
                 </el-select>
               </el-form-item>
@@ -448,7 +448,7 @@
               <el-form-item label="订单状态">
                 <el-select class="filter-item" v-model="orderQuery.status" placeholder="请选会员类型">
                   <el-option :key="undefined" label="所有订单" :value="undefined"></el-option>
-                  <el-option v-for="(val, key, index) in orderStatusList " :key="val.id" :label="val.name"
+                  <el-option v-for="(val,index) in orderStatusList " :key="index" :label="val.name"
                              :value="val.id"></el-option>
                 </el-select>
               </el-form-item>