From ee1a7c20d6625a7dafa827da6ba99b544c66d7df 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, 1 Jun 2023 19:31:28 +0800 Subject: [PATCH] admin --- admin/auto-imports.d.ts | 1 + admin/components.d.ts | 14 + admin/src/api/addon.ts | 4 +- admin/src/lang/zh-cn/member.detail.json | 4 +- admin/src/lang/zh-cn/site.info.json | 1 + admin/src/styles/common.scss | 30 +- admin/src/views/app/index.vue | 7 +- admin/src/views/app/store.vue | 24 +- admin/src/views/auth/menu.vue | 14 +- admin/src/views/auth/site_menu.vue | 16 +- admin/src/views/channel/weapp/template.vue | 12 +- admin/src/views/channel/wechat/template.vue | 12 +- admin/src/views/diy/edit.vue | 2 +- admin/src/views/index/index.vue | 2 +- admin/src/views/member/member_detail.vue | 473 ++++++++++---------- admin/src/views/setting/pay.vue | 8 +- admin/src/views/setting/sms.vue | 4 +- admin/src/views/setting/storage.vue | 4 +- admin/src/views/setting/transfer.vue | 11 +- admin/src/views/site/info.vue | 1 + admin/src/views/site/list.vue | 11 +- 21 files changed, 344 insertions(+), 311 deletions(-) diff --git a/admin/auto-imports.d.ts b/admin/auto-imports.d.ts index a51b7a66e..8f3c7963e 100644 --- a/admin/auto-imports.d.ts +++ b/admin/auto-imports.d.ts @@ -1,5 +1,6 @@ // Generated by 'unplugin-auto-import' export {} declare global { + const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElNotification: typeof import('element-plus/es')['ElNotification'] } diff --git a/admin/components.d.ts b/admin/components.d.ts index 7fcb7ca9a..aaa34799c 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,6 +10,7 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] + ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -17,13 +18,18 @@ declare module '@vue/runtime-core' { ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCol: typeof import('element-plus/es')['ElCol'] ElCollapse: typeof import('element-plus/es')['ElCollapse'] ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElContainer: typeof import('element-plus/es')['ElContainer'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] + ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] + ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] ElDialog: typeof import('element-plus/es')['ElDialog'] + ElDivider: typeof import('element-plus/es')['ElDivider'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] @@ -37,26 +43,34 @@ declare module '@vue/runtime-core' { ElImage: typeof import('element-plus/es')['ElImage'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElLink: typeof import('element-plus/es')['ElLink'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] + ElResult: typeof import('element-plus/es')['ElResult'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElSlider: typeof import('element-plus/es')['ElSlider'] ElStatistic: typeof import('element-plus/es')['ElStatistic'] + ElStep: typeof import('element-plus/es')['ElStep'] + ElSteps: typeof import('element-plus/es')['ElSteps'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] + ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] ElUpload: typeof import('element-plus/es')['ElUpload'] Icon: typeof import('./src/components/icon/index.vue')['default'] PopoverInput: typeof import('./src/components/popover-input/index.vue')['default'] diff --git a/admin/src/api/addon.ts b/admin/src/api/addon.ts index 5981d30f5..55048f770 100644 --- a/admin/src/api/addon.ts +++ b/admin/src/api/addon.ts @@ -22,7 +22,7 @@ export function getAddonDetial(id: number) { * @returns */ export function installAddon(params: Record) { - return request.post(`addon/install/${params.addon}`, params, { showErrorMessage: true }) + return request.post(`addon/install/${params.addon}`, params) } /** @@ -59,5 +59,5 @@ export function getAddonInstallTaskState(addon: string, key: string) { * @returns */ export function executeInstall(addon: string) { - return request.post(`addon/install/execute/${addon}`, {}, { showErrorMessage: true }) + return request.post(`addon/install/execute/${addon}`, {}) } \ No newline at end of file diff --git a/admin/src/lang/zh-cn/member.detail.json b/admin/src/lang/zh-cn/member.detail.json index 89474d170..dd5cbfa29 100644 --- a/admin/src/lang/zh-cn/member.detail.json +++ b/admin/src/lang/zh-cn/member.detail.json @@ -21,8 +21,8 @@ "sexPlaceholder": "请选择性别", "headimg": "会员头像", "wxUnionid": "微信unionid", - "weappOpenid": "微信用户openid", - "wxOpenid": "微信小程openid", + "weappOpenid": "微信公众号openid", + "wxOpenid": "微信小程序openid", "memberLabel": "会员标签", "memberLabelPlaceholder": "请选择会员标签", "nickNamePlaceholder": "请输入会员名称", diff --git a/admin/src/lang/zh-cn/site.info.json b/admin/src/lang/zh-cn/site.info.json index 7f980306f..dbda7aa92 100644 --- a/admin/src/lang/zh-cn/site.info.json +++ b/admin/src/lang/zh-cn/site.info.json @@ -23,6 +23,7 @@ "contactAddress": "联系地址", "address": "详细地址", "contactAddressPlaceholder":"联系地址", + "keywords":"关键字", "keywordsPlaceholder": "网站关键字", "logoPlaceholder": "网站Logo", "descPlaceholder": "网站简介", diff --git a/admin/src/styles/common.scss b/admin/src/styles/common.scss index 9ba031cde..876309f7f 100644 --- a/admin/src/styles/common.scss +++ b/admin/src/styles/common.scss @@ -163,4 +163,32 @@ select:-webkit-autofill { color: var(--el-text-color-placeholder); } } -} \ No newline at end of file +} + + +// 温馨提示样式 +.warm-prompt { + background-color: var(--el-color-primary-light-9) !important; + .el-icon, p { + color: var(--el-color-primary-light-3); + } + .el-alert__content{ + padding: 0; + } +} +html.dark { + .warm-prompt { + background-color: var(--el-color-primary-light-5) !important; + .el-icon, p { + color: var(--el-color-primary-dark-2); + } + } +} +.app-item { + background: #f7f7f7; +} +html.dark { + .app-item { + background: #191a23; + } +} diff --git a/admin/src/views/app/index.vue b/admin/src/views/app/index.vue index db515c90a..e4e3cdb67 100644 --- a/admin/src/views/app/index.vue +++ b/admin/src/views/app/index.vue @@ -1,5 +1,5 @@