From 036eb3a206cb0dd6e715622b8879cae06138bef2 Mon Sep 17 00:00:00 2001
From: "wenqi.peng" <1647700520@qq.com>
Date: Wed, 31 Dec 2025 11:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D/=E7=BC=B4=E8=B4=B9=E8=AE=B0=E5=BD=95/=E6=B0=B4?=
=?UTF-8?q?=E7=94=B5=E8=B4=B9=E6=98=8E=E7=BB=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/bottom/assetBottomBar.vue | 10 +-
pages.json | 2 +-
pages/bill/bill.vue | 596 +++++++++++++--------------
pages/bill/payHistory.vue | 469 +++++++++++++--------
pages/center/center.vue | 88 ++--
pages/detail/assetsDetail.vue | 4 +
pages/notice/notice.vue | 2 +-
pages/wae/waeRecords.vue | 33 +-
static/center-selected.png | Bin 5614 -> 7524 bytes
static/center.png | Bin 5851 -> 3798 bytes
static/icon/水费.png | Bin 0 -> 2762 bytes
static/icon/电费.png | Bin 0 -> 4289 bytes
static/index-selected.png | Bin 4953 -> 4938 bytes
static/index.png | Bin 5156 -> 4908 bytes
14 files changed, 648 insertions(+), 556 deletions(-)
create mode 100644 static/icon/水费.png
create mode 100644 static/icon/电费.png
diff --git a/components/bottom/assetBottomBar.vue b/components/bottom/assetBottomBar.vue
index b9afe14..4dfc14f 100644
--- a/components/bottom/assetBottomBar.vue
+++ b/components/bottom/assetBottomBar.vue
@@ -97,21 +97,21 @@ export default {
flex-shrink: 0;
width: 340rpx;
height: 88rpx;
- border: 2rpx solid #007aff;
+ border: 2rpx solid #FF2F31;
border-radius: 44rpx;
background-color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
- color: #007aff;
+ color: #FF2F31;
font-size: 30rpx;
font-weight: 500;
transition: all 0.2s;
}
.main-btn:active {
background-color: #e6f0ff;
- border-color: #0066d8;
- color: #0066d8;
+ border-color: #FF2F31;
+ color: #FF2F31;
}
/* 内部内容居中控制 */
@@ -127,6 +127,6 @@ export default {
}
.btn-content .label {
font-size: 28rpx;
- color: #007aff;
+ color: #FF2F31;
}
diff --git a/pages.json b/pages.json
index a450aed..8fcd4f2 100644
--- a/pages.json
+++ b/pages.json
@@ -380,7 +380,7 @@
},
"tabBar": {
"color": "#909399",
- "selectedColor": "#2979ff",
+ "selectedColor": "#252B44",
// "borderStyle": "#909399",
"borderStyle": "white",
"backgroundColor": "#ffffff",
diff --git a/pages/bill/bill.vue b/pages/bill/bill.vue
index e6eaa01..d5ef4fe 100644
--- a/pages/bill/bill.vue
+++ b/pages/bill/bill.vue
@@ -1,347 +1,317 @@
-
-
-
+
+
+
-
-
-
-
- {{ currentYear }}年
-
-
-
-
-
-
-
-
-
-
-
- 支出
-
-
- 收入
-
-
-
+
+
+
+
+ {{ currentYear }}年
+
+
-
-
-
-
-
-
- {{ item.feeName }}
- 支付时间:{{ item.payTime }}
- {{ item.status }}
-
+
+
+
-
+
+
+
+ {{ year }}年
+
+
+
+
-
-
-
+
+
+
+ 支出
+
+
+ 收入
+
+
+
-
-
-
+
+
+
+
+
+
+ {{ item.feeName }}
+ 支付时间:{{ item.payTime }}
+ {{ item.status }}
+
+
+
+
+ {{ formatMoney(item.amount) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ .bill-name {
+ font-size: 28rpx;
+ color: #2D2B2C;
+ font-weight: 500;
+ }
+
+ .bill-date,
+ .bill-status {
+ font-size: 24rpx;
+ color: #ADADB1;
+ margin-top: 18rpx;
+ }
+ }
+
+ .bill-right {
+ display: flex;
+ align-items: center;
+
+ .amount {
+ font-size: 28rpx;
+ color: #F34038;
+ margin-right: 10rpx;
+ }
+ }
+
+ .empty {
+ margin-top: 200rpx;
+ text-align: center;
+ }
+
\ No newline at end of file
diff --git a/pages/bill/payHistory.vue b/pages/bill/payHistory.vue
index d055436..c3886e4 100644
--- a/pages/bill/payHistory.vue
+++ b/pages/bill/payHistory.vue
@@ -1,202 +1,305 @@
-
-
+
+
-
-
-
- {{ tab.label }}
-
-
+
+
+
+
+ {{ currentYear }}年
+
+
-
-
-
-
-
-
- {{ item.feeName }}
- {{ item.timeLabel }}:{{ item.time || '—' }}
-
+
+
+
-
+
+
+
+ {{ year }}年
+
+
+
+
+
+
+
+ {{ tab.label }}
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+ {{ item.feeName }}
+ {{ item.timeLabel }}:{{ item.time || '—' }}
+
+
+
+
+
+ {{ item.type === 'income' ? '+' : '-' }}{{ item.amount.toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+
+ &.unpaid {
+ color: #F34038;
+ }
+ }
+ }
+
+ .right {
+ display: flex;
+ align-items: center;
+
+ .amount {
+ font-size: 28rpx;
+ font-weight: 500;
+ margin-right: 10rpx;
+
+ &.income {
+ color: #73B936;
+ }
+
+ &.expense {
+ color: #F34038;
+ }
+ }
+ }
+ }
+ }
+
+ .empty {
+ margin-top: 100rpx;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/center/center.vue b/pages/center/center.vue
index d79ae78..3af8b6d 100644
--- a/pages/center/center.vue
+++ b/pages/center/center.vue
@@ -1,16 +1,8 @@
-
+