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 @@