From 3d13c3003a8613cea452b6a1d988b294755ca570 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 6 May 2024 15:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E7=A5=A8=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=92=8C=E8=AF=A6=E6=83=85=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/electricQuery/index.js                  |   1 -
 pages/home/index.js                           |   2 +
 pages/invoiceList/components/already/index.js |   1 -
 pages/invoiceList/components/info/index.js    |   4 +
 pages/invoiceList/components/info/index.wxml  | 213 +++++++++++-------
 pages/invoicing/index.js                      |   1 -
 pages/my/index.json                           |   6 +-
 pages/my/index.wxml                           |  26 +--
 pages/rechargeRecord/index.js                 |   2 +-
 9 files changed, 151 insertions(+), 105 deletions(-)

diff --git a/pages/electricQuery/index.js b/pages/electricQuery/index.js
index d82d9d0..afcffc0 100644
--- a/pages/electricQuery/index.js
+++ b/pages/electricQuery/index.js
@@ -122,7 +122,6 @@ Page({
   onOk(e) {
     const { type, value = {} } = e.detail;
     const { id, code } = e;
-    console.log('e', e)
     const { year } = this.data;
     // const currentYear = years[Number(e)]
     this.setData({
diff --git a/pages/home/index.js b/pages/home/index.js
index c772215..5beee83 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -306,6 +306,8 @@ Page({
     updateDatas.all = data;
     this.setData({
       ...updateDatas
+    }, () => {
+      this.getMeters({ id: updateDatas.tenement.id })
     })
   },
   jumpToRecord() {
diff --git a/pages/invoiceList/components/already/index.js b/pages/invoiceList/components/already/index.js
index 38071d5..f0c6561 100644
--- a/pages/invoiceList/components/already/index.js
+++ b/pages/invoiceList/components/already/index.js
@@ -20,7 +20,6 @@ Component({
     list: []
   },
   onRefresh() {
-    console.log('--------------')
     this.getList();
   },
   lifetimes: {
diff --git a/pages/invoiceList/components/info/index.js b/pages/invoiceList/components/info/index.js
index 27bdac3..6215f60 100644
--- a/pages/invoiceList/components/info/index.js
+++ b/pages/invoiceList/components/info/index.js
@@ -107,6 +107,10 @@ Component({
         }
       }
       const { code, message } = await updateInvoiceInfo(formData)
+      if (code !== OK) {
+        alertInfo(message)
+        return;
+      }
       alertSuccess("编辑成功")
       this.getDetail()
     }
diff --git a/pages/invoiceList/components/info/index.wxml b/pages/invoiceList/components/info/index.wxml
index 6c85aa8..010e497 100644
--- a/pages/invoiceList/components/info/index.wxml
+++ b/pages/invoiceList/components/info/index.wxml
@@ -60,31 +60,45 @@
         </view>
       </van-field>
       <van-field
+        wx:if="{{editType === 'detail'}}"
+        value="{{detail.name || '--'}}"
+        label="发票抬头"
+        custom-style="padding-left: 0; padding-right: 0;"
+        readonly="{{true}}"
+        autosize="{{true}}"
+        type="textarea"
+        title-width="132rpx"
+        border="{{ false }}"
+      />
+      <van-field
+        wx:else
         value="{{formData.name}}"
         label="发票抬头"
         custom-style="padding-left: 0; padding-right: 0;"
-        readonly="{{editType === 'detail'}}"
-        disabled="{{editType === 'edit' && formData.headerType !== 1}}"
+        disabled="{{formData.headerType !== 1}}"
         autosize="{{true}}"
         type="textarea"
         title-width="132rpx"
         bind:change="onChangeText"
         data-name="name"
         bind:change="onChangeText"
-        border="{{ editType === 'detail' ? false : true }}"
-      >
-        <view 
-          wx:if="{{editType === 'detail'}}"  
-          slot="input" 
-        > 
-          <view wx:if="{{!!detail.name}}" style="margin-top: -10rpx;"> {{detail.name}} </view>
-          <view wx:else  style="margin-top: -10rpx;">--</view>
-        </view>
-      </van-field>
+        border="{{ true }}"
+      />
       <van-field
-        value="{{formData.tin}}"
+        value="{{detail.tin|| '--'}}"
         label="发票税号"
-        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
+        wx:if="{{editType === 'detail' && detail.headerType === 0}}"
+        custom-style="padding-left: 0; padding-right: 0;"
+        readonly="{{editType === 'detail'}}"
+        autosize="{{true}}"
+        type="textarea"
+        title-width="132rpx"
+        border="{{ editType === 'detail' ? false : true }}"
+      />
+      <van-field
+        value="{{formData.tin }}"
+        label="发票税号"
+        wx:if="{{editType === 'edit' && formData.headerType === 0}}"
         placeholder="{{editType === 'edit' ? '请输入发票税号' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -94,41 +108,35 @@
         bind:change="onChangeText"
         data-name="tin"
         border="{{ editType === 'detail' ? false : true }}"
-      >
-        <view 
-          wx:if="{{editType === 'detail'}}"  
-          slot="input" 
-        > 
-          <view wx:if="{{!!detail.tin}}" style="margin-top: -10rpx;">{{detail.tin}}</view>
-          <view wx:else style="margin-top: -10rpx;">-</view>
-        </view>
-      </van-field>
+      />
+      <van-field
+        value="{{detail.bank || '--'}}"
+        label="开户行"
+        wx:if="{{editType === 'detail' && detail.headerType === 0}}"
+        custom-style="padding-left: 0; padding-right: 0;"
+        readonly="{{editType === 'detail'}}"
+        autosize="{{true}}"
+        type="textarea"
+        title-width="132rpx"
+        border="{{ editType === 'detail' ? false : true }}"
+      />
       <van-field
         value="{{formData.bank}}"
         label="开户行"
-        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
-        placeholder="{{editType === 'edit' ? '请输入开户行' : ''}}"
+        wx:if="{{editType === 'edit' && formData.headerType === 0}}"
+        placeholder="{{'请输入开户行'}}"
         custom-style="padding-left: 0; padding-right: 0;"
-        readonly="{{editType === 'detail'}}"
-        autosize="{{bank}}"
+        autosize="{{true}}"
         type="textarea"
         title-width="132rpx"
         border="{{ editType === 'detail' ? false : true }}"
         bind:change="onChangeText"
         data-name="bank"
-      >
-        <view 
-          wx:if="{{editType === 'detail'}}"  
-          slot="input" 
-        > 
-          <view wx:if="{{!!detail.bank}}" style="margin-top: -10rpx;">{{detail.bank}}</view>
-          <view wx:else style="margin-top: -10rpx;">-</view>
-        </view>
-      </van-field>
+      />
       <van-field
-        value="{{formData.account}}"
+        value="{{detail.account || '--'}}"
         label="银行账号"
-        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
+        wx:if="{{(editType === 'detail' && detail.headerType === 0)}}"
         placeholder="{{editType === 'edit' ? '请输入银行账号' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -138,19 +146,25 @@
         border="{{ editType === 'detail' ? false : true }}"
         bind:change="onChangeText"
         data-name="account"
-      >
-        <view 
-          wx:if="{{editType === 'detail' && !detail.account}}"  
-          slot="input" 
-        > 
-          <view wx:if="{{!!detail.account}}">{{detail.account}}</view>
-          <view>-</view>
-        </view>
-      </van-field>
+      />
       <van-field
-        value="{{detail.address}}"
+        value="{{formData.account}}"
+        label="银行账号"
+        wx:if="{{(editType === 'edit' && formData.headerType === 0) }}"
+        placeholder="{{editType === 'edit' ? '请输入银行账号' : ''}}"
+        custom-style="padding-left: 0; padding-right: 0;"
+        readonly="{{editType === 'detail'}}"
+        autosize="{{true}}"
+        type="textarea"
+        title-width="132rpx"
+        border="{{ editType === 'detail' ? false : true }}"
+        bind:change="onChangeText"
+        data-name="account"
+      />
+      <van-field
+        value="{{detail.address || '--'}}"
         label="地址"
-        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
+        wx:if="{{(editType === 'detail' && detail.headerType === 0)}}"
         placeholder="{{editType === 'edit' ? '请输入地址' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -160,19 +174,25 @@
         border="{{ editType === 'detail' ? false : true }}"
         bind:change="onChangeText"
         data-name="address"
-      >
-        <view 
-          wx:if="{{editType === 'detail'}}"  
-          slot="input" 
-        > 
-          <view wx:if="{{!!detail.address}}">{{detail.address}}</view>
-          <view>-</view>
-        </view>
-      </van-field>
+      />
       <van-field
-        value="{{detail.phone}}"
+        value="{{formData.address}}"
+        label="地址"
+        wx:if="{{(editType === 'edit' && formData.headerType === 0)}}"
+        placeholder="{{editType === 'edit' ? '请输入地址' : ''}}"
+        custom-style="padding-left: 0; padding-right: 0;"
+        readonly="{{editType === 'detail'}}"
+        autosize="{{true}}"
+        type="textarea"
+        title-width="132rpx"
+        border="{{ editType === 'detail' ? false : true }}"
+        bind:change="onChangeText"
+        data-name="address"
+      />
+      <van-field
+        value="{{detail.phone || '--'}}"
         label="电话"
-        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
+        wx:if="{{(editType === 'detail' && detail.headerType === 0)}}"
         placeholder="{{editType === 'edit' ? '请输入电话' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -182,17 +202,38 @@
         border="{{ editType === 'detail' ? false : true }}"
         bind:change="onChangeText"
         data-name="phone"
-      >
-        <view 
-          wx:if="{{editType === 'detail' && !detail.phone}}"  
-          slot="input" 
-        > 
-          <view>-</view>
-        </view>
-      </van-field>
+      />
       <van-field
-        value="{{detail.remark}}"
+        value="{{formData.phone }}"
+        label="电话"
+        wx:if="{{(editType === 'edit' && formData.headerType === 0) }}"
+        placeholder="{{editType === 'edit' ? '请输入电话' : ''}}"
+        custom-style="padding-left: 0; padding-right: 0;"
+        readonly="{{editType === 'detail'}}"
+        autosize="{{true}}"
+        type="textarea"
+        title-width="132rpx"
+        border="{{ editType === 'detail' ? false : true }}"
+        bind:change="onChangeText"
+        data-name="phone"
+      />
+      <van-field
+        value="{{detail.remark || '--'}}"
         label="备注"
+        wx:if="{{editType === 'detail' }}"
+        custom-style="padding-left: 0; padding-right: 0;"
+        readonly="{{editType === 'detail'}}"
+        autosize="{{true}}"
+        type="textarea"
+        title-width="132rpx"
+        border="{{ editType === 'detail' ? false : true }}"
+        bind:change="onChangeText"
+        data-name="remark"
+      />
+      <van-field
+        value="{{formData.remark}}"
+        label="备注"
+        wx:else
         placeholder="{{editType === 'edit' ? '请输入备注' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -202,14 +243,7 @@
         border="{{ editType === 'detail' ? false : true }}"
         bind:change="onChangeText"
         data-name="remark"
-      >
-        <view 
-          wx:if="{{editType === 'detail' && !detail.remark}}"  
-          slot="input" 
-        > 
-          <view>-</view>
-        </view>
-      </van-field>
+      />
     </view>
   </card>
 </view>
@@ -217,7 +251,8 @@
   <card title="接收信息">
     <view slot="content"> 
       <van-field
-        value="{{detail.email}}"
+        value="{{detail.email || '--'}}"
+        wx:if="{{editType === 'detail'}}"
         label="电子邮箱"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -227,14 +262,20 @@
         border="{{ editType === 'detail' ? false : true }}"
         bind:change="onChangeText"
         data-name="email"
-      >
-        <view 
-          wx:if="{{editType === 'detail' && !detail.email}}"  
-          slot="input" 
-        > 
-          <view>-</view>
-        </view>
-      </van-field>
+      />
+      <van-field
+        value="{{formData.email}}"
+        wx:else
+        label="电子邮箱"
+        custom-style="padding-left: 0; padding-right: 0;"
+        readonly="{{editType === 'detail'}}"
+        autosize="{{true}}"
+        type="textarea"
+        title-width="132rpx"
+        border="{{ editType === 'detail' ? false : true }}"
+        bind:change="onChangeText"
+        data-name="email"
+      />
     </view>
   </card>
 </view>
diff --git a/pages/invoicing/index.js b/pages/invoicing/index.js
index a8f13fd..99b1012 100644
--- a/pages/invoicing/index.js
+++ b/pages/invoicing/index.js
@@ -23,7 +23,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    console.log('options', options)
     const { money = 0, tenement, ids = '', count = 0, tenementName } = options;
     this.setData({ money, tenement, ids: ids.split(","), count, tenementName })
     this.getDetail();
diff --git a/pages/my/index.json b/pages/my/index.json
index d53986f..10f58ec 100644
--- a/pages/my/index.json
+++ b/pages/my/index.json
@@ -4,7 +4,9 @@
     "van-cell-group": "@vant/weapp/cell-group/index",
     "cell": "/components/cell/index",
     "van-dialog": "@vant/weapp/dialog/index",
-    "dot": "/components/dot/index"
+    "dot": "/components/dot/index",
+    "navigator": "/components/navigator/index"
   },
-  "navigationBarTitleText": "我的"
+  "navigationBarTitleText": "我的",
+  "navigationStyle": "custom"
 }
\ No newline at end of file
diff --git a/pages/my/index.wxml b/pages/my/index.wxml
index 974a775..2c18b70 100644
--- a/pages/my/index.wxml
+++ b/pages/my/index.wxml
@@ -4,20 +4,20 @@
 <cell  title="常见问题" bind:click="jumpToQuestions" /> -->
 
 <!-- <van-cell-group title=" "> -->
-
-  <van-cell title="联系客服" value="" is-link bind:tap="connect" />
-  <van-cell wx:if="{{!!user.isAdmin}}" title="二维码" value="" is-link bind:click="jumpToQrCode" />
-  <van-cell wx:if="{{!!user.isAdmin}}" is-link bind:click="jumpToMember">
-    <view slot="title">
-      <view  class="cellWrapper">        
-        <view class="text"> 成员管理 </view>
-        <dot wx:if="{{dot > 0}}" number="{{dot}}" />
-      </view>
+<navigator title="我的" />
+<van-cell title="联系客服" value="" is-link bind:tap="connect" />
+<van-cell wx:if="{{!!user.isAdmin}}" title="二维码" value="" is-link bind:click="jumpToQrCode" />
+<van-cell wx:if="{{!!user.isAdmin}}" is-link bind:click="jumpToMember">
+  <view slot="title">
+    <view  class="cellWrapper">        
+      <view class="text"> 成员管理 </view>
+      <dot wx:if="{{dot > 0}}" number="{{dot}}" />
     </view>
-  </van-cell>
-  <van-cell title="发票抬头" value="" is-link bind:tap="jumpToUpdateInvoice" />
-  <van-cell title="绑定企业" value="" is-link bind:tap="bindTenement" />
-  <van-cell title="退出登录" value="" is-link bind:tap="logout" />
+  </view>
+</van-cell>
+<van-cell title="发票抬头" value="" is-link bind:tap="jumpToUpdateInvoice" />
+<van-cell title="绑定企业" value="" is-link bind:tap="bindTenement" />
+<van-cell title="退出登录" value="" is-link bind:tap="logout" />
 <!-- </van-cell-group> -->
 <!-- <van-cell-group title=" ">
   <van-cell title="单元格" value="内容" is-link />
diff --git a/pages/rechargeRecord/index.js b/pages/rechargeRecord/index.js
index b9ddd58..6728601 100644
--- a/pages/rechargeRecord/index.js
+++ b/pages/rechargeRecord/index.js
@@ -35,7 +35,7 @@ Page({
   clickMeter() {
     this.setData({
       type: "meter",
-      columns: this.data.meterList.map(item => ({ id: item.id, name: `${item.code}-${item.address}`, code: item.code })),
+      columns: [{id: "", name: "全部", address: "", code: ""}, ...this.data.meterList.map(item => ({ id: item.id, name: `${item.code}-${item.address}`, code: item.code }))],
       show: true,
       title: "表计"
     })