Skip to content

C
cloud-platform-ui
Commit b90ecf53 authored by jiaorz's avatar jiaorz
Browse files
Options

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

parents 1660e616 a71f356d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 425 additions and 332 deletions
src/api/order/rentVehicle.js
View file @ b90ecf53
...@@ -123,7 +123,7 @@ export function downloadExcel(params) { ...@@ -123,7 +123,7 @@ export function downloadExcel(params) {
return fetch({ return fetch({
url: '/api/order/orderStatistics/excel', url: '/api/order/orderStatistics/excel',
method: 'post', method: 'post',
data:params, data: params,
responseType: 'blob' responseType: 'blob'
}); });
} }
...@@ -140,7 +140,7 @@ export function pageList(params) { ...@@ -140,7 +140,7 @@ export function pageList(params) {
//会员订单管理导出 //会员订单管理导出
export function orderMemberExcel(params) { export function orderMemberExcel(params) {
return fetch({ return fetch({
url: '/api/order/orderMember/page', url: '/api/order/orderMember/export',
method: 'post', method: 'post',
data: params, data: params,
responseType: 'blob' responseType: 'blob'
......
src/views/order/memberOrderInfo/index.vue
View file @ b90ecf53
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<p>{{scope.row.creatTime}}</p> <p>{{scope.row.creatTime}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="订单状态"> <el-table-column width="90" align="center" label="订单状态">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.status == '2'">取消</span> <span v-if="scope.row.status == '2'">取消</span>
<span v-if="scope.row.status == '3'">待付款</span> <span v-if="scope.row.status == '3'">待付款</span>
...@@ -197,12 +197,11 @@ ...@@ -197,12 +197,11 @@
<span>{{!!scope.row.payTime ? timestamp(new Date(scope.row.payTime)) : ''}}</span> <span>{{!!scope.row.payTime ? timestamp(new Date(scope.row.payTime)) : ''}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="操作" width="150"> <el-table-column align="center" label="操作" >
<template scope="scope"> <template scope="scope">
<el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">订单详情</el-button> <el-button size="small" type="text" @click="handleBuy(scope.row)">订单详情</el-button>
<el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">操作</el-button>
</template> </template>
</el-table-column>--> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
...@@ -216,6 +215,157 @@ ...@@ -216,6 +215,157 @@
:total="total" :total="total"
></el-pagination> ></el-pagination>
</div> </div>
<!-- 用户详细信息窗口-->
<el-dialog title="用户详情" :visible.sync="detailsDialogFormVisible" type="text" label-width="95px"
class="user-list-dialog">
<el-form>
<el-row>
<el-form-item label="基础信息">
<span v-if="userDetails.status!=1">(状态-正常)</span>
<span v-if="userDetails.status==1">(状态-已禁用)</span>
</el-form-item>
</el-row>
<el-row style="border-bottom: 1px dashed #ccc;padding: 10px 0;">
<el-col :span="3">
<div class="demo-type">
<img :src="userDetails.headimgurl" style="width: 80px;border-radius: 50%;"/>
</div>
</el-col>
<el-col :span="18">
<el-row>
<el-col :span="6">
<el-form-item label="用户Id:">
<span>{{userDetails.userId}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="昵称:">
<span>{{userDetails.nickName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号:">
<span>{{userDetails.username}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="注册终端:">
<span>{{userDetails.channel}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注册时间:">
<span>{{userDetails.createTime}}</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="最近登录时间:">
<span>{{userDetails.lastTime}}</span>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
<el-row>
<el-form-item label="实名认证状态">
<span v-if="!statusBoolean">(状态-未认证)</span>
<span v-if="statusBoolean">(状态-已认证)</span>
</el-form-item>
</el-row>
<el-row style="border-bottom: 1px dashed #ccc;padding-bottom: 10px;">
<el-col :span="6">
<el-form-item label="真实姓名: ">
<span>{{userDetails.realName}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="身份证号: ">
<span>{{userDetails.idNumber}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="性别: ">
<span>{{userDetails.sex}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<div style="margin: 20px 0;"><span style="font-size: 16px;font-weight: bold;">会员信息</span></div>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="会员类型:">
<span>{{userDetails.memberName}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="有效期:">
<span>{{userDetails.validTime}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="充值次数:">
<span>{{userDetails.buyCount}}次</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="加入时间:">
<span>{{userDetails.timeOfMembership}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row style="border-bottom: 1px dashed #ccc;padding-bottom: 10px;">
<el-col :span="12">
<el-form-item label="最近充值时间:">
<span>{{userDetails.recentRecharge}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="赠送总天数:">
<span>{{userDetails.totalNumber}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="剩余总天数:">
<span>{{userDetails.rentFreeDays}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<div style="margin: 20px 0;"><span style="font-size: 16px;font-weight: bold;">用户来源</span></div>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="来源:">
<span>{{userDetails.source}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="邀请人账号:">
<span>{{userDetails.inviter}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属地区:">
<span>{{userDetails.cityName}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="上级:">
<span>{{getSuperiorInformation(userDetails.nameOfSuperior,userDetails.superiorMobileNumber,2)}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="detailsDialogFormVisible = false">关 闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -230,6 +380,9 @@ export default { ...@@ -230,6 +380,9 @@ export default {
name: 'branchCompanyStock', name: 'branchCompanyStock',
data() { data() {
return { return {
detailsDialogFormVisible:false,//用户信息弹窗
userDetails:{},//用户信息
statusBoolean:false,//实名认证
form: { form: {
id: null, id: null,
companyId: null, companyId: null,
...@@ -349,6 +502,16 @@ export default { ...@@ -349,6 +502,16 @@ export default {
} }
}, },
methods: { methods: {
//上级信息
getSuperiorInformation(name,mobile,type){
if (type==1&&name && mobile) {
return name+'/'+mobile;
}
if (type==2&&name && mobile) {
return name+' '+mobile;
}
return '';
},
changeCreate(val){ changeCreate(val){
!val ? this.clearSearch() :'' !val ? this.clearSearch() :''
}, },
...@@ -370,11 +533,12 @@ export default { ...@@ -370,11 +533,12 @@ export default {
return year+"-"+month+"-"+date+' '+ Hours+':'+Minutes+":"+Seconds return year+"-"+month+"-"+date+' '+ Hours+':'+Minutes+":"+Seconds
}, },
excel() { excel() {
this.listQuery.isExport = true this.listQuery.isExport = true;
orderMemberExcel(this.listQuery).then(res => { orderMemberExcel(this.listQuery).then(res => {
this.listQuery.isExport = false;
const content = res const content = res
const blob = new Blob([content]) const blob = new Blob([content])
const fileName = this.timestamp(new Date()) const fileName = this.timestamp(new Date())+'.xlsx'
if ('download' in document.createElement('a')) { if ('download' in document.createElement('a')) {
// 非IE下载 // 非IE下载
const elink = document.createElement('a') const elink = document.createElement('a')
...@@ -392,63 +556,13 @@ export default { ...@@ -392,63 +556,13 @@ export default {
}) })
}, },
handleBuy(row) { handleBuy(row) {
this.$confirm('此操作将确认购买, 是否继续?', '提示', { console.log(row);
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
buyStock(row.id).then(() => {
this.$notify({
title: '成功',
message: '操作成功',
type: 'success',
duration: 2000
})
this.getList()
})
})
},
handleCancel(row) {
this.$confirm('此操作将放弃购买, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
cancelApply(row.id).then(() => {
this.$notify({
title: '成功',
message: '操作成功',
type: 'success',
duration: 2000
})
this.getList()
})
})
},
handleDelete(row) {
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delObj(row.id).then(() => {
this.$notify({
title: '成功',
message: '删除成功',
type: 'success',
duration: 2000
})
const index = this.list.indexOf(row)
this.list.splice(index, 1)
})
})
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1 this.listQuery.page = 1
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate(valid => {
if (valid) { if (valid) {
this.getList() this.getList()
} else { } else {
return false return false
} }
...@@ -517,6 +631,12 @@ export default { ...@@ -517,6 +631,12 @@ export default {
} }
</script> </script>
<style> <style>
.member .el-dialog--small {
width: 500px;
}
.user-list-dialog .el-form-item {
margin-bottom: 0px;
}
.el-card__body { .el-card__body {
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
......
src/views/purseManage/gainRecord.vue
View file @ b90ecf53
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-table-column align="center" label="流水类型"> <el-table-column align="center" label="流水类型">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.source==0">活动奖励</span> <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==2">会员充值</span>
<span v-if="scope.row.source==10">成功提现</span> <span v-if="scope.row.source==10">成功提现</span>
<span v-if="scope.row.source==11">转账</span> <span v-if="scope.row.source==11">转账</span>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<el-table-column align="center" label="来源"> <el-table-column align="center" label="来源">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.sourceName || '-'}}</span> <span>{{scope.row.sourceUserName || '-'}}</span>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/purseManage/incomeOverview.vue
View file @ b90ecf53
...@@ -4,17 +4,18 @@ ...@@ -4,17 +4,18 @@
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="5">
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input> <el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="5">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> </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="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="clearFilter">清除搜索</el-button>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
...@@ -31,11 +32,11 @@ ...@@ -31,11 +32,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="佣金比例"> <!-- <el-table-column width="200" align="center" label="佣金比例">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.commissionRate+'%'}}</span> <span>{{scope.row.commissionRate+'%'}}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column width="200" align="center" label="总收益"> <el-table-column width="200" align="center" label="总收益">
<template scope="scope"> <template scope="scope">
...@@ -71,7 +72,7 @@ ...@@ -71,7 +72,7 @@
<span>{{scope.row.balance}}</span> <span>{{scope.row.balance}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" fixed="right"> <!-- <el-table-column align="center" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button <el-button
size="small" size="small"
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
@click="deposit(scope.row)" @click="deposit(scope.row)"
>{{scope.row.isFrozen == 0 ? '禁止提现' : '允许提现'}}</el-button> >{{scope.row.isFrozen == 0 ? '禁止提现' : '允许提现'}}</el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination <el-pagination
...@@ -149,6 +150,11 @@ export default { ...@@ -149,6 +150,11 @@ export default {
...mapGetters(['elements']) ...mapGetters(['elements'])
}, },
methods: { methods: {
//清除搜索
clearFilter(){
this.listQuery.username = this.listQuery.phone = null;
this.getList()
},
//提现 //提现
deposit(row) { deposit(row) {
let titleMsg = let titleMsg =
......
src/views/userManagement/userList/index.vue
View file @ b90ecf53
...@@ -9,21 +9,21 @@ ...@@ -9,21 +9,21 @@
<el-form-item label="注册终端"> <el-form-item label="注册终端">
<el-select class="filter-item" v-model="listQuery.channel" placeholder="请选注册终端"> <el-select class="filter-item" v-model="listQuery.channel" placeholder="请选注册终端">
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <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> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="会员类型"> <el-form-item label="会员类型">
<el-select class="filter-item" v-model="listQuery.memberLevel" placeholder="请选会员类型"> <el-select class="filter-item" v-model="listQuery.memberLevel" placeholder="请选会员类型">
<el-option :key="undefined" label="全部用户" :value="undefined"></el-option> <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> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="用户身份"> <el-form-item label="用户身份">
<el-select class="filter-item" v-model="listQuery.postionState" placeholder="选择会员身份"> <el-select class="filter-item" v-model="listQuery.postionState" placeholder="选择会员身份">
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <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> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<el-form-item label="用户来源"> <el-form-item label="用户来源">
<el-select class="filter-item" v-model="listQuery.source" placeholder="请选用户来源"> <el-select class="filter-item" v-model="listQuery.source" placeholder="请选用户来源">
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <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> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
<el-form-item label="会员等级" prop="memberLevel"> <el-form-item label="会员等级" prop="memberLevel">
<el-select class="filter-item" v-model="userMembershipInformation.memberLevel" placeholder="请选择会员等级"> <el-select class="filter-item" v-model="userMembershipInformation.memberLevel" placeholder="请选择会员等级">
<!-- <el-option :key="undefined" label="无" :value="undefined"></el-option>--> <!-- <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> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
<el-form-item label="会员等级"> <el-form-item label="会员等级">
<el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员等级"> <el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员等级">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <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> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
<el-form-item label="订单类型"> <el-form-item label="订单类型">
<el-select class="filter-item" v-model="orderQuery.type" placeholder="请选订单状态"> <el-select class="filter-item" v-model="orderQuery.type" placeholder="请选订单状态">
<el-option :key="undefined" label="所有订单" :value="undefined"></el-option> <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> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
<el-form-item label="订单状态"> <el-form-item label="订单状态">
<el-select class="filter-item" v-model="orderQuery.status" placeholder="请选会员类型"> <el-select class="filter-item" v-model="orderQuery.status" placeholder="请选会员类型">
<el-option :key="undefined" label="所有订单" :value="undefined"></el-option> <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> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
......
src/views/vehicle/bookRecord/index.vue
View file @ b90ecf53
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment