From 07b1f341b3f6fd846f760d71bd773d0684a415cd Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Tue, 24 Dec 2024 20:31:47 +0800 Subject: [PATCH] 241224 --- .env.development | 3 +- src/api/cms/articleCheck/index.ts | 106 +++ src/api/cms/articleCheck/model/index.ts | 35 + src/api/cms/cmsArticleComment/index.ts | 14 +- src/api/cms/cmsArticleComment/model/index.ts | 1 + src/api/cms/follow/index.ts | 106 +++ src/api/cms/follow/model/index.ts | 35 + src/api/shop/commissionRole/index.ts | 106 +++ src/api/shop/commissionRole/model/index.ts | 33 + src/api/shop/expressTemplate/index.ts | 106 +++ src/api/shop/expressTemplate/model/index.ts | 36 + src/api/shop/expressTemplateDetail/index.ts | 106 +++ .../shop/expressTemplateDetail/model/index.ts | 39 + src/api/shop/goods/model/index.ts | 8 + src/api/shop/goodsRoleCommission/index.ts | 106 +++ .../shop/goodsRoleCommission/model/index.ts | 35 + src/api/shop/merchant/index.ts | 6 +- src/api/shop/merchantApply/index.ts | 10 + src/api/shop/merchantChargePackage/index.ts | 106 +++ .../shop/merchantChargePackage/model/index.ts | 39 + src/api/shop/merchantGoodsPackage/index.ts | 106 +++ .../shop/merchantGoodsPackage/model/index.ts | 39 + src/api/shop/merchantPackageGoods/index.ts | 106 +++ .../shop/merchantPackageGoods/model/index.ts | 37 + src/api/shop/message/index.ts | 106 +++ src/api/shop/message/model/index.ts | 35 + src/api/shop/order/index.ts | 36 +- src/api/shop/swiper/model/index.ts | 4 + src/api/shop/userBalanceInMerchant/index.ts | 106 +++ .../shop/userBalanceInMerchant/model/index.ts | 35 + src/api/shop/userCommissionRole/index.ts | 117 +++ .../shop/userCommissionRole/model/index.ts | 29 + src/api/shop/userGoodsInMerchant/index.ts | 106 +++ .../shop/userGoodsInMerchant/model/index.ts | 35 + src/api/shop/viewHistory/index.ts | 106 +++ src/api/shop/viewHistory/model/index.ts | 33 + src/api/system/area/index.ts | 21 + src/api/system/area/model/index.ts | 8 + src/api/user/referee/index.ts | 87 +- src/components/PayMethod/index.vue | 12 + src/layout/index.vue | 512 +++++------ .../cms/article/components/commentList.vue | 125 +++ src/views/cms/article/components/search.vue | 2 +- src/views/cms/article/index.vue | 549 ++++++------ .../components/articleCheckEdit.vue | 220 +++++ .../cms/articleCheck/components/search.vue | 42 + src/views/cms/articleCheck/index.vue | 257 ++++++ .../cms/follow/components/followEdit.vue | 220 +++++ src/views/cms/follow/components/search.vue | 42 + src/views/cms/follow/index.vue | 257 ++++++ .../components/commissionRoleEdit.vue | 171 ++++ .../shop/commissionRole/components/search.vue | 42 + src/views/shop/commissionRole/index.vue | 239 +++++ .../components/dealerWithdrawEdit.vue | 375 ++++---- .../shop/dealerWithdraw/components/search.vue | 7 +- src/views/shop/dealerWithdraw/index.vue | 442 +++++----- .../components/expressTemplateEdit.vue | 276 ++++++ .../expressTemplate/components/search.vue | 42 + src/views/shop/expressTemplate/index.vue | 224 +++++ .../components/expressTemplateDetailEdit.vue | 233 +++++ .../components/search.vue | 42 + .../shop/expressTemplateDetail/index.vue | 269 ++++++ src/views/shop/goods/components/goodsEdit.vue | 533 +++++++++--- src/views/shop/goods/components/search.vue | 2 +- .../components/goodsRoleCommissionEdit.vue | 210 +++++ .../goodsRoleCommission/components/search.vue | 42 + src/views/shop/goodsRoleCommission/index.vue | 251 ++++++ .../shop/merchant/components/merchantEdit.vue | 183 +++- src/views/shop/merchant/components/search.vue | 84 +- .../components/merchantApplyEdit.vue | 21 +- .../components/merchantChargePackageEdit.vue | 236 +++++ .../components/search.vue | 42 + .../shop/merchantChargePackage/index.vue | 269 ++++++ .../components/merchantGoodsPackageEdit.vue | 236 +++++ .../components/search.vue | 42 + src/views/shop/merchantGoodsPackage/index.vue | 269 ++++++ .../components/merchantPackageGoodsEdit.vue | 228 +++++ .../components/search.vue | 42 + src/views/shop/merchantPackageGoods/index.vue | 263 ++++++ .../shop/message/components/messageEdit.vue | 173 ++++ src/views/shop/message/components/search.vue | 42 + src/views/shop/message/index.vue | 225 +++++ src/views/shop/order/index.vue | 2 + .../shop/swiper/components/swiperEdit.vue | 2 +- .../components/search.vue | 42 + .../components/userBalanceInMerchantEdit.vue | 220 +++++ .../shop/userBalanceInMerchant/index.vue | 257 ++++++ .../userCommissionRole/components/search.vue | 42 + .../components/userCommissionRoleEdit.vue | 194 +++++ src/views/shop/userCommissionRole/index.vue | 239 +++++ .../userGoodsInMerchant/components/search.vue | 42 + .../components/userGoodsInMerchantEdit.vue | 220 +++++ src/views/shop/userGoodsInMerchant/index.vue | 257 ++++++ .../shop/viewHistory/components/search.vue | 42 + .../components/viewHistoryEdit.vue | 212 +++++ src/views/shop/viewHistory/index.vue | 251 ++++++ src/views/system/chart/index.vue | 44 + .../system/user/components/childList.vue | 102 +++ .../system/user/components/commissionRole.vue | 101 +++ src/views/system/user/index.vue | 819 +++++++++--------- 100 files changed, 11616 insertions(+), 1653 deletions(-) create mode 100644 src/api/cms/articleCheck/index.ts create mode 100644 src/api/cms/articleCheck/model/index.ts create mode 100644 src/api/cms/follow/index.ts create mode 100644 src/api/cms/follow/model/index.ts create mode 100644 src/api/shop/commissionRole/index.ts create mode 100644 src/api/shop/commissionRole/model/index.ts create mode 100644 src/api/shop/expressTemplate/index.ts create mode 100644 src/api/shop/expressTemplate/model/index.ts create mode 100644 src/api/shop/expressTemplateDetail/index.ts create mode 100644 src/api/shop/expressTemplateDetail/model/index.ts create mode 100644 src/api/shop/goodsRoleCommission/index.ts create mode 100644 src/api/shop/goodsRoleCommission/model/index.ts create mode 100644 src/api/shop/merchantChargePackage/index.ts create mode 100644 src/api/shop/merchantChargePackage/model/index.ts create mode 100644 src/api/shop/merchantGoodsPackage/index.ts create mode 100644 src/api/shop/merchantGoodsPackage/model/index.ts create mode 100644 src/api/shop/merchantPackageGoods/index.ts create mode 100644 src/api/shop/merchantPackageGoods/model/index.ts create mode 100644 src/api/shop/message/index.ts create mode 100644 src/api/shop/message/model/index.ts create mode 100644 src/api/shop/userBalanceInMerchant/index.ts create mode 100644 src/api/shop/userBalanceInMerchant/model/index.ts create mode 100644 src/api/shop/userCommissionRole/index.ts create mode 100644 src/api/shop/userCommissionRole/model/index.ts create mode 100644 src/api/shop/userGoodsInMerchant/index.ts create mode 100644 src/api/shop/userGoodsInMerchant/model/index.ts create mode 100644 src/api/shop/viewHistory/index.ts create mode 100644 src/api/shop/viewHistory/model/index.ts create mode 100644 src/api/system/area/index.ts create mode 100644 src/api/system/area/model/index.ts create mode 100644 src/views/cms/article/components/commentList.vue create mode 100644 src/views/cms/articleCheck/components/articleCheckEdit.vue create mode 100644 src/views/cms/articleCheck/components/search.vue create mode 100644 src/views/cms/articleCheck/index.vue create mode 100644 src/views/cms/follow/components/followEdit.vue create mode 100644 src/views/cms/follow/components/search.vue create mode 100644 src/views/cms/follow/index.vue create mode 100644 src/views/shop/commissionRole/components/commissionRoleEdit.vue create mode 100644 src/views/shop/commissionRole/components/search.vue create mode 100644 src/views/shop/commissionRole/index.vue create mode 100644 src/views/shop/expressTemplate/components/expressTemplateEdit.vue create mode 100644 src/views/shop/expressTemplate/components/search.vue create mode 100644 src/views/shop/expressTemplate/index.vue create mode 100644 src/views/shop/expressTemplateDetail/components/expressTemplateDetailEdit.vue create mode 100644 src/views/shop/expressTemplateDetail/components/search.vue create mode 100644 src/views/shop/expressTemplateDetail/index.vue create mode 100644 src/views/shop/goodsRoleCommission/components/goodsRoleCommissionEdit.vue create mode 100644 src/views/shop/goodsRoleCommission/components/search.vue create mode 100644 src/views/shop/goodsRoleCommission/index.vue create mode 100644 src/views/shop/merchantChargePackage/components/merchantChargePackageEdit.vue create mode 100644 src/views/shop/merchantChargePackage/components/search.vue create mode 100644 src/views/shop/merchantChargePackage/index.vue create mode 100644 src/views/shop/merchantGoodsPackage/components/merchantGoodsPackageEdit.vue create mode 100644 src/views/shop/merchantGoodsPackage/components/search.vue create mode 100644 src/views/shop/merchantGoodsPackage/index.vue create mode 100644 src/views/shop/merchantPackageGoods/components/merchantPackageGoodsEdit.vue create mode 100644 src/views/shop/merchantPackageGoods/components/search.vue create mode 100644 src/views/shop/merchantPackageGoods/index.vue create mode 100644 src/views/shop/message/components/messageEdit.vue create mode 100644 src/views/shop/message/components/search.vue create mode 100644 src/views/shop/message/index.vue create mode 100644 src/views/shop/userBalanceInMerchant/components/search.vue create mode 100644 src/views/shop/userBalanceInMerchant/components/userBalanceInMerchantEdit.vue create mode 100644 src/views/shop/userBalanceInMerchant/index.vue create mode 100644 src/views/shop/userCommissionRole/components/search.vue create mode 100644 src/views/shop/userCommissionRole/components/userCommissionRoleEdit.vue create mode 100644 src/views/shop/userCommissionRole/index.vue create mode 100644 src/views/shop/userGoodsInMerchant/components/search.vue create mode 100644 src/views/shop/userGoodsInMerchant/components/userGoodsInMerchantEdit.vue create mode 100644 src/views/shop/userGoodsInMerchant/index.vue create mode 100644 src/views/shop/viewHistory/components/search.vue create mode 100644 src/views/shop/viewHistory/components/viewHistoryEdit.vue create mode 100644 src/views/shop/viewHistory/index.vue create mode 100644 src/views/system/chart/index.vue create mode 100644 src/views/system/user/components/childList.vue create mode 100644 src/views/system/user/components/commissionRole.vue diff --git a/.env.development b/.env.development index b5845e1..2ec9cc6 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,12 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com -VITE_SERVER_URL=https://server.gxwebsoft.com/api VITE_THINK_URL=https://gxtyzx-api.websoft.top/api #VITE_API_URL=https://ngb-service-api.websoft.top/api +VITE_SERVER_URL=https://server.gxwebsoft.com/api #VITE_SERVER_URL=http://127.0.0.1:9090/api VITE_API_URL=http://127.0.0.1:9002/api #VITE_THINK_URL=http://127.0.0.1:9099/api #/booking/bookingItem +F diff --git a/src/api/cms/articleCheck/index.ts b/src/api/cms/articleCheck/index.ts new file mode 100644 index 0000000..7874bf0 --- /dev/null +++ b/src/api/cms/articleCheck/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ArticleCheck, ArticleCheckParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询 + */ +export async function pageArticleCheck(params: ArticleCheckParam) { + const res = await request.get>>( + MODULES_API_URL + '/cms/article-check/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询列表 + */ +export async function listArticleCheck(params?: ArticleCheckParam) { + const res = await request.get>( + MODULES_API_URL + '/cms/article-check', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加 + */ +export async function addArticleCheck(data: ArticleCheck) { + const res = await request.post>( + MODULES_API_URL + '/cms/article-check', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改 + */ +export async function updateArticleCheck(data: ArticleCheck) { + const res = await request.put>( + MODULES_API_URL + '/cms/article-check', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除 + */ +export async function removeArticleCheck(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/cms/article-check/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除 + */ +export async function removeBatchArticleCheck(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/cms/article-check/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询 + */ +export async function getArticleCheck(id: number) { + const res = await request.get>( + MODULES_API_URL + '/cms/article-check/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/cms/articleCheck/model/index.ts b/src/api/cms/articleCheck/model/index.ts new file mode 100644 index 0000000..9577af5 --- /dev/null +++ b/src/api/cms/articleCheck/model/index.ts @@ -0,0 +1,35 @@ +import type { PageParam } from '@/api'; + +/** + * + */ +export interface ArticleCheck { + // + id?: number; + // 文章ID + articleId?: number; + // + userId?: number; + // 0待审核1通过2拒绝 + status?: string; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 搜索条件 + */ +export interface ArticleCheckParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/cms/cmsArticleComment/index.ts b/src/api/cms/cmsArticleComment/index.ts index 085579f..dee4118 100644 --- a/src/api/cms/cmsArticleComment/index.ts +++ b/src/api/cms/cmsArticleComment/index.ts @@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting'; */ export async function pageCmsArticleComment(params: CmsArticleCommentParam) { const res = await request.get>>( - MODULES_API_URL + '/cms/cms-article-comment/page', + MODULES_API_URL + '/cms/article-comment/page', { params } @@ -24,7 +24,7 @@ export async function pageCmsArticleComment(params: CmsArticleCommentParam) { */ export async function listCmsArticleComment(params?: CmsArticleCommentParam) { const res = await request.get>( - MODULES_API_URL + '/cms/cms-article-comment', + MODULES_API_URL + '/cms/article-comment', { params } @@ -40,7 +40,7 @@ export async function listCmsArticleComment(params?: CmsArticleCommentParam) { */ export async function addCmsArticleComment(data: CmsArticleComment) { const res = await request.post>( - MODULES_API_URL + '/cms/cms-article-comment', + MODULES_API_URL + '/cms/article-comment', data ); if (res.data.code === 0) { @@ -54,7 +54,7 @@ export async function addCmsArticleComment(data: CmsArticleComment) { */ export async function updateCmsArticleComment(data: CmsArticleComment) { const res = await request.put>( - MODULES_API_URL + '/cms/cms-article-comment', + MODULES_API_URL + '/cms/article-comment', data ); if (res.data.code === 0) { @@ -68,7 +68,7 @@ export async function updateCmsArticleComment(data: CmsArticleComment) { */ export async function removeCmsArticleComment(id?: number) { const res = await request.delete>( - MODULES_API_URL + '/cms/cms-article-comment/' + id + MODULES_API_URL + '/cms/article-comment/' + id ); if (res.data.code === 0) { return res.data.message; @@ -81,7 +81,7 @@ export async function removeCmsArticleComment(id?: number) { */ export async function removeBatchCmsArticleComment(data: (number | undefined)[]) { const res = await request.delete>( - MODULES_API_URL + '/cms/cms-article-comment/batch', + MODULES_API_URL + '/cms/article-comment/batch', { data } @@ -97,7 +97,7 @@ export async function removeBatchCmsArticleComment(data: (number | undefined)[]) */ export async function getCmsArticleComment(id: number) { const res = await request.get>( - MODULES_API_URL + '/cms/cms-article-comment/' + id + MODULES_API_URL + '/cms/article-comment/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/cms/cmsArticleComment/model/index.ts b/src/api/cms/cmsArticleComment/model/index.ts index 2490228..912e40f 100644 --- a/src/api/cms/cmsArticleComment/model/index.ts +++ b/src/api/cms/cmsArticleComment/model/index.ts @@ -43,5 +43,6 @@ export interface CmsArticleComment { */ export interface CmsArticleCommentParam extends PageParam { commentId?: number; + articleId?: number; keywords?: string; } diff --git a/src/api/cms/follow/index.ts b/src/api/cms/follow/index.ts new file mode 100644 index 0000000..dccb3fb --- /dev/null +++ b/src/api/cms/follow/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { Follow, FollowParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询关注 + */ +export async function pageFollow(params: FollowParam) { + const res = await request.get>>( + MODULES_API_URL + '/cms/follow/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询关注列表 + */ +export async function listFollow(params?: FollowParam) { + const res = await request.get>( + MODULES_API_URL + '/cms/follow', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加关注 + */ +export async function addFollow(data: Follow) { + const res = await request.post>( + MODULES_API_URL + '/cms/follow', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改关注 + */ +export async function updateFollow(data: Follow) { + const res = await request.put>( + MODULES_API_URL + '/cms/follow', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除关注 + */ +export async function removeFollow(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/cms/follow/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除关注 + */ +export async function removeBatchFollow(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/cms/follow/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询关注 + */ +export async function getFollow(id: number) { + const res = await request.get>( + MODULES_API_URL + '/cms/follow/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/cms/follow/model/index.ts b/src/api/cms/follow/model/index.ts new file mode 100644 index 0000000..880637e --- /dev/null +++ b/src/api/cms/follow/model/index.ts @@ -0,0 +1,35 @@ +import type { PageParam } from '@/api'; + +/** + * 关注 + */ +export interface Follow { + // + id?: number; + // + userId?: number; + // + followUserId?: number; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 状态, 0已发布, 1待审核 2已驳回 3违规内容 + status?: number; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 关注搜索条件 + */ +export interface FollowParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/commissionRole/index.ts b/src/api/shop/commissionRole/index.ts new file mode 100644 index 0000000..e5c0f28 --- /dev/null +++ b/src/api/shop/commissionRole/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { CommissionRole, CommissionRoleParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询分红角色 + */ +export async function pageCommissionRole(params: CommissionRoleParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/commission-role/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询分红角色列表 + */ +export async function listCommissionRole(params?: CommissionRoleParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/commission-role', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加分红角色 + */ +export async function addCommissionRole(data: CommissionRole) { + const res = await request.post>( + MODULES_API_URL + '/shop/commission-role', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改分红角色 + */ +export async function updateCommissionRole(data: CommissionRole) { + const res = await request.put>( + MODULES_API_URL + '/shop/commission-role', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除分红角色 + */ +export async function removeCommissionRole(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/commission-role/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除分红角色 + */ +export async function removeBatchCommissionRole(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/commission-role/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询分红角色 + */ +export async function getCommissionRole(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/commission-role/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/commissionRole/model/index.ts b/src/api/shop/commissionRole/model/index.ts new file mode 100644 index 0000000..ab1e309 --- /dev/null +++ b/src/api/shop/commissionRole/model/index.ts @@ -0,0 +1,33 @@ +import type { PageParam } from '@/api'; + +/** + * 分红角色 + */ +export interface CommissionRole { + // + id?: number; + // + title?: string; + // + provinceId?: number; + // + cityId?: number; + // + regionId?: number; + // 状态, 0正常, 1异常 + status?: number; + // 备注 + comments?: string; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; +} + +/** + * 分红角色搜索条件 + */ +export interface CommissionRoleParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/expressTemplate/index.ts b/src/api/shop/expressTemplate/index.ts new file mode 100644 index 0000000..138abb5 --- /dev/null +++ b/src/api/shop/expressTemplate/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ExpressTemplate, ExpressTemplateParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询运费模板 + */ +export async function pageExpressTemplate(params: ExpressTemplateParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/express-template/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询运费模板列表 + */ +export async function listExpressTemplate(params?: ExpressTemplateParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/express-template', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加运费模板 + */ +export async function addExpressTemplate(data: ExpressTemplate) { + const res = await request.post>( + MODULES_API_URL + '/shop/express-template', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改运费模板 + */ +export async function updateExpressTemplate(data: ExpressTemplate) { + const res = await request.put>( + MODULES_API_URL + '/shop/express-template', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除运费模板 + */ +export async function removeExpressTemplate(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/express-template/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除运费模板 + */ +export async function removeBatchExpressTemplate(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/express-template/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询运费模板 + */ +export async function getExpressTemplate(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/express-template/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/expressTemplate/model/index.ts b/src/api/shop/expressTemplate/model/index.ts new file mode 100644 index 0000000..1d6ce1b --- /dev/null +++ b/src/api/shop/expressTemplate/model/index.ts @@ -0,0 +1,36 @@ +import type { PageParam } from '@/api'; +import {ExpressTemplateDetail} from "@/api/shop/expressTemplateDetail/model"; + +/** + * 运费模板 + */ +export interface ExpressTemplate { + // + id?: number; + type?: number; + // + title?: string; + // 状态, 0已发布, 1待审核 2已驳回 3违规内容 + status?: number; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; + firstAmount?: number; + extraAmount?: number; + firstNum?: number; + extraNum?: number; + detailList?: ExpressTemplateDetail[] +} + +/** + * 运费模板搜索条件 + */ +export interface ExpressTemplateParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/expressTemplateDetail/index.ts b/src/api/shop/expressTemplateDetail/index.ts new file mode 100644 index 0000000..a4f25a0 --- /dev/null +++ b/src/api/shop/expressTemplateDetail/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ExpressTemplateDetail, ExpressTemplateDetailParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询运费模板 + */ +export async function pageExpressTemplateDetail(params: ExpressTemplateDetailParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/express-template-detail/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询运费模板列表 + */ +export async function listExpressTemplateDetail(params?: ExpressTemplateDetailParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/express-template-detail', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加运费模板 + */ +export async function addExpressTemplateDetail(data: ExpressTemplateDetail) { + const res = await request.post>( + MODULES_API_URL + '/shop/express-template-detail', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改运费模板 + */ +export async function updateExpressTemplateDetail(data: ExpressTemplateDetail) { + const res = await request.put>( + MODULES_API_URL + '/shop/express-template-detail', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除运费模板 + */ +export async function removeExpressTemplateDetail(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/express-template-detail/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除运费模板 + */ +export async function removeBatchExpressTemplateDetail(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/express-template-detail/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询运费模板 + */ +export async function getExpressTemplateDetail(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/express-template-detail/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/expressTemplateDetail/model/index.ts b/src/api/shop/expressTemplateDetail/model/index.ts new file mode 100644 index 0000000..8ee0802 --- /dev/null +++ b/src/api/shop/expressTemplateDetail/model/index.ts @@ -0,0 +1,39 @@ +import type { PageParam } from '@/api'; + +/** + * 运费模板 + */ +export interface ExpressTemplateDetail { + // + id?: number; + // + templateId?: number; + // 0按件 + type?: string; + // + provinceId?: number; + // + cityId?: number; + // 收件价格 + firstAmount?: number; + // 续件价格 + extraAmount?: number; + // 状态, 0已发布, 1待审核 2已驳回 3违规内容 + status?: number; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 运费模板搜索条件 + */ +export interface ExpressTemplateDetailParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/goods/model/index.ts b/src/api/shop/goods/model/index.ts index 993bcb9..088e4fe 100644 --- a/src/api/shop/goods/model/index.ts +++ b/src/api/shop/goods/model/index.ts @@ -1,6 +1,7 @@ import type { PageParam } from '@/api'; import { GoodsSpec } from '@/api/shop/goodsSpec/model'; import { GoodsSku } from '@/api/shop/goodsSku/model'; +import {GoodsRoleCommission} from "@/api/shop/goodsRoleCommission/model"; export interface GoodsCount { totalNum: number; @@ -38,12 +39,14 @@ export interface Goods { // categoryChildren?: string; // 商品规格 0单规格 1多规格 specs?: number; + commissionRole?: number; // 货架 position?: string; // 进货价 buyingPrice?: string; // 商品价格 price?: string; + originPrice?: string; // 销售价格 salePrice?: string; chainStorePrice?: string; @@ -110,10 +113,15 @@ export interface Goods { specName?: string; // 商品规格 goodsSpecs?: GoodsSpec[]; + goodsRoleCommission?: GoodsRoleCommission[]; // 商品sku列表 goodsSkus?: GoodsSku[]; // 单位名称 unitName?: string; + expressTemplateId?: number; + canUseDate?: string; + ensureTag?: string; + expiredDay?: number; } export interface BathSet { diff --git a/src/api/shop/goodsRoleCommission/index.ts b/src/api/shop/goodsRoleCommission/index.ts new file mode 100644 index 0000000..9752681 --- /dev/null +++ b/src/api/shop/goodsRoleCommission/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { GoodsRoleCommission, GoodsRoleCommissionParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询商品绑定角色的分润金额 + */ +export async function pageGoodsRoleCommission(params: GoodsRoleCommissionParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/goods-role-commission/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询商品绑定角色的分润金额列表 + */ +export async function listGoodsRoleCommission(params?: GoodsRoleCommissionParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/goods-role-commission', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加商品绑定角色的分润金额 + */ +export async function addGoodsRoleCommission(data: GoodsRoleCommission) { + const res = await request.post>( + MODULES_API_URL + '/shop/goods-role-commission', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改商品绑定角色的分润金额 + */ +export async function updateGoodsRoleCommission(data: GoodsRoleCommission) { + const res = await request.put>( + MODULES_API_URL + '/shop/goods-role-commission', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除商品绑定角色的分润金额 + */ +export async function removeGoodsRoleCommission(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/goods-role-commission/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除商品绑定角色的分润金额 + */ +export async function removeBatchGoodsRoleCommission(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/goods-role-commission/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询商品绑定角色的分润金额 + */ +export async function getGoodsRoleCommission(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/goods-role-commission/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/goodsRoleCommission/model/index.ts b/src/api/shop/goodsRoleCommission/model/index.ts new file mode 100644 index 0000000..d5391c6 --- /dev/null +++ b/src/api/shop/goodsRoleCommission/model/index.ts @@ -0,0 +1,35 @@ +import type { PageParam } from '@/api'; + +/** + * 商品绑定角色的分润金额 + */ +export interface GoodsRoleCommission { + // + id?: number; + // + roleId?: number; + // + goodsId?: number; + // + sku?: string; + // + amount?: number; + // 状态, 0正常, 1异常 + status?: number; + // 备注 + comments?: string; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + roleName?: string; +} + +/** + * 商品绑定角色的分润金额搜索条件 + */ +export interface GoodsRoleCommissionParam extends PageParam { + id?: number; + goodsId?: number; + keywords?: string; +} diff --git a/src/api/shop/merchant/index.ts b/src/api/shop/merchant/index.ts index 1f410d9..12d2f10 100644 --- a/src/api/shop/merchant/index.ts +++ b/src/api/shop/merchant/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; -import type { ApiResult, PageResult } from '@/api'; -import type { Merchant, MerchantParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import type {ApiResult, PageResult} from '@/api'; +import type {Merchant, MerchantParam} from './model'; +import {MODULES_API_URL} from '@/config/setting'; /** * 分页查询商户 diff --git a/src/api/shop/merchantApply/index.ts b/src/api/shop/merchantApply/index.ts index 6a58bd5..3eceb3a 100644 --- a/src/api/shop/merchantApply/index.ts +++ b/src/api/shop/merchantApply/index.ts @@ -104,3 +104,13 @@ export async function getMerchantApply(id: number) { } return Promise.reject(new Error(res.data.message)); } + +export async function getMerchantApplyUnCheckNum() { + const res = await request.get>( + MODULES_API_URL + '/shop/merchant-apply/uncheck-num' + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/merchantChargePackage/index.ts b/src/api/shop/merchantChargePackage/index.ts new file mode 100644 index 0000000..c4bc1c7 --- /dev/null +++ b/src/api/shop/merchantChargePackage/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { MerchantChargePackage, MerchantChargePackageParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询商家充值套餐 + */ +export async function pageMerchantChargePackage(params: MerchantChargePackageParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/merchant-charge-package/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询商家充值套餐列表 + */ +export async function listMerchantChargePackage(params?: MerchantChargePackageParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/merchant-charge-package', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加商家充值套餐 + */ +export async function addMerchantChargePackage(data: MerchantChargePackage) { + const res = await request.post>( + MODULES_API_URL + '/shop/merchant-charge-package', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改商家充值套餐 + */ +export async function updateMerchantChargePackage(data: MerchantChargePackage) { + const res = await request.put>( + MODULES_API_URL + '/shop/merchant-charge-package', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除商家充值套餐 + */ +export async function removeMerchantChargePackage(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/merchant-charge-package/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除商家充值套餐 + */ +export async function removeBatchMerchantChargePackage(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/merchant-charge-package/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询商家充值套餐 + */ +export async function getMerchantChargePackage(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/merchant-charge-package/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/merchantChargePackage/model/index.ts b/src/api/shop/merchantChargePackage/model/index.ts new file mode 100644 index 0000000..25a3d16 --- /dev/null +++ b/src/api/shop/merchantChargePackage/model/index.ts @@ -0,0 +1,39 @@ +import type { PageParam } from '@/api'; + +/** + * 商家充值套餐 + */ +export interface MerchantChargePackage { + // + id?: number; + // 金额 + amount?: string; + // 赠送金额 + sendAmount?: string; + // + merchantId?: number; + // + userId?: number; + // 0待审核1通过2拒绝 + status?: string; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 商家充值套餐搜索条件 + */ +export interface MerchantChargePackageParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/merchantGoodsPackage/index.ts b/src/api/shop/merchantGoodsPackage/index.ts new file mode 100644 index 0000000..a51425a --- /dev/null +++ b/src/api/shop/merchantGoodsPackage/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { MerchantGoodsPackage, MerchantGoodsPackageParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询商家充值套餐 + */ +export async function pageMerchantGoodsPackage(params: MerchantGoodsPackageParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/merchant-goods-package/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询商家充值套餐列表 + */ +export async function listMerchantGoodsPackage(params?: MerchantGoodsPackageParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/merchant-goods-package', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加商家充值套餐 + */ +export async function addMerchantGoodsPackage(data: MerchantGoodsPackage) { + const res = await request.post>( + MODULES_API_URL + '/shop/merchant-goods-package', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改商家充值套餐 + */ +export async function updateMerchantGoodsPackage(data: MerchantGoodsPackage) { + const res = await request.put>( + MODULES_API_URL + '/shop/merchant-goods-package', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除商家充值套餐 + */ +export async function removeMerchantGoodsPackage(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/merchant-goods-package/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除商家充值套餐 + */ +export async function removeBatchMerchantGoodsPackage(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/merchant-goods-package/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询商家充值套餐 + */ +export async function getMerchantGoodsPackage(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/merchant-goods-package/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/merchantGoodsPackage/model/index.ts b/src/api/shop/merchantGoodsPackage/model/index.ts new file mode 100644 index 0000000..b7309ba --- /dev/null +++ b/src/api/shop/merchantGoodsPackage/model/index.ts @@ -0,0 +1,39 @@ +import type { PageParam } from '@/api'; + +/** + * 商家充值套餐 + */ +export interface MerchantGoodsPackage { + // + id?: number; + // 金额 + amount?: string; + // 可使用次数 + getNum?: string; + // + merchantId?: number; + // + userId?: number; + // 0待审核1通过2拒绝 + status?: string; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 商家充值套餐搜索条件 + */ +export interface MerchantGoodsPackageParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/merchantPackageGoods/index.ts b/src/api/shop/merchantPackageGoods/index.ts new file mode 100644 index 0000000..f749d11 --- /dev/null +++ b/src/api/shop/merchantPackageGoods/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { MerchantPackageGoods, MerchantPackageGoodsParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询商家套餐可使用的商品 + */ +export async function pageMerchantPackageGoods(params: MerchantPackageGoodsParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/merchant-package-goods/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询商家套餐可使用的商品列表 + */ +export async function listMerchantPackageGoods(params?: MerchantPackageGoodsParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/merchant-package-goods', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加商家套餐可使用的商品 + */ +export async function addMerchantPackageGoods(data: MerchantPackageGoods) { + const res = await request.post>( + MODULES_API_URL + '/shop/merchant-package-goods', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改商家套餐可使用的商品 + */ +export async function updateMerchantPackageGoods(data: MerchantPackageGoods) { + const res = await request.put>( + MODULES_API_URL + '/shop/merchant-package-goods', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除商家套餐可使用的商品 + */ +export async function removeMerchantPackageGoods(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/merchant-package-goods/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除商家套餐可使用的商品 + */ +export async function removeBatchMerchantPackageGoods(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/merchant-package-goods/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询商家套餐可使用的商品 + */ +export async function getMerchantPackageGoods(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/merchant-package-goods/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/merchantPackageGoods/model/index.ts b/src/api/shop/merchantPackageGoods/model/index.ts new file mode 100644 index 0000000..da57381 --- /dev/null +++ b/src/api/shop/merchantPackageGoods/model/index.ts @@ -0,0 +1,37 @@ +import type { PageParam } from '@/api'; + +/** + * 商家套餐可使用的商品 + */ +export interface MerchantPackageGoods { + // + id?: number; + // + packageId?: number; + // + goodsId?: number; + // + userId?: number; + // 0待审核1通过2拒绝 + status?: string; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 商家套餐可使用的商品搜索条件 + */ +export interface MerchantPackageGoodsParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/message/index.ts b/src/api/shop/message/index.ts new file mode 100644 index 0000000..8beb5d3 --- /dev/null +++ b/src/api/shop/message/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { Message, MessageParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询 + */ +export async function pageMessage(params: MessageParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/message/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询列表 + */ +export async function listMessage(params?: MessageParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/message', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加 + */ +export async function addMessage(data: Message) { + const res = await request.post>( + MODULES_API_URL + '/shop/message', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改 + */ +export async function updateMessage(data: Message) { + const res = await request.put>( + MODULES_API_URL + '/shop/message', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除 + */ +export async function removeMessage(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/message/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除 + */ +export async function removeBatchMessage(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/message/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询 + */ +export async function getMessage(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/message/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/message/model/index.ts b/src/api/shop/message/model/index.ts new file mode 100644 index 0000000..3a3dd10 --- /dev/null +++ b/src/api/shop/message/model/index.ts @@ -0,0 +1,35 @@ +import type { PageParam } from '@/api'; + +/** + * + */ +export interface Message { + // + id?: number; + // + type?: string; + // + pk?: number; + // + title?: string; + phone?: string; + nickname?: string; + // + content?: string; + // + userId?: number; + // + hasRead?: string; + // 租户id + tenantId?: number; + // 注册时间 + createTime?: string; +} + +/** + * 搜索条件 + */ +export interface MessageParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/order/index.ts b/src/api/shop/order/index.ts index 732d01b..4265096 100644 --- a/src/api/shop/order/index.ts +++ b/src/api/shop/order/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; -import type { ApiResult, PageResult } from '@/api'; -import type { Order, OrderParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import type {ApiResult, PageResult} from '@/api'; +import type {Order, OrderParam} from './model'; +import {MODULES_API_URL} from '@/config/setting'; /** * 分页查询 @@ -104,3 +104,33 @@ export async function getOrder(id: number) { } return Promise.reject(new Error(res.data.message)); } + +export async function getData() { + const res = await request.post>( + MODULES_API_URL + '/shop/order/data-for-admin' + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +export async function exportSupplierSheet() { + const res = await request.post>( + MODULES_API_URL + '/shop/order/export-for-supplier' + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +export async function exportSupplierCashSheet() { + const res = await request.post>( + MODULES_API_URL + '/shop/order/export-for-cash' + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/swiper/model/index.ts b/src/api/shop/swiper/model/index.ts index d003ad7..65ec94e 100644 --- a/src/api/shop/swiper/model/index.ts +++ b/src/api/shop/swiper/model/index.ts @@ -45,6 +45,10 @@ export const SwiperType = [ label: '会员商城', value: '会员商城' }, + { + label: 'TV', + value: 'TV' + }, { label: '会员店', value: '会员店' diff --git a/src/api/shop/userBalanceInMerchant/index.ts b/src/api/shop/userBalanceInMerchant/index.ts new file mode 100644 index 0000000..9024692 --- /dev/null +++ b/src/api/shop/userBalanceInMerchant/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { UserBalanceInMerchant, UserBalanceInMerchantParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询用户在商家中的余额 + */ +export async function pageUserBalanceInMerchant(params: UserBalanceInMerchantParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/user-balance-in-merchant/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询用户在商家中的余额列表 + */ +export async function listUserBalanceInMerchant(params?: UserBalanceInMerchantParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/user-balance-in-merchant', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加用户在商家中的余额 + */ +export async function addUserBalanceInMerchant(data: UserBalanceInMerchant) { + const res = await request.post>( + MODULES_API_URL + '/shop/user-balance-in-merchant', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改用户在商家中的余额 + */ +export async function updateUserBalanceInMerchant(data: UserBalanceInMerchant) { + const res = await request.put>( + MODULES_API_URL + '/shop/user-balance-in-merchant', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除用户在商家中的余额 + */ +export async function removeUserBalanceInMerchant(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/user-balance-in-merchant/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除用户在商家中的余额 + */ +export async function removeBatchUserBalanceInMerchant(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/user-balance-in-merchant/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询用户在商家中的余额 + */ +export async function getUserBalanceInMerchant(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/user-balance-in-merchant/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/userBalanceInMerchant/model/index.ts b/src/api/shop/userBalanceInMerchant/model/index.ts new file mode 100644 index 0000000..168d651 --- /dev/null +++ b/src/api/shop/userBalanceInMerchant/model/index.ts @@ -0,0 +1,35 @@ +import type { PageParam } from '@/api'; + +/** + * 用户在商家中的余额 + */ +export interface UserBalanceInMerchant { + // + id?: number; + // + userId?: number; + // + balance?: string; + // 0待审核1通过2拒绝 + status?: string; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 用户在商家中的余额搜索条件 + */ +export interface UserBalanceInMerchantParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/userCommissionRole/index.ts b/src/api/shop/userCommissionRole/index.ts new file mode 100644 index 0000000..9cce0d0 --- /dev/null +++ b/src/api/shop/userCommissionRole/index.ts @@ -0,0 +1,117 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { UserCommissionRole, UserCommissionRoleParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询用户绑定分红角色 + */ +export async function pageUserCommissionRole(params: UserCommissionRoleParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/user-commission-role/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询用户绑定分红角色列表 + */ +export async function listUserCommissionRole(params?: UserCommissionRoleParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/user-commission-role', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加用户绑定分红角色 + */ +export async function addUserCommissionRole(data: UserCommissionRole) { + const res = await request.post>( + MODULES_API_URL + '/shop/user-commission-role', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +export async function batchAddUserCommissionRole(data: UserCommissionRole[]) { + const res = await request.post>( + MODULES_API_URL + '/shop/user-commission-role/batch', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改用户绑定分红角色 + */ +export async function updateUserCommissionRole(data: UserCommissionRole) { + const res = await request.put>( + MODULES_API_URL + '/shop/user-commission-role', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除用户绑定分红角色 + */ +export async function removeUserCommissionRole(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/user-commission-role/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除用户绑定分红角色 + */ +export async function removeBatchUserCommissionRole(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/user-commission-role/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询用户绑定分红角色 + */ +export async function getUserCommissionRole(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/user-commission-role/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/userCommissionRole/model/index.ts b/src/api/shop/userCommissionRole/model/index.ts new file mode 100644 index 0000000..01351b4 --- /dev/null +++ b/src/api/shop/userCommissionRole/model/index.ts @@ -0,0 +1,29 @@ +import type { PageParam } from '@/api'; + +/** + * 用户绑定分红角色 + */ +export interface UserCommissionRole { + // + id?: number; + // + roleId?: number; + // + userId?: number; + // 状态, 0正常, 1异常 + status?: number; + // 备注 + comments?: string; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; +} + +/** + * 用户绑定分红角色搜索条件 + */ +export interface UserCommissionRoleParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/userGoodsInMerchant/index.ts b/src/api/shop/userGoodsInMerchant/index.ts new file mode 100644 index 0000000..eedf31d --- /dev/null +++ b/src/api/shop/userGoodsInMerchant/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { UserGoodsInMerchant, UserGoodsInMerchantParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询用户在商家中的代金券 + */ +export async function pageUserGoodsInMerchant(params: UserGoodsInMerchantParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/user-goods-in-merchant/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询用户在商家中的代金券列表 + */ +export async function listUserGoodsInMerchant(params?: UserGoodsInMerchantParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/user-goods-in-merchant', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加用户在商家中的代金券 + */ +export async function addUserGoodsInMerchant(data: UserGoodsInMerchant) { + const res = await request.post>( + MODULES_API_URL + '/shop/user-goods-in-merchant', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改用户在商家中的代金券 + */ +export async function updateUserGoodsInMerchant(data: UserGoodsInMerchant) { + const res = await request.put>( + MODULES_API_URL + '/shop/user-goods-in-merchant', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除用户在商家中的代金券 + */ +export async function removeUserGoodsInMerchant(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/user-goods-in-merchant/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除用户在商家中的代金券 + */ +export async function removeBatchUserGoodsInMerchant(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/user-goods-in-merchant/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询用户在商家中的代金券 + */ +export async function getUserGoodsInMerchant(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/user-goods-in-merchant/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/userGoodsInMerchant/model/index.ts b/src/api/shop/userGoodsInMerchant/model/index.ts new file mode 100644 index 0000000..4bec046 --- /dev/null +++ b/src/api/shop/userGoodsInMerchant/model/index.ts @@ -0,0 +1,35 @@ +import type { PageParam } from '@/api'; + +/** + * 用户在商家中的代金券 + */ +export interface UserGoodsInMerchant { + // + id?: number; + // + userId?: number; + // + balance?: string; + // 0待审核1通过2拒绝 + status?: string; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 用户在商家中的代金券搜索条件 + */ +export interface UserGoodsInMerchantParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/viewHistory/index.ts b/src/api/shop/viewHistory/index.ts new file mode 100644 index 0000000..6219daf --- /dev/null +++ b/src/api/shop/viewHistory/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ViewHistory, ViewHistoryParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询浏览历史 + */ +export async function pageViewHistory(params: ViewHistoryParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/view-history/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询浏览历史列表 + */ +export async function listViewHistory(params?: ViewHistoryParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/view-history', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加浏览历史 + */ +export async function addViewHistory(data: ViewHistory) { + const res = await request.post>( + MODULES_API_URL + '/shop/view-history', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改浏览历史 + */ +export async function updateViewHistory(data: ViewHistory) { + const res = await request.put>( + MODULES_API_URL + '/shop/view-history', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除浏览历史 + */ +export async function removeViewHistory(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/view-history/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除浏览历史 + */ +export async function removeBatchViewHistory(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/view-history/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询浏览历史 + */ +export async function getViewHistory(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/view-history/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/viewHistory/model/index.ts b/src/api/shop/viewHistory/model/index.ts new file mode 100644 index 0000000..3b7b646 --- /dev/null +++ b/src/api/shop/viewHistory/model/index.ts @@ -0,0 +1,33 @@ +import type { PageParam } from '@/api'; + +/** + * 浏览历史 + */ +export interface ViewHistory { + // + id?: number; + // + type?: string; + // + pk?: string; + // + userId?: number; + // 排序号 + sortNumber?: number; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 浏览历史搜索条件 + */ +export interface ViewHistoryParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/system/area/index.ts b/src/api/system/area/index.ts new file mode 100644 index 0000000..f640964 --- /dev/null +++ b/src/api/system/area/index.ts @@ -0,0 +1,21 @@ +import request from '@/utils/request'; +import type {ApiResult} from '@/api'; +import {Area} from "@/api/system/area/model"; + + +export async function listArea(param: any) { + const res = await request.post>('/common/area/list-by-level', param); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + + +export async function listCity() { + const res = await request.post>('/common/area/city-list'); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/system/area/model/index.ts b/src/api/system/area/model/index.ts new file mode 100644 index 0000000..ada0fa4 --- /dev/null +++ b/src/api/system/area/model/index.ts @@ -0,0 +1,8 @@ + +export interface Area { + id?: any, + name?: any, + fid?: any, + levelId?: any, + children?: any, +} diff --git a/src/api/user/referee/index.ts b/src/api/user/referee/index.ts index c926a3b..4e1e8e7 100644 --- a/src/api/user/referee/index.ts +++ b/src/api/user/referee/index.ts @@ -1,12 +1,13 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { UserReferee, UserRefereeParam } from '@/api/user/referee/model'; +import {SERVER_API_URL} from "@/config/setting"; /** * 分页查询推荐关系 */ export async function pageUserReferee(params: UserRefereeParam) { const res = await request.get>>( - '/shop/user-referee/page', + `${SERVER_API_URL}/system/user-referee/page`, { params } @@ -16,87 +17,3 @@ export async function pageUserReferee(params: UserRefereeParam) { } return Promise.reject(new Error(res.data.message)); } - -/** - * 查询推荐关系列表 - */ -export async function listUserReferee(params?: UserRefereeParam) { - const res = await request.get>( - '/shop/user-referee', - { - params - } - ); - if (res.data.code === 0 && res.data.data) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 添加推荐关系 - */ -export async function addUserReferee(data: UserReferee) { - const res = await request.post>( - '/shop/user-referee', - data - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 修改推荐关系 - */ -export async function updateUserReferee(data: UserReferee) { - const res = await request.put>('/shop/user-referee', data); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 绑定推荐关系 - */ -export async function bindUserReferee(data: UserReferee) { - const res = await request.put>( - '/shop/user-referee/bind', - data - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 删除推荐关系 - */ -export async function removeUserReferee(id?: number) { - const res = await request.delete>( - '/shop/user-referee/' + id - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} - -/** - * 批量删除推荐关系 - */ -export async function removeBatchUserReferee(data: (number | undefined)[]) { - const res = await request.delete>( - '/shop/user-referee/batch', - { - data - } - ); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); -} diff --git a/src/components/PayMethod/index.vue b/src/components/PayMethod/index.vue index 73c19f1..d1102f1 100644 --- a/src/components/PayMethod/index.vue +++ b/src/components/PayMethod/index.vue @@ -66,6 +66,18 @@ label: '代付', key: 'friendPayment', icon: 'https://oss.wsdns.cn/20241002/3fe17586c7394a1290fd0dae03eb1f24.png' + }, + { + value: 19, + label: '门店余额', + key: 'merchantBalance', + icon: 'https://oss.wsdns.cn/20241002/3fe17586c7394a1290fd0dae03eb1f24.png' + }, + { + value: 20, + label: '门店套餐', + key: 'merchantPackage', + icon: 'https://oss.wsdns.cn/20241002/3fe17586c7394a1290fd0dae03eb1f24.png' } ]); diff --git a/src/layout/index.vue b/src/layout/index.vue index 009df17..7ab1cf5 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -46,7 +46,7 @@ @tab-context-menu="onTabContextMenu" > - + diff --git a/src/views/cms/article/components/commentList.vue b/src/views/cms/article/components/commentList.vue new file mode 100644 index 0000000..2d2d13c --- /dev/null +++ b/src/views/cms/article/components/commentList.vue @@ -0,0 +1,125 @@ + + + + diff --git a/src/views/cms/article/components/search.vue b/src/views/cms/article/components/search.vue index dd6d24b..c5ef0bf 100644 --- a/src/views/cms/article/components/search.vue +++ b/src/views/cms/article/components/search.vue @@ -41,7 +41,7 @@ allow-clear placeholder="请输入关键词" style="width: 280px" - v-model:value="where.userId" + v-model:value="where.keywords" @pressEnter="reload" @search="reload" /> diff --git a/src/views/cms/article/index.vue b/src/views/cms/article/index.vue index 79dfa5e..f1c353f 100644 --- a/src/views/cms/article/index.vue +++ b/src/views/cms/article/index.vue @@ -30,7 +30,7 @@ {{ record.title }}{{ record.title }} diff --git a/src/views/cms/articleCheck/components/articleCheckEdit.vue b/src/views/cms/articleCheck/components/articleCheckEdit.vue new file mode 100644 index 0000000..c4a5bb3 --- /dev/null +++ b/src/views/cms/articleCheck/components/articleCheckEdit.vue @@ -0,0 +1,220 @@ + + + + diff --git a/src/views/cms/articleCheck/components/search.vue b/src/views/cms/articleCheck/components/search.vue new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/views/cms/articleCheck/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/cms/articleCheck/index.vue b/src/views/cms/articleCheck/index.vue new file mode 100644 index 0000000..064368c --- /dev/null +++ b/src/views/cms/articleCheck/index.vue @@ -0,0 +1,257 @@ + + + + + + + diff --git a/src/views/cms/follow/components/followEdit.vue b/src/views/cms/follow/components/followEdit.vue new file mode 100644 index 0000000..3735808 --- /dev/null +++ b/src/views/cms/follow/components/followEdit.vue @@ -0,0 +1,220 @@ + + + + diff --git a/src/views/cms/follow/components/search.vue b/src/views/cms/follow/components/search.vue new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/views/cms/follow/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/cms/follow/index.vue b/src/views/cms/follow/index.vue new file mode 100644 index 0000000..a8051fa --- /dev/null +++ b/src/views/cms/follow/index.vue @@ -0,0 +1,257 @@ + + + + + + + diff --git a/src/views/shop/commissionRole/components/commissionRoleEdit.vue b/src/views/shop/commissionRole/components/commissionRoleEdit.vue new file mode 100644 index 0000000..405a77f --- /dev/null +++ b/src/views/shop/commissionRole/components/commissionRoleEdit.vue @@ -0,0 +1,171 @@ + + + + diff --git a/src/views/shop/commissionRole/components/search.vue b/src/views/shop/commissionRole/components/search.vue new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/views/shop/commissionRole/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/shop/commissionRole/index.vue b/src/views/shop/commissionRole/index.vue new file mode 100644 index 0000000..0739b95 --- /dev/null +++ b/src/views/shop/commissionRole/index.vue @@ -0,0 +1,239 @@ + + + + + + + diff --git a/src/views/shop/dealerWithdraw/components/dealerWithdrawEdit.vue b/src/views/shop/dealerWithdraw/components/dealerWithdrawEdit.vue index 2c2bb0a..28ce391 100644 --- a/src/views/shop/dealerWithdraw/components/dealerWithdrawEdit.vue +++ b/src/views/shop/dealerWithdraw/components/dealerWithdrawEdit.vue @@ -19,13 +19,6 @@ styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' } " > - - - - - + + + 微信 + 支付宝 + 银行卡 + - - + + + + + 待审核 + 审核通过 + 驳回 + 已打款 + - - - - - - - - - - - - - - - - - - - + - - - - - - diff --git a/src/views/shop/dealerWithdraw/components/search.vue b/src/views/shop/dealerWithdraw/components/search.vue index 82fea9d..3f0ba29 100644 --- a/src/views/shop/dealerWithdraw/components/search.vue +++ b/src/views/shop/dealerWithdraw/components/search.vue @@ -1,12 +1,7 @@ diff --git a/src/views/shop/dealerWithdraw/index.vue b/src/views/shop/dealerWithdraw/index.vue index 85aa668..22f6428 100644 --- a/src/views/shop/dealerWithdraw/index.vue +++ b/src/views/shop/dealerWithdraw/index.vue @@ -7,7 +7,6 @@ row-key="id" :columns="columns" :datasource="datasource" - :customRow="customRow" tool-class="ele-toolbar-form" class="sys-org-table" > @@ -22,7 +21,7 @@