admin/RentWeAppFront
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wenqi.peng
2025-12-31 11:23:28 +08:00
parent 293e8f1139
commit 036eb3a206
14 changed files with 648 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/bottom/assetBottomBar.vue
View File

@@ -97,21 +97,21 @@ export default {
flex-shrink: 0; flex-shrink: 0;
width: 340rpx; width: 340rpx;
height: 88rpx; height: 88rpx;
border: 2rpx solid #007aff; border: 2rpx solid #FF2F31;
border-radius: 44rpx; border-radius: 44rpx;
background-color: #ffffff; background-color: #ffffff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: #007aff; color: #FF2F31;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
transition: all 0.2s; transition: all 0.2s;
} }
.main-btn:active { .main-btn:active {
background-color: #e6f0ff; background-color: #e6f0ff;
border-color: #0066d8; border-color: #FF2F31;
color: #0066d8; color: #FF2F31;
} }
/* 内部内容居中控制 */ /* 内部内容居中控制 */
@@ -127,6 +127,6 @@ export default {
} }
.btn-content .label { .btn-content .label {
font-size: 28rpx; font-size: 28rpx;
color: #007aff; color: #FF2F31;
} }
</style> </style>

2
pages.json
View File

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

596
pages/bill/bill.vue
View File

@@ -1,347 +1,317 @@
<template> <template>
<view class="bill-list-page"> <view class="bill-list-page">
<!-- 自定义导航栏 --> <!-- 自定义导航栏 -->
<customNavbar <customNavbar title="我的账单"></customNavbar>
title="我的账单"
></customNavbar>
<!-- 筛选栏 --> <!-- 筛选栏 -->
<view class="filter-bar"> <view class="filter-bar">
<!-- 年份筛选点击区域 --> <!-- 年份筛选点击区域 -->
<view class="year-filter" @click="toggleYearPicker"> <view class="year-filter" @click="toggleYearPicker">
<text class="year-text">{{ currentYear }}年</text> <text class="year-text">{{ currentYear }}年</text>
<u-icon name="arrow-down" size="24" color="#666"></u-icon> <u-icon name="arrow-down" size="24" color="#666"></u-icon>
</view> </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>
<!-- 支出/收入切换 -->
<view class="tab-bar">
<view
class="tab-item"
:class="{ active: currentTab === 'out' }"
@click="switchTab('out')"
>
支出
</view>
<view
class="tab-item"
:class="{ active: currentTab === 'in' }"
@click="switchTab('in')"
>
收入
</view>
</view>
</view>
<!-- 账单列表 --> <!-- 自定义年份选择器弹窗 -->
<scroll-view <u-popup v-model="showYearPicker" mode="bottom" border-radius="20rpx" :closeable="true">
scroll-y <view class="year-picker-popup">
class="scroll-content" <!-- 弹窗标题 -->
:scroll-top="0" <view class="popup-header">
:refresher-enabled="true" <text class="popup-title">选择年份</text>
:refresher-triggered="isRefreshing" </view>
@refresherrefresh="refresh"
@scrolltolower="loadMore"
>
<view v-if="bills.length > 0">
<view
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
class="bill-status"
v-if="currentTab === 'out'"
>{{ item.status }}</text>
</view>
<!-- 右侧金额 + 箭头 --> <!-- 年份列表 -->
<view class="bill-right"> <view class="year-list">
<text class="amount">{{ formatMoney(item.amount) }}</text> <view class="year-item" v-for="year in years" :key="year"
<u-icon name="arrow-right" size="28" color="#ccc" /> :class="{ active: currentYear === year }" @click="selectYear(year)">
</view> {{ year }}年
</view> </view>
</view> </view>
</view>
</u-popup>
<view v-else class="empty"> <!-- 支出/收入切换 -->
<u-empty mode="list" text="暂无账单" /> <view class="tab-bar">
</view> <view class="tab-item" :class="{ active: currentTab === 'out' }" @click="switchTab('out')">
支出
</view>
<view class="tab-item" :class="{ active: currentTab === 'in' }" @click="switchTab('in')">
收入
</view>
</view>
</view>
<u-loadmore :status="loadStatus" /> <!-- 账单列表 -->
</scroll-view> <scroll-view scroll-y class="scroll-content" :scroll-top="0" :refresher-enabled="true"
</view> :refresher-triggered="isRefreshing" @refresherrefresh="refresh" @scrolltolower="loadMore">
<view v-if="bills.length > 0">
<view 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 class="bill-status" v-if="currentTab === 'out'">{{ item.status }}</text>
</view>
<!-- 右侧金额 + 箭头 -->
<view class="bill-right">
<text class="amount">{{ formatMoney(item.amount) }}</text>
<u-icon name="arrow-right" size="28" color="#ccc" />
</view>
</view>
</view>
<view v-else class="empty">
<u-empty mode="list" text="暂无账单" />
</view>
<u-loadmore :status="loadStatus" />
</scroll-view>
</view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
currentTab: 'out', // in 收 / out 支 currentTab: 'out', // in 收 / out 支
bills: [], bills: [],
isRefreshing: false, isRefreshing: false,
loadStatus: 'more', // u-loadmore 状态 loadStatus: 'more', // u-loadmore 状态
// 年份筛选相关 // 年份筛选相关
currentYear: 2025, currentYear: 2025,
years: [2025, 2024, 2023, 2022, 2021], years: [2025, 2024, 2023, 2022, 2021],
showYearPicker: false showYearPicker: false
}; };
}, },
onLoad(options) { onLoad(options) {
// 可以从 options 获取用户ID或合同ID // 可以从 options 获取用户ID或合同ID
this.loadBills(); this.loadBills();
}, },
methods: { methods: {
switchTab(tab) { switchTab(tab) {
this.currentTab = tab; this.currentTab = tab;
this.loadBills(); this.loadBills();
}, },
// 切换年份选择器显示
toggleYearPicker() {
this.showYearPicker = !this.showYearPicker;
},
// 选择年份
selectYear(year) {
this.currentYear = year;
this.showYearPicker = false;
// 重新加载账单数据
this.loadBills();
},
loadBills() { // 切换年份选择器显示
// 模拟数据加载 toggleYearPicker() {
if (this.currentTab === 'in') { this.showYearPicker = !this.showYearPicker;
this.bills = [ },
{
id: 'b101',
feeName: '第一期（2024.12.01-2024.12.31）',
payTime: '2024-12-05',
amount: 3000,
status: '已收',
},
{
id: 'b102',
feeName: '第二期（2025.01.01-2025.01.31）',
payTime: '',
amount: 3000,
status: '未收',
},
];
} else {
this.bills = [
{
id: 'b201',
feeName: '第一期租金（2024.12.01-2024.12.31）',
payTime: '2024-12-05',
amount: 3000,
status: '已支付',
},
{
id: 'b202',
feeName: '第二期租金（2025.01.01-2025.01.31）',
payTime: '',
amount: 3000,
status: '待支付',
},
];
}
},
refresh() { // 选择年份
this.isRefreshing = true; selectYear(year) {
setTimeout(() => { this.currentYear = year;
this.loadBills(); this.showYearPicker = false;
this.isRefreshing = false; // 重新加载账单数据
}, 1000); this.loadBills();
}, },
loadMore() { loadBills() {
// 可以调用接口分页加载更多数据 // 模拟数据加载
this.loadStatus = 'noMore'; if (this.currentTab === 'in') {
}, this.bills = [{
id: 'b101',
feeName: '第一期（2024.12.01-2024.12.31）',
payTime: '2024-12-05',
amount: 3000,
status: '已收',
},
{
id: 'b102',
feeName: '第二期（2025.01.01-2025.01.31）',
payTime: '',
amount: 3000,
status: '未收',
},
];
} else {
this.bills = [{
id: 'b201',
feeName: '第一期租金（2024.12.01-2024.12.31）',
payTime: '2024-12-05',
amount: 3000,
status: '已支付',
},
{
id: 'b202',
feeName: '第二期租金（2025.01.01-2025.01.31）',
payTime: '',
amount: 3000,
status: '待支付',
},
];
}
},
formatMoney(val) { refresh() {
if (!val && val !== 0) return '—'; this.isRefreshing = true;
return '¥' + Number(val).toFixed(2); setTimeout(() => {
}, this.loadBills();
this.isRefreshing = false;
}, 1000);
},
goDetail(item) { loadMore() {
uni.navigateTo({ // 可以调用接口分页加载更多数据
url: `/pages/bill/billDetail?id=${item.id}`, this.loadStatus = 'noMore';
}); },
},
}, formatMoney(val) {
}; if (!val && val !== 0) return '—';
return '¥' + Number(val).toFixed(2);
},
goDetail(item) {
uni.navigateTo({
url: `/pages/bill/billDetail?id=${item.id}`,
});
},
},
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.bill-list-page { .bill-list-page {
background: #f7f8fa; background: #f7f8fa;
min-height: 100vh; min-height: 100vh;
padding-top: 120rpx; /* 给导航栏留空间 */ padding-top: 120rpx;
} /* 给导航栏留空间 */
}
.filter-bar { .filter-bar {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
background: #fff; background: #fff;
padding: 24rpx 30rpx; padding: 24rpx 30rpx;
margin: 20rpx; margin: 20rpx;
border-radius: 12rpx; border-radius: 12rpx;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.05); box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.05);
} }
/* 年份筛选 */ /* 年份筛选 */
.year-filter { .year-filter {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8rpx; gap: 8rpx;
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
cursor: pointer; cursor: pointer;
} }
/* 支出/收入切换 */ /* 支出/收入切换 */
.tab-bar { .tab-bar {
display: flex; display: flex;
gap: 20rpx; gap: 20rpx;
} }
.tab-item { .tab-item {
padding: 12rpx 32rpx; padding: 12rpx 32rpx;
font-size: 28rpx; font-size: 28rpx;
border-radius: 24rpx; border-radius: 24rpx;
color: #333; color: #333;
background-color: #f5f5f5; background-color: #f5f5f5;
transition: all 0.2s ease; transition: all 0.2s ease;
&.active {
color: #fff;
background: #ff3b30;
}
}
/* 自定义年份选择器样式 */ &.active {
.year-picker-popup { color: #fff;
background: #fff; background: #ff3b30;
padding: 30rpx 0; }
} }
.popup-header { /* 自定义年份选择器样式 */
text-align: center; .year-picker-popup {
padding: 20rpx 0; background: #fff;
border-bottom: 1rpx solid #f0f0f0; padding: 30rpx 0;
} }
.popup-title { .popup-header {
font-size: 34rpx; text-align: center;
font-weight: 600; padding: 20rpx 0;
color: #333; border-bottom: 1rpx solid #f0f0f0;
} }
.year-list { .popup-title {
padding: 20rpx; font-size: 34rpx;
} font-weight: 600;
color: #333;
}
.year-item { .year-list {
font-size: 32rpx; padding: 20rpx;
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;
}
}
.scroll-content { .year-item {
margin-top: 20rpx; font-size: 32rpx;
padding-bottom: 20rpx; color: #666;
} text-align: center;
padding: 24rpx;
border-radius: 12rpx;
margin-bottom: 16rpx;
background: #f5f5f5;
transition: all 0.2s ease;
.bill-item { &:last-child {
display: flex; margin-bottom: 0;
justify-content: space-between; }
background: #fff;
margin: 0 20rpx 20rpx 20rpx;
border-radius: 12rpx;
padding: 20rpx;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.05);
}
.bill-left { &.active {
display: flex; background: #ff3b30;
flex-direction: column; color: #fff;
}
.bill-name { &:hover {
font-size: 28rpx; background: #ff5252;
color: #2D2B2C; color: #fff;
font-weight: 500; }
} }
.bill-date, .scroll-content {
.bill-status { margin-top: 20rpx;
font-size: 24rpx; padding-bottom: 20rpx;
color: #ADADB1; }
margin-top: 18rpx;
}
}
.bill-right { .bill-item {
display: flex; display: flex;
align-items: center; justify-content: space-between;
background: #fff;
margin: 0 20rpx 20rpx 20rpx;
border-radius: 12rpx;
padding: 20rpx;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.05);
}
.amount { .bill-left {
font-size: 28rpx; display: flex;
color: #F34038; flex-direction: column;
margin-right: 10rpx;
}
}
.empty { .bill-name {
margin-top: 200rpx; font-size: 28rpx;
text-align: center; color: #2D2B2C;
} font-weight: 500;
</style> }
.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;
}
</style>

469
pages/bill/payHistory.vue
View File

@@ -1,202 +1,305 @@
<template> <template>
<view class="pay-history-page"> <view class="pay-history-page">
<customNavbar title="缴费记录" /> <customNavbar title="缴费记录" />
<!-- 顶部tab切换 --> <!-- 筛选栏 -->
<view class="tab-bar"> <view class="filter-bar">
<view <!-- 年份筛选点击区域 -->
v-for="(tab, index) in tabs" <view class="year-filter" @click="toggleYearPicker">
:key="index" <text class="year-text">{{ currentYear }}年</text>
:class="['tab-item', activeTab === tab.value ? 'active' : '']" <u-icon name="arrow-down" size="24" color="#666"></u-icon>
@click="activeTab = tab.value" </view>
>
{{ tab.label }}
</view>
</view>
<!-- 收支记录列表 --> <!-- 自定义年份选择器弹窗 -->
<scroll-view scroll-y class="scroll-content"> <u-popup v-model="showYearPicker" mode="bottom" border-radius="20rpx" :closeable="true">
<view v-if="filteredRecords.length > 0" class="record-list"> <view class="year-picker-popup">
<view <!-- 弹窗标题 -->
v-for="(item, index) in filteredRecords" <view class="popup-header">
:key="index" <text class="popup-title">选择年份</text>
class="record-item" </view>
@click="goDetail(item)"
>
<!-- 左侧信息 -->
<view class="left">
<view class="title">{{ item.feeName }}</view>
<view class="sub">{{ item.timeLabel }}：{{ item.time || '—' }}</view>
</view>
<!-- 右侧金额 + 图标 --> <!-- 年份列表 -->
<view class="right"> <view class="year-list">
<view <view class="year-item" v-for="year in years" :key="year"
class="amount" :class="{ active: currentYear === year }" @click="selectYear(year)">
:class="item.type === 'income' ? 'income' : 'expense'" {{ year }}年
> </view>
{{ item.type === 'income' ? '+' : '-' }}{{ item.amount.toFixed(2) }} </view>
</view> </view>
<u-icon name="arrow-right" size="32" color="#ccc"></u-icon> </u-popup>
</view> <!-- 顶部tab切换 -->
</view> <view class="tab-bar">
</view> <view v-for="(tab, index) in tabs" :key="index"
:class="['tab-item', activeTab === tab.value ? 'active' : '']" @click="activeTab = tab.value">
{{ tab.label }}
</view>
</view>
</view>
<view v-else class="empty"> <!-- 收支记录列表 -->
<u-empty mode="list" text="暂无记录" /> <scroll-view scroll-y class="scroll-content">
</view> <view v-if="filteredRecords.length > 0" class="record-list">
</scroll-view> <view v-for="(item, index) in filteredRecords" :key="index" class="record-item" @click="goDetail(item)">
</view> <!-- 左侧信息 -->
<view class="left">
<view class="title">{{ item.feeName }}</view>
<view class="sub">{{ item.timeLabel }}：{{ item.time || '—' }}</view>
</view>
<!-- 右侧金额 + 图标 -->
<view class="right">
<view 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>
</view>
</view>
</view>
<view v-else class="empty">
<u-empty mode="list" text="暂无记录" />
</view>
</scroll-view>
</view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
activeTab: 'income', // 默认显示“收” activeTab: 'income', // 默认显示“收”
tabs: [ tabs: [{
{ label: '收', value: 'income' }, label: '收入',
{ label: '支', value: 'expense' }, value: 'income'
], },
records: [ {
{ label: '支出',
id: 1, value: 'expense'
type: 'income', // 收 },
feeName: '第一期租金（2024.01.01 - 2024.03.31）', ],
time: '2024-01-05', records: [{
timeLabel: '收款时间', id: 1,
amount: 8500, type: 'income', // 收
}, feeName: '第一期租金（2024.01.01 - 2024.03.31）',
{ time: '2024-01-05',
id: 2, timeLabel: '收款时间',
type: 'expense', // 支 amount: 8500,
feeName: '押金缴纳', },
time: '2024-01-03', {
timeLabel: '支付时间', id: 2,
amount: 5000, type: 'expense', // 支
}, feeName: '押金缴纳',
{ time: '2024-01-03',
id: 3, timeLabel: '支付时间',
type: 'expense', amount: 5000,
feeName: '第二期租金（2024.04.01 - 2024.06.30）', },
time: '', {
timeLabel: '支付时间', id: 3,
amount: 8500, type: 'expense',
}, feeName: '第二期租金（2024.04.01 - 2024.06.30）',
], time: '',
}; timeLabel: '支付时间',
}, amount: 8500,
computed: { },
filteredRecords() { ],
return this.records.filter((r) => r.type === this.activeTab); // 年份筛选相关
}, currentYear: 2025,
}, years: [2025, 2024, 2023, 2022, 2021],
methods: { showYearPicker: false
statusText(status) { };
const map = { },
paid: '已支付 / 已收款', computed: {
unpaid: '待支付', filteredRecords() {
pending: '处理中', return this.records.filter((r) => r.type === this.activeTab);
}; },
return map[status] || '未知状态'; },
}, methods: {
goDetail(item) { // 切换年份选择器显示
uni.navigateTo({ toggleYearPicker() {
url: `/pages/bill/detail?id=${item.id}`, this.showYearPicker = !this.showYearPicker;
}); },
}, // 选择年份
}, selectYear(year) {
}; this.currentYear = year;
this.showYearPicker = false;
// 重新加载数据
// this.load();
},
statusText(status) {
const map = {
paid: '已支付 / 已收款',
unpaid: '待支付',
pending: '处理中',
};
return map[status] || '未知状态';
},
goDetail(item) {
uni.navigateTo({
url: `/pages/bill/detail?id=${item.id}`,
});
},
},
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.pay-history-page { .pay-history-page {
background: #f8f8f8; background: #f8f8f8;
min-height: 100vh; 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;
gap: 20rpx;
}
.tab-item {
padding: 12rpx 32rpx;
font-size: 28rpx;
border-radius: 24rpx;
color: #333;
background-color: #f5f5f5;
transition: all 0.2s ease;
&.active {
color: #fff;
background: #ff3b30;
}
}
/* 自定义年份选择器样式 */
.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;
}
}
.tab-bar { .record-list {
display: flex; padding: 20rpx;
background: #fff;
margin: 0 20rpx;
border-radius: 12rpx;
overflow: hidden;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.05);
.tab-item { .record-item {
flex: 1; display: flex;
text-align: center; justify-content: space-between;
padding: 24rpx 0; align-items: center;
font-size: 28rpx; background: #fff;
color: #666; border-radius: 16rpx;
font-weight: 500; margin-bottom: 20rpx;
transition: all 0.2s; padding: 20rpx;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.03);
&.active { .left {
color: #007aff; flex: 1;
font-weight: 700;
background: #eaf3ff;
}
}
}
.record-list { .title {
padding: 20rpx; font-size: 28rpx;
font-weight:5600;
color: #2D2B2C;
}
.record-item { .sub {
display: flex; font-size: 24rpx;
justify-content: space-between; color: #86868C;
align-items: center; margin-top: 18rpx;
background: #fff; }
border-radius: 16rpx;
margin-bottom: 20rpx;
padding: 20rpx;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.03);
.left { .status {
flex: 1; font-size: 28rpx;
.title {
font-size: 28rpx;
font-weight: 600;
color: #333;
margin-bottom: 8rpx;
}
.sub {
font-size: 24rpx;
color: #888;
margin-bottom: 6rpx;
}
.status {
font-size: 24rpx;
&.paid {
color: #4caf50;
}
&.unpaid {
color: #f56c6c;
}
}
}
.right { &.paid {
display: flex; color: #73B936;
align-items: center; }
.amount {
font-size: 30rpx;
font-weight: bold;
margin-right: 10rpx;
&.income {
color: #4caf50;
}
&.expense {
color: #f56c6c;
}
}
}
}
}
.empty { &.unpaid {
margin-top: 100rpx; color: #F34038;
} }
} }
</style> }
.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;
}
}
</style>

88
pages/center/center.vue
View File

@@ -1,16 +1,8 @@
<template> <template>
<view class="user-center"> <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"> <view class="user-header">
<u-avatar :src="avatar" size="133"></u-avatar> <u-avatar :src="avatar" size="133"></u-avatar>
@@ -31,32 +23,32 @@
<view class="contract-view"> <view class="contract-view">
<!-- 我的合同和我的预约 --> <!-- 我的合同和我的预约 -->
<view class="contract-appointment"> <view class="contract-appointment">
<view class="card" @click="clickNav('pages/center/contract')"> <view class="card" @click="clickNav('pages/center/contract')">
<view class="card-title">我的合同</view> <view class="card-title">我的合同</view>
<view class="card-main"> <view class="card-main">
<view class="card-content"> <view class="card-content">
<view class="card-number">5</view> <view class="card-number">5</view>
<view class="card-type">份合同</view> <view class="card-type">份合同</view>
</view>
<view class="card-icon">
<image src="/static/icon/sign.png" mode="widthFix"></image>
</view>
</view> </view>
<view class="card-icon"> </view>
<image src="/static/icon/sign.png" mode="widthFix"></image> <view class="card" @click="clickNav('pages/reserve/reserveRecords')">
<view class="card-title">我的预约</view>
<view class="card-main">
<view class="card-content">
<view class="card-number">3</view>
<view class="card-type">个预约</view>
</view>
<view class="card-icon">
<image src="/static/icon/sign.png" mode="widthFix"></image>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="card" @click="clickNav('pages/reserve/reserveRecords')">
<view class="card-title">我的预约</view>
<view class="card-main">
<view class="card-content">
<view class="card-number">3</view>
<view class="card-type">个预约</view>
</view>
<view class="card-icon">
<image src="/static/icon/sign.png" mode="widthFix"></image>
</view>
</view>
</view>
</view>
<!-- 我的服务 --> <!-- 我的服务 -->
<view class="my-service"> <view class="my-service">
@@ -134,8 +126,8 @@
user, // user 信息放这里即可 user, // user 信息放这里即可
show: true, show: true,
showGetProfile: false, showGetProfile: false,
userType:'', userType: '',
oaAuth:'', oaAuth: '',
gridList: [{ gridList: [{
name: "我的合同", name: "我的合同",
icon: "/static/icon/sign.png", icon: "/static/icon/sign.png",
@@ -220,7 +212,7 @@
onShow() { onShow() {
// this.checkToken(); // this.checkToken();
}, },
methods: { methods: {
@@ -262,7 +254,9 @@
}) })
} }
let url = "/login/checkExpiration"; let url = "/login/checkExpiration";
this.$u.get(url, {}, {'WT': token}).then(obj => { this.$u.get(url, {}, {
'WT': token
}).then(obj => {
if (obj.data) { if (obj.data) {
uni.reLaunch({ uni.reLaunch({
url: '../login/login' url: '../login/login'
@@ -319,7 +313,9 @@
let life = uni.getStorageSync('lifeData') || {} let life = uni.getStorageSync('lifeData') || {}
let token = life.vuex_token let token = life.vuex_token
let url = "/login/userOtherInfo"; 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.userType = obj.data.userType;
this.oaAuth = obj.data.oaAuth; this.oaAuth = obj.data.oaAuth;
}); });
@@ -331,11 +327,11 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.user-center { .user-center {
padding-top: 120rpx; 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-color: #fff;
background-repeat: space; background-repeat: no-repeat;
background-size: 750rpx 731rpx; background-size: 750rpx 731rpx;
min-height: 100vh; min-height: 100vh;
} }
/* 用户信息头 */ /* 用户信息头 */
@@ -379,11 +375,11 @@
display: flex; display: flex;
gap: 20rpx; gap: 20rpx;
} }
.contract-view{ .contract-view {
width: 96%; width: 96%;
margin: 0 auto; 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; background-repeat: round;
border-radius: 10rpx; border-radius: 10rpx;
} }

4
pages/detail/assetsDetail.vue
View File

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

2
pages/notice/notice.vue
View File

@@ -5,7 +5,7 @@
<scroll-view scroll-y style="height: 100%;width: 100%;"> <scroll-view scroll-y style="height: 100%;width: 100%;">
<view class="page-box"> <view class="page-box">
<view class="tabSwiper" v-for="(item, index) in dataList" :key="item.id" @click="clickContent(item)"> <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="content-wrapper">
<view class="top"> <view class="top">
<view class="title">{{ item.title }}</view> <view class="title">{{ item.title }}</view>

33
pages/wae/waeRecords.vue
View File

@@ -16,6 +16,10 @@
:key="index" :key="index"
@click="toDetail(item)" @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"> <view class="record-left">
<text class="record-title">{{ item.feeType }}（{{ item.period }}）</text> <text class="record-title">{{ item.feeType }}（{{ item.period }}）</text>
@@ -75,7 +79,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.water-electric-page { .water-electric-page {
padding: 175rpx 20rpx 20rpx 20rpx; padding: 120rpx 20rpx 20rpx 20rpx;
.header { .header {
background-color: #fff; background-color: #fff;
@@ -103,6 +107,21 @@ export default {
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 24rpx 30rpx; padding: 24rpx 30rpx;
box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05); 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 { .record-left {
display: flex; display: flex;
@@ -110,14 +129,14 @@ export default {
gap: 10rpx; gap: 10rpx;
.record-title { .record-title {
font-size: 28rpx; font-size: 30rpx;
font-weight: 600; font-weight: 500;
color: #333; color: #2D2B2C;
} }
.record-time { .record-time {
font-size: 24rpx; font-size: 24rpx;
color: #888; color: #86868C;
} }
} }
@@ -125,8 +144,8 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 400;
color: #333; color: #222222;
.amount { .amount {
display: flex; display: flex;

BIN
static/center-selected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
static/center.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
static/icon/水费.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
static/icon/电费.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
static/index-selected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/index.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB