diff --git a/package.json b/package.json index 4bffc85..9f366a9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fuintAdmin", "version": "3.0.3", - "description": "fuint会员营销系统后台管理端", + "description": "手工王国后台管理端", "author": "FSQ", "license": "MIT", "scripts": { diff --git a/src/api/book.js b/src/api/book.js index 5085072..80116b7 100644 --- a/src/api/book.js +++ b/src/api/book.js @@ -99,3 +99,11 @@ export function updateBookItemStatus(id, status) { data: data, }) } + +// 预约订单详情 +export function getBookItemInfo(id) { + return request({ + url: `backendApi/bookItem/info/${id}`, + method: 'get', + }) +} diff --git a/src/api/look.js b/src/api/look.js new file mode 100644 index 0000000..cfaaa25 --- /dev/null +++ b/src/api/look.js @@ -0,0 +1,30 @@ +import request from '@/utils/request' + +// 分页查询看看作品 +export function getLookList(query) { + return request({ + url: 'backendApi/look/list', + method: 'get', + params: query, + }) +} + +// 查询作品详情 +export function getLookInfo(id) { + return request({ + url: 'backendApi/look/info/' + id, + method: 'get', + }) +} + +// 更新状态 +export function updateLookStatus(id, status) { + return request({ + url: 'backendApi/look/updateStatus', + method: 'post', + data: { + id, + status, + }, + }) +} diff --git a/src/api/point.js b/src/api/point.js index 94a3ee3..5842854 100644 --- a/src/api/point.js +++ b/src/api/point.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 分页查询积分明细列表 +// 分页查询银币明细列表 export function getPointList(query) { return request({ url: 'backendApi/point/list', diff --git a/src/api/raffle.js b/src/api/raffle.js new file mode 100644 index 0000000..206a191 --- /dev/null +++ b/src/api/raffle.js @@ -0,0 +1,84 @@ +import request from '@/utils/request' + +export function getRaffleList(query) { + return request({ + url: 'backendApi/raffle/list', + method: 'get', + params: query, + }) +} + +export function getRaffleDetail(id) { + return request({ + url: 'backendApi/raffle/info', + method: 'get', + params: { id }, + }) +} + +export function updateRaffleStatus(id, status) { + return request({ + url: 'backendApi/raffle/change', + method: 'get', + params: { id, status }, + }) +} + +export function saveRaffle(data) { + return request({ + url: 'backendApi/raffle/save', + method: 'post', + data: data, + }) +} + +export function getRaffleRecords(query) { + return request({ + url: 'backendApi/raffle/detail', + method: 'get', + params: query, + }) +} + +export function dealRaffle(id) { + return request({ + url: 'backendApi/raffle/deal', + method: 'get', + params: { id }, + }) +} + +// 抽奖类型列表 +export function getRaffleTypeList(query) { + return request({ + url: 'backendApi/raffleType/list', + method: 'get', + params: query, + }) +} + +// 抽奖类型详情 +export function getRaffleTypeInfo(id) { + return request({ + url: `backendApi/raffleType/info/${id}`, + method: 'get', + }) +} + +// 保存抽奖类型 +export function saveRaffleType(data) { + return request({ + url: 'backendApi/raffleType/save', + method: 'post', + data: data, + }) +} + +// 更新抽奖类型状态 +export function updateRaffleTypeStatus(typeId, status) { + return request({ + url: 'backendApi/raffleType/updateStatus', + method: 'post', + data: { typeId, status }, + }) +} diff --git a/src/api/task.js b/src/api/task.js new file mode 100644 index 0000000..275abce --- /dev/null +++ b/src/api/task.js @@ -0,0 +1,67 @@ +import request from '@/utils/request' + +// 分页查询任务列表 +export function getTaskList(query) { + return request({ + url: 'backendApi/task/list', + method: 'get', + params: query, + }) +} + +// 查询任务信息 +export function getTaskInfo(id) { + return request({ + url: 'backendApi/task/info/' + id, + method: 'get', + }) +} + +// 更新任务状态 +export function updateTaskStatus(id, status) { + const data = { + id, + status, + } + return request({ + url: 'backendApi/task/updateStatus', + method: 'post', + data, + }) +} + +// 保存任务 +export function saveTask(data) { + return request({ + url: 'backendApi/task/save', + method: 'post', + data, + }) +} + +// 查询公共任务列表（merchant_id=0,store_id=0） +export function getPublicTaskList(query) { + return request({ + url: 'backendApi/task/publicList', + method: 'get', + params: query, + }) +} + +// 导入公共任务 +export function importPublicTask(data) { + return request({ + url: 'backendApi/task/importPublic', + method: 'post', + data, + }) +} + +// 查询任务完成记录 +export function getTaskRecordList(query) { + return request({ + url: 'backendApi/task/recordList', + method: 'get', + params: query, + }) +} diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 36d00d3..3a9bdbc 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 1b1fc71..13bfac1 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -83,6 +83,10 @@ export default { return '' }, role() { + const roles = this.$store.getters.roles || [] + if (roles.includes('admin')) { + return '系统管理员' + } if (this.$store.getters.storeName && this.$store.getters.storeId) { return '店铺管理员' } diff --git a/src/utils/image.js b/src/utils/image.js new file mode 100644 index 0000000..3f6652c --- /dev/null +++ b/src/utils/image.js @@ -0,0 +1,7 @@ +export const resolveImageUrl = (base, path) => { + if (!path) return '' + if (/^https?:\/\//i.test(path)) { + return path + } + return (base || '') + path +} diff --git a/src/utils/upload.js b/src/utils/upload.js new file mode 100644 index 0000000..d384de9 --- /dev/null +++ b/src/utils/upload.js @@ -0,0 +1,5 @@ +export const getUploadFileName = (res) => { + if (!res) return '' + const data = res.data || res.result || res + return data.fileName || data.file || data.path || data.url || '' +} diff --git a/src/views/book/components/bookCate.vue b/src/views/book/components/bookCate.vue index 9d912af..a48e27f 100644 --- a/src/views/book/components/bookCate.vue +++ b/src/views/book/components/bookCate.vue @@ -60,7 +60,7 @@ /> @@ -179,6 +179,11 @@ export default { }, }, methods: { + getImageUrl(path) { + if (!path) return '' + if (/^https?:\/\//i.test(path)) return path + return (this.imagePath || '') + path + }, handleClose() { this.innerShowDialog = false }, diff --git a/src/views/book/components/bookCateForm.vue b/src/views/book/components/bookCateForm.vue index 6f14d2f..d5eecbf 100644 --- a/src/views/book/components/bookCateForm.vue +++ b/src/views/book/components/bookCateForm.vue @@ -60,7 +60,7 @@ > @@ -108,6 +108,7 @@ - diff --git a/src/views/cashier/components/noGoodsCashier.vue b/src/views/cashier/components/noGoodsCashier.vue index 77766c2..b811cb3 100644 --- a/src/views/cashier/components/noGoodsCashier.vue +++ b/src/views/cashier/components/noGoodsCashier.vue @@ -1,5 +1,5 @@