diff --git a/lib/pages/life_pay/life_pay_page_new.dart b/lib/pages/life_pay/life_pay_page_new.dart index a4951060..dbd5dc06 100644 --- a/lib/pages/life_pay/life_pay_page_new.dart +++ b/lib/pages/life_pay/life_pay_page_new.dart @@ -244,7 +244,7 @@ class _LifePayPageNewState extends State { 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) { diff --git a/lib/pages/life_pay/life_pay_record_page.dart b/lib/pages/life_pay/life_pay_record_page.dart index 62925a9a..c44ef27a 100644 --- a/lib/pages/life_pay/life_pay_record_page.dart +++ b/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 { 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 { .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 { '${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 { '${model.code}'.text.color(ktextPrimary).size(28.sp).make(), ], ), - ].sepWidget(separate: 24.w.heightBox), ) .box diff --git a/lib/ui/home/application/all_application.dart b/lib/ui/home/application/all_application.dart index a033cb7f..26d04316 100644 --- a/lib/ui/home/application/all_application.dart +++ b/lib/ui/home/application/all_application.dart @@ -237,28 +237,29 @@ class _AllApplicationPageState extends State { 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: [