From c5c22224cf9c958eb69c786b5a3cad62053c2fdc Mon Sep 17 00:00:00 2001
From: Gsh <15170702455@163.com>
Date: Wed, 15 Oct 2025 23:43:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=202.0=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Ai.Vue3/index.html                                      | 2 +-
 Yi.Ai.Vue3/src/api/pay/index.ts                            | 1 +
 Yi.Ai.Vue3/src/components/ProductPackage/index.vue         | 5 ++++-
 .../userPersonalCenter/components/RechargeLog.vue          | 3 ---
 .../src/layouts/components/Header/components/Avatar.vue    | 2 ++
 Yi.Ai.Vue3/src/pages/payResult/index.vue                   | 7 ++++---
 Yi.Ai.Vue3/types/components.d.ts                           | 2 --
 Yi.Ai.Vue3/types/import_meta.d.ts                          | 1 +
 8 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Yi.Ai.Vue3/index.html b/Yi.Ai.Vue3/index.html
index eb48f78d..5c1b414b 100644
--- a/Yi.Ai.Vue3/index.html
+++ b/Yi.Ai.Vue3/index.html
@@ -112,7 +112,7 @@
 <body>
 <!-- 加载动画容器 -->
 <div id="yixinai-loader" class="loader-container">
-  <div class="loader-title">意心Ai</div>
+  <div class="loader-title">意心Ai 2.0</div>
   <div class="loader-subtitle">海外地址，仅首次访问预计加载约10秒</div>
   <div class="loader-logo">
     <div class="pulse-box"></div>
diff --git a/Yi.Ai.Vue3/src/api/pay/index.ts b/Yi.Ai.Vue3/src/api/pay/index.ts
index 38bd8f10..92494e6a 100644
--- a/Yi.Ai.Vue3/src/api/pay/index.ts
+++ b/Yi.Ai.Vue3/src/api/pay/index.ts
@@ -16,6 +16,7 @@ export interface GoodsItem {
   goodsCategory: string; // 商品分类
   remark: string | null; // 备注（标签）
   discountDescription: string | null; // 折扣描述
+  goodsType: string | null; // 折扣描述
 }
 
 // 获取商品列表
diff --git a/Yi.Ai.Vue3/src/components/ProductPackage/index.vue b/Yi.Ai.Vue3/src/components/ProductPackage/index.vue
index 5b4f5538..0d518531 100644
--- a/Yi.Ai.Vue3/src/components/ProductPackage/index.vue
+++ b/Yi.Ai.Vue3/src/components/ProductPackage/index.vue
@@ -24,6 +24,7 @@ interface PackageItem {
   discount: string; // 累计优惠描述，如"根据累加充值已优惠 ¥47.00"
   goodsName: string; // 用于创建订单
   discountAmount?: number; // 优惠金额（从discount字段解析）
+  goodsType?: any; // 商品枚举
 }
 
 // 商品数据（从接口获取）
@@ -73,6 +74,7 @@ async function fetchGoodsList() {
       tag: item.remark || '',
       discount: item.discountDescription || '',
       goodsName: item.goodsName,
+      goodsType: item.goodsType,
     }));
 
     // 转换Token商品数据（字段含义保持原定义）
@@ -95,6 +97,7 @@ async function fetchGoodsList() {
         tag: item.remark || '',
         discount: item.discountDescription || '',
         goodsName: item.goodsName,
+        goodsType: item.goodsType,
         discountAmount,
       };
     });
@@ -229,7 +232,7 @@ async function pay() {
   try {
     const returnUrl = `${window.location.origin}/pay-result`;
     const params = {
-      goodsName: selectPackageObject.value.goodsName,
+      GoodsType: selectPackageObject.value.goodsType,
       ReturnUrl: returnUrl,
     };
 
diff --git a/Yi.Ai.Vue3/src/components/userPersonalCenter/components/RechargeLog.vue b/Yi.Ai.Vue3/src/components/userPersonalCenter/components/RechargeLog.vue
index 787c4dfb..05b428d5 100644
--- a/Yi.Ai.Vue3/src/components/userPersonalCenter/components/RechargeLog.vue
+++ b/Yi.Ai.Vue3/src/components/userPersonalCenter/components/RechargeLog.vue
@@ -466,8 +466,6 @@ onMounted(() => {
 :deep(.el-table th) {
   background-color: #f8fafc;
   color: #333;
-  //background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  //color: white;
   font-weight: 600;
   font-size: 14px;
   padding: 8px 0;
@@ -475,7 +473,6 @@ onMounted(() => {
 }
 
 :deep(.el-table th .cell) {
-  //color: white;
 }
 
 :deep(.el-table--striped .el-table__body tr.el-table__row--striped td) {
diff --git a/Yi.Ai.Vue3/src/layouts/components/Header/components/Avatar.vue b/Yi.Ai.Vue3/src/layouts/components/Header/components/Avatar.vue
index 92208fca..9ed64ca7 100644
--- a/Yi.Ai.Vue3/src/layouts/components/Header/components/Avatar.vue
+++ b/Yi.Ai.Vue3/src/layouts/components/Header/components/Avatar.vue
@@ -1,5 +1,6 @@
 <!-- 头像 -->
 <script setup lang="ts">
+import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 import Popover from '@/components/Popover/index.vue';
 import SvgIcon from '@/components/SvgIcon/index.vue';
@@ -57,6 +58,7 @@ const popoverList = ref([
 ]);
 
 const dialogVisible = ref(false);
+
 const navItems = [
   { name: 'user', label: '用户信息', icon: 'User' },
   // { name: 'role', label: '角色管理', icon: 'Avatar' },
diff --git a/Yi.Ai.Vue3/src/pages/payResult/index.vue b/Yi.Ai.Vue3/src/pages/payResult/index.vue
index dab9c54c..531e1e89 100644
--- a/Yi.Ai.Vue3/src/pages/payResult/index.vue
+++ b/Yi.Ai.Vue3/src/pages/payResult/index.vue
@@ -170,7 +170,8 @@ function contactCustomerService() {
         🎉 恭喜！
       </h1>
       <p class="text-xl font-semibold mb-6">
-        您已成为尊贵的 <span class="text-orange-500">YixinAI VIP</span>
+        您已充值成功
+        <!--        您已成为尊贵的 <span class="text-orange-500">YixinAI VIP</span> -->
       </p>
 
       <!-- 订单信息卡片 -->
@@ -244,8 +245,8 @@ function contactCustomerService() {
     append-to-body
   >
     <h3 class="text-lg font-bold mb-3">
-        请扫码加入微信交流群<br>
-        备注ai获取专属客服支持
+      请扫码加入微信交流群<br>
+      备注ai获取专属客服支持
     </h3>
     <div class="py-10 flex items-center justify-center space-x-2">
       <span class="font-semibold">站长微信账号：</span>
diff --git a/Yi.Ai.Vue3/types/components.d.ts b/Yi.Ai.Vue3/types/components.d.ts
index 54ebc259..3b634da7 100644
--- a/Yi.Ai.Vue3/types/components.d.ts
+++ b/Yi.Ai.Vue3/types/components.d.ts
@@ -19,8 +19,6 @@ declare module 'vue' {
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElContainer: typeof import('element-plus/es')['ElContainer']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
diff --git a/Yi.Ai.Vue3/types/import_meta.d.ts b/Yi.Ai.Vue3/types/import_meta.d.ts
index b3e9d275..d8a60d41 100644
--- a/Yi.Ai.Vue3/types/import_meta.d.ts
+++ b/Yi.Ai.Vue3/types/import_meta.d.ts
@@ -6,6 +6,7 @@ interface ImportMetaEnv {
   readonly VITE_WEB_ENV: string;
   readonly VITE_WEB_BASE_API: string;
   readonly VITE_API_URL: string;
+  readonly VITE_BUILD_COMPRESS: string;
   readonly VITE_SSO_SEVER_URL: string;
   readonly VITE_APP_VERSION: string;
 }
