From 75713f1e97dab53ca92c3ff3845e2a309d2b16f0 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 17 Jun 2024 17:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.wxss | 2 +-
components/dot/index.wxss | 9 ++++++---
pages/billList/index.js | 2 +-
pages/billList/index.json | 3 ++-
pages/billList/index.wxml | 14 ++++++++-----
pages/electricQuery/index.wxss | 20 ++++++++++---------
pages/home/index.wxml | 6 +++---
pages/home/index.wxss | 8 +++++---
pages/invoiceList/components/already/index.js | 2 +-
pages/invoiceList/components/info/index.wxml | 3 ++-
pages/invoicing/index.js | 4 ++--
pages/qrCode/index.js | 4 +++-
pages/rechargeDetail/index.js | 9 ++++++++-
pages/rechargeRecord/index.js | 10 +++++++---
pages/rechargeRecord/index.wxml | 4 ++--
pages/rechargeRecord/index.wxss | 12 ++++++++---
16 files changed, 72 insertions(+), 40 deletions(-)
diff --git a/app.wxss b/app.wxss
index 0820b67..48b2ee9 100644
--- a/app.wxss
+++ b/app.wxss
@@ -8,7 +8,7 @@ page {
}
.border {
- border: 0.5rpx solid #f0f0f0;
+ border: 0.5rpx solid #cfc9c9;
}
.radius12 {
diff --git a/components/dot/index.wxss b/components/dot/index.wxss
index fd4927c..faff189 100644
--- a/components/dot/index.wxss
+++ b/components/dot/index.wxss
@@ -1,10 +1,13 @@
/* components/dot/index.wxss */
.dot {
background-color: #ee0a24;
- width: 56rpx;
- height: 56rpx;
+ width: 52rpx;
+ height: 52rpx;
border-radius: 50%;
text-align: center;
color: #fff;
- font-size: 28rpx;
+ font-size: 26rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
\ No newline at end of file
diff --git a/pages/billList/index.js b/pages/billList/index.js
index 3e7d64b..297f03a 100644
--- a/pages/billList/index.js
+++ b/pages/billList/index.js
@@ -23,7 +23,7 @@ Page({
const { page, list } = this.data;
const { code, data, message } = await getBillList(page)
if (!data?.length) {
- alertInfo("没用更多了")
+ alertInfo("没有更多了")
return;
}
this.setData({
diff --git a/pages/billList/index.json b/pages/billList/index.json
index 64646d1..83d0970 100644
--- a/pages/billList/index.json
+++ b/pages/billList/index.json
@@ -1,7 +1,8 @@
{
"usingComponents": {
"navigator": "/components/navigator/index",
- "van-icon": "@vant/weapp/icon/index"
+ "van-icon": "@vant/weapp/icon/index",
+ "empty": "/components/empty/index"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/billList/index.wxml b/pages/billList/index.wxml
index b88ef27..5898831 100644
--- a/pages/billList/index.wxml
+++ b/pages/billList/index.wxml
@@ -1,8 +1,12 @@
-
-
-
- {{ item.time }}
- 查看详细
+
+
+
+
+
+
+ {{ item.time }}
+ 查看详细
+
\ No newline at end of file
diff --git a/pages/electricQuery/index.wxss b/pages/electricQuery/index.wxss
index 756776c..b4758a8 100644
--- a/pages/electricQuery/index.wxss
+++ b/pages/electricQuery/index.wxss
@@ -6,17 +6,17 @@ page {
.queryWrapper {
margin: 20rpx 0rpx;
background-color: #fff;
- padding: 30rpx;
+ padding:15rpx 20rpx;
box-sizing: border-box;
border-radius: 20rpx;
display: flex;
align-items: center;
-
+ font-size: 32rpx;
}
.label {
width: 180rpx;
- font-size: 34rpx;
+ font-size: 32rpx;
}
.sum {
@@ -32,9 +32,9 @@ page {
.typeQueryText {
text-align: center;
- padding: 30rpx;
+ padding: 20rpx;
background-color: var(--light-green);
- font-size: 34rpx;
+ font-size: 32rpx;
}
.select {
@@ -44,13 +44,14 @@ page {
flex: 1;
display: flex;
justify-content: space-between;
+ font-size: 30rpx;
}
.timeQueryText {
text-align: center;
- padding: 30rpx;
+ padding: 20rpx;
background-color: rgb(242,248,246);
- font-size: 34rpx;
+ font-size: 30rpx;
}
.wrapper {
@@ -61,12 +62,13 @@ page {
.tooltip {
margin: 20rpx 0;
- font-size: 32rpx;
- color: rgb(119, 114, 114);
+ font-size: 28rpx;
+ color: rgb(97, 93, 93);
}
.timeChooseWrapper {
display: flex;
align-items: center;
+ font-size: 30rpx;
}
.time {
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index 87fa668..dc7e420 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -24,7 +24,7 @@
- {{tenement.name}}
+ {{tenement.name}}
欢迎使用华昌宝能用电管理系统！
@@ -53,10 +53,10 @@
电表余额：
-
+
{{meter.money}}
---
-
+
刷新
diff --git a/pages/home/index.wxss b/pages/home/index.wxss
index 906df4b..3ea44c2 100644
--- a/pages/home/index.wxss
+++ b/pages/home/index.wxss
@@ -26,6 +26,7 @@
.parkContent {
display: flex;
align-items: center;
+ font-size: 32rpx;
}
.notLoginWrapper, .logined {
@@ -63,6 +64,7 @@
display: flex;
align-items: center;
flex: 1;
+ font-size: 33rpx;
}
.cardContent {
@@ -73,7 +75,7 @@
display: flex;
align-items: center;
margin-bottom: 30rpx;
- font-size: 34rpx;
+ font-size: 32rpx;
}
.cardItemValue {
@@ -105,8 +107,8 @@
.welcome {
margin-top: 20rpx;
margin-left: 30rpx;
- font-size: 32rpx;
- color: #fff;
+ font-size: 30rpx;
+ color: rgba(255,255,255, .85);
}
.moneyBox {
diff --git a/pages/invoiceList/components/already/index.js b/pages/invoiceList/components/already/index.js
index afb62bd..4c61922 100644
--- a/pages/invoiceList/components/already/index.js
+++ b/pages/invoiceList/components/already/index.js
@@ -35,7 +35,7 @@ Component({
const { page, list = [] } = this.data;
const { code, message, data } = await getAlreadyInvoiceList(page);
if (!data.length) {
- alertInfo("没用更多数据了")
+ alertInfo("没有更多数据了")
return
}
this.setData({
diff --git a/pages/invoiceList/components/info/index.wxml b/pages/invoiceList/components/info/index.wxml
index e4f5ee7..a9c9c66 100644
--- a/pages/invoiceList/components/info/index.wxml
+++ b/pages/invoiceList/components/info/index.wxml
@@ -70,7 +70,7 @@
>
diff --git a/pages/invoicing/index.js b/pages/invoicing/index.js
index 38cd1db..5954fef 100644
--- a/pages/invoicing/index.js
+++ b/pages/invoicing/index.js
@@ -38,7 +38,7 @@ Page({
if (user.isAdmin) {
wx.showModal({
title: '提示',
- content: '当前公司没用开票信息，请先前往开票信息页面编辑开票信息',
+ content: '当前公司没有开票信息，请先前往开票信息页面编辑开票信息',
confirmText: '前往编辑',
cancelText: '取消',
complete: (res) => {
@@ -57,7 +57,7 @@ Page({
} else {
wx.showModal({
title: '提示',
- content: '当前公司没用开票信息，请联系管理员编辑完开票信息之后再开票',
+ content: '当前公司没有开票信息，请联系管理员编辑完开票信息之后再开票',
showCancel: false,
confirmText: '返回',
complete: (res) => {
diff --git a/pages/qrCode/index.js b/pages/qrCode/index.js
index f4639f8..376c274 100644
--- a/pages/qrCode/index.js
+++ b/pages/qrCode/index.js
@@ -23,7 +23,9 @@ Page({
*/
onLoad(options) {
// this.getList()
- this.getCode()
+ loadingFunc(async () => {
+ await this.getCode()
+ })
},
async getList() {
const { code, message, data } = await getOwnTenementList()
diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js
index f6f53aa..dcfd6de 100644
--- a/pages/rechargeDetail/index.js
+++ b/pages/rechargeDetail/index.js
@@ -1,4 +1,5 @@
import { getRechargeDetail } from "../../service/recharge";
+import { alertError, alertInfo, loadingFunc } from "../../utils/index";
import { getRechargeOperateType, getRechargeOperateWay } from "../../utils/data";
import request from "../../utils/request"
const { OK } = request
@@ -17,10 +18,16 @@ Page({
*/
onLoad(options) {
const { id } = options;
- this.init(id)
+ loadingFunc(async () => {
+ await this.init(id)
+ })
},
async init(id) {
const { code, message, data } = await getRechargeDetail(id)
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
this.setData({
detail: { ...data, way: getRechargeOperateWay(data.way), type: getRechargeOperateType(data.type) }
})
diff --git a/pages/rechargeRecord/index.js b/pages/rechargeRecord/index.js
index 1ec0f63..a1f7621 100644
--- a/pages/rechargeRecord/index.js
+++ b/pages/rechargeRecord/index.js
@@ -1,6 +1,6 @@
import { getRechargeList } from "../../service/recharge";
import { getTenementMeterList } from "../../service/meter";
-import { getYears, alertInfo } from "../../utils/index";
+import { getYears, alertInfo, loadingFunc } from "../../utils/index";
import request from "../../utils/request";
const { OK } = request;
// pages/rechargeRecord/index.js
@@ -95,10 +95,14 @@ Page({
onShow() {
const { year } = this.data;
const tenement = wx.getStorageSync('tenement')
- this.init(year, '');
- this.getMeters(tenement?.id);
+ loadingFunc(async () => {
+ await this.init(year, '');
+ await this.getMeters(tenement?.id);
+ });
+
},
refreshEmpty() {
+ const { year } = this.data;
const tenement = wx.getStorageSync('tenement')
this.init(year, '');
this.init(year, tenement);
diff --git a/pages/rechargeRecord/index.wxml b/pages/rechargeRecord/index.wxml
index ebe75b5..a21c07b 100644
--- a/pages/rechargeRecord/index.wxml
+++ b/pages/rechargeRecord/index.wxml
@@ -4,14 +4,14 @@
{{ year }}年
-
+
{{ meterCode }}
全部
-
+
diff --git a/pages/rechargeRecord/index.wxss b/pages/rechargeRecord/index.wxss
index 8e1a19d..409aceb 100644
--- a/pages/rechargeRecord/index.wxss
+++ b/pages/rechargeRecord/index.wxss
@@ -3,6 +3,8 @@
.yearPicker {
display: flex;
align-items: center;
+ color: #fff;
+ font-size: 32rpx;
}
.down {
@@ -35,11 +37,12 @@
font-size: 34rpx;
}
.time {
- margin-top: 16rpx;
+ margin-top: 12rpx;
font-size: 28rpx;
+ color:rgb(158, 154, 154);
}
.money {
- font-size: 40rpx;
+ font-size: 36rpx;
font-weight: 500;
margin-right: 30rpx;
}
@@ -61,6 +64,8 @@
margin-left: 30rpx;
display: flex;
align-items: center;
+ color: #fff;
+ font-size: 32rpx;
}
.allMoney {
@@ -73,8 +78,9 @@
}
.type {
- margin-right: 46rpx;
+ margin-right: 40rpx;
font-weight: 600;
+ font-size: 36rpx;
}
.codeTime {