Skip to content

G
gxpt_web
Commit 8a195be4 by 吕明尚
Options

修改用户会员页面

parent 4657fc91
Showing with 81 additions and 58 deletions
src/api/system/memberConfig.js
......@@ -42,3 +42,11 @@ export function delMemberConfig(id) {
method: 'delete'
})
}
export function query(data) {
return request({
url: '/system/memberConfig/query',
method: 'get',
params: data
})
}
src/views/system/IntegralLog/index.vue
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
<el-form-item label="用户id" prop="consumerId">
<el-input
v-model="queryParams.consumerId"
clearable
placeholder="请输入用户id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="用户id" prop="consumerId">-->
<!-- <el-input-->
<!-- v-model="queryParams.consumerId"-->
<!-- clearable-->
<!-- placeholder="请输入用户id"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="变动积分" prop="variableIntegral">
<el-input
v-model="queryParams.variableIntegral"
......@@ -33,14 +33,14 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-input
v-model="queryParams.isDelete"
clearable
placeholder="请输入是否删除"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="是否删除" prop="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- clearable-->
<!-- placeholder="请输入是否删除"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -48,41 +48,41 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:IntegralLog:add']"
icon="el-icon-plus"
plain
size="mini"
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:IntegralLog:edit']"
:disabled="single"
icon="el-icon-edit"
plain
size="mini"
type="success"
@click="handleUpdate"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:IntegralLog:remove']"
:disabled="multiple"
icon="el-icon-delete"
plain
size="mini"
type="danger"
@click="handleDelete"
>删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:IntegralLog:add']"-->
<!-- icon="el-icon-plus"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:IntegralLog:edit']"-->
<!-- :disabled="single"-->
<!-- icon="el-icon-edit"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- @click="handleUpdate"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:IntegralLog:remove']"-->
<!-- :disabled="multiple"-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="handleDelete"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:IntegralLog:export']"
......@@ -99,7 +99,7 @@
<el-table v-loading="loading" :data="IntegralLogList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="ID" prop="id"/>
<!-- <el-table-column align="center" label="ID" prop="id"/>-->
<el-table-column align="center" label="用户id" prop="consumerId"/>
<el-table-column align="center" label="变动积分" prop="variableIntegral"/>
<el-table-column align="center" label="当前积分" prop="currentIntegral"/>
......@@ -183,7 +183,7 @@ import {
delIntegralLog,
addIntegralLog,
updateIntegralLog
} from "@/api/system/IntegralLog";
} from "@/api/system/integralLog";
export default {
name: "IntegralLog",
......
src/views/system/member/index.vue
......@@ -88,20 +88,25 @@
<!-- <el-table-column align="center" label="ID" prop="id"/>-->
<!-- <el-table-column align="center" label="用户id" prop="consumerId"/>-->
<el-table-column align="center" label="会员等级" prop="membershipLevel"/>
<el-table-column align="center" label="等级名称" prop="memberConfigId">
<template slot-scope="scope">
<span v-for="item in memberConfigList" v-if="scope.row.memberConfigId === item.id">{{ item.levelName }}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="会员类型" prop="memberType"/>-->
<el-table-column align="center" label="会员类型" prop="memberType" width="100px">
<template slot-scope="scope">
<dict-tag :options="dict.type.member_type" :value="scope.row.memberType"/>
</template>
</el-table-column>
<el-table-column align="center" label="会员配置id" prop="memberConfigId"/>
<!-- <el-table-column align="center" label="会员配置id" prop="memberConfigId"/>-->
<el-table-column align="center" label="会员有效期" prop="expirationDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.expirationDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="会员进度" prop="membershipProgress"/>
<el-table-column align="center" label="是否删除" prop="isDelete"/>
<!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>-->
<el-table-column align="center" label="备注" prop="remark"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope">
......@@ -152,9 +157,9 @@
<el-form-item label="会员等级" prop="membershipLevel">
<el-input v-model="form.membershipLevel" placeholder="请输入会员等级"/>
</el-form-item>
<el-form-item label="会员配置id" prop="memberConfigId">
<el-input v-model="form.memberConfigId" placeholder="请输入会员配置id"/>
</el-form-item>
<!-- <el-form-item label="会员配置id" prop="memberConfigId">-->
<!-- <el-input v-model="form.memberConfigId" placeholder="请输入会员配置id"/>-->
<!-- </el-form-item>-->
<el-form-item label="会员有效期" prop="expirationDate">
<el-date-picker v-model="form.expirationDate"
clearable
......@@ -183,6 +188,9 @@
<script>
import {listMember, getMember, delMember, addMember, updateMember} from "@/api/system/member";
import {
query
} from "@/api/system/memberConfig";
export default {
name: "Member",
......@@ -203,6 +211,7 @@ export default {
total: 0,
// 会员用户表格数据
memberList: [],
memberConfigList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -231,6 +240,7 @@ export default {
},
created() {
this.getList();
this.onMemberConfig();
},
methods: {
/** 查询会员用户列表 */
......@@ -271,6 +281,11 @@ export default {
this.queryParams.pageNum = 1;
this.getList();
},
onMemberConfig() {
query().then(res => {
this.memberConfigList = res.data
})
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
......
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