From e5c4340a09ac0d00b3ddfea7e4373acddbf7fa09 Mon Sep 17 00:00:00 2001 From: echobool Date: Fri, 17 Nov 2023 00:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=A2=9E=E5=8A=A0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE=20=20=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=20=E4=BD=99=E9=A2=9D=E6=98=8E=E7=BB=86=20?= =?UTF-8?q?=20=E9=80=80=E6=AC=BE=E8=AE=B0=E5=BD=95=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=BE=E7=BD=AE=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/api/app/recharge.ts | 10 + admin/src/api/channel/open_setting.ts | 11 + admin/src/api/finance.ts | 41 ++ admin/src/api/setting/pay.ts | 26 + admin/src/api/setting/user.ts | 2 +- admin/src/components/material/hook.ts | 16 +- admin/src/components/material/index.vue | 253 ++------ admin/src/components/material/picker.vue | 77 +-- admin/src/hooks/usePaging.ts | 3 +- admin/src/router/index.ts | 2 + admin/src/views/app/recharge/index.vue | 49 ++ admin/src/views/channel/h5.vue | 28 +- admin/src/views/channel/open_setting.vue | 75 +++ admin/src/views/channel/weapp.vue | 135 ++-- admin/src/views/channel/wx_dev.vue | 62 -- admin/src/views/channel/wx_oa/config.vue | 126 ++-- admin/src/views/channel/wx_oa/menu.vue | 6 +- .../views/channel/wx_oa/menu_com/oa-attr.vue | 27 +- .../wx_oa/menu_com/oa-menu-form-edit.vue | 12 +- .../channel/wx_oa/menu_com/oa-menu-form.vue | 15 +- .../views/channel/wx_oa/menu_com/oa-phone.vue | 6 +- .../views/channel/wx_oa/menu_com/useMenuOa.ts | 25 +- .../channel/wx_oa/reply/default_reply.vue | 39 +- admin/src/views/channel/wx_oa/reply/edit.vue | 62 +- .../channel/wx_oa/reply/follow_reply.vue | 41 +- .../channel/wx_oa/reply/keyword_reply.vue | 43 +- admin/src/views/consumer/lists/detail.vue | 18 +- admin/src/views/finance/balance_details.vue | 82 +++ .../views/finance/component/refund-log.vue | 68 ++ admin/src/views/finance/recharge_record.vue | 108 ++++ admin/src/views/finance/refund_record.vue | 191 ++++++ admin/src/views/message/notice/edit.vue | 70 ++- admin/src/views/message/notice/index.vue | 88 +-- admin/src/views/message/short_letter/edit.vue | 11 +- .../src/views/message/short_letter/index.vue | 7 +- admin/src/views/permission/admin/edit.vue | 7 +- admin/src/views/setting/pay/config/edit.vue | 253 ++++++++ admin/src/views/setting/pay/config/index.vue | 51 ++ admin/src/views/setting/pay/method/index.vue | 119 ++++ admin/src/views/setting/storage/edit.vue | 69 +-- admin/src/views/setting/storage/index.vue | 71 ++- .../src/views/setting/user/login_register.vue | 33 +- admin/src/views/setting/user/setup.vue | 6 +- admin/src/views/user/setting.vue | 32 +- server/admin/routers/enter.go | 12 + server/admin/routers/finance/accountLog.go | 50 ++ server/admin/routers/finance/recharge.go | 55 ++ server/admin/routers/finance/refundRecord.go | 63 ++ server/admin/routers/setting/login.go | 41 ++ server/admin/routers/setting/notice.go | 64 ++ server/admin/routers/setting/pay.go | 72 +++ server/admin/routers/setting/recharge.go | 44 ++ server/admin/routers/setting/sms.go | 56 ++ server/admin/routers/setting/storage.go | 10 +- server/admin/routers/setting/user.go | 43 ++ server/admin/schemas/req/finance.go | 40 ++ server/admin/schemas/req/setting.go | 155 ++++- server/admin/schemas/resp/finance.go | 105 ++++ server/admin/schemas/resp/setting.go | 91 ++- server/admin/schemas/resp/system.go | 35 +- server/admin/service/enter.go | 13 + server/admin/service/finance/accountLog.go | 88 +++ server/admin/service/finance/recharge.go | 218 +++++++ server/admin/service/finance/refundLog.go | 71 +++ server/admin/service/finance/refundRecord.go | 147 +++++ server/admin/service/setting/login.go | 54 ++ server/admin/service/setting/notice.go | 109 ++++ server/admin/service/setting/pay.go | 177 ++++++ server/admin/service/setting/recharge.go | 60 ++ server/admin/service/setting/sms.go | 97 +++ server/admin/service/setting/storage.go | 138 +++-- server/admin/service/setting/user.go | 48 ++ server/admin/service/system/admin.go | 27 +- server/admin/service/system/user.go | 42 +- server/config/config.go | 6 +- .../accountLog.go => constant/finance.go} | 47 +- server/dao/gen.go | 76 ++- server/dao/la_notice_setting.gen.go | 424 +++++++++++++ server/dao/la_recharge_order.gen.go | 518 ++++++++++++++++ server/dao/la_refund_log.gen.go | 498 +++++++++++++++ server/dao/la_refund_record.gen.go | 514 ++++++++++++++++ server/dao/la_system_auth_admin.gen.go | 448 ++++++++++++++ server/dao/la_user.gen.go | 12 +- server/dao/la_user_account_log.gen.go | 86 ++- server/generator/constants.go | 12 +- .../generator/templates/gocode/route.go.tpl | 20 +- .../generator/templates/gocode/schema.go.tpl | 12 +- .../generator/templates/gocode/service.go.tpl | 69 ++- server/model/la_notice_setting.gen.go | 28 + server/model/la_recharge_order.gen.go | 33 + server/model/la_refund_log.gen.go | 28 + server/model/la_refund_record.gen.go | 32 + server/model/la_system_auth_admin.gen.go | 34 + server/model/la_user.gen.go | 4 +- server/model/la_user_account_log.gen.go | 27 +- server/static/default_avatar.png | Bin 0 -> 35634 bytes .../04706cf14a6e4161bac53822de1f166e.jpeg | Bin 0 -> 44356 bytes .../0a8143ea83244c74a6c456786a792988.png | Bin 0 -> 68390 bytes .../9678a22c7c4b40669354b5d88347c465.png | Bin 0 -> 193510 bytes .../e10e78f505a2403488b41b57a6e34777.jpeg | Bin 0 -> 9416 bytes .../7761e1fad64d4d849e476d35679797c7.png | Bin 0 -> 10830 bytes .../7b289c2c902d45dda676044d6cd14439.png | Bin 0 -> 193510 bytes .../c88ec3f53dd0425899682e56b11002d5.png | Bin 0 -> 193510 bytes .../1022529df4d34afcb34d8624db3202ed.png | Bin 0 -> 2424 bytes .../872472ee657a4a4f9ae8aace06961b8d.png | Bin 0 -> 154496 bytes .../a3f22d1b805c43d483e063399c846c40.png | Bin 0 -> 3204 bytes .../dd2adfb1df364ec4ba2483297aead3e0.png | Bin 0 -> 166065 bytes .../e037db90197c4a9a9a911ea7d75db690.png | Bin 0 -> 4362 bytes .../f15d9858074e4aa5ac99536f0c45a285.png | Bin 0 -> 3491 bytes .../f2b1e19d6e22463abfb161f1d87544fb.png | Bin 0 -> 6483 bytes server/tool/gormgen.go | 34 +- server/util/config.go | 17 +- server/util/setting.go | 56 ++ server/util/url.go | 8 +- sql/byteadmin.sql | 582 ++++++++++++++---- 115 files changed, 7128 insertions(+), 1198 deletions(-) create mode 100644 admin/src/api/app/recharge.ts create mode 100644 admin/src/api/channel/open_setting.ts create mode 100644 admin/src/api/finance.ts create mode 100644 admin/src/api/setting/pay.ts create mode 100644 admin/src/views/app/recharge/index.vue create mode 100644 admin/src/views/channel/open_setting.vue delete mode 100644 admin/src/views/channel/wx_dev.vue create mode 100644 admin/src/views/finance/balance_details.vue create mode 100644 admin/src/views/finance/component/refund-log.vue create mode 100644 admin/src/views/finance/recharge_record.vue create mode 100644 admin/src/views/finance/refund_record.vue create mode 100644 admin/src/views/setting/pay/config/edit.vue create mode 100644 admin/src/views/setting/pay/config/index.vue create mode 100644 admin/src/views/setting/pay/method/index.vue create mode 100644 server/admin/routers/finance/accountLog.go create mode 100644 server/admin/routers/finance/recharge.go create mode 100644 server/admin/routers/finance/refundRecord.go create mode 100644 server/admin/routers/setting/login.go create mode 100644 server/admin/routers/setting/notice.go create mode 100644 server/admin/routers/setting/pay.go create mode 100644 server/admin/routers/setting/recharge.go create mode 100644 server/admin/routers/setting/sms.go create mode 100644 server/admin/routers/setting/user.go create mode 100644 server/admin/schemas/req/finance.go create mode 100644 server/admin/schemas/resp/finance.go create mode 100644 server/admin/service/finance/accountLog.go create mode 100644 server/admin/service/finance/recharge.go create mode 100644 server/admin/service/finance/refundLog.go create mode 100644 server/admin/service/finance/refundRecord.go create mode 100644 server/admin/service/setting/login.go create mode 100644 server/admin/service/setting/notice.go create mode 100644 server/admin/service/setting/pay.go create mode 100644 server/admin/service/setting/recharge.go create mode 100644 server/admin/service/setting/sms.go create mode 100644 server/admin/service/setting/user.go rename server/{enum/accountLog.go => constant/finance.go} (52%) create mode 100644 server/dao/la_notice_setting.gen.go create mode 100644 server/dao/la_recharge_order.gen.go create mode 100644 server/dao/la_refund_log.gen.go create mode 100644 server/dao/la_refund_record.gen.go create mode 100644 server/dao/la_system_auth_admin.gen.go create mode 100644 server/model/la_notice_setting.gen.go create mode 100644 server/model/la_recharge_order.gen.go create mode 100644 server/model/la_refund_log.gen.go create mode 100644 server/model/la_refund_record.gen.go create mode 100644 server/model/la_system_auth_admin.gen.go create mode 100644 server/static/default_avatar.png create mode 100644 server/static/uploads/image/20230711/04706cf14a6e4161bac53822de1f166e.jpeg create mode 100644 server/static/uploads/image/20230711/0a8143ea83244c74a6c456786a792988.png create mode 100644 server/static/uploads/image/20230711/9678a22c7c4b40669354b5d88347c465.png create mode 100644 server/static/uploads/image/20230711/e10e78f505a2403488b41b57a6e34777.jpeg create mode 100644 server/static/uploads/image/20230911/7761e1fad64d4d849e476d35679797c7.png create mode 100644 server/static/uploads/image/20230911/7b289c2c902d45dda676044d6cd14439.png create mode 100644 server/static/uploads/image/20230911/c88ec3f53dd0425899682e56b11002d5.png create mode 100644 server/static/uploads/image/20231611/1022529df4d34afcb34d8624db3202ed.png create mode 100644 server/static/uploads/image/20231611/872472ee657a4a4f9ae8aace06961b8d.png create mode 100644 server/static/uploads/image/20231611/a3f22d1b805c43d483e063399c846c40.png create mode 100644 server/static/uploads/image/20231611/dd2adfb1df364ec4ba2483297aead3e0.png create mode 100644 server/static/uploads/image/20231611/e037db90197c4a9a9a911ea7d75db690.png create mode 100644 server/static/uploads/image/20231611/f15d9858074e4aa5ac99536f0c45a285.png create mode 100644 server/static/uploads/image/20231611/f2b1e19d6e22463abfb161f1d87544fb.png create mode 100644 server/util/setting.go diff --git a/admin/src/api/app/recharge.ts b/admin/src/api/app/recharge.ts new file mode 100644 index 0000000..c9fe92b --- /dev/null +++ b/admin/src/api/app/recharge.ts @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +export function getRechargeConfig() { + return request.get({ url: '/setting/recharge/get' }) +} + +// 设置 +export function setRechargeConfig(params: any) { + return request.post({ url: '/setting/recharge/set', params }) +} diff --git a/admin/src/api/channel/open_setting.ts b/admin/src/api/channel/open_setting.ts new file mode 100644 index 0000000..51a6ece --- /dev/null +++ b/admin/src/api/channel/open_setting.ts @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +// 微信开发平台配置保存 +export function setOpenSettingConfig(params: any) { + return request.post({ url: '/channel.open_setting/setConfig', params }) +} + +// 微信开发平台配置详情 +export function getOpenSettingConfig() { + return request.get({ url: '/channel.open_setting/getConfig' }) +} diff --git a/admin/src/api/finance.ts b/admin/src/api/finance.ts new file mode 100644 index 0000000..d5176b9 --- /dev/null +++ b/admin/src/api/finance.ts @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +// 余额明细 +export function accountLog(params?: any) { + return request.get({ url: '/finance/account_log/lists', params }) +} + +// 充值记录 +export function rechargeLists(params?: any) { + return request.get({ url: '/finance/recharge/lists', params }, { ignoreCancelToken: true }) +} + +// 余额变动类型 +export function getUmChangeType(params?: any) { + return request.get({ url: '/finance/account_log/getUmChangeType', params }) +} + +//退款 +export function refund(params?: any) { + return request.post({ url: '/finance/recharge/refund', params }) +} + +//重新退款 +export function refundAgain(params?: any) { + return request.post({ url: '/finance/recharge/refundAgain', params }) +} + +//退款记录 +export function refundRecord(params?: any) { + return request.get({ url: '/finance/refund/record/list', params }) +} + +//退款日志 +export function refundLog(params?: any) { + return request.get({ url: '/finance/refund/log', params }) +} + +//退款统计 +export function refundStat(params?: any) { + return request.get({ url: '/finance/refund/record/stat', params }) +} diff --git a/admin/src/api/setting/pay.ts b/admin/src/api/setting/pay.ts new file mode 100644 index 0000000..445e66c --- /dev/null +++ b/admin/src/api/setting/pay.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 获取支付方式 +export function getPayWay() { + return request.get({ url: '/setting/pay/way/get' }) +} + +// 设置支付方式 +export function setPayWay(params: any) { + return request.post({ url: '/setting/pay/way/set', params }) +} + +// 获取支付方式 +export function getPayConfigLists() { + return request.get({ url: '/setting/pay/config/lists' }) +} + +// 设置支付方式 +export function setPayConfig(params: any) { + return request.post({ url: '/setting/pay/config/set', params }) +} + +// 设置支付方式 +export function getPayConfig(params: any) { + return request.get({ url: '/setting/pay/config/get', params }) +} diff --git a/admin/src/api/setting/user.ts b/admin/src/api/setting/user.ts index 946f4b0..144fb75 100644 --- a/admin/src/api/setting/user.ts +++ b/admin/src/api/setting/user.ts @@ -13,7 +13,7 @@ export function getUserSetup() { * @param { string } defaultAvatar 默认用户头像 * @description 设置用户设置 */ -export function setUserSetup(params: { defaultAvatar: string }) { +export function setUserSetup(params: { default_avatar: string }) { return request.post({ url: '/setting/user/save', params }) } diff --git a/admin/src/components/material/hook.ts b/admin/src/components/material/hook.ts index e490c9a..05615c6 100644 --- a/admin/src/components/material/hook.ts +++ b/admin/src/components/material/hook.ts @@ -28,14 +28,14 @@ export function useCate(type: number) { type }) const item: any[] = [ - // { - // name: '全部', - // id: '' - // }, - // { - // name: '未分组', - // id: 0 - // } + { + name: '全部', + id: '' + }, + { + name: '未分组', + id: 0 + } ] cateLists.value = data cateLists.value.unshift(...item) diff --git a/admin/src/components/material/index.vue b/admin/src/components/material/index.vue index 2a24ac9..ece4726 100644 --- a/admin/src/components/material/index.vue +++ b/admin/src/components/material/index.vue @@ -4,56 +4,31 @@
- +