mirror of
https://github.com/Wei-Shaw/claude-relay-service.git
synced 2026-01-23 00:53:33 +00:00
fix: 解决Git合并冲突
- 解决ApiKeysView.vue中的合并冲突 - 解决CreateApiKeyModal.vue中的合并冲突 - 解决EditApiKeyModal.vue中的合并冲突 - 保留本地修改版本,包含更完善的功能: - Claude OAuth和Console账户分组显示 - 移动端响应式优化 - 批量创建API Key功能 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -302,15 +302,6 @@
|
||||
<option value="">
|
||||
使用共享账号池
|
||||
</option>
|
||||
<<<<<<< Updated upstream
|
||||
<option
|
||||
v-for="account in accounts.claude"
|
||||
:key="account.id"
|
||||
:value="account.id"
|
||||
>
|
||||
{{ account.name }} ({{ account.status === 'active' ? '正常' : '异常' }})
|
||||
</option>
|
||||
=======
|
||||
<optgroup
|
||||
v-if="localAccounts.claude.filter(a => a.isDedicated && a.platform === 'claude-oauth').length > 0"
|
||||
label="Claude OAuth 账号"
|
||||
@@ -335,7 +326,6 @@
|
||||
{{ account.name }} ({{ account.status === 'active' ? '正常' : '异常' }})
|
||||
</option>
|
||||
</optgroup>
|
||||
>>>>>>> Stashed changes
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
Reference in New Issue
Block a user