From 533cc3b53a30cf1eeff3d6b2dfb4bad124bca846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Thu, 8 Jun 2023 18:17:58 +0800 Subject: [PATCH] update admin --- admin/src/api/order.ts | 12 +- admin/src/api/sys.ts | 15 ++ .../upload-attachment/attachment.vue | 32 ++- admin/src/components/upload-image/index.vue | 3 +- admin/src/lang/zh-cn/article.edit.json | 4 +- admin/src/lang/zh-cn/article.list.json | 2 +- admin/src/lang/zh-cn/common.json | 4 +- admin/src/lang/zh-cn/decorate.edit.json | 3 + admin/src/lang/zh-cn/diy.index.json | 5 +- ...detail.json => order.recharge.detail.json} | 0 ...echarge.json => order.recharge.order.json} | 0 ...refund.json => order.recharge.refund.json} | 0 admin/src/lang/zh-cn/setting.pay.channel.json | 4 +- .../src/lang/zh-cn/setting.pay.transfer.json | 4 +- .../layout/default/components/aside/side.vue | 63 ++++-- .../default/components/header/index.vue | 8 - .../default/components/header/switch-lang.vue | 1 + admin/src/styles/common.scss | 28 ++- admin/src/styles/iconfont.css | 18 +- admin/src/utils/common.ts | 11 - admin/src/views/article/edit.vue | 55 +++-- admin/src/views/channel/aliapp/config.vue | 16 +- admin/src/views/channel/h5/config.vue | 160 +++++++------- admin/src/views/channel/pc/config.vue | 107 ++++----- admin/src/views/channel/weapp/config.vue | 16 +- admin/src/views/channel/wechat/config.vue | 17 +- .../views/diy/components/edit-image-ads.vue | 49 ++-- admin/src/views/diy/edit.vue | 88 ++++++-- admin/src/views/diy/index.vue | 91 +++++++- admin/src/views/diy/tabbar.vue | 4 +- admin/src/views/member/balance.vue | 2 +- admin/src/views/member/member_detail.vue | 18 +- .../{finance => order}/recharge/detail.vue | 7 - .../{finance => order}/recharge/list.vue | 10 +- .../src/views/order/{ => recharge}/refund.vue | 138 ++++++------ admin/src/views/setting/adminlogin.vue | 10 +- admin/src/views/setting/agreement_edit.vue | 15 +- admin/src/views/setting/cash_out.vue | 6 + admin/src/views/setting/copyright.vue | 10 +- admin/src/views/setting/login.vue | 10 +- admin/src/views/setting/map.vue | 52 +++++ admin/src/views/setting/notice.vue | 10 +- admin/src/views/setting/system.vue | 12 +- admin/src/views/setting/transfer.vue | 12 +- admin/src/views/setting/wxoplatform.vue | 16 +- admin/src/views/site/info.vue | 22 +- admin/src/views/tools/code/edit.vue | 209 +++++++++++------- admin/src/views/tools/detection.vue | 8 +- 48 files changed, 888 insertions(+), 499 deletions(-) rename admin/src/lang/zh-cn/{finance.recharge.detail.json => order.recharge.detail.json} (100%) rename admin/src/lang/zh-cn/{finance.recharge.json => order.recharge.order.json} (100%) rename admin/src/lang/zh-cn/{finance.refund.json => order.recharge.refund.json} (100%) rename admin/src/views/{finance => order}/recharge/detail.vue (96%) rename admin/src/views/{finance => order}/recharge/list.vue (98%) rename admin/src/views/order/{ => recharge}/refund.vue (64%) create mode 100644 admin/src/views/setting/map.vue diff --git a/admin/src/api/order.ts b/admin/src/api/order.ts index 76eb1350b..5cc0201d2 100644 --- a/admin/src/api/order.ts +++ b/admin/src/api/order.ts @@ -41,16 +41,16 @@ export function getRechargeOrderStatusList() { * 获取退款记录 * @returns */ -export function getRefund(params: Record) { - return request.get(`refund/refund`, { params }) +export function getRechargeRefund(params: Record) { + return request.get(`order/recharge/refund`, { params }) } /** * 获取退款状态 * @returns */ -export function getRefundStatus() { - return request.get(`refund/status`) +export function getRechargeRefundStatus() { + return request.get(`order/recharge/refund/status`) } /** @@ -65,6 +65,6 @@ export function rechargeRefund(id: number) { * 获取退款统计 * @returns */ -export function getRefundStat() { - return request.get(`refund/stat`); +export function getRechargeRefundStat() { + return request.get(`order/recharge/refund/stat`); } \ No newline at end of file diff --git a/admin/src/api/sys.ts b/admin/src/api/sys.ts index d961867d5..6ed0283fe 100644 --- a/admin/src/api/sys.ts +++ b/admin/src/api/sys.ts @@ -466,5 +466,20 @@ export function getAppMange() { return request.get(`sys/applist`) } +/***************************************************** 地图设置 ****************************************************/ + +/** + * 设置地图key + */ +export function setMap(params: Record) { + return request.put(`sys/config/map`, params, { showSuccessMessage: true }) +} +/** + * 获取地图配置 + */ +export function getMap() { + return request.get(`sys/config/map`) +} + diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue index 4528453aa..7fb2c655f 100644 --- a/admin/src/components/upload-attachment/attachment.vue +++ b/admin/src/components/upload-attachment/attachment.vue @@ -13,12 +13,22 @@
{{item.name }}
- - - {{ t('edit') }} - - - {{ t('delete')}} + + + {{item.name}} + +
@@ -40,7 +50,6 @@ {{t('edit') }} {{ t('complete') }} - @@ -64,8 +73,8 @@
{{ item.real_name }}
- - +