diff --git a/lib/new_ui/work_order/dialog/urge_dialog.dart b/lib/new_ui/work_order/dialog/urge_dialog.dart index d8a5a1b..f22621a 100644 --- a/lib/new_ui/work_order/dialog/urge_dialog.dart +++ b/lib/new_ui/work_order/dialog/urge_dialog.dart @@ -17,18 +17,27 @@ class UrgeDialog extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - width: double.infinity, - padding: EdgeInsets.symmetric(horizontal: 32.w), - child: Column( - children: [ - 120.w.heightBox, - title.text.size(36.sp).black.bold.isIntrinsic.make(), - 40.w.heightBox, - content.text.size(28.sp).align(TextAlign.center).isIntrinsic.make(), - 150.w.heightBox, - BeeLongButton(onPressed: onConfirm, text: '确认') - ], + return Align( + alignment: Alignment.topCenter, + child: Container( + margin: EdgeInsets.all(40.w), + width: double.infinity, + height: 400.h, + padding: EdgeInsets.symmetric(horizontal: 32.w), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(20.w), + ), + child: Column( + children: [ + 90.w.heightBox, + title.text.size(36.sp).black.bold.isIntrinsic.make(), + 40.w.heightBox, + content.text.size(28.sp).align(TextAlign.center).isIntrinsic.make(), + 30.w.heightBox, + BeeLongButton(onPressed: onConfirm, text: '确认') + ], + ), ), ); } diff --git a/lib/new_ui/work_order/dialog/work_order_bill_dialog.dart b/lib/new_ui/work_order/dialog/work_order_bill_dialog.dart index f984dca..36f5b82 100644 --- a/lib/new_ui/work_order/dialog/work_order_bill_dialog.dart +++ b/lib/new_ui/work_order/dialog/work_order_bill_dialog.dart @@ -25,62 +25,73 @@ class WorkOrderBillDialog extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - width: double.infinity, - color: Colors.white, - child: Column( - children: [ - 40.w.heightBox, - '确认账单' - .text - .size(32.sp) - .isIntrinsic - .color(Colors.black.withOpacity(0.65)) - .make(), - 80.w.heightBox, - ...models - .map((e) => Row( - children: [ - '${e.costType == 1 ? '人工费' : '耗材费'}${e.name}${e.costType == 1 ? '' : '*${e.number}'}' - .text - .size(28.sp) - .color(Colors.black.withOpacity(0.65)) - .isIntrinsic - .make(), - Spacer(), - '¥${e.price}' - .text - .size(28.sp) - .color(Colors.black.withOpacity(0.65)) - .isIntrinsic - .make(), - ], - )) - .toList() - .sepWidget( - separate: 16.w.heightBox, - ), - BeeDivider.horizontal(), - Row( - children: [ - '工单总费用' - .text - .size(28.sp) - .color(Colors.black.withOpacity(0.65)) - .isIntrinsic - .make(), - Spacer(), - '¥${total}' - .text - .size(28.sp) - .color(Color(0xFFF5222D)) - .isIntrinsic - .make(), - ], - ), - 80.w.heightBox, - BeeLongButton(onPressed: onConfirm, text: '提醒用户支付'), - ], + return Align( + alignment: Alignment.topCenter, + child: Container( + margin: EdgeInsets.all(30.w), + padding: EdgeInsets.only(left: 40.w,right: 40.w,), + height: 430.h, + width: double.infinity, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(20.w), + ), + child: Column( + children: [ + 40.w.heightBox, + '确认账单' + .text + .size(32.sp) + .isIntrinsic + .color(Colors.black.withOpacity(0.65)) + .make(), + 80.w.heightBox, + ...models + .map((e) => Row( + children: [ + '${e.costType == 1 ? '人工费' : '耗材费'}${e.name}${e.costType == 1 ? '' : '*${e.number}'}' + .text + .size(28.sp) + .color(Colors.black.withOpacity(0.65)) + .isIntrinsic + .make(), + Spacer(), + '¥${e.price}' + .text + .size(28.sp) + .color(Colors.black.withOpacity(0.65)) + .isIntrinsic + .make(), + ], + )) + .toList() + .sepWidget( + separate: 16.w.heightBox, + ), + 10.heightBox, + BeeDivider.horizontal(), + 10.heightBox, + Row( + children: [ + '工单总费用' + .text + .size(28.sp) + .color(Colors.black.withOpacity(0.65)) + .isIntrinsic + .make(), + Spacer(), + '¥${total}' + .text + .size(28.sp) + .color(Color(0xFFF5222D)) + .isIntrinsic + .make(), + ], + ), + 80.w.heightBox, + BeeLongButton(onPressed: onConfirm, text: '提醒用户支付'), + ], + ), ), ); }