Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart

@@ -69,7 +69,7 @@ class _LifePayBillPageState extends State<LifePayBillPage> {
                 _cardList('收费项目', widget.model.chargesName),
                 SizedBox(height: 30.w),
                 _cardList('收费地址',
-                    '${S.of(context)!.tempPlotName} ${widget.model.unitName + widget.model.estateName}'),
+                    '${widget.model.buildingName + '栋' + widget.model.unitName + '单元' + widget.model.estateName}'),
               ],
             ),
           ),
@@ -92,14 +92,14 @@ class _LifePayBillPageState extends State<LifePayBillPage> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                _billItem('账单月份',DateUtil.formatDate(DateTime.parse(widget.model.billDateStart),
+                _billItem('账单月份',DateUtil.formatDate(DateUtil.getDateTime(widget.model.billDateStart),
                     format: 'yyyy-MM'),),
                 _billItem('缴纳金额','¥'+widget.model.payAmount.toStringAsFixed(2),isRed: true),
 
-                _billItem('缴费时间',DateUtil.formatDate(DateTime.parse(widget.model.createDate),
+                _billItem('缴费时间',DateUtil.formatDate(DateUtil.getDateTime(widget.model.createDate),
                     format: 'yyyy/MM/dd hh:mm'),),
                 _billItem('付款方式',  '${getPayType[widget.model.payType]}'),
-                _billItem('账单创建时间',DateUtil.formatDate(DateTime.parse(widget.model.billCreateDate),
+                _billItem('账单创建时间',DateUtil.formatDate(DateUtil.getDateTime(widget.model.billCreateDate),
                     format: 'yyyy/MM/dd hh:mm'),),
                 _billItem('流水号',widget.model.code,),
 

lib/pages/opening_code_page/opening_code_page.dart

@@ -168,6 +168,15 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
                                     size: 460.w,
                                   ),
                                 ),
+                                36.hb,
+                                if (UserTool.userProvider.defaultHouse != null)
+                                  Center(
+                                    child: '本小区尚未配置门禁设备'
+                                        .text
+                                        .size(28.sp)
+                                        .color(Colors.red)
+                                        .make(),
+                                  ),
                               ],
                             ),
                           ),
@@ -217,7 +226,7 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
                                 suffix: ''),
                             buildRow(
                                 onTap: () {
-                                  BotToast.showText(text: '当前小区未接入开门码功能');
+                                  BotToast.showText(text: '当前小区未接入人脸识别功能');
                                 },
                                 text: '人脸识别',
                                 suffix: ''),