From 4413a0296440eaa6f35773cdf93a40dfa8439801 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 03:00:19 +0000
Subject: [PATCH 1/2] chore: sync VERSION file with release v1.1.68 [skip ci]

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 470abefa..03f7611d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.67
+1.1.68

From be98d5c498a72f469a4ef6dd54d779461a5e65fc Mon Sep 17 00:00:00 2001
From: shaw <shaw-wei@foxmail.com>
Date: Mon, 4 Aug 2025 12:48:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复移动端数据路径不一致问题(usage.dailyRequests -> usage.daily.requests)
- 增强移动端会话窗口显示，添加进度百分比、时间窗口和剩余时间
- 改进会话窗口UI，使用卡片样式更清晰展示信息
- 检查确认API Keys页面无类似问题

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 web/admin-spa/src/views/AccountsView.vue | 54 +++++++++++++++---------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/web/admin-spa/src/views/AccountsView.vue b/web/admin-spa/src/views/AccountsView.vue
index c5091db1..485d4eee 100644
--- a/web/admin-spa/src/views/AccountsView.vue
+++ b/web/admin-spa/src/views/AccountsView.vue
@@ -535,10 +535,10 @@
                 今日使用
               </p>
               <p class="text-sm font-semibold text-gray-900">
-                {{ formatNumber(account.usage?.dailyRequests || 0) }} 次
+                {{ formatNumber(account.usage?.daily?.requests || 0) }} 次
               </p>
               <p class="text-xs text-gray-500 mt-0.5">
-                {{ formatNumber(account.usage?.dailyTokens || 0) }} tokens
+                {{ formatNumber(account.usage?.daily?.allTokens || 0) }} tokens
               </p>
             </div>
             <div>
@@ -546,10 +546,10 @@
                 总使用量
               </p>
               <p class="text-sm font-semibold text-gray-900">
-                {{ formatNumber(account.usage?.totalRequests || 0) }} 次
+                {{ formatNumber(account.usage?.total?.requests || 0) }} 次
               </p>
               <p class="text-xs text-gray-500 mt-0.5">
-                {{ formatNumber(account.usage?.totalTokens || 0) }} tokens
+                {{ formatNumber(account.usage?.total?.allTokens || 0) }} tokens
               </p>
             </div>
           </div>
@@ -558,25 +558,37 @@
           <div class="space-y-2 mb-3">
             <!-- 会话窗口 -->
             <div
-              v-if="account.sessionWindow"
-              class="flex items-center justify-between text-xs"
+              v-if="account.platform === 'claude' && account.sessionWindow && account.sessionWindow.hasActiveWindow"
+              class="bg-gray-50 rounded-lg p-2 space-y-1.5"
             >
-              <span class="text-gray-500">会话窗口</span>
-              <div class="flex items-center gap-2">
-                <span
-                  :class="[
-                    'font-medium',
-                    account.sessionWindow.remaining <= 20 ? 'text-orange-600' : 'text-gray-900'
-                  ]"
-                >
-                  {{ account.sessionWindow.remaining || 0 }} / {{ account.sessionWindow.total || 0 }}
+              <div class="flex items-center justify-between text-xs">
+                <span class="text-gray-600 font-medium">会话窗口</span>
+                <span class="text-gray-700 font-medium">
+                  {{ account.sessionWindow.progress }}%
+                </span>
+              </div>
+              <div class="w-full h-2 bg-gray-200 rounded-full overflow-hidden">
+                <div 
+                  class="h-full bg-gradient-to-r from-blue-500 to-indigo-600 transition-all duration-300"
+                  :style="{ width: account.sessionWindow.progress + '%' }"
+                />
+              </div>
+              <div class="flex items-center justify-between text-xs">
+                <span class="text-gray-500">
+                  {{ formatSessionWindow(account.sessionWindow.windowStart, account.sessionWindow.windowEnd) }}
+                </span>
+                <span
+                  v-if="account.sessionWindow.remainingTime > 0"
+                  class="text-indigo-600 font-medium"
+                >
+                  剩余 {{ formatRemainingTime(account.sessionWindow.remainingTime) }}
+                </span>
+                <span
+                  v-else
+                  class="text-gray-500"
+                >
+                  已结束
                 </span>
-                <div class="w-20 h-1.5 bg-gray-200 rounded-full overflow-hidden">
-                  <div 
-                    class="h-full bg-gradient-to-r from-blue-500 to-blue-600 transition-all duration-300"
-                    :style="{ width: `${getSessionWindowPercentage(account)}%` }"
-                  />
-                </div>
               </div>
             </div>