From 3d33079de00fcb3b89ddf62d3337bf4f6b824021 Mon Sep 17 00:00:00 2001 From: liuzhifei <2679431923@qq.com> Date: Fri, 20 Sep 2024 18:27:16 +0800 Subject: [PATCH] ratio must gte 0 --- common/group-ratio.go | 2 +- web/src/pages/Setting/Operation/SettingsMagnification.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/group-ratio.go b/common/group-ratio.go index e4d52fc7..9df72975 100644 --- a/common/group-ratio.go +++ b/common/group-ratio.go @@ -35,7 +35,7 @@ func GetGroupRatio(name string) float64 { func CheckGroupRatio(jsonStr string) error { checkGroupRatio := make(map[string]float64) - err := json.Unmarshal([]byte(jsonStr), &GroupRatio) + err := json.Unmarshal([]byte(jsonStr), &checkGroupRatio) if err != nil { return err } diff --git a/web/src/pages/Setting/Operation/SettingsMagnification.js b/web/src/pages/Setting/Operation/SettingsMagnification.js index 4a70f11f..3c7a3d61 100644 --- a/web/src/pages/Setting/Operation/SettingsMagnification.js +++ b/web/src/pages/Setting/Operation/SettingsMagnification.js @@ -51,14 +51,16 @@ export default function SettingsMagnification(props) { return showError('部分保存失败,请重试'); } for (let i = 0; i < res.length; i++) { - if (!res[i].success) { - return showError(res[i].message) + if (!res[i].data.success) { + return showError(res[i].data.message) } } showSuccess('保存成功'); props.refresh(); }) - .catch(() => { + .catch(error => { + console.error('Unexpected error in Promise.all:', error); + showError('保存失败,请重试'); }) .finally(() => {