diff --git a/admin/.env.development b/admin/.env.development index a1db89fea..6a2b23e54 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -8,4 +8,4 @@ VITE_IMG_DOMAIN='' VITE_REQUEST_HEADER_TOKEN_KEY='token' # 请求时header中站点的参数名 -VITE_REQUEST_HEADER_SITEID_KEY='site-id' \ No newline at end of file +VITE_REQUEST_HEADER_SITEID_KEY='site-id' diff --git a/admin/.env.production b/admin/.env.production index a1db89fea..6a2b23e54 100644 --- a/admin/.env.production +++ b/admin/.env.production @@ -8,4 +8,4 @@ VITE_IMG_DOMAIN='' VITE_REQUEST_HEADER_TOKEN_KEY='token' # 请求时header中站点的参数名 -VITE_REQUEST_HEADER_SITEID_KEY='site-id' \ No newline at end of file +VITE_REQUEST_HEADER_SITEID_KEY='site-id' diff --git a/admin/components.d.ts b/admin/components.d.ts index 2d55690b8..1003b02cc 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -16,14 +16,9 @@ declare module '@vue/runtime-core' { ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] - ElCalendar: typeof import('element-plus/es')['ElCalendar'] ElCard: typeof import('element-plus/es')['ElCard'] - ElCarousel: typeof import('element-plus/es')['ElCarousel'] - ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] - ElCheckTag: typeof import('element-plus/es')['ElCheckTag'] ElCol: typeof import('element-plus/es')['ElCol'] ElCollapse: typeof import('element-plus/es')['ElCollapse'] ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] @@ -59,7 +54,6 @@ declare module '@vue/runtime-core' { ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElRate: typeof import('element-plus/es')['ElRate'] ElResult: typeof import('element-plus/es')['ElResult'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] @@ -77,7 +71,6 @@ declare module '@vue/runtime-core' { ElTag: typeof import('element-plus/es')['ElTag'] ElTimeline: typeof import('element-plus/es')['ElTimeline'] ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] - ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] diff --git a/admin/public/ueditor/ueditor.config.js b/admin/public/ueditor/ueditor.config.js index 5612c5b6d..d133471ab 100644 --- a/admin/public/ueditor/ueditor.config.js +++ b/admin/public/ueditor/ueditor.config.js @@ -108,8 +108,8 @@ "touppercase", // 字母大写 "tolowercase", // 字母小写 "|", - // "link", // 超链接 - // "unlink", // 取消链接 + "link", // 超链接 + "unlink", // 取消链接 // "anchor", // 锚点 "|", "imagenone", // 图片默认 diff --git a/admin/src/App.vue b/admin/src/App.vue index 49dd8d6ce..8976f9a20 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -35,6 +35,11 @@ onMounted(() => { // 设置主题色 toggleDark(systemStore.dark) setThemeColor(systemStore.theme, systemStore.dark ? 'dark' : 'light') + + // importIconFontCss(); + + // getIcon() + }) diff --git a/admin/src/addon/.gitignore b/admin/src/addon/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/admin/src/app/api/addon.ts b/admin/src/app/api/addon.ts index 6caf1ba39..1fd2069ff 100644 --- a/admin/src/app/api/addon.ts +++ b/admin/src/app/api/addon.ts @@ -5,7 +5,7 @@ import request from '@/utils/request' * @returns */ export function getAddonLocal(params: Record) { - return request.get('addon/local', params, { showSuccessMessage: true }) + return request.get('addon/local', params) } /** @@ -13,7 +13,7 @@ export function getAddonLocal(params: Record) { * @returns */ export function getAddonDetial(id: number) { - return request.get(`addon/${id}`) + return request.get(`addon/${ id }`) } /** @@ -22,7 +22,7 @@ export function getAddonDetial(id: number) { * @returns */ export function installAddon(params: Record) { - return request.post(`addon/install/${params.addon}`, params) + return request.post(`addon/install/${ params.addon }`, params) } /** @@ -31,7 +31,7 @@ export function installAddon(params: Record) { * @returns */ export function cloudInstallAddon(params: Record) { - return request.post(`addon/cloudinstall/${params.addon}`, params) + return request.post(`addon/cloudinstall/${ params.addon }`, params) } /** @@ -40,7 +40,7 @@ export function cloudInstallAddon(params: Record) { * @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 }) } /** @@ -49,7 +49,7 @@ export function uninstallAddon(params: Record) { * @returns */ export function preInstallCheck(addon: string) { - return request.get(`addon/install/check/${addon}`) + return request.get(`addon/install/check/${ addon }`) } /** @@ -66,7 +66,7 @@ export function getAddonInstalltask() { * @returns */ export function getAddonCloudInstallLog(addon: string) { - return request.get(`addon/cloudinstall/${addon}`) + return request.get(`addon/cloudinstall/${ addon }`) } /** @@ -75,7 +75,7 @@ export function getAddonCloudInstallLog(addon: string) { * @returns */ export function preUninstallCheck(addon: string) { - return request.get(`addon/uninstall/check/${addon}`) + return request.get(`addon/uninstall/check/${ addon }`) } /** @@ -84,7 +84,7 @@ export function preUninstallCheck(addon: string) { * @returns */ export function cancelInstall(addon: string) { - return request.put(`addon/install/cancel/${addon}`, {}, { showErrorMessage: false }) + return request.put(`addon/install/cancel/${ addon }`, {}, { showErrorMessage: false }) } export function getInstalledAddonList() { diff --git a/admin/src/app/api/notice.ts b/admin/src/app/api/notice.ts index b5e3357d5..8f1a173e3 100644 --- a/admin/src/app/api/notice.ts +++ b/admin/src/app/api/notice.ts @@ -10,15 +10,6 @@ export function getNoticeList(params: any) { return request.get('notice/notice', {params}) } -/** - * 消息详情 - * @param key - * @returns - */ -export function getNoticeInfo(key: string) { - return request.get(`notice/notice/${key}`) -} - /** * 消息发送记录 * @param params @@ -28,6 +19,15 @@ export function getNoticeLog(params: any) { return request.get(`notice/log`, {params}) } +/** + * 消息详情 + * @param key + * @returns + */ +export function getNoticeInfo(key: string) { + return request.get(`notice/notice/${key}`) +} + /** * 消息启动与关闭 * @param params diff --git a/admin/src/app/api/order.ts b/admin/src/app/api/order.ts deleted file mode 100644 index 7fdf586e5..000000000 --- a/admin/src/app/api/order.ts +++ /dev/null @@ -1,70 +0,0 @@ -import request from '@/utils/request' - -/***************************************************** 充值订单 ****************************************************/ - -/** - * 获取充值订单列表 - * @param params - * @returns - */ -export function getRechargeOrderList(params: Record) { - return request.get(`order/recharge`, {params}) -} - -/** - * 获取充值订单统计 - * @param params - * @returns - */ -export function getRechargeStat(params: Record) { - return request.get(`order/recharge/stat`, {params}) -} - -/** - * 获取充值订单详情 - * @param order_id - * @returns - */ -export function getRechargeOrderInfo(order_id: number) { - return request.get(`order/recharge/${order_id}`); -} - -/** - * 获取充值订单状态列表 - * @returns - */ -export function getRechargeOrderStatusList() { - return request.get(`order/recharge/status`) -} - -/** - * 获取退款记录 - * @returns - */ -export function getRechargeRefund(params: Record) { - return request.get(`order/recharge/refund`, {params}) -} - -/** - * 获取退款状态 - * @returns - */ -export function getRechargeRefundStatus() { - return request.get(`order/recharge/refund/status`) -} - -/** - * 充值订单发起退款 - * @returns - */ -export function rechargeRefund(id: number) { - return request.put(`order/recharge/refund/${id}`, {}, {showSuccessMessage: true}); -} - -/** - * 获取退款统计 - * @returns - */ -export function getRechargeRefundStat() { - return request.get(`order/recharge/refund/stat`); -} \ No newline at end of file diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index b25101e29..2aaaca84e 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -33,7 +33,7 @@ export function getRoleList(params: Record) { * @param roleId */ export function getRoleInfo(roleId: number) { - return request.get(`sys/role/${roleId}`) + return request.get(`sys/role/${ roleId }`) } /** @@ -50,7 +50,7 @@ export function addRole(params: Record) { * @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 }) } /** @@ -58,7 +58,7 @@ export function editRole(params: Record) { * @param roleId */ export function deleteRole(roleId: number) { - return request.delete(`sys/role/${roleId}`, { showSuccessMessage: true }) + return request.delete(`sys/role/${ roleId }`, { showSuccessMessage: true }) } /** @@ -76,7 +76,7 @@ export function allRole() { * @returns */ export function getMenus(type: string) { - return request.get(`sys/menu/${type}`) + return request.get(`sys/menu/${ type }`) } /** @@ -85,7 +85,7 @@ export function getMenus(type: string) { * @param menu_key */ export function getMenuInfo(app_type: string, menu_key: string) { - return request.get(`sys/menu/${app_type}/info/${menu_key}`); + return request.get(`sys/menu/${ app_type }/info/${ menu_key }`); } /** @@ -102,7 +102,7 @@ export function addMenu(params: Record) { * @param params */ export function editMenu(params: Record) { - return request.put(`sys/menu/${params.app_type}/${params.menu_key}`, params, { showSuccessMessage: true }) + return request.put(`sys/menu/${ params.app_type }/${ params.menu_key }`, params, { showSuccessMessage: true }) } /** @@ -111,7 +111,7 @@ export function editMenu(params: Record) { * @param menu_key */ export function deleteMenu(app_type: string, menu_key: string) { - return request.delete(`sys/menu/${app_type}/${menu_key}`, { showSuccessMessage: true }) + return request.delete(`sys/menu/${ app_type }/${ menu_key }`, { showSuccessMessage: true }) } /** @@ -127,7 +127,7 @@ export function getSystemMenu() { * */ export function getAddonMenu(key: any) { - return request.get(`sys/menu/addon_menu/${key}`) + return request.get(`sys/menu/addon_menu/${ key }`) } /** @@ -135,7 +135,7 @@ export function getAddonMenu(key: any) { * @param key */ export function getMenuByTypeDir(key: any = 'system') { - return request.get(`sys/menu/dir/${key}`) + return request.get(`sys/menu/dir/${ key }`) } /***************************************************** 站点菜单 ****************************************************/ @@ -231,7 +231,7 @@ export function addAttachmentCategory(params: Record) { * @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 }) } /** @@ -240,7 +240,7 @@ export function editAttachmentCategory(params: Record) { * @returns */ export function deleteAttachmentCategory(id: number) { - return request.delete(`sys/attachment/category/${id}`, { showSuccessMessage: true }) + return request.delete(`sys/attachment/category/${ id }`, { showSuccessMessage: true }) } /** @@ -302,6 +302,7 @@ export function getIconList(params: Record) { export function getEnv() { return request.get(`sys/env`) } + /***************************************************** 地址管理 ****************************************************/ /** @@ -309,7 +310,7 @@ export function getEnv() { * @param pid */ export function getAreaListByPid(pid: number = 0) { - return request.get(`sys/area/list_by_pid/${pid}`) + return request.get(`sys/area/list_by_pid/${ pid }`) } /** @@ -317,7 +318,7 @@ export function getAreaListByPid(pid: number = 0) { * @param level */ export function getAreatree(level: number = 1) { - return request.get(`sys/area/tree/${level}`) + return request.get(`sys/area/tree/${ level }`) } /** @@ -339,8 +340,9 @@ export function getContraryAddress(params: any) { * @param code */ export function getAreaByCode(code: number | string) { - return request.get(`sys/area/code/${code}`) + return request.get(`sys/area/code/${ code }`) } + /***************************************************** 存储设置 ****************************************************/ /** @@ -355,7 +357,7 @@ export function getStorageList() { * @param type */ export function getStorageInfo(type: string) { - return request.get(`sys/storage/${type}`) + return request.get(`sys/storage/${ type }`) } /** @@ -364,7 +366,7 @@ export function getStorageInfo(type: string) { * @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 }) } /***************************************************** 支付设置 ****************************************************/ @@ -374,7 +376,7 @@ export function editStorage(params: Record) { * @returns */ export function getPayConfig(type: string) { - return request.get(`pay/config/${type}`) + return request.get(`pay/config/${ type }`) } /** @@ -382,7 +384,7 @@ export function getPayConfig(type: string) { * @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 }); } /** @@ -399,7 +401,7 @@ export function getPayList() { * @param channel */ export function getTransferInfo(channel: string) { - return request.get(`pay/channel/lists/${channel}`) + return request.get(`pay/channel/lists/${ channel }`) } /** @@ -426,7 +428,7 @@ export function getCronList(params: any) { * @returns */ export function getCronInfo(id: string) { - return request.get(`sys/cron/${id}`); + return request.get(`sys/cron/${ id }`); } /** @@ -466,7 +468,7 @@ export function addCron(params: Record) { * @returns */ export function editCron(params: Record) { - return request.put(`sys/schedule/${params.id}`, params, { showSuccessMessage: true }) + return request.put(`sys/schedule/${ params.id }`, params, { showSuccessMessage: true }) } /** @@ -474,7 +476,7 @@ export function editCron(params: Record) { * @returns */ export function deleteCron(id: string) { - return request.delete(`sys/schedule/${id}`, { showSuccessMessage: true }) + return request.delete(`sys/schedule/${ id }`, { showSuccessMessage: true }) } /***************************************************** 协议管理 ****************************************************/ @@ -492,7 +494,7 @@ export function getAgreementList() { * @returns */ export function getAgreementInfo(key: string) { - return request.get(`sys/agreement/${key}`); + return request.get(`sys/agreement/${ key }`); } /** @@ -500,7 +502,7 @@ export function getAgreementInfo(key: string) { * @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 }) } /** @@ -602,7 +604,7 @@ export function getPayAuditList(params: Record) { * @returns */ export function payAuditPass(outTradeNo: string) { - return request.put(`pay/pass/${outTradeNo}`, {}, { showSuccessMessage: true }) + return request.put(`pay/pass/${ outTradeNo }`, {}, { showSuccessMessage: true }) } /** @@ -610,14 +612,14 @@ export function payAuditPass(outTradeNo: string) { * @returns */ export function payAuditRefuse(params: Record) { - return request.put(`pay/refuse/${params.out_trade_no}`, params, { showSuccessMessage: true }) + return request.put(`pay/refuse/${ params.out_trade_no }`, params, { showSuccessMessage: true }) } /** * 获取支付单据详情 */ export function getPayDetail(id: number) { - return request.get(`pay/detail/${id}`) + return request.get(`pay/detail/${ id }`) } /** @@ -717,7 +719,7 @@ export function getExportKeyList() { * @returns */ export function exportData(type: string, params: Record) { - return request.get(`sys/export/${type}`, { params }) + return request.get(`sys/export/${ type }`, { params }) } /** @@ -725,7 +727,7 @@ export function exportData(type: string, params: Record) { * @returns */ export function exportDataCheck(type: string, params: Record) { - return request.get(`sys/export/check/${type}`, { params }) + return request.get(`sys/export/check/${ type }`, { params }) } /** @@ -733,7 +735,7 @@ export function exportDataCheck(type: string, params: Record) { * @param id */ export function deleteExport(id: number) { - return request.delete(`sys/export/${id}`, { showSuccessMessage: true }) + return request.delete(`sys/export/${ id }`, { showSuccessMessage: true }) } /** diff --git a/admin/src/app/api/user.ts b/admin/src/app/api/user.ts index c762ad811..f751b7a36 100644 --- a/admin/src/app/api/user.ts +++ b/admin/src/app/api/user.ts @@ -19,7 +19,7 @@ export function getUserList(params: Record) { * @returns */ export function getUserInfo(uid: number) { - return request.get(`user/user/${uid}`); + return request.get(`user/user/${ uid }`); } /** @@ -31,6 +31,14 @@ export function addUser(params: Record) { return request.post('user/user', params, { showSuccessMessage: true }) } +/** + * 删除用户 + * @param uid + */ +export function deleteUser(uid: number) { + return request.delete(`user/user/${uid}`, { showSuccessMessage: true }) +} + /** * 获取所有用户列表 * @param params @@ -63,7 +71,7 @@ export function checkUsernameIsExist(username: string) { * @param uid */ export function getUserCreateSiteLimit(uid: number) { - return request.get(`user/user/create_site_limit/${uid}`) + return request.get(`user/user/create_site_limit/${ uid }`) } /** @@ -71,7 +79,7 @@ export function getUserCreateSiteLimit(uid: number) { * @param id */ export function getUserCreateSiteLimitInfo(id: number) { - return request.get(`user/user/create_site_limit/info/${id}`) + return request.get(`user/user/create_site_limit/info/${ id }`) } /** @@ -87,7 +95,7 @@ export function addUserCreateSiteLimit(params: Record) { * @param params */ export function editUserCreateSiteLimit(params: Record) { - return request.put(`user/user/create_site_limit/${params.id}`, params, { showSuccessMessage: true }) + return request.put(`user/user/create_site_limit/${ params.id }`, params, { showSuccessMessage: true }) } /** @@ -95,5 +103,5 @@ export function editUserCreateSiteLimit(params: Record) { * @param id */ export function delUserCreateSiteLimit(id: number) { - return request.delete(`user/user/create_site_limit/${id}`, { showSuccessMessage: true }) + return request.delete(`user/user/create_site_limit/${ id }`, { showSuccessMessage: true }) } diff --git a/admin/src/app/components/cloud-build/index.vue b/admin/src/app/components/cloud-build/index.vue index c14982707..00f99c789 100644 --- a/admin/src/app/components/cloud-build/index.vue +++ b/admin/src/app/components/cloud-build/index.vue @@ -109,6 +109,7 @@ const getCloudBuildLogFn = () => { if (showDialog.value && cloudBuildLog.length) { active.value = 'complete' terminalRef.value.execute('clear') + clearCloudBuildTask() } notificationEl && notificationEl.close() cloudBuildTask.value = null diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue index 14a65fcf7..a2e648f75 100644 --- a/admin/src/app/components/upgrade/index.vue +++ b/admin/src/app/components/upgrade/index.vue @@ -8,7 +8,7 @@ 本次升级将从{{ upgradeContent.version }}升级到{{ upgradeContent.upgrade_version }}版本
- + @@ -22,7 +22,7 @@
-
+
{{ t('upgrade.upgradeButton') }}
@@ -109,20 +109,17 @@ - - + + diff --git a/admin/src/app/views/setting/copyright.vue b/admin/src/app/views/setting/copyright.vue index 11895fe72..f8003e51b 100644 --- a/admin/src/app/views/setting/copyright.vue +++ b/admin/src/app/views/setting/copyright.vue @@ -68,7 +68,7 @@ const formData = reactive>({ copyright_desc: '' }) -const setFormData = async (id: number = 0) => { +const setFormData = async () => { const data = await (await getCopyright()).data Object.keys(formData).forEach((key: string) => { if (data[key] != undefined) formData[key] = data[key] diff --git a/admin/src/app/views/setting/developer_token.vue b/admin/src/app/views/setting/developer_token.vue index 26b93add2..f110b7ea5 100644 --- a/admin/src/app/views/setting/developer_token.vue +++ b/admin/src/app/views/setting/developer_token.vue @@ -32,7 +32,7 @@ const formData = ref({ getDeveloperToken().then(({ data }) => { loading.value = false data.token && (formData.value = data) -}).catch() +}) const formRef = ref() diff --git a/admin/src/app/views/setting/layout.vue b/admin/src/app/views/setting/layout.vue index 8ee615f58..b904fc3a0 100644 --- a/admin/src/app/views/setting/layout.vue +++ b/admin/src/app/views/setting/layout.vue @@ -106,7 +106,7 @@ getInstalledAddonList().then(({ data }) => { item.type == 'app' && addonList.value.push(item) }) loading.value = false -}).catch() +}) const getLayoutConfig = () => { getLayout().then(({ data }) => { diff --git a/admin/src/app/views/setting/login.vue b/admin/src/app/views/setting/login.vue index b63fb9f4e..ed79a8777 100644 --- a/admin/src/app/views/setting/login.vue +++ b/admin/src/app/views/setting/login.vue @@ -6,19 +6,19 @@

{{ t('commonSetting') }}

- -
{{ t('isUsernameTip') }}
- + +
{{ t('isUsernameTip') }}
+
{{ t('isMobileTip') }}
 - +
{{ t('isBindMobileTip') }}
 - +
{{ t('agreementTips') }}
 @@ -27,10 +27,24 @@

{{ t('tripartiteSetting') }}

- +
{{ t('isAuthRegisterTip') }}
 + + +

{{ t('loginPageSet') }}

+ +
+ +

{{ t('bgUrlPlaceholder') }}

+
+ + + + + +
@@ -47,18 +61,22 @@ import { t } from '@/lang' import { getLoginConfig, setLoginConfig } from '@/app/api/member' import { FormInstance } from 'element-plus' import { useRoute } from 'vue-router' +import { cloneDeep } from 'lodash-es' const route = useRoute() const pageName = route.meta.title const loading = ref(true) const ruleFormRef = ref() -const formData = reactive>({ +const formData:any = reactive({ is_username: 0, is_mobile: 0, is_auth_register: 0, is_bind_mobile: 0, - agreement_show: 0 + agreement_show: 0, + bg_url: '', + logo: '', + desc: '' }) const formRules = computed(() => { @@ -79,27 +97,20 @@ const formRules = computed(() => { } }) -const setFormData = async (id: number = 0) => { +const setFormData = async () => { const data = await (await getLoginConfig()).data Object.keys(formData).forEach((key: string) => { - if (data[key] != undefined) formData[key] = Boolean(Number(data[key])) + if (data[key] != undefined) formData[key] = data[key] }) loading.value = false } setFormData() -const switchChange = (val, key) => { - formData[key] = val -} - const onSave = async (formEl: FormInstance | undefined) => { if (loading.value || !formEl) return await formEl.validate((valid) => { if (valid) { - const save = JSON.parse(JSON.stringify(formData)) - Object.keys(save).forEach((key) => { - save[key] = Number(save[key]) - }) + const save = cloneDeep(formData) setLoginConfig(save).then(() => { loading.value = false diff --git a/admin/src/app/views/setting/map.vue b/admin/src/app/views/setting/map.vue index 43bf5aed9..254b96166 100644 --- a/admin/src/app/views/setting/map.vue +++ b/admin/src/app/views/setting/map.vue @@ -40,7 +40,7 @@ import { FormInstance } from 'element-plus' const loading = ref(false) const formRef = ref() -const formData = reactive>({ +const formData = reactive({ key: '', is_open: 1, valid_time: 0 diff --git a/admin/src/app/views/setting/notice.vue b/admin/src/app/views/setting/notice.vue index 2e57ed376..30df41d1a 100644 --- a/admin/src/app/views/setting/notice.vue +++ b/admin/src/app/views/setting/notice.vue @@ -46,25 +46,19 @@