Commit 5ab3b7c9 authored by 高宇's avatar 高宇

会员权益添加等级卡片和描述卡片

parent a164611d
...@@ -172,6 +172,7 @@ export default { ...@@ -172,6 +172,7 @@ export default {
} }
} }
return { return {
srcList: [],
pickoptions: { pickoptions: {
disabledDate: time => { disabledDate: time => {
const oneDay = 60 * 60 * 24 * 1000 const oneDay = 60 * 60 * 24 * 1000
...@@ -285,6 +286,8 @@ export default { ...@@ -285,6 +286,8 @@ export default {
this.formdisable = true this.formdisable = true
// this.endtimedisable = true // this.endtimedisable = true
this.numinputdisable = true this.numinputdisable = true
this.uploaddisable = true
this.srcList.push(this.imageUrl)
this.form.activityDetails = this.form.activityDetails.replace(/\<p/gi, this.form.activityDetails = this.form.activityDetails.replace(/\<p/gi,
'<p style=" margin: 0px;" ') '<p style=" margin: 0px;" ')
this.form.activityDetails = this.form.activityDetails.replace(/\<img/gi, this.form.activityDetails = this.form.activityDetails.replace(/\<img/gi,
......
...@@ -118,6 +118,9 @@ export default { ...@@ -118,6 +118,9 @@ export default {
validMobile(value) ? callback() : callback(new Error('手机号格式不正确')) validMobile(value) ? callback() : callback(new Error('手机号格式不正确'))
} }
return { return {
baseURL: 'http://192.144.239.97:20043/file/',
imgageList: [],
imgList: [],
imgUrl: '', imgUrl: '',
imgageUrl: '', imgageUrl: '',
// 表单数据 // 表单数据
...@@ -174,6 +177,8 @@ export default { ...@@ -174,6 +177,8 @@ export default {
queryDetailById(id).then(res => { queryDetailById(id).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.form = res.data this.form = res.data
this.uploaddisable1 = true
this.uploaddisable = true
// this.imgUrl = baseURL + this.form.imgUrl // this.imgUrl = baseURL + this.form.imgUrl
if (this.form.imgUrl === null) { if (this.form.imgUrl === null) {
this.imgUrl = baseURL + '/static/images/login/denglu_icon_logo.png' this.imgUrl = baseURL + '/static/images/login/denglu_icon_logo.png'
......
...@@ -58,7 +58,8 @@ ...@@ -58,7 +58,8 @@
icon="el-icon-plus" icon="el-icon-plus"
size="small" size="small"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增
</el-button>
</div> </div>
</el-form> </el-form>
<div class="placeholder" /> <div class="placeholder" />
...@@ -120,27 +121,31 @@ ...@@ -120,27 +121,31 @@
size="mini" size="mini"
type="text" type="text"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)"
>详情</el-button> >详情
</el-button>
<el-button <el-button
v-if="scope.row.status === 0" v-if="scope.row.status === 0"
v-hasPermi="['sys:dict:edit']" v-hasPermi="['sys:dict:edit']"
size="mini" size="mini"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑</el-button> >编辑
</el-button>
<el-button <el-button
v-if="scope.row.status === 0" v-if="scope.row.status === 0"
v-hasPermi="['sys:dict:remove']" v-hasPermi="['sys:dict:remove']"
size="mini" size="mini"
type="text" type="text"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button> >删除
</el-button>
<el-button <el-button
v-hasPermi="['sys:dict:remove']" v-hasPermi="['sys:dict:remove']"
size="mini" size="mini"
type="text" type="text"
@click="bindmember(scope.row)" @click="bindmember(scope.row)"
>绑定管理员</el-button> >绑定管理员
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -153,7 +158,14 @@ ...@@ -153,7 +158,14 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 详情弹出框--> <!-- 详情弹出框-->
<el-dialog title="商家详情" :close-on-click-modal="false" :visible.sync="detailopen" width="779px" append-to-body @close="reset"> <el-dialog
title="商家详情"
:close-on-click-modal="false"
:visible.sync="detailopen"
width="779px"
append-to-body
@close="reset"
>
<el-form :model="businessForm" label-width="100px"> <el-form :model="businessForm" label-width="100px">
<el-form-item label="商家名称"> <el-form-item label="商家名称">
<span>{{ businessForm.name || '-' }}</span> <span>{{ businessForm.name || '-' }}</span>
...@@ -176,10 +188,32 @@ ...@@ -176,10 +188,32 @@
<el-form-item label="商家简介"> <el-form-item label="商家简介">
<span>{{ businessForm.entryDetails || '-' }}</span> <span>{{ businessForm.entryDetails || '-' }}</span>
</el-form-item> </el-form-item>
<el-form-item label="横版封面">
<el-image
class="avatar"
:src="businessForm.imageUrl"
:preview-src-list="imgageList"
/>
</el-form-item>
<el-form-item label="竖版封面">
<el-image
class="avatar"
:src="businessForm.imgUrl"
:preview-src-list="imgList"
/>
</el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
<!-- 绑定管理员弹窗--> <!-- 绑定管理员弹窗-->
<el-dialog title="绑定会员 " :close-on-click-modal="false" class="memberDialog" :visible.sync="bindopen" width="60%" append-to-body @close="reset"> <el-dialog
title="绑定会员 "
:close-on-click-modal="false"
class="memberDialog"
:visible.sync="bindopen"
width="60%"
append-to-body
@close="reset"
>
<el-form ref="query" style="padding: 0 0 0 0px" :model="query" :inline="true"> <el-form ref="query" style="padding: 0 0 0 0px" :model="query" :inline="true">
<el-form-item prop="phone"> <el-form-item prop="phone">
<el-input <el-input
...@@ -192,9 +226,9 @@ ...@@ -192,9 +226,9 @@
@keyup.enter.native="handleQuerys" @keyup.enter.native="handleQuerys"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="nickName"> <el-form-item prop="name">
<el-input <el-input
v-model="query.nickName" v-model="query.name"
placeholder="用户昵称" placeholder="用户昵称"
clearable clearable
:maxlength="30" :maxlength="30"
...@@ -208,7 +242,14 @@ ...@@ -208,7 +242,14 @@
<el-button icon="el-icon-refresh" size="small" @click="resetQuerys">重置</el-button> <el-button icon="el-icon-refresh" size="small" @click="resetQuerys">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table ref="table" style="margin-top: 16px" :header-cell-class-name="cellClass" border :data="memberList" @selection-change="handleSelectionChange"> <el-table
ref="table"
style="margin-top: 16px"
:header-cell-class-name="cellClass"
border
:data="memberList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" align="center" width="55" /> <el-table-column label="序号" type="index" align="center" width="55" />
<el-table-column label="会员头像" prop="avatar" width="80"> <el-table-column label="会员头像" prop="avatar" width="80">
...@@ -223,7 +264,7 @@ ...@@ -223,7 +264,7 @@
width="400" width="400"
trigger="click" trigger="click"
> >
<span>{{text}}</span> <span>{{ text }}</span>
<el-button slot="reference" @click="handleClick(scope.row)">{{ scope.row.phone }}</el-button> <el-button slot="reference" @click="handleClick(scope.row)">{{ scope.row.phone }}</el-button>
</el-popover> </el-popover>
</template> </template>
...@@ -262,7 +303,14 @@ import { ...@@ -262,7 +303,14 @@ import {
clearCache clearCache
} from '@/api/system/dict/type' } from '@/api/system/dict/type'
import dictCons from '@/utils/dictCons' import dictCons from '@/utils/dictCons'
import { queryBussinessAll, queryDetailById, deleteBussiness, BingBussinss, UnBingBussiness, updataBussinessInfo } from '@/api/bussiness/bussiness' import {
queryBussinessAll,
queryDetailById,
deleteBussiness,
BingBussinss,
UnBingBussiness,
updataBussinessInfo
} from '@/api/bussiness/bussiness'
import { queryMemberList, getDetailById } from '@/api/member/member' import { queryMemberList, getDetailById } from '@/api/member/member'
export default { export default {
...@@ -322,6 +370,8 @@ export default { ...@@ -322,6 +370,8 @@ export default {
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
baseURL: 'http://192.144.239.97:20043/file/', baseURL: 'http://192.144.239.97:20043/file/',
imgageList: [],
imgList: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
page: 1, page: 1,
...@@ -377,7 +427,7 @@ export default { ...@@ -377,7 +427,7 @@ export default {
handleClick(row) { handleClick(row) {
console.log('row', row) console.log('row', row)
getDetailById(row.businessId).then(res => { getDetailById(row.businessId).then(res => {
console.log('res',res) console.log('res', res)
this.text = res.data.phone this.text = res.data.phone
}) })
}, },
...@@ -494,8 +544,12 @@ export default { ...@@ -494,8 +544,12 @@ export default {
if (flag) { if (flag) {
if (this.form.dataId) { if (this.form.dataId) {
// 如果找不到 下拉框选项中对应选中的选项 或者 下拉框选项中对应选中的选项 状态为1(停用)则将双向绑定的数据清空 // 如果找不到 下拉框选项中对应选中的选项 或者 下拉框选项中对应选中的选项 状态为1(停用)则将双向绑定的数据清空
if (!this.optionsDict.find(item => { return item.dictCode === this.form.dataId }) || if (!this.optionsDict.find(item => {
this.optionsDict.find(item => { return item.dictCode === this.form.dataId }).status === 1) { return item.dictCode === this.form.dataId
}) ||
this.optionsDict.find(item => {
return item.dictCode === this.form.dataId
}).status === 1) {
this.form.dataId = '' this.form.dataId = ''
} }
} }
...@@ -571,6 +625,8 @@ export default { ...@@ -571,6 +625,8 @@ export default {
this.getList() this.getList()
}, },
getListS() { getListS() {
const storeId = JSON.parse(localStorage.getItem('storeId'))
this.query.storeId = storeId
queryMemberList(this.query).then(respos => { queryMemberList(this.query).then(respos => {
console.log('会员列表', respos) console.log('会员列表', respos)
this.memberList = respos.rows this.memberList = respos.rows
...@@ -593,8 +649,16 @@ export default { ...@@ -593,8 +649,16 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.queryParams = {
this.resetForm('queryForm') page: 1,
rows: 10,
name: undefined,
head: undefined,
phone: undefined,
beginTime: '',
endTime: ''
// status: undefined
}
this.handleQuery() this.handleQuery()
}, },
resetQuerys() { resetQuerys() {
...@@ -641,7 +705,21 @@ export default { ...@@ -641,7 +705,21 @@ export default {
const id = row.businessId const id = row.businessId
queryDetailById(id).then(res => { queryDetailById(id).then(res => {
console.log('商家信息', res) console.log('商家信息', res)
if (res.data.imageUrl != null) {
res.data.imageUrl = this.baseURL + res.data.imageUrl
} else {
res.data.imageUrl = 'http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png'
}
if (res.data.imgUrl !== null) {
res.data.imgUrl = this.baseURL + res.data.imgUrl
} else {
res.data.imgUrl = 'http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png'
}
this.imgageList = []
this.imgList = []
this.businessForm = res.data this.businessForm = res.data
this.imgList.push(this.businessForm.imgUrl)
this.imgageList.push(this.businessForm.imageUrl)
this.detailopen = true this.detailopen = true
}) })
}, },
...@@ -700,11 +778,12 @@ export default { ...@@ -700,11 +778,12 @@ export default {
}).then(function() { }).then(function() {
deleteBussiness(id).then(res => { deleteBussiness(id).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.$message.success('操作成功')
this.getList() this.getList()
this.$message.success('操作成功')
} }
}) })
}).catch(() => {}) }).catch(() => {
})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
...@@ -746,27 +825,33 @@ export default { ...@@ -746,27 +825,33 @@ export default {
::v-deep .el-table tr { ::v-deep .el-table tr {
height: 59px; height: 59px;
} }
.memberDialog{
::v-deep .el-dialog .el-dialog__body{ .memberDialog {
::v-deep .el-dialog .el-dialog__body {
max-height: 85vh; max-height: 85vh;
} }
::v-deep .el-table tr{
::v-deep .el-table tr {
height: 59px; height: 59px;
} }
::v-deep .el-table__header-wrapper .el-checkbox { ::v-deep .el-table__header-wrapper .el-checkbox {
display: none display: none
} }
} }
.app-container-dict { .app-container-dict {
font-size: 18px; font-size: 18px;
padding: 0; padding: 0;
.placeholder{
height:1.3vh; .placeholder {
height: 1.3vh;
background-color: #F4F4F4; background-color: #F4F4F4;
margin-bottom:10px margin-bottom: 10px
} }
} }
.upload-trademark{
.upload-trademark {
width: 56px; width: 56px;
height: 56px; height: 56px;
display: flex; display: flex;
...@@ -774,7 +859,7 @@ export default { ...@@ -774,7 +859,7 @@ export default {
align-items: center; align-items: center;
border: 1px dashed #E5E5E5; border: 1px dashed #E5E5E5;
.upload-trademark-title{ .upload-trademark-title {
font-size: 10px; font-size: 10px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400; font-weight: 400;
...@@ -782,9 +867,11 @@ export default { ...@@ -782,9 +867,11 @@ export default {
line-height: 10px !important; line-height: 10px !important;
} }
} }
::v-deep .el-switch__label * { ::v-deep .el-switch__label * {
font-size: 12px !important; font-size: 12px !important;
} }
::v-deep .el-switch__label { ::v-deep .el-switch__label {
position: absolute; position: absolute;
display: none; display: none;
...@@ -792,29 +879,34 @@ export default { ...@@ -792,29 +879,34 @@ export default {
font-size: 12px !important; font-size: 12px !important;
line-height: unset !important; line-height: unset !important;
} }
/*打开时文字位置设置*/ /*打开时文字位置设置*/
::v-deep .el-switch__label--right { ::v-deep .el-switch__label--right {
z-index: 1; z-index: 1;
right: 20px; right: 20px;
} }
/*关闭时文字位置设置*/ /*关闭时文字位置设置*/
::v-deep .el-switch__label--left { ::v-deep .el-switch__label--left {
z-index: 1; z-index: 1;
left: 20px; left: 20px;
} }
/*显示文字*/ /*显示文字*/
::v-deep .el-switch__label.is-active { ::v-deep .el-switch__label.is-active {
display: block; display: block;
} }
::v-deep .el-switch .el-switch__core, ::v-deep .el-switch .el-switch__core,
.el-switch .el-switch__label { .el-switch .el-switch__label {
width: 57px!important; width: 57px !important;
} }
</style> </style>
<style lang="scss"> <style lang="scss">
.app-container-dict { .app-container-dict {
.el-form { .el-form {
padding: 0 0 0 10px; padding: 0 0 0 10px;
.el-form-item { .el-form-item {
margin-top: 0; margin-top: 0;
margin-left: 0; margin-left: 0;
......
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