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/life_pay/life_pay_page_new.dart

@@ -244,7 +244,7 @@ class _LifePayPageNewState extends State<LifePayPageNew> {
         Function cancel = BotToast.showLoading();
         BaseModel baseModel = await NetUtil()
             .post(SAASAPI.pay.createLivingExpensesOrder, params: {
-          "chargesBillId": total.ids,
+          "chargesBillIds": total.selectIds.map((e) => e.id).toList(),
           "paymentAmount": total.payTotal
         });
         if (baseModel.success) {

lib/pages/life_pay/life_pay_record_page.dart

@@ -14,7 +14,7 @@ import 'package:get/get.dart';
 import 'life_pay_bill_page/life_pay_bill_page.dart';
 
 class LifePayRecordPage extends StatefulWidget {
-   LifePayRecordPage({Key? key}) : super(key: key);
+  LifePayRecordPage({Key? key}) : super(key: key);
 
   @override
   _LifePayRecordPageState createState() => _LifePayRecordPageState();
@@ -87,24 +87,25 @@ class _LifePayRecordPageState extends State<LifePayRecordPage> {
 
   Widget _buildRecordCard(LifePayRecordModel model) {
     return GestureDetector(
-      onTap: (){
-        Get.to(()=>LifePayBillPage(model: model,));
+      onTap: () {
+        Get.to(() => LifePayBillPage(
+              model: model,
+            ));
       },
       child: Column(
         children: [
           Container(
-            padding: EdgeInsets.symmetric(vertical: 8.w,horizontal: 24.w),
+            padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
             decoration: BoxDecoration(
               color: Colors.black.withOpacity(0.06),
               borderRadius: BorderRadius.circular(8.w),
             ),
-            child: DateUtil.formatDate(
-                DateTime.parse(model.createDate),
-                format: 'MM-dd hh-mm').text
+            child: DateUtil.formatDate(DateUtil.getDateTime(model.createDate),
+                    format: 'MM-dd hh-mm')
+                .text
                 .size(24.sp)
                 .color(Colors.black.withOpacity(0.45))
                 .make(),
-
           ),
           Row(
             children: [
@@ -114,7 +115,7 @@ class _LifePayRecordPageState extends State<LifePayRecordPage> {
                   .bold
                   .make(),
               Spacer(),
-              '${S.of(context)!.tempPlotName} ${model.unitName+model.estateName}'
+              '${model.buildingName + '栋' + model.unitName + '单元' + model.estateName}'
                   .text
                   .size(24.sp)
                   .color(Color(0xFF999999))
@@ -147,7 +148,6 @@ class _LifePayRecordPageState extends State<LifePayRecordPage> {
               '${model.code}'.text.color(ktextPrimary).size(28.sp).make(),
             ],
           ),
-
           Row(
             children: [
               '流水号'.text.color(ktextSubColor).size(28.sp).make(),
@@ -155,7 +155,6 @@ class _LifePayRecordPageState extends State<LifePayRecordPage> {
               '${model.code}'.text.color(ktextPrimary).size(28.sp).make(),
             ],
           ),
-
         ].sepWidget(separate: 24.w.heightBox),
       )
           .box

lib/ui/home/application/all_application.dart

@@ -237,28 +237,29 @@ class _AllApplicationPageState extends State<AllApplicationPage> {
         backgroundColor: Colors.white,
         elevation: 0,
         leading: BeeBackButton(),
-        title: MaterialButton(
-          materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-          height: 72.w,
-          shape: StadiumBorder(),
-          elevation: 0,
-          minWidth: double.infinity,
-          color: Color(0xFFF3F3F3),
-          onPressed: () {
-            Get.to(() => BeeSearch());
-          },
-          child: Row(
-            children: [
-              Icon(
-                Icons.search,
-                size: 32.w,
-                color: Color(0xFF666666),
-              ),
-              10.wb,
-              '搜索应用'.text.size(28.sp).color(ktextSubColor).make().expand(),
-            ],
-          ),
-        ),
+        title: '全部应用'.text.make(),
+        // title: MaterialButton(
+        //   materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        //   height: 72.w,
+        //   shape: StadiumBorder(),
+        //   elevation: 0,
+        //   minWidth: double.infinity,
+        //   color: Color(0xFFF3F3F3),
+        //   onPressed: () {
+        //     Get.to(() => BeeSearch());
+        //   },
+        //   child: Row(
+        //     children: [
+        //       Icon(
+        //         Icons.search,
+        //         size: 32.w,
+        //         color: Color(0xFF666666),
+        //       ),
+        //       10.wb,
+        //       '搜索应用'.text.size(28.sp).color(ktextSubColor).make().expand(),
+        //     ],
+        //   ),
+        // ),
       ),
       body: Column(
         children: [