diff --git a/ln_jq_app/lib/common/styles/theme.dart b/ln_jq_app/lib/common/styles/theme.dart index 80299a9..102e364 100644 --- a/ln_jq_app/lib/common/styles/theme.dart +++ b/ln_jq_app/lib/common/styles/theme.dart @@ -7,11 +7,14 @@ class AppTheme { static const Color themeColor = Color(0xFF0c83c3); - + //http://192.168.110.222:8080/ static const String test_service_url = "https://beta-esg.api.lnh2e.com/"; static const String release_service_url = ""; + //加氢站相关查询 - static const String jiaqing_service_url = "https://beta.lnh2e.com/api/lingniu-manager-v1/v1/"; + static const String jiaqing_service_url = + "https://beta.lnh2e.com/api/lingniu-manager-v1/v1/"; + //车辆信息 static const String car_service_url = "http://47.99.166.38:20000/"; @@ -56,12 +59,9 @@ class AppTheme { appBarTheme: const AppBarTheme( backgroundColor: Color.fromARGB(255, 34, 34, 34), centerTitle: true, - titleTextStyle: TextStyle( - fontSize: 18, - fontWeight: FontWeight.bold, - ), + titleTextStyle: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), ), - bottomAppBarTheme: BottomAppBarThemeData( + bottomAppBarTheme: BottomAppBarThemeData( color: Color.fromARGB(255, 34, 34, 34), elevation: 4.0, ), diff --git a/ln_jq_app/lib/pages/b_page/site/controller.dart b/ln_jq_app/lib/pages/b_page/site/controller.dart index 1cf6a6d..bb97fbf 100644 --- a/ln_jq_app/lib/pages/b_page/site/controller.dart +++ b/ln_jq_app/lib/pages/b_page/site/controller.dart @@ -267,6 +267,8 @@ class SiteController extends GetxController with BaseControllerMixin { String orderAmount = ""; String completedAmount = ""; String name = ""; + String orderTotalAmount = ""; + String orderUnfinishedAmount = ""; Future renderData() async { try { @@ -286,8 +288,12 @@ class SiteController extends GetxController with BaseControllerMixin { orderAmount = result.data["orderAmount"].toString(); completedAmount = result.data["completedAmount"].toString(); name = result.data["name"].toString(); + orderTotalAmount = result.data["orderTotalAmount"]?? ""; + orderUnfinishedAmount = result.data["orderUnfinishedAmount"]?? ""; leftHydrogen = leftHydrogen.isEmpty ? "统计中" : leftHydrogen.toString(); + orderTotalAmount = orderTotalAmount.isEmpty ? "统计中" : orderTotalAmount.toString(); + orderUnfinishedAmount = orderUnfinishedAmount.isEmpty ? "统计中" : orderUnfinishedAmount.toString(); //加载列表数据 fetchReservationData(); diff --git a/ln_jq_app/lib/pages/b_page/site/view.dart b/ln_jq_app/lib/pages/b_page/site/view.dart index 8564190..fa8c244 100644 --- a/ln_jq_app/lib/pages/b_page/site/view.dart +++ b/ln_jq_app/lib/pages/b_page/site/view.dart @@ -94,6 +94,17 @@ class SitePage extends GetView { ], ), ), + const SizedBox(height: 12), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + _buildStatItem(controller.orderTotalAmount, '加氢总量'), + _buildStatItem(controller.orderUnfinishedAmount, '未加氢总量'), + ], + ), + ), ], ), ), diff --git a/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart b/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart index b986cb7..ba4adfd 100644 --- a/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart +++ b/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart @@ -7,7 +7,6 @@ import 'package:ln_jq_app/common/model/base_model.dart'; import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // For ReservationModel import 'package:ln_jq_app/common/styles/theme.dart'; -// Reusing the TimeSlot helper class from the reservation creation page. class TimeSlot { final TimeOfDay start; final TimeOfDay end;