Skip to content

C
cms-admin
提交 1964caf6 authored 作者: pengxiaohui's avatar pengxiaohui
浏览文件
操作

修改bug

上级 5b685548
隐藏空白字符变更
内嵌 并排
正在显示 包含 43 行增加 和 21 行删除
src/api/settings.js
浏览文件 @ 1964caf6
...@@ -62,6 +62,12 @@ export function updateStaff(data) { ...@@ -62,6 +62,12 @@ export function updateStaff(data) {
export function batchDeleteStaff(data) { export function batchDeleteStaff(data) {
return httpRequest.post('/api/cms/admin/v1/user/batch-delete', data) return httpRequest.post('/api/cms/admin/v1/user/batch-delete', data)
} }
/**
* 删除用户缓存
*/
export function clearUserCached(id) {
return httpRequest.get(`/api/cms/admin/v1/user/${id}/clear-cached`)
}
/* ------------------------------------项目管理------------------------------------ */ /* ------------------------------------项目管理------------------------------------ */
/** /**
* 获取项目列表 * 获取项目列表
......
src/index.html
浏览文件 @ 1964caf6
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
id="viewport" id="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no, viewport-fit=cover" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no, viewport-fit=cover"
/> />
<script src="../static/tinymce/tinymce.min.js"></script> <script type="text/javascript" src="https://webapp-pub.ezijing.com/plugins/tinymce/tinymce.min.js"></script>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
src/pages/content-manage/ads/index.vue
浏览文件 @ 1964caf6
...@@ -166,7 +166,7 @@ export default { ...@@ -166,7 +166,7 @@ export default {
{ {
prop: 'start_time', prop: 'start_time',
label: '开始时间', label: '开始时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.start_time) || '-' return dateFormat(row.start_time) || '-'
} }
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
{ {
prop: 'end_time', prop: 'end_time',
label: '结束时间', label: '结束时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.end_time) || '-' return dateFormat(row.end_time) || '-'
} }
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
{ {
prop: 'created_at', prop: 'created_at',
label: '创建时间', label: '创建时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.created_at) || '-' return dateFormat(row.created_at) || '-'
} }
...@@ -306,6 +306,7 @@ export default { ...@@ -306,6 +306,7 @@ export default {
if (res.code === 0 && res.data && res.data.status) { if (res.code === 0 && res.data && res.data.status) {
this.$message.success('审核广告成功') this.$message.success('审核广告成功')
this.$refs.tableList.refetch() this.$refs.tableList.refetch()
this.$refs.ad_drawer.closeDrawer()
this.dialogVisible = false this.dialogVisible = false
} else { } else {
this.$message.error(res.message || '审核广告失败') this.$message.error(res.message || '审核广告失败')
......
src/pages/content-manage/article/index.vue
浏览文件 @ 1964caf6
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<el-tabs v-model="activeName" type="card" @tab-click="handleTabClick"> <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
<el-tab-pane label="全部" name="0"></el-tab-pane> <el-tab-pane label="全部" name="0"></el-tab-pane>
<el-tab-pane label="待审核" name="1"></el-tab-pane> <el-tab-pane label="待审核" name="1"></el-tab-pane>
<el-tab-pane label="已驳回" name="2"></el-tab-pane> <el-tab-pane label="已驳回" name="3"></el-tab-pane>
<el-tab-pane label="已通过" name="3"></el-tab-pane> <el-tab-pane label="已通过" name="2"></el-tab-pane>
</el-tabs> </el-tabs>
<!-- 图片 --> <!-- 图片 -->
<template v-slot:image="{ row }"> <template v-slot:image="{ row }">
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
{ {
prop: 'start_time', prop: 'start_time',
label: '开始时间', label: '开始时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.start_time) || '-' return dateFormat(row.start_time) || '-'
} }
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
{ {
prop: 'end_time', prop: 'end_time',
label: '结束时间', label: '结束时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.end_time) || '-' return dateFormat(row.end_time) || '-'
} }
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
{ {
prop: 'created_at', prop: 'created_at',
label: '创建时间', label: '创建时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.created_at) || '-' return dateFormat(row.created_at) || '-'
} }
...@@ -286,6 +286,7 @@ export default { ...@@ -286,6 +286,7 @@ export default {
if (res.code === 0 && res.data && res.data.status) { if (res.code === 0 && res.data && res.data.status) {
this.$message.success('审核文章成功') this.$message.success('审核文章成功')
this.$refs.tableList.refetch() this.$refs.tableList.refetch()
this.$refs.articleDrawer.closeDrawer()
this.dialogVisible = false this.dialogVisible = false
} else { } else {
this.$message.error(res.message || '审核文章失败') this.$message.error(res.message || '审核文章失败')
......
src/pages/content-manage/components/DrawerForm.vue
浏览文件 @ 1964caf6
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="right"> <div class="right">
<el-form-item label="web端图片：" required class="file-upload"> <el-form-item label="web端图片：" class="file-upload">
<el-upload <el-upload
:disabled="isDetails" :disabled="isDetails"
class="avatar-uploader" class="avatar-uploader"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</el-upload> </el-upload>
<p class="des">请上传文件，最多上传一张/份<br>支持：PNG、JPG</p> <p class="des">请上传文件，最多上传一张/份<br>支持：PNG、JPG</p>
</el-form-item> </el-form-item>
<el-form-item label="移动端图片：" required class="file-upload"> <el-form-item label="移动端图片：" class="file-upload">
<el-upload <el-upload
:disabled="isDetails" :disabled="isDetails"
action="https://baidu.com" action="https://baidu.com"
...@@ -87,16 +87,16 @@ ...@@ -87,16 +87,16 @@
<el-switch v-model="form.hasEndDate" :active-value="1" :inactive-value="0" active-text="有" inactive-text="无" :disabled="isDetails"></el-switch> <el-switch v-model="form.hasEndDate" :active-value="1" :inactive-value="0" active-text="有" inactive-text="无" :disabled="isDetails"></el-switch>
<el-date-picker v-if="form.hasEndDate" v-model="form.end_time" type="datetime" placeholder="选择结束时间" size="small" clearable :disabled="isDetails"/> <el-date-picker v-if="form.hasEndDate" v-model="form.end_time" type="datetime" placeholder="选择结束时间" size="small" clearable :disabled="isDetails"/>
</el-form-item> </el-form-item>
<el-form-item label="发布状态：" class="mb-15" v-if="!isCreate"> <el-form-item label="发布状态：" class="mb-15" v-if="!isEdit">
<el-switch v-model="form.is_publish" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" :disabled="isDetails"></el-switch> <el-switch v-model="form.is_publish" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" :disabled="isDetails"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="置顶状态：" class="mb-15" v-if="pageType !== 3"> <el-form-item label="置顶状态：" class="mb-15" v-if="pageType !== 3 && !isEdit">
<el-switch v-model="form.is_top" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" :disabled="isDetails"></el-switch> <el-switch v-model="form.is_top" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" :disabled="isDetails"></el-switch>
<el-select v-model="form.weight" placeholder="请选择权重" size="small" clearable :disabled="isDetails"> <el-select v-model="form.weight" placeholder="请选择权重" size="small" clearable :disabled="isDetails">
<el-option v-for="item in 10" :label="item" :value="item" :key="item"></el-option> <el-option v-for="item in 10" :label="item" :value="item" :key="item"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="推荐状态：" class="mb-15" v-if="pageType === 1"> <el-form-item label="推荐状态：" class="mb-15" v-if="pageType === 1 && !isEdit">
<el-switch v-model="form.is_recommend" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" :disabled="isDetails"></el-switch> <el-switch v-model="form.is_recommend" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" :disabled="isDetails"></el-switch>
</el-form-item> </el-form-item>
<el-form-item v-if="!isDetails" class="mb-15"> <el-form-item v-if="!isDetails" class="mb-15">
...@@ -203,6 +203,9 @@ export default { ...@@ -203,6 +203,9 @@ export default {
}, },
isCreate() { isCreate() {
return this.options.type === 'create' return this.options.type === 'create'
},
isEdit() {
return this.options.type === 'edit'
} }
}, },
watch: { watch: {
......
src/pages/content-manage/image-text/index.vue
浏览文件 @ 1964caf6
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<el-tabs v-model="activeName" type="card" @tab-click="handleTabClick"> <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
<el-tab-pane label="全部" name="0"></el-tab-pane> <el-tab-pane label="全部" name="0"></el-tab-pane>
<el-tab-pane label="待审核" name="1"></el-tab-pane> <el-tab-pane label="待审核" name="1"></el-tab-pane>
<el-tab-pane label="已驳回" name="2"></el-tab-pane> <el-tab-pane label="已驳回" name="3"></el-tab-pane>
<el-tab-pane label="已通过" name="3"></el-tab-pane> <el-tab-pane label="已通过" name="2"></el-tab-pane>
</el-tabs> </el-tabs>
<!-- 图片 --> <!-- 图片 -->
<template v-slot:image="{ row }"> <template v-slot:image="{ row }">
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
{ {
prop: 'start_time', prop: 'start_time',
label: '开始时间', label: '开始时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.start_time) || '-' return dateFormat(row.start_time) || '-'
} }
...@@ -155,7 +155,7 @@ export default { ...@@ -155,7 +155,7 @@ export default {
{ {
prop: 'end_time', prop: 'end_time',
label: '结束时间', label: '结束时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.end_time) || '-' return dateFormat(row.end_time) || '-'
} }
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
{ {
prop: 'created_at', prop: 'created_at',
label: '创建时间', label: '创建时间',
minWidth: '90px', minWidth: '150px',
computed({ row }) { computed({ row }) {
return dateFormat(row.created_at) || '-' return dateFormat(row.created_at) || '-'
} }
...@@ -250,6 +250,7 @@ export default { ...@@ -250,6 +250,7 @@ export default {
this.$message.success('审核图文成功') this.$message.success('审核图文成功')
this.$refs.tableList.refetch() this.$refs.tableList.refetch()
this.dialogVisible = false this.dialogVisible = false
this.$refs.imgTextDrawer.closeDrawer()
} else { } else {
this.$message.error(res.message || '审核图文失败') this.$message.error(res.message || '审核图文失败')
} }
......
src/pages/settings/role/index.vue
浏览文件 @ 1964caf6
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
}, },
columns: [ columns: [
{ prop: 'name', label: '角色名称', slots: 'table-role-name' }, { prop: 'name', label: '角色名称', slots: 'table-role-name' },
{ prop: 'role_owner', label: '角色拥有人' }, { prop: 'user_count', label: '角色拥有人' },
{ prop: 'operate', label: '操作', slots: 'table-operate' } { prop: 'operate', label: '操作', slots: 'table-operate' }
] ]
}, },
......
src/pages/settings/staff/index.vue
浏览文件 @ 1964caf6
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</template> </template>
<script> <script>
import TableList from '@/components/TableList' import TableList from '@/components/TableList'
import { getStaffList, getProjectList, getRoleList, createStaff, updateStaff, batchDeleteStaff } from '@/api/settings' import { getStaffList, getProjectList, getRoleList, createStaff, updateStaff, batchDeleteStaff, clearUserCached } from '@/api/settings'
import { sendCode, updatePassword, updateUserInfo } from '@/api/account' import { sendCode, updatePassword, updateUserInfo } from '@/api/account'
import { searchUserList } from '@/api/system' import { searchUserList } from '@/api/system'
const MOBILE_REG = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{4,8}$/ const MOBILE_REG = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{4,8}$/
...@@ -402,6 +402,7 @@ export default { ...@@ -402,6 +402,7 @@ export default {
if (res.code === 0 && res.msg === 'OK') { if (res.code === 0 && res.msg === 'OK') {
this.$message.success('更改密码成功') this.$message.success('更改密码成功')
this.dialogVisible = false this.dialogVisible = false
this.fetchClearUserCached()
} else { } else {
this.$message.error('更改密码失败') this.$message.error('更改密码失败')
} }
...@@ -415,6 +416,7 @@ export default { ...@@ -415,6 +416,7 @@ export default {
if (res.code === 0 && res.data && res.data.mobile) { if (res.code === 0 && res.data && res.data.mobile) {
this.$message.success('更改手机号成功') this.$message.success('更改手机号成功')
this.dialogVisible = false this.dialogVisible = false
this.fetchClearUserCached()
} else { } else {
this.$message.error('更改手机号失败') this.$message.error('更改手机号失败')
} }
...@@ -479,6 +481,14 @@ export default { ...@@ -479,6 +481,14 @@ export default {
this.projectList = res.data.data this.projectList = res.data.data
} }
}) })
},
fetchClearUserCached() {
const id = this.operateItem.sso_id || ''
clearUserCached(id).then(res => {
if (res.code === 0 && res.data && res.data.status) {
this.$refs.tabList.refetch()
}
})
} }
} }
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论