Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/zhangdanlist/zhangdanlist.js

pages/zhangdanlist/zhangdanlist.js

@@ -15,16 +15,20 @@ Page({
     customAmount: '',
     inputFocus: false,
     address: '',
-    billList: []
+    billList: [],
+    // 是否可以开票
+    isInvoic:false,
   },
 
   onLoad: function(options) {
+    debugger;
     // 确保图片资源正确加载
     this.setData({
       images: {
         background: '/static_file/background.png',
         water: '/static_file/water.png'
-      }
+      },
+      isInvoic: app.globalData.waterCompanys.filter(data=>data.id==app.globalData.currentAccountInfo.dsKey)[0].swCompanyInfo.supportonlineinvoice=="1"
     });
     // 获取账单列表
     this.getBillList();
@@ -66,7 +70,7 @@ Page({
   },
   // 返回上一页
   goBack: function() {
-
+    wx.navigateBack();
   },
 
   // 点击开发票按钮
@@ -116,6 +120,12 @@ Page({
 
   // 获取发票
   getInvoice: function(e) {
+    wx.showToast({
+      title: '暂不支持!',
+      icon: 'none'
+    });
+    return;
+    // 阻止事件冒泡，避免触发goToBillDetail
     e.stopPropagation();
     const bill = e.currentTarget.dataset.bill;
     wx.navigateTo({

pages/zhangdanlist/zhangdanlist.wxml

@@ -29,7 +29,7 @@
         <view class="bill-card" bindtap="goToBillDetail" data-bill="{{item}}">
           <view class="bill-date">
             <text>{{item.billDate}}</text>
-            <view wx:if="{{item.isPaid}}" class="invoice-btn" catchtap="getInvoice" data-bill="{{item}}">开发票></view>
+            <view wx:if="{{isInvoic&&item.isPaid}}" class="invoice-btn" catchtap="getInvoice" data-bill="{{item}}">开发票></view>
           </view>
           
           <view class="bill-info">