更换logo

ln_jq_app/android/app/build.gradle.kts

@@ -37,8 +37,8 @@ android {
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = 6
-        versionName = "1.2.3"
+        versionCode = 5
+        versionName = "1.2.2"
     }
 
     signingConfigs {

ln_jq_app/assets/html/map.html

@@ -25,41 +25,6 @@
             display: none !important;
         }
 
-        /* 去除高德默认的 label 边框和背景 */
-        .amap-marker-label {
-            border: none !important;
-            background-color: transparent !important;
-        }
-
-        /* 自定义气泡样式 */
-        .custom-bubble {
-            position: relative;
-            background: rgba(51, 51, 51, 0.7);
-            /* #33333399 对应 rgba(51,51,51,0.7) */
-            color: #fff;
-            padding: 6px 15px;
-            border-radius: 20px;
-            /* 圆角 */
-            font-size: 13px;
-            white-space: nowrap;
-            box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
-            text-align: center;
-            line-height: 1.4;
-        }
-
-        /* 气泡下方的向下小箭头 */
-        .custom-bubble::after {
-            content: '';
-            position: absolute;
-            bottom: -6px;
-            /* 箭头高度 */
-            left: 50%;
-            transform: translateX(-50%);
-            border-width: 6px 6px 0 6px;
-            border-style: solid;
-            border-color: rgba(51, 51, 51, 0.7) transparent transparent transparent;
-        }
-
         #panel .amap-call {
             display: none;
         }
@@ -67,7 +32,7 @@
         /* --- 搜索栏样式 --- */
         #search-box {
             position: absolute;
-            top: 40px;
+            top: 10px;
             left: 10px;
             right: 10px;
             z-index: 100;
@@ -98,7 +63,7 @@
         button {
             padding: 0 15px;
             height: 38px;
-            background: #017143FF;
+            background: #3366FF;
             color: #fff;
             border: none;
             border-radius: 4px;
@@ -109,7 +74,7 @@
         /* --- 导航结果面板 (底部弹出) --- */
         #panel {
             position: fixed;
-            bottom: 75px;
+            bottom: 0;
             left: 0;
             width: 100%;
             height: 35%;
@@ -129,7 +94,7 @@
         #location-btn {
             position: fixed;
             right: 10px;
-            bottom: 75px;
+            bottom: 50px;
             /* 默认位置 */
             width: 44px;
             height: 44px;
@@ -156,24 +121,9 @@
             fill: #555;
         }
 
-        /* --- 调整比例尺位置 --- */
-        .amap-scalecontrol {
-            /* 初始状态：避开底部的定位按钮或留出安全间距 */
-            bottom: 80px !important;
-            left: 10px !important;
-            transition: bottom 0.3s ease;
-            /* 增加平滑动画 */
-        }
-
-        /* --- 当路径规划面板显示时，比例尺自动上移 --- */
-        body.panel-active .amap-scalecontrol {
-            bottom: 38% !important;
-            /* 移动到面板上方 (面板高度35% + 3%间距) */
-        }
-
         /* --- 关键：当 body 有 panel-active 类时，按钮上移 --- */
         body.panel-active #location-btn {
-            bottom: 45%;
+            bottom: 38%;
             /* 对应 #panel 的 height + 一点间距 */
         }
     </style>
@@ -217,7 +167,7 @@
     </div>
 
     <script>
-        var map, marker, destMarker, driving, truckDriving, geocoder;
+        var map, marker, driving, truckDriving, geocoder;
         var currentLat, currentLng;
         var isTruckMode = false;
         var isInitialLocationSet = false;
@@ -226,7 +176,7 @@
         function initMap() {
             map = new AMap.Map('container', {
                 resizeEnable: true,
-                zoom: 17,
+                zoom: 15,
                 viewMode: '3D'
             });
 
@@ -287,7 +237,7 @@
         /**
          * 核心功能 1: 接收 Flutter 传来的定位数据
          * Flutter 端调用: webViewController.evaluateJavascript("updateMyLocation(...)")
-         *  纬度 经度
+         *  经度  维度
          */
         function updateMyLocation(lat, lng, angle) {
             var rawLat = parseFloat(lat);
@@ -313,7 +263,6 @@
                             angle: isNaN(rawAngle) ? 0 : rawAngle,
                         });
                         map.setCenter(position);
-                        map.setZoom(13);
                     } else {
                         marker.moveTo(position, {
                             duration: 1000,
@@ -332,10 +281,6 @@
                                 const addressComponent = regeo.addressComponent;
                                 const pois = regeo.pois;
 
-                                console.log("地理：" + JSON.stringify(result));
-                                fetchStationInfo(addressComponent.province, addressComponent.city,
-                                    addressComponent.district, lat, lng);
-
                                 // 策略1: 优先使用最近的、类型合适的POI的名称
                                 if (pois && pois.length > 0) {
                                     // 查找第一个类型不是“商务住宅”或“地名地址信息”的POI，这类POI通常是具体的建筑或地点名
@@ -350,9 +295,8 @@
                                 }
                                 // 策略2: 如果没有POI，使用"道路+门牌号"
                                 else if (addressComponent.street && addressComponent.streetNumber) {
-                                    shortAddress = addressComponent.district +
-                                        addressComponent.township +
-                                        addressComponent.street + addressComponent.streetNumber;
+                                    shortAddress = addressComponent.street + addressComponent
+                                        .streetNumber;
                                 }
                                 // 策略3: 如果还没有，使用"区+乡镇"
                                 else if (addressComponent.district) {
@@ -386,104 +330,7 @@
         }
 
         /**
-         *  调用后端接口获取站点
-         */
-        function fetchStationInfo(province, city, district, lat, lng) {
-            // 注意：某些直辖市在高德中 city 字段可能为空，需做兼容处理
-            console.log("JS->: 开始请求." + province + city + district);
-            var cityName = (typeof city === 'string' && city.length > 0) ? city : province;
-
-            fetch('https://beta-esg.api.lnh2e.com/appointment/station/getStationInfoByArea', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                        // "asoco-token": "e28eada8-4611-4dc2-a942-0122e52f52da"
-                    },
-                    body: JSON.stringify({
-                        province: province,
-                        city: cityName,
-                        district: district,
-                        longitude: lng,
-                        latitude: lat,
-                    })
-                })
-                .then(response => {
-                    if (!response.ok) {
-                        throw new Error('网络响应错误: ' + response.status);
-                    }
-                    return response.json(); // 解析 JSON
-                })
-                .then(res => {
-                    // 打印完整的返回结果，方便调试观察结构
-                    console.log("JS->: 接口完整返回:", JSON.stringify(res));
-
-                    // 安全校验：判断 res.data 是否存在
-                    if (res.code === 0 && res.data) {
-                        if (res.data.address) {
-                            console.log("JS->: 找到地址:", res.data.address);
-                            var destAddress = res.data.address;
-                            document.getElementById('endInput').value = destAddress;
-                            // 标记终点
-                            markDestination(destAddress, res.data.name || "目的地",
-                                res.data.longitude, res.data.latitude
-                            );
-                        } else {
-                            console.log("JS->: 接口请求成功，但该区域暂无站点地址");
-                        }
-                    } else {
-                        console.log("JS->: 业务报错或无数据:", res.message);
-                    }
-                })
-                .catch(err => console.error('JS->:获取站点信息失败:', err));
-        }
-
-        /**
-         *  地理编码并在地图标记终点
-         */
-        function markDestination(address, name, longitude, latitude) {
-
-
-            // 1. 清除旧的终点标记
-            if (destMarker) destMarker.setMap(null);
-
-            // 2. 创建自定义图标
-            // 假设图标大小为 32x32，你可以根据实际图片尺寸调整 Size
-            var destIcon = new AMap.Icon({
-                size: new AMap.Size(32, 32), // 图标尺寸
-                image: 'ic_tag.png', // 本地图片路径
-                imageSize: new AMap.Size(32, 32) // 图片在图标内拉伸的大小
-            });
-
-            // 3. 创建标记
-            destMarker = new AMap.Marker({
-                map: map,
-                position: [longitude, latitude],
-                icon: destIcon, // 使用自定义图标
-                // 偏移量：如果图标底部中心是尖角，offset 设为宽的一半的负数，高度的负数
-                // 这样能确保图片的底部尖端指向地图上的精确位置
-                offset: new AMap.Pixel(-16, -32),
-                title: name,
-                label: {
-                    content: '<div class="custom-bubble">' + name + '</div>',
-                    direction: 'top'
-                }
-            });
-
-            // 4. 打印调试信息
-            console.log("JS->: 终点标记已添加", address, loc.toString());
-
-            // 5. 自动调整视野包含起点和终点
-            // if (marker) {
-            //     // 如果起点标志已存在，缩放地图以展示两者
-            //     map.setFitView([marker, destMarker], false, [60, 60, 60, 60]);
-            // } else {
-            //     // 如果没有起点，直接跳到终点
-            //     map.setCenter(loc);
-            // }
-        }
-
-        /**
-         * 点击按钮回到当前位置
+         * 核心功能 2: 点击按钮回到当前位置
          */
         function backToLocation() {
             if (currentLng && currentLat) {
@@ -499,7 +346,7 @@
         }
 
         /**
-         *  路径规划
+         * 核心功能 3: 路径规划
          */
         function startRouteSearch() {
             // 获取输入框的文字

ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -13,7 +13,7 @@
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-App-29x29@1x.png",
+      "filename" : "Icon-App-29x29 1.png",
       "idiom" : "iphone",
       "scale" : "1x",
       "size" : "29x29"
@@ -31,25 +31,25 @@
       "size" : "29x29"
     },
     {
-      "filename" : "Icon-App-80x80.jpg",
+      "filename" : "Icon-App-80x80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-App-120x120.jpg",
+      "filename" : "Icon-App-120x120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-App-120x120 1.jpg",
+      "filename" : "Icon-App-120x120 1.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "Icon-App-180.jpg",
+      "filename" : "Icon-App-180.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
@@ -61,19 +61,19 @@
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-App-20x20@2x.png",
+      "filename" : "Icon-App-20x20@2x 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-App-29x29@1x.png",
+      "filename" : "Icon-App-29x29.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
-      "filename" : "Icon-App-29x29@2x.png",
+      "filename" : "Icon-App-29x29@2x 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
@@ -91,7 +91,7 @@
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-App-76x76@1x.png",
+      "filename" : "Icon-App-76x76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"

ln_jq_app/ios/Runner/Info.plist

@@ -70,11 +70,5 @@
     		<string>fetch</string>
     	</array>
 
-<key>CFBundleLocalizations</key>
-<array>
-    <string>zh-Hans</string>
-    <string>en</string>
-</array>
-
 </dict>
 </plist>

ln_jq_app/lib/common/login_util.dart

@@ -1,5 +1,4 @@
 import 'package:encrypt/encrypt.dart';
-import 'package:flutter/material.dart' as ui;
 
 class LoginUtil {
   static final _keyString = '915eae87951a448c86c47796e44c1fcf';
@@ -27,9 +26,5 @@ class LoginUtil {
     final decrypted = _encrypter.decrypt(encrypted);
     return decrypted;
   }
-
-  static ui.Image getAssImg(String imgName){
-    return ui.Image(image: ui.AssetImage('assets/images/$imgName.png'),fit: ui.BoxFit.cover,);
-  }
 }
 

ln_jq_app/lib/common/styles/theme.dart

@@ -5,14 +5,14 @@ class AppTheme {
 
   static const String Font_YuYang = 'YuYang';
 
-  static const Color themeColor = Color(0xFF017137);
+  static const Color themeColor = Color(0xFF0c83c3);
 
   //是否开放域名切换
-  static const bool is_show_host = true;
+  static const bool is_show_host = false;
 
   //http://192.168.110.222:8080/
   //http://192.168.110.44:8080/
-  static String test_service_url = "https://beta-esg.api.lnh2e.com/";
+  static String test_service_url = "http://47.101.201.13:8443/api/";
   static const String release_service_url = "";
 
   //加氢站相关查询

ln_jq_app/lib/main.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:get_storage/get_storage.dart';
@@ -9,19 +8,17 @@ import 'package:ln_jq_app/storage_service.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import 'common/styles/theme.dart';
+import 'pages/home/view.dart';
 import 'pages/login/view.dart';
-import 'pages/welcome/view.dart'; // 引入启动页
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   WidgetsBinding widgetsBinding = await init(
-    isDebug: true,
+    isDebug: false,
     logTag: '小羚羚',
-    supportedLocales: [const Locale('zh', 'CN')],
+    supportedLocales: [Locale('zh', 'CN')],
   );
-  
-  // 保持原生闪屏页，直到 WelcomeController 调用 remove()
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
 
   await GetStorage.init();
@@ -34,7 +31,7 @@ void main() async {
       // 设计稿尺寸 单位：dp
       designSize: const Size(390, 844),
       // Getx Log
-      enableLog: true,
+      enableLog: false,
       // 默认的跳转动画
       defaultTransition: Transition.rightToLeft,
       // 主题模式
@@ -45,17 +42,22 @@ void main() async {
       darkTheme: AppTheme.light,
       // AppTitle
       title: '小羚羚',
-      // 将入口改为启动页
-      home: const WelcomePage(),
-      fallbackLocale: const Locale('zh', 'CN'),
-      supportedLocales: const [Locale('zh', 'CN')],
+      // 首页入口
+      home: HomePage(),
+      //组件国际化
+      fallbackLocale: Locale('zh', 'CN'),
+      supportedLocales: [Locale('zh', 'CN')],
       localizationsDelegates: const [
+        //pull_to_refresh
         RefreshLocalizations.delegate,
         GlobalMaterialLocalizations.delegate,
         GlobalWidgetsLocalizations.delegate,
         GlobalCupertinoLocalizations.delegate,
       ],
+
+      // Builder
       builder: (context, widget) {
+        // do something....
         return widget!;
       },
     ),
@@ -65,16 +67,23 @@ void main() async {
 void initHttpSet() {
   AppTheme.test_service_url = StorageService.to.hostUrl ?? AppTheme.test_service_url;
 
+  // 设置基础 URL
   HttpService.to.setBaseUrl(AppTheme.test_service_url);
+  //指定请求头
   HttpService.to.dio.interceptors.add(TokenInterceptor(tokenKey: 'asoco-token'));
+  // 设置全局响应处理器
   HttpService.to.setOnResponseHandler((response) async {
     try {
+      if (response.data == null) {
+        return null;
+      }
       final baseModel = BaseModel.fromJson(response.data);
       if (baseModel.code == 0 || baseModel.code == 200) {
+
         return null;
       } else if (baseModel.code == 401) {
         await StorageService.to.clearLoginInfo();
-        Get.offAll(() => const LoginPage());
+        Get.offAll(() => LoginPage());
         return baseModel.message;
       } else {
         return (baseModel.error.toString()).isEmpty

ln_jq_app/lib/pages/b_page/base_widgets/view.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:getx_scaffold/common/index.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/pages/b_page/base_widgets/controller.dart';
 import 'package:ln_jq_app/pages/b_page/reservation/view.dart';
 import 'package:ln_jq_app/pages/b_page/site/view.dart';
@@ -10,16 +9,14 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
    B_BaseWidgetsPage({super.key});
 
   final PageController _pageController = PageController();
-
   // 主视图
   Widget _buildView() {
     return PageView(
       controller: _pageController,
-      physics: const NeverScrollableScrollPhysics(), // 禁止滑动
       onPageChanged: (index) {
         jumpTabAndPage(index);
       },
-      children: _buildPages(),
+      children: _buildPages(), // 页面的列表
     );
   }
 
@@ -28,59 +25,33 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
     controller.updateUi(); // 更新 UI
     _pageController.jumpToPage(controller.pageIndex);
   }
-
   // 对应的页面
   List<Widget> _buildPages() {
-    return [SitePage(), ReservationPage()];
+    return [
+      SitePage(),
+      ReservationPage(),
+    ];
   }
 
-  // 自定义导航栏 (悬浮胶囊样式)
+  //导航栏
   Widget _buildNavigationBar() {
-    return SafeArea(
-      child: Container(
-        height: 50.h,
-        margin: const EdgeInsets.fromLTRB(24, 0, 24, 10), // 悬浮边距
-        decoration: BoxDecoration(
-          color: Color.fromRGBO(240, 244, 247, 1), // 浅灰色背景
-          borderRadius: BorderRadius.circular(30),
-          boxShadow: [
-            BoxShadow(
-              color: Colors.black.withOpacity(0.05),
-              blurRadius: 10,
-              offset: const Offset(0, 5),
+    return NavigationX(
+      currentIndex: controller.pageIndex, // 当前选中的tab索引
+      onTap: (index) {
+        jumpTabAndPage(index);
+      }, // 切换tab事件
+      items: [
+        NavigationItemModel(
+          label: '加氢预约',
+          icon: AntdIcon.orderedlist,
+          selectedIcon: AntdIcon.calendar_fill,
+        ),
+        NavigationItemModel(
+          label: '站点信息',
+          icon: AntdIcon.car,
+          selectedIcon: AntdIcon.car_fill,
         ),
       ],
-        ),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
-          children: [
-            _buildNavItem(0, "ic_h2_select@2x", "ic_h2@2x"),
-            _buildNavItem(1, "ic_h2_my@2x", "ic_h2_my_select@2x"),
-          ],
-        ),
-      ),
-    );
-  }
-
-  // 构建单个导航项
-  Widget _buildNavItem(int index, String icon, String selectedIcon) {
-    bool isSelected = controller.pageIndex == index;
-    return GestureDetector(
-      onTap: () => jumpTabAndPage(index),
-      behavior: HitTestBehavior.opaque,
-      child: AnimatedContainer(
-        duration: const Duration(milliseconds: 200),
-        padding:  EdgeInsets.symmetric(horizontal: 50.w, vertical: 8),
-        decoration: BoxDecoration(
-          color: isSelected ? const Color(0xFF006633) : Colors.transparent, // 选中时的深绿色背景
-          borderRadius: BorderRadius.circular(20),
-        ),
-        child: SizedBox(
-          height: 24,
-          width: 24,
-          child: LoginUtil.getAssImg(isSelected ? selectedIcon : icon),
-        ),
-      ),
     );
   }
 
@@ -91,10 +62,10 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
       id: 'b_baseWidgets',
       builder: (_) {
         return Scaffold(
-          extendBody: true,
+          extendBody: false,
           resizeToAvoidBottomInset: false,
           bottomNavigationBar: _buildNavigationBar(),
-          body: _buildView(),
+          body: SafeArea(child: _buildView()),
         );
       },
     );

ln_jq_app/lib/pages/b_page/reservation/controller.dart

@@ -45,7 +45,6 @@ class ReservationController extends GetxController with BaseControllerMixin {
     customStartTime = DateTime.now();
     customEndTime = customStartTime!.add(const Duration(days: 1));
     renderData();
-    msgNotice(); // 红点消息
     startAutoRefresh();
   }
 
@@ -95,7 +94,6 @@ class ReservationController extends GetxController with BaseControllerMixin {
   String jobDetailsStr = "";
   String jobId = "";
   Timer? _refreshTimer;
-  bool isNotice = false;
 
   Future<void> renderData() async {
     showLoading("加载中");
@@ -248,27 +246,6 @@ class ReservationController extends GetxController with BaseControllerMixin {
     }
   }
 
-  Future<void> msgNotice() async {
-    final Map<String, dynamic> requestData = {
-      'appFlag': 1,
-      'isRead': 1,
-      'pageNum': 1,
-      'pageSize': 5,
-    };
-    final response = await HttpService.to.get(
-      'appointment/unread_notice/page',
-      params: requestData,
-    );
-    if (response != null) {
-      final result = BaseModel.fromJson(response.data);
-      if (result.code == 0 && result.data != null) {
-        String total = result.data["total"].toString();
-        isNotice = int.parse(total) > 0;
-        updateUi();
-      }
-    }
-  }
-
   void onOperationStatusChanged(String? newValue) {
     if (newValue != null) {
       selectedOperationStatus = newValue;

ln_jq_app/lib/pages/b_page/reservation/view.dart

@@ -1,17 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/pages/b_page/reservation/controller.dart';
-import 'package:ln_jq_app/pages/c_page/message/view.dart';
 
 class ReservationPage extends GetView<ReservationController> {
   const ReservationPage({super.key});
 
-  // 定义主题色
-  static const kPrimaryColor = Color(0xFF006D35); // 效果图深绿色
-  static const kBgColor = Color(0xFFF5F7F9); // 背景灰
-
   @override
   Widget build(BuildContext context) {
     return GetBuilder<ReservationController>(
@@ -19,313 +13,180 @@ class ReservationPage extends GetView<ReservationController> {
       id: 'b_reservation',
       builder: (_) {
         return Scaffold(
-          backgroundColor: kBgColor,
           body: SingleChildScrollView(
+            child: Padding(
+              padding: const EdgeInsets.all(12.0),
               child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
-                _buildTopSection(context),
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 20.w),
-                  child: Column(
-                    children: [
-                      SizedBox(height: 16),
-                      _buildBasicInfoCard(),
-                      SizedBox(height: 16),
-                      _buildOperationContentCard(context),
-                      SizedBox(height: 16.h),
-                      _buildSystemTips(),
-                      SizedBox(height: 24),
+                  _buildHeaderCard(),
+                  const SizedBox(height: 12),
+                  _buildInfoFormCard(context),
+                  const SizedBox(height: 12),
+                  _buildTipsCard(),
+                  const SizedBox(height: 12),
                   _buildLogoutButton(),
-                      SizedBox(height: 75.h),
                 ],
               ),
             ),
-              ],
-            ),
           ),
         );
       },
     );
   }
 
-  /// 1. 顶部个人信息及统计栏
-  Widget _buildTopSection(BuildContext context) {
-    return Container(
-      width: double.infinity,
-      decoration: const BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.vertical(bottom: Radius.circular(30)),
-      ),
-      padding: EdgeInsets.only(
-        top: MediaQuery.of(context).padding.top + 10,
-        left: 20,
-        right: 20,
-        bottom: 25,
-      ),
+  /// 构建顶部的站点信息头卡片
+  Widget _buildHeaderCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
       child: Column(
         children: [
-          Row(
-            children: [
-              CircleAvatar(
-                radius: 25,
-                backgroundColor: Colors.white,
-                child: LoginUtil.getAssImg('ic_user_logo@2x'),
-              ),
-              const SizedBox(width: 12),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Row(
-                      children: [
-                        Text(
+          ListTile(
+            leading: const Icon(Icons.local_gas_station, color: Colors.blue, size: 40),
+            title: Text(
               controller.name,
-                          style: const TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.bold,
+              style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
             ),
-                        ),
-                        const SizedBox(width: 8),
-                        _buildStatusTag(),
-                      ],
-                    ),
-                    const SizedBox(height: 4),
-                    Text(
-                      "站点：${controller.address}",
-                      style: TextStyle(color: Colors.grey[500], fontSize: 13),
-                    ),
-                  ],
-                ),
-              ),
-              IconButton(
-                onPressed: () async{
-                  var scanResult = await Get.to(() => const MessagePage());
-                  if (scanResult == null) {
-                    controller.msgNotice();
-                  }
-
-                },
-                style: IconButton.styleFrom(
-                  backgroundColor: Colors.grey[100],
-                  padding: const EdgeInsets.all(8),
-                ),
-                icon: Badge(
-                  smallSize: 8,
-                  backgroundColor: controller.isNotice
-                      ? Colors.red
-                      : Colors.transparent,
-                  child: const Icon(
-                    Icons.notifications_outlined,
-                    color: Colors.black87,
-                    size: 30,
-                  ),
-                ),
-              ),
-            ],
-          ),
-          const SizedBox(height: 25),
-          Row(
-            children: [
-              _buildStatBox("氢气价格", "Hydrogen price", controller.customerPrice, "/kg"),
-              SizedBox(width: 4.w),
-              _buildStatBox("营业时间", "Opening time", controller.timeStr, ""),
-              SizedBox(width: 4.w),
-              _buildStatBox("设备状态", "Anlagenzustand", "98", "%"),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildStatusTag() {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+            subtitle: Text(controller.address),
+            trailing: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
               decoration: BoxDecoration(
-        color: const Color(0xFFE1F5FE),
-        borderRadius: BorderRadius.circular(10),
+                color: Colors.blue[100],
+                borderRadius: BorderRadius.circular(12),
               ),
               child: Text(
                 controller.selectedOperationStatus,
-        style: TextStyle(
-          color: Color(0xFF03A9F4),
-          fontSize: 12.sp,
-          fontWeight: FontWeight.w600,
+                style: const TextStyle(
+                  color: Colors.blue,
+                  fontWeight: FontWeight.bold,
+                  fontSize: 12,
                 ),
               ),
-    );
-  }
-
-  Widget _buildStatBox(String title, String enTitle, String value, String unit) {
-    return Expanded(
-      child: Container(
-        padding: EdgeInsets.only(left: 12.w, top: 4.h, bottom: 4.h),
-        decoration: BoxDecoration(
-          color: kBgColor,
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              title,
-              style: TextStyle(
-                fontSize: 12.sp,
-                color: Color.fromRGBO(51, 51, 51, 0.8),
-                fontWeight: FontWeight.w400,
             ),
           ),
-            Text(enTitle, style: const TextStyle(fontSize: 9, color: Colors.grey)),
-            const SizedBox(height: 8),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text(
-                  value,
-                  style: TextStyle(
-                    fontSize: 12.sp,
-                    fontWeight: FontWeight.w500,
-                    color: Color(0xFF333333),
-                  ),
-                ),
-                const SizedBox(width: 2),
-                Text(unit, style: const TextStyle(fontSize: 11, color: Colors.grey)),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// 2. 站点基本信息
-  Widget _buildBasicInfoCard() {
-    return Container(
-      padding: const EdgeInsets.all(20),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            "站点基本信息",
-            style: TextStyle(fontSize: 14.sp, fontWeight: FontWeight.bold),
-          ),
-          SizedBox(height: 15),
-          _buildInfoRow("站点名称", controller.name),
-          _buildInfoRow("运营企业", controller.operatingEnterprise),
-          _buildInfoRow("站点地址", controller.address),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildInfoRow(String label, String value) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 12),
+          const Divider(height: 1, indent: 16, endIndent: 16),
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
             child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              mainAxisAlignment: MainAxisAlignment.spaceAround,
+              children: [
+                _buildHeaderStat(controller.customerPrice, '氢气价格'),
+                _buildHeaderStat(controller.timeStr, '营业时间'),
+                _buildHeaderStat('98%', '设备状态'),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// 构建头部卡片中的单个统计项
+  Widget _buildHeaderStat(String value, String label) {
+    return Column(
       children: [
-          Text(
-            label,
-            style: TextStyle(color: Colors.grey, fontSize: 11.sp),
-          ),
         Text(
           value,
-            style: TextStyle(
-              color: Color(0xFF333333),
-              fontSize: 12.sp,
+          style: const TextStyle(
+            color: Colors.blue,
+            fontSize: 20,
             fontWeight: FontWeight.bold,
           ),
         ),
+        const SizedBox(height: 4),
+        Text(label, style: const TextStyle(color: Colors.grey, fontSize: 12)),
       ],
-      ),
     );
   }
 
-  /// 3. 运营信息/站点广播 Tab 及内容
-  Widget _buildOperationContentCard(BuildContext context) {
-    return GestureDetector(
-      onTap: hideKeyboard,
-      child: Container(
-        decoration: BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.circular(20),
-        ),
+  /// 构建包含所有信息表单的卡片（增加 Tab 切换功能）
+  Widget _buildInfoFormCard(BuildContext context) {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+      clipBehavior: Clip.antiAlias, // 确保 Tab 背景圆角生效
       child: Column(
         children: [
-            // 自定义 TabBar
+          // Tab 切换栏
           Obx(
-              () => Padding(
-                padding: const EdgeInsets.only(left: 16, top: 16),
+            () => Container(
+              color: Colors.grey[50],
               child: Row(
                 children: [
-                    _buildTabTitle(0, "运营信息"),
-                    const SizedBox(width: 30),
-                    _buildTabTitle(1, "站点广播"),
+                  _buildTabItem(0, Icons.business_outlined, '站点信息'),
+                  _buildTabItem(1, Icons.campaign_outlined, '站点广播'),
                 ],
               ),
             ),
           ),
+          const Divider(height: 1),
+          // 内容区域
           Obx(
             () => controller.selectedTabIndex.value == 0
-                  ? _buildOperatingForm(context)
-                  : _buildBroadcastForm(),
+                ? _buildStationInfo(context)
+                : _buildStationBroadcast(context),
           ),
         ],
       ),
-      ),
     );
   }
 
-  Widget _buildTabTitle(int index, String title) {
+  /// 构建单个 Tab 项
+  Widget _buildTabItem(int index, IconData icon, String label) {
     bool isSelected = controller.selectedTabIndex.value == index;
-    return GestureDetector(
+    return Expanded(
+      child: InkWell(
         onTap: () => controller.selectedTabIndex.value = index,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            title,
-            style: TextStyle(
-              fontSize: 17,
-              fontWeight: FontWeight.bold,
-              color: isSelected ? Colors.black87 : Colors.grey,
-            ),
-          ),
-          if (isSelected)
-            Container(
-              margin: const EdgeInsets.only(top: 4),
-              width: 25,
-              height: 3,
+        child: Container(
+          padding: const EdgeInsets.symmetric(vertical: 14),
           decoration: BoxDecoration(
-                color: const Color(0xFF00A870), // 效果图中的亮绿色横线
-                borderRadius: BorderRadius.circular(2),
+            border: Border(
+              bottom: BorderSide(
+                color: isSelected ? Colors.blue : Colors.transparent,
+                width: 2,
+              ),
+            ),
+          ),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Icon(icon, size: 20, color: isSelected ? Colors.blue : Colors.grey[600]),
+              const SizedBox(width: 8),
+              Text(
+                label,
+                style: TextStyle(
+                  fontSize: 15,
+                  fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
+                  color: isSelected ? Colors.blue : Colors.grey[600],
                 ),
               ),
             ],
           ),
+        ),
+      ),
     );
   }
 
-  Widget _buildOperatingForm(BuildContext context) {
+  /// 站点信息子视图
+  Widget _buildStationInfo(BuildContext context) {
     return Padding(
-      padding: EdgeInsets.all(16),
+      padding: const EdgeInsets.all(16.0),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
+          _buildSectionTitle('基本信息'),
+          _buildDisplayField(label: '站点名称', value: controller.name),
+          _buildDisplayField(label: '运营企业', value: controller.operatingEnterprise),
+          _buildDisplayField(label: '站点地址', value: controller.address),
+          const SizedBox(height: 16),
+          _buildSectionTitle('价格信息'),
+          _buildDisplayField(label: '官方价格 (元/kg)', value: controller.customerPrice),
+          const SizedBox(height: 16),
+          _buildSectionTitle('运营信息'),
           Row(
             children: [
-              Text(
-                '运营状态',
-                style: TextStyle(
-                  color: Color.fromRGBO(51, 51, 51, 1),
-                  fontSize: 12.sp,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
+              Text('运营状态', style: TextStyle(color: Colors.grey[600], fontSize: 14)),
               //加氢站未执行的状态修改任务
               if (controller.jobTipStr.isNotEmpty)
                 GestureDetector(
@@ -343,113 +204,157 @@ class ReservationPage extends GetView<ReservationController> {
                 ),
             ],
           ),
-          const SizedBox(height: 12),
-          // 状态网格选择
-          Wrap(
-            spacing: 4,
-            runSpacing: 4,
-            children: controller.operationStatusOptions.map((status) {
-              bool isSelected = controller.selectedOperationStatus == status;
-              return GestureDetector(
-                onTap: () => controller.onOperationStatusChanged(status),
-                child: Container(
-                  width: (Get.width - 80) / 2,
-                  padding: const EdgeInsets.symmetric(vertical: 12),
-                  decoration: BoxDecoration(
-                    color: isSelected ? kPrimaryColor : const Color(0xFFEBEBEB),
-                    borderRadius: BorderRadius.circular(8),
-                  ),
-                  alignment: Alignment.center,
-                  child: Text(
-                    status,
-                    style: TextStyle(
-                      fontSize: 13.sp,
-                      color: isSelected ? Colors.white : Color.fromRGBO(51, 51, 51, 1),
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                ),
-              );
+          const SizedBox(height: 8),
+          DropdownButtonFormField<String>(
+            value: controller.selectedOperationStatus,
+            items: controller.operationStatusOptions.map((String value) {
+              return DropdownMenuItem<String>(value: value, child: Text(value));
             }).toList(),
+            onChanged: controller.onOperationStatusChanged,
+            decoration: InputDecoration(
+              border: OutlineInputBorder(borderRadius: BorderRadius.circular(8.0)),
+              contentPadding: const EdgeInsets.symmetric(horizontal: 12.0),
             ),
-          SizedBox(height: 12.h),
+          ),
+          const SizedBox(height: 16),
           if (controller.selectedOperationStatus == "营运中")
             _buildDisplayField(label: '营业时间', value: controller.timeStr)
           else
             Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                _buildInputLabel("开始时间"),
-                _buildDateTimePicker(
-                  controller.customStartTimeStr,
-                  () => controller.pickDateTime(context, true),
+                _buildClickField(
+                  label: '开始时间',
+                  value: controller.customStartTimeStr,
+                  onTap: () => controller.pickDateTime(context, true),
                 ),
-                const SizedBox(height: 15),
-                _buildInputLabel("结束时间"),
-                _buildDateTimePicker(
-                  controller.customEndTimeStr,
-                  () => controller.pickDateTime(context, false),
+                _buildClickField(
+                  label: '结束时间',
+                  value: controller.customEndTimeStr,
+                  onTap: () => controller.pickDateTime(context, false),
                 ),
-                const SizedBox(height: 15),
               ],
             ),
           _buildDisplayField(label: '联系电话', value: controller.phone),
-          const SizedBox(height: 25),
-          Row(
-            children: [
-              Expanded(
-                flex: 1,
-                child: OutlinedButton(
-                  onPressed: () {
-                    controller.renderData();
-                  }, // 重置逻辑
-                  style: OutlinedButton.styleFrom(
-                    side: const BorderSide(color: kPrimaryColor),
-                    padding: const EdgeInsets.symmetric(vertical: 12),
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                  ),
-                  child: const Text("重置", style: TextStyle(color: kPrimaryColor)),
-                ),
-              ),
-              const SizedBox(width: 15),
-              Expanded(
-                flex: 2,
-                child: ElevatedButton(
+          const SizedBox(height: 24),
+          ElevatedButton(
             onPressed: controller.saveInfo,
             style: ElevatedButton.styleFrom(
-                    backgroundColor: kPrimaryColor,
-                    padding: const EdgeInsets.symmetric(vertical: 12),
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(10),
+              minimumSize: const Size(double.infinity, 48),
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
             ),
-                  ),
-                  child: const Text("保存设置", style: TextStyle(color: Colors.white)),
-                ),
-              ),
-            ],
+            child: const Text('保存信息', style: TextStyle(fontSize: 16)),
           ),
         ],
       ),
     );
   }
 
+  /// 站点广播子视图
+  Widget _buildStationBroadcast(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(16.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              const Icon(Icons.campaign, color: Colors.blue, size: 28),
+              const SizedBox(width: 10),
+              const Text(
+                '站点广播通知',
+                style: TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black87,
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 13),
+          _buildTextFieldLabel('通知标题'),
+          const SizedBox(height: 8),
+          SizedBox(
+            height: 45.h,
+            child: TextField(
+              controller: controller.broadcastTitleController,
+              maxLength: 30,
+              decoration: InputDecoration(
+                hintText: '例如：临时闭站通知',
+                hintStyle: TextStyle(color: Colors.grey[400], fontSize: 14),
+                border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
+                contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                counterText: '', // 隐藏原生计数器，我们可以按需自定义
+              ),
+            ),
+          ),
+          const SizedBox(height: 20),
+          _buildTextFieldLabel('通知内容'),
+          const SizedBox(height: 8),
+          TextField(
+            controller: controller.broadcastContentController,
+            maxLength: 150,
+            maxLines: 5,
+            decoration: InputDecoration(
+              hintText: '请输入通知内容...',
+              hintStyle: TextStyle(color: Colors.grey[400], fontSize: 14),
+              border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
+              contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+            ),
+          ),
+          const SizedBox(height: 12),
+          ElevatedButton(
+            onPressed: controller.sendBroadcast,
+            style: ElevatedButton.styleFrom(
+              backgroundColor: Colors.blue,
+              foregroundColor: Colors.white,
+              minimumSize: const Size(double.infinity, 50),
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+              elevation: 0,
+            ),
+            child: const Text(
+              '发送',
+              style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+            ),
+          ),
+          const SizedBox(height: 20),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildTextFieldLabel(String label) {
+    return Text(
+      label,
+      style: const TextStyle(
+        fontSize: 14,
+        fontWeight: FontWeight.w500,
+        color: Colors.black87,
+      ),
+    );
+  }
+
+  /// 构建带标题的表单区域
+  Widget _buildSectionTitle(String title) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 12.0),
+      child: Row(
+        children: [
+          Container(width: 4, height: 16, color: Colors.blue),
+          const SizedBox(width: 8),
+          Text(title, style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+        ],
+      ),
+    );
+  }
+
+  /// 构建一个“标签+纯文本”的显示行
   Widget _buildDisplayField({required String label, required String value}) {
     return Padding(
       padding: const EdgeInsets.only(bottom: 12.0),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Text(
-            label,
-            style: TextStyle(
-              color: Color.fromRGBO(51, 51, 51, 1),
-              fontSize: 12.sp,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
+          Text(label, style: TextStyle(color: Colors.grey[600], fontSize: 14)),
           const SizedBox(height: 8),
           Container(
             width: double.infinity,
@@ -469,177 +374,118 @@ class ReservationPage extends GetView<ReservationController> {
     );
   }
 
-  Widget _buildBroadcastForm() {
+  /// 构建一个“可点击”的选择行
+  Widget _buildClickField({
+    required String label,
+    required String value,
+    required VoidCallback onTap,
+  }) {
     return Padding(
-      padding: const EdgeInsets.all(16),
+      padding: const EdgeInsets.only(bottom: 12.0),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          _buildInputLabel("通知标题"),
-          TextField(
-            controller: controller.broadcastTitleController,
-            decoration: _inputDecoration("例如：临时闭站通知"),
-          ),
-          const SizedBox(height: 15),
-          _buildInputLabel("通知内容"),
-          TextField(
-            controller: controller.broadcastContentController,
-            maxLines: 4,
-            decoration: _inputDecoration("请输入通知内容..."),
-          ),
-          const SizedBox(height: 20),
-          Row(
-            children: [
-              Expanded(
-                flex: 1,
-                child: OutlinedButton(
-                  onPressed: () {
-                    controller.broadcastTitleController.clear();
-                    controller.broadcastContentController.clear();
-                  }, // 重置逻辑
-                  style: OutlinedButton.styleFrom(
-                    side: const BorderSide(color: kPrimaryColor),
-                    padding: const EdgeInsets.symmetric(vertical: 12),
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                  ),
-                  child: const Text("重置", style: TextStyle(color: kPrimaryColor)),
-                ),
-              ),
-              const SizedBox(width: 15),
-              Expanded(
-                flex: 2,
-                child: ElevatedButton(
-                  onPressed: controller.sendBroadcast,
-                  style: ElevatedButton.styleFrom(
-                    backgroundColor: kPrimaryColor,
-                    minimumSize: const Size(double.infinity, 50),
-                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
-                  ),
-                  child: const Text("发送广播", style: TextStyle(color: Colors.white)),
-                ),
-              ),
-            ],
-          ),
-
-        ],
-      ),
-    );
-  }
-
-  Widget _buildInputLabel(String label) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 0, bottom: 8),
-      child: Text(
-        label,
-        style: TextStyle(
-          color: Color.fromRGBO(51, 51, 51, 1),
-          fontSize: 12.sp,
-          fontWeight: FontWeight.bold,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildDateTimePicker(String value, VoidCallback onTap) {
-    return GestureDetector(
+          Text(label, style: TextStyle(color: Colors.grey[600], fontSize: 14)),
+          const SizedBox(height: 8),
+          InkWell(
             onTap: onTap,
             child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 15, vertical: 12),
+              width: double.infinity,
+              padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 12.0),
               decoration: BoxDecoration(
-          border: Border.all(color: const Color(0xFF00A870).withOpacity(0.5)),
-          borderRadius: BorderRadius.circular(10),
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(8.0),
+                border: Border.all(color: Colors.blue.withOpacity(0.5)),
               ),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-            Text(value, style: const TextStyle(color: Colors.black87)),
-            const Icon(Icons.calendar_today_outlined, size: 18, color: Color(0xFF00A870)),
+                  Text(
+                    value,
+                    style: const TextStyle(fontSize: 14, color: Colors.black87),
+                  ),
+                  const Icon(Icons.calendar_month, size: 18, color: Colors.blue),
                 ],
               ),
             ),
+          ),
+        ],
+      ),
     );
   }
 
-  InputDecoration _inputDecoration(String hint) {
-    return InputDecoration(
-      hintText: hint,
-      hintStyle: const TextStyle(color: Colors.grey, fontSize: 14),
-      border: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(10),
-        borderSide: const BorderSide(color: Color(0xFFE0E0E0)),
-      ),
-      enabledBorder: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(10),
-        borderSide: const BorderSide(color: Color(0xFFE0E0E0)),
-      ),
-      contentPadding: const EdgeInsets.symmetric(horizontal: 15, vertical: 12),
-    );
-  }
-
-  /// 4. 系统提醒
-  Widget _buildSystemTips() {
-    return Container(
-      padding: const EdgeInsets.all(15),
-      decoration: BoxDecoration(
-        color: const Color(0xFFF1F9F6), // 极浅绿色背景
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
+  /// 构建静态提示信息卡片
+  Widget _buildTipsCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
           children: [
-          Icon(Icons.info_outline, color: Color.fromRGBO(1, 113, 55, 1), size: 20),
-          SizedBox(width: 8.w),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
+            _buildInfoItem(Icons.info_outline, '请确保信息准确无误'),
+            const SizedBox(height: 10),
+            _buildInfoItem(Icons.help_outline, '价格信息将实时更新到用户端'),
+            const SizedBox(height: 10),
+            _buildInfoItem(Icons.headset_mic_outlined, '如有疑问请联系技术支持: 400-021-1773'),
+            const SizedBox(height: 10),
+            Row(
               children: [
-              Text(
-                "系统提醒",
-                style: TextStyle(
-                  color: Color.fromRGBO(1, 113, 55, 1),
-                  fontWeight: FontWeight.bold,
-                  fontSize: 14.sp,
+                const Icon(Icons.verified_outlined, color: Colors.blue, size: 20),
+                const SizedBox(width: 10),
+                Expanded(
+                  child: FutureBuilder<String>(
+                    future: getVersion(),
+                    builder: (context, snapshot) {
+                      if (snapshot.connectionState == ConnectionState.waiting) {
+                        return const Text("");
+                      }
+                      if (snapshot.hasData) {
+                        return TextX.labelSmall(
+                          "当前版本: ${snapshot.data}",
+                          color: Colors.black54,
+                        );
+                      }
+                      return const Text("");
+                    },
                   ),
                 ),
-              SizedBox(height: 6.h),
-              Text(
-                "请您确保所提供的信息准确无误，价格信息也将实时\n更新至用户端",
-                style: TextStyle(color: Color.fromRGBO(1, 113, 55, 0.8), fontSize: 12.sp),
-              ),
-              SizedBox(height: 6.h),
-              Text(
-                "如有疑问请联系客服：400-021-1773",
-                style: TextStyle(color: Color.fromRGBO(1, 113, 55, 0.8), fontSize: 12.sp),
-              ),
               ],
             ),
           ],
         ),
+      ),
     );
   }
 
-  /// 5. 退出登录按钮
+  /// 构建退出登录按钮
   Widget _buildLogoutButton() {
-    return SizedBox(
-      width: double.infinity,
-      height: 50,
-      child: ElevatedButton(
+    return ElevatedButton(
       onPressed: controller.logout,
       style: ElevatedButton.styleFrom(
-          backgroundColor: Color.fromRGBO(204, 52, 46, 1),
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
-          elevation: 0,
+        backgroundColor: Colors.red,
+        foregroundColor: Colors.white,
+        minimumSize: const Size(double.infinity, 48),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),
+        elevation: 2,
       ),
       child: const Text(
-          "退出登录",
-          style: TextStyle(
-            color: Colors.white,
-            fontSize: 16,
-            fontWeight: FontWeight.bold,
-          ),
+        '退出登录',
+        style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
       ),
+    );
+  }
+
+  /// 构建带图标的提示信息行
+  Widget _buildInfoItem(IconData icon, String text) {
+    return Row(
+      children: [
+        Icon(icon, color: Colors.blue, size: 20),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Text(text, style: const TextStyle(fontSize: 14, color: Colors.black54)),
         ),
+      ],
     );
   }
 }

ln_jq_app/lib/pages/b_page/site/controller.dart

@@ -6,7 +6,6 @@ import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/storage_service.dart';
-import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 enum ReservationStatus {
   pending, // 待处理 ( addStatus: 0)
@@ -144,8 +143,6 @@ class SiteController extends GetxController with BaseControllerMixin {
   Timer? _refreshTimer;
 
   final TextEditingController searchController = TextEditingController();
-  bool isNotice = false;
-  final RefreshController refreshController = RefreshController(initialRefresh: false);
 
   @override
   bool get listenLifecycleEvent => true;
@@ -170,7 +167,7 @@ class SiteController extends GetxController with BaseControllerMixin {
     searchController.dispose();
     super.onClose();
   }
-
+  bool isNotice = false;
   Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,
@@ -202,8 +199,6 @@ class SiteController extends GetxController with BaseControllerMixin {
     });
   }
 
-  void onRefresh() => renderData(isRefresh: true);
-
   ///停止定时器的方法
   void stopAutoRefresh() {
     // 如果定时器存在并且是激活状态，就取消它
@@ -226,7 +221,7 @@ class SiteController extends GetxController with BaseControllerMixin {
           'pageNum': 1,
           'pageSize': 50, // 暂时不考虑分页，一次获取30条
           'keyword': searchText, // 加氢站名称、手机号
-          'stationId': StorageService.to.userId,
+          'stationId': StorageService.to.userId
         },
       );
 
@@ -592,7 +587,7 @@ class SiteController extends GetxController with BaseControllerMixin {
   String orderTotalAmount = "";
   String orderUnfinishedAmount = "";
 
-  Future<void> renderData({bool isRefresh = false}) async {
+  Future<void> renderData() async {
     try {
       var responseData = await HttpService.to.get(
         'appointment/station/getStationInfoById?hydrogenId=${StorageService.to.userId}',
@@ -625,10 +620,6 @@ class SiteController extends GetxController with BaseControllerMixin {
     } finally {
       //加载列表数据
       fetchReservationData();
-
-      if (isRefresh) {
-        refreshController.refreshCompleted();
-      }
     }
   }
 }

ln_jq_app/lib/pages/b_page/site/view.dart

@@ -1,10 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/b_page/history/view.dart';
-import 'package:ln_jq_app/pages/c_page/message/view.dart';
-import 'package:pull_to_refresh/pull_to_refresh.dart';
+import 'package:ln_jq_app/pages/c_page/message/view.dart' show MessagePage;
 
 import 'controller.dart';
 
@@ -18,151 +16,32 @@ class SitePage extends GetView<SiteController> {
       init: SiteController(),
       id: 'site',
       builder: (_) {
-        return Scaffold(
-          backgroundColor: Color.fromRGBO(247, 249, 251, 1),
-          body: SmartRefresher(
-            controller: controller.refreshController,
-            enablePullUp: false,
-            onRefresh: controller.onRefresh,
-            child: SingleChildScrollView(child: _buildView(context)),
-          ),
-        );
+        return SingleChildScrollView(child: _buildView());
       },
     );
   }
 
   // 主视图
-  Widget _buildView(BuildContext context) {
-    return Column(
-      children: [
-        // 第一个卡片: 今日预约统计
-        _buildTopSection(context),
-        Padding(
-          padding: EdgeInsets.only(left: 20.w, right: 20.w),
+  Widget _buildView() {
+    return Padding(
+      padding: const EdgeInsets.all(12.0),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-              Padding(
-                padding: EdgeInsets.only(top: 17.h, bottom: 10.h),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Text(
-                      "预约信息",
-                      style: TextStyle(
-                        color: Color.fromRGBO(51, 51, 51, 1),
-                        fontWeight: FontWeight.w600,
-                        fontSize: 14.sp,
-                      ),
-                    ),
-                    GestureDetector(
-                      onTap: () {
-                        Get.to(
-                          () => HistoryPage(),
-                          arguments: {'stationName': controller.name},
-                        );
-                      },
-                      child: Text(
-                        '历史记录',
-                        style: TextStyle(
-                          fontSize: 14.sp,
-                          fontWeight: FontWeight.bold,
-                          color: Color.fromRGBO(156, 163, 175, 1),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              // 第二个卡片: 预约信息
-              Column(
-                children: [
-                  _buildSearchView(),
-                  controller.hasReservationData
-                      ? _buildReservationListView()
-                      : _buildEmptyReservationView(),
-                ],
-              ),
-
-              SizedBox(height: 35.h),
-              //第三部分
-              Container(
-                padding: const EdgeInsets.all(15),
-                decoration: BoxDecoration(
-                  color: const Color(0xFFF1F9F6), // 极浅绿色背景
-                  borderRadius: BorderRadius.circular(10),
-                ),
-                child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Icon(
-                      Icons.info_outline,
-                      color: Color.fromRGBO(1, 113, 55, 1),
-                      size: 20,
-                    ),
-                    SizedBox(width: 8.w),
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          "系统提醒",
-                          style: TextStyle(
-                            color: Color.fromRGBO(1, 113, 55, 1),
-                            fontWeight: FontWeight.bold,
-                            fontSize: 14.sp,
-                          ),
-                        ),
-                        SizedBox(height: 6.h),
-                        Text(
-                          "数据每五分钟自动刷新，如需实时更新请下拉页面",
-                          style: TextStyle(
-                            color: Color.fromRGBO(1, 113, 55, 0.8),
-                            fontSize: 12.sp,
-                          ),
-                        ),
-                        SizedBox(height: 6.h),
-                        Text(
-                          "如有疑问请联系客服：400-021-1773",
-                          style: TextStyle(
-                            color: Color.fromRGBO(1, 113, 55, 0.8),
-                            fontSize: 12.sp,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            ],
-          ),
-        ),
-        SizedBox(height: 75.h),
-      ],
-    );
-  }
-
-  Widget _buildTopSection(BuildContext context) {
-    return Container(
-      width: double.infinity,
-      decoration: const BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.vertical(bottom: Radius.circular(20)),
-      ),
-      padding: EdgeInsets.only(
-        top: MediaQuery.of(context).padding.top + 10,
-        left: 20,
-        right: 20,
-        bottom: 25,
-      ),
+          // 第一个卡片: 今日预约统计
+          Card(
+            elevation: 3,
+            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
+            margin: const EdgeInsets.only(bottom: 12),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 12.0),
               child: Column(
                 children: [
-          Row(
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                    child: Row(
                       children: [
-              CircleAvatar(
-                radius: 25,
-                backgroundColor: Colors.white,
-                child: LoginUtil.getAssImg('ic_user_logo@2x'),
-              ),
+                        const Icon(Icons.calendar_today, color: Colors.blue, size: 32),
                         const SizedBox(width: 12),
                         Expanded(
                           child: Column(
@@ -171,186 +50,230 @@ class SitePage extends GetView<SiteController> {
                               Row(
                                 children: [
                                   Text(
-                          "今日预约统计",
-                          style: TextStyle(fontSize: 14.sp, fontWeight: FontWeight.w400),
+                                    '今日预约统计',
+                                    style: TextStyle(
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                  SizedBox(width: 5.w,),
+                                  Container(
+                                    padding: EdgeInsets.symmetric(
+                                      horizontal: 10,
+                                      vertical: 4,
+                                    ),
+                                    decoration: BoxDecoration(
+                                      color: Colors.blue.withOpacity(0.1),
+                                      borderRadius: BorderRadius.circular(12),
+                                    ),
+                                    child: Text(
+                                      '实时',
+                                      style: TextStyle(
+                                        color: Colors.blue,
+                                        fontSize: 12,
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
                                   ),
-                        const SizedBox(width: 8),
                                 ],
                               ),
-                    const SizedBox(height: 4),
                               Text(
                                 "Today's Reservation Statistics",
-                      style: TextStyle(color: Colors.grey[500], fontSize: 13),
+                                style: TextStyle(fontSize: 12, color: Colors.grey),
                               ),
                             ],
                           ),
                         ),
                         IconButton(
                           onPressed: () async {
+                            // 跳转消息中心
                             var scanResult = await Get.to(() => const MessagePage());
                             if (scanResult == null) {
                               controller.msgNotice();
                             }
                           },
+                          // 这里的 style 是为了模拟你图片里的灰色圆形背景
                           style: IconButton.styleFrom(
                             backgroundColor: Colors.grey[100],
                             padding: const EdgeInsets.all(8),
                           ),
                           icon: Badge(
+                            // label: Text('3'), // 如果你想显示数字，就加 label
                             smallSize: 8,
-                  backgroundColor: controller.isNotice ? Colors.red : Colors.transparent,
-                  child: const Icon(
+                            // 红点的大小
+                            backgroundColor: controller.isNotice
+                                ? Colors.red
+                                : Colors.white,
+                            // 红点颜色
+                            child: Icon(
                               Icons.notifications_outlined,
                               color: Colors.black87,
-                    size: 30,
+                              size: 25,
                             ),
                           ),
                         ),
                       ],
                     ),
-          const SizedBox(height: 25),
-          Row(
+                  ),
+                  const SizedBox(height: 10),
+                  const Divider(height: 1, indent: 16, endIndent: 16),
+                  const SizedBox(height: 12),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceAround,
                       children: [
-              _buildStatBox("剩余氢量", "remaining quantity", controller.leftHydrogen, "kg"),
-              SizedBox(width: 4.w),
-              _buildStatBox(
-                "今日加氢量",
-                "Have been added",
-                controller.orderTotalAmount,
-                "kg",
+                        _buildStatItem(controller.leftHydrogen, '剩余余量'),
+                        _buildStatItem(controller.orderAmount, '预约车辆'),
+                        _buildStatItem(controller.completedAmount, '已完成'),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(height: 12),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      children: [
+                        _buildStatItem(controller.orderTotalAmount, '加氢总量'),
+                        _buildStatItem(controller.orderUnfinishedAmount, '未加氢总量'),
+                      ],
                     ),
-              SizedBox(width: 4.w),
-              _buildStatBox(
-                "未加氢总量",
-                "No quantity added",
-                controller.orderUnfinishedAmount,
-                "kg",
                   ),
                 ],
               ),
-        ],
             ),
-    );
-  }
+          ),
 
-  Widget _buildStatBox(String title, String enTitle, String value, String unit) {
-    return Expanded(
-      child: Container(
-        padding: EdgeInsets.only(left: 12.w, top: 4.h, bottom: 4.h),
-        decoration: BoxDecoration(
-          color: Color(0xFFF5F7F9),
-          borderRadius: BorderRadius.circular(12),
+          // 第二个卡片: 预约信息
+          Card(
+            elevation: 3,
+            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
+            margin: EdgeInsets.only(bottom: 12),
+            clipBehavior: Clip.antiAlias,
+            child: Column(
+              children: [
+                Container(
+                  color: Colors.blue,
+                  padding: EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
+                  child: Row(
+                    children: [
+                      Expanded(
+                        child: GestureDetector(
+                          onTap: () {
+                            controller.renderData();
+                          },
+                          child: Row(
+                            children: [
+                              Text(
+                                '预约信息',
+                                style: TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold,
+                                  color: Colors.white,
                                 ),
+                              ),
+                              SizedBox(
+                                width: 32,
+                                height: 32,
+                                child: const Icon(
+                                  Icons.refresh,
+                                  size: 18,
+                                  color: Colors.white,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                      ElevatedButton(
+                        onPressed: () {
+                          Get.to(
+                            () => HistoryPage(),
+                            arguments: {'stationName': controller.name},
+                          );
+                        },
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: Colors.blue.shade700,
+                          foregroundColor: Colors.white,
+                          padding: EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(5),
+                          ),
+                          elevation: 2,
+                        ),
+                        child: const Text(
+                          '历史记录',
+                          style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                _buildSearchView(),
+                controller.hasReservationData
+                    ? _buildReservationListView()
+                    : _buildEmptyReservationView(),
+              ],
+            ),
+          ),
+
+          //第三部分
+          Card(
+            elevation: 3,
+            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
+            margin: const EdgeInsets.only(bottom: 12),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-            Text(
-              title,
-              style: TextStyle(
-                fontSize: 12.sp,
-                color: Color.fromRGBO(51, 51, 51, 0.8),
-                fontWeight: FontWeight.w400,
-              ),
-            ),
-            Text(enTitle, style: const TextStyle(fontSize: 9, color: Colors.grey)),
+                  _buildInfoItem(Icons.info_outline, '数据每5分钟自动刷新一次'),
                   const SizedBox(height: 8),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text(
-                  value,
-                  style: TextStyle(
-                    fontSize: 12.sp,
-                    fontWeight: FontWeight.w500,
-                    color: Color(0xFF333333),
-                  ),
-                ),
-                const SizedBox(width: 2),
-                Text(unit, style: const TextStyle(fontSize: 11, color: Colors.grey)),
+                  _buildInfoItem(Icons.headset_mic_outlined, '如有疑问请联系客服: 400-021-1773'),
                 ],
               ),
-          ],
             ),
           ),
+        ],
+      ),
     );
   }
 
   //搜索输入框，提示可以输入车牌或者手机
   Widget _buildSearchView() {
     return Padding(
-      padding: EdgeInsets.fromLTRB(0, 0, 0, 8.h),
+      padding: const EdgeInsets.fromLTRB(16, 12, 16, 0),
       child: Row(
         children: [
           Expanded(
             child: SizedBox(
-              height: 42.h,
+              height: 44,
               child: TextField(
-                textAlignVertical: TextAlignVertical.center,
                 controller: controller.searchController, // 绑定控制器
                 decoration: InputDecoration(
-                  filled: true,
-                  isDense: true,
-                  fillColor: Colors.white,
-                  hintText: '输入车牌号或手机号搜索...',
-                  contentPadding: const EdgeInsets.symmetric(
-                    vertical: 12,
-                    horizontal: 16,
-                  ),
+                  hintText: '输入车牌号或完整手机号查询',
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 16),
                   border: OutlineInputBorder(
-                    borderRadius: BorderRadius.circular(12),
-                    borderSide: BorderSide(color: Color.fromRGBO(229, 231, 235, 1)),
+                    borderRadius: BorderRadius.circular(22),
+                    borderSide: BorderSide(color: Colors.grey.shade300),
                   ),
                   enabledBorder: OutlineInputBorder(
-                    borderRadius: BorderRadius.circular(12),
-                    borderSide: BorderSide(color: Color.fromRGBO(229, 231, 235, 1)),
+                    borderRadius: BorderRadius.circular(22),
+                    borderSide: BorderSide(color: Colors.grey.shade300),
                   ),
                   focusedBorder: OutlineInputBorder(
-                    borderRadius: BorderRadius.circular(12),
-                    borderSide: BorderSide(
-                      color: Color.fromRGBO(229, 231, 235, 1),
-                      width: 1.5,
-                    ),
+                    borderRadius: BorderRadius.circular(22),
+                    borderSide: BorderSide(color: Get.theme.primaryColor, width: 1.5),
                   ),
                   // 清除按钮
-                  suffix: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      IconButton(
+                  suffixIcon: IconButton(
                     icon: const Icon(Icons.clear, size: 20),
                     onPressed: () {
                       controller.searchController.clear();
                       controller.fetchReservationData(); // 清除后也刷新一次
                     },
                   ),
-                      GestureDetector(
-                        onTap: () {
-                          // 点击“搜索”按钮时触发
-                          FocusScope.of(Get.context!).unfocus(); // 收起键盘
-                          controller.fetchReservationData();
-                        },
-                        child: Container(
-                          padding: EdgeInsets.only(
-                            left: 16.w,
-                            right: 16.h,
-                            top: 4.5.h,
-                            bottom: 4.5.h,
-                          ),
-                          decoration: BoxDecoration(
-                            color: Color.fromRGBO(1, 113, 55, 1),
-                            borderRadius: BorderRadius.circular(8),
-                          ),
-                          child: Text(
-                            "搜索",
-                            style: TextStyle(
-                              color: Colors.white,
-                              fontWeight: FontWeight.w500,
-                              fontSize: 12.sp,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
                 ),
                 onSubmitted: (value) {
                   // 用户在键盘上点击“完成”或“搜索”时触发
@@ -359,6 +282,40 @@ class SitePage extends GetView<SiteController> {
               ),
             ),
           ),
+          const SizedBox(width: 10),
+          ElevatedButton(
+            onPressed: () {
+              // 点击“搜索”按钮时触发
+              FocusScope.of(Get.context!).unfocus(); // 收起键盘
+              controller.fetchReservationData();
+            },
+            style: ElevatedButton.styleFrom(
+              shape: const CircleBorder(),
+              padding: const EdgeInsets.all(8),
+            ),
+            child: const Icon(Icons.search_rounded),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// 构建单个统计项
+  Widget _buildStatItem(String value, String label, {Color valueColor = Colors.blue}) {
+    return Expanded(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(
+            value,
+            style: TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.bold,
+              color: valueColor,
+            ),
+          ),
+          const SizedBox(height: 4),
+          Text(label, style: const TextStyle(fontSize: 14, color: Colors.grey)),
         ],
       ),
     );
@@ -373,17 +330,14 @@ class SitePage extends GetView<SiteController> {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          LoginUtil.getAssImg("ic_no_data@2x"),
-          SizedBox(height: 16.h),
-          Text(
-            '暂无订单',
-            style: TextStyle(
-              fontSize: 16.sp,
-              color: Colors.black54,
-              fontWeight: FontWeight.w600,
-            ),
-          ),
+          Icon(Icons.inventory_2_outlined, size: 80, color: Colors.grey[300]),
+          const SizedBox(height: 16),
+          const Text('暂无预约数据', style: TextStyle(fontSize: 16, color: Colors.black54)),
           const SizedBox(height: 8),
+          const Text(
+            '点击右上角刷新按钮获取最新数据',
+            style: TextStyle(fontSize: 14, color: Colors.grey),
+          ),
         ],
       ),
     );
@@ -391,295 +345,134 @@ class SitePage extends GetView<SiteController> {
 
   /// 构建“有预约数据”的列表视图
   Widget _buildReservationListView() {
-    return ListView.separated(
+    return Container(
+      color: Colors.white,
+      child: ListView.separated(
         shrinkWrap: true,
         physics: const NeverScrollableScrollPhysics(),
         // 因为外层已有滚动，这里禁用内部滚动
         itemCount: controller.reservationList.length,
+        padding: const EdgeInsets.all(12.0),
         itemBuilder: (context, index) {
           final item = controller.reservationList[index];
           // 调用新的方法来构建每一项
           return _buildReservationItem(index, item);
         },
-      separatorBuilder: (context, index) => const SizedBox(height: 0), // 列表项之间的间距
+        separatorBuilder: (context, index) => const SizedBox(height: 12), // 列表项之间的间距
+      ),
     );
   }
 
   Widget _buildReservationItem(int index, ReservationModel item) {
-    const kPrimaryGreen = Color(0xFF006D35); // 深绿
-    const kLineColor = Color(0xFFE0E6ED); // 线条颜色
-
-    return IntrinsicHeight(
-      // 保证左侧竖线能跟右侧内容高度对齐
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          // 1. 左侧样式区域（竖线 + 圆点）
-          SizedBox(
-            width: 20,
-            child: Column(
-              children: [
-                // 顶部的装饰圆点
-                Container(
-                  margin: EdgeInsets.only(top: 3.w),
-                  width: 8,
-                  height: 8,
-                  decoration: BoxDecoration(
-                    color: kPrimaryGreen.withOpacity(0.5),
-                    shape: BoxShape.circle,
-                  ),
-                ),
-                // 延伸的竖线
-                Expanded(child: Container(width: 1, color: kLineColor)),
-              ],
-            ),
-          ),
-          // 2. 右侧内容区域（时间 + 卡片数据）
-          Expanded(
-            child: Padding(
-              padding: EdgeInsets.only(left: 10.w, bottom: 8.h),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  // 时间显示
-                  Text(
-                    item.time, // 格式如 "09:00 - 10:00"
-                    style: TextStyle(
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.bold,
-                      color: Color(0xFF333333),
-                    ),
-                  ),
-                  const SizedBox(height: 10),
-
-                  // 数据卡片
-                  _buildInfoCard(item),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  /// 右侧具体数据卡片
-  Widget _buildInfoCard(ReservationModel item) {
     return Container(
-      padding: EdgeInsets.only(left: 16.w, top: 8.5, bottom: 8.5, right: 16.w),
       decoration: BoxDecoration(
         color: Colors.white,
-        borderRadius: BorderRadius.circular(16),
-        border: Border.all(color: const Color(0xFFF0F0F0)),
+        borderRadius: BorderRadius.circular(8.0),
+        border: Border.all(color: Colors.grey[200]!, width: 1.0),
         boxShadow: [
           BoxShadow(
-            color: Colors.black.withOpacity(0.04),
-            blurRadius: 10,
-            offset: const Offset(0, 4),
+            color: Colors.grey.withOpacity(0.1),
+            spreadRadius: 1,
+            blurRadius: 3,
+            offset: const Offset(0, 2),
           ),
         ],
       ),
       child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          // 车牌与状态标签
-          Row(
+          // 顶部：序号、车牌号、状态
+          Padding(
+            padding: const EdgeInsets.fromLTRB(8, 12, 16, 12),
+            child: Row(
               children: [
-              Text(
-                item.plateNumber,
-                style: TextStyle(
-                  fontSize: 14.sp,
+                // 序号
+                Container(
+                  width: 24,
+                  height: 24,
+                  alignment: Alignment.center,
+                  decoration: const BoxDecoration(
+                    color: Colors.blue,
+                    shape: BoxShape.circle,
+                  ),
+                  child: Text(
+                    "${index + 1}",
+                    style: const TextStyle(
+                      color: Colors.white,
                       fontWeight: FontWeight.bold,
-                  color: Color(0xFF333333),
+                    ),
                   ),
                 ),
                 const SizedBox(width: 8),
-              _buildStatusTag(item.status),
-              Spacer(),
-              Text(
-                "预约量:${item.amount}",
-                style: TextStyle(
-                  color: Color(0xFF00A870),
-                  fontSize: 13.sp,
+                const Icon(Icons.directions_car, color: Colors.black54),
+                const SizedBox(width: 4),
+                // 车牌号
+                Expanded(
+                  child: Text(
+                    item.plateNumber,
+                    style: const TextStyle(
+                      fontSize: 16,
                       fontWeight: FontWeight.bold,
+                      color: AppTheme.themeColor,
                     ),
                   ),
+                ),
+                // 状态标签
+                _buildStatusChip(item.status),
               ],
             ),
+          ),
+          const Divider(height: 1),
+          // 中部：详细信息
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
+            child: Column(
+              children: [
+                _buildDetailRow(
+                  Icons.local_gas_station,
+                  '加氢量',
+                  item.amount,
+                  valueColor: Colors.red,
+                ),
                 const SizedBox(height: 8),
-          // 联系信息
-          Column(
-            mainAxisAlignment: MainAxisAlignment.start,
+                _buildDetailRow(Icons.access_time, '预约时间', item.time),
+                const SizedBox(height: 8),
+                _buildDetailRow(Icons.person, '联系人', item.contactPerson),
+                const SizedBox(height: 8),
+                _buildDetailRow(
+                  Icons.phone,
+                  '联系电话',
+                  item.contactPhone,
+                  valueColor: AppTheme.themeColor,
+                ),
+              ],
+            ),
+          ),
+          // 底部：操作按钮 (仅在待处理时显示)
+          if (item.status == ReservationStatus.pending)
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+              child: Row(
                 children: [
-              Text(
-                "${item.contactPerson} | ${item.contactPhone}",
-                style: TextStyle(
-                  color: Color(0xFF999999),
-                  fontSize: 13.sp,
-                  fontWeight: FontWeight.w400,
+                  Expanded(
+                    child: ElevatedButton(
+                      onPressed: () => controller.confirmReservation(item.id),
+                      style: ElevatedButton.styleFrom(backgroundColor: Colors.blue),
+                      child: const Text('确认'),
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: ElevatedButton(
+                      onPressed: () => controller.rejectReservation(item.id),
+                      style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
+                      child: const Text('拒绝'),
                     ),
                   ),
                 ],
               ),
-
-          //操作按钮（仅在待处理状态显示）
-          if (item.status == ReservationStatus.pending) ...[
-            const SizedBox(height: 15),
-            const Divider(height: 1, color: Color(0xFFF5F5F5)),
-            const SizedBox(height: 12),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                _buildSmallButton(
-                  "拒绝",
-                  isOutline: true,
-                  onTap: () {
-                    controller.rejectReservation(item.id);
-                  },
-                ),
-                const SizedBox(width: 12),
-                _buildSmallButton(
-                  "确认",
-                  isOutline: false,
-                  onTap: () {
-                    controller.confirmReservation(item.id);
-                  },
             ),
         ],
       ),
-          ],
-        ],
-      ),
-    );
-  }
-
-  /// 通用小按钮
-  Widget _buildSmallButton(
-    String text, {
-    required bool isOutline,
-    required VoidCallback onTap,
-  }) {
-    const kPrimaryGreen = Color(0xFF006D35);
-    const kDangerRed = Color(0xFFFF7D7D);
-
-    return GestureDetector(
-      onTap: onTap,
-      child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
-        decoration: BoxDecoration(
-          color: isOutline ? Colors.white : kPrimaryGreen,
-          borderRadius: BorderRadius.circular(10),
-          border: Border.all(color: isOutline ? kDangerRed : kPrimaryGreen),
-        ),
-        child: Text(
-          text,
-          style: TextStyle(
-            color: isOutline ? kDangerRed : Colors.white,
-            fontSize: 14,
-            fontWeight: FontWeight.bold,
-          ),
-        ),
-      ),
-    );
-  }
-
-  /// 状态标签构建（带圆角和浅色背景）
-  Widget _buildStatusTag(ReservationStatus status) {
-    Color textColor;
-    Color bgColor;
-    String text;
-
-    switch (status) {
-      case ReservationStatus.pending:
-        text = "待加氢";
-        textColor = const Color(0xFFFE9E62); // 橘色
-        bgColor = const Color(0xFFFFF2E9);
-        break;
-      case ReservationStatus.completed: // 假设已加氢状态
-        text = "已加氢";
-        textColor = const Color(0xFF00A870); // 绿色
-        bgColor = const Color(0xFFE6F7F1);
-        break;
-      case ReservationStatus.rejected:
-        text = "拒绝加氢";
-        textColor = const Color(0xFFFF7D7D); // 红色
-        bgColor = const Color(0xFFFFEEEE);
-        break;
-      case ReservationStatus.unadded:
-        text = '未加氢';
-        textColor = const Color(0xFFFF7D7D); // 红色
-        bgColor = const Color(0xFFFFEEEE);
-        break;
-      case ReservationStatus.cancel:
-        text = '已取消';
-        textColor = const Color(0xFFFF7D7D); // 红色
-        bgColor = const Color(0xFFFFEEEE);
-        break;
-      default:
-        text = "未知";
-        textColor = Colors.grey;
-        bgColor = Colors.grey[100]!;
-    }
-
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-      decoration: BoxDecoration(
-        color: bgColor,
-        borderRadius: BorderRadius.circular(8),
-        border: Border.all(color: textColor.withOpacity(0.3)),
-      ),
-      child: Text(
-        text,
-        style: TextStyle(color: textColor, fontSize: 11, fontWeight: FontWeight.bold),
-      ),
-    );
-  }
-
-  /// 右侧操作按钮（拒绝/确认）
-  Widget _buildActionButtons(ReservationModel item) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        // 拒绝按钮（空心）
-        GestureDetector(
-          onTap: () => controller.rejectReservation(item.id),
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(10),
-              border: Border.all(color: const Color(0xFFFF7D7D)),
-            ),
-            child: const Text(
-              "拒绝",
-              style: TextStyle(
-                color: Color(0xFFFF7D7D),
-                fontSize: 14,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-        ),
-        const SizedBox(width: 8),
-        // 确认按钮（实心深绿）
-        GestureDetector(
-          onTap: () => controller.confirmReservation(item.id),
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-            decoration: BoxDecoration(
-              color: const Color(0xFF006D35),
-              borderRadius: BorderRadius.circular(10),
-            ),
-            child: const Text(
-              "确认",
-              style: TextStyle(
-                color: Colors.white,
-                fontSize: 14,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-        ),
-      ],
     );
   }
 

ln_jq_app/lib/pages/c_page/base_widgets/view.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
+import 'package:getx_scaffold/common/index.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/pages/c_page/car_info/view.dart';
 import 'package:ln_jq_app/pages/c_page/map/view.dart';
 import 'package:ln_jq_app/pages/c_page/mine/view.dart';
@@ -13,7 +12,6 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
    BaseWidgetsPage({super.key});
 
   final PageController _pageController = PageController();
-
   // 主视图
   Widget _buildView() {
     return PageView(
@@ -22,68 +20,54 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
       onPageChanged: (index) {
         jumpTabAndPage(index);
       },
-      children: _buildPages(),
+      children: _buildPages(), // 页面的列表
     );
   }
 
   void jumpTabAndPage(int index) {
-    controller.pageIndex = index;
-    controller.updateUi();
+    controller.pageIndex = index; // 更新页面索引
+    controller.updateUi(); // 更新 UI
     _pageController.jumpToPage(controller.pageIndex);
   }
-
+  // 对应的页面
   List<Widget> _buildPages() {
-    return [ReservationPage(), MapPage(), CarInfoPage(), MinePage()];
+    return [
+      ReservationPage(),
+      MapPage(),
+      CarInfoPage(),
+      MinePage(),
+    ];
   }
 
-  // 自定义导航栏 (悬浮胶囊样式)
+  //导航栏
   Widget _buildNavigationBar() {
-    return SafeArea(
-      child: Container(
-        height: 50.h,
-        margin: const EdgeInsets.fromLTRB(24, 0, 24, 10), // 悬浮边距
-        decoration: BoxDecoration(
-          color: Color.fromRGBO(240, 244, 247, 1), // 浅灰色背景
-          borderRadius: BorderRadius.circular(30),
-          boxShadow: [
-            BoxShadow(
-              color: Colors.black.withOpacity(0.05),
-              blurRadius: 10,
-              offset: const Offset(0, 5),
+    return NavigationX(
+      currentIndex: controller.pageIndex, // 当前选中的tab索引
+      onTap: (index) {
+        jumpTabAndPage(index);
+      }, // 切换tab事件
+      items: [
+        NavigationItemModel(
+          label: '加氢预约',
+          icon: AntdIcon.orderedlist,
+          selectedIcon: AntdIcon.calendar_fill,
+        ),
+        NavigationItemModel(
+          label: '地图',
+          icon: AntdIcon.location,
+          selectedIcon: AntdIcon.location_fill,
+        ),
+        NavigationItemModel(
+          label: '车辆信息',
+          icon: AntdIcon.car,
+          selectedIcon: AntdIcon.car_fill,
+        ),
+        NavigationItemModel(
+          label: '我的',
+          icon: AntdIcon.user,
+          selectedIcon: AntdIcon.user,
         ),
       ],
-        ),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
-          children: [
-            _buildNavItem(0, "ic_h2_select@2x", "ic_h2@2x"),
-            _buildNavItem(1, "ic_map_select@2x", "ic_map@2x"),
-            _buildNavItem(2, "ic_car_select@2x", "ic_car@2x"),
-            _buildNavItem(3, "ic_user_select@2x", "ic_user@2x"),
-          ],
-        ),
-      ),
-    );
-  }
-
-  // 构建单个导航项
-  Widget _buildNavItem(int index, String icon, String selectedIcon) {
-    bool isSelected = controller.pageIndex == index;
-    return GestureDetector(
-      onTap: () => jumpTabAndPage(index),
-      behavior: HitTestBehavior.opaque,
-      child: AnimatedContainer(
-        duration: const Duration(milliseconds: 200),
-        padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
-        decoration: BoxDecoration(
-          color: isSelected ? const Color(0xFF006633) : Colors.transparent, // 选中时的深绿色背景
-          borderRadius: BorderRadius.circular(20),
-        ),
-        child: SizedBox(
-          height: 24,
-          width: 24,
-          child: LoginUtil.getAssImg(isSelected ? selectedIcon : icon),),
-      ),
     );
   }
 
@@ -94,10 +78,10 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
       id: 'baseWidgets',
       builder: (_) {
         return Scaffold(
-          extendBody: true, // 重要：让 body 延伸到导航栏后面
+          extendBody: false,
           resizeToAvoidBottomInset: false,
           bottomNavigationBar: _buildNavigationBar(),
-          body: _buildView(), // 移除 SafeArea 以获得更好的全屏沉浸感
+          body: SafeArea(child: _buildView()),
         );
       },
     );

ln_jq_app/lib/pages/c_page/car_info/attachment_viewer_page.dart

@@ -12,12 +12,12 @@ class AttachmentViewerPage extends GetView<AttachmentViewerController> {
   @override
   Widget build(BuildContext context) {
     Get.put(AttachmentViewerController());
-    // final fileName = controller.url.split('/').last;
+    final fileName = controller.url.split('/').last;
 
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          "证件详情",
+          fileName,
           style: const TextStyle(fontSize: 16),
           overflow: TextOverflow.ellipsis,
         ),

ln_jq_app/lib/pages/c_page/car_info/certificate_viewer_controller.dart

@@ -6,7 +6,7 @@ import 'package:path_provider/path_provider.dart';
 
 import 'attachment_viewer_page.dart';
 
-class CertificateViewerController extends GetxController with BaseControllerMixin {
+class CertificateViewerController extends GetxController with BaseControllerMixin{
   late final String title;
   late final List<String> attachments;
 
@@ -78,11 +78,18 @@ class CertificateViewerController extends GetxController with BaseControllerMixi
       return;
     }
 
-    Get.to(() => const AttachmentViewerPage(), arguments: {'url': url});
+    Get.to(
+          () => const AttachmentViewerPage(),
+      arguments: {
+        'url': url,
+      },
+    );
   }
 
   /// 检查 URL 是否为 PDF (此方法保持不变)
   bool isPdf(String url) {
     return url.toLowerCase().endsWith('.pdf');
   }
+
+
 }

ln_jq_app/lib/pages/c_page/car_info/controller.dart

@@ -2,12 +2,10 @@ import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/model/vehicle_info.dart';
-import 'package:ln_jq_app/pages/c_page/car_info/attachment_viewer_page.dart';
 import 'package:ln_jq_app/pages/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
-import 'package:path_provider/path_provider.dart';
+
 import 'certificate_viewer_page.dart';
-import 'dart:io';
 
 class CarInfoController extends GetxController with BaseControllerMixin {
   @override
@@ -24,38 +22,11 @@ class CarInfoController extends GetxController with BaseControllerMixin {
   final RxList<String> operationAttachments = <String>[].obs;
   final RxList<String> hydrogenationAttachments = <String>[].obs;
   final RxList<String> registerAttachments = <String>[].obs;
-  String color = "";
-  String hydrogenCapacity = "";
-  String rentFromCompany = "";
-  String address = "";
-  bool isNotice = false;
 
   @override
   void onInit() {
     super.onInit();
     getUserBindCarInfo();
-    msgNotice();
-  }
-
-  Future<void> msgNotice() async {
-    final Map<String, dynamic> requestData = {
-      'appFlag': 1,
-      'isRead': 1,
-      'pageNum': 1,
-      'pageSize': 5,
-    };
-    final response = await HttpService.to.get(
-      'appointment/unread_notice/page',
-      params: requestData,
-    );
-    if (response != null) {
-      final result = BaseModel.fromJson(response.data);
-      if (result.code == 0 && result.data != null) {
-        String total = result.data["total"].toString();
-        isNotice = int.parse(total) > 0;
-        updateUi();
-      }
-    }
   }
 
   @override
@@ -125,21 +96,6 @@ class CarInfoController extends GetxController with BaseControllerMixin {
             parseAttachments(data['hydrogenationAttachment']),
           );
           registerAttachments.assignAll(parseAttachments(data['registerAttachment']));
-
-          // 初始化时开始加载所有PDF
-          attachments = [
-            ...drivingAttachments,
-            ...operationAttachments,
-            ...hydrogenationAttachments,
-            ...registerAttachments,
-          ];
-
-           color = data['color'].toString();
-           hydrogenCapacity = data['hydrogenCapacity'].toString();
-           rentFromCompany = data['rentFromCompany'].toString();
-           address = data['address'].toString();
-
-          loadAllPdfs();
         }
       }
       updateUi();
@@ -161,69 +117,4 @@ class CarInfoController extends GetxController with BaseControllerMixin {
       arguments: {'title': title, 'attachments': attachments},
     );
   }
-
-  /// 导航到通用的附件查看器页面
-  void openAttachment(String url) {
-    if (url.isEmpty) {
-      showErrorToast('附件链接无效');
-      return;
-    }
-
-    Get.to(() => const AttachmentViewerPage(), arguments: {'url': url});
-  }
-
-  /// 检查 URL 是否为 PDF
-  bool isPdf(String url) {
-    return url.toLowerCase().endsWith('.pdf');
-  }
-
-  List<String> attachments = [];
-
-  // --- 新增: 状态管理 ---
-  /// 用于存储网络PDF的本地路径，key是网络url，value是本地路径
-  final RxMap<String, String> localPdfPaths = <String, String>{}.obs;
-
-  /// 用于跟踪每个附件的加载状态，key是网络url
-  final RxMap<String, bool> isLoading = <String, bool>{}.obs;
-
-  /// 遍历所有附件，如果是PDF则进行下载
-  void loadAllPdfs() {
-    for (var url in attachments) {
-      if (isPdf(url)) {
-        _downloadPdf(url);
-      }
-    }
-  }
-
-  /// 下载单个PDF文件
-  Future<void> _downloadPdf(String url) async {
-    if (url.isEmpty) return;
-
-    // 开始加载
-    isLoading[url] = true;
-
-    try {
-      final dio = Dio();
-      final Directory tempDir = await getTemporaryDirectory();
-      final String savePath = '${tempDir.path}/${url.split('/').last}';
-
-      // 检查文件是否已存在，避免重复下载
-      if (await File(savePath).exists()) {
-        localPdfPaths[url] = savePath;
-        isLoading[url] = false;
-        return;
-      }
-
-      await dio.download(url, savePath);
-
-      // 下载成功后，更新本地路径
-      localPdfPaths[url] = savePath;
-    } catch (e) {
-      print('PDF download error for $url: $e');
-      // 出错时也可以更新状态，以便UI显示错误提示
-    } finally {
-      // 结束加载
-      isLoading[url] = false;
-    }
-  }
 }

ln_jq_app/lib/pages/c_page/car_info/view.dart

@@ -1,13 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_pdfview/flutter_pdfview.dart';
-import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/login_util.dart';
-import 'package:ln_jq_app/pages/c_page/message/view.dart';
+import 'package:ln_jq_app/common/styles/theme.dart';
+import 'package:ln_jq_app/pages/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
-import 'package:photo_view/photo_view.dart';
 
-import '../../../common/styles/theme.dart';
 import 'controller.dart';
 
 class CarInfoPage extends GetView<CarInfoController> {
@@ -20,103 +16,80 @@ class CarInfoPage extends GetView<CarInfoController> {
       id: 'car_info',
       builder: (_) {
         return Scaffold(
-          backgroundColor: const Color.fromRGBO(240, 244, 247, 0.4),
+          backgroundColor: Colors.grey[100],
           body: SingleChildScrollView(
-            child: Column(
-              children: [
-                _buildUserInfoCard(),
-                Padding(
-                  padding: EdgeInsets.only(left: 20.w, right: 20.w),
+            child: Padding(
+              padding: const EdgeInsets.all(12.0),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
-                      const SizedBox(height: 16),
-                      _buildCarInfoCard(),
-                      _buildCertificatesCard(context),
-                      const SizedBox(height: 12),
-                      _buildSafetyReminderCard(),
-                      SizedBox(height: 95.h),
+                  _buildDriverInfoCard(),
+                  const SizedBox(height: 5),
+                  _buildCarBindingCard(),
+                  const SizedBox(height: 5),
+                  _buildCertificatesCard(),
+                  const SizedBox(height: 5),
+                  _buildTipsCard(),
                 ],
               ),
             ),
-              ],
-            ),
           ),
         );
       },
     );
   }
 
-  Widget _buildUserInfoCard() {
+  /// 构建顶部的司机信息卡片
+  Widget _buildDriverInfoCard() {
     return Card(
-      elevation: 1,
-      color: Colors.white,
+      elevation: 2,
       margin: EdgeInsets.zero,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.only(
-          bottomLeft: Radius.circular(20),
-          bottomRight: Radius.circular(20),
-        ),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
       child: Column(
         children: [
           Padding(
-            padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 16, top: 50),
+            padding: const EdgeInsets.all(16.0),
             child: Row(
               children: [
-                Stack(
-                  children: [
-                    CircleAvatar(
-                      radius: 25,
-                      backgroundColor: Colors.white,
-                      child: LoginUtil.getAssImg('ic_user_logo@2x'),
+                const CircleAvatar(
+                  radius: 20,
+                  backgroundColor: Colors.blue,
+                  child: Icon(Icons.person, color: Colors.white, size: 34),
                 ),
-                    Positioned(
-                      right: 0,
-                      bottom: 0,
-                      child: SizedBox(
-                        height: 16.h,
-                        width: 16.w,
-                        child: LoginUtil.getAssImg('ic_logo@2x'),
-                      ),
-                    ),
-                  ],
-                ),
-                SizedBox(width: 8.w),
+                const SizedBox(width: 12),
                 Expanded(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Row(
                     children: [
                       Text(
                         "${StorageService.to.name}",
-                            style: const TextStyle(
-                              fontSize: 14,
-                              fontWeight: FontWeight.bold,
+                        style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        "${StorageService.to.phone}",
+                        style: TextStyle(color: Colors.grey, fontSize: 11),
+                      ),
+                    ],
                   ),
                 ),
-                          SizedBox(width: 8.w),
                 Container(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 8,
-                              vertical: 2,
-                            ),
+                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
                   decoration: BoxDecoration(
-                              color: const Color.fromRGBO(236, 255, 234, 1),
-                              border: Border.all(color: const Color(0xFFB7E19F)),
+                    color: Colors.blue[50],
                     borderRadius: BorderRadius.circular(12),
+                    border: Border.all(color: Colors.blue, width: 0.5),
                   ),
                   child: const Row(
-                              mainAxisSize: MainAxisSize.min,
                     children: [
-                                Icon(Icons.eco, size: 12, color: Color(0xFF52C41A)),
+                      Icon(Icons.shield_outlined, color: Colors.blue, size: 14),
                       SizedBox(width: 4),
                       Text(
-                                  "绿色先锋",
+                        '已认证',
                         style: TextStyle(
-                                    color: Color(0xFF52C41A),
+                          color: Colors.blue,
                           fontSize: 10,
+                          fontWeight: FontWeight.bold,
                         ),
                       ),
                     ],
@@ -124,50 +97,16 @@ class CarInfoPage extends GetView<CarInfoController> {
                 ),
               ],
             ),
-                      const SizedBox(height: 4),
-                      Text(
-                        "羚牛ID：${StorageService.to.phone}",
-                        style: const TextStyle(color: Colors.grey, fontSize: 11),
-                      ),
-                    ],
-                  ),
-                ),
-                IconButton(
-                  onPressed: () async{
-                    var scanResult = await Get.to(() => const MessagePage());
-                    if (scanResult == null) {
-                      controller.msgNotice();
-                    }
-                  },
-                  style: IconButton.styleFrom(
-                    backgroundColor: Colors.grey[100],
-                    padding: const EdgeInsets.all(8),
-                  ),
-                  icon: Badge(
-                    smallSize: 8,
-                    backgroundColor: controller.isNotice
-                        ? Colors.red
-                        : Colors.transparent,
-                    child: const Icon(
-                      Icons.notifications_outlined,
-                      color: Colors.black87,
-                      size: 30,
-                    ),
-                  ),
-                ),
-              ],
-            ),
           ),
+          const Divider(height: 1, indent: 16, endIndent: 16),
           Padding(
-            padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 20),
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
             child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: [
-                _buildModernStatItem('本月里程数', 'Accumulated', '2,852km', ''),
-                const SizedBox(width: 8),
-                _buildModernStatItem('总里程', 'Refuel Count', "2.5W km", ''),
-                const SizedBox(width: 8),
-                _buildModernStatItem('服务评分', 'Driver rating', "4.9分", ''),
+                _buildStatItem('156', '服务天数'),
+                _buildStatItem('4.9', '评分'),
+                _buildStatItem('98%', '准时率'),
               ],
             ),
           ),
@@ -176,379 +115,207 @@ class CarInfoPage extends GetView<CarInfoController> {
     );
   }
 
-  Widget _buildModernStatItem(String title, String subtitle, String value, String unit) {
-    return Expanded(
-      child: Container(
-        padding: const EdgeInsets.all(12.0),
-        decoration: BoxDecoration(
-          color: const Color(0xFFF8F9FA),
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              title,
-              style: const TextStyle(
-                fontSize: 12,
-                fontWeight: FontWeight.bold,
-                color: Colors.black87,
-              ),
-            ),
-            Text(subtitle, style: const TextStyle(fontSize: 9, color: Colors.grey)),
-            const SizedBox(height: 8),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.baseline,
-              textBaseline: TextBaseline.alphabetic,
-              children: [
-                Text(
-                  value,
-                  style: const TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.w600,
-                    color: Colors.black87,
-                  ),
-                ),
-                Text(unit, style: const TextStyle(fontSize: 10, color: Colors.black54)),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildCarInfoCard() {
-    return Card(
-      elevation: 2,
-      color: Colors.white,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-      child: Padding(
-        padding: const EdgeInsets.all(20.0),
-        child: Column(
-          children: [
-            _buildDetailRow('车牌号', controller.plateNumber, isPlate: true),
-            const SizedBox(height: 11),
-            _buildDetailRow('车架号', controller.vin),
-            const SizedBox(height: 11),
-            _buildDetailRow('车辆型号', controller.modelName),
-            const SizedBox(height: 11),
-            _buildDetailRow('车辆品牌', controller.brandName),
-            const SizedBox(height: 10),
-            _buildH2LevelProgress(),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildDetailRow(String label, String value, {bool isPlate = false}) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: [
-        Text(label, style: const TextStyle(fontSize: 13, color: Colors.grey)),
-        Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            if (isPlate)
-              GestureDetector(
-                onTap: () => controller.doQrCode(),
-                child: Container(
-                  margin: const EdgeInsets.only(right: 10),
-                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-                  decoration: BoxDecoration(
-                    border: Border.all(color: const Color.fromRGBO(71, 174, 208, 1)),
-                    borderRadius: BorderRadius.circular(12),
-                    color: const Color.fromRGBO(235, 250, 255, 1),
-                  ),
-                  child: Row(
-                    children: [
-                      const Icon(
-                        Icons.sync,
-                        size: 12,
-                        color: Color.fromRGBO(71, 174, 208, 1),
-                      ),
-                      const SizedBox(width: 4),
-                      Text(
-                        StorageService.to.hasVehicleInfo ? "换车牌" : "扫码绑定",
-                        style: const TextStyle(
-                          color: Color.fromRGBO(71, 174, 208, 1),
-                          fontSize: 10,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            Text(
-              value,
-              style: const TextStyle(
-                fontSize: 14,
-                fontWeight: FontWeight.w600,
-                color: Colors.black87,
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  Widget _buildH2LevelProgress() {
+  // 司机信息卡片中的小统计项
+  Widget _buildStatItem(String value, String label) {
     return Column(
       children: [
-        ClipRRect(
-          borderRadius: BorderRadius.circular(4),
-          child: const LinearProgressIndicator(
-            value: 0.75,
-            minHeight: 8,
-            backgroundColor: Color(0xFFF0F2F5),
-            valueColor: AlwaysStoppedAnimation<Color>(Color.fromRGBO(16, 185, 129, 1)),
-          ),
-        ),
-        const SizedBox(height: 8),
-        const Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text("H2 Level", style: TextStyle(fontSize: 11, color: Colors.grey)),
-            Text(
-              "75%",
-              style: TextStyle(
-                fontSize: 11,
-                color: Color.fromRGBO(16, 185, 129, 1),
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  /// 3. 构建车辆证件卡片 (重构为 TabView 样式)
-  Widget _buildCertificatesCard(BuildContext context) {
-    return DefaultTabController(
-      length: 4,
-      child: Column(
-        children: [
-          TabBar(
-            isScrollable: false,
-            indicatorColor: Color.fromRGBO(16, 185, 129, 1),
-            labelColor: Color.fromRGBO(16, 185, 129, 1),
-            unselectedLabelColor: Colors.grey,
-            labelStyle: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
-            indicatorSize: TabBarIndicatorSize.label,
-            tabs: const [
-              Tab(text: '行驶证'),
-              Tab(text: '营运证'),
-              Tab(text: '加氢证'),
-              Tab(text: '登记证'),
-            ],
-          ),
-          const SizedBox(height: 9),
-          SizedBox(
-            height: 356.h, // 给定一个高度，或者使用别的方式布局
-            child: TabBarView(
-              children: [
-                _buildCertificateContent('行驶证', controller.drivingAttachments),
-                _buildCertificateContent('营运证', controller.operationAttachments),
-                _buildCertificateContent('加氢资格证', controller.hydrogenationAttachments),
-                _buildCertificateContent('登记证', controller.registerAttachments),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  /// 构建单个证件的展示内容
-  Widget _buildCertificateContent(String title, RxList<String> attachments) {
-    return Obx(() {
-      return Card(
-        elevation: 0,
-        color: Colors.white,
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-        child: Padding(
-          padding: EdgeInsets.all(16.0),
-          child: attachments.isEmpty
-              ? const Center(child: Text('暂无相关证件信息'))
-              : Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    //证件文字
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        _buildCertDetailItem('所属公司', controller.rentFromCompany, isFull: false),
-                        _buildCertDetailItem('运营城市', controller.address),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        _buildCertDetailItem(
-                          '车辆颜色',
-                          controller.color,
-                          valueColor: const Color(0xFF52C41A),
-                        ),
-                        _buildCertDetailItem('氢瓶容量', controller.hydrogenCapacity),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-                    // 附件预览部分
-                    GestureDetector(
-                      onTap: () {
-                        controller.navigateToCertificateViewer(title, attachments);
-                      },
-                      child: Container(
-                        height: 184.h,
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(16),
-                          border: Border.all(color: Color.fromRGBO(226, 232, 240, 1)),
-                          color: Color.fromRGBO(248, 250, 252, 1),
-                        ),
-                        child: Center(child: _buildAttachmentPreview(attachments[0])),
-                      ),
-                    ),
-                  ],
-                ),
-        ),
-      );
-    });
-  }
-
-  Widget _buildCertDetailItem(
-    String label,
-    String value, {
-    Color? valueColor,
-    bool isFull = false,
-  }) {
-    return Container(
-      width: isFull ? null : 140,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(label, style: const TextStyle(fontSize: 12, color: Colors.grey)),
-          const SizedBox(height: 4),
         Text(
           value,
-            style: TextStyle(
-              fontSize: 13,
+          style: const TextStyle(
+            fontSize: 18,
             fontWeight: FontWeight.bold,
-              color: valueColor ?? Colors.black87,
+            color: Colors.blue,
           ),
-            maxLines: 2,
-            overflow: TextOverflow.ellipsis,
         ),
+        const SizedBox(height: 4),
+        Text(label, style: const TextStyle(color: Colors.grey, fontSize: 12)),
       ],
-      ),
     );
   }
 
-  /// 附件预览组件 (智能判断 PDF 或图片)
-  Widget _buildAttachmentPreview(String url) {
-    return AspectRatio(
-      aspectRatio: 4 / 3,
-      child: controller.isPdf(url)
-          ? Obx(() {
-              final bool loading = controller.isLoading[url] ?? true;
-              final String? localPath = controller.localPdfPaths[url];
-
-              if (loading) {
-                return _buildLoadingIndicator();
-              } else if (localPath != null && localPath.isNotEmpty) {
-                return IgnorePointer(
-                  ignoring: true, // 设置为 true 来忽略所有指针事件
-                  child: PDFView(
-                    backgroundColor: Color.fromRGBO(248, 250, 252, 1),
-                    fitEachPage: true,
-                    filePath: localPath,
-                    fitPolicy: FitPolicy.WIDTH,
-                    // 适配宽度
-                    enableSwipe: false,
-                    swipeHorizontal: false,
-                    autoSpacing: false,
-                    pageFling: false,
-                    preventLinkNavigation: true, // 顺便禁用PDF内部链接的跳转
-                  ),
-                );
-              } else {
-                // PDF加载失败
-                return _buildErrorIndicator();
-              }
-            })
-          : Image.network(
-              url,
-              fit: BoxFit.contain,
-              // 图片加载时显示loading
-              loadingBuilder: (context, child, loadingProgress) {
-                if (loadingProgress == null) return child;
-                return _buildLoadingIndicator();
-              },
-              // 图片加载失败时显示错误
-              errorBuilder: (context, error, stackTrace) {
-                return _buildErrorIndicator();
-              },
-            ),
-    );
-  }
-
-  Widget _buildLoadingIndicator() {
-    return const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()));
-  }
-
-  Widget _buildErrorIndicator() {
-    return const SizedBox(
-      height: 200,
-      child: Center(child: Icon(Icons.error_outline, color: Colors.red, size: 48)),
-    );
-  }
-
-  /// 安全提醒卡片
-  Widget _buildSafetyReminderCard() {
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: const Color.fromRGBO(242, 249, 248, 1),
-        borderRadius: BorderRadius.circular(16),
-      ),
+  /// 构建车辆绑定信息卡片
+  Widget _buildCarBindingCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Row(
+          children: [
+            Expanded(
               child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-          Row(
-            children: [
-              Icon(Icons.info_outline, color: AppTheme.themeColor, size: 24),
-              const SizedBox(width: 8),
-              Text(
-                "安全提醒",
-                style: TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.bold,
-                  color: Color.fromRGBO(1, 113, 55, 1),
-                ),
-              ),
-            ],
-          ),
+                  _buildInfoRow('车牌号:   ${controller.plateNumber}', '扫码绑定'),
                   const SizedBox(height: 12),
-          const Text(
-            "请确保车辆证件齐全有效，定期检查车辆状态和证件有效期，以确保运输作业合规安全。",
-            style: TextStyle(
-              fontSize: 13,
-              color: Color.fromRGBO(1, 113, 55, 0.8),
-              height: 1.5,
+                  _buildInfoRow('车架号:', '${controller.vin}'),
+                  const SizedBox(height: 12),
+                  _buildInfoRow('车辆型号:', '${controller.modelName}'),
+                  const SizedBox(height: 12),
+                  _buildInfoRow('车辆品牌:', '${controller.brandName}'),
+                ],
               ),
             ),
-          const SizedBox(height: 8),
-          const Text(
-            "如有疑问请联系客服：400-021-1773",
-            style: TextStyle(fontSize: 13, color: Color.fromRGBO(1, 113, 55, 0.8)),
+            const SizedBox(width: 8),
+            Icon(Icons.propane_rounded, size: 50, color: Colors.blue.withOpacity(0.5)),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // 车辆绑定卡片中的信息行
+  Widget _buildInfoRow(String label, String value) {
+    bool isButton = value == '扫码绑定';
+    return Row(
+      children: [
+        Text(label, style: const TextStyle(fontSize: 13)),
+        const SizedBox(width: 8),
+        isButton
+            ? GestureDetector(
+                onTap: () async {
+                  controller.doQrCode();
+                },
+                child: Container(
+                  margin: EdgeInsetsGeometry.only(left: 10.w),
+                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),
+                  decoration: BoxDecoration(
+                    border: Border.all(color: Colors.blue.shade300, width: 1),
+                    borderRadius: BorderRadius.circular(5),
+                    color: Colors.blue.withOpacity(0.05),
+                  ),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min, // Keep the row compact
+                    children: [
+                      Icon(
+                        StorageService.to.hasVehicleInfo ? Icons.repeat : Icons.search,
+                        size: 13,
+                        color: Colors.blue,
+                      ),
+                      const SizedBox(width: 3),
+                      Text(
+                        StorageService.to.hasVehicleInfo ? "换车牌" : value,
+                        style: const TextStyle(
+                          color: Colors.blue,
+                          fontSize: 11,
+                          fontWeight: FontWeight.w500,
+                        ),
                       ),
                     ],
                   ),
+                ),
+              )
+            : Text(
+                value,
+                style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
+              ),
+      ],
+    );
+  }
+
+  /// 3. 构建车辆证件卡片
+  Widget _buildCertificatesCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+        child: Column(
+          children: [
+            _buildCertificateRow(
+              icon: Icons.credit_card_rounded,
+              title: '行驶证',
+              attachments: controller.drivingAttachments,
+            ),
+            const Divider(),
+            _buildCertificateRow(
+              icon: Icons.article_rounded,
+              title: '营运证',
+              attachments: controller.operationAttachments,
+            ),
+            const Divider(),
+            _buildCertificateRow(
+              icon: Icons.propane_tank_rounded,
+              title: '加氢证',
+              attachments: controller.hydrogenationAttachments,
+            ),
+            const Divider(),
+            _buildCertificateRow(
+              icon: Icons.app_registration_rounded,
+              title: '登记证',
+              attachments: controller.registerAttachments,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  /// 证件展示
+  Widget _buildCertificateRow({
+    required IconData icon,
+    required String title,
+    required List<String> attachments,
+  }) {
+    return ListTile(
+      contentPadding: EdgeInsets.zero,
+      leading: CircleAvatar(
+        radius: 24,
+        backgroundColor: Colors.blue.withOpacity(0.1),
+        child: Icon(icon, color: Colors.blue, size: 28),
+      ),
+      title: Text(
+        title,
+        style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
+      ),
+      // 使用 Obx 响应式地显示附件数量
+      subtitle: Obx(
+        () => Text(
+          '共 ${attachments.length} 个附件',
+          style: const TextStyle(color: Colors.grey, fontSize: 12),
+        ),
+      ),
+      trailing: Container(
+        padding: const EdgeInsets.all(8),
+        decoration: BoxDecoration(
+          color: Colors.grey[200],
+          borderRadius: BorderRadius.circular(8),
+        ),
+        child: const Icon(Icons.find_in_page_outlined, color: AppTheme.themeColor),
+      ),
+      // 更新 onTap 逻辑
+      onTap: () => controller.navigateToCertificateViewer(title, attachments),
+    );
+  }
+
+  Widget _buildTipsCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          children: [
+            _buildTipItem(Icons.info_outline, '请确保车辆证件齐全有效'),
+            const SizedBox(height: 10),
+            _buildTipItem(Icons.rule, '定期检查车辆状态和证件有效期'),
+            const SizedBox(height: 10),
+            _buildTipItem(Icons.headset_mic_outlined, '如有疑问请联系客服: 400-021-1773'),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // 提示信息卡片中的列表项
+  Widget _buildTipItem(IconData icon, String text) {
+    return Row(
+      children: [
+        Icon(icon, color: Colors.blue, size: 20),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Text(text, style: const TextStyle(fontSize: 12, color: Colors.black54)),
+        ),
+      ],
     );
   }
 }

ln_jq_app/lib/pages/c_page/mine/controller.dart

@@ -35,9 +35,9 @@ class MineController extends GetxController with BaseControllerMixin {
   String historyBreakRules = "";
   String vin = "";
   String plateNumber = "";
-  String violationTotal = "0";//违章总数
-  String violationScore = "0";//扣分总数
-  String violationDispose = "0";//已处理
+  String violationTotal = "0";
+  String violationScore = "0";
+  String violationDispose = "0";
   bool isNotice = false;
 
   void renderData() async {

ln_jq_app/lib/pages/c_page/mine/view.dart

@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:getx_scaffold/common/index.dart';
 import 'package:getx_scaffold/common/widgets/index.dart';
-import 'package:ln_jq_app/common/login_util.dart';
+import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/c_page/message/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
 import 'controller.dart';
@@ -18,491 +17,312 @@ class MinePage extends GetView<MineController> {
       id: 'mine',
       builder: (_) {
         return Scaffold(
-          backgroundColor: const Color.fromRGBO(247, 249, 251, 1),
+          backgroundColor: Colors.grey[100],
           body: SingleChildScrollView(
+            child: Padding(
+              padding: const EdgeInsets.all(12.0),
               child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
                   _buildUserInfoCard(),
-                const SizedBox(height: 8),
-                // 新 UI 模块开始
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                  child: Column(
-                    children: [
-                      _buildWalletCard(),
-                      SizedBox(height: 16.h),
-                      _buildGridMenu(),
-                      SizedBox(height: 16.h),
-                      _buildRecommendCard(context),
-                      SizedBox(height: 8.h),
-                      _buildSafetyReminderCard(),
-                      SizedBox(height: 24.h),
+                  const SizedBox(height: 5),
+                  _buildDriverScoreCard(),
+                  const SizedBox(height: 5),
+                  _buildMonthlyRecordCard(),
+                  const SizedBox(height: 5),
+                  _buildTipsCard(),
+                  const SizedBox(height: 20),
                   _buildLogoutButton(),
-                      SizedBox(height: 95.h),
+                  const SizedBox(height: 20),
                 ],
               ),
             ),
-                // 新 UI 模块结束
-              ],
-            ),
           ),
         );
       },
     );
   }
 
-  ///  构建顶部用户信息卡片
+  /// 1. 构建顶部用户信息卡片
   Widget _buildUserInfoCard() {
     return Card(
-      elevation: 1,
-      color: Colors.white,
-      margin: EdgeInsets.zero,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.only(
-          bottomLeft: Radius.circular(20),
-          bottomRight: Radius.circular(20),
-        ),
-      ),
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
       child: Column(
         children: [
           Padding(
-            padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 16, top: 40),
-            // 增加了顶部 padding 适配状态栏
+            padding: const EdgeInsets.all(16.0),
             child: Row(
               children: [
-                Stack(
-                  children: [
-                    CircleAvatar(
+                const CircleAvatar(
                   radius: 25,
-                      backgroundColor: Colors.white,
-                      child: LoginUtil.getAssImg('ic_user_logo@2x'),
+                  backgroundColor: Colors.blue,
+                  child: Icon(Icons.person, color: Colors.white, size: 40),
                 ),
-                    Positioned(
-                      right: 0,
-                      bottom: 0,
-                      child: SizedBox(
-                        height: 16.h,
-                        width: 16.w,
-                        child: LoginUtil.getAssImg('ic_logo@2x'),
-                      ),
-                    ),
-                  ],
-                ),
-                SizedBox(width: 8.w),
+                const SizedBox(width: 16),
                 Expanded(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Row(
                     children: [
                       Text(
                         "${StorageService.to.name}",
-                            style: const TextStyle(
-                              fontSize: 14,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                          SizedBox(width: 8.w),
-                          Container(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 8,
-                              vertical: 2,
-                            ),
-                            decoration: BoxDecoration(
-                              color: const Color.fromRGBO(236, 255, 234, 1), // 极浅绿色背景
-                              border: Border.all(color: const Color(0xFFB7E19F)), // 边框
-                              borderRadius: BorderRadius.circular(12),
-                            ),
-                            child: const Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                Icon(Icons.eco, size: 12, color: Color(0xFF52C41A)),
-                                // 叶子图标
-                                SizedBox(width: 4),
-                                Text(
-                                  "绿色先锋",
-                                  style: TextStyle(
-                                    color: Color(0xFF52C41A),
-                                    fontSize: 10,
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                        ],
+                        style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
                       ),
                       const SizedBox(height: 4),
                       Text(
-                        "羚牛ID：${StorageService.to.phone}",
-                        style: const TextStyle(color: Colors.grey, fontSize: 11),
+                        "${StorageService.to.phone}",
+                        style: TextStyle(color: Colors.grey, fontSize: 11),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        StorageService.to.hasVehicleInfo ? "已绑定车辆" : '未绑定车辆',
+                        style: TextStyle(color: Colors.orange, fontSize: 12),
                       ),
                     ],
                   ),
                 ),
                 IconButton(
-                  onPressed: () async{
+                  onPressed: () async {
+                    // 跳转消息中心
                     var scanResult = await Get.to(() => const MessagePage());
                     if (scanResult == null) {
                       controller.msgNotice();
                     }
-
                   },
+                  // 这里的 style 是为了模拟你图片里的灰色圆形背景
                   style: IconButton.styleFrom(
                     backgroundColor: Colors.grey[100],
                     padding: const EdgeInsets.all(8),
                   ),
                   icon: Badge(
+                    // label: Text('3'), // 如果你想显示数字，就加 label
                     smallSize: 8,
-                    backgroundColor: controller.isNotice
-                        ? Colors.red
-                        : Colors.transparent,
-                    child: const Icon(
+                    // 红点的大小
+                    backgroundColor: controller.isNotice ? Colors.red : Colors.white,
+                    // 红点颜色
+                    child: Icon(
                       Icons.notifications_outlined,
                       color: Colors.black87,
-                      size: 30,
+                      size: 25,
                     ),
                   ),
                 ),
               ],
             ),
           ),
-          Padding(
-            padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 20),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                _buildModernStatItem('服务天数', 'service days', '156', ''),
-                const SizedBox(width: 8),
-                _buildModernStatItem('准时率', 'Punctuality', controller.rate, ''),
-                const SizedBox(width: 8),
-                _buildModernStatItem('司机评分', 'Driver rating', controller.rating, ''),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  // 统计项
-  Widget _buildModernStatItem(String title, String subtitle, String value, String unit) {
-    return Expanded(
-      child: Container(
-        padding: const EdgeInsets.all(12.0),
-        decoration: BoxDecoration(
-          color: const Color(0xFFF8F9FA),
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              title,
-              style: const TextStyle(
-                fontSize: 12,
-                fontWeight: FontWeight.bold,
-                color: Colors.black87,
-              ),
-            ),
-            Text(subtitle, style: const TextStyle(fontSize: 9, color: Colors.grey)),
-            const SizedBox(height: 8),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.baseline,
-              textBaseline: TextBaseline.alphabetic,
-              children: [
-                Text(
-                  value,
-                  style: const TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.w600,
-                    color: Colors.black87,
-                  ),
-                ),
-                Text(unit, style: const TextStyle(fontSize: 10, color: Colors.black54)),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// 我的钱包卡片
-  Widget _buildWalletCard() {
-    return Card(
-      elevation: 1,
-      color: Colors.white,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-      child: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Row(
-          children: [
-            const Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    "我的钱包",
-                    style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
-                  ),
-                  Text("User wallet", style: TextStyle(fontSize: 12, color: Colors.grey)),
-                ],
-              ),
-            ),
-            Text(
-              "¥ 0,00元",
-              style: TextStyle(
-                color: Colors.green[700],
-                fontSize: 16,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// 2x2 功能网格菜单
-  Widget _buildGridMenu() {
-    return Column(
-      children: [
-        Row(
-          children: [
-            _buildGridItem(Icons.person_search_outlined, "客服评价", "3项可评"),
-            const SizedBox(width: 19),
-            _buildGridItem(
-              Icons.assignment_late_outlined,
-              "违章处理",
-              "${controller.historyBreakRules}项待办",
-              countColor: Colors.red,
-            ),
-          ],
-        ),
-        const SizedBox(height: 16),
-        Row(
-          children: [
-            _buildGridItem(Icons.book_outlined, "安全培训", "0个待看"),
-            const SizedBox(width: 19),
-            _buildGridItem(
-              Icons.verified_user_outlined,
-              "诚信加氢值",
-              "845",
-              isSpecial: true,
-              backgroundColor: const Color(0xFF006633),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  Widget _buildGridItem(
-    IconData icon,
-    String title,
-    String subtitle, {
-    Color? countColor,
-    bool isSpecial = false,
-    Color? backgroundColor,
-  }) {
-    return Expanded(
-      child: Container(
-        height: 100,
-        padding: const EdgeInsets.all(12),
-        decoration: BoxDecoration(
-          color: isSpecial ? backgroundColor : Colors.white,
-          borderRadius: BorderRadius.circular(16),
-        ),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Icon(icon, color: isSpecial ? Colors.white : Colors.black87, size: 28),
-            const SizedBox(height: 8),
-            Text(
-              title,
-              style: TextStyle(
-                fontSize: 14,
-                fontWeight: FontWeight.bold,
-                color: isSpecial ? Colors.white : Colors.black87,
-              ),
-            ),
-            Text(
-              subtitle,
-              style: TextStyle(
-                fontSize: 12,
-                color: isSpecial
-                    ? Colors.white.withOpacity(0.8)
-                    : (countColor ?? Colors.grey),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// 我要推荐卡片
-  Widget _buildRecommendCard(BuildContext context) {
-    return Card(
-      elevation: 0,
-      color: Colors.white,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-      child: Padding(
-        padding: const EdgeInsets.all(12.0),
-        child: Column(
-          children: [
-            const Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      "我要推荐",
-                      style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
-                    ),
-                    Text("Recommend", style: TextStyle(fontSize: 12, color: Colors.grey)),
-                  ],
-                ),
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  children: [
-                    Text("累计奖励(积分)", style: TextStyle(fontSize: 11, color: Colors.grey)),
-                    Text(
-                      "0,00",
-                      style: TextStyle(
-                        fontSize: 18,
-                        fontWeight: FontWeight.bold,
-                        color: Colors.green,
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () {
-                if (GetPlatform.isIOS) {
-                  // 跳转到 iOS 应用商店 (这里使用一个通用的应用商店链接模板，请确保替换为正式的 AppID)
-                  openWebPage("https://apps.apple.com/cn/app/羚牛氢能/6756245815");
-                } else if (GetPlatform.isAndroid) {
-                  // Android 弹出二维码图片
-                  _showAndroidDownloadDialog(context);
-                }
-              },
-              style: ElevatedButton.styleFrom(
-                backgroundColor: const Color(0xFF006633),
-                foregroundColor: Colors.white,
-                minimumSize: const Size(double.infinity, 48),
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),
-                elevation: 0,
-              ),
-              child: const Text(
-                "下载推荐",
-                style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// Android 端下载二维码弹窗
-  void _showAndroidDownloadDialog(BuildContext context) {
-    Get.dialog(
-      Center(
-        child: Container(
-          width: 280.w,
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(16),
-          ),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Padding(
-                padding: const EdgeInsets.all(24.0),
-                child: Column(
-                  children: [
-                    const Text(
-                      "扫描二维码下载",
-                      style: TextStyle(
-                        fontSize: 18,
-                        fontWeight: FontWeight.bold,
-                        color: Colors.black87,
-                      ),
-                    ),
-                    const SizedBox(height: 20),
-                    // 使用 LoginUtil.getAssImg 加载你的图片 android_apk_img.png
-                    SizedBox(
-                      width: 180.w,
-                      height: 180.w,
-                      child: LoginUtil.getAssImg('android_apk_img'),
-                    ),
-                    const SizedBox(height: 16),
-                    const Text(
-                      "请让被推荐人扫描上方二维码进行下载安装",
-                      textAlign: TextAlign.center,
-                      style: TextStyle(fontSize: 13, color: Colors.grey),
-                    ),
-                  ],
-                ),
-              ),
           const Divider(height: 1),
-              TextButton(
-                onPressed: () => Get.back(),
-                style: TextButton.styleFrom(minimumSize: const Size(double.infinity, 50)),
-                child: const Text(
-                  "确 定",
-                  style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceAround,
+              children: [
+                _buildStatItem(controller.violationTotal, '违章总数'),
+                _buildStatItem(controller.violationScore, '扣分总数'),
+                _buildStatItem(controller.violationDispose, '已处理'),
+              ],
             ),
           ),
         ],
       ),
+    );
+  }
+
+  // 用户信息卡片中的小统计项
+  Widget _buildStatItem(String value, String label) {
+    return Column(
+      children: [
+        Text(value, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+        const SizedBox(height: 4),
+        Text(label, style: const TextStyle(color: Colors.grey, fontSize: 12)),
+      ],
+    );
+  }
+
+  /// 2. 构建驾驶得分卡片
+  Widget _buildDriverScoreCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text(
+              '驾驶得分',
+              style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+            ),
+            const Text('本月表现', style: TextStyle(fontSize: 12, color: Colors.grey)),
+            const SizedBox(height: 20),
+            Center(
+              child: SizedBox(
+                width: 100,
+                height: 100,
+                child: Stack(
+                  fit: StackFit.expand,
+                  children: [
+                    CircularProgressIndicator(
+                      value: (double.tryParse(controller.rating) ?? 0) / 10,
+                      strokeWidth: 8,
+                      backgroundColor: Colors.grey[200],
+                      valueColor: AlwaysStoppedAnimation<Color>(Colors.blue),
+                    ),
+                    Center(
+                      child: Text(
+                        controller.rating,
+                        style: TextStyle(
+                          fontSize: 32,
+                          fontWeight: FontWeight.bold,
+                          color: Colors.blue,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            const SizedBox(height: 20),
+            _buildScoreDetailRow(Icons.directions_car, '安全驾驶', '无违章记录', true),
+            const Divider(),
+            _buildScoreDetailRow(Icons.timer, '准时率', '100%准时到达', true),
+            const Divider(),
+            _buildScoreDetailRow(Icons.thumb_up, '服务质量', '用户满意度高', true),
+            const Divider(),
+            Padding(
+              padding: const EdgeInsets.only(top: 12.0),
+              child: Row(
+                children: [
+                  const Text(
+                    '优秀驾驶员',
+                    style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
+                  ),
+                  const Spacer(),
+                  Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                    decoration: BoxDecoration(
+                      color: Colors.blue,
+                      borderRadius: BorderRadius.circular(16),
+                    ),
+                    child: const Text(
+                      'A+',
+                      style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
         ),
       ),
     );
   }
 
-  /// 安全提醒卡片
-  Widget _buildSafetyReminderCard() {
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: const Color.fromRGBO(242, 249, 248, 1), // 极浅绿色背景
-        borderRadius: BorderRadius.circular(16),
+  // 驾驶得分卡片中的评分项
+  Widget _buildScoreDetailRow(
+    IconData icon,
+    String title,
+    String subtitle,
+    bool isCompleted,
+  ) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: Row(
+        children: [
+          CircleAvatar(
+            radius: 20,
+            backgroundColor: Colors.blue.withOpacity(0.1),
+            child: Icon(icon, color: Colors.blue, size: 24),
           ),
+          const SizedBox(width: 12),
+          Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-          Row(
-            children: [
-              Icon(Icons.info_outline, color: Colors.green[700], size: 24),
-              const SizedBox(width: 8),
                 Text(
-                "安全提醒",
-                style: TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.bold,
-                  color: Colors.green[900],
-                ),
+                  title,
+                  style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
                 ),
+                Text(subtitle, style: const TextStyle(fontSize: 12, color: Colors.grey)),
               ],
             ),
-          const SizedBox(height: 12),
-          Text(
-            "请保持良好驾驶习惯，提高安全评分，遵守交通规则，避免违章扣分。",
-            style: TextStyle(fontSize: 13, color: Colors.green[800], height: 1.5),
+          ),
+          if (isCompleted) const Icon(Icons.check_circle, color: Colors.blue),
+        ],
+      ),
+    );
+  }
+
+  /// 3. 构建本月记录卡片
+  Widget _buildMonthlyRecordCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text(
+              '本月记录',
+              style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
             ),
             const SizedBox(height: 8),
-          Text(
-            "如有疑问请联系客服：400-021-1773",
-            style: TextStyle(fontSize: 13, color: Colors.green[800]),
+            _buildRecordRow(Icons.rate_review, '加氢预约践行率', controller.rate),
+            const Divider(),
+            _buildRecordRow(
+              Icons.report_problem_outlined,
+              '违章',
+              "${controller.historyBreakRules}起",
             ),
+            const Divider(),
+            _buildRecordRow(Icons.car_crash_outlined, '交通事故', "${controller.accident}起"),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // 本月记录中的列表项
+  Widget _buildRecordRow(IconData icon, String title, String value) {
+    return ListTile(
+      contentPadding: EdgeInsets.zero,
+      leading: CircleAvatar(
+        radius: 20,
+        backgroundColor: Colors.blue.withOpacity(0.1),
+        child: Icon(icon, color: Colors.blue, size: 24),
+      ),
+      title: Text(title, style: const TextStyle(fontSize: 14)),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(value, style: const TextStyle(color: AppTheme.themeColor, fontSize: 14)),
+        ],
+      ),
+      onTap: () {
+        // TODO: 处理点击事件
+      },
+    );
+  }
+
+  /// 4. 构建提示信息卡片
+  Widget _buildTipsCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          children: [
+            _buildInfoItem(Icons.info_outline, '保持良好的驾驶习惯，提高安全评分'),
+            const SizedBox(height: 10),
+            _buildInfoItem(Icons.rule, '遵守交通规则，避免违章扣分'),
+            const SizedBox(height: 10),
+            _buildInfoItem(Icons.headset_mic_outlined, '如有疑问请联系客服: 400-021-1773'),
+            const SizedBox(height: 10),
             Row(
               children: [
+                Icon(Icons.verified_outlined, color: Colors.blue, size: 20),
+                const SizedBox(width: 10),
                 Expanded(
                   child: FutureBuilder<String>(
                     future: getVersion(),
@@ -516,7 +336,7 @@ class MinePage extends GetView<MineController> {
                       if (snapshot.hasData) {
                         return TextX.labelSmall(
                           "当前版本: ${snapshot.data}",
-                        color: Colors.green[800],
+                          color: Colors.black54,
                         );
                       }
 
@@ -529,6 +349,20 @@ class MinePage extends GetView<MineController> {
             ),
           ],
         ),
+      ),
+    );
+  }
+
+  // 提示信息卡片中的列表项
+  Widget _buildInfoItem(IconData icon, String text) {
+    return Row(
+      children: [
+        Icon(icon, color: Colors.blue, size: 20),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Text(text, style: const TextStyle(fontSize: 12, color: Colors.black54)),
+        ),
+      ],
     );
   }
 
@@ -538,7 +372,7 @@ class MinePage extends GetView<MineController> {
         controller.logout();
       },
       style: ElevatedButton.styleFrom(
-        backgroundColor: Color.fromRGBO(204, 52, 46, 1),
+        backgroundColor: Colors.red[400],
         foregroundColor: Colors.white,
         minimumSize: const Size(double.infinity, 48),
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),

ln_jq_app/lib/pages/c_page/reservation/controller.dart

@@ -33,8 +33,6 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
   @override
   String get builderId => 'reservation';
 
-  C_ReservationController();
-
   final DateTime _now = DateTime.now();
 
   // 计算当前时间属于哪个1小时区间
@@ -344,7 +342,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       return;
     }*/
 
-    DateTime reservationEndDateTime = DateTime(
+    final reservationEndDateTime = DateTime(
       selectedDate.value.year,
       selectedDate.value.month,
       selectedDate.value.day,
@@ -352,13 +350,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       endTime.value.minute,
     );
 
-    // 如果结束的小时数小于开始的小时数，或者结束时间是 00:00，说明是次日
-    if (endTime.value.hour < startTime.value.hour ||
-        (endTime.value.hour == 0 && endTime.value.minute == 0)) {
-      reservationEndDateTime = reservationEndDateTime.add(const Duration(days: 1));
-    }
-
-    // 执行时间检查
+    //判断预约区间的结束时间是否早于当前时间（留出1分钟缓冲）
     if (reservationEndDateTime.isBefore(
       DateTime.now().subtract(const Duration(minutes: 1)),
     )) {
@@ -371,10 +363,10 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
         (s) => s.hydrogenId == selectedStationId.value,
       );
 
-      /*if (selectedStation.siteStatusName != "营运中") {
+      if (selectedStation.siteStatusName != "营运中") {
         showToast("该站点${selectedStation.siteStatusName}，暂无法预约");
         return;
-      }*/
+      }
 
       showLoading("提交中");
 
@@ -544,7 +536,6 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
   String leftHydrogen = "0";
   num maxHydrogen = 0;
   String difference = "";
-  var progressValue = 0.0;
 
   //用来管理查看预约的弹窗
   Worker? _sheetWorker;
@@ -560,35 +551,16 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
     getUserBindCarInfo();
     getSiteList();
     startAutoRefresh();
-    msgNotice();
-
     if (!init) {
       _setupListener();
       init = true;
     }
   }
 
-  bool isNotice = false;
-
-  Future<void> msgNotice() async {
-    final Map<String, dynamic> requestData = {
-      'appFlag': 1,
-      'isRead': 1,
-      'pageNum': 1,
-      'pageSize': 5,
-    };
-    final response = await HttpService.to.get(
-      'appointment/unread_notice/page',
-      params: requestData,
-    );
-    if (response != null) {
-      final result = BaseModel.fromJson(response.data);
-      if (result.code == 0 && result.data != null) {
-        String total = result.data["total"].toString();
-        isNotice = int.parse(total) > 0;
-        updateUi();
-      }
-    }
+  @override
+  void onPaused() {
+    stopAutoRefresh();
+    super.onPaused();
   }
 
   void startAutoRefresh() {
@@ -659,10 +631,8 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
       var result = BaseModel.fromJson(responseData.data);
 
-      final value = double.tryParse(result.data["fillingWeight"]?.toString() ?? '0') ?? 0;
-      final String formatted = value.toStringAsFixed(2);
-
-      fillingWeight = "$formatted${result.data["fillingWeightUnit"]}";
+      fillingWeight =
+          "${result.data["fillingWeight"]}${result.data["fillingWeightUnit"]}";
       fillingTimes = "${result.data["fillingTimes"]}${result.data["fillingTimesUnit"]}";
 
       updateUi();
@@ -674,8 +644,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
   void getCatinfo() async {
     try {
+      HttpService.to.setBaseUrl(AppTheme.car_service_url);
       var responseData = await HttpService.to.post(
-        'appointment/vehicle/getHydrogenInfoByPlateNumber',
+        'VehicleData/getHydrogenInfoByPlateNumber',
         data: {
           'userName': "xll@lingniu",
           'password': "4q%3!l6s0p",
@@ -700,28 +671,11 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
         amountController.text = flooredDifference.toString();
       }
 
-      if (maxHydrogen > 0) {
-        progressValue = leftHydrogenNum / maxHydrogen;
-
-        // 边界处理：确保值在 0 到 1 之间
-        if (progressValue > 1.0) progressValue = 1.0;
-        if (progressValue < 0.0) progressValue = 0.0;
-      }
-
       updateUi();
-    } catch (e) {}
-    renderSliderTheme();
+    } catch (e) {
+    } finally {
+      HttpService.to.setBaseUrl(AppTheme.test_service_url);
     }
-
-  double current = 0.0;
-  double maxVal = 0.0;
-
-  void renderSliderTheme() {
-    current = double.tryParse(amountController.text) ?? 0.0;
-    maxVal = double.tryParse(difference) ?? 100.0;
-    if (maxVal <= 0) maxVal = 100.0;
-
-    updateUi();
   }
 
   void getSiteList() async {
@@ -781,7 +735,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       if (stationOptions.isEmpty) {
         showToast('附近暂无可用加氢站');
       } else {
-        // showToast('站点列表已刷新');
+        showToast('站点列表已刷新');
       }
 
       // 找到第一个可选的站点作为默认值
@@ -829,7 +783,6 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
   @override
   void onClose() {
-    super.onClose();
     amountController.dispose();
     plateNumberController.dispose();
     if (_debounce != null) {
@@ -837,5 +790,6 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
     }
     _sheetWorker?.dispose();
     stopAutoRefresh();
+    super.onClose();
   }
 }

ln_jq_app/lib/pages/common/webview/controller.dart

@@ -1,26 +0,0 @@
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
-import 'package:get/get.dart';
-
-class WebController extends GetxController {
-  late String title;
-  late String url;
-  
-  final RxDouble progress = 0.0.obs;
-  InAppWebViewController? webViewController;
-
-  @override
-  void onInit() {
-    super.onInit();
-    // 从参数中获取标题和URL
-    title = Get.arguments['title'] ?? '详情';
-    url = Get.arguments['url'] ?? '';
-  }
-
-  void onWebViewCreated(InAppWebViewController controller) {
-    webViewController = controller;
-  }
-
-  void onProgressChanged(InAppWebViewController controller, int progressValue) {
-    progress.value = progressValue / 100;
-  }
-}

ln_jq_app/lib/pages/common/webview/view.dart

@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
-import 'package:get/get.dart';
-
-import 'controller.dart';
-
-class WebViewPage extends GetView<WebController> {
-  const WebViewPage({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    Get.put(WebController());
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(controller.title),
-        centerTitle: true,
-        bottom: PreferredSize(
-          preferredSize: const Size.fromHeight(2.0),
-          child: Obx(
-            () => controller.progress.value < 1.0
-                ? LinearProgressIndicator(
-                    value: controller.progress.value,
-                    backgroundColor: Colors.transparent,
-                    valueColor: AlwaysStoppedAnimation<Color>(
-                      Theme.of(context).primaryColor,
-                    ),
-                    minHeight: 2.0,
-                  )
-                : const SizedBox(height: 2.0),
-          ),
-        ),
-      ),
-      body: InAppWebView(
-        initialUrlRequest: URLRequest(url: WebUri(controller.url)),
-        initialSettings: InAppWebViewSettings(
-          isInspectable: true,
-          javaScriptEnabled: true,
-          javaScriptCanOpenWindowsAutomatically: true,
-          useShouldOverrideUrlLoading: true,
-          mixedContentMode: MixedContentMode.MIXED_CONTENT_ALWAYS_ALLOW,
-          mediaPlaybackRequiresUserGesture: false,
-          allowsInlineMediaPlayback: true,
-        ),
-        onWebViewCreated: controller.onWebViewCreated,
-        onProgressChanged: controller.onProgressChanged,
-      ),
-    );
-  }
-}

ln_jq_app/lib/pages/login/controller.dart

@@ -1,7 +1,4 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/model/base_model.dart';
 
 class LoginController extends GetxController with BaseControllerMixin {
   @override
@@ -10,73 +7,19 @@ class LoginController extends GetxController with BaseControllerMixin {
   LoginController();
 
   // 控制输入框的 TextEditingController
-  final TextEditingController phoneController = TextEditingController();
-  final TextEditingController codeController = TextEditingController();
-
+  final TextEditingController driverIdentityController = TextEditingController();
   final TextEditingController stationIdController = TextEditingController();
   final TextEditingController passwordController = TextEditingController();
 
-
-  // --- 倒计时逻辑 ---
-  final RxInt countdown = 0.obs;
-  Timer? _timer;
-
-  void startCountdown() async {
-    if (phoneController.text.isEmpty || !phoneController.text.isPhoneNumber) {
-      showToast("请输入正确的手机号");
-      return;
-    }
-
-    if (countdown.value > 0) return;
-
-    // 调用发送验证码接口
-    var responseData = await HttpService.to.post(
-      'appointment/login/sendCode',
-      data: {"mobile": phoneController.text},
-    );
-
-    if (responseData == null) {
-      showToast('验证码发送失败，请稍后重试');
-      return;
-    }
-
-    try {
-      var result = BaseModel.fromJson(responseData.data);
-
-      if (result.code != 0) {
-        showToast(result.error);
-        dismissLoading();
-        return;
-      }
-
-      showToast("验证码已发送");
-
-      countdown.value = 60;
-      _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
-        if (countdown.value > 0) {
-          countdown.value--;
-        } else {
-          _timer?.cancel();
-        }
-      });
-    } catch (e) {
-      showToast('验证码服务异常，请稍后重试');
-    }
-  }
-
   @override
   void onInit() {
+
     super.onInit();
   }
 
   @override
   void onClose() {
-    _timer?.cancel();
-    phoneController.dispose();
-    codeController.dispose();
-
-    stationIdController.dispose();
-    passwordController.dispose();
     super.onClose();
   }
+
 }

ln_jq_app/lib/pages/login/view.dart

@@ -1,9 +1,6 @@
-import 'dart:io';
-
 import 'package:aliyun_push_flutter/aliyun_push_flutter.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/login_util.dart';
@@ -12,7 +9,6 @@ import 'package:ln_jq_app/common/model/vehicle_info.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/b_page/base_widgets/view.dart';
 import 'package:ln_jq_app/pages/c_page/base_widgets/view.dart';
-import 'package:ln_jq_app/pages/common/webview/view.dart';
 import 'package:ln_jq_app/pages/login/controller.dart';
 import 'package:ln_jq_app/pages/url_host/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
@@ -25,467 +21,170 @@ class LoginPage extends StatefulWidget {
 }
 
 class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMixin {
-  late TabController _tabController;
-  bool _isAgreed = false;
+  late TabController tabController;
+
+  bool cLogin = true;
   bool _obscureText = true;
+
+  // 用于管理“记住密码”的复选框状态
   bool _rememberPassword = true;
+
+  // 用于确保凭证只在首次加载时回填一次
   bool _credentialsLoaded = false;
 
   @override
   void initState() {
     super.initState();
-    _tabController = TabController(length: 2, vsync: this);
-    _tabController.addListener(() {
-      if (!_tabController.indexIsChanging) {
-        setState(() {});
+    tabController = TabController(length: 2, vsync: this);
+    tabController.addListener(_tabChangeListener);
   }
+
+  void _tabChangeListener() {
+    if (!tabController.indexIsChanging) {
+      switchTab(tabController.index);
+    }
+  }
+
+  void switchTab(int index) {
+    setState(() {
+      cLogin = (index == 0);
     });
   }
 
   @override
   void dispose() {
-    _tabController.dispose();
+    tabController.dispose();
     super.dispose();
   }
 
-  @override
-  Widget build(BuildContext context) {
-    return GetBuilder<LoginController>(
-      init: LoginController(),
-      id: 'login',
-      builder: (controller) {
-        // 站点登录凭证回填逻辑
+  Widget _buildView(LoginController controller) {
+    // 在视图构建时，检查并回填已保存的凭证
     if (!_credentialsLoaded) {
       final savedAccount = StorageService.to.stationAccount;
       final savedPassword = StorageService.to.stationPassword;
       if (savedAccount != null && savedPassword != null) {
         controller.stationIdController.text = savedAccount;
         controller.passwordController.text = savedPassword;
-            _rememberPassword = true;
+        _rememberPassword = true; // 如果有保存的密码，则默认勾选
       }
-          _credentialsLoaded = true;
+      _credentialsLoaded = true; // 标记为已加载，防止重复执行
     }
 
-        return Scaffold(
-          backgroundColor: Colors.white,
-          resizeToAvoidBottomInset: false,
-          body: GestureDetector(
-            onTap: () {
-              hideKeyboard();
-            },
-            child: Stack(
-              children: [
-                //顶部背景与装饰
-                Positioned(
-                  top: 0,
-                  left: 0,
-                  right: 0,
-                  child: LoginUtil.getAssImg("bg_login"),
+    return Container(
+      color: Color(0xFFEFF4F7),
+      child: <Widget>[
+        Icon(cLogin ? AntdIcon.car : AntdIcon.USB),
+        SizedBox(height: 5.h),
+        TextX.bodyLarge(cLogin ? '司机端' : "加氢站", weight: FontWeight.w700),
+        SizedBox(height: 5.h),
+        TextX.bodyLarge(cLogin ? '安全驾驶·智能服务' : "氢能服务·专业运营"),
+        Card(
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(15), // 设置圆角弧度
           ),
-                Positioned(
-                  top: 0,
-                  left: 0,
-                  child: SizedBox(
-                    width: 180.w,
-                    height: 218.h,
-                    child: LoginUtil.getAssImg("ic_login_bg@2x"),
-                  ),
-                ),
-                _buildBrandingHeader(),
-
-                //  登录表单主体
-                Positioned(
-                  top: 300.h,
-                  left: 0,
-                  right: 0,
-                  bottom: 0,
+          margin: EdgeInsets.all(15),
+          elevation: 4,
           child: Container(
-                    decoration: const BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.only(
-                        topLeft: Radius.circular(40),
-                        topRight: Radius.circular(40),
-                      ),
-                    ),
+            height: cLogin ? 285.h : 360.h,
+            padding: EdgeInsets.all(15),
             child: Column(
               children: [
-                        const SizedBox(height: 20),
-                        // TabBar 切换
-                        Container(
-                          margin: EdgeInsets.symmetric(horizontal: 60.w),
+                Card(
+                  elevation: 2,
+                  child: Container(
+                    height: 55.h,
+                    padding: EdgeInsets.all(3),
                     child: TabBar(
-                            controller: _tabController,
-                            indicatorColor: const Color(0xFF006633),
-                            indicatorWeight: 3,
-                            labelColor: const Color(0xFF006633),
-                            unselectedLabelColor: Colors.grey,
-                            labelStyle: const TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                            ),
-                            tabs: const [
-                              Tab(text: "司机登录"),
-                              Tab(text: "站点登录"),
-                            ],
-                          ),
-                        ),
-                        Expanded(
-                          child: SingleChildScrollView(
-                            padding: EdgeInsets.symmetric(horizontal: 30.w),
-                            child: Column(
-                              children: [
-                                const SizedBox(height: 30),
-                                // 根据 Tab 显示不同的输入框
-                                _tabController.index == 0
-                                    ? _buildDriverInputFields(controller)
-                                    : _buildStationInputFields(controller),
-
-                                const SizedBox(height: 30),
-                                // 统一登录按钮
-                                _buildLoginButton(controller),
-
-                                const SizedBox(height: 10),
-                                buildAgreement(),
-                                const SizedBox(height: 40),
-                              ],
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-                Positioned(left: 0, right: 0, bottom: 33.h, child: _buildFooterSlogan()),
-                if (AppTheme.is_show_host)
-                  Positioned(
-                    top: 40.h,
-                    right: 20.w,
-                    child: TextButton(
-                      onPressed: () => Get.to(() => const UrlHostPage()),
-                      child: const Text(
-                        "域名配置",
-                        style: TextStyle(
-                          color: Colors.black,
-                          fontSize: 16,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ),
-                  ),
-              ],
-            ),
-          ),
-        );
+                      controller: tabController,
+                      onTap: (index) {
+                        delayed(300, () {
+                          switchTab(index);
+                        });
                       },
+                      labelColor: Colors.white,
+                      unselectedLabelColor: Colors.black,
+                      indicator: BoxDecoration(
+                        color: AppTheme.themeColor,
+                        borderRadius: BorderRadius.circular(12),
+                        boxShadow: [
+                          BoxShadow(
+                            color: Colors.blue.withOpacity(0.2),
+                            spreadRadius: 1,
+                            blurRadius: 6,
+                          ),
+                        ],
+                      ),
+                      tabs: [
+                        Tab(text: '司机端登录'),
+                        Tab(text: '加氢站登录'),
+                      ],
+                      isScrollable: false,
+                    ),
+                  ),
+                ),
+                Flexible(
+                  child: TabBarView(
+                    controller: tabController,
+                    children: [
+                      _driverLoginView(controller),
+                      _stationLoginView(controller),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ].toColumn(mainAxisSize: MainAxisSize.min).center(),
     );
   }
 
-  /// 品牌头部
-  Widget _buildBrandingHeader() {
-    return Positioned(
-      top: 0,
-      left: 32.w,
-      right: 0,
-      child: Column(
+  Widget _driverLoginView(LoginController controller) {
+    return !cLogin
+        ? SizedBox()
+        : Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-          SizedBox(height: 100.h),
-          SizedBox(height: 60.h, child: LoginUtil.getAssImg('ic_logo_unbg@2x')),
-          SizedBox(height: 30.h),
-          const Text(
-            "HELLO,",
-            style: TextStyle(
-              fontSize: 32,
-              fontWeight: FontWeight.w500,
-              color: Color.fromRGBO(51, 51, 51, 1),
-            ),
-          ),
-          const SizedBox(height: 8),
-          Row(
-            children: [
-              const Text(
-                "欢迎使用 ",
-                style: TextStyle(
-                  fontSize: 24,
-                  fontWeight: FontWeight.w500,
-                  color: Color.fromRGBO(51, 51, 51, 1),
-                ),
-              ),
-              Container(
-                padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
-                decoration: BoxDecoration(
-                  color: const Color.fromRGBO(56, 198, 151, 1),
-                  borderRadius: BorderRadius.circular(20),
-                ),
-                child: const Text(
-                  "“羚牛氢能智慧服务平台”",
-                  style: TextStyle(
-                    color: Colors.white,
-                    fontSize: 12,
-                    fontWeight: FontWeight.bold,
+              SizedBox(height: 20.h),
+              TextFormField(
+                controller: controller.driverIdentityController,
+                cursorColor: AppTheme.themeColor,
+                maxLength: 8,
+                style: TextStyle(fontSize: 14),
+                decoration: InputDecoration(
+                  hintText: '请输入身份后8位',
+                  border: OutlineInputBorder(),
+                  hintStyle: TextStyle(fontSize: 14),
+                  contentPadding: EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                  prefixIcon: Icon(Icons.person_2_outlined, color: Colors.grey),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: AppTheme.themeColor),
                   ),
                 ),
               ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  /// 司机登录输入框 (手机号+验证码)
-  Widget _buildDriverInputFields(LoginController controller) {
-    return Column(
-      children: [
-        _buildInputWrapper(
-          child: TextField(
-            controller: controller.phoneController,
-            keyboardType: TextInputType.phone,
-            decoration: const InputDecoration(
-              hintText: '请输入手机号',
-              border: InputBorder.none,
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-            ),
-          ),
-        ),
-        const SizedBox(height: 20),
-        _buildInputWrapper(
-          child: Row(
-            children: [
-              Expanded(
-                child: TextField(
-                  controller: controller.codeController,
-                  keyboardType: TextInputType.number,
-                  inputFormatters: [LengthLimitingTextInputFormatter(6)],
-                  decoration: const InputDecoration(
-                    hintText: '请输入验证码',
-                    border: InputBorder.none,
-                    contentPadding: EdgeInsets.symmetric(horizontal: 24),
-                  ),
-                ),
-              ),
-              Obx(
-                () => GestureDetector(
-                  onTap: controller.countdown.value == 0
-                      ? controller.startCountdown
-                      : null,
-                  child: Padding(
-                    padding: const EdgeInsets.only(right: 24.0),
-                    child: Text(
-                      controller.countdown.value == 0
-                          ? "获取验证码"
-                          : "${controller.countdown.value}s后重发",
-                      style: TextStyle(
-                        color: controller.countdown.value == 0
-                            ? const Color(0xFF006633)
-                            : Colors.grey,
-                        fontSize: 13,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  /// 站点登录输入框 (账号+密码)
-  Widget _buildStationInputFields(LoginController controller) {
-    return Column(
-      children: [
-        _buildInputWrapper(
-          child: TextField(
-            controller: controller.stationIdController,
-            decoration: const InputDecoration(
-              hintText: '请输入加氢站编号',
-              border: InputBorder.none,
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-            ),
-          ),
-        ),
-        const SizedBox(height: 20),
-        _buildInputWrapper(
-          child: Row(
-            children: [
-              Expanded(
-                child: TextField(
-                  controller: controller.passwordController,
-                  obscureText: _obscureText,
-                  decoration: const InputDecoration(
-                    hintText: '请输入密码',
-                    border: InputBorder.none,
-                    contentPadding: EdgeInsets.symmetric(horizontal: 24),
-                  ),
-                ),
-              ),
-              IconButton(
-                icon: Icon(
-                  _obscureText ? Icons.visibility_off : Icons.visibility,
-                  color: Colors.grey,
-                ),
-                onPressed: () => setState(() => _obscureText = !_obscureText),
-              ),
-            ],
-          ),
-        ),
-        const SizedBox(height: 10),
-        Row(
-          children: [
-            SizedBox(
-              width: 40,
-              child: Checkbox(
-                value: _rememberPassword,
-                activeColor: const Color(0xFF006633),
-                onChanged: (val) => setState(() => _rememberPassword = val ?? false),
-              ),
-            ),
-            const Text("记住密码", style: TextStyle(color: Colors.grey, fontSize: 14)),
-          ],
-        ),
-      ],
-    );
-  }
-
-  /// 通用输入框包装
-  Widget _buildInputWrapper({required Widget child}) {
-    return Container(
-      height: 55.h,
-      alignment: Alignment.center,
-      decoration: BoxDecoration(
-        color: const Color(0xFFF7F9FB),
-        borderRadius: BorderRadius.circular(28),
-      ),
-      child: child,
-    );
-  }
-
-  /// 统一登录按钮逻辑
-  Widget _buildLoginButton(LoginController controller) {
-    return ElevatedButton(
-      onPressed: () => _handleLogin(controller),
-      style: ElevatedButton.styleFrom(
-        backgroundColor: const Color(0xFF006633),
-        foregroundColor: Colors.white,
-        minimumSize: const Size(double.infinity, 55),
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(28)),
-        elevation: 0,
-      ),
-      child: Text(
-        _tabController.index == 0 ? "司机登录" : "站点登录",
-        style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
-      ),
-    );
-  }
-
-  void _handleLogin(LoginController controller) async {
-    if (!_isAgreed) {
-      DialogX.to.showConfirmDialog(
-        icon: DialogIcon.warn,
-        content: _buildDialogContent(),
-        confirmText: '同意',
-        cancelText: '拒绝',
-        onConfirm: () {
-          _isAgreed = true;
-          controller.updateUi();
-        },
-      );
+              SizedBox(height: 20.h),
+              ElevatedButton(
+                onPressed: () async {
+                  String password = controller.driverIdentityController.text;
+                  if (password.isEmpty) {
+                    showToast("请输入密码");
                     return;
                   }
-    _tabController.index == 0
-        ? _handleDriverLogin(controller)
-        : _handleStationLogin(controller);
-  }
-
-  /// 司机登录逻辑 (短信登录)
-  void _handleDriverLogin(LoginController controller) async {
-    if (!_validateAgreed()) return;
-    String phone = controller.phoneController.text;
-    String code = controller.codeController.text;
-    if (phone.isEmpty || !phone.isPhoneNumber) {
-      showToast("请输入正确的手机号");
-      return;
-    }
-    if (code.isEmpty) {
-      showToast("请输入验证码");
-      return;
-    }
-
                   showLoading('登录中...');
                   try {
                     var responseData = await HttpService.to.post(
-        'appointment/login/login',
-        data: {'mobile': phone, 'code': code},
+                      'appointment/login/loginForDriver',
+                      data: {'idNo': password},
                     );
-      _processLoginResponse(responseData, "driver", phone);
-    } catch (e) {
+                    if (responseData == null && responseData!.data == null) {
                       dismissLoading();
-    }
-  }
-
-  /// 站点登录逻辑 (账号密码)
-  void _handleStationLogin(LoginController controller) async {
-    if (!_validateAgreed()) return;
-    String account = controller.stationIdController.text;
-    String password = controller.passwordController.text;
-    if (account.isEmpty || password.isEmpty) {
-      showToast("请输入账号和密码");
+                      showToast('登录失败：无法获取凭证');
                       return;
                     }
-
-    showLoading('登录中...');
+                    //登录信息处理
                     try {
-      String encryptedPassword = LoginUtil.encrypt(password);
-      var responseData = await HttpService.to.post(
-        'appointment/login/password',
-        data: {'account': account, 'password': encryptedPassword, 'loginType': "station"},
-      );
-
-      if (responseData != null && responseData.data != null) {
                       var result = BaseModel.fromJson(responseData.data);
-        if (result.code == 0) {
-          // 登录成功，处理记住密码逻辑
-          if (_rememberPassword) {
-            await StorageService.to.saveStationCredentials(account, password);
-          } else {
-            await StorageService.to.clearStationCredentials();
-          }
-        }
-      }
 
-
-      _processLoginResponse(responseData, "station", account);
-    } catch (e) {
-      dismissLoading();
-    }
-  }
-
-  bool _validateAgreed() {
-    if (!_isAgreed) {
-      DialogX.to.showConfirmDialog(
-        icon: DialogIcon.warn,
-        message: '请阅读并同意用户协议和隐私政策',
-        confirmText: '确定',
-        onConfirm: () {},
-      );
-      return false;
-    }
-    return true;
-  }
-
-  void _processLoginResponse(
-    dynamic responseData,
-    String channel,
-    String identifier,
-  ) async {
-    if (responseData == null || responseData.data == null) {
-      dismissLoading();
-      return;
-    }
-    var result = BaseModel.fromJson(responseData.data);
                       if (result.code != 0) {
                         showToast(result.error);
                         dismissLoading();
@@ -493,18 +192,25 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
                       }
 
                       String token = result.data['token'] ?? '';
-    if (channel == "driver") {
+                      String idCard = result.data['idCard'] ?? '';
+                      String name = result.data['name'] ?? '';
+                      String phone = result.data['phone'] ?? '';
                       await StorageService.to.saveLoginInfo(
                         token: token,
                         userId: "",
                         channel: "driver",
-        name: result.data['name'],
-        phone: result.data['phone'],
+                        idCard: idCard,
+                        name: name,
+                        phone: phone,
                       );
-      // 成功后自动获取车辆信息
+
+                      //注册推送别名
+                      addAlias(phone);
+
+                      //登录后查询已绑定车辆信息
                       try {
                         var carInfo = await HttpService.to.get(
-          "appointment/driver/getTruckInfoByDriver?phone=${result.data['phone']}",
+                          "appointment/driver/getTruckInfoByDriver?phone=$phone",
                         );
                         if (carInfo != null) {
                           var carInforesult = BaseModel.fromJson(carInfo.data);
@@ -520,20 +226,179 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
                         Logger.d("暂时不处理 查询车辆信息失败的情况");
                       }
 
-
+                      //页面操作
                       dismissLoading();
+                      showToast('登录成功，欢迎您');
                       Get.offAll(() => BaseWidgetsPage());
-    } else {
+                    } catch (e) {
+                      dismissLoading();
+                      showToast('登录失败：数据异常');
+                    }
+                  } catch (e) {
+                    dismissLoading();
+                  }
+                },
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: AppTheme.themeColor,
+                  minimumSize: Size(double.infinity, 50),
+                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                ),
+                child: Text('登录'),
+              ),
+            ],
+          );
+  }
+
+  Widget _stationLoginView(LoginController controller) {
+    return cLogin
+        ? SizedBox()
+        : Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(height: 20),
+              TextFormField(
+                controller: controller.stationIdController,
+                cursorColor: AppTheme.themeColor,
+                style: TextStyle(fontSize: 14),
+                decoration: InputDecoration(
+                  hintText: '请输入加氢站编号',
+                  border: OutlineInputBorder(),
+                  hintStyle: TextStyle(fontSize: 14),
+                  contentPadding: EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                  prefixIcon: Icon(Icons.person_2_outlined, color: Colors.grey),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: AppTheme.themeColor),
+                  ),
+                ),
+              ),
+              SizedBox(height: 10),
+              TextFormField(
+                controller: controller.passwordController,
+                obscureText: _obscureText,
+                style: TextStyle(fontSize: 14),
+                cursorColor: AppTheme.themeColor,
+                decoration: InputDecoration(
+                  hintStyle: TextStyle(fontSize: 14),
+                  contentPadding: EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                  hintText: '请输入密码',
+                  border: OutlineInputBorder(),
+                  suffixIcon: IconButton(
+                    icon: Icon(_obscureText ? Icons.visibility_off : Icons.visibility),
+                    onPressed: () {
+                      setState(() {
+                        _obscureText = !_obscureText;
+                      });
+                    },
+                  ),
+                  prefixIcon: Icon(Icons.lock_outline, color: Colors.grey),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: AppTheme.themeColor),
+                  ),
+                ),
+              ),
+              SizedBox(height: 10),
+              //记住密码复选框 ---
+              Row(
+                children: <Widget>[
+                  SizedBox(
+                    height: 24,
+                    width: 24,
+                    child: Checkbox(
+                      value: _rememberPassword,
+                      activeColor: AppTheme.themeColor,
+                      onChanged: (bool? value) {
+                        setState(() {
+                          _rememberPassword = value ?? true;
+                        });
+                      },
+                    ),
+                  ),
+                  GestureDetector(
+                    onTap: () => setState(() => _rememberPassword = !_rememberPassword),
+                    child: const Text('记住密码', style: TextStyle(color: Colors.grey)),
+                  ),
+                ],
+              ),
+              SizedBox(height: 20), // 调整间距
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: AppTheme.themeColor,
+                  minimumSize: Size(double.infinity, 50),
+                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                ),
+                onPressed: () async {
+                  String account = controller.stationIdController.text;
+                  String password = controller.passwordController.text;
+
+                  if (account.isEmpty || password.isEmpty) {
+                    showToast("请输入账号和密码");
+                    return;
+                  }
+
+                  showLoading('登录中...');
+
+                  try {
+                    String encryptedPassword = LoginUtil.encrypt(password);
+                    var responseData = await HttpService.to.post(
+                      'appointment/login/password',
+                      data: {
+                        'account': account,
+                        'password': encryptedPassword,
+                        'loginType': "station",
+                      },
+                    );
+
+                    if (responseData == null && responseData!.data == null) {
+                      dismissLoading();
+                      showToast('登录失败：无法获取凭证');
+                      return;
+                    }
+
+                    try {
+                      var result = BaseModel.fromJson(responseData.data);
+
+                      if (result.code != 0) {
+                        showToast(result.error);
+                        dismissLoading();
+                        return;
+                      }
+
+                      String token = result.data['token'] ?? '';
+                      String userId = result.data['userId'] ?? '';
+                      String mobile = result.data['mobile'] ?? '';
+
                       await StorageService.to.saveLoginInfo(
                         token: token,
-        userId: result.data['userId'],
-        phone: result.data['mobile'],
+                        userId: userId,
+                        phone: mobile,
                         channel: "station",
                       );
-      dismissLoading();
-      Get.offAll(() => B_BaseWidgetsPage());
+
+                      //注册推送别名
+                      addAlias(mobile);
+
+                      // 根据复选框状态保存或清除密码 ---
+                      if (_rememberPassword) {
+                        await StorageService.to.saveStationCredentials(account, password);
+                      } else {
+                        await StorageService.to.clearStationCredentials();
                       }
-    addAlias(identifier);
+
+                      dismissLoading();
+                      showToast('登录成功，欢迎您');
+                      Get.offAll(() => B_BaseWidgetsPage());
+                    } catch (e) {
+                      dismissLoading();
+                      showToast('登录失败：数据异常');
+                    }
+                  } catch (e) {
+                    dismissLoading();
+                  }
+                },
+                child: Text('登录'),
+              ),
+            ],
+          );
   }
 
   final _aliyunPush = AliyunPushFlutter();
@@ -551,110 +416,38 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
     }
   }
 
-  Widget buildAgreement() {
-    return Padding(
-      padding: EdgeInsets.only(top: 13.h),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder<LoginController>(
+      init: LoginController(),
+      id: 'login',
+      builder: (controller) {
+        return Scaffold(
+          body: Stack(
             children: [
-          // 勾选框
-          SizedBox(
-            width: 22.w,
-            height: 22.h,
-            child: Checkbox(
-              value: _isAgreed,
-              activeColor: AppTheme.themeColor,
-              // 简单的圆角样式
-              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
-              onChanged: (bool? value) {
-                setState(() {
-                  _isAgreed = value ?? false;
-                });
+              Positioned.fill(child: _buildView(controller)),
+              if (AppTheme.is_show_host)
+                Positioned(
+                  top: 40.h,
+                  right: 20.w,
+                  child: TextButton(
+                    onPressed: () {
+                      Get.to(() => const UrlHostPage());
                     },
-            ),
-          ),
-          const SizedBox(width: 4),
-          // 富文本协议部分
-          Text.rich(
-            TextSpan(
-              text: '我已阅读并同意',
-              style: const TextStyle(color: Colors.grey, fontSize: 13),
-              children: [
-                TextSpan(
-                  text: '《用户协议》',
-                  style: TextStyle(color: AppTheme.themeColor, fontSize: 13),
-                  recognizer: TapGestureRecognizer()
-                    ..onTap = () {
-                      openPage("用户协议", "https://lnh2e.com/user_agreement.html");
-                    },
-                ),
-                const TextSpan(text: ' 和 '),
-                TextSpan(
-                  text: '《隐私政策》',
-                  style: TextStyle(color: AppTheme.themeColor, fontSize: 13),
-                  recognizer: TapGestureRecognizer()
-                    ..onTap = () {
-                      openPage("隐私政策", "https://lnh2e.com/privacy_agreement.html");
-                    },
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildDialogContent() {
-    return RichTextX(
-      children: [
-        TextSpanItem('请阅读并同意'),
-        TextSpanItem(
-          '《隐私协议》',
-          onTap: () => openPage("隐私政策", "https://lnh2e.com/privacy_agreement.html"),
-        ),
-        TextSpanItem('和'),
-        TextSpanItem(
-          '《用户政策》',
-          onTap: () => openPage("用户协议", "https://lnh2e.com/user_agreement.html"),
-        ),
-        TextSpanItem('，我们将在协议框架内为您提供更优质的服务。'),
-      ],
-    );
-  }
-
-  void openPage(String title, String url) {
-    if (Platform.isIOS) {
-      openWebPage(url);
-      return;
-    }
-    Get.to(() => const WebViewPage(), arguments: {'title': title, 'url': url});
-  }
-
-  Widget _buildFooterSlogan() {
-    return Center(
-      child: Column(
-        children: [
-          Text(
-            "H Y P A I",
+                    child: const Text(
+                      "域名配置",
                       style: TextStyle(
+                        color: Colors.black,
                         fontSize: 16,
-              fontWeight: FontWeight.w400,
-              color: const Color.fromRGBO(51, 51, 51, 1),
-              letterSpacing: 8,
+                        fontWeight: FontWeight.bold,
                       ),
                     ),
-          Text(
-            "HYDROGEN MOBILITY",
-            style: TextStyle(
-              fontWeight: FontWeight.w300,
-              fontSize: 9,
-              color: Colors.grey.shade400,
-              letterSpacing: 1,
                   ),
                 ),
             ],
           ),
         );
+      },
+    );
   }
 }

ln_jq_app/lib/pages/qr_code/controller.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'package:dio/dio.dart' as dio;
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
@@ -7,156 +6,243 @@ import 'package:image_picker/image_picker.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/model/vehicle_info.dart';
 import 'package:ln_jq_app/storage_service.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
 import 'package:permission_handler/permission_handler.dart';
 
-class QrCodeController extends GetxController with BaseControllerMixin {
+class QrCodeController extends GetxController
+    with BaseControllerMixin, GetSingleTickerProviderStateMixin {
   @override
   String get builderId => 'qrcode';
 
-  final RxBool hasCameraPermission = false.obs;
+  // --- Animation ---
+  late final AnimationController animationController;
+  late final Animation<double> scanAnimation;
+
+  // --- 使用 MobileScanner 的控制器 ---
+  final MobileScannerController scannerController = MobileScannerController();
+
+  final RxBool isFlashOn = false.obs;
+  final RxBool isProcessingResult = false.obs;
+
+  final RxBool hasPermission = false.obs;
 
   @override
   void onInit() {
     super.onInit();
-    _checkPermission();
+    requestPermission();
+
+    animationController = AnimationController(
+      duration: const Duration(milliseconds: 2500),
+      vsync: this,
+    );
+    scanAnimation =
+        Tween<double>(begin: 0, end: 1).animate(animationController);
+    animationController.repeat(reverse: false);
   }
 
-  /// 检查权限
-  void _checkPermission() async {
-    var status = await Permission.camera.status;
-    hasCameraPermission.value = status.isGranted;
+  /// MobileScanner 的 onDetect 回调方法
+  void onDetect(BarcodeCapture capture) {
+    if (isProcessingResult.value) return;
+
+    final Barcode? barcode = capture.barcodes.firstOrNull;
+    if (barcode?.rawValue != null && barcode!.rawValue!.isNotEmpty) {
+      isProcessingResult.value = true;
+      scannerController.stop();
+      animationController.stop();
+      renderResult(barcode.rawValue!);
+    }
   }
 
-  /// 1. 拍照并识别车牌流程
-  void takePhotoAndRecognize() async {
-    var status = await Permission.camera.request();
-    if (!status.isGranted) {
-      if (status.isPermanentlyDenied) openAppSettings();
-      showErrorToast("需要相机权限才能拍照识别");
+  /// 恢复扫描状态
+  void resumeScanner() {
+    isProcessingResult.value = false;
+    try {
+      scannerController.start();
+      animationController.repeat(reverse: false);
+    } catch (e) {
+      print("无法重启相机: $e");
+    }
+  }
+
+  /// 从相册选择图片并扫描二维码
+  void scanFromGallery() async {
+    try {
+      final XFile? imageFile =
+      await ImagePicker().pickImage(source: ImageSource.gallery);
+      if (imageFile == null) {
         return;
       }
 
-    final XFile? photo = await ImagePicker().pickImage(
-      source: ImageSource.camera,
-      imageQuality: 80, // 压缩图片质量以加快上传
-    );
-    if (photo == null) return;
+      scannerController.stop();
+      animationController.stop();
+      showLoading("正在识别...");
 
-    // 1.1 上传文件
-    String? imageUrl = await uploadFile(photo.path);
-    if (imageUrl != null) {
-      // 1.2 获取车牌号
-      String? plateNumber = await getPlateNumber(imageUrl);
-      if (plateNumber != null) {
-        // 1.3 弹窗确认
-        manualInputBind(plateNumber, 0);
+      final BarcodeCapture? capture =
+      await scannerController.analyzeImage(imageFile.path);
+
+      dismissLoading();
+
+      final Barcode? firstBarcode = capture?.barcodes.firstOrNull;
+
+      if (firstBarcode?.rawValue != null &&
+          firstBarcode!.rawValue!.isNotEmpty) {
+        final String scanResult = firstBarcode.rawValue!;
+        print("相册识别到的内容: $scanResult");
+        renderResult(scanResult);
+      } else {
+        showErrorToast('未识别到二维码');
+        resumeScanner();
       }
+    } catch (e, stackTrace) {
+      dismissLoading();
+      showErrorToast('从相册选择失败，请稍后重试');
+      print("scanFromGallery Error: $e\n$stackTrace");
+      resumeScanner();
     }
   }
 
-  /// 手动输入车牌绑定
-  void manualInputBind(String plateNumber, int source) {
-    final TextEditingController controller = TextEditingController(
-      text: plateNumber.toUpperCase() ?? '',
+  /// 切换闪光灯
+  void toggleFlash() async {
+    try {
+      await scannerController.toggleTorch();
+      final currentTorchState = scannerController.value.torchState;
+      isFlashOn.value = currentTorchState == TorchState.on;
+    } catch (e) {
+      print("切换闪光灯失败: $e");
+      showErrorToast("无法打开闪光灯");
+    }
+  }
+
+  /// 翻转相机
+  void flipCamera() async {
+    await scannerController.switchCamera();
+  }
+
+  /// 请求相机权限
+  void requestPermission() async {
+    var status = await Permission.camera.request();
+
+    hasPermission.value = status.isGranted;
+
+    if (!status.isGranted) {
+      if (status.isPermanentlyDenied) {
+        showErrorToast('相机权限已被永久拒绝，请到系统设置中开启');
+        // 延迟一会再引导用户去设置
+        Future.delayed(const Duration(seconds: 2), () => openAppSettings());
+      } else {
+        showErrorToast('请授予相机权限以使用扫描功能');
+      }
+    }
+
+  }
+
+  void requestPhotoPermission() async {
+    var status = await Permission.photos.request();
+    if (status.isGranted) {
+      scanFromGallery();
+    } else if (status.isPermanentlyDenied) {
+      openAppSettings();
+    } else {
+      showErrorToast('需要相册权限才能从相册中选择图片');
+    }
+  }
+
+  /// 处理扫描结果
+  void renderResult(String resultStr, {plateNumber}) async {
+    showLoading("正在获取车辆信息...");
+    try {
+      final Map<String, dynamic> requestData = {
+        "code": resultStr,
+        "phone": StorageService.to.phone,
+      };
+      if (plateNumber != null && plateNumber.isNotEmpty) {
+        requestData['plateNumber'] = plateNumber;
+      }
+      var responseData = await HttpService.to.post(
+        "appointment/truck/bindTruck",
+        data: requestData,
       );
 
+      if (responseData == null) {
+        dismissLoading();
+        showToast('无法获取车辆信息，请检查网络或稍后重试');
+        resumeScanner();
+        return;
+      }
+      var result = BaseModel.fromJson(responseData.data);
+
+      if (result.code != 0) {
+        showToast(result.error);
+        dismissLoading();
+        resumeScanner(); // 绑定失败也要恢复扫描
+        return;
+      }
+
+      if (result.data == null) {
+        dismissLoading();
+        showBindDialog(resultStr);
+        return;
+      }
+
+      final vehicle = VehicleInfo.fromJson(result.data as Map<String, dynamic>);
+      await StorageService.to.saveVehicleInfo(vehicle);
+      dismissLoading();
+      Get.back(result: true);
+
+    } on DioException catch (_) {
+      showErrorToast("网络请求失败，请稍后重试");
+      resumeScanner();
+    } catch (e, _) {
+      showErrorToast("处理失败，请稍后重舍");
+      resumeScanner();
+    } finally {
+      if (Get.isDialogOpen ?? false) {
+        dismissLoading();
+      }
+    }
+  }
+
+  /// 显示绑定确认对话框
+  void showBindDialog(String resultStr) {
+    final TextEditingController plateNumberController = TextEditingController();
+    // 使用 showConfirmDialog，它有 onCancel 回调
     DialogX.to.showConfirmDialog(
-      title: source == 0 ? "识别结果" : '手动输入车牌',
-      content: SizedBox(
-        height: 40.h,
-        child: TextField(
-          textAlign: TextAlign.start,
-          controller: controller,
-          autofocus: plateNumber.isEmpty,
-          textCapitalization: TextCapitalization.characters,
+      title: '请输入车牌号',
+      barrierDismissible: false,
+      content: TextField(
+        controller: plateNumberController,
+        autofocus: false,
         decoration: const InputDecoration(
-            contentPadding: EdgeInsets.only(left: 5),
           hintText: '请输入完整的车牌号',
           border: OutlineInputBorder(),
-          ),
+          contentPadding: EdgeInsets.symmetric(horizontal: 12.0),
         ),
       ),
       confirmText: '确认绑定',
-      cancelText: source == 0 ? "重新拍摄" : '取消',
-      onCancel: () {
-        if (source == 0) {
-          takePhotoAndRecognize();
-        }
-      },
+      cancelText: '取消', // showConfirmDialog 有 cancelText
       onConfirm: () {
-        final plate = controller.text.trim().toUpperCase();
-        if (plate.isNotEmpty) {
-          bindVehicleByPlate(plate);
+        final String plateNumber = plateNumberController.text.trim();
+        if (plateNumber.isEmpty) {
+          showToast("请输入车牌号");
+          // 返回 false 可以阻止弹窗关闭，让用户继续输入
+          return false;
         }
+        renderResult(resultStr, plateNumber: plateNumber);
+        //关闭弹窗
+        return true;
+      },
+      onCancel: () {
+        // 如果用户点击取消，恢复扫描
+        resumeScanner();
       },
     );
   }
 
-  /// 上传图片
-  Future<String?> uploadFile(String filePath) async {
-    showLoading("正在上传图片...");
-    try {
-      dio.FormData formData = dio.FormData.fromMap({
-        'file': await dio.MultipartFile.fromFile(filePath, filename: 'ocr_plate.jpg'),
-      });
-
-      var response = await HttpService.to.post("appointment/ocr/upload", data: formData);
-      if (response != null) {
-        final result = BaseModel.fromJson(response.data);
-        if (result.code == 0) return result.data.toString();
-        showErrorToast(result.error);
-      }
-    } catch (e) {
-      showErrorToast("图片上传失败");
-    } finally {
-      dismissLoading();
-    }
-    return null;
-  }
-
-  /// OCR 识别
-  Future<String?> getPlateNumber(String imageUrl) async {
-    showLoading("正在识别车牌...");
-    try {
-      var response = await HttpService.to.get(
-        "appointment/ocr/getPlateNumber",
-        params: {'imageUrl': imageUrl},
-      );
-      if (response != null) {
-        final result = BaseModel.fromJson(response.data);
-        if (result.code == 0) return result.data.toString();
-        showErrorToast(result.error);
-      }
-    } catch (e) {
-      showErrorToast("车牌识别失败");
-    } finally {
-      dismissLoading();
-    }
-    return null;
-  }
-
-  /// 核心绑定方法
-  void bindVehicleByPlate(String plateNumber) async {
-    showLoading("正在绑定车辆...");
-    try {
-      var responseData = await HttpService.to.post(
-        "appointment/truck/bindOcrTruck",
-        data: {"plateNumber": plateNumber, "phone": StorageService.to.phone},
-      );
-
-      var result = BaseModel.fromJson(responseData?.data);
-      if (result.code == 0 && result.data != null) {
-        await StorageService.to.saveVehicleInfo(VehicleInfo.fromJson(result.data));
-        dismissLoading();
-        showSuccessToast("绑定成功");
-        Get.back(result: true);
-      } else {
-        showErrorToast(result.error);
-      }
-    } catch (e) {
-
-    } finally {
-      dismissLoading();
-    }
+  @override
+  void onClose() {
+    scannerController.dispose();
+    animationController.dispose();
+    super.onClose();
   }
 }
+

ln_jq_app/lib/pages/qr_code/view.dart

@@ -1,82 +1,285 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/styles/theme.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
 
 import 'controller.dart';
 
 class QrCodePage extends GetView<QrCodeController> {
-  const QrCodePage({Key? key}) : super(key: key);
+  const QrCodePage({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return GetBuilder<QrCodeController>(
-      init: QrCodeController(),
-      id: 'qrcode',
-      builder: (controller) {
+    Get.put(QrCodeController());
     return Scaffold(
+      extendBodyBehindAppBar: true,
       appBar: AppBar(
-            title: const Text('绑定车辆'),
+        title: const Text('扫码', style: TextStyle(color: Colors.white)),
         centerTitle: true,
+        backgroundColor: Colors.transparent,
         elevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_ios, color: Colors.white),
+          onPressed: () => Get.back(),
         ),
-          body: Container(
-            width: double.infinity,
-            padding: const EdgeInsets.symmetric(horizontal: 24.0),
-            child: SingleChildScrollView(child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
+        actions: [
+          TextButton(
+            onPressed: controller.requestPhotoPermission,
+            child: const Text('相册', style: TextStyle(color: Colors.white, fontSize: 16)),
+          ),
+        ],
+      ),
+      body: Obx(() { // 1. 使用 Obx 包裹整个 body
+        // 根据权限状态来决定显示什么
+        if (controller.hasPermission.value) {
+          // 如果有权限，显示扫描器
+          return _buildScannerView(context);
+        } else {
+          // 如果没有权限，显示引导界面
+          return _buildPermissionDeniedView();
+        }
+      }),
+    );
+  }
+  Widget _buildScannerView(BuildContext context){
+    if (!controller.animationController.isAnimating) {
+      controller.animationController.repeat(reverse: false);
+    }
+    return Stack(
+      alignment: Alignment.center,
       children: [
-                const SizedBox(height: 24),
-                Icon(
-                  Icons.directions_car_rounded,
-                  size: 100,
-                  color: Theme.of(context).primaryColor.withOpacity(0.1),
+        // 使用 MobileScanner 作为扫描视图
+        MobileScanner(
+          controller: controller.scannerController,
+          onDetect: controller.onDetect,
+          // 您可以自定义扫描框的样式
+          scanWindow: Rect.fromCenter(
+            center: Offset(
+              MediaQuery.of(context).size.width / 2,
+              MediaQuery.of(context).size.height / 2 - 50,
             ),
-                const SizedBox(height: 24),
+            width: 250,
+            height: 250,
+          ),
+        ),
+        // 扫描动画和覆盖层
+        _buildScannerOverlay(context),
+        // 底部的功能按钮
+        Positioned(bottom: 80, left: 0, right: 0, child: _buildActionButtons()),
+      ],
+    );
+  }
+
+  Widget _buildPermissionDeniedView() {
+    // 确保动画是停止的
+    if (controller.animationController.isAnimating) {
+      controller.animationController.stop();
+    }
+
+    return Container(
+      color: Colors.black,
+      alignment: Alignment.center,
+      padding: const EdgeInsets.all(24.0),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Icon(Icons.no_photography, color: Colors.white70, size: 64),
+          const SizedBox(height: 16),
           const Text(
-                  "请选择绑定方式",
-                  style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+            '需要相机权限',
+            style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
           ),
           const SizedBox(height: 8),
           const Text(
-                  "您可以拍摄照片自动识别，\n或手动输入车牌号进行绑定。",
+            '请授予相机权限以使用扫码功能。',
+            style: TextStyle(color: Colors.white70, fontSize: 14),
             textAlign: TextAlign.center,
-                  style: TextStyle(fontSize: 14, color: Colors.grey),
           ),
-                const SizedBox(height: 60),
-
-                // 拍照识别按钮
-                ElevatedButton.icon(
-                  onPressed: controller.takePhotoAndRecognize,
-                  icon: const Icon(Icons.camera_alt_rounded),
-                  label: const Text("拍照识别车牌"),
-                  style: ElevatedButton.styleFrom(
-                    minimumSize: const Size(double.infinity, 56),
-                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(28)),
-                    textStyle: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+          const SizedBox(height: 24),
+          ElevatedButton(
+            onPressed: controller.requestPermission, // 点击按钮重新请求权限
+            child: const Text('授予权限'),
           ),
-                ),
-                const SizedBox(height: 20),
-
-                // 3. 手动输入按钮
-                OutlinedButton.icon(
-                  onPressed: (){
-                    controller.manualInputBind("",1);
-                  },
-                  icon: const Icon(Icons.edit_note_rounded),
-                  label: const Text("手动输入车牌"),
-                  style: OutlinedButton.styleFrom(
-                    minimumSize: const Size(double.infinity, 56),
-                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(28)),
-                    side: BorderSide(color: Theme.of(context).primaryColor, width: 1.5),
-                    textStyle: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
-                  ),
-                ),
-                const SizedBox(height: 100), // 底部留白
         ],
-            ),),
+      ),
+    );
+  }
+
+  /// 构建扫描区域的覆盖层和动画
+  Widget _buildScannerOverlay(BuildContext context) {
+    // 模拟扫描框的位置和大小
+    const double scanAreaSize = 250.0;
+    return Stack(
+      children: [
+        // 半透明的覆盖层
+        ColorFiltered(
+          colorFilter: ColorFilter.mode(Colors.black.withOpacity(0.5), BlendMode.srcOut),
+          child: Stack(
+            children: [
+              Container(decoration: const BoxDecoration(color: Colors.transparent)),
+              Align(
+                alignment: Alignment.center,
+                child: Container(
+                  margin: const EdgeInsets.only(bottom: 100), // 微调位置
+                  width: scanAreaSize,
+                  height: scanAreaSize,
+                  decoration: BoxDecoration(
+                    color: Colors.black,
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+        // 扫描动画
+        Align(
+          alignment: Alignment.center,
+          child: Container(
+            margin: const EdgeInsets.only(bottom: 100),
+            width: scanAreaSize,
+            height: scanAreaSize,
+            child: AnimatedBuilder(
+              animation: controller.scanAnimation,
+              builder: (context, child) {
+                return CustomPaint(
+                  painter: ScannerAnimationPainter(
+                    controller.scanAnimation.value,
+                    AppTheme.themeColor,
                   ),
                 );
               },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// 构建底部的功能按钮（闪光灯、相册）
+  Widget _buildActionButtons() {
+      return Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Text(
+            '将二维码/条形码放入框内，即可自动扫描',
+            style: TextStyle(color: Colors.white, fontSize: 14),
+          ),
+          const SizedBox(height: 20),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: <Widget>[
+              // 闪光灯按钮
+              _buildIconButton(
+                onPressed: controller.toggleFlash,
+                //闪光灯状态的变化
+                child: Obx(
+                      () => IconButton(
+                    icon: Icon(
+                      controller.isFlashOn.value ? Icons.flash_on : Icons.flash_off,
+                      color: Colors.white,
+                      size: 28,
+                    ),
+                    onPressed: controller.toggleFlash,
+                  ),
+                ),
+              ),
+              // 翻转相机按钮
+              _buildIconButton(
+                onPressed: controller.flipCamera,
+                child: const Icon(
+                  Icons.flip_camera_ios,
+                  color: Colors.white,
+                  size: 28,
+                ),
+              ),
+            ],
+          ),
+        ],
+      );
+    }
+
+
+  Widget _buildIconButton({required VoidCallback onPressed, required Widget child}) {
+    return Container(
+      decoration: BoxDecoration(
+        color: Colors.black.withOpacity(0.3),
+        shape: BoxShape.circle,
+      ),
+      child: IconButton(
+        onPressed: onPressed,
+        icon: child,
+        iconSize: 32, // 增大点击区域
+      ),
     );
   }
 }
+
+/// 扫描动画的绘制器
+class ScannerAnimationPainter extends CustomPainter {
+  final double value;
+  final Color borderColor;
+
+  ScannerAnimationPainter(this.value, this.borderColor);
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = borderColor
+      ..strokeWidth = 3
+      ..style = PaintingStyle.stroke;
+
+    final cornerLength = 20.0;
+    // 绘制四个角的边框
+    // Top-left
+    canvas.drawPath(
+      Path()
+        ..moveTo(0, cornerLength)
+        ..lineTo(0, 0)
+        ..lineTo(cornerLength, 0),
+      paint,
+    );
+    // Top-right
+    canvas.drawPath(
+      Path()
+        ..moveTo(size.width - cornerLength, 0)
+        ..lineTo(size.width, 0)
+        ..lineTo(size.width, cornerLength),
+      paint,
+    );
+    // Bottom-left
+    canvas.drawPath(
+      Path()
+        ..moveTo(0, size.height - cornerLength)
+        ..lineTo(0, size.height)
+        ..lineTo(cornerLength, size.height),
+      paint,
+    );
+    // Bottom-right
+    canvas.drawPath(
+      Path()
+        ..moveTo(size.width - cornerLength, size.height)
+        ..lineTo(size.width, size.height)
+        ..lineTo(size.width, size.height - cornerLength),
+      paint,
+    );
+
+    // 绘制扫描线
+    final linePaint = Paint()
+      ..color = borderColor.withOpacity(0.8)
+      ..strokeWidth = 2
+      ..shader = LinearGradient(
+        colors: [borderColor.withOpacity(0), borderColor, borderColor.withOpacity(0)],
+        stops: const [0.0, 0.5, 1.0],
+      ).createShader(Rect.fromLTWH(0, 0, size.width, size.height));
+
+    final y = size.height * value;
+    canvas.drawLine(Offset(0, y), Offset(size.width, y), linePaint);
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) {
+    return true;
+  }
+}

ln_jq_app/lib/pages/url_host/controller.dart

@@ -10,14 +10,12 @@ class UrlHostController extends GetxController {
   // 预设的域名列表
   final List<String> presetUrls = [
     'https://beta-esg.api.lnh2e.com/', // 测试环境
-    'http://47.101.201.13:8443/api/', // 测试环境
     'http://192.168.110.44:8080/', // 沈辰本地
     'http://192.168.110.222:8080/', // 何斐本地
   ];
 
   final List<String> urlNames = [
     '测试环境',
-    '线上环境',
     '沈辰本地环境',
     '何斐本地环境',
   ];

ln_jq_app/lib/pages/welcome/controller.dart

@@ -1,32 +0,0 @@
-import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:get/get.dart';
-import 'package:ln_jq_app/pages/home/view.dart';
-import 'package:ln_jq_app/pages/login/view.dart';
-import 'package:ln_jq_app/storage_service.dart';
-
-class WelcomeController extends GetxController {
-  @override
-  void onReady() {
-    super.onReady();
-    // 移除原生闪屏页（如果有的话）
-    FlutterNativeSplash.remove();
-    _startTimer();
-  }
-
-  void _startTimer() {
-    // 1.5秒后执行跳转逻辑
-    Future.delayed(const Duration(milliseconds: 1500), () {
-      Get.offAll(() => const HomePage());
-    });
-  }
-
-  void _jumpToNextPage() {
-    if (StorageService.to.isLoggedIn) {
-      // 已登录，跳转到首页
-      Get.offAll(() => const HomePage());
-    } else {
-      // 未登录，跳转到登录页
-      Get.offAll(() => const LoginPage());
-    }
-  }
-}

ln_jq_app/lib/pages/welcome/view.dart

@@ -1,34 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:ln_jq_app/common/login_util.dart';
-import 'controller.dart';
-
-class WelcomePage extends GetView<WelcomeController> {
-  const WelcomePage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    // 初始化控制器
-    Get.put(WelcomeController());
-
-    return Scaffold(
-      backgroundColor: Colors.white,
-      body: SizedBox.expand(
-        child: Stack(
-          children: [
-            Positioned(
-              top: 0,
-              bottom: 0,
-              left: 0,
-              right: 0,
-              child: Image.asset(
-                'assets/images/welcome.png',
-                fit: BoxFit.fill
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

ln_jq_app/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.2.3+6
+version: 1.2.2+5
 
 environment:
   sdk: ^3.9.0