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 @@
 <!--pages/handleLogin/index.wxml-->
 <!-- <topbar /> -->
-<navigator title="绑定商户" canBack="{{true}}" />
+<navigator title="绑定商户" canBack="{{canBack}}" />
 <van-tabs>
   <van-tab title="扫码绑定">
     <view class="codeContent">
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 @@
 <view class="logined" wx:else>
   <avatar text="{{ user.nickName }}" />
   <view>
-    <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>
+    <van-button type="info" size="small" plain="{{true}}" class="loginBtn" custom-style="font-size: 32rpx; max-width:300rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" bind:click="chooseTenement">{{tenement.name}}    <van-icon name="arrow-down" style="margin-left: 16rpx;" /></van-button>
     <view class="welcome"> 欢迎使用华昌宝能用电管理系统！ </view>
   </view>
 </view>
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"
   />
   <van-field
-    value="{{detail.invoice.type === 0 ? '普通电子发票' : '增值税专用电子发票'}}"
+    value="{{detail.invoice.type === 0 ? '普通发票' : '增值税专用发票'}}"
     label="发票类型 :"
     readonly
     autosize="{{true}}"
diff --git a/pages/invoiceList/components/already/index.wxml b/pages/invoiceList/components/already/index.wxml
index 4cc2aa7..c380db2 100644
--- a/pages/invoiceList/components/already/index.wxml
+++ b/pages/invoiceList/components/already/index.wxml
@@ -11,7 +11,7 @@
         发票内容： {{item.invoice.content}}（{{item.money}}元）
       </view>
       <view class="invoiceType">
-        发票类型：{{ item.invoice.type === 0 ? '普通电子发票' : '增值税专用电子发票' }}
+        发票类型：{{ item.invoice.type === 0 ? '普通发票' : '增值税专用发票' }}
       </view>
       <view class="time">
         {{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 }}"
         >
           <view slot="input" style="margin-top: -10rpx;"> 
-            <view wx:if="{{detail.type === 0}}"> 普通电子发票 </view>
-            <view wx:elif="{{detail.type === 1}}"> 增值税专用电子发票 </view>
+            <view wx:if="{{detail.type === 0}}"> 普通发票 </view>
+            <view wx:elif="{{detail.type === 1}}"> 增值税专用发票 </view>
             <view wx:else>-</view>
           </view>
         </van-field>
@@ -141,8 +141,8 @@
         >
           <view slot="input" style="margin-top: 16rpx;">
             <van-radio-group direction="horizontal" value="{{formData.type}}" bind:change="onChangeType">
-              <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">普通电子</van-radio>
-              <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">增值税专用电子</van-radio>
+              <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">普通发票</van-radio>
+              <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">增值税专用发票</van-radio>
             </van-radio-group>
           </view>
         </van-field>
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 @@
 <view>
   <card title="发票类型">
     <van-radio-group disabled="{{true}}"  direction="horizontal" slot="content" value="{{detail.type}}">
-      <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 32rpx;margin-bottom: 20rpx;">普通电子发票</van-radio>
-      <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 32rpx;">增值税专用电子发票</van-radio>
+      <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 32rpx;margin-bottom: 20rpx;">普通发票</van-radio>
+      <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 32rpx;">增值税专用发票</van-radio>
     </van-radio-group>
   </card>
 </view>
@@ -120,7 +120,7 @@
       border="{{false}}"
     />
     <van-field
-      value="{{ detail.type === 0 ? '普通电子发票' : '增值税专用电子发票' }}"
+      value="{{ detail.type === 0 ? '普通发票' : '增值税专用发票' }}"
       label="发票类型"
       readonly
       title-width="132rpx"
diff --git a/pages/updateInvoice/index.wxml b/pages/updateInvoice/index.wxml
index 8834548..cf29b62 100644
--- a/pages/updateInvoice/index.wxml
+++ b/pages/updateInvoice/index.wxml
@@ -24,14 +24,14 @@
       >
         <view slot="input" style="margin-top: 16rpx;" wx:if="{{editType === 'edit'}}">
           <van-radio-group direction="horizontal" value="{{formData.type}}" bind:change="onChangeType">
-            <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">普通电子</van-radio>
-            <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">增值税专用电子</van-radio>
+            <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">普通发票</van-radio>
+            <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">增值税专用发票</van-radio>
           </van-radio-group>
         </view>
         
         <view wx:else slot="input" style="margin-top: -10rpx;"> 
-          <view wx:if="{{detail.type === 0}}"> 普通电子发票 </view>
-          <view wx:elif="{{detail.type === 1}}"> 增值税专用电子发票 </view>
+          <view wx:if="{{detail.type === 0}}"> 普通发票 </view>
+          <view wx:elif="{{detail.type === 1}}"> 增值税专用发票 </view>
           <view wx:else>-</view>
         </view>
       </van-field>