github/sub2api
4
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-11-02 08:31:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge main 并修复与 #5730 的语义冲突

Browse Source 
main 侧 #5730 新增的 openai_gateway_cn_fixes_test.go 按旧 11 参签名调用
calculateOpenAIRecordUsageCost；本分支为该函数新增了第 12 个参数
pricingAt。文本无冲突但 test build 会失败，此处按本分支对同类测试
调用点的既有处理方式补传 time.Time{}。
This commit is contained in:
shaw
2026-08-17 22:27:22 +08:00
parent 9f24a55305 ab28a2d10b
commit 6bf335965a
20 changed files with 551 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/admin/GroupsView.vue
+20 -2
View File
@@ -146,7 +146,13 @@
? 'bg-purple-100 text-purple-700 dark:bg-purple-900/30 dark:text-purple-400'
: value === 'grok'
? 'bg-zinc-200 text-zinc-800 dark:bg-zinc-700 dark:text-zinc-100'
: 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400',
: value === 'kimi'
? 'bg-pink-100 text-pink-700 dark:bg-pink-900/30 dark:text-pink-400'
: value === 'zhipu'
? 'bg-indigo-100 text-indigo-700 dark:bg-indigo-900/30 dark:text-indigo-400'
: value === 'deepseek'
? 'bg-teal-100 text-teal-700 dark:bg-teal-900/30 dark:text-teal-400'
: 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400',
]"
>
<PlatformIcon :platform="value" size="xs" />
@@ -3965,7 +3971,13 @@
? 'bg-purple-100 text-purple-700 dark:bg-purple-900/30 dark:text-purple-400'
: group.platform === 'grok'
? 'bg-zinc-200 text-zinc-800 dark:bg-zinc-700 dark:text-zinc-100'
: 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400',
: group.platform === 'kimi'
? 'bg-pink-100 text-pink-700 dark:bg-pink-900/30 dark:text-pink-400'
: group.platform === 'zhipu'
? 'bg-indigo-100 text-indigo-700 dark:bg-indigo-900/30 dark:text-indigo-400'
: group.platform === 'deepseek'
? 'bg-teal-100 text-teal-700 dark:bg-teal-900/30 dark:text-teal-400'
: 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400',
]"
>
{{ t("admin.groups.platforms." + group.platform) }}
@@ -4731,6 +4743,9 @@ const platformOptions = computed(() => [
{ value: "gemini", label: "Gemini" },
{ value: "antigravity", label: "Antigravity" },
{ value: "grok", label: "Grok" },
{ value: "kimi", label: "Kimi" },
{ value: "zhipu", label: "Zhipu GLM" },
{ value: "deepseek", label: "DeepSeek" },
{ value: "composite", label: "Composite" },
]);
@@ -4741,6 +4756,9 @@ const platformFilterOptions = computed(() => [
{ value: "gemini", label: "Gemini" },
{ value: "antigravity", label: "Antigravity" },
{ value: "grok", label: "Grok" },
{ value: "kimi", label: "Kimi" },
{ value: "zhipu", label: "Zhipu GLM" },
{ value: "deepseek", label: "DeepSeek" },
{ value: "composite", label: "Composite" },
]);