修改样式

app.wxss

@@ -8,7 +8,7 @@ page {
 }
 
 .border {
-  border: 0.5rpx solid #f0f0f0;
+  border: 0.5rpx solid #cfc9c9;
 }
 
 .radius12 {

components/dot/index.wxss

@@ -1,10 +1,13 @@
 /* components/dot/index.wxss */
 .dot {
   background-color: #ee0a24;
-  width: 56rpx;
+  width: 52rpx;
-  height: 56rpx;
+  height: 52rpx;
   border-radius: 50%;
   text-align: center;
   color: #fff;
-  font-size: 28rpx;
+  font-size: 26rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }

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({

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"
 }

pages/billList/index.wxml

@@ -1,8 +1,12 @@
 <!--pages/billList/index.wxml-->
 <navigator title="电费账单" canBack="{{true}}" />
-
+<view wx:if="{{!list.length}}">
-<view class="itemWrapper" wx:for="{{list}}" wx:key="index">
+  <empty bind:refresh="init" />
+</view>
+<view wx:else>
+  <view class="itemWrapper" wx:for="{{list}}" wx:key="index">
     <van-icon name="balance-list-o" />
     <view class="time"> {{ item.time }} </view>
     <view class="operate" bind:tap="jumpToDetail" data-id="{{item.id}}"> 查看详细 </view>
+  </view>
 </view>

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;
+  font-size: 28rpx;
-  color: rgb(119, 114, 114);
+  color: rgb(97, 93, 93);
 }
 .timeChooseWrapper {
   display: flex;
   align-items: center;
+  font-size: 30rpx;
 }
 
 .time {

pages/home/index.wxml

@@ -24,7 +24,7 @@
 <view class="logined" wx:else>
   <avatar text="{{ user.nickName }}" />
   <view>
-    <van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="chooseTenement">{{tenement.name}}    <van-icon name="arrow-down" style="margin-left: 16rpx;" /></van-button>
+    <van-button type="info" size="small" plain="{{true}}" class="loginBtn" custom-style="font-size: 32rpx;" bind:click="chooseTenement">{{tenement.name}}    <van-icon name="arrow-down" style="margin-left: 16rpx;" /></van-button>
     <view class="welcome"> 欢迎使用华昌宝能用电管理系统！ </view>
   </view>
 </view>
@@ -53,10 +53,10 @@
       </view>
       <view class="cardItem">
         <view class="cardItemLabel"> 电表余额： </view>
-        <view class="cardItemValue">
+        <view class="cardItemValue" style="position: relative;">
           <view class="text"  wx:if="{{user.id}}"> {{meter.money}} </view>
           <view class="text"  wx:else> --- </view>
-          <van-button type="info" size="small" plain="{{true}}" bind:click="refreshMeter"  wx:if="{{user.id}}">
+          <van-button type="info" size="small" plain="{{true}}" custom-style="position: absolute; right: 0; bottom: 0;z-index: 99;" bind:click="refreshMeter"  wx:if="{{user.id}}">
             <van-icon name="replay" />
             刷新
           </van-button>

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;
+  font-size: 30rpx;
-  color: #fff;
+  color: rgba(255,255,255, .85);
 }
 
 .moneyBox {

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({

pages/invoiceList/components/info/index.wxml

@@ -70,7 +70,7 @@
         >
         </van-field>
         <van-field
-          value="{{detail.bank}}"
+          value="{{detail.bank || '-'}}"
           label="开户行"
           wx:if="{{detail.headerType === 0}}"
           custom-style="padding-left: 0; padding-right: 0;"
@@ -306,6 +306,7 @@
         border="{{ editType === 'detail' ? false : true }}"
         bind:change="onChangeText"
         data-name="email"
+        placeholder="请输入电子邮箱"
       />
     </view>
   </card>

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) => {

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()

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) }
     })

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, '');
+    loadingFunc(async () => {
-    this.getMeters(tenement?.id);
+      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);

pages/rechargeRecord/index.wxml

@@ -4,14 +4,14 @@
   <!-- <picker bindchange="onChangeYear" value="{{index}}" range="{{years}}"> -->
     <view class="yearPicker" bind:tap="clickYear">
       {{ year }}年
-      <image src="/assets/images/down.png" mode="" class="down" />
+      <van-icon name="arrow-down" custom-class="down" />
     </view>
   <!-- </picker> -->
   <!-- <picker bindchange="onChangeYear" value="{{index}}" range="{{years}}"> -->
     <view class="tenementPicker" bind:tap="clickMeter">
       <view wx:if="{{meterCode}}" class="tenementName"> {{ meterCode }} </view>
       <view wx:else> 全部 </view>
-      <image src="/assets/images/down.png" mode="" class="down" />
+      <van-icon name="arrow-down" custom-class="down" />
     </view>
   <!-- </picker> -->
   <view class="allMoney">

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 {