diff --git a/model/redemption.go b/model/redemption.go index 378976a3..61003ded 100644 --- a/model/redemption.go +++ b/model/redemption.go @@ -79,9 +79,9 @@ func SearchRedemptions(keyword string, startIdx int, num int) (redemptions []*Re // Only try to convert to ID if the string represents a valid integer if id, err := strconv.Atoi(keyword); err == nil { - query = query.Where("id = ? OR name LIKE ?", id, keyword+"%") + query = query.Where("id = ? OR name LIKE ? OR "+commonKeyCol+" LIKE ?", id, keyword+"%", keyword+"%") } else { - query = query.Where("name LIKE ?", keyword+"%") + query = query.Where("name LIKE ? OR "+commonKeyCol+" LIKE ?", keyword+"%", keyword+"%") } // Get total count diff --git a/web/src/components/table/redemptions/RedemptionsFilters.jsx b/web/src/components/table/redemptions/RedemptionsFilters.jsx index 80e55126..16838965 100644 --- a/web/src/components/table/redemptions/RedemptionsFilters.jsx +++ b/web/src/components/table/redemptions/RedemptionsFilters.jsx @@ -60,7 +60,7 @@ const RedemptionsFilters = ({ } - placeholder={t('关键字(id或者名称)')} + placeholder={t('关键字(id、名称或兑换码)')} showClear pure size='small' diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json index a5e8f9dd..7e97ee1b 100644 --- a/web/src/i18n/locales/en.json +++ b/web/src/i18n/locales/en.json @@ -492,6 +492,7 @@ "关于系统的详细信息": "Detailed information about the system", "关于项目": "About Project", "关键字(id或者名称)": "Keyword (id or name)", + "关键字(id、名称或兑换码)": "Keyword (id, name or code)", "关闭": "Close", "关闭侧边栏": "Close sidebar", "关闭公告": "Close Notice", diff --git a/web/src/i18n/locales/fr.json b/web/src/i18n/locales/fr.json index eff2a74a..983c1317 100644 --- a/web/src/i18n/locales/fr.json +++ b/web/src/i18n/locales/fr.json @@ -497,6 +497,7 @@ "关于系统的详细信息": "Informations détaillées sur le système", "关于项目": "À propos du projet", "关键字(id或者名称)": "Mot-clé (id ou nom)", + "关键字(id、名称或兑换码)": "Mot-clé (id, nom ou code)", "关闭": "Fermer", "关闭侧边栏": "Fermer la barre latérale", "关闭公告": "Fermer l'avis", diff --git a/web/src/i18n/locales/ja.json b/web/src/i18n/locales/ja.json index 4e27540f..d973ddb3 100644 --- a/web/src/i18n/locales/ja.json +++ b/web/src/i18n/locales/ja.json @@ -488,6 +488,7 @@ "关于系统的详细信息": "システムの詳細情報", "关于项目": "プロジェクトについて", "关键字(id或者名称)": "キーワード(IDまたは名称)", + "关键字(id、名称或兑换码)": "キーワード(ID、名称または引換コード)", "关闭": "閉じる", "关闭侧边栏": "サイドバー折りたたみ", "关闭公告": "お知らせを閉じる", diff --git a/web/src/i18n/locales/ru.json b/web/src/i18n/locales/ru.json index 7f063e8c..a8e5fde7 100644 --- a/web/src/i18n/locales/ru.json +++ b/web/src/i18n/locales/ru.json @@ -503,6 +503,7 @@ "关于系统的详细信息": "Подробная информация о системе", "关于项目": "О проекте", "关键字(id或者名称)": "Ключевое слово (ID или имя)", + "关键字(id、名称或兑换码)": "Ключевое слово (ID, имя или код)", "关闭": "Закрыть", "关闭侧边栏": "Закрыть боковую панель", "关闭公告": "Закрыть объявление", diff --git a/web/src/i18n/locales/vi.json b/web/src/i18n/locales/vi.json index a59e5fb2..86db388f 100644 --- a/web/src/i18n/locales/vi.json +++ b/web/src/i18n/locales/vi.json @@ -489,6 +489,7 @@ "关于系统的详细信息": "Thông tin chi tiết về hệ thống", "关于项目": "Về dự án", "关键字(id或者名称)": "Từ khóa (id hoặc tên)", + "关键字(id、名称或兑换码)": "Từ khóa (id, tên hoặc mã)", "关闭": "Đóng", "关闭侧边栏": "Đóng thanh bên", "关闭公告": "Đóng thông báo", diff --git a/web/src/i18n/locales/zh-CN.json b/web/src/i18n/locales/zh-CN.json index 96dd1bb1..a88a5515 100644 --- a/web/src/i18n/locales/zh-CN.json +++ b/web/src/i18n/locales/zh-CN.json @@ -487,6 +487,7 @@ "关于系统的详细信息": "关于系统的详细信息", "关于项目": "关于项目", "关键字(id或者名称)": "关键字(id或者名称)", + "关键字(id、名称或兑换码)": "关键字(id、名称或兑换码)", "关闭": "关闭", "关闭侧边栏": "关闭侧边栏", "关闭公告": "关闭公告", diff --git a/web/src/i18n/locales/zh-TW.json b/web/src/i18n/locales/zh-TW.json index 0050eaab..d949798c 100644 --- a/web/src/i18n/locales/zh-TW.json +++ b/web/src/i18n/locales/zh-TW.json @@ -488,6 +488,7 @@ "关于系统的详细信息": "關於系統的詳細資訊", "关于项目": "關於項目", "关键字(id或者名称)": "關鍵字(id或者名稱)", + "关键字(id、名称或兑换码)": "關鍵字(id、名稱或兌換碼)", "关闭": "關閉", "关闭侧边栏": "關閉側邊欄", "关闭公告": "關閉公告",