From a3fa01395b177a3c1b58a44d1c199459a56a388d Mon Sep 17 00:00:00 2001
From: speakeloudest <speakeloudest@gmail.com>
Date: Mon, 8 Sep 2025 00:00:42 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../(main)/(content)/(user)/order/page.tsx    | 22 ++++++++++---------
 .../(content)/(user)/subscribe/page.tsx       |  2 +-
 .../SubscribePlan/PlanContent/index.tsx       |  6 ++---
 apps/user/locales/en-US/subscribe.json        |  2 ++
 apps/user/locales/zh-CN/subscribe.json        |  2 ++
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/apps/user/app/(main)/(content)/(user)/order/page.tsx b/apps/user/app/(main)/(content)/(user)/order/page.tsx
index 30a2ea2..cd66856 100644
--- a/apps/user/app/(main)/(content)/(user)/order/page.tsx
+++ b/apps/user/app/(main)/(content)/(user)/order/page.tsx
@@ -65,16 +65,18 @@ export default function Page() {
                   )}
                 </div>
                 <div className={'sm:hidden'}>
-                  <AiroButton
-                    variant={'dangerLink'}
-                    className={'min-w-0 px-0'}
-                    onClick={async () => {
-                      await closeOrder({ orderNo: item.order_no });
-                      ref.current?.refresh();
-                    }}
-                  >
-                    {t('cancelOrder')}
-                  </AiroButton>
+                  {item.status === 1 ? (
+                    <AiroButton
+                      variant={'dangerLink'}
+                      className={'min-w-0 px-0'}
+                      onClick={async () => {
+                        await closeOrder({ orderNo: item.order_no });
+                        ref.current?.refresh();
+                      }}
+                    >
+                      {t('cancelOrder')}
+                    </AiroButton>
+                  ) : null}
                 </div>
               </div>
               <CardContent className='px-0 py-3 pb-0 text-sm'>
diff --git a/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx b/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx
index 0c2defd..01f1a1b 100644
--- a/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx
+++ b/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx
@@ -22,7 +22,7 @@ export default function Page() {
     queryKey: ['querySubscribeList'],
     queryFn: async () => {
       const { data } = await querySubscribeList();
-      return data.data?.list?.filter((v) => v.unit_time === 'Month') || [];
+      return data?.data?.list?.filter((v) => v.unit_time === 'Month') || [];
     },
   });
 
diff --git a/apps/user/components/SubscribePlan/PlanContent/index.tsx b/apps/user/components/SubscribePlan/PlanContent/index.tsx
index d9c91f4..1409f00 100644
--- a/apps/user/components/SubscribePlan/PlanContent/index.tsx
+++ b/apps/user/components/SubscribePlan/PlanContent/index.tsx
@@ -149,10 +149,10 @@ const FeatureList = ({ plan }: { plan: API.Subscribe }) => {
           <div className={'flex items-start justify-between'}>
             <span className='flex items-center'>
               <SvgIcon name={'feature/Group 69'} className={'ml-1 mr-2'} />
-              {plan?.name?.includes('pro') ? (
-                <span className={'font-medium'}>IEPL专线</span>
+              {plan?.name?.includes('Pro') ? (
+                <span className={'font-medium'}>{t('IEPL_Pro')}</span>
               ) : (
-                <span>国内中转+专线中转</span>
+                <span>{t('General_Line')}</span>
               )}
             </span>
           </div>
diff --git a/apps/user/locales/en-US/subscribe.json b/apps/user/locales/en-US/subscribe.json
index 6cbac7f..09fb9dd 100644
--- a/apps/user/locales/en-US/subscribe.json
+++ b/apps/user/locales/en-US/subscribe.json
@@ -24,6 +24,8 @@
   "coupon": "Coupon",
   "description": "Choose the service plan that suits you best",
   "detail": {
+    "IEPL_Pro": "IEPL Dedicated Line",
+    "General_Line": "Domestic Relay + Dedicated Line Relay",
     "availableTraffic": "Available Traffic",
     "connectedDevices": "Connected Devices",
     "connectionSpeed": "Connection Speed",
diff --git a/apps/user/locales/zh-CN/subscribe.json b/apps/user/locales/zh-CN/subscribe.json
index 9c4d22f..e57fd2e 100644
--- a/apps/user/locales/zh-CN/subscribe.json
+++ b/apps/user/locales/zh-CN/subscribe.json
@@ -24,6 +24,8 @@
   "coupon": "优惠券",
   "description": "选择最适合您的服务套餐",
   "detail": {
+    "IEPL_Pro": "IEPL专线",
+    "General_Line": "国内中转+专线中转",
     "availableTraffic": "可用流量",
     "connectedDevices": "同时连接 IP 数",
     "connectionSpeed": "连接速度",