From 9ca94479fa98821b4286dd7fe39c82961c161571 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 24 Jun 2024 15:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E5=8A=A8=E7=BB=91?=
=?UTF-8?q?=E5=AE=9A=E4=B8=8D=E8=83=BD=E8=BF=94=E5=9B=9E=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8F=91=E7=A5=A8=E7=B1=BB?=
=?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A6=96?=
=?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/handleLogin/index.js | 8 ++++++--
pages/handleLogin/index.wxml | 2 +-
pages/home/index.js | 2 +-
pages/home/index.wxml | 2 +-
pages/home/index.wxss | 4 ++++
pages/invoiceDetailContent/index.wxml | 2 +-
pages/invoiceList/components/already/index.wxml | 2 +-
pages/invoiceList/components/info/index.wxml | 8 ++++----
pages/invoiceList/components/notyet/index.js | 1 -
pages/invoicing/index.wxml | 6 +++---
pages/updateInvoice/index.wxml | 8 ++++----
11 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/pages/handleLogin/index.js b/pages/handleLogin/index.js
index a078e0b..0ad24cd 100644
--- a/pages/handleLogin/index.js
+++ b/pages/handleLogin/index.js
@@ -14,14 +14,18 @@ Page({
parkName: "",
park: "",
tenementName: "",
- tenement: ""
+ tenement: "",
+ canBack: true,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
+ const { canBack } = options
+ if (canBack === 'false') {
+ this.setData({ canBack: false })
+ }
},
onChangeName(e) {
this.setData({
diff --git a/pages/handleLogin/index.wxml b/pages/handleLogin/index.wxml
index d87f22d..e57879d 100644
--- a/pages/handleLogin/index.wxml
+++ b/pages/handleLogin/index.wxml
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/home/index.js b/pages/home/index.js
index a97eb8f..64c22bb 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -294,7 +294,7 @@ Page({
if (!data?.length) {
alertInfo("尚无信息")
wx.redirectTo({
- url: '/pages/handleLogin/index',
+ url: '/pages/handleLogin/index?back=false',
})
return;
}
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index dc7e420..b1e26ed 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -24,7 +24,7 @@
- {{tenement.name}}
+ {{tenement.name}}
欢迎使用华昌宝能用电管理系统！
diff --git a/pages/home/index.wxss b/pages/home/index.wxss
index c745b2c..23ddc7c 100644
--- a/pages/home/index.wxss
+++ b/pages/home/index.wxss
@@ -21,6 +21,10 @@
.park {
margin-left: 20rpx;
+ max-width: 200rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
.parkContent {
diff --git a/pages/invoiceDetailContent/index.wxml b/pages/invoiceDetailContent/index.wxml
index 32e5f1a..35d8faa 100644
--- a/pages/invoiceDetailContent/index.wxml
+++ b/pages/invoiceDetailContent/index.wxml
@@ -56,7 +56,7 @@
title-width="160rpx"
/>
- 发票类型：{{ item.invoice.type === 0 ? '普通电子发票' : '增值税专用电子发票' }}
+ 发票类型：{{ item.invoice.type === 0 ? '普通发票' : '增值税专用发票' }}
{{item.finishTime}}
diff --git a/pages/invoiceList/components/info/index.wxml b/pages/invoiceList/components/info/index.wxml
index a9c9c66..ad8efda 100644
--- a/pages/invoiceList/components/info/index.wxml
+++ b/pages/invoiceList/components/info/index.wxml
@@ -23,8 +23,8 @@
border="{{ false }}"
>
- 普通电子发票
- 增值税专用电子发票
+ 普通发票
+ 增值税专用发票
-
@@ -141,8 +141,8 @@
>
- 普通电子
- 增值税专用电子
+ 普通发票
+ 增值税专用发票
diff --git a/pages/invoiceList/components/notyet/index.js b/pages/invoiceList/components/notyet/index.js
index 9c43a1b..246de48 100644
--- a/pages/invoiceList/components/notyet/index.js
+++ b/pages/invoiceList/components/notyet/index.js
@@ -65,7 +65,6 @@ Component({
selectMoney += list[i]?.money;
}
}
- console.log('newSelectList', newSelectList)
this.setData({
// chooseList: newList,
selectList: newSelectList,
diff --git a/pages/invoicing/index.wxml b/pages/invoicing/index.wxml
index 7ee0d06..8529c37 100644
--- a/pages/invoicing/index.wxml
+++ b/pages/invoicing/index.wxml
@@ -7,8 +7,8 @@
- 普通电子发票
- 增值税专用电子发票
+ 普通发票
+ 增值税专用发票
@@ -120,7 +120,7 @@
border="{{false}}"
/>
- 普通电子
- 增值税专用电子
+ 普通发票
+ 增值税专用发票
- 普通电子发票
- 增值税专用电子发票
+ 普通发票
+ 增值税专用发票
-