diff --git a/.env.production b/.env.production index f145831..a1ec662 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 麻瓜后台管理系统 +VUE_APP_TITLE = 恋香后台管理系统 # 生产环境配置 ENV = 'production' -VUE_APP_SYSTEM_HOME = '麻瓜' +VUE_APP_SYSTEM_HOME = '恋香' # 若依管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/public/favicon.ico b/public/favicon.ico index 3f919d8..759369b 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/cai/anchorTop.js b/src/api/cai/anchorTop.js new file mode 100644 index 0000000..dd204a6 --- /dev/null +++ b/src/api/cai/anchorTop.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询主播限时置顶列表 +export function listAnchorTop(query) { + return request({ + url: '/cai/anchorTop/list', + method: 'get', + params: query + }) +} + +// 查询主播限时置顶详细 +export function getAnchorTop(id) { + return request({ + url: '/cai/anchorTop/' + id, + method: 'get' + }) +} + +export function getAnchorTopByUserCode(usercode) { + return request({ + url: '/cai/anchorTop/getAnchorTopByUserCode', + method: 'get', + params: {'usercode': usercode} + }) +} + + +// 新增主播限时置顶 +export function addAnchorTop(data) { + return request({ + url: '/cai/anchorTop', + method: 'post', + data: data + }) +} + +// 修改主播限时置顶 +export function updateAnchorTop(data) { + return request({ + url: '/cai/anchorTop', + method: 'put', + data: data + }) +} + +// 删除主播限时置顶 +export function delAnchorTop(id) { + return request({ + url: '/cai/anchorTop/' + id, + method: 'delete' + }) +} diff --git a/src/api/cai/memberPrice.js b/src/api/cai/memberPrice.js index 7fe72fa..2113692 100644 --- a/src/api/cai/memberPrice.js +++ b/src/api/cai/memberPrice.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询会员价格列表 +// 查询会员价格设置列表 export function listMemberPrice(query) { return request({ url: '/cai/memberPrice/list', @@ -9,7 +9,7 @@ export function listMemberPrice(query) { }) } -// 查询会员价格详细 +// 查询会员价格设置详细 export function getMemberPrice(id) { return request({ url: '/cai/memberPrice/' + id, @@ -17,7 +17,7 @@ export function getMemberPrice(id) { }) } -// 新增会员价格 +// 新增会员价格设置 export function addMemberPrice(data) { return request({ url: '/cai/memberPrice', @@ -26,7 +26,7 @@ export function addMemberPrice(data) { }) } -// 修改会员价格 +// 修改会员价格设置 export function updateMemberPrice(data) { return request({ url: '/cai/memberPrice', @@ -35,7 +35,7 @@ export function updateMemberPrice(data) { }) } -// 删除会员价格 +// 删除会员价格设置 export function delMemberPrice(id) { return request({ url: '/cai/memberPrice/' + id, diff --git a/src/api/cai/payConfig.js b/src/api/cai/payConfig.js index 8ba1412..d488c60 100644 --- a/src/api/cai/payConfig.js +++ b/src/api/cai/payConfig.js @@ -35,6 +35,14 @@ export function updatePayConfig(data) { }) } +export function updatePayConfigStatus(data) { + return request({ + url: '/cai/payConfig/status', + method: 'put', + data: data + }) +} + // 删除支付配置 export function delPayConfig(id) { return request({ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 3f919d8..877331c 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/constant/statusMap.js b/src/constant/statusMap.js index b84fa98..8ea6b8e 100644 --- a/src/constant/statusMap.js +++ b/src/constant/statusMap.js @@ -314,3 +314,10 @@ export const sensitiveTypeList = [ { value: 2, label: '黑名单', listClass: listClass.danger}, ] +// 1-生效 2-过期 3-待生效 + +export const topStatusList = [ + { value: 1, label: '生效', listClass: listClass.primary}, + { value: 2, label: '过期', listClass: listClass.info}, + { value: 3, label: '待生效', listClass: listClass.warning}, +] diff --git a/src/views/cai/anchor/index.vue b/src/views/cai/anchor/index.vue index f45d87f..fe357d5 100644 --- a/src/views/cai/anchor/index.vue +++ b/src/views/cai/anchor/index.vue @@ -34,6 +34,28 @@ v-hasPermi="['cai:anchor:add']" >新增 + + 新增主播置顶 + + + + 主播置顶快速查询 + + @@ -138,6 +160,8 @@ + + @@ -147,10 +171,13 @@ import {genderList, userStatusList, videoStatusList} from '@/constant/statusMap' import AddAnchorDialog from "@/views/cai/anchor/add-anchor-dialog"; import UpdateAnchorDialog from "@/views/cai/anchor/update-anchor-dialog"; import AnchorInfoDialog from "@/views/cai/anchor/anchor-info-dialog"; +import AddAnchorTopDialog from '@/views/cai/anchorTop/add-anchor-top-dialog.vue' +import AnchorTopDialog from '@/views/cai/anchorTop/anchor-top-dialog.vue' export default { name: "Anchor", components:{ + AddAnchorTopDialog,AnchorTopDialog, AddAnchorDialog,UpdateAnchorDialog,AnchorInfoDialog }, data() { @@ -160,6 +187,8 @@ export default { addAnchorDialogVisible: false, updateAnchorDialogVisible: false, anchorInfoDialogVisible: false, + addAnchorTopDialogVisible: false, + anchorTopDialogVisible: false, // 遮罩层 loading: true, // 选中数组 @@ -286,6 +315,19 @@ export default { this.loading = false; }); }, + handleAnchorTop(){ + this.addAnchorTopDialogVisible = true + this.$nextTick(() => { + this.$refs.addAnchorTopDialog.init() + }) + }, + handleAnchorTopList(){ + this.anchorTopDialogVisible = true + this.$nextTick(() => { + this.$refs.anchorTopDialog.init() + }) + }, + } }; diff --git a/src/views/cai/anchorTop/add-anchor-top-dialog.vue b/src/views/cai/anchorTop/add-anchor-top-dialog.vue new file mode 100644 index 0000000..11e9448 --- /dev/null +++ b/src/views/cai/anchorTop/add-anchor-top-dialog.vue @@ -0,0 +1,145 @@ + + + diff --git a/src/views/cai/anchorTop/anchor-top-dialog.vue b/src/views/cai/anchorTop/anchor-top-dialog.vue new file mode 100644 index 0000000..db21b37 --- /dev/null +++ b/src/views/cai/anchorTop/anchor-top-dialog.vue @@ -0,0 +1,144 @@ + + + diff --git a/src/views/cai/anchorTop/index.vue b/src/views/cai/anchorTop/index.vue new file mode 100644 index 0000000..207afcb --- /dev/null +++ b/src/views/cai/anchorTop/index.vue @@ -0,0 +1,233 @@ + + + diff --git a/src/views/cai/forbidFilter/index.vue b/src/views/cai/forbidFilter/index.vue index ae569d3..c9f1553 100644 --- a/src/views/cai/forbidFilter/index.vue +++ b/src/views/cai/forbidFilter/index.vue @@ -69,6 +69,7 @@ + +
+ + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/views/cai/memberPrice/member-price-update-dialog.vue b/src/views/cai/memberPrice/member-price-update-dialog.vue new file mode 100644 index 0000000..0834008 --- /dev/null +++ b/src/views/cai/memberPrice/member-price-update-dialog.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/views/cai/payConfig/index.vue b/src/views/cai/payConfig/index.vue index 4c7554a..cffe051 100644 --- a/src/views/cai/payConfig/index.vue +++ b/src/views/cai/payConfig/index.vue @@ -86,7 +86,7 @@