From c0c4e81cf68d7c3f4a2cab152672f3be5b38fb14 Mon Sep 17 00:00:00 2001
From: zhongzm <zhongzm@agt.com>
Date: Thu, 27 Feb 2025 18:34:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A5=97=E9=A4=90=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=A5=97=E9=A4=90=E7=A6=81=E6=AD=A2=E5=8A=9E?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/langs/en-us.ts               |  3 +++
 src/locales/langs/zh-cn.ts               |  3 +++
 src/typings/api.d.ts                     |  1 +
 src/views/home/modules/header-banner.vue | 10 ++++++++--
 src/views/recharge/package/index.vue     | 22 ++++++++++++++++++++--
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 5fa0412..e0bb59f 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -564,6 +564,9 @@ const local: any = {
       uplimit:'Uplink rate',
       downlimit:'Downlink rate',
       client:'Client',
+      packageStatus:'Status',
+      active:'Active',
+      inactive:'Inactive',
       accountinfor:'Account information',
       Remainingcredit:'Balance',
       monthphonebill:'Month bill',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index fad5bba..6ba057b 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -562,6 +562,9 @@ const local:any = {
       packageinfo:'套餐信息',
       packagename:'套餐名称',
       price:'套餐费用',
+      packageStatus:'套餐状态',
+      active:'有效',
+      inactive:'无效',
       uplimit:'上行速率',
       downlimit:'下行速率',
       client:'设备数',
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index c8e247f..069ceb2 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -462,6 +462,7 @@ declare namespace Api {
       clientNumEnable:boolean;
       price:string;
       error?: any;
+      status:number;
     }
   }
 
diff --git a/src/views/home/modules/header-banner.vue b/src/views/home/modules/header-banner.vue
index 47768b3..081c1c3 100644
--- a/src/views/home/modules/header-banner.vue
+++ b/src/views/home/modules/header-banner.vue
@@ -284,7 +284,8 @@ const packageInfo = ref({
   // packageName: '',
   // price: '0.00'
   packageName: t('page.headerbanner.noPackage'),
-  price: '-'
+  price: '-',
+  status:3,
 });
 
 // 修改数据更新函数，添加套餐信息的更新
@@ -295,7 +296,8 @@ async function mockDataUpdate() {
       // 更新套餐信息
       packageInfo.value = {
         packageName: response.packageName || t('page.headerbanner.nopackage'),
-        price: response.packageName ? formatBalance(response.price) : '-'  // 有套餐时才格式化价格
+        price: response.packageName ? formatBalance(response.price) : '-',// 有套餐时才格式化价格
+        status: response.status !== undefined ? Number(response.status) : 3,//有套餐时才判断状态
       };
 
       // 更新余额和设备数据
@@ -516,6 +518,10 @@ const getDeviceCount = (subTitle?: string, clientNumEnable?: boolean): string =>
               <span class="info-label">{{ t('page.headerbanner.downlimit') }}</span>
               <span class="info-value">{{ speedLimits.downLimit }}</span>
             </div>
+            <div class="info-item">
+              <span class="info-label">{{ t('page.headerbanner.packageStatus') }}</span>
+              <span class="info-value">{{ packageInfo.status === 0 ? t('page.headerbanner.inactive') : (packageInfo.status === 1 ? t('page.headerbanner.active') : '-') }}</span>
+            </div>
           </div>
         </div>
 
diff --git a/src/views/recharge/package/index.vue b/src/views/recharge/package/index.vue
index 4ca385e..e10fbc0 100644
--- a/src/views/recharge/package/index.vue
+++ b/src/views/recharge/package/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
 import { ref, onMounted, computed } from 'vue';
-import { fetchPackageList, submitOrder } from '@/service/api/auth';
+import { fetchPackageList, submitOrder, fetchDashboardData } from '@/service/api/auth';
 import { message } from 'ant-design-vue';
 import OrderConfirmModal from '@/components/order-confirm/orderConfirmModal.vue';
 import { aliPayPcPay,aliPayWapPay, wxPayScanCode, payBalance } from '@/service/api/payment';
@@ -165,6 +165,8 @@ const canUseBalancePay = computed(() => {
 
 // 添加 loading 状态
 const paymentLoading = ref(false);
+// 添加用户状态
+const userPackageStatus = ref<number | null>(null); // 用于存储套餐状态
 
 const fetchPackages = async () => {
   isLoading.value = true;
@@ -324,8 +326,24 @@ const fetchUserBalance = async () => {
     // console.error('Failed to fetch user balance:', error);
   }
 };
+// 获取仪表盘数据
+const fetchDashboardData = async () => {
+  try {
+    const response = await authStore.getDashboardData(); // 获取仪表盘数据
+    if (response && typeof response === 'object' && !response.error) {
+      userPackageStatus.value = response.status; // 获取套餐状态
+    }
+  } catch (error) {
+    console.error('Failed to fetch dashboard data:', error);
+  }
+};
+// 计算属性，检查套餐状态
+const isPackageActive = computed(() => {
+  return userPackageStatus.value === 1; // 如果状态为 1，则套餐有效
+});
 
 onMounted(async () => {
+  fetchDashboardData();
   await fetchPackages();
   await fetchUserBalance();
 });
@@ -417,7 +435,7 @@ onMounted(async () => {
           <button
             class="btn-primary"
             @click="handleSubmitOrder"
-            :disabled="isLoading || !hasPackages"
+            :disabled="isLoading || !hasPackages || isPackageActive"
           >
             {{ isLoading ? t('page.common.loading') :
             !hasPackages ? t('page.setmeal.noPackages') :