部分样式修复/缴费记录/水电费明细样式修改完成

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;
+  border-color: #FF2F31;
-  color: #0066d8;
+  color: #FF2F31;
 }
 
 /* 内部内容居中控制 */
@@ -127,6 +127,6 @@ export default {
 }
 .btn-content .label {
   font-size: 28rpx;
-  color: #007aff;
+  color: #FF2F31;
 }
 </style>

pages.json

@@ -380,7 +380,7 @@
 	},
 	"tabBar": {
 	    "color": "#909399",
-	    "selectedColor": "#2979ff",
+	    "selectedColor": "#252B44",
 	    // "borderStyle": "#909399",
 		"borderStyle": "white",
 	    "backgroundColor": "#ffffff",

pages/bill/bill.vue

@@ -1,9 +1,7 @@
 <template>
 	<view class="bill-list-page">
 		<!-- 自定义导航栏 -->
-    <customNavbar
+		<customNavbar title="我的账单"></customNavbar>
-      title="我的账单"
-    ></customNavbar>
 
 		<!-- 筛选栏 -->
 		<view class="filter-bar">
@@ -23,13 +21,8 @@
 
 					<!-- 年份列表 -->
 					<view class="year-list">
-            <view 
+						<view class="year-item" v-for="year in years" :key="year"
-              class="year-item" 
+							:class="{ active: currentYear === year }" @click="selectYear(year)">
-              v-for="year in years" 
-              :key="year"
-              :class="{ active: currentYear === year }"
-              @click="selectYear(year)"
-            >
 							{{ year }}年
 						</view>
 					</view>
@@ -38,48 +31,25 @@
 
 			<!-- 支出/收入切换 -->
 			<view class="tab-bar">
-        <view
+				<view class="tab-item" :class="{ active: currentTab === 'out' }" @click="switchTab('out')">
-          class="tab-item"
-          :class="{ active: currentTab === 'out' }"
-          @click="switchTab('out')"
-        >
 					支出
 				</view>
-        <view
+				<view class="tab-item" :class="{ active: currentTab === 'in' }" @click="switchTab('in')">
-          class="tab-item"
-          :class="{ active: currentTab === 'in' }"
-          @click="switchTab('in')"
-        >
 					收入
 				</view>
 			</view>
 		</view>
 
 		<!-- 账单列表 -->
-    <scroll-view
+		<scroll-view scroll-y class="scroll-content" :scroll-top="0" :refresher-enabled="true"
-      scroll-y
+			:refresher-triggered="isRefreshing" @refresherrefresh="refresh" @scrolltolower="loadMore">
-      class="scroll-content"
-      :scroll-top="0"
-      :refresher-enabled="true"
-      :refresher-triggered="isRefreshing"
-      @refresherrefresh="refresh"
-      @scrolltolower="loadMore"
-    >
 			<view v-if="bills.length > 0">
-        <view
+				<view class="bill-item" v-for="item in bills" :key="item.id" @click="goDetail(item)">
-          class="bill-item"
-          v-for="item in bills"
-          :key="item.id"
-          @click="goDetail(item)"
-        >
 					<!-- 左侧信息 -->
 					<view class="bill-left">
 						<text class="bill-name">{{ item.feeName }}</text>
 						<text class="bill-date" v-if="item.payTime">支付时间：{{ item.payTime }}</text>
-            <text
+						<text class="bill-status" v-if="currentTab === 'out'">{{ item.status }}</text>
-              class="bill-status"
-              v-if="currentTab === 'out'"
-            >{{ item.status }}</text>
 					</view>
 
 					<!-- 右侧金额 + 箭头 -->
@@ -139,8 +109,7 @@ export default {
 			loadBills() {
 				// 模拟数据加载
 				if (this.currentTab === 'in') {
-        this.bills = [
+					this.bills = [{
-          {
 							id: 'b101',
 							feeName: '第一期（2024.12.01-2024.12.31）',
 							payTime: '2024-12-05',
@@ -156,8 +125,7 @@ export default {
 						},
 					];
 				} else {
-        this.bills = [
+					this.bills = [{
-          {
 							id: 'b201',
 							feeName: '第一期租金（2024.12.01-2024.12.31）',
 							payTime: '2024-12-05',
@@ -206,7 +174,8 @@ export default {
 	.bill-list-page {
 		background: #f7f8fa;
 		min-height: 100vh;
-  padding-top: 120rpx; /* 给导航栏留空间 */
+		padding-top: 120rpx;
+		/* 给导航栏留空间 */
 	}
 
 	.filter-bar {
@@ -243,6 +212,7 @@ export default {
 		color: #333;
 		background-color: #f5f5f5;
 		transition: all 0.2s ease;
+
 		&.active {
 			color: #fff;
 			background: #ff3b30;

pages/bill/payHistory.vue

@@ -2,27 +2,44 @@
 	<view class="pay-history-page">
 		<customNavbar title="缴费记录" />
 
+		<!-- 筛选栏 -->
+		<view class="filter-bar">
+			<!-- 年份筛选点击区域 -->
+			<view class="year-filter" @click="toggleYearPicker">
+				<text class="year-text">{{ currentYear }}年</text>
+				<u-icon name="arrow-down" size="24" color="#666"></u-icon>
+			</view>
+
+			<!-- 自定义年份选择器弹窗 -->
+			<u-popup v-model="showYearPicker" mode="bottom" border-radius="20rpx" :closeable="true">
+				<view class="year-picker-popup">
+					<!-- 弹窗标题 -->
+					<view class="popup-header">
+						<text class="popup-title">选择年份</text>
+					</view>
+
+					<!-- 年份列表 -->
+					<view class="year-list">
+						<view class="year-item" v-for="year in years" :key="year"
+							:class="{ active: currentYear === year }" @click="selectYear(year)">
+							{{ year }}年
+						</view>
+					</view>
+				</view>
+			</u-popup>
 			<!-- 顶部tab切换 -->
 			<view class="tab-bar">
-      <view
+				<view v-for="(tab, index) in tabs" :key="index"
-        v-for="(tab, index) in tabs"
+					:class="['tab-item', activeTab === tab.value ? 'active' : '']" @click="activeTab = tab.value">
-        :key="index"
-        :class="['tab-item', activeTab === tab.value ? 'active' : '']"
-        @click="activeTab = tab.value"
-      >
 					{{ tab.label }}
 				</view>
 			</view>
+		</view>
 
 		<!-- 收支记录列表 -->
 		<scroll-view scroll-y class="scroll-content">
 			<view v-if="filteredRecords.length > 0" class="record-list">
-        <view
+				<view v-for="(item, index) in filteredRecords" :key="index" class="record-item" @click="goDetail(item)">
-          v-for="(item, index) in filteredRecords"
-          :key="index"
-          class="record-item"
-          @click="goDetail(item)"
-        >
 					<!-- 左侧信息 -->
 					<view class="left">
 						<view class="title">{{ item.feeName }}</view>
@@ -31,10 +48,7 @@
 
 					<!-- 右侧金额 + 图标 -->
 					<view class="right">
-            <view
+						<view class="amount" :class="item.type === 'income' ? 'income' : 'expense'">
-              class="amount"
-              :class="item.type === 'income' ? 'income' : 'expense'"
-            >
 							{{ item.type === 'income' ? '+' : '-' }}{{ item.amount.toFixed(2) }}
 						</view>
 						<u-icon name="arrow-right" size="32" color="#ccc"></u-icon>
@@ -54,12 +68,16 @@ export default {
 		data() {
 			return {
 				activeTab: 'income', // 默认显示“收”
-      tabs: [
+				tabs: [{
-        { label: '收', value: 'income' },
+						label: '收入',
-        { label: '支', value: 'expense' },
+						value: 'income'
-      ],
+					},
-      records: [
 					{
+						label: '支出',
+						value: 'expense'
+					},
+				],
+				records: [{
 						id: 1,
 						type: 'income', // 收
 						feeName: '第一期租金（2024.01.01 - 2024.03.31）',
@@ -84,6 +102,10 @@ export default {
 						amount: 8500,
 					},
 				],
+				// 年份筛选相关
+				currentYear: 2025,
+				years: [2025, 2024, 2023, 2022, 2021],
+				showYearPicker: false
 			};
 		},
 		computed: {
@@ -92,6 +114,17 @@ export default {
 			},
 		},
 		methods: {
+			// 切换年份选择器显示
+			toggleYearPicker() {
+				this.showYearPicker = !this.showYearPicker;
+			},
+			// 选择年份
+			selectYear(year) {
+				this.currentYear = year;
+				this.showYearPicker = false;
+				// 重新加载数据
+				// this.load();
+			},
 			statusText(status) {
 				const map = {
 					paid: '已支付 / 已收款',
@@ -113,31 +146,94 @@ export default {
 	.pay-history-page {
 		background: #f8f8f8;
 		min-height: 100vh;
-  padding-top: 175rpx;
+		padding-top: 120rpx;
+		.filter-bar {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background: #fff;
+			padding: 24rpx 30rpx;
+			margin: 20rpx;
+			margin-bottom: 0;
+			border-radius: 12rpx;
+			box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.05);
+		}
 		
+		/* 年份筛选 */
+		.year-filter {
+			display: flex;
+			align-items: center;
+			gap: 8rpx;
+			font-size: 32rpx;
+			color: #333;
+			cursor: pointer;
+		}
+		
+		/* 支出/收入切换 */
 		.tab-bar {
 			display: flex;
-    background: #fff;
+			gap: 20rpx;
-    margin: 0 20rpx;
+		}
-    border-radius: 12rpx;
-    overflow: hidden;
-    box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.05);
 		
 		.tab-item {
-      flex: 1;
+			padding: 12rpx 32rpx;
-      text-align: center;
-      padding: 24rpx 0;
 			font-size: 28rpx;
-      color: #666;
+			border-radius: 24rpx;
-      font-weight: 500;
+			color: #333;
-      transition: all 0.2s;
+			background-color: #f5f5f5;
+			transition: all 0.2s ease;
 		
 			&.active {
-        color: #007aff;
+				color: #fff;
-        font-weight: 700;
+				background: #ff3b30;
-        background: #eaf3ff;
 			}
 		}
+		
+		/* 自定义年份选择器样式 */
+		.year-picker-popup {
+			background: #fff;
+			padding: 30rpx 0;
+		}
+		
+		.popup-header {
+			text-align: center;
+			padding: 20rpx 0;
+			border-bottom: 1rpx solid #f0f0f0;
+		}
+		
+		.popup-title {
+			font-size: 34rpx;
+			font-weight: 600;
+			color: #333;
+		}
+		
+		.year-list {
+			padding: 20rpx;
+		}
+		
+		.year-item {
+			font-size: 32rpx;
+			color: #666;
+			text-align: center;
+			padding: 24rpx;
+			border-radius: 12rpx;
+			margin-bottom: 16rpx;
+			background: #f5f5f5;
+			transition: all 0.2s ease;
+		
+			&:last-child {
+				margin-bottom: 0;
+			}
+		
+			&.active {
+				background: #ff3b30;
+				color: #fff;
+			}
+		
+			&:hover {
+				background: #ff5252;
+				color: #fff;
+			}
 		}
 
 		.record-list {
@@ -155,24 +251,28 @@ export default {
 
 				.left {
 					flex: 1;
+
 					.title {
 						font-size: 28rpx;
-          font-weight: 600;
+						font-weight:5600;
-          color: #333;
+						color: #2D2B2C;
-          margin-bottom: 8rpx;
 					}
+
 					.sub {
 						font-size: 24rpx;
-          color: #888;
+						color: #86868C;
-          margin-bottom: 6rpx;
+						margin-top: 18rpx;
 					}
+
 					.status {
-          font-size: 24rpx;
+						font-size: 28rpx;
+
 						&.paid {
-            color: #4caf50;
+							color: #73B936;
 						}
+
 						&.unpaid {
-            color: #f56c6c;
+							color: #F34038;
 						}
 					}
 				}
@@ -180,15 +280,18 @@ export default {
 				.right {
 					display: flex;
 					align-items: center;
+
 					.amount {
-          font-size: 30rpx;
+						font-size: 28rpx;
-          font-weight: bold;
+						font-weight: 500;
 						margin-right: 10rpx;
+
 						&.income {
-            color: #4caf50;
+							color: #73B936;
 						}
+
 						&.expense {
-            color: #f56c6c;
+							color: #F34038;
 						}
 					}
 				}

pages/center/center.vue

@@ -1,16 +1,8 @@
 <template>
 	<view class="user-center">
-		<customNavbar
+		<customNavbar title="个人中心" ref="navbar" :is-transparent="navbarStyle.isTransparent"
-		  title="个人中心" 
+			:bg-color="navbarStyle.bgColor" :text-color="navbarStyle.textColor" :opacity="navbarStyle.opacity"
-		  ref="navbar"
+			:extra-icons="navbarStyle.extraIcons" :show-home="false" :show-back="false" />
-		  :is-transparent="navbarStyle.isTransparent"
-		  :bg-color="navbarStyle.bgColor"
-		  :text-color="navbarStyle.textColor"
-		  :opacity="navbarStyle.opacity"
-		  :extra-icons="navbarStyle.extraIcons"
-		  :show-home="false"
-		  :show-back="false"
-		/>
 		<!-- 顶部用户信息 -->
 		<view class="user-header">
 			<u-avatar :src="avatar" size="133"></u-avatar>
@@ -262,7 +254,9 @@
 					})
 				}
 				let url = "/login/checkExpiration";
-				this.$u.get(url, {}, {'WT': token}).then(obj => {
+				this.$u.get(url, {}, {
+					'WT': token
+				}).then(obj => {
 					if (obj.data) {
 						uni.reLaunch({
 							url: '../login/login'
@@ -319,7 +313,9 @@
 				let life = uni.getStorageSync('lifeData') || {}
 				let token = life.vuex_token
 				let url = "/login/userOtherInfo";
-				this.$u.get(url, {}, {'WT': token}).then(obj => {
+				this.$u.get(url, {}, {
+					'WT': token
+				}).then(obj => {
 					this.userType = obj.data.userType;
 					this.oaAuth = obj.data.oaAuth;
 				});
@@ -331,9 +327,9 @@
 <style lang="scss" scoped>
 	.user-center {
 		padding-top: 120rpx;
-    background-image: url(https://eyidu.ydszw.cn/static/img/test/my-bg.png);
+		background-image: url("https://eyidu.ydszw.cn/static/img/test/my-bg.png");//只支持网络图片，请自行上传至图片服务器并替换
 		background-color: #fff;
-    background-repeat: space;
+		background-repeat: no-repeat;
 		background-size: 750rpx 731rpx;
 		min-height: 100vh;
 	}
@@ -383,7 +379,7 @@
 	.contract-view {
 		width: 96%;
 		margin: 0 auto;
-		background-image: url("https://eyidu.ydszw.cn/static/img/test/my-bg2.png");//只支持网络图片，请自行上传至图片服务器
+		background-image: url("https://eyidu.ydszw.cn/static/img/test/my-bg2.png"); //只支持网络图片，请自行上传至图片服务器并替换
 		background-repeat: round;
 		border-radius: 10rpx;
 	}

pages/detail/assetsDetail.vue

@@ -436,6 +436,10 @@
 		padding: 40rpx 30rpx;
 		background-color: #fff;
 		border-radius: 20rpx 20rpx 0 0;
+
+		&::v-deep .u-btn {
+			background: #ff3b30;
+		}
 	}
 
 	.popup-title {

pages/notice/notice.vue

@@ -5,7 +5,7 @@
 			<scroll-view scroll-y style="height: 100%;width: 100%;">
 				<view class="page-box">
 					<view class="tabSwiper" v-for="(item, index) in dataList" :key="item.id" @click="clickContent(item)">
-						<u-icon name="bell" :size="35" color="#2979ff" class="bell-icon"></u-icon>
+						<u-icon name="bell" :size="35" color="#FF2F31" class="bell-icon"></u-icon>
 						<view class="content-wrapper">
 							<view class="top">
 								<view class="title">{{ item.title }}</view>

pages/wae/waeRecords.vue

@@ -16,6 +16,10 @@
         :key="index"
         @click="toDetail(item)"
       >
+		<view class="record-icon">
+			<image src="/static/icon/水费.png" class="icon-1" v-if="item.feeType=='水费'"></image>
+			<image src="/static/icon/电费.png" class="icon-2" v-else></image>
+		</view>
         <!-- 左侧信息 -->
         <view class="record-left">
           <text class="record-title">{{ item.feeType }}（{{ item.period }}）</text>
@@ -75,7 +79,7 @@ export default {
 
 <style lang="scss" scoped>
 .water-electric-page {
-  padding: 175rpx 20rpx 20rpx 20rpx;
+  padding: 120rpx 20rpx 20rpx 20rpx;
   
   .header {
     background-color: #fff;
@@ -104,20 +108,35 @@ export default {
     padding: 24rpx 30rpx;
     box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
 	
+	.record-icon{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		.icon-1{
+			width: 33rpx;
+			height: 47rpx;
+		}
+		
+		.icon-2{
+			width: 35rpx;
+			height: 57rpx;
+		}
+	}
+
     .record-left {
       display: flex;
       flex-direction: column;
       gap: 10rpx;
 
       .record-title {
-        font-size: 28rpx;
+        font-size: 30rpx;
-        font-weight: 600;
+        font-weight: 500;
-        color: #333;
+        color: #2D2B2C;
       }
 
       .record-time {
         font-size: 24rpx;
-        color: #888;
+        color: #86868C;
       }
     }
 
@@ -125,8 +144,8 @@ export default {
       display: flex;
       align-items: center;
       font-size: 30rpx;
-      font-weight: 600;
+      font-weight: 400;
-      color: #333;
+      color: #222222;
 
       .amount {
         display: flex;