生活缴费

lib/constants/api.dart

@@ -272,8 +272,6 @@ class _Manager {
   ///借还管理：根据用户主键id查询需要归还物品信息（归还界面）
   String get articleReturnList => '/user/articleBorrow/findBorrowByUserId';
 
-  ///生活缴费：查询生活缴费信息list
-  String get dailyPaymentList => '/user/dailyPayment/list';
 
   ///生活缴费：查询当前用户的房屋是否缴费
   String get findEstatelsPament => '/user/dailyPayment/findEstateIsPayment';

lib/constants/application_objects.dart

@@ -13,6 +13,7 @@ import 'package:aku_new_community/pages/goods_manage_page/select_borrow_return_p
 import 'package:aku_new_community/pages/house_introduce/house_introduce.dart';
 import 'package:aku_new_community/pages/industry_committee/industry_committee_page.dart';
 import 'package:aku_new_community/pages/life_pay/life_pay_choose_page.dart';
+import 'package:aku_new_community/pages/life_pay/life_pay_page.dart';
 import 'package:aku_new_community/pages/one_alarm/widget/alarm_page.dart';
 import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart';
 import 'package:aku_new_community/pages/renovation_manage/new_renovation/new_renovation_page.dart';
@@ -75,7 +76,7 @@ List<AO> appObjects = [
   AO('开门码', R.ASSETS_ICONS_FUNC_KMM_PNG, () => OpeningCodePage()),
   AO('访客邀请', R.ASSETS_ICONS_FUNC_FKYQ_PNG, () => VisitorAccessPage()),
   AO('报事报修', R.ASSETS_ICONS_FUNC_BSBX_PNG, () => WorkOrderPage()),
-  AO('生活缴费', R.ASSETS_ICONS_FUNC_SHJF_PNG, () => LifePayChoosePage()),
+  AO('生活缴费', R.ASSETS_ICONS_FUNC_SHJF_PNG, () => LifePayPage()),
   AO('业委会', R.ASSETS_ICONS_FUNC_YWH_PNG, () => IndustryCommitteePage()),
   AO('建议咨询', R.ASSETS_ICONS_FUNC_JYZX_PNG,
       () => AdvicePage(type: AdviceType.SUGGESTION)),

lib/constants/saas_api.dart

@@ -34,6 +34,7 @@ class SAASAPI {
   static _Information information = _Information();
   static _WorkOrder workOrder = _WorkOrder();
   static _Pay pay = _Pay();
+  static _LifePay lifePay = _LifePay();
 
   ///二级分类
   static _ProfileApi profile = _ProfileApi();
@@ -262,3 +263,14 @@ class _Pay {
   ///app商品 向支付宝发起订单查询请求
   String get jcookOrderCheckAlipay => '/app/user/alipay/jcookOrderCheckAlipay';
 }
+
+
+class _LifePay{
+  ///查询该房屋下所有的未缴费的订单
+  String get livingExpensesList => '/app/user/livingExpenses/list';
+
+  ///生活缴费支付记录
+  String get paymentRecordList => '/app/user/livingExpenses/paymentRecord';
+
+
+}

lib/pages/life_pay/life_pay_page.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/models/life_pay/life_pay_list_model.dart';
 import 'package:aku_new_community/pages/life_pay/life_pay_record_page.dart';
 import 'package:aku_new_community/pages/life_pay/life_pre_pay_page.dart';
@@ -294,7 +295,7 @@ class _LifePayPageState extends State<LifePayPage> {
           _page = 1;
           _size = 10;
           BaseListModel baseListModel = await NetUtil()
-              .getList(API.manager.dailyPaymentList, params: {
+              .getList(SAASAPI.lifePay.livingExpensesList, params: {
             "pageNum": _page,
             "size": _size,
             'estateId': appProvider.selectedHouse!.estateId
@@ -331,7 +332,7 @@ class _LifePayPageState extends State<LifePayPage> {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  '缴费账单'.text.color(ktextPrimary).size(28.sp).make(),
+                  '当前账单'.text.color(ktextPrimary).size(28.sp).make(),
                   ...List.generate(_models.length,
                           (index) => _buildCard(_models[index], index))
                       .sepWidget(separate: BeeDivider.horizontal()),

lib/widget/others/house_head_card.dart

@@ -60,7 +60,8 @@ class HouseHeadCard extends StatelessWidget {
                             .bold
                             .make(),
                         10.w.heightBox,
-                        appProvider.selectedHouse!.roomName.text.black
+
+                          (appProvider.selectedHouse!=null?appProvider.selectedHouse!.roomName:'').text.black
                             .size(32.sp)
                             .bold
                             .make()