diff --git a/pages/edit-profile/edit-profile.wxml b/pages/edit-profile/edit-profile.wxml
index 681a62b..261c782 100644
--- a/pages/edit-profile/edit-profile.wxml
+++ b/pages/edit-profile/edit-profile.wxml
@@ -51,7 +51,7 @@
- 年龄段
+ 年龄
@@ -93,7 +93,7 @@
- 完善资料可获得 100 爱心值
+ 完善资料赠送100爱心
diff --git a/pages/edit-profile/edit-profile.wxss b/pages/edit-profile/edit-profile.wxss
index e71231c..63f06e5 100644
--- a/pages/edit-profile/edit-profile.wxss
+++ b/pages/edit-profile/edit-profile.wxss
@@ -142,6 +142,8 @@
display: flex;
flex-direction: column;
align-items: center;
+ flex: 1; /* 占据剩余空间 */
+ justify-content: space-between; /* 上下分布 */
}
.save-btn {
@@ -155,6 +157,7 @@
border-radius: 8px;
border: none;
padding: 0;
+ margin-bottom: auto; /* 按钮靠上 */
}
.save-btn[disabled] {
@@ -163,10 +166,12 @@
}
.reward-tip {
- margin-top: 16px;
+ margin-top: 64px; /* 增加上边距,使其远离按钮 */
+ margin-bottom: 40px; /* 增加下边距,使其不贴底 */
display: flex;
align-items: center;
- gap: 4px;
- font-size: 14px;
+ gap: 6px;
+ font-size: 18px;
color: #B06AB3;
+ font-weight: 500;
}
diff --git a/pages/performance/performance.js b/pages/performance/performance.js
index 2fafce9..27fd8ac 100644
--- a/pages/performance/performance.js
+++ b/pages/performance/performance.js
@@ -190,6 +190,7 @@ Page({
userLevel: userLevel,
levelClass: levelClass,
orderAmount: record.orderAmount ? Number(record.orderAmount).toFixed(2) : (record.amount ? Number(record.amount).toFixed(2) : '0.00'),
+ commission: record.commission ? Number(record.commission).toFixed(2) : '0.00',
time: fmtTime
}
},
diff --git a/pages/performance/performance.wxml b/pages/performance/performance.wxml
index d4e7be8..a27e63a 100644
--- a/pages/performance/performance.wxml
+++ b/pages/performance/performance.wxml
@@ -52,17 +52,17 @@
- {{item.userName}}
-
- {{item.productName ? item.productName + ' · ' : ''}}
- {{item.userLevel}}
+
+ {{item.userName}}
+ ¥{{item.orderAmount}}
+
+
+ {{item.productName || '推广服务'}}
+ 收益 ¥{{item.commission}}
+
+
+ {{item.time}}
- 时间: {{item.time}}
- 单号: {{item.orderNo}}
-
-
-
- ¥{{item.orderAmount}}
diff --git a/pages/performance/performance.wxss b/pages/performance/performance.wxss
index b221069..9eef388 100644
--- a/pages/performance/performance.wxss
+++ b/pages/performance/performance.wxss
@@ -150,7 +150,13 @@
flex: 1;
display: flex;
flex-direction: column;
- gap: 4rpx;
+ gap: 12rpx;
+}
+
+.info-row {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
}
.user-name {
@@ -159,36 +165,31 @@
color: #111827;
}
-.product-info {
+.order-amount {
+ font-size: 32rpx;
+ font-weight: 900;
+ color: #B06AB3;
+}
+
+.order-time {
font-size: 24rpx;
color: #9CA3AF;
font-weight: 500;
}
-.order-no {
- font-size: 20rpx;
- color: #D1D5DB;
- font-weight: 400;
- margin-top: 4rpx;
+.commission-amount {
+ font-size: 26rpx;
+ color: #10B981; /* Green color for earnings */
+ font-weight: 700;
}
-.order-right {
- display: flex;
- flex-direction: column;
- align-items: flex-end;
- gap: 4rpx;
-}
-
-.label {
- font-size: 22rpx;
- color: #9CA3AF;
- font-weight: 600;
-}
-
-.amount {
- font-size: 34rpx;
- font-weight: 900;
- color: #B06AB3;
+.product-name {
+ font-size: 26rpx;
+ color: #4B5563;
+ font-weight: 500;
+ background: #F3F4F6;
+ padding: 4rpx 12rpx;
+ border-radius: 8rpx;
}
/* Tag Styles */
diff --git a/pages/promote/promote.wxml b/pages/promote/promote.wxml
index 6dfa079..de57541 100644
--- a/pages/promote/promote.wxml
+++ b/pages/promote/promote.wxml
@@ -109,6 +109,8 @@
+
+