diff --git a/admin/src/api/addon.ts b/admin/src/api/addon.ts index 55048f770..8a8c77f48 100644 --- a/admin/src/api/addon.ts +++ b/admin/src/api/addon.ts @@ -2,15 +2,15 @@ import request from '@/utils/request' /** * 本地下载的插件列表 - * @returns + * @returns */ export function getAddonLocal(params: Record) { - return request.get('addon/local', params, { showSuccessMessage: true }) + return request.get('addon/local', params, {showSuccessMessage: true}) } /** * 插件详情 - * @returns + * @returns */ export function getAddonDetial(id: number) { return request.get(`addon/${id}`) @@ -27,27 +27,27 @@ export function installAddon(params: Record) { /** * 卸载插件 - * @param params + * @param params * @returns */ export function uninstallAddon(params: Record) { - return request.post(`addon/uninstall/${params.addon}`, params, { showSuccessMessage: true }) + return request.post(`addon/uninstall/${params.addon}`, params, {showSuccessMessage: true}) } /** * 插件安装前检测 - * @param addon - * @returns + * @param addon + * @returns */ export function preInstallCheck(addon: string) { - return request.get(`addon/install/check/${addon}`, { timeout: 30 * 1000 }) + return request.get(`addon/install/check/${addon}`, {timeout: 30 * 1000}) } /** * 获取插件安装任务执行状态 - * @param addon - * @param key - * @returns + * @param addon + * @param key + * @returns */ export function getAddonInstallTaskState(addon: string, key: string) { return request.get(`addon/install/${addon}/status/${key}`) @@ -55,8 +55,7 @@ export function getAddonInstallTaskState(addon: string, key: string) { /** * 执行安装任务 - * @param params - * @returns + * @param addon */ export function executeInstall(addon: string) { return request.post(`addon/install/execute/${addon}`, {}) diff --git a/admin/src/api/aliapp.ts b/admin/src/api/aliapp.ts index 07eda4936..e3df32a9b 100644 --- a/admin/src/api/aliapp.ts +++ b/admin/src/api/aliapp.ts @@ -2,7 +2,7 @@ import request from '@/utils/request' /** * 获取支付宝小程序配置 - * @returns + * @returns */ export function getAliappConfig() { return request.get('aliapp/config') @@ -10,16 +10,16 @@ export function getAliappConfig() { /** * 编辑支付宝小程序配置 - * @param params - * @returns + * @param params + * @returns */ export function setAliappConfig(params: Record) { - return request.put('aliapp/config', params, { showSuccessMessage: true }) + return request.put('aliapp/config', params, {showSuccessMessage: true}) } /** * 获取支付宝小程序静态资源 - * @returns + * @returns */ export function getAliappStatic() { return request.get('aliapp/static') diff --git a/admin/src/api/article.ts b/admin/src/api/article.ts index 614b547d6..0825f0054 100644 --- a/admin/src/api/article.ts +++ b/admin/src/api/article.ts @@ -8,7 +8,7 @@ import request from '@/utils/request' * @returns */ export function getArticleList(params: Record) { - return request.get(`article/article`, { params }) + return request.get(`article/article`, {params}) } /** @@ -26,17 +26,15 @@ export function getArticleInfo(id: number) { * @returns */ export function addArticle(params: Record) { - return request.post('article/article', params, { showSuccessMessage: true }) + return request.post('article/article', params, {showSuccessMessage: true}) } /** * 编辑文章表 - * @param id * @param params - * @returns */ export function editArticle(params: Record) { - return request.put(`article/article/${params.id}`, params, { showSuccessMessage: true }) + return request.put(`article/article/${params.id}`, params, {showSuccessMessage: true}) } /** @@ -45,24 +43,25 @@ export function editArticle(params: Record) { * @returns */ export function deleteArticle(id: number) { - return request.delete(`article/article/${id}`, { showSuccessMessage: true }) + return request.delete(`article/article/${id}`, {showSuccessMessage: true}) } + /***************************************************** 文章分类管理 ****************************************************/ /** * 获取文章分类列表 - * @param params - * @returns + * @param params + * @returns */ export function getArticleCategoryList(params: Record) { - return request.get(`article/category`, { params }) + return request.get(`article/category`, {params}) } /** * 获取文章全部分类 - * @param params - * @returns + * @param params + * @returns */ export function getArticleCategoryAll(params: Record) { return request.get(`article/category/all`, params) @@ -70,8 +69,7 @@ export function getArticleCategoryAll(params: Record) { /** * 获取文章分类详情 - * @param id 文章分类id - * @returns + * @param category_id */ export function getArticleCategoryInfo(category_id: number) { return request.get(`article/category/${category_id}`); @@ -79,27 +77,26 @@ export function getArticleCategoryInfo(category_id: number) { /** * 添加文章分类 - * @param params - * @returns + * @param params + * @returns */ export function addArticleCategory(params: Record) { - return request.post('article/category', params, { showSuccessMessage: true }) + return request.post('article/category', params, {showSuccessMessage: true}) } /** * 编辑文章分类 - * @param params - * @returns + * @param params + * @returns */ export function editArticleCategory(params: Record) { - return request.put(`article/category/${params.category_id}`, params, { showSuccessMessage: true }) + return request.put(`article/category/${params.category_id}`, params, {showSuccessMessage: true}) } /** * 文章分类删除 - * @param id 文章分类id - * @returns + * @param category_id */ export function deleteArticleCategory(category_id: number) { - return request.delete(`article/category/${category_id}`, { showSuccessMessage: true }); + return request.delete(`article/category/${category_id}`, {showSuccessMessage: true}); } \ No newline at end of file diff --git a/admin/src/api/auth.ts b/admin/src/api/auth.ts index c308bdcb3..5caaa2c76 100644 --- a/admin/src/api/auth.ts +++ b/admin/src/api/auth.ts @@ -2,16 +2,16 @@ import request from '@/utils/request' /** * 登录 - * @param params - * @returns + * @param params + * @param app_type */ export function login(params: Record, app_type: string) { - return request.get(`login/${app_type}`, { params }) + return request.get(`login/${app_type}`, {params}) } /** * 获取登录用户权限 - * @returns + * @returns */ export function getAuthMenus() { return request.get('auth/authmenu') @@ -19,7 +19,7 @@ export function getAuthMenus() { /** * 获取登录用户权限 - * @returns + * @returns */ export function getSiteInfo() { return request.get('auth/site') @@ -27,7 +27,7 @@ export function getSiteInfo() { /** * 获取登录配置信息 - * @returns + * @returns */ export function getLoginConfig() { return request.get('login/config') diff --git a/admin/src/api/h5.ts b/admin/src/api/h5.ts index bcc88695e..b9a766f06 100644 --- a/admin/src/api/h5.ts +++ b/admin/src/api/h5.ts @@ -2,7 +2,7 @@ import request from '@/utils/request' /** * 获取h5配置 - * @returns + * @returns */ export function getH5Config() { return request.get('channel/h5/config') @@ -10,9 +10,9 @@ export function getH5Config() { /** * 编辑h5配置 - * @param params - * @returns + * @param params + * @returns */ export function setH5Config(params: Record) { - return request.put('channel/h5/config', params, { showSuccessMessage: true }) + return request.put('channel/h5/config', params, {showSuccessMessage: true}) } diff --git a/admin/src/api/member.ts b/admin/src/api/member.ts index 9b2f16316..9a825b50b 100644 --- a/admin/src/api/member.ts +++ b/admin/src/api/member.ts @@ -5,17 +5,17 @@ import request from '@/utils/request' /** * 获取会员列表 - * @param params - * @returns + * @param params + * @returns */ export function getMemberList(params: Record) { - return request.get(`member/member`, { params }) + return request.get(`member/member`, {params}) } /** * 获取会员详情 * @param id 会员id - * @returns + * @returns */ export function getMemberInfo(id: number) { return request.get(`member/member/${id}`); @@ -23,7 +23,7 @@ export function getMemberInfo(id: number) { /** * 获取会员编码 - * @returns + * @returns */ export function getMemberNo() { return request.get(`member/memberno`); @@ -31,17 +31,17 @@ export function getMemberNo() { /** * 添加会员 - * @param params - * @returns + * @param params + * @returns */ export function addMember(params: Record) { - return request.post(`member/member`, params, { showSuccessMessage: true }) + return request.post(`member/member`, params, {showSuccessMessage: true}) } /** * 会员注册方式 - * @param params - * @returns + * @param params + * @returns */ export function getRegisterType(params: Record) { return request.get(`member/registertype`, params) @@ -49,8 +49,8 @@ export function getRegisterType(params: Record) { /** * 会员注册渠道 - * @param params - * @returns + * @param params + * @returns */ export function getRegisterChannelType(params: Record) { return request.get(`member/register/channel`, params) @@ -58,15 +58,13 @@ export function getRegisterChannelType(params: Record) { /** * 会员删除 - * @param params - * @returns + * @param member_id */ export function deleteMember(member_id: number) { - return request.delete(`member/member/${member_id}`, { showSuccessMessage: true }) + return request.delete(`member/member/${member_id}`, {showSuccessMessage: true}) } - /***************************************************** 会员标签 ****************************************************/ /** @@ -75,7 +73,7 @@ export function deleteMember(member_id: number) { * @returns */ export function getMemberLabelList(params: Record) { - return request.get(`member/label`, { params }) + return request.get(`member/label`, {params}) } /** @@ -93,17 +91,15 @@ export function getMemberLabelInfo(label_id: number) { * @returns */ export function addMemberLabel(params: Record) { - return request.post('member/label', params, { showSuccessMessage: true }) + return request.post('member/label', params, {showSuccessMessage: true}) } /** * 编辑会员标签 - * @param label_id * @param params - * @returns */ export function updateMemberLabel(params: Record) { - return request.put(`member/label/${params.label_id}`, params, { showSuccessMessage: true }) + return request.put(`member/label/${params.label_id}`, params, {showSuccessMessage: true}) } /** @@ -112,13 +108,11 @@ export function updateMemberLabel(params: Record) { * @returns */ export function deleteMemberLabel(label_id: number) { - return request.delete(`member/label/${label_id}`, { showSuccessMessage: true }) + return request.delete(`member/label/${label_id}`, {showSuccessMessage: true}) } /** * 获取全部会员标签 - * @param label_id 会员标签label_id - * @returns */ export function getMemberLabelAll() { return request.get(`member/label/all`); @@ -126,25 +120,20 @@ export function getMemberLabelAll() { /** * 编辑会员详情 - * @param id - * @param params - * @returns + * @param params */ export function editMemberDetail(params: Record) { - return request.put(`member/member/modify/${params.member_id}/${params.field}`, params, { showSuccessMessage: true }) + return request.put(`member/member/modify/${params.member_id}/${params.field}`, params, {showSuccessMessage: true}) } /***************************************************** 会员零钱 ****************************************************/ - - /***************************************************** 会员账户 ****************************************************/ /** * 账户变动方式 - * @param params - * @returns + * @param change_type */ export function getChangeTypeList(change_type: string) { return request.get(`member/account/change_type/${change_type}`) @@ -152,77 +141,78 @@ export function getChangeTypeList(change_type: string) { /** * 会员积分流水 - * @param params - * @returns + * @param params + * @returns */ export function getPointList(params: Record) { - return request.get(`member/account/point`, { params }) + return request.get(`member/account/point`, {params}) } + /** * 会员余额流水 - * @param params - * @returns + * @param params + * @returns */ export function getBalanceList(params: Record) { - return request.get(`member/account/balance`, { params }) + return request.get(`member/account/balance`, {params}) } + /** * 获取会员可提现余额列表 - * @param params - * @returns + * @param params + * @returns */ export function getMoneyList(params: Record) { - return request.get(`member/account/money`, { params }) + return request.get(`member/account/money`, {params}) } + /** * 获取会员佣金列表 - * @param params - * @returns + * @param params + * @returns */ export function getCommissionList(params: Record) { - return request.get(`member/account/commission`, { params }) + return request.get(`member/account/commission`, {params}) } + /** * 会员积分调整 - * @param params - * @returns + * @param params + * @returns */ export function adjustPoint(params: Record) { - return request.post(`member/account/point`, params, { showSuccessMessage: true }) + return request.post(`member/account/point`, params, {showSuccessMessage: true}) } + /** * 会员余额调整 - * @param params - * @returns + * @param params + * @returns */ export function adjustBalance(params: Record) { - return request.post(`member/account/balance`, params, { showSuccessMessage: true }) + return request.post(`member/account/balance`, params, {showSuccessMessage: true}) } /***************************************************** 会员相关设置 ****************************************************/ /** * 获取登录设置 - * @param params - * @returns */ export function getLoginConfig() { return request.get(`member/config/login`) } + /** * 注册登录设置 - * @param params - * @returns + * @param params + * @returns */ export function setLoginConfig(params: Record) { - return request.post(`member/config/login`, params, { showSuccessMessage: true }) + return request.post(`member/config/login`, params, {showSuccessMessage: true}) } - /** * 获取会员设置 - * @param params - * @returns */ export function getMemberConfig() { return request.get(`member/config/member`) @@ -230,18 +220,16 @@ export function getMemberConfig() { /** * 会员设置 - * @param params - * @returns + * @param params + * @returns */ export function setMemberConfig(params: Record) { - return request.post(`member/config/member`, params, { showSuccessMessage: true }) + return request.post(`member/config/member`, params, {showSuccessMessage: true}) } /** * 获取会员转账方式 - * @param params - * @returns */ export function getTransfertype() { return request.get(`member/cash_out/transfertype`) @@ -250,35 +238,33 @@ export function getTransfertype() { /** * 佣金统计 - * @param params - * @returns + * @param params + * @returns */ export function getCommissionSum(params: Record) { - return request.get(`member/account/sum_commission`, { params }) + return request.get(`member/account/sum_commission`, {params}) } /** * 积分统计 - * @param params - * @returns + * @param params + * @returns */ export function getPointSum(params: Record) { - return request.get(`member/account/sum_point`, { params }) + return request.get(`member/account/sum_point`, {params}) } /** * 余额统计 - * @param params - * @returns + * @param params + * @returns */ export function getBalanceSum(params: Record) { - return request.get(`member/account/sum_balance`, { params }) + return request.get(`member/account/sum_balance`, {params}) } /** * 余额类型 - * @param params - * @returns */ export function getBalanceStatus() { return request.get(`member/account/type`) @@ -296,34 +282,32 @@ export function getAccountType(params: Record) { /** * 获取提现设置 - * @param params - * @returns */ export function getCashOutConfig() { return request.get(`member/config/cash_out`) } + /** * 设置提现设置 - * @param params - * @returns + * @param params + * @returns */ export function setCashOutConfig(params: Record) { - return request.post(`member/config/cash_out`, params, { showSuccessMessage: true }) + return request.post(`member/config/cash_out`, params, {showSuccessMessage: true}) } /** * 获取会员提现列表 - * @param params - * @returns + * @param params + * @returns */ export function getCashOutList(params: Record) { - return request.get(`member/cash_out`, { params }) + return request.get(`member/cash_out`, {params}) } /** * 会员提现详情 - * @param params - * @returns id + * @param id */ export function getCashOutDetail(id: number) { return request.get(`member/cash_out/${id}`, {}) @@ -331,38 +315,30 @@ export function getCashOutDetail(id: number) { /** * 会员提现审核 - * @param id * @param params - * @returns */ export function memberAudit(params: Record) { - return request.put(`member/cash_out/audit/${params.id}/${params.action}`, params, { showSuccessMessage: true }) + return request.put(`member/cash_out/audit/${params.id}/${params.action}`, params, {showSuccessMessage: true}) } /** * 会员提现转账 - * @param id * @param params - * @returns */ export function memberTransfer(params: Record) { - return request.put(`member/cash_out/transfer/${params.id}`, params, { showSuccessMessage: true }) + return request.put(`member/cash_out/transfer/${params.id}`, params, {showSuccessMessage: true}) } /** * 会员状态变更 - * @param id - * @param params - * @returns + * @param params */ export function editMemberStatus(params: Record) { - return request.put(`member/setstatus/${params.status}`, params, { showSuccessMessage: true }) + return request.put(`member/setstatus/${params.status}`, params, {showSuccessMessage: true}) } /** * 会员提现状态 - * @param params - * @returns */ export function getCashOutStatusList() { return request.get(`member/cash_out/status`) diff --git a/admin/src/api/notice.ts b/admin/src/api/notice.ts index 4176ea206..eae131ed6 100644 --- a/admin/src/api/notice.ts +++ b/admin/src/api/notice.ts @@ -4,7 +4,7 @@ import request from '@/utils/request' /** * 消息列表 - * @returns + * @returns */ export function getNoticeList() { return request.get('notice/notice') @@ -13,7 +13,7 @@ export function getNoticeList() { /** * 消息详情 * @param key - * @returns + * @returns */ export function getNoticeInfo(key: string) { return request.get(`notice/notice/${key}`) @@ -21,35 +21,35 @@ export function getNoticeInfo(key: string) { /** * 消息发送记录 - * @param params - * @returns + * @param params + * @returns */ export function getNoticeLog(params: any) { - return request.get(`notice/log`, { params }) + return request.get(`notice/log`, {params}) } /** * 消息启动与关闭 - * @param params - * @returns + * @param params + * @returns */ export function editNoticeStatus(params: Record) { - return request.post(`notice/notice/editstatus`, params, { showSuccessMessage: true }) + return request.post(`notice/notice/editstatus`, params, {showSuccessMessage: true}) } /** * 消息修改 - * @param params - * @returns + * @param params + * @returns */ export function editNotice(params: Record) { - return request.post(`notice/notice/edit`, params, { showSuccessMessage: true }) + return request.post(`notice/notice/edit`, params, {showSuccessMessage: true}) } /** * 短信配置列表 - * @returns + * @returns */ export function getSmsList() { return request.get('notice/notice/sms') @@ -57,8 +57,8 @@ export function getSmsList() { /** * 短信配置详情 - * @param sms_type - * @returns + * @param sms_type + * @returns */ export function getSmsInfo(sms_type: string) { return request.get(`notice/notice/sms/${sms_type}`,) @@ -66,19 +66,15 @@ export function getSmsInfo(sms_type: string) { /** * 短信配置修改 - * @param sms_type - * @param params - * @returns + * @param params */ export function editSms(params: Record) { - return request.put(`notice/notice/sms/${params.sms_type}`, params, { showSuccessMessage: true }) + return request.put(`notice/notice/sms/${params.sms_type}`, params, {showSuccessMessage: true}) } /** * 短信发送记录 - * @param sms_type - * @param params - * @returns + * @param params */ export function getSmsLog(params: Record) { return request.get(`notice/sms/log`, params) diff --git a/admin/src/api/order.ts b/admin/src/api/order.ts index 5cc0201d2..7fdf586e5 100644 --- a/admin/src/api/order.ts +++ b/admin/src/api/order.ts @@ -8,7 +8,7 @@ import request from '@/utils/request' * @returns */ export function getRechargeOrderList(params: Record) { - return request.get(`order/recharge`, { params }) + return request.get(`order/recharge`, {params}) } /** @@ -17,7 +17,7 @@ export function getRechargeOrderList(params: Record) { * @returns */ export function getRechargeStat(params: Record) { - return request.get(`order/recharge/stat`, { params }) + return request.get(`order/recharge/stat`, {params}) } /** @@ -42,7 +42,7 @@ export function getRechargeOrderStatusList() { * @returns */ export function getRechargeRefund(params: Record) { - return request.get(`order/recharge/refund`, { params }) + return request.get(`order/recharge/refund`, {params}) } /** @@ -54,15 +54,15 @@ export function getRechargeRefundStatus() { } /** -* 充值订单发起退款 + * 充值订单发起退款 * @returns */ export function rechargeRefund(id: number) { - return request.put(`order/recharge/refund/${id}`, {}, { showSuccessMessage: true }); + return request.put(`order/recharge/refund/${id}`, {}, {showSuccessMessage: true}); } /** -* 获取退款统计 + * 获取退款统计 * @returns */ export function getRechargeRefundStat() { diff --git a/admin/src/api/personal.ts b/admin/src/api/personal.ts index c507a9b66..af4f253d7 100644 --- a/admin/src/api/personal.ts +++ b/admin/src/api/personal.ts @@ -2,7 +2,7 @@ import request from '@/utils/request' /** * 获取支付设置 - * @returns + * @returns */ export function getUserInfo(type: string) { return request.get(`auth/get`) @@ -10,9 +10,9 @@ export function getUserInfo(type: string) { /** * 配置支付 - * @returns + * @returns */ export function setUserInfo(params: Record) { - return request.put(`auth/edit`, params, { showSuccessMessage: true }); + return request.put(`auth/edit`, params, {showSuccessMessage: true}); } diff --git a/admin/src/api/site.ts b/admin/src/api/site.ts index d4e89cb36..ae0415ea7 100644 --- a/admin/src/api/site.ts +++ b/admin/src/api/site.ts @@ -6,17 +6,16 @@ import request from '@/utils/request' /** * 获取站点列表 - * @param params - * @returns + * @param params + * @returns */ export function getSiteList(params: Record) { - return request.get(`site/site`, { params }) + return request.get(`site/site`, {params}) } /** * 获取站点详情 - * @param id 站点id - * @returns + * @param site_id */ export function getSiteInfo(site_id: number) { return request.get(`site/site/${site_id}`); @@ -24,47 +23,39 @@ export function getSiteInfo(site_id: number) { /** * 添加站点 - * @param params - * @returns + * @param params + * @returns */ export function addSite(params: Record) { - return request.post('site/site', params, { showSuccessMessage: true }) + return request.post('site/site', params, {showSuccessMessage: true}) } /** * 更新站点 - * @param id - * @param params - * @returns + * @param params */ export function editSite(params: Record) { - return request.put(`site/site/${params.site_id}`, params, { showSuccessMessage: true }) + return request.put(`site/site/${params.site_id}`, params, {showSuccessMessage: true}) } /** * 关闭站点 - * @param id - * @param params - * @returns + * @param params */ export function closeSite(params: Record) { - return request.put(`site/closesite/${params.site_id}`, params, { showSuccessMessage: true }) + return request.put(`site/closesite/${params.site_id}`, params, {showSuccessMessage: true}) } /** - * 关闭站点 - * @param id - * @param params - * @returns + * 打开站点 + * @param params */ export function openSite(params: Record) { - return request.put(`site/opensite/${params.site_id}`, params, { showSuccessMessage: true }) + return request.put(`site/opensite/${params.site_id}`, params, {showSuccessMessage: true}) } /** * 获取全部站点状态 - * @param params - * @returns */ export function getStatusList() { return request.get(`site/statuslist`) @@ -75,17 +66,16 @@ export function getStatusList() { /** * 获取站点分组列表 - * @param params - * @returns + * @param params + * @returns */ export function getSiteGroupList(params: Record) { - return request.get(`site/group`, { params }) + return request.get(`site/group`, {params}) } /** * 获取站点分组详情 - * @param id 站点id - * @returns + * @param site_id */ export function getSiteGroupInfo(site_id: number) { return request.get(`site/group/${site_id}`); @@ -93,37 +83,33 @@ export function getSiteGroupInfo(site_id: number) { /** * 添加站点分组 - * @param params - * @returns + * @param params + * @returns */ export function addSiteGroup(params: Record) { - return request.post('site/group', params, { showSuccessMessage: true }) + return request.post('site/group', params, {showSuccessMessage: true}) } /** * 更新站点分组 - * @param id - * @param params - * @returns + * @param params */ export function editSiteGroup(params: Record) { - return request.put(`site/group/${params.group_id}`, params, { showSuccessMessage: true }) + return request.put(`site/group/${params.group_id}`, params, {showSuccessMessage: true}) } /** * 删除站点分组 - * @param id - * @param params - * @returns + * @param group_id */ export function deleteSiteGroup(group_id: number) { - return request.delete(`site/group/${group_id}`, { showSuccessMessage: true }); + return request.delete(`site/group/${group_id}`, {showSuccessMessage: true}); } /** * 获取全部站点分组 - * @param params - * @returns + * @param params + * @returns */ export function getSiteGroupAll(params: Record) { return request.get(`site/group/all`, params) @@ -133,17 +119,16 @@ export function getSiteGroupAll(params: Record) { /** * 获取站点用户列表 - * @param params - * @returns + * @param params + * @returns */ export function getUserList(params: Record) { - return request.get(`site/user`, { params }) + return request.get(`site/user`, {params}) } /** * 获取站点用户详情 - * @param id 站点id - * @returns + * @param uid */ export function getUserInfo(uid: number) { return request.get(`site/user/${uid}`); @@ -151,37 +136,35 @@ export function getUserInfo(uid: number) { /** * 添加用户 - * @param params - * @returns + * @param params + * @returns */ export function addUser(params: Record) { - return request.post('site/user', params, { showSuccessMessage: true }) + return request.post('site/user', params, {showSuccessMessage: true}) } /** * 编辑用户 - * @param uid - * @param params - * @returns + * @param params */ export function editUser(params: Record) { - return request.put(`site/user/${params.uid}`, params, { showSuccessMessage: true }) + return request.put(`site/user/${params.uid}`, params, {showSuccessMessage: true}) } /** * 删除用户 - * @param uid - * @returns + * @param uid + * @returns */ export function deleteUser(uid: number) { - return request.delete(`site/user/${uid}`, { showSuccessMessage: true }) + return request.delete(`site/user/${uid}`, {showSuccessMessage: true}) } /** * 锁定用户 - * @param uid - * @returns + * @param uid + * @returns */ export function lockUser(uid: number) { return request.put(`site/user/lock/${uid}`) @@ -190,8 +173,8 @@ export function lockUser(uid: number) { /** * 解锁用户 - * @param uid - * @returns + * @param uid + * @returns */ export function unlockUser(uid: number) { return request.put(`site/user/unlock/${uid}`) @@ -202,36 +185,35 @@ export function unlockUser(uid: number) { /** * 获取操作日志列表 - * @param params - * @returns + * @param params + * @returns */ export function getLogList(params: Record) { - return request.get(`site/log`, { params }) + return request.get(`site/log`, {params}) } /** * 获取操作日志详情 - * @param params - * @returns + * @param id */ export function getLogInfo(id: number) { return request.get(`site/log/${id}`) } + /***************************************************** 账单列表 **************************************************/ /** * 获取账单列表 - * @param params - * @returns + * @param params + * @returns */ export function getAccountList(params: Record) { - return request.get(`site/account`, { params }) + return request.get(`site/account`, {params}) } /** * 获取账单详情 - * @param params - * @returns + * @param id */ export function getAccountInfo(id: number) { return request.get(`site/account/${id}`) @@ -239,7 +221,7 @@ export function getAccountInfo(id: number) { /** * 获取账单统计 - * @returns + * @returns */ export function getAccountStat() { return request.get(`site/account/stat`) @@ -247,7 +229,7 @@ export function getAccountStat() { /** * 获取账单类型 - * @returns + * @returns */ export function getAccountType() { return request.get(`site/account/type`) diff --git a/admin/src/api/stat.ts b/admin/src/api/stat.ts index 5e529abfa..02f5f8551 100644 --- a/admin/src/api/stat.ts +++ b/admin/src/api/stat.ts @@ -3,16 +3,13 @@ import request from '@/utils/request' /***************************************************** 统计信息 **************************************************/ /** * 获取统计信息 - * @param params - * @returns */ export function getStatInfo() { return request.get(`stat/index`) } + /** * 获取站点统计信息 - * @param params - * @returns */ export function getSiteStatInfo() { return request.get(`stat/siteindex`) diff --git a/admin/src/api/sys.ts b/admin/src/api/sys.ts index 8d061e423..8cc8a0c5a 100644 --- a/admin/src/api/sys.ts +++ b/admin/src/api/sys.ts @@ -4,7 +4,7 @@ import request from '@/utils/request' /** * 系统信息 - * @returns + * @returns */ export function getInfo() { return request.get('sys/role') @@ -12,25 +12,25 @@ export function getInfo() { /** * 系统信息 - * @returns + * @returns */ export function getUrl() { return request.get('sys/url') } + /***************************************************** 用户组 ****************************************************/ /** * 用户组列表 - * @returns + * @returns */ export function getRoleList(params: Record) { - return request.get('sys/role', { params }) + return request.get('sys/role', {params}) } /** * 用户组详情 - * @param params - * @returns + * @param roleId */ export function getRoleInfo(roleId: number) { return request.get(`sys/role/${roleId}`) @@ -38,35 +38,32 @@ export function getRoleInfo(roleId: number) { /** * 添加用户组 - * @param params - * @returns + * @param params + * @returns */ export function addRole(params: Record) { - return request.post(`sys/role`, params, { showSuccessMessage: true }) + return request.post(`sys/role`, params, {showSuccessMessage: true}) } /** * 编辑用户组 - * @param role_id - * @param params - * @returns + * @param params */ export function editRole(params: Record) { - return request.put(`sys/role/${params.role_id}`, params, { showSuccessMessage: true }) + return request.put(`sys/role/${params.role_id}`, params, {showSuccessMessage: true}) } /** * 删除用户组 - * @param role_id - * @returns + * @param roleId */ export function deleteRole(roleId: number) { - return request.delete(`sys/role/${roleId}`, { showSuccessMessage: true }) + return request.delete(`sys/role/${roleId}`, {showSuccessMessage: true}) } /** * 全部分组 - * @returns + * @returns */ export function allRole() { return request.get('sys/role/all') @@ -76,7 +73,7 @@ export function allRole() { /** * 获取全部菜单 - * @returns + * @returns */ export function getMenus(type: string) { return request.get(`sys/menu/${type}`) @@ -84,8 +81,7 @@ export function getMenus(type: string) { /** * 获取菜单信息 - * @param id - * @returns + * @param menu_key */ export function getMenuInfo(menu_key: string) { return request.get(`sys/menu/info/${menu_key}`); @@ -93,37 +89,34 @@ export function getMenuInfo(menu_key: string) { /** * 添加菜单 - * @param params - * @returns + * @param params + * @returns */ export function addMenu(params: Record) { - return request.post('sys/menu', params, { showSuccessMessage: true }) + return request.post('sys/menu', params, {showSuccessMessage: true}) } /** * 更新菜单 - * @param id - * @param params - * @returns + * @param params */ export function editMenu(params: Record) { - return request.put(`sys/menu/${params.menu_key}`, params, { showSuccessMessage: true }) + return request.put(`sys/menu/${params.menu_key}`, params, {showSuccessMessage: true}) } /** * 删除菜单 - * @param id - * @returns + * @param menu_key */ export function deleteMenu(menu_key: string) { - return request.delete(`sys/menu/${menu_key}`, { showSuccessMessage: true }) + return request.delete(`sys/menu/${menu_key}`, {showSuccessMessage: true}) } /***************************************************** 站点菜单 ****************************************************/ /** * 获取站点菜单 - * @returns + * @returns */ export function getSiteMenus() { return request.get(`site/site/menu`) @@ -134,7 +127,7 @@ export function getSiteMenus() { /** * 获取网站设置 - * @returns + * @returns */ export function getWebsite() { return request.get('sys/config/website') @@ -142,7 +135,7 @@ export function getWebsite() { /** * 获取网站设置 - * @returns + * @returns */ export function getWebConfig() { return request.get('sys/web/website') @@ -150,16 +143,16 @@ export function getWebConfig() { /** * 更新网站设置 - * @param params - * @returns + * @param params + * @returns */ export function setWebsite(params: Record) { - return request.put(`sys/config/website`, params, { showSuccessMessage: true }) + return request.put(`sys/config/website`, params, {showSuccessMessage: true}) } /** * 获取版权设置 - * @returns + * @returns */ export function getCopyright() { return request.get('sys/config/copyright') @@ -167,7 +160,7 @@ export function getCopyright() { /** * 获服务信息 - * @returns + * @returns */ export function getService() { return request.get('sys/config/service') @@ -175,70 +168,70 @@ export function getService() { /** * 更新版权设置 - * @param params - * @returns + * @param params + * @returns */ export function setCopyright(params: Record) { - return request.put(`sys/config/copyright`, params, { showSuccessMessage: true }) + return request.put(`sys/config/copyright`, params, {showSuccessMessage: true}) } /** * 获取附件组列表 - * @param params - * @returns + * @param params + * @returns */ export function getAttachmentCategoryList(params: Record) { - return request.get(`sys/attachment/category`, { params }) + return request.get(`sys/attachment/category`, {params}) } /** * 添加分类 - * @param params + * @param params */ export function addAttachmentCategory(params: Record) { - return request.post(`sys/attachment/category`, params, { showSuccessMessage: true }) + return request.post(`sys/attachment/category`, params, {showSuccessMessage: true}) } /** * 编辑分类 - * @param params - * @returns + * @param params + * @returns */ export function editAttachmentCategory(params: Record) { - return request.put(`sys/attachment/category/${params.id}`, params, { showSuccessMessage: true }) + return request.put(`sys/attachment/category/${params.id}`, params, {showSuccessMessage: true}) } /** * 删除分类 - * @param id - * @returns + * @param id + * @returns */ export function deleteAttachmentCategory(id: number) { - return request.delete(`sys/attachment/category/${id}`, { showSuccessMessage: true }) + return request.delete(`sys/attachment/category/${id}`, {showSuccessMessage: true}) } /** * 获取附件列表 - * @param params - * @returns + * @param params + * @returns */ export function getAttachmentList(params: Record) { - return request.get(`sys/attachment`, { params }) + return request.get(`sys/attachment`, {params}) } /** * 删除附件 - * @param params - * @returns + * @param params + * @returns */ export function deleteAttachment(params: Record) { - return request.delete(`sys/attachment/del`, { data: params, showSuccessMessage: true }) + return request.delete(`sys/attachment/del`, {data: params, showSuccessMessage: true}) } /** * 移动附件 - * @param params - * @returns + * @param params + * @returns */ export function moveAttachment(params: Record) { return request.put(`sys/attachment/batchmove`, params) @@ -262,15 +255,32 @@ export function getShortcutMenu() { * 添加快捷菜单 */ export function setShortcutMenu(params: Record) { - return request.put(`sys/config/shortcut_menu`, params, { showSuccessMessage: true }) + return request.put(`sys/config/shortcut_menu`, params, {showSuccessMessage: true}) +} + +/** + * 获取图标库分类列表 + * @param params + * @returns + */ +export function getIconCategoryList(params: Record) { + return request.get(`sys/attachment/icon_category`, {params}) +} + +/** + * 获取图标库列表 + * @param params + * @returns + */ +export function getIconList(params: Record) { + return request.get(`sys/attachment/icon`, {params}) } /***************************************************** 地址管理 ****************************************************/ /** * 获取下级地址列表 - * @param params - * @returns + * @param pid */ export function getAreaListByPid(pid: number = 0) { return request.get(`sys/area/list_by_pid/${pid}`) @@ -278,8 +288,7 @@ export function getAreaListByPid(pid: number = 0) { /** * 获取地址树列表 - * @param params - * @returns + * @param level */ export function getAreatree(level: number = 1) { return request.get(`sys/area/tree/${level}`) @@ -290,22 +299,20 @@ export function getAreatree(level: number = 1) { * 获取地址信息 */ export function getAddressInfo(params: any) { - return request.get(`sys/area/get_info`, { params }) + return request.get(`sys/area/get_info`, {params}) } /** * 获取地址信息 */ export function getContraryAddress(params: any) { - return request.get(`sys/area/contrary`, { params }) + return request.get(`sys/area/contrary`, {params}) } /***************************************************** 存储设置 ****************************************************/ /** * 获取存储配置列表 - * @param params - * @returns */ export function getStorageList() { return request.get(`sys/storage`) @@ -313,8 +320,7 @@ export function getStorageList() { /** * 获取存储详情 - * @param params - * @returns + * @param type */ export function getStorageInfo(type: string) { return request.get(`sys/storage/${type}`) @@ -322,18 +328,18 @@ export function getStorageInfo(type: string) { /** * 修改存储 - * @param params - * @returns + * @param params + * @returns */ export function editStorage(params: Record) { - return request.put(`sys/storage/${params.storage_type}`, params, { showSuccessMessage: true }) + return request.put(`sys/storage/${params.storage_type}`, params, {showSuccessMessage: true}) } /***************************************************** 支付设置 ****************************************************/ /** * 获取支付设置 - * @returns + * @returns */ export function getPayConfig(type: string) { return request.get(`pay/config/${type}`) @@ -341,15 +347,15 @@ export function getPayConfig(type: string) { /** * 配置支付 - * @returns + * @returns */ export function setPayConfig(params: Record) { - return request.put(`pay/config/${params.type}`, params, { showSuccessMessage: true }); + return request.put(`pay/config/${params.type}`, params, {showSuccessMessage: true}); } /** * 获取支付列表 - * @returns + * @returns */ export function getPayList() { return request.get(`pay/lists`) @@ -358,8 +364,7 @@ export function getPayList() { /***************************************************** 打款设置 ****************************************************/ /** * 获取打款设置配置 - * @returns channel 渠道 - * @returns + * @param channel */ export function getTransferInfo(channel) { return request.get(`pay/channel/lists/${channel}`) @@ -367,43 +372,84 @@ export function getTransferInfo(channel) { /** * 设置打款配置 - * @param params + * @param params * @returns */ export function setTransferInfo(params: Record) { return request.post(`pay/channel/set/transfer`, params) } + /***************************************************** 定时任务 ****************************************************/ /** * 获取任务列表 - * @returns + * @returns */ export function getCronList(params: any) { - return request.get(`sys/schedule/list`, { params }) + return request.get(`sys/schedule/list`, {params}) } /** * 任务详情 - * @returns + * @returns */ export function getCronInfo(id: string) { return request.get(`sys/cron/${id}`); } /** - * 任务类型 - * @returns + * 任务模版 + * @returns */ -export function getCronType() { - return request.get(`sys/cron/type`) +export function getCronTemplate() { + return request.get(`sys/schedule/template`) +} + +/** + * 任务间隔 + * @returns + */ +export function getCronDateType() { + return request.get(`sys/schedule/datetype`) +} + +/** + * 获取星期 + * @returns + */ +export function getWeek() { + return request.get(`sys/date/week`) +} + +/** + * 添加计划任务 + * @returns + */ +export function addCron(params: Record) { + return request.post(`sys/schedule`, params, {showSuccessMessage: true}) +} + +/** + * 编辑任务 + * @returns + */ +export function editCron(params: Record) { + return request.put(`sys/schedule/${params.id}`, params, {showSuccessMessage: true}) +} + +/** + * 删除任务 + * @returns + */ +export function deleteCron(id: string) { + return request.delete(`sys/schedule/${id}`, {showSuccessMessage: true}) } /***************************************************** 协议管理 ****************************************************/ /** * 获取协议列表 - * @returns + * @returns */ export function getAgreementList() { return request.get(`sys/agreement`) @@ -411,7 +457,7 @@ export function getAgreementList() { /** * 协议详情 - * @returns + * @returns */ export function getAgreementInfo(key: string) { return request.get(`sys/agreement/${key}`); @@ -419,15 +465,15 @@ export function getAgreementInfo(key: string) { /** * 更新协议 - * @returns + * @returns */ export function editAgreement(params: Record) { - return request.put(`sys/agreement/${params.key}`, params, { showSuccessMessage: true }) + return request.put(`sys/agreement/${params.key}`, params, {showSuccessMessage: true}) } /** * 协议详情 - * @returns + * @returns */ export function getChannelType() { return request.get(`sys/channel`); @@ -436,7 +482,7 @@ export function getChannelType() { /** * 获取渠道域名 - * @returns + * @returns */ export function getSceneDomain() { return request.get(`sys/scene_domain`); @@ -446,8 +492,6 @@ export function getSceneDomain() { /** * 管理端登录注册配置 - * @param params - * @returns */ export function getConfigLogin() { return request.get(`sys/config/login`) @@ -455,11 +499,11 @@ export function getConfigLogin() { /** * 设置管理端登录注册配置 - * @param params - * @returns + * @param params + * @returns */ export function setConfigLogin(params: Record) { - return request.put(`sys/config/login`, params, { showSuccessMessage: true }) + return request.put(`sys/config/login`, params, {showSuccessMessage: true}) } /** @@ -473,7 +517,7 @@ export function getPayConfigList() { * 设置支付配置 */ export function setPatConfig(params: Record) { - return request.post(`pay/channel/set/all`, params, { showSuccessMessage: true }) + return request.post(`pay/channel/set/all`, params, {showSuccessMessage: true}) } @@ -482,14 +526,14 @@ export function setPatConfig(params: Record) { * 刷新菜单 */ export function menuRefresh(params: Record) { - return request.post(`sys/menu/refresh`, {}, { showSuccessMessage: true }) + return request.post(`sys/menu/refresh`, {}, {showSuccessMessage: true}) } /** * 清理数据字段缓存 */ export function clearSchemaCache(params: Record) { - return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true }) + return request.post(`sys/schema/clear`, {}, {showSuccessMessage: true}) } @@ -507,8 +551,9 @@ export function getAppMange() { * 设置地图key */ export function setMap(params: Record) { - return request.put(`sys/config/map`, params, { showSuccessMessage: true }) + return request.put(`sys/config/map`, params, {showSuccessMessage: true}) } + /** * 获取地图配置 */ @@ -528,5 +573,5 @@ export function getIndexList() { * 设置首页模版 */ export function setIndexList(params: Record) { - return request.put(`sys/config/site_index`, params, { showSuccessMessage: true }) + return request.put(`sys/config/site_index`, params, {showSuccessMessage: true}) } diff --git a/admin/src/api/tools.ts b/admin/src/api/tools.ts index cf55cd1de..37c25f0eb 100644 --- a/admin/src/api/tools.ts +++ b/admin/src/api/tools.ts @@ -8,7 +8,7 @@ import request from '@/utils/request' * @returns */ export function getGenerateTableList(params: Record) { - return request.get(`generator/generator`, { params }) + return request.get(`generator/generator`, {params}) } /** @@ -26,17 +26,15 @@ export function getGenerateTableInfo(id: number) { * @returns */ export function addGenerateTable(params: Record) { - return request.post('generator/generator', params, { showSuccessMessage: true }) + return request.post('generator/generator', params, {showSuccessMessage: true}) } /** * 编辑代码生成 - * @param id * @param params - * @returns */ export function editGenerateTable(params: Record) { - return request.put(`generator/generator/${params.id}`, params, { showSuccessMessage: true }) + return request.put(`generator/generator/${params.id}`, params, {showSuccessMessage: true}) } /** @@ -45,7 +43,7 @@ export function editGenerateTable(params: Record) { * @returns */ export function deleteGenerateTable(id: number) { - return request.delete(`generator/generator/${id}`, { showSuccessMessage: true }) + return request.delete(`generator/generator/${id}`, {showSuccessMessage: true}) } /** @@ -59,8 +57,6 @@ export function generateCreate(params: Record) { /** * 数据表 - * @param file - * @returns */ export function generateTable() { return request.get(`generator/table`) @@ -68,8 +64,6 @@ export function generateTable() { /** * 获取服务器环境配置 - * @param file - * @returns */ export function getSystem() { return request.get(`sys/system`) diff --git a/admin/src/api/user.ts b/admin/src/api/user.ts index 306b2ff4e..3e71e1635 100644 --- a/admin/src/api/user.ts +++ b/admin/src/api/user.ts @@ -33,9 +33,7 @@ export function addUser(params: Record) { /** * 更新用户 - * @param id - * @param params - * @returns + * @param params */ export function editUser(params: Record) { return request.put(`user/user/${params.uid}`, params, { showSuccessMessage: true }) diff --git a/admin/src/api/weapp.ts b/admin/src/api/weapp.ts index 1b0d0cb0a..e874ecf40 100644 --- a/admin/src/api/weapp.ts +++ b/admin/src/api/weapp.ts @@ -2,7 +2,7 @@ import request from '@/utils/request' /** * 获取微信小程序配置 - * @returns + * @returns */ export function getWeappConfig() { return request.get('weapp/config') @@ -10,16 +10,16 @@ export function getWeappConfig() { /** * 编辑微信小程序配置 - * @param params - * @returns + * @param params + * @returns */ export function setWeappConfig(params: Record) { - return request.put('weapp/config', params, { showSuccessMessage: true }) + return request.put('weapp/config', params, {showSuccessMessage: true}) } /** * 获取订阅消息列表 - * @returns + * @returns */ export function getTemplateList() { return request.get('weapp/template') @@ -27,9 +27,65 @@ export function getTemplateList() { /** * 获取同步 - * @param params - * @returns + * @param params + * @returns */ export function getBatchAcquisition(params: Record) { - return request.put('weapp/template/sync', params, { showSuccessMessage: true }) + return request.put('weapp/template/sync', params, {showSuccessMessage: true}) } + +/***************************************************** 管理端 ****************************************************/ + +/** + * 上传文件 + * @param params + * @returns + */ +export function uploadVersion(params: Record) { + return request.put('applet/upload', params, {showSuccessMessage: true}) +} + +/** + * 添加版本 + * @param params + * @returns + */ +export function addVersion(params: Record) { + return request.put('applet/version/add', params, {showSuccessMessage: true}) +} + +/** + * 版本列表 + * @param params + * @returns + */ +export function getVersionList(params: Record) { + return request.get('applet/version', {params}) +} + +/** + * 版本详情 + * @param params + * @returns + */ +export function getVersionInfo(id: string) { + return request.get(`applet/version/${id}`) +} + +/** + * 编辑版本 + * @param params + * @returns + */ +export function editVersion(params: Record) { + return request.get(`applet/version/${params.id}`, params, {showSuccessMessage: true}) +} + +/** + * 版本删除 + * @param params + * @returns + */ +export function deleteVersion(id: string) { + return request.delete(`applet/version/${id}`) +} \ No newline at end of file diff --git a/admin/src/api/wechat.ts b/admin/src/api/wechat.ts index 6412b49ba..30744a91d 100644 --- a/admin/src/api/wechat.ts +++ b/admin/src/api/wechat.ts @@ -2,7 +2,7 @@ import request from '@/utils/request' /** * 获取微信配置 - * @returns + * @returns */ export function getWechatConfig() { return request.get('wechat/config') @@ -10,8 +10,6 @@ export function getWechatConfig() { /** * 微信配置所需的静态信息 - * @param uid 用户uid - * @returns */ export function getWechatStatic() { return request.get('wechat/static'); @@ -19,16 +17,16 @@ export function getWechatStatic() { /** * 编辑微信配置 - * @param params - * @returns + * @param params + * @returns */ export function editWechatConfig(params: Record) { - return request.put('wechat/config', params, { showSuccessMessage: true }) + return request.put('wechat/config', params, {showSuccessMessage: true}) } /** * 获取微信菜单 - * @returns + * @returns */ export function getWechatMenu() { return request.get('wechat/menu') @@ -36,16 +34,16 @@ export function getWechatMenu() { /** * 编辑微信菜单 - * @param params - * @returns + * @param params + * @returns */ export function editWechatMenu(params: Record) { - return request.put('wechat/menu', params, { showSuccessMessage: true }) + return request.put('wechat/menu', params, {showSuccessMessage: true}) } /** * 获取消息模板列表 - * @returns + * @returns */ export function getTemplateList() { return request.get('wechat/template') @@ -54,11 +52,11 @@ export function getTemplateList() { /** * 获取同步 - * @param params - * @returns + * @param params + * @returns */ export function getBatchAcquisition(params: Record) { - return request.put('wechat/template/sync', params, { showSuccessMessage: true }) + return request.put('wechat/template/sync', params, {showSuccessMessage: true}) } diff --git a/admin/src/assets/images/iphone_bg.png b/admin/src/assets/images/iphone_bg.png index 3feb4143e..0906ff524 100644 Binary files a/admin/src/assets/images/iphone_bg.png and b/admin/src/assets/images/iphone_bg.png differ diff --git a/admin/src/assets/images/login/admin_login_img.png b/admin/src/assets/images/login/admin_login_img.png new file mode 100644 index 000000000..c21c753a4 Binary files /dev/null and b/admin/src/assets/images/login/admin_login_img.png differ diff --git a/admin/src/assets/images/login/site_bg.png b/admin/src/assets/images/login/site_bg.png new file mode 100644 index 000000000..f755f3345 Binary files /dev/null and b/admin/src/assets/images/login/site_bg.png differ diff --git a/admin/src/assets/images/login/site_bg_1.png b/admin/src/assets/images/login/site_bg_1.png new file mode 100644 index 000000000..c1056537f Binary files /dev/null and b/admin/src/assets/images/login/site_bg_1.png differ diff --git a/admin/src/assets/images/login/site_code.png b/admin/src/assets/images/login/site_code.png new file mode 100644 index 000000000..a41cd7b16 Binary files /dev/null and b/admin/src/assets/images/login/site_code.png differ diff --git a/admin/src/assets/images/site_login_bg.png b/admin/src/assets/images/site_login_bg.png new file mode 100644 index 000000000..1563f9c79 Binary files /dev/null and b/admin/src/assets/images/site_login_bg.png differ diff --git a/admin/src/assets/images/site_login_logo.png b/admin/src/assets/images/site_login_logo.png new file mode 100644 index 000000000..117460294 Binary files /dev/null and b/admin/src/assets/images/site_login_logo.png differ diff --git a/admin/src/components/diy-link/index.vue b/admin/src/components/diy-link/index.vue index 8e8c97f4d..b61df5899 100644 --- a/admin/src/components/diy-link/index.vue +++ b/admin/src/components/diy-link/index.vue @@ -73,7 +73,6 @@ import {cloneDeep} from 'lodash-es' import {getLink} from '@/api/diy'; import {ElMessage} from 'element-plus' -import { CollectionTag } from '@element-plus/icons-vue'; const prop = defineProps({ modelValue: { diff --git a/admin/src/components/icon/index.vue b/admin/src/components/icon/index.vue index f3113d066..79382527d 100644 --- a/admin/src/components/icon/index.vue +++ b/admin/src/components/icon/index.vue @@ -1,9 +1,13 @@ - diff --git a/admin/src/components/select-icon/index.vue b/admin/src/components/select-icon/index.vue index 61c42b2e6..69e921a9e 100644 --- a/admin/src/components/select-icon/index.vue +++ b/admin/src/components/select-icon/index.vue @@ -1,71 +1,145 @@ diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue index 7fb2c655f..afe6d7c9c 100644 --- a/admin/src/components/upload-attachment/attachment.vue +++ b/admin/src/components/upload-attachment/attachment.vue @@ -1,529 +1,567 @@ + .el-upload-list__item { + background: #fff !important; + box-shadow: var(--el-box-shadow-light); + } + } diff --git a/admin/src/components/upload-video/index.vue b/admin/src/components/upload-video/index.vue index 4693048de..93eb44a82 100644 --- a/admin/src/components/upload-video/index.vue +++ b/admin/src/components/upload-video/index.vue @@ -1,157 +1,158 @@ diff --git a/admin/src/lang/zh-cn/common.json b/admin/src/lang/zh-cn/common.json index c22ab7c96..81cd59873 100644 --- a/admin/src/lang/zh-cn/common.json +++ b/admin/src/lang/zh-cn/common.json @@ -46,11 +46,13 @@ "root": "上传", "selectimage": "选择图片", "selectvideo": "选择视频", + "selecticon": "选择图标", "uploadimage": "上传图片", "uploadvideo": "上传视频", "addAttachmentCategory": "添加分组", "attachmentCategoryPlaceholder": "请输入分组名称", "attachmentEmpty": "暂无附件,请点击上传按钮上传", + "iconEmpty": "暂无图标", "deleteCategoryTips": "确定要删除该分组吗?", "deleteAttachmentTips": "确定要删除所选附件吗?如所选附件已被使用删除将会受到影响,请谨慎操作!", "move": "移动", @@ -58,6 +60,7 @@ "moveTo": "移动至", "placeholderimageName": "请输入图片名称", "placeholdervideoName": "请输入视频名称", + "placeholdericonName": "请输入图标名称", "success": "上传成功", "triggerUpperLimit": "可选数量已达上限" }, diff --git a/admin/src/lang/zh-cn/diy.preview.json b/admin/src/lang/zh-cn/diy.preview.json index b706dee11..b69d5ecd0 100644 --- a/admin/src/lang/zh-cn/diy.preview.json +++ b/admin/src/lang/zh-cn/diy.preview.json @@ -1,5 +1,6 @@ { "preview": "预览", + "h5": "H5", "weapp": "微信小程序", "wechat": "微信公众号", "link": "链接", diff --git a/admin/src/lang/zh-cn/finance.account.json b/admin/src/lang/zh-cn/finance.account.json index 6d91b5570..5e170e57c 100644 --- a/admin/src/lang/zh-cn/finance.account.json +++ b/admin/src/lang/zh-cn/finance.account.json @@ -2,19 +2,12 @@ "id":"主键", "accountDetail":"账单详情", "detail":"详情", - "idPlaceholder":"请输入主键", - "siteId":"站点id", - "siteIdPlaceholder":"请输入站点id", "type":"账单类型", "money":"账单金额", "moneyPlaceholder":"请输入账单金额", "tradeNo":"账单编号", "tradeNoPlaceholder":"请输入账单编号", - "createTime":"添加时间", - "createTimePlaceholder":"请输入添加时间", - "addSiteAccountLog":"添加站点账单记录", - "updateSiteAccountLog":"编辑站点账单记录", - "siteAccountLogDeleteTips":"确定要删除该站点账单记录吗?", + "createTime":"账单日期", "totalPay":"累计收款(元)", "totalRefund":"累计退款(元)", "totalTransfer":"累计转账(元)", diff --git a/admin/src/lang/zh-cn/index.site_index.json b/admin/src/lang/zh-cn/index.site_index.json index e4ffb778d..8c5a36f7f 100644 --- a/admin/src/lang/zh-cn/index.site_index.json +++ b/admin/src/lang/zh-cn/index.site_index.json @@ -52,14 +52,14 @@ "siteType": "站点类型", "periodTime": "有效期", "renew": "续费", - "selectModel": "选择模版", + "selectModel": "选择模块", "addMenu": "添加模块", "shortcutLink": "模版", "emptyMenu": "暂无快捷模块", "select": "选择", "custom": "自定义", "accessSite": "访问站点", - "pathSelect": "选择模版", + "pathSelect": "选择模块", "bgColorPlaceholder": "请选择背景色", "iconPlaceholder": "请选择图标", "pathPlaceholder": "请选择链接", diff --git a/admin/src/lang/zh-cn/setting.system.json b/admin/src/lang/zh-cn/setting.system.json index 280822552..216a4dd0a 100644 --- a/admin/src/lang/zh-cn/setting.system.json +++ b/admin/src/lang/zh-cn/setting.system.json @@ -3,7 +3,7 @@ "contactAddress":"联系地址", "siteName": "站点名称", "keywords": "网站关键字", - "logo": "网站Logo", + "logo": "长方形logo", "desc": "网站简介", "province": "省", "city": "市", @@ -15,7 +15,6 @@ "contactAddressPlaceholder":"联系地址", "siteNamePlaceholder": "站点名称", "keywordsPlaceholder": "网站关键字", - "logoPlaceholder": "网站Logo", "descPlaceholder": "网站简介", "addressPlaceholder": "详细地址", "phonePlaceholder": "客服电话", @@ -25,10 +24,12 @@ "frontEndName": "前台名称", "frontEndNamePlaceholder": "请输入前台名称", "frontEndLogo": "前台Logo", - "icon": "网站图标", + "icon": "网站方形logo", "serviceInformation": "服务信息", "wechatCode": "公众号二维码", "customerServiceCode": "客服二维码", "contactsTel": "联系电话", - "contactsTelPlaceholder": "请输入联系电话" -} \ No newline at end of file + "contactsTelPlaceholder": "请输入联系电话", + "logoPlaceholder": "建议图片尺寸:210*30像素;图片格式:jpg、png、jpeg。", + "iconPlaceholder": "建议图片尺寸:100*100像素;图片格式:jpg、png、jpeg。" +} diff --git a/admin/src/lang/zh-cn/setting.weapp.json b/admin/src/lang/zh-cn/setting.weapp.json new file mode 100644 index 000000000..fdeacbbb3 --- /dev/null +++ b/admin/src/lang/zh-cn/setting.weapp.json @@ -0,0 +1,11 @@ +{ + "addVersion": "上传版本", + "version": "版本号", + "versionPlaceholder": "请添加版本号", + "createTime": "创建时间", + "status": "状态", + "editVersion": "添加/编辑版本", + "file": "文件", + "filePlaceholder":"请上传版本文件", + "desc": "版本说明" +} \ No newline at end of file diff --git a/admin/src/lang/zh-cn/tools.schedule.json b/admin/src/lang/zh-cn/tools.schedule.json index c9ad30da8..823f493d7 100644 --- a/admin/src/lang/zh-cn/tools.schedule.json +++ b/admin/src/lang/zh-cn/tools.schedule.json @@ -6,7 +6,7 @@ "startDate":"开始时间", "cron":"定时执行", "endDate":"结束时间", - "titlePlaceholder": "请输入任务名称", + "titlePlaceholder": "请选择任务模版", "typeName":"任务类型", "crondType":"任务周期", "count":"已执行次数", @@ -16,5 +16,15 @@ "statusDesc":"最后执行结果", "key": "key", "timeClass": "时间类型", - "executeTime": "执行时间" + "executeTime": "执行时间", + "editCron": "编辑任务", + "cronTemplate": "任务模版", + "cronTime": "任务周期", + "openStatus": "任务状态", + "day": "日", + "hour": "时", + "min": "分", + "cronDeleteTips": "你确定要删除任务吗", + "addCron": "添加任务", + "cronTimeTips": "任务周期时间不能为空" } \ No newline at end of file diff --git a/admin/src/layout/default/components/aside/index.vue b/admin/src/layout/default/components/aside/index.vue index c3fc97098..68707f280 100644 --- a/admin/src/layout/default/components/aside/index.vue +++ b/admin/src/layout/default/components/aside/index.vue @@ -3,8 +3,7 @@ - + diff --git a/admin/src/layout/default/components/aside/menu-item.vue b/admin/src/layout/default/components/aside/menu-item.vue index 8b0b09df3..f11816647 100644 --- a/admin/src/layout/default/components/aside/menu-item.vue +++ b/admin/src/layout/default/components/aside/menu-item.vue @@ -16,8 +16,8 @@ @@ -31,12 +31,12 @@
-
+
{{ items.name }}
-
+
{{ itemTo.name }}
@@ -53,7 +53,6 @@ import { t } from '@/lang' import { getIndexList, setIndexList } from '@/api/sys' import { useRoute, useRouter } from 'vue-router' -import { CollectionTag } from '@element-plus/icons-vue' import { ref, computed } from 'vue' import menuItem from './menu-item.vue' const router = useRouter() @@ -79,6 +78,11 @@ const checkIndexList = () => { getIndexList().then(res => { showDialog.value = true indexList.value = res.data + for(let i = 0 ; i < indexList.value.length; i ++){ + if(indexList.value[i].is_use == 1){ + index_path.value = indexList.value[i].view_path + } + } }) } @@ -106,8 +110,13 @@ const submitIndex = () => { .el-alert .el-alert__description{ margin-top: 0; } -.selected { - color: #fff; - background-color: #2C3EEF; +.index-item { + border: 1px solid; + border-color: var(--el-color-primary); + &:hover { + color: #fff; + background-color: var(--el-color-primary); + } } + diff --git a/admin/src/layout/default/components/aside/side.vue b/admin/src/layout/default/components/aside/side.vue index 46862b4aa..a492a4815 100644 --- a/admin/src/layout/default/components/aside/side.vue +++ b/admin/src/layout/default/components/aside/side.vue @@ -1,6 +1,5 @@