Skip to content

C
cloud-platform-ui
Commit d692df95 authored by hanfeng's avatar hanfeng
Browse files
Options

修改用户后台管理后台,设置会员

parent 5be6cf79
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 109 deletions
config/dev.env.js
View file @ d692df95
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API: '"http://10.1.37.244:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威) BASE_API: '"http://10.1.37.246:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
src/api/admin/userManagement/index.js
View file @ d692df95
...@@ -32,7 +32,7 @@ export function setDisable(id) { ...@@ -32,7 +32,7 @@ export function setDisable(id) {
export function seveObj(obj) { export function seveObj(obj) {
return fetch({ return fetch({
url: '/api/admin/baseUserMember/setUserMember/', url: '/api/admin/baseUserMember/setUserMember',
method: 'put', method: 'put',
data:obj data:obj
}); });
......
src/router/index.js
View file @ d692df95
...@@ -336,12 +336,12 @@ export const asyncRouterMap = [{ ...@@ -336,12 +336,12 @@ export const asyncRouterMap = [{
name: '车辆保养记录', name: '车辆保养记录',
authority: 'vehicleUpkeepLog' authority: 'vehicleUpkeepLog'
}, },
{ // {
path: 'vehicleSchedulManage', // path: 'vehicleSchedulManage',
component: _import('vehicle/vehicleSchedulManage/index'), // component: _import('vehicle/vehicleSchedulManage/index'),
name: '车辆排班管理', // name: '车辆排班管理',
authority: 'vehicleSchedulManage' // authority: 'vehicleSchedulManage'
} // }
] ]
}, },
{ {
......
src/views/userManagement/userList/index.vue
View file @ d692df95
...@@ -49,13 +49,14 @@ ...@@ -49,13 +49,14 @@
</el-row> </el-row>
</el-form> </el-form>
<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" style="margin-left: 10px;" @click="newMember" <el-button class="filter-item" type="primary" v-waves icon="delete" @click="cleaningQuery">清除搜索条件</el-button>
type="primary" icon="edit">新增会员 <!-- <el-button class="filter-item" style="margin-left: 10px;" @click="newMember"-->
</el-button> <!-- type="primary" icon="edit">新增会员-->
<!-- </el-button>-->
<el-button class="filter-item" style="margin-left: 10px;" @click="bulkUpload" <!-- <el-button class="filter-item" style="margin-left: 10px;" @click="bulkUpload"-->
type="primary" icon="edit">批量导入会员 <!-- type="primary" icon="edit">批量导入会员-->
</el-button> <!-- </el-button>-->
</div> </div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
style="width: 100%"> style="width: 100%">
...@@ -111,15 +112,15 @@ ...@@ -111,15 +112,15 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column align="center" label="操作" width="480"> <el-table-column align="center" label="操作" width="480">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="viewDetails(scope.row)">查看详情 <el-button size="small" type="success" @click="viewDetails(scope.row)">查看详情
</el-button> </el-button>
<el-button v-if="scope.row.status!=1" size="small" type="success" @click=" setMember(scope.row)">设置会员信息 <el-button v-if="scope.row.status!=1" size="small" type="success" @click=" setMember(scope.row)">设置会员信息
</el-button> </el-button>
<el-button v-if="scope.row.status!=1" size="small" type="success" @click="userOrder(scope.row)">用户订单 <el-button v-if="scope.row.status!=1" size="small" type="success" @click="userOrder(scope.row)">用户订单
</el-button> </el-button>
<el-button v-if="scope.row.status!=1" size="small" type="danger" @click="disable(scope.row)">设为禁用 <el-button v-if="scope.row.status!=1" size="small" type="danger" @click="disable(scope.row)">设为禁用
</el-button> </el-button>
<el-button v-if="scope.row.status==1" size="small" type="danger" @click="available(scope.row)">取消禁用 <el-button v-if="scope.row.status==1" size="small" type="danger" @click="available(scope.row)">取消禁用
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -132,10 +133,10 @@ ...@@ -132,10 +133,10 @@
</div> </div>
<!-- 用户详细信息窗口--> <!-- 用户详细信息窗口-->
<el-dialog title="用户详情" :visible.sync="detailsDialogFormVisible" type="text" label-width="95px"> <el-dialog title="用户详情" :visible.sync="detailsDialogFormVisible" type="text" label-width="95px">
<el-form > <el-form>
<el-row> <el-row>
<el-row> <el-row>
<el-form-item label="基础信息"> <el-form-item label="基础信息">
<span v-if="userDetails.status!=1">(状态-正常)</span> <span v-if="userDetails.status!=1">(状态-正常)</span>
<span v-if="userDetails.status==1">(状态-已禁用)</span> <span v-if="userDetails.status==1">(状态-已禁用)</span>
</el-form-item> </el-form-item>
...@@ -143,7 +144,7 @@ ...@@ -143,7 +144,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<div class="demo-type"> <div class="demo-type">
<el-avatar :size="60" <el-avatar :size="60"
src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png"
@error="errorHandler"> @error="errorHandler">
<img :src="userDetails.headimgurl"/> <img :src="userDetails.headimgurl"/>
...@@ -190,7 +191,7 @@ ...@@ -190,7 +191,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-row> <el-row>
<el-form-item label="实名认证状态"> <el-form-item label="实名认证状态">
<span v-if="!statusBoolean">(状态-未认证)</span> <span v-if="!statusBoolean">(状态-未认证)</span>
<span v-if="statusBoolean">(状态-已认证)</span> <span v-if="statusBoolean">(状态-已认证)</span>
</el-form-item> </el-form-item>
...@@ -265,7 +266,7 @@ ...@@ -265,7 +266,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-row> <el-row>
<el-form-item v label="用户来源"> <el-form-item v label="用户来源">
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
...@@ -306,6 +307,7 @@ ...@@ -306,6 +307,7 @@
<el-col :span="16"> <el-col :span="16">
<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 v-for="(val, key, index) in memberLevelist " :key="val.id" :label="val.name" <el-option v-for="(val, key, index) in memberLevelist " :key="val.id" :label="val.name"
:value="val.id"></el-option> :value="val.id"></el-option>
</el-select> </el-select>
...@@ -317,8 +319,8 @@ ...@@ -317,8 +319,8 @@
<el-form-item label="有效期" prop="validTime"> <el-form-item label="有效期" prop="validTime">
<el-radio-group v-model="validityType"> <el-radio-group v-model="validityType">
<el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button> <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>
<el-radio-button style="margin-bottom: 10px;"label="永久"></el-radio-button> <el-radio-button style="margin-bottom: 10px;" label="永久"></el-radio-button>
<el-radio-button style="margin-bottom: 10px;"label="自定义" ></el-radio-button> <el-radio-button style="margin-bottom: 10px;" label="自定义"></el-radio-button>
</el-radio-group> </el-radio-group>
<dir></dir> <dir></dir>
<div class="block" v-if="validityType=='自定义'"> <div class="block" v-if="validityType=='自定义'">
...@@ -419,42 +421,42 @@ ...@@ -419,42 +421,42 @@
</el-form> </el-form>
</div> </div>
<!-- <el-form :model="userOrderMessage" ref="alterUserOrder" label-width="100px">--> <!-- <el-form :model="userOrderMessage" ref="alterUserOrder" label-width="100px">-->
<el-table <el-table
:data="orderData" :data="orderData"
style="width: 100%" style="width: 100%"
:row-class-name="tableRowClassName"> :row-class-name="tableRowClassName">
<el-table-column <el-table-column
prop="no" prop="no"
label="订单号" label="订单号"
style="width: 100%" align="center"> style="width: 100%" align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="type" prop="type"
label="订单类型" label="订单类型"
width="180" align="center"> width="180" align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
label="订单状态" align="center"> label="订单状态" align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="crtTime" prop="crtTime"
label="下单时间" align="center"> label="下单时间" align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updTime" prop="updTime"
label="修改时间" align="center"> label="修改时间" align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
align="center"> align="center">
<el-button size="small" type="success">查看详情 <el-button size="small" type="success">查看详情
</el-button> </el-button>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- </el-form>--> <!-- </el-form>-->
<div v-show="!orderListLoading" class="pagination-container"> <div v-show="!orderListLoading" class="pagination-container">
<el-pagination @size-change="orderSizeChange" @current-change="orderCurrentChange" <el-pagination @size-change="orderSizeChange" @current-change="orderCurrentChange"
:current-page.sync="orderQuery.page" :page-sizes="[10,20,30, 50]" :page-size="orderQuery.limit" :current-page.sync="orderQuery.page" :page-sizes="[10,20,30, 50]" :page-size="orderQuery.limit"
...@@ -657,10 +659,10 @@ ...@@ -657,10 +659,10 @@
bulkUploadMember: false, bulkUploadMember: false,
dialogStatus: '', dialogStatus: '',
userManager_btn_del: false, userManager_btn_del: false,
statusBoolean:false, statusBoolean: false,
myGroups: [], myGroups: [],
loading: false, loading: false,
HeaderWithToken: undefined,
tableKey: 0, tableKey: 0,
selectedAccItem: undefined selectedAccItem: undefined
} }
...@@ -677,11 +679,19 @@ ...@@ -677,11 +679,19 @@
/** /**
* 获取token * 获取token
*/ */
getHeaderWithToken() { getHeaderWithToken() {
return {Authorization: getToken()}; return {Authorization: getToken()};
}, },
}
, },
watch: {
'userMembershipInformation.memberLevel'(newValue, oldValue) {
console.log('userMembershipInformation.memberLevel='+newValue)
}
},
methods: { methods: {
/** /**
...@@ -830,15 +840,16 @@ ...@@ -830,15 +840,16 @@
* @param row * @param row
*/ */
setMember(row) { setMember(row) {
this.userMembershipInformation = {} this.userMembershipInformation = {}
this.saveUserId = row.userId this.saveUserId = row.userId
getUserMemberByUserId(row.userId).then(response => { getUserMemberByUserId(row.userId).then(response => {
console.log(JSON.stringify(response))
if (response.data.validTime == 0) { if (response.data.validTime == 0) {
this.validityType = '永久' this.validityType = '永久'
} else if (response.data.validTime) { } else if (response.data.validTime) {
this.validityType = '自定义' this.validityType = '自定义'
response.data.validTime = timestamp2Date(response.data.validTime); response.data.validTime = timestamp2Date(response.data.validTime)
} else { } else {
this.validityType = '无' this.validityType = '无'
} }
...@@ -854,10 +865,17 @@ ...@@ -854,10 +865,17 @@
* @param formName * @param formName
*/ */
saveMember(formName) { saveMember(formName) {
let date = new Date(this.validTime);
this.userMembershipInformation.validTime = date.getTime()
console.log(this.userMembershipInformation) if (this.validityType == '永久') {
this.userMembershipInformation.validTime = 0
} else if (this.validityType == '自定义') {
let date = new Date(this.validTime);
this.userMembershipInformation.validTime = date.getTime()
} else {
this.userMembershipInformation.validTime = null
}
this.userMembershipInformation.userId = this.saveUserId
console.log('userMembershipInformation:' + JSON.stringify(this.userMembershipInformation))
seveObj(this.userMembershipInformation).then(res => { seveObj(this.userMembershipInformation).then(res => {
if (res.rel) { if (res.rel) {
this.$notify.success({ this.$notify.success({
...@@ -1004,62 +1022,73 @@ ...@@ -1004,62 +1022,73 @@
this.orderQuery.page = val; this.orderQuery.page = val;
this.userOrder(this.orderQuery); this.userOrder(this.orderQuery);
}, },
disable(obj){ disable(obj) {
setDisable(obj.userId).then(res=> { setDisable(obj.userId).then(res => {
if (res.rel){ if (res.rel) {
this.$notify.success({ this.$notify.success({
title: '成功', title: '成功',
message: `success` message: `success`
}) })
}else { } else {
this.$notify.warning({ this.$notify.warning({
title: '失败', title: '失败',
message: `failed` message: `failed`
}) })
} }
this.getList() this.getList()
}) })
}, },
/** /**
* 设置为禁用取消禁用 * 设置为禁用取消禁用
*/ */
available(obj){ available(obj) {
setAvailable(obj.userId).then(res=>{ setAvailable(obj.userId).then(res => {
if (res.rel){ if (res.rel) {
this.$notify.success({ this.$notify.success({
title: '成功', title: '成功',
message: `success` message: `success`
}) })
}else { } else {
this.$notify.warning({ this.$notify.warning({
title: '失败', title: '失败',
message: `failed` message: `failed`
}) })
} }
this.getList() this.getList()
}) })
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
if (rowIndex/2==0) { if (rowIndex / 2 == 0) {
return 'warning-row'; return 'warning-row';
} }
// else if (rowIndex === 3) {
// return 'success-row';
// }
return ''; return '';
}, },
getBoolean(bool){ getBoolean(bool) {
if (bool==='1'){ if (bool === '1') {
this.statusBoolean=true this.statusBoolean = true
} }
}, },
setDate(){ setDate() {
alert(this.validTime) if (!this.validTime) {
if(!this.validTime){
let date = new Date();//时间戳为10位需*1000，时间戳为13位的话不需乘1000 let date = new Date();//时间戳为10位需*1000，时间戳为13位的话不需乘1000
this.validTime= formatDate(date, 'yyyy-MM-dd hh:mm:ss'); this.validTime = formatDate(date, 'yyyy-MM-dd hh:mm:ss');
}
},
cleaningQuery() {
this.listQuery = {
page: 1,
limit: 20,
mobileList: undefined,
mobile: undefined,
memberLevel: undefined,
source: undefined,
channel: undefined,
registrationTimeEnd: undefined,
registrationTimeBegin: undefined,
registrationDate: undefined
} }
} }
......
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