Merge branch 'dev'

扫码无权限优化，司机预约多弹窗
bugfix
2025-12-25 10:41:04 +08:00 · 2025-12-25 10:40:26 +08:00 · 2025-12-24 10:53:34 +08:00 · 2025-12-23 10:43:12 +08:00 · 2025-12-23 10:18:44 +08:00 · 2025-12-22 16:15:32 +08:00
57 changed files with 3301 additions and 1160 deletions
--- a/ln_jq_app/android/app/build.gradle.kts
+++ b/ln_jq_app/android/app/build.gradle.kts
@@ -21,7 +21,7 @@ android {

    defaultConfig {
        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.lnkj.ln_jq_app"
+        applicationId = "com.lingniu.driver"
        // You can update the following values to match your application needs.
        // For more information, see: https://flutter.dev/to/review-gradle-config.
        minSdk = flutter.minSdkVersion
--- a/ln_jq_app/android/app/src/main/AndroidManifest.xml
+++ b/ln_jq_app/android/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
    <application
        android:label="小羚羚"
        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/logo">
        <activity
            android:name=".MainActivity"
            android:exported="true"
--- a/ln_jq_app/android/app/src/main/res/mipmap-xhdpi/logo.jpg
+++ b/ln_jq_app/android/app/src/main/res/mipmap-xhdpi/logo.jpg
--- a/ln_jq_app/assets/html/car.png
+++ b/ln_jq_app/assets/html/car.png
--- a/ln_jq_app/assets/html/map.html
+++ b/ln_jq_app/assets/html/map.html
@@ -1,13 +1,35 @@
 <!DOCTYPE html>
 <html>
+
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
-    <title>导航规划</title>
-    <style>
-        html, body, #container { width: 100%; height: 100%; margin: 0; }
+    <title>路径规划</title>

-        /* 搜索栏样式 */
+    <style>
+        /* --- 全局样式 --- */
+        html,
+        body,
+        #container {
+            width: 100%;
+            height: 100%;
+            margin: 0;
+            font-family: sans-serif;
+        }
+
+        /* --- 暴力隐藏高德自带的导流链接和Logo (关键) --- */
+        .amap-callamap,
+        .amap-lib-driving-callBtn,
+        .amap-copyright,
+        .amap-logo {
+            display: none !important;
+        }
+
+        #panel .amap-call {
+            display: none;
+        }
+
+        /* --- 搜索栏样式 --- */
        #search-box {
            position: absolute;
            top: 10px;
@@ -16,209 +38,404 @@
            z-index: 100;
            background: #fff;
            padding: 10px;
-            border-radius: 4px;
-            box-shadow: 0 2px 5px rgba(0,0,0,0.3);
+            border-radius: 8px;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
            display: flex;
            flex-direction: column;
            gap: 8px;
        }
-        .input-row { display: flex; gap: 5px; }
-        input { flex: 1; padding: 8px; border: 1px solid #eee; border-radius: 4px; }
-        button { padding: 0 15px; background: #3366FF; color: #fff; border: none; border-radius: 4px; font-weight: bold; }

-        /* 导航结果面板 (仿高德原生) */
+        .input-row {
+            display: flex;
+            gap: 8px;
+            align-items: center;
+        }
+
+        input {
+            flex: 1;
+            padding: 10px;
+            border: 1px solid #eee;
+            border-radius: 4px;
+            background-color: #f9f9f9;
+            font-size: 14px;
+        }
+
+        button {
+            padding: 0 15px;
+            height: 38px;
+            background: #3366FF;
+            color: #fff;
+            border: none;
+            border-radius: 4px;
+            font-weight: bold;
+            font-size: 14px;
+        }
+
+        /* --- 导航结果面板 (底部弹出) --- */
        #panel {
            position: fixed;
            bottom: 0;
            left: 0;
            width: 100%;
-            height: 30%; /* 占据底部30% */
+            height: 35%;
+            /* 面板高度 */
            background-color: white;
            overflow-y: auto;
-            border-top: 1px solid #ccc;
+            border-top: 1px solid #eee;
+            border-top-left-radius: 12px;
+            border-top-right-radius: 12px;
+            box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1);
            z-index: 99;
-            display: none; /* 默认隐藏，规划成功后显示 */
+            display: none;
+            /* 默认隐藏 */
+        }
+
+        /* --- 自定义定位按钮样式 --- */
+        #location-btn {
+            position: fixed;
+            right: 10px;
+            bottom: 50px;
+            /* 默认位置 */
+            width: 44px;
+            height: 44px;
+            background-color: #fff;
+            border-radius: 50%;
+            /* 圆形更符合现代审美 */
+            box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
+            z-index: 150;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            cursor: pointer;
+            transition: bottom 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+            /* 平滑动画 */
+        }
+
+        #location-btn:active {
+            background-color: #f2f2f2;
+        }
+
+        #location-btn svg {
+            width: 24px;
+            height: 24px;
+            fill: #555;
+        }
+
+        /* --- 关键：当 body 有 panel-active 类时，按钮上移 --- */
+        body.panel-active #location-btn {
+            bottom: 38%;
+            /* 对应 #panel 的 height + 一点间距 */
        }
    </style>

-    <!-- 1. 必须最先配置安全密钥 -->
+    <!-- 1. 配置安全密钥 -->
    <script type="text/javascript">
        window._AMapSecurityConfig = {
-            securityJsCode: '0529b72df6bf0c577ff2182cb8b1d970',
+            securityJsCode: 'aa3a22c19ed76b27f8a587555d6981c8',
        }
    </script>

-    <!-- 2. 加载地图和插件 -->
-    <!-- 注意：如果你要货车规划，需要在plugin里加上 AMap.TruckDriving -->
-    <script src="https://webapi.amap.com/maps?v=2.0&key=2cc1d822e313307fe311c3127a1deeb5&plugin=AMap.MoveAnimation,AMap.Driving,AMap.TruckDriving,AMap.AutoComplete"></script>
+    <!-- 2. 加载地图和插件 (去掉了 Geolocation 插件，避免弹窗) -->
+    <script
+        src="https://webapi.amap.com/maps?v=2.0&key=ecd74ece8cb14c9dad67675f83c3274d&plugin=AMap.MoveAnimation,AMap.Driving,AMap.TruckDriving,AMap.AutoComplete,AMap.ToolBar,AMap.Scale,AMap.Geocoder">
+    </script>
 </head>
+
 <body>

-<div id="search-box">
-    <div class="input-row">
-        <input id="startInput" placeholder="起点: 默认使用当前位置" />
+    <div id="search-box">
+        <div class="input-row">
+            <input id="startInput" placeholder="起点: 请输入当前地点" />
+        </div>
+        <div class="input-row">
+            <input id="endInput" placeholder="终点: 请输入目的地" />
+            <button onclick="startRouteSearch()">路径规划</button>
+        </div>
    </div>
-    <div class="input-row">
-        <input id="endInput" placeholder="终点: 请输入目的地" />
-        <button onclick="startRouteSearch()">路径规划</button>
+
+    <div id="container"></div>
+
+    <div id="panel"></div>
+
+    <!-- 自定义定位按钮 -->
+    <div id="location-btn" onclick="backToLocation()">
+        <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+            <path
+                d="M512 85.333333a426.666667 426.666667 0 1 0 0 853.333334 426.666667 426.666667 0 0 0 0-853.333334z m0 149.333334a277.333333 277.333333 0 1 1 0 554.666666 277.333333 277.333333 0 0 1 0-554.666666z m0 149.333333a128 128 0 1 0 0 256 128 128 0 0 0 0-256z"
+                fill="#666666"></path>
+        </svg>
    </div>
-</div>

-<div id="container"></div>
-<div id="panel"></div>
+    <script>
+        var map, marker, driving, truckDriving, geocoder;
+        var currentLat, currentLng;
+        var isTruckMode = false;
+        var isInitialLocationSet = false;

-<script>
-    var map, marker, driving, truckDriving;
-    var currentLat, currentLng;

-    // 标记是否使用货车模式 (true: 货车, false: 轿车)
-    var isTruckMode = false;
+        function initMap() {
+            map = new AMap.Map('container', {
+                resizeEnable: true,
+                zoom: 15,
+                viewMode: '3D'
+            });

-    function initMap() {
-        map = new AMap.Map('container', {
-            resizeEnable: true,
-            zoom: 15,
-            viewMode: '3D'
-        });
+            // --- 2. 初始化 geocoder ---
+            geocoder = new AMap.Geocoder({
+                city: "全国" // 设置地理编码范围
+            });

-        // --- 初始化轿车规划 ---
-        driving = new AMap.Driving({
-            map: map,
-            panel: "panel", // 结果显示在 panel div 中
-            policy: AMap.DrivingPolicy.LEAST_TIME
-        });
+            // 通知 Flutter 地图加载完毕
+            map.on('complete', function () {
+                console.log("JS->: Map is ready.");
+                if (window.flutter_inappwebview) {
+                    window.flutter_inappwebview.callHandler('mapReady');
+                }
+            });

-        // --- 初始化货车规划 (按需开启) ---
-        // 货车需要设置 size (1:微型, 2:轻型, 3:中型, 4:重型)
-        if(AMap.TruckDriving) {
-            truckDriving = new AMap.TruckDriving({
+            // 添加基础控件
+            map.addControl(new AMap.Scale());
+            map.addControl(new AMap.ToolBar({
+                visible: true,
+                position: {
+                    top: '200px',
+                    right: '10px'
+                } // 稍微避开定位按钮
+            }));
+
+            // --- 初始化轿车规划 ---
+            driving = new AMap.Driving({
                map: map,
                panel: "panel",
-                size: 2,
-                policy: 0, // 0: 躲避拥堵
-                width: 2.5,
-                height: 2,
-                load: 1,
-                weight: 10,
-                axlesNum: 2,
+                policy: AMap.DrivingPolicy.LEAST_TIME
            });
-        }

-        // --- 输入提示 (自动补全) ---
-        new AMap.AutoComplete({ input: "startInput" });
-        new AMap.AutoComplete({ input: "endInput" });
-    }
-
-    // --- 被动接收 Flutter 传来的定位 ---
-    function updateMyLocation(lat, lng, angle) {
-        currentLat = lat;
-        currentLng = lng;
-        var position = [lng, lat];
-
-        if (!marker) {
-            marker = new AMap.Marker({
-                map: map,
-                position: position,
-                icon: "https://webapi.amap.com/images/car.png",
-                offset: new AMap.Pixel(-26, -13),
-                autoRotation: true,
-                angle: angle || 0,
-            });
-            // 第一次定位移动中心
-            map.setCenter(position);
-        } else {
-            marker.setPosition(position);
-            if (angle) marker.setAngle(angle);
-        }
-    }
-
-    // --- 核心：规划路线 ---
-    function startRouteSearch() {
-        var startKw = document.getElementById('startInput').value;
-        var endKw = document.getElementById('endInput').value;
-
-        if(!endKw) {
-            console.log("FlutterLog: 终点不能为空");
-            return;
-        }
-
-        console.log("FlutterLog: 开始规划..." + (isTruckMode ? "货车" : "轿车"));
-
-        // 清除之前的路线
-        if(driving) driving.clear();
-        if(truckDriving) truckDriving.clear();
-
-        // 构造起点和终点参数
-        // 高德API Search方法支持点对象数组：[{keyword: '名字', city: '城市'}, {keyword: '...'}]
-        var points = [];
-
-        // 1. 处理起点
-        if (startKw) {
-            // 如果用户输入了文字
-            points.push({ keyword: startKw });
-        } else {
-            // 如果用户没输入，使用当前定位
-            if (currentLng && currentLat) {
-                // 关键点：当混合使用坐标和关键字时，必须构建 LngLat 对象
-                points.push({
-                    keyword: '我的位置',
-                    location: new AMap.LngLat(currentLng, currentLat)
+            // --- 初始化货车规划 ---
+            if (AMap.TruckDriving) {
+                truckDriving = new AMap.TruckDriving({
+                    map: map,
+                    panel: "panel",
+                    size: 2,
+                    policy: 0,
+                    width: 2.5,
+                    height: 2,
+                    load: 1,
+                    weight: 10,
+                    axlesNum: 2,
                });
+            }
+
+            // --- 输入提示 ---
+            new AMap.AutoComplete({
+                input: "startInput"
+            });
+            new AMap.AutoComplete({
+                input: "endInput"
+            });
+        }
+
+        /**
+         * 核心功能 1: 接收 Flutter 传来的定位数据
+         * Flutter 端调用: webViewController.evaluateJavascript("updateMyLocation(...)")
+         *  经度  维度
+         */
+        function updateMyLocation(lat, lng, angle) {
+            var rawLat = parseFloat(lat);
+            var rawLng = parseFloat(lng);
+            var rawAngle = parseFloat(angle);
+            var gps = [rawLng, rawLat];
+
+            AMap.convertFrom(gps, 'gps', function (status, result) {
+                if (result.info === 'ok') {
+                    var mPoint = result.locations[0];
+                    currentLng = mPoint.lng;
+                    currentLat = mPoint.lat;
+                    var position = [currentLng, currentLat];
+
+                    // 更新车辆标记位置 (保持不变)
+                    if (!marker) {
+                        marker = new AMap.Marker({
+                            map: map,
+                            position: position,
+                            icon: "car.png",
+                            offset: new AMap.Pixel(-23.5, -15),
+                            autoRotation: true,
+                            angle: isNaN(rawAngle) ? 0 : rawAngle,
+                        });
+                        map.setCenter(position);
+                    } else {
+                        marker.moveTo(position, {
+                            duration: 1000,
+                            autoRotation: true
+                        });
+                        if (!isNaN(rawAngle)) marker.setAngle(rawAngle);
+                    }
+
+                    // --- 4. 逆地理编码并设置默认起点 ---
+                    // 只有在第一次获取到位置时，才设置默认起点，避免覆盖用户手动输入的起点
+                    if (!isInitialLocationSet) {
+                        geocoder.getAddress(position, function (status, result) {
+                            if (status === 'complete' && result.regeocode) {
+                                let shortAddress = '';
+                                const regeo = result.regeocode;
+                                const addressComponent = regeo.addressComponent;
+                                const pois = regeo.pois;
+
+                                // 策略1: 优先使用最近的、类型合适的POI的名称
+                                if (pois && pois.length > 0) {
+                                    // 查找第一个类型不是“商务住宅”或“地名地址信息”的POI，这类POI通常是具体的建筑或地点名
+                                    const significantPoi = pois.find(p => p.type.indexOf('商务住宅') === -
+                                        1 && p.type.indexOf('地名地址信息') === -1);
+                                    if (significantPoi) {
+                                        shortAddress = significantPoi.name;
+                                    } else {
+                                        // 如果找不到，就用第一个POI的名字
+                                        shortAddress = pois[0].name;
+                                    }
+                                }
+                                // 策略2: 如果没有POI，使用"道路+门牌号"
+                                else if (addressComponent.street && addressComponent.streetNumber) {
+                                    shortAddress = addressComponent.street + addressComponent
+                                        .streetNumber;
+                                }
+                                // 策略3: 如果还没有，使用"区+乡镇"
+                                else if (addressComponent.district) {
+                                    shortAddress = addressComponent.district + (addressComponent
+                                        .township || '');
+                                }
+                                // 策略4: 降级到使用完整的、但可能很长的地址
+                                else {
+                                    shortAddress = regeo.formattedAddress;
+                                }
+
+                                // 如果拼接出的地址过长，可以再做一次截断
+                                if (shortAddress.length > 20) {
+                                    // 可以在这里添加更复杂的截断逻辑，比如按关键字
+                                    shortAddress = regeo.formattedAddress.substring(0, 20) + '...';
+                                }
+
+
+                                // 将获取到的地址填充到起点输入框
+                                document.getElementById('startInput').value = shortAddress;
+                                isInitialLocationSet = true; // 标记为已设置，不再更新
+                            } else {
+                                // 如果逆地理编码失败，依然使用“当前位置”作为提示
+                                document.getElementById('startInput').placeholder = "当前位置";
+                                console.error('逆地理编码失败:', result);
+                            }
+                        });
+                    }
+                }
+            });
+        }
+
+        /**
+         * 核心功能 2: 点击按钮回到当前位置
+         */
+        function backToLocation() {
+            if (currentLng && currentLat) {
+                map.panTo([currentLng, currentLat]);
+                map.setZoom(17);
+                console.log("JS: 已回到当前位置");
            } else {
-                console.log("FlutterLog: 无定位数据且无输入");
-                alert("未获取到定位，请输入起点");
+                console.log("JS: 暂无定位数据，向 Flutter 请求...");
+                if (window.flutter_inappwebview) {
+                    window.flutter_inappwebview.callHandler('requestLocation');
+                }
+            }
+        }
+
+        /**
+         * 核心功能 3: 路径规划
+         */
+        function startRouteSearch() {
+            // 获取输入框的文字
+            var startKw = document.getElementById('startInput').value;
+            var endKw = document.getElementById('endInput').value;
+
+            if (!startKw) {
+                alert("请输入起点");
                return;
            }
-        }

-        // 2. 处理终点
-        points.push({ keyword: endKw });
-
-        // 显示底部面板
-        document.getElementById('panel').style.display = 'block';
-
-        // 3. 发起请求
-        if (isTruckMode && truckDriving) {
-            // 货车接口略有不同，需要传入 path 数组
-            // truckDriving.search(path, callback)
-            // 这里为了简化，我们先演示轿车。货车通常需要具体的经纬度，建议先通过 Geocoder 把 endKw 转成经纬度再传给货车接口
-            console.log("FlutterLog: 货车API需要更严格的经纬度参数，建议先使用轿车演示");
-        }
-
-        // 默认使用轿车规划 (支持 keyword + location 混合)
-        driving.search(points, function(status, result) {
-            if (status === 'complete') {
-                console.log('FlutterLog: 规划成功');
-            } else {
-                console.log('FlutterLog: 规划失败: ' + result);
-                // 常见错误： "USER_DAILY_QUERY_OVER_LIMIT" (Key额度超限)
-                // "INVALID_USER_KEY" (Key错误)
-                // "no_data" (地点没找到)
+            if (!endKw) {
+                alert("请输入终点");
+                return;
            }
-        });
-    }

-    // --- 绘制自定义路径 (保持原有功能) ---
-    function drawCustomRoute(pointsJsonString) {
-        // 如果是从Flutter传来的JSON字符串，需要Parse，如果是对象则直接用
-        var path = typeof pointsJsonString === 'string' ? JSON.parse(pointsJsonString) : pointsJsonString;
+            // 清除旧路线
+            if (driving) driving.clear();

-        if (driving) driving.clear();
+            // 收起键盘
+            document.getElementById('startInput').blur();
+            document.getElementById('endInput').blur();

-        var polyline = new AMap.Polyline({
-            path: path,
-            isOutline: true,
-            outlineColor: '#ffeeee',
-            borderWeight: 3,
-            strokeColor: "#3366FF",
-            strokeWeight: 6,
-            lineJoin: 'round'
-        });
-        map.add(polyline);
-        map.setFitView([polyline]);
-    }
+            // --- 构造路径规划的点 (使用数组方式，更灵活) ---
+            var points = [];

-    window.onload = initMap;
-</script>
+            // 1. 处理起点逻辑
+            // 如果输入框是空的，或者写着 "我的位置"，则使用 GPS 坐标
+            if (!startKw || startKw === '我的位置') {
+                if (!currentLng || !currentLat) {
+                    // 如果还没获取到定位
+                    if (window.flutter_inappwebview) {
+                        window.flutter_inappwebview.callHandler('requestLocation');
+                    }
+                    alert("正在获取定位，请稍后...");
+                    return;
+                }
+                // 使用精准坐标对象 (避免高德去猜 '我的位置' 关键词)
+                points.push({
+                    keyword: '我的位置', // 用于显示的名字
+                    location: new AMap.LngLat(currentLng, currentLat) // 实际导航用的坐标
+                });
+            } else {
+                // 如果用户手动输入了地点 (例如 "北京南站")
+                // 直接存入关键词，让高德自己去搜
+                points.push({
+                    keyword: startKw
+                });
+            }
+
+            // 2. 处理终点逻辑 (通常是关键词)
+            points.push({
+                keyword: endKw
+            });
+
+            // 3. 发起搜索
+            // points 数组里现在是一个起点对象和一个终点对象
+            driving.search(points, function (status, result) {
+                if (status === 'complete') {
+                    console.log('JS: 规划成功');
+                    var panel = document.getElementById('panel');
+                    panel.style.display = 'block';
+                    document.body.classList.add('panel-active');
+                } else {
+                    console.log('JS: 规划失败', result);
+                    alert("规划失败，请检查起终点名称");
+                }
+            });
+        }
+
+        // 辅助功能：手动绘制路线 (Flutter 可能用到)
+        function drawCustomRoute(pointsJsonString) {
+            var path = typeof pointsJsonString === 'string' ? JSON.parse(pointsJsonString) : pointsJsonString;
+            if (driving) driving.clear();
+            var polyline = new AMap.Polyline({
+                path: path,
+                isOutline: true,
+                outlineColor: '#ffeeee',
+                borderWeight: 3,
+                strokeColor: "#3366FF",
+                strokeWeight: 6,
+                lineJoin: 'round'
+            });
+            map.add(polyline);
+            map.setFitView([polyline]);
+        }
+
+        window.onload = initMap;
+    </script>
 </body>
+
 </html>
--- a/ln_jq_app/ios/Podfile.lock
+++ b/ln_jq_app/ios/Podfile.lock
@@ -20,7 +20,9 @@ PODS:
    - FlutterMacOS
  - image_picker_ios (0.0.1):
    - Flutter
-  - MTBBarcodeScanner (5.0.11)
+  - mobile_scanner (7.0.0):
+    - Flutter
+    - FlutterMacOS
  - OrderedSet (6.0.3)
  - package_info_plus (0.4.5):
    - Flutter
@@ -29,9 +31,6 @@ PODS:
    - FlutterMacOS
  - permission_handler_apple (9.3.0):
    - Flutter
-  - qr_code_scanner_plus (0.2.6):
-    - Flutter
-    - MTBBarcodeScanner
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
@@ -47,16 +46,15 @@ DEPENDENCIES:
  - flutter_pdfview (from `.symlinks/plugins/flutter_pdfview/ios`)
  - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`)
  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - qr_code_scanner_plus (from `.symlinks/plugins/qr_code_scanner_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

 SPEC REPOS:
  trunk:
-    - MTBBarcodeScanner
    - OrderedSet

 EXTERNAL SOURCES:
@@ -76,14 +74,14 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/geolocator_apple/darwin"
  image_picker_ios:
    :path: ".symlinks/plugins/image_picker_ios/ios"
+  mobile_scanner:
+    :path: ".symlinks/plugins/mobile_scanner/darwin"
  package_info_plus:
    :path: ".symlinks/plugins/package_info_plus/ios"
  path_provider_foundation:
    :path: ".symlinks/plugins/path_provider_foundation/darwin"
  permission_handler_apple:
    :path: ".symlinks/plugins/permission_handler_apple/ios"
-  qr_code_scanner_plus:
-    :path: ".symlinks/plugins/qr_code_scanner_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
  url_launcher_ios:
@@ -95,15 +93,14 @@ SPEC CHECKSUMS:
  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
-  flutter_pdfview: 54e283d5851b0b247b3cc57877d35f1a05a204de
+  flutter_pdfview: 32bf27bda6fd85b9dd2c09628a824df5081246cf
  geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
-  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
+  mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
  path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
-  qr_code_scanner_plus: 7e087021bc69873140e0754750eb87d867bed755
  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b

--- a/ln_jq_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/ln_jq_app/ios/Runner.xcodeproj/project.pbxproj
@@ -487,7 +487,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 2228B9MS38;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -495,11 +497,17 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lnkj.lnJqApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -674,7 +682,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 2228B9MS38;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -682,12 +692,18 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lnkj.lnJqApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -698,7 +714,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 2228B9MS38;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -706,11 +724,17 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lnkj.lnJqApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,122 @@
 {
  "images" : [
    {
-      "size" : "20x20",
-      "idiom" : "iphone",
      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
    },
    {
-      "size" : "20x20",
-      "idiom" : "iphone",
      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
    },
    {
-      "size" : "29x29",
-      "idiom" : "iphone",
      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
    },
    {
-      "size" : "29x29",
-      "idiom" : "iphone",
      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
    },
    {
-      "size" : "29x29",
-      "idiom" : "iphone",
      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "29x29"
    },
    {
-      "size" : "40x40",
+      "filename" : "Icon-App-80x80.jpg",
      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "40x40"
    },
    {
-      "size" : "60x60",
+      "filename" : "Icon-App-120x120.jpg",
      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "40x40"
    },
    {
-      "size" : "60x60",
+      "filename" : "Icon-App-120x120 1.jpg",
      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-App-180.jpg",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
    },
    {
-      "size" : "20x20",
-      "idiom" : "ipad",
      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
    },
    {
-      "size" : "20x20",
-      "idiom" : "ipad",
      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
    },
    {
-      "size" : "29x29",
-      "idiom" : "ipad",
      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
    },
    {
-      "size" : "29x29",
-      "idiom" : "ipad",
      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
    },
    {
-      "size" : "40x40",
-      "idiom" : "ipad",
      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
    },
    {
-      "size" : "40x40",
-      "idiom" : "ipad",
      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
    },
    {
-      "size" : "76x76",
-      "idiom" : "ipad",
      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
    },
    {
-      "size" : "76x76",
-      "idiom" : "ipad",
      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
    },
    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
    }
  ],
  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
  }
 }
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-120x120
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-120x120
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-120x120.jpg
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-120x120.jpg
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-180.jpg
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-180.jpg
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x29@1x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x29@1x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x29@2x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x29@2x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x29@3x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x29@3x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-80x80.jpg
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-80x80.jpg
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
--- a/ln_jq_app/ios/Runner/Info.plist
+++ b/ln_jq_app/ios/Runner/Info.plist
@@ -2,16 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>需要您的位置信息以在地图上展示</string>
-    <!-- 建议添加：即使你只申请WhenInUse，有些插件逻辑可能会检查这个key -->
-    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-    <string>我们需要您的位置来规划路线</string>
-    <!-- 建议添加：旧版本iOS兼容 -->
-    <key>NSLocationAlwaysUsageDescription</key>
-    <string>我们需要您的位置来规划路线</string>
-
-
+	<key></key>
+	<string></string>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -32,8 +26,24 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>需要访问您的相机以扫描二维码</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>我们需要您的位置来规划路线</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>我们需要您的位置来规划路线</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>需要您的位置信息以在地图上展示</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>需要访问您的相册以选择二维码图片进行识别</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>需要访问您的相册以选择二维码图片进行识别</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -51,17 +61,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-
-	<key>NSCameraUsageDescription</key>
-    <string>需要访问您的相机以扫描二维码</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>需要访问您的相册以选择二维码图片进行识别</string>
-    <key>NSPhotoLibraryAddUsageDescription</key>
-    <string>需要访问您的相册以选择二维码图片进行识别</string>
-
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
+	<key>uses</key>
+	<string></string>
 </dict>
 </plist>
--- a/ln_jq_app/lib/common/model/station_model.dart
+++ b/ln_jq_app/lib/common/model/station_model.dart
@@ -4,6 +4,7 @@ class StationModel {
  final String address;
  final String price;
  final String siteStatusName; // 例如 "维修中"
+  final int isSelect; // 新增字段 1是可用 0是不可用

  StationModel({
    required this.hydrogenId,
@@ -11,6 +12,7 @@ class StationModel {
    required this.address,
    required this.price,
    required this.siteStatusName,
+    required this.isSelect,
  });

  // 从 JSON map 创建对象的工厂构造函数
@@ -21,6 +23,7 @@ class StationModel {
      address: json['address'] ?? '地址未知',
      price: json['price']?.toString() ?? '0.00',
      siteStatusName: json['siteStatusName'] ?? '',
+      isSelect: json['isSelect'] as int? ?? 0, // 新增字段的解析，默认为 0
    );
  }
 }
--- a/ln_jq_app/lib/main.dart
+++ b/ln_jq_app/lib/main.dart
@@ -14,7 +14,7 @@ void main() async {
  WidgetsFlutterBinding.ensureInitialized();

  WidgetsBinding widgetsBinding = await init(
-    isDebug: true,
+    isDebug: false,
    logTag: '小羚羚',
    supportedLocales: [Locale('zh', 'CN')],
  );
@@ -38,7 +38,7 @@ void main() async {
      // 主题
      theme: AppTheme.light,
      // Dark主题
-      darkTheme: AppTheme.dark,
+      darkTheme: AppTheme.light,
      // AppTitle
      title: '小羚羚',
      // 首页入口
@@ -76,8 +76,6 @@ void initHttpSet() {
        await StorageService.to.clearLoginInfo();
        Get.offAll(() => LoginPage());
        return baseModel.message;
-      } else {
-        return baseModel.message;
      }
    } on Exception catch (e) {
      e.printInfo();
--- a/ln_jq_app/lib/pages/b_page/base_widgets/view.dart
+++ b/ln_jq_app/lib/pages/b_page/base_widgets/view.dart
@@ -45,8 +45,6 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
          label: '加氢预约',
          icon: AntdIcon.orderedlist,
          selectedIcon: AntdIcon.calendar_fill,
-          badge: '99+',
-          dot: true,
        ),
        NavigationItemModel(
          label: '站点信息',
--- a/ln_jq_app/lib/pages/b_page/history/controller.dart
+++ b/ln_jq_app/lib/pages/b_page/history/controller.dart
@@ -0,0 +1,216 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/model/base_model.dart';
+import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // Reuse ReservationModel
+
+class HistoryController extends GetxController {
+  // --- 定义 API 需要的日期格式化器 ---
+  final DateFormat _apiDateFormat = DateFormat('yyyy-MM-dd');
+
+  // 默认查询最近7天
+  final Rx<DateTime> startDate = DateTime.now().subtract(const Duration(days: 7)).obs;
+  final Rx<DateTime> endDate = DateTime.now().obs;
+  final TextEditingController plateNumberController = TextEditingController();
+
+  final RxString totalHydrogen = '0 kg'.obs;
+  final RxString totalCompletions = '0 次'.obs;
+
+  final RxList<ReservationModel> historyList = <ReservationModel>[].obs;
+  final RxBool isLoading = true.obs;
+  final RxBool hasData = false.obs;
+
+  String get formattedStartDate => DateFormat('yyyy/MM/dd').format(startDate.value);
+
+  String get formattedEndDate => DateFormat('yyyy/MM/dd').format(endDate.value);
+  String stationName = "";
+
+  @override
+  void onInit() {
+    super.onInit();
+
+    final args = Get.arguments as Map<String, dynamic>;
+    stationName = args['stationName'] as String;
+    fetchHistoryData();
+  }
+
+  Future<void> getAllOrderCounts() async {
+    var response = await HttpService.to.post(
+      "appointment/orderAddHyd/getAllOrderCounts",
+      data: {
+        // --- 直接使用 DateFormat 来格式化日期 ---
+        'startTime': _apiDateFormat.format(startDate.value),
+        'endTime': _apiDateFormat.format(endDate.value),
+        'plateNumber': plateNumberController.text,
+        'stationName': stationName, // 加氢站名称
+      },
+    );
+    if (response == null || response.data == null) {
+      totalHydrogen.value = '0 kg';
+      totalCompletions.value = '0 次';
+      return;
+    }
+    try {
+      final baseModel = BaseModel<dynamic>.fromJson(response.data);
+      final dataMap = baseModel.data as Map<String, dynamic>;
+      totalHydrogen.value = '${dataMap['totalAddAmount'] ?? 0} kg';
+      totalCompletions.value = '${dataMap['orderCompleteCount'] ?? 0} 次';
+    } catch (e) {
+      totalHydrogen.value = '0 kg';
+      totalCompletions.value = '0 次';
+    }
+  }
+
+  Future<void> fetchHistoryData() async {
+    isLoading.value = true;
+
+    //获取数据
+    getAllOrderCounts();
+
+    try {
+      var response = await HttpService.to.post(
+        "appointment/orderAddHyd/sitOrderPage",
+        data: {
+          // --- 直接使用 DateFormat 来格式化日期 ---
+          'startTime': _apiDateFormat.format(startDate.value),
+          'endTime': _apiDateFormat.format(endDate.value),
+          'plateNumber': plateNumberController.text,
+          'pageNum': 1,
+          'pageSize': 50,
+          'stationName': stationName, // 加氢站名称
+        },
+      );
+
+      if (response == null || response.data == null) {
+        showToast('无法获取历史记录');
+        _resetData();
+        return;
+      }
+
+      final baseModel = BaseModel<dynamic>.fromJson(response.data);
+      if (baseModel.code == 0 && baseModel.data != null) {
+        final dataMap = baseModel.data as Map<String, dynamic>;
+
+        final List<dynamic> listFromServer = dataMap['records'] ?? [];
+        historyList.assignAll(
+          listFromServer
+              .map((item) => ReservationModel.fromJson(item as Map<String, dynamic>))
+              .toList(),
+        );
+        hasData.value = historyList.isNotEmpty;
+      } else {
+        showToast(baseModel.message);
+        _resetData();
+      }
+    } catch (e) {
+      showToast('获取历史记录失败: $e');
+      _resetData();
+    } finally {
+      isLoading.value = false;
+    }
+  }
+
+  void _resetData() {
+    historyList.clear();
+    hasData.value = false;
+  }
+
+  void pickDate(BuildContext context, bool isStartDate) {
+    //  确定当前操作的日期和临时存储变量
+    final DateTime initialDate = isStartDate ? startDate.value : endDate.value;
+    DateTime tempDate = initialDate;
+
+    //  定义全局的最早可选日期
+    final DateTime globalMinimumDate = DateTime(2025, 12, 1);
+
+    //  动态计算当前选择器的最小/最大日期范围
+    DateTime minimumDate;
+    DateTime? maximumDate; // 声明为可空，因为两个日期都可能没有最大限制
+
+    if (isStartDate) {
+      // 当选择【开始日期】时 它的最小日期就是全局最小日期
+      minimumDate = globalMinimumDate;
+      // 最大日期没有限制
+      maximumDate = null;
+    } else {
+      // 当选择【结束日期】时 它的最小日期不能早于当前的开始日期
+      minimumDate = startDate.value;
+      //  确认结束日期没有最大限制 ---
+      //最大日期没有限制
+      maximumDate = null;
+    }
+
+    Get.bottomSheet(
+      Container(
+        height: 300,
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.only(
+            topLeft: Radius.circular(16),
+            topRight: Radius.circular(16),
+          ),
+        ),
+        child: Column(
+          children: [
+            // 顶部的取消和确认按钮
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  TextButton(
+                    onPressed: () => Get.back(),
+                    child: const Text('取消', style: TextStyle(color: Colors.grey)),
+                  ),
+                  TextButton(
+                    onPressed: () {
+                      // 4. 确认后，更新对应的日期变量
+                      if (isStartDate) {
+                        startDate.value = tempDate;
+                        // 如果新的开始日期晚于结束日期，自动将结束日期调整为同一天
+                        if (tempDate.isAfter(endDate.value)) {
+                          endDate.value = tempDate;
+                        }
+                      } else {
+                        endDate.value = tempDate;
+                      }
+                      Get.back();
+
+                      // 选择日期后自动刷新数据
+                      fetchHistoryData();
+                    },
+                    child: const Text(
+                      '确认',
+                      style: TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            const Divider(height: 1),
+            // 日期选择器
+            Expanded(
+              child: CupertinoDatePicker(
+                mode: CupertinoDatePickerMode.date,
+                initialDateTime: initialDate,
+                // 应用动态计算好的最小/最大日期
+                minimumDate: minimumDate,
+                maximumDate: maximumDate,
+                onDateTimeChanged: (DateTime newDate) {
+                  tempDate = newDate;
+                },
+              ),
+            ),
+          ],
+        ),
+      ),
+      backgroundColor: Colors.transparent, // 使底部工作表外的区域透明
+    );
+  }
+
+  @override
+  void onClose() {
+    plateNumberController.dispose();
+    super.onClose();
+  }
+}
--- a/ln_jq_app/lib/pages/b_page/history/view.dart
+++ b/ln_jq_app/lib/pages/b_page/history/view.dart
@@ -0,0 +1,249 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:ln_jq_app/common/styles/theme.dart';
+import 'package:ln_jq_app/pages/b_page/history/controller.dart';
+import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // Reuse ReservationModel
+
+class HistoryPage extends GetView<HistoryController> {
+  const HistoryPage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    Get.put(HistoryController());
+
+    return Scaffold(
+      appBar: AppBar(title: const Text('历史记录'), centerTitle: true),
+      body: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          children: [
+            _buildFilterCard(context),
+            const SizedBox(height: 12),
+            _buildSummaryCard(),
+            const SizedBox(height: 12),
+            _buildListHeader(),
+            Expanded(child: _buildHistoryList()),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFilterCard(BuildContext context) {
+    return Card(
+      elevation: 2,
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text('时间范围', style: TextStyle(fontSize: 14, color: Colors.grey)),
+            const SizedBox(height: 8),
+            Row(
+              children: [
+                Expanded(child: _buildDateField(context, true)),
+                const Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 8.0),
+                  child: Text('至'),
+                ),
+                Expanded(child: _buildDateField(context, false)),
+              ],
+            ),
+            const SizedBox(height: 16),
+            const Text('车牌号', style: TextStyle(fontSize: 14, color: Colors.grey)),
+            const SizedBox(height: 8),
+            SizedBox(
+              height: 44,
+              child: TextField(
+                controller: controller.plateNumberController,
+                decoration: InputDecoration(
+                  hintText: '请输入车牌号',
+                  border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 12),
+                ),
+              ),
+            ),
+            const SizedBox(height: 16),
+            ElevatedButton.icon(
+              onPressed: () {
+                FocusScope.of(context).unfocus(); // Hide keyboard
+                controller.fetchHistoryData();
+              },
+              icon: const Icon(Icons.search, size: 20),
+              label: const Text('查询'),
+              style: ElevatedButton.styleFrom(
+                minimumSize: const Size(double.infinity, 44),
+                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSummaryCard() {
+    return Card(
+      elevation: 2,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 20.0),
+        child: Obx(
+          () => Row(
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
+            children: [
+              _buildSummaryItem('实际加氢总量', controller.totalHydrogen.value, Colors.blue),
+              const SizedBox(width: 1, height: 40, child: VerticalDivider()),
+              _buildSummaryItem(
+                '预约完成次数',
+                controller.totalCompletions.value,
+                Colors.green,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildHistoryList() {
+    return Obx(() {
+      if (controller.isLoading.value) {
+        return const Center(child: CircularProgressIndicator());
+      }
+      if (!controller.hasData.value) {
+        return const Center(child: Text('没有找到相关记录'));
+      }
+      return ListView.builder(
+        itemCount: controller.historyList.length,
+        itemBuilder: (context, index) {
+          final ReservationModel item = controller.historyList[index];
+          return Card(
+            margin: const EdgeInsets.only(bottom: 8),
+            child: ListTile(
+              title: Text('车牌号: ${item.plateNumber}'),
+              subtitle: Text.rich(
+                TextSpan(
+                  children: [
+                    TextSpan(
+                      text: '加氢站: ${item.stationName}\n',
+                      style: TextStyle(fontSize: 16),
+                    ),
+                    TextSpan(
+                      text: '时间: ${item.time}\n',
+                      style: TextStyle(fontSize: 16),
+                    ),
+                    TextSpan(
+                      text: '加氢量：',
+                    ),
+                    TextSpan(
+                      text: '${item.amount}',
+                      style: TextStyle(fontSize: 16, color: AppTheme.themeColor),
+                    ),
+                  ],
+                ),
+              )
+              ,
+              trailing:
+                  // 状态标签
+                  _buildStatusChip(item.status),
+            ),
+          );
+        },
+      );
+    });
+  }
+
+  Widget _buildStatusChip(ReservationStatus status) {
+    String text;
+    Color color;
+    switch (status) {
+      case ReservationStatus.pending:
+        text = '待加氢';
+        color = Colors.orange;
+        break;
+      case ReservationStatus.completed:
+        text = '已加氢';
+        color = Colors.greenAccent;
+        break;
+      case ReservationStatus.rejected:
+        text = '拒绝加氢';
+        color = Colors.red;
+        break;
+      case ReservationStatus.unadded:
+        text = '未加氢';
+        color = Colors.red;
+        break;
+      default:
+        text = '未知状态';
+        color = Colors.grey;
+        break;
+    }
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: color.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(Icons.circle, color: color, size: 8),
+          const SizedBox(width: 4),
+          Text(
+            text,
+            style: TextStyle(color: color, fontSize: 12, fontWeight: FontWeight.bold),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDateField(BuildContext context, bool isStart) {
+    return Obx(
+      () => InkWell(
+        onTap: () => controller.pickDate(context, isStart),
+        child: Container(
+          height: 44,
+          padding: const EdgeInsets.symmetric(horizontal: 12),
+          decoration: BoxDecoration(
+            border: Border.all(color: Colors.grey.shade400),
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(isStart ? controller.formattedStartDate : controller.formattedEndDate),
+              const Icon(Icons.calendar_today, size: 18, color: Colors.grey),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSummaryItem(String label, String value, Color color) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(label, style: const TextStyle(color: Colors.grey, fontSize: 14)),
+        const SizedBox(height: 8),
+        Text(
+          value,
+          style: TextStyle(color: color, fontSize: 22, fontWeight: FontWeight.bold),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildListHeader() {
+    return const Padding(
+      padding: EdgeInsets.symmetric(vertical: 8.0, horizontal: 14.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text('加氢明细', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+        ],
+      ),
+    );
+  }
+}
--- a/ln_jq_app/lib/pages/b_page/reservation/view.dart
+++ b/ln_jq_app/lib/pages/b_page/reservation/view.dart
@@ -71,7 +71,7 @@ class ReservationPage extends GetView<ReservationController> {
            child: Row(
              mainAxisAlignment: MainAxisAlignment.spaceAround,
              children: [
-                _buildHeaderStat(controller.costPrice, '氢气价格'),
+                _buildHeaderStat(controller.customerPrice, '氢气价格'),
                _buildHeaderStat(controller.timeStr, '营业时间'),
                _buildHeaderStat('98%', '设备状态'),
              ],
@@ -119,7 +119,7 @@ class ReservationPage extends GetView<ReservationController> {

            // --- 价格信息 ---
            _buildSectionTitle('价格信息'),
-            _buildDisplayField(label: '氢气价格 (元/kg)', value: controller.costPrice),
+            // _buildDisplayField(label: '氢气价格 (元/kg)', value: controller.costPrice),
            _buildDisplayField(label: '官方价格 (元/kg)', value: controller.customerPrice),
            const SizedBox(height: 16),

--- a/ln_jq_app/lib/pages/b_page/site/controller.dart
+++ b/ln_jq_app/lib/pages/b_page/site/controller.dart
@@ -1,20 +1,24 @@
 import 'dart:async';

+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 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';

 enum ReservationStatus {
-  pending, // 待处理 ( addStatus: 1)
-  completed, // 已完成 ( addStatus: 2)
-  rejected, // 已拒绝 ( 3)
+  pending, // 待处理 ( addStatus: 0)
+  completed, // 完成 ( addStatus: 1)
+  rejected, // 拒绝 ( -1)
+  unadded, // 未加 ( 2)
  unknown, // 未知状态
 }

 class ReservationModel {
  final String id;
  final String plateNumber;
-  final String amount;
+  String amount;
  final String time;
  final String contactPerson;
  final String contactPhone;
@@ -22,6 +26,7 @@ class ReservationModel {

  final String contacts;
  final String phone;
+  final String rejectReason;
  final String stationName;
  final String startTime;
  final String endTime;
@@ -31,6 +36,7 @@ class ReservationModel {
  final String stateName;
  final String addStatus;
  final String addStatusName;
+  bool hasEdit;

  ReservationModel({
    required this.id,
@@ -39,6 +45,7 @@ class ReservationModel {
    required this.time,
    required this.contactPerson,
    required this.contactPhone,
+    required this.hasEdit,
    this.status = ReservationStatus.pending,
    required this.contacts,
    required this.phone,
@@ -51,32 +58,39 @@ class ReservationModel {
    required this.stateName,
    required this.addStatus,
    required this.addStatusName,
+    required this.rejectReason,
  });

  /// 工厂构造函数，用于从JSON创建ReservationModel实例
  factory ReservationModel.fromJson(Map<String, dynamic> json) {
-    //1完成 0待处理 2已拒绝
+    // 1完成 2未加 -1拒绝 0是待加氢
    ReservationStatus currentStatus;
    int statusFromServer = json['addStatus'] as int? ?? 0;
-    switch (statusFromServer) {
-      case 0:
-        currentStatus = ReservationStatus.pending;
-        break;
-      case 1:
-        currentStatus = ReservationStatus.completed;
-        break;
-      case 2:
-        currentStatus = ReservationStatus.rejected;
-        break;
-      default:
-        currentStatus = ReservationStatus.unknown;
+    int state = json['state'] as int? ?? 0;
+    if (state == -1) {
+      currentStatus = ReservationStatus.rejected;
+    } else {
+      switch (statusFromServer) {
+        case 0:
+          currentStatus = ReservationStatus.pending;
+          break;
+        case 1:
+          currentStatus = ReservationStatus.completed;
+          break;
+        case 2:
+          currentStatus = ReservationStatus.unadded;
+          break;
+        default:
+          currentStatus = ReservationStatus.unknown;
+      }
    }

    // 格式化时间显示
    String startTimeStr = json['startTime']?.toString() ?? '';
    String endTimeStr = json['endTime']?.toString() ?? '';
    String dateStr = json['date']?.toString() ?? '';
-    String timeRange = (startTimeStr.isNotEmpty && endTimeStr.isNotEmpty && dateStr.isNotEmpty)
+    String timeRange =
+        (startTimeStr.isNotEmpty && endTimeStr.isNotEmpty && dateStr.isNotEmpty)
        ? '$dateStr ${startTimeStr.substring(11, 16)}-${endTimeStr.substring(11, 16)}' // 截取 HH:mm
        : '时间未定';

@@ -102,6 +116,8 @@ class ReservationModel {
      addStatus: statusFromServer.toString(),
      addStatusName: json['addStatusName']?.toString() ?? '',
      stateName: json['stateName']?.toString() ?? '',
+      rejectReason: json['rejectReason']?.toString() ?? '',
+      hasEdit: true,
    );
  }
 }
@@ -119,6 +135,8 @@ class SiteController extends GetxController with BaseControllerMixin {
  List<ReservationModel> reservationList = [];
  Timer? _refreshTimer;

+  final TextEditingController searchController = TextEditingController();
+
  @override
  void onInit() {
    super.onInit();
@@ -130,6 +148,7 @@ class SiteController extends GetxController with BaseControllerMixin {
  @override
  void onClose() {
    stopAutoRefresh();
+    searchController.dispose();
    super.onClose();
  }

@@ -139,7 +158,7 @@ class SiteController extends GetxController with BaseControllerMixin {

    // 创建一个每5分钟执行一次的周期性定时器
    _refreshTimer = Timer.periodic(const Duration(minutes: 5), (timer) {
-      fetchReservationData();
+      renderData();
    });
  }

@@ -155,13 +174,16 @@ class SiteController extends GetxController with BaseControllerMixin {
  Future<void> fetchReservationData() async {
    showLoading("加载中");

+    final String searchText = searchController.text.trim();
+
    try {
      var response = await HttpService.to.post(
        "appointment/orderAddHyd/sitOrderPage",
        data: {
          'stationName': name, // 使用从 renderData 中获取到的 name
          'pageNum': 1,
-          'pageSize': 30, // 暂时不考虑分页，一次获取30条
+          'pageSize': 50, // 暂时不考虑分页，一次获取30条
+          'keyword': searchText, // 加氢站名称、手机号
        },
      );

@@ -170,6 +192,7 @@ class SiteController extends GetxController with BaseControllerMixin {
        showToast('暂时无法获取预约数据');
        hasReservationData = false;
        reservationList = [];
+        dismissLoading();
        return;
      }

@@ -179,7 +202,7 @@ class SiteController extends GetxController with BaseControllerMixin {
        // 【核心修改】处理接口返回的列表数据
        final dataMap = baseModel.data as Map<String, dynamic>;

-        final List<dynamic> listFromServer = dataMap['list'] ?? [];
+        final List<dynamic> listFromServer = dataMap['records'] ?? [];

        // 使用 .map() 遍历列表，将每个 item 转换为一个 ReservationModel 对象
        reservationList = listFromServer.map((item) {
@@ -208,38 +231,290 @@ class SiteController extends GetxController with BaseControllerMixin {

  /// 确认预约
  Future<void> confirmReservation(String id) async {
-    final item = reservationList.firstWhere((item) => item.id == id);
-    DialogX.to.showConfirmDialog(
-      title: '确认预约',
-      message: '确定要确认车牌号${item.plateNumber}的预约吗',
-      onConfirm: () {
-        upDataService(id, 1, item);
-      },
-      onCancel: () {},
+    final item = reservationList.firstWhere(
+      (item) => item.id == id,
+      orElse: () => throw Exception('Reservation not found'),
+    );
+    final TextEditingController amountController = TextEditingController(
+      text: item.hydAmount,
+    );
+    Get.dialog(
+      Dialog(
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), // 圆角
+        child: Padding(
+          padding: const EdgeInsets.only(top: 24.0),
+          child: Column(
+            mainAxisSize: MainAxisSize.min, // 高度自适应
+            children: [
+              const Text(
+                '确认加氢状态',
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              ),
+              const SizedBox(height: 5),
+              // content 部分
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 24),
+                child: Column(
+                  children: [
+                    Text(
+                      '车牌号 ${item.plateNumber}',
+                      style: const TextStyle(
+                        fontSize: 16,
+                        color: AppTheme.themeColor,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const SizedBox(height: 12),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        const Text(
+                          '加氢量',
+                          style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+                        ),
+                        const SizedBox(width: 16),
+                        SizedBox(
+                          width: 100,
+                          child: TextField(
+                            controller: amountController,
+                            textAlign: TextAlign.center,
+                            keyboardType:  TextInputType.number,
+                            inputFormatters: [
+                              FilteringTextInputFormatter.digitsOnly, // 只允许数字输入
+                            ],
+                            style: TextStyle(
+                              fontSize: 22,
+                              fontWeight: FontWeight.bold,
+                              color: Get.theme.primaryColor,
+                            ),
+                            decoration: const InputDecoration(
+                              suffixText: 'kg',
+                              suffixStyle: TextStyle(fontSize: 16, color: Colors.grey),
+                              enabledBorder: UnderlineInputBorder(
+                                borderSide: BorderSide(color: Colors.grey),
+                              ),
+                              focusedBorder: UnderlineInputBorder(
+                                borderSide: BorderSide(color: Colors.grey, width: 2),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 12),
+                    const Text(
+                      '请选择本次加氢的实际状态\n用于更新预约记录。',
+                      textAlign: TextAlign.center,
+                      style: TextStyle(fontSize: 14, color: Colors.grey),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 24),
+              // actions 部分 (按钮)
+              Padding(
+                padding: const EdgeInsets.only(left: 24, right: 24, bottom: 24),
+                child: Column(
+                  children: [
+                    ElevatedButton(
+                      onPressed: () {
+                        Get.back(); // 关闭弹窗
+                        final num addHydAmount = num.tryParse(amountController.text) ?? 0;
+                        upDataService(id, 0, 1, addHydAmount, "", item);
+                      },
+                      style: ElevatedButton.styleFrom(
+                        minimumSize: const Size(double.infinity, 48),
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(5),
+                        ),
+                      ),
+                      child: const Text('加氢完成', style: TextStyle(fontSize: 16)),
+                    ),
+                    const SizedBox(height: 12),
+                    ElevatedButton(
+                      onPressed: () {
+                        Get.back(); // 关闭弹窗
+                        upDataService(id, 0, 2, 0, "", item);
+                      },
+                      style: ElevatedButton.styleFrom(
+                        backgroundColor: Colors.orange,
+                        minimumSize: const Size(double.infinity, 48),
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(5),
+                        ),
+                      ),
+                      child: const Text('未加氢', style: TextStyle(fontSize: 16)),
+                    ),
+                    const SizedBox(height: 12),
+                    TextButton(
+                      onPressed: () => Get.back(), // 只关闭弹窗
+                      child: const Text(
+                        '暂不处理',
+                        style: TextStyle(color: Colors.grey, fontSize: 14),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+      barrierDismissible: false, // 点击外部不关闭弹窗
    );
  }

-  /// 拒绝预约
  Future<void> rejectReservation(String id) async {
    final item = reservationList.firstWhere((item) => item.id == id);
-    DialogX.to.showConfirmDialog(
-      title: '拒绝预约',
-      message: '确定要拒绝车牌号${item.plateNumber}的预约吗',
-      onConfirm: () {
-        upDataService(id, 2, item);
-      },
-      onCancel: () {},
+    final TextEditingController reasonController = TextEditingController();
+    final RxString selectedReason = ''.obs;
+
+    // 预设的拒绝原因列表
+    final List<String> presetReasons = ['车辆未到场', '司机联系不上', '设备故障无法加氢'];
+
+    Get.dialog(
+      Dialog(
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+        child: SingleChildScrollView(
+          child: Padding(
+            padding: const EdgeInsets.all(24.0),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                const Text(
+                  '拒绝预约',
+                  textAlign: TextAlign.center,
+                  style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+                ),
+                const SizedBox(height: 16),
+                Text(
+                  '正在处理车牌号 ${item.plateNumber} 的预约',
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(fontSize: 16, color: AppTheme.themeColor),
+                ),
+                const SizedBox(height: 24),
+
+                // 4. 预设原因选择区域
+                const Text('选择或填写拒绝原因:', style: TextStyle(color: Colors.grey)),
+                const SizedBox(height: 8),
+                Obx(
+                  () => Wrap(
+                    // 使用 Wrap 自动换行
+                    spacing: 8.0, // 水平间距
+                    children: presetReasons.map((reason) {
+                      final isSelected = selectedReason.value == reason;
+                      return ChoiceChip(
+                        label: Text(reason),
+                        selected: isSelected,
+                        onSelected: (selected) {
+                          if (selected) {
+                            selectedReason.value = reason;
+                            reasonController.clear(); // 选择预设原因时，清空自定义输入
+                          }
+                        },
+                        selectedColor: Get.theme.primaryColor.withOpacity(0.2),
+                        labelStyle: TextStyle(
+                          color: isSelected ? Get.theme.primaryColor : Colors.black,
+                        ),
+                      );
+                    }).toList(),
+                  ),
+                ),
+                const SizedBox(height: 16),
+
+                // 5. 自定义原因输入框
+                TextField(
+                  controller: reasonController,
+                  maxLines: 2,
+                  decoration: InputDecoration(
+                    hintText: '输入其它原因',
+                    border: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(8),
+                      borderSide: BorderSide(color: Colors.grey.shade300),
+                    ),
+                  ),
+                  onChanged: (text) {
+                    if (text.isNotEmpty) {
+                      selectedReason.value = ''; // 输入自定义原因时，取消预设选择
+                    }
+                  },
+                ),
+                const SizedBox(height: 24),
+
+                // 6. 按钮区域
+                Row(
+                  children: [
+                    Expanded(
+                      child: TextButton(
+                        onPressed: () {
+                          // 获取最终的拒绝原因
+                          String finalReason = reasonController.text.trim();
+                          if (finalReason.isEmpty) {
+                            finalReason = selectedReason.value;
+                          }
+
+                          if (finalReason.isEmpty) {
+                            showToast('请选择或填写一个拒绝原因');
+                            return;
+                          }
+
+                          Get.back(); // 关闭弹窗
+                          upDataService(id, 1, -1, 0, finalReason, item);
+                        },
+                        child: const Text('确认拒绝', style: TextStyle(color: Colors.red)),
+                      ),
+                    ),
+                    const SizedBox(width: 16),
+                    Expanded(
+                      child: TextButton(
+                        onPressed: () => Get.back(),
+                        child: const Text('暂不处理', style: TextStyle(color: Colors.grey)),
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+      barrierDismissible: false,
    );
  }

-  void upDataService(String id, int status, ReservationModel item) async {
+  //addStatus 1完成 2未加 -1拒绝
+  void upDataService(
+    String id,
+    int status,
+    int addStatus,
+    num addHydAmount,
+    String rejectReason,
+    ReservationModel item,
+  ) async {
    showLoading("确认中");

    try {
-      var responseData = await HttpService.to.post(
-        'appointment/orderAddHyd/completeOrder',
-        data: {'id': id, 'addStatus': status},
-      );
+      var responseData;
+      if (addStatus == -1) {
+        responseData = await HttpService.to.post(
+          'appointment/orderAddHyd/rejectOrder',
+          data: {
+            'id': id,
+            'state': -1, //拒绝使用
+            "rejectReason": rejectReason,
+          },
+        );
+      } else {
+        responseData = await HttpService.to.post(
+          'appointment/orderAddHyd/completeOrder',
+          data: {
+            'id': id,
+            'addStatus': addStatus, //完成使用   完成1,未加2
+            "addHydAmount": addHydAmount,
+          },
+        );
+      }

      if (responseData == null && responseData!.data == null) {
        dismissLoading();
@@ -252,12 +527,16 @@ class SiteController extends GetxController with BaseControllerMixin {
      }
      dismissLoading();

-      if (status == 1) {
+      //1完成 2未加 -1拒绝
+      if (addStatus == 1) {
        item.status = ReservationStatus.completed;
-      } else if (status == 2) {
+        item.amount = "${addHydAmount}kg";
+      } else if (addStatus == -1) {
        item.status = ReservationStatus.rejected;
+      } else if (addStatus == 2) {
+        item.status = ReservationStatus.unadded;
      }
-      updateUi();
+      renderData();
    } catch (e) {
      dismissLoading();
    }
@@ -267,6 +546,8 @@ class SiteController extends GetxController with BaseControllerMixin {
  String orderAmount = "";
  String completedAmount = "";
  String name = "";
+  String orderTotalAmount = "";
+  String orderUnfinishedAmount = "";

  Future<void> renderData() async {
    try {
@@ -286,14 +567,22 @@ class SiteController extends GetxController with BaseControllerMixin {
        orderAmount = result.data["orderAmount"].toString();
        completedAmount = result.data["completedAmount"].toString();
        name = result.data["name"].toString();
+        orderTotalAmount = result.data["orderTotalAmount"].toString();
+        orderUnfinishedAmount = result.data["orderUnfinishedAmount"].toString();

        leftHydrogen = leftHydrogen.isEmpty ? "统计中" : leftHydrogen.toString();
-
-        //加载列表数据
-        fetchReservationData();
+        orderTotalAmount = orderTotalAmount.isEmpty ? "统计中" : orderTotalAmount.toString();
+        orderUnfinishedAmount = orderUnfinishedAmount.isEmpty
+            ? "统计中"
+            : orderUnfinishedAmount.toString();
      } catch (e) {
        showToast('数据异常');
      }
-    } catch (e) {}
+    } catch (e) {
+    } finally {
+
+      //加载列表数据
+      fetchReservationData();
+    }
  }
 }
--- a/ln_jq_app/lib/pages/b_page/site/view.dart
+++ b/ln_jq_app/lib/pages/b_page/site/view.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
+import 'package:ln_jq_app/pages/b_page/history/view.dart';

 import 'controller.dart';

@@ -94,6 +95,17 @@ class SitePage extends GetView<SiteController> {
                      ],
                    ),
                  ),
+                  const SizedBox(height: 12),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      children: [
+                        _buildStatItem(controller.orderTotalAmount, '加氢总量'),
+                        _buildStatItem(controller.orderUnfinishedAmount, '未加氢总量'),
+                      ],
+                    ),
+                  ),
                ],
              ),
            ),
@@ -103,53 +115,70 @@ class SitePage extends GetView<SiteController> {
          Card(
            elevation: 3,
            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
-            margin: const EdgeInsets.only(bottom: 12),
+            margin: EdgeInsets.only(bottom: 12),
            clipBehavior: Clip.antiAlias,
            child: Column(
              children: [
                Container(
                  color: Colors.blue,
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
+                  padding: EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
                  child: Row(
                    children: [
-                      const Expanded(
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Text(
-                              '今日预约信息',
-                              style: TextStyle(
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold,
-                                color: Colors.white,
+                      Expanded(
+                        child: GestureDetector(
+                          onTap: () {
+                            controller.renderData();
+                          },
+                          child: Row(
+                            children: [
+                              Text(
+                                '今日预约信息',
+                                style: TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold,
+                                  color: Colors.white,
+                                ),
                              ),
-                            ),
-                            SizedBox(height: 2),
-                            Text(
-                              'Reservation Information',
-                              style: TextStyle(fontSize: 12, color: Colors.white70),
-                            ),
-                          ],
+                              SizedBox(
+                                width: 32,
+                                height: 32,
+                                child: const Icon(
+                                  Icons.refresh,
+                                  size: 18,
+                                  color: Colors.white,
+                                ),
+                              ),
+                            ],
+                          ),
                        ),
                      ),
-                      ElevatedButton.icon(
+                      ElevatedButton(
                        onPressed: () {
-                          controller.fetchReservationData();
+                          Get.to(
+                            () => HistoryPage(),
+                            arguments: {
+                              'stationName': controller.name,
+                            },
+                          );
                        },
-                        icon: const Icon(Icons.refresh, size: 16),
-                        label: const Text('刷新'),
                        style: ElevatedButton.styleFrom(
-                          foregroundColor: Colors.blue,
-                          backgroundColor: Colors.white,
-                          padding: const EdgeInsets.symmetric(horizontal: 12),
+                          backgroundColor: Colors.blue.shade700,
+                          foregroundColor: Colors.white,
+                          padding: EdgeInsets.symmetric(horizontal: 12, vertical: 4),
                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(16),
+                            borderRadius: BorderRadius.circular(5),
                          ),
+                          elevation: 2,
+                        ),
+                        child: const Text(
+                          '历史记录',
+                          style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
                        ),
                      ),
                    ],
                  ),
                ),
+                _buildSearchView(),
                controller.hasReservationData
                    ? _buildReservationListView()
                    : _buildEmptyReservationView(),
@@ -179,6 +208,66 @@ class SitePage extends GetView<SiteController> {
    );
  }

+  //搜索输入框，提示可以输入车牌或者手机
+  Widget _buildSearchView() {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 12, 16, 0),
+      child: Row(
+        children: [
+          Expanded(
+            child: SizedBox(
+              height: 44,
+              child: TextField(
+                controller: controller.searchController, // 绑定控制器
+                decoration: InputDecoration(
+                  hintText: '输入车牌号或完整手机号查询',
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                  border: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(22),
+                    borderSide: BorderSide(color: Colors.grey.shade300),
+                  ),
+                  enabledBorder: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(22),
+                    borderSide: BorderSide(color: Colors.grey.shade300),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(22),
+                    borderSide: BorderSide(color: Get.theme.primaryColor, width: 1.5),
+                  ),
+                  // 清除按钮
+                  suffixIcon: IconButton(
+                    icon: const Icon(Icons.clear, size: 20),
+                    onPressed: () {
+                      controller.searchController.clear();
+                      controller.fetchReservationData(); // 清除后也刷新一次
+                    },
+                  ),
+                ),
+                onSubmitted: (value) {
+                  // 用户在键盘上点击“完成”或“搜索”时触发
+                  controller.fetchReservationData();
+                },
+              ),
+            ),
+          ),
+          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(
@@ -336,7 +425,7 @@ class SitePage extends GetView<SiteController> {
                    child: ElevatedButton(
                      onPressed: () => controller.confirmReservation(item.id),
                      style: ElevatedButton.styleFrom(backgroundColor: Colors.blue),
-                      child: const Text('确定'),
+                      child: const Text('确认'),
                    ),
                  ),
                  const SizedBox(width: 16),
@@ -361,15 +450,19 @@ class SitePage extends GetView<SiteController> {
    Color color;
    switch (status) {
      case ReservationStatus.pending:
-        text = '待处理';
+        text = '待加氢';
        color = Colors.orange;
        break;
      case ReservationStatus.completed:
-        text = '已完成';
+        text = '已加氢';
        color = Colors.greenAccent;
        break;
      case ReservationStatus.rejected:
-        text = '已拒绝';
+        text = '拒绝加氢';
+        color = Colors.red;
+        break;
+      case ReservationStatus.unadded:
+        text = '未加氢';
        color = Colors.red;
        break;
      default:
--- a/ln_jq_app/lib/pages/c_page/base_widgets/view.dart
+++ b/ln_jq_app/lib/pages/c_page/base_widgets/view.dart
@@ -51,14 +51,11 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
          label: '地图',
          icon: AntdIcon.location,
          selectedIcon: AntdIcon.location_fill,
-          dot: false,
        ),
        NavigationItemModel(
          label: '加氢预约',
          icon: AntdIcon.orderedlist,
          selectedIcon: AntdIcon.calendar_fill,
-          badge: '99+',
-          dot: true,
        ),
        NavigationItemModel(
          label: '车辆信息',
--- a/ln_jq_app/lib/pages/c_page/car_info/attachment_viewer_controller.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/attachment_viewer_controller.dart
@@ -48,9 +48,9 @@ class AttachmentViewerController extends GetxController {
          }
        },
      );
-      
+
      localFilePath.value = savePath;
-      
+
    } catch (e) {
      showErrorToast('PDF文件加载失败，请检查网络或文件链接');
      print('PDF Download Error: $e');
--- a/ln_jq_app/lib/pages/c_page/car_info/attachment_viewer_page.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/attachment_viewer_page.dart
@@ -40,11 +40,10 @@ class AttachmentViewerPage extends GetView<AttachmentViewerController> {
        if (controller.fileType == 'pdf') {
          if (controller.localFilePath.isNotEmpty) {
            return PDFView(
-              key: ValueKey(controller.localFilePath.value),
              filePath: controller.localFilePath.value,
              enableSwipe: true,
-              swipeHorizontal: false,
-              autoSpacing: false,
+              swipeHorizontal: true,
+              autoSpacing: true,
              pageFling: true,
              onRender: (pages) {
                print("PDF rendered with $pages pages.");
--- a/ln_jq_app/lib/pages/c_page/car_info/certificate_viewer_controller.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/certificate_viewer_controller.dart
@@ -1,21 +1,77 @@
+import 'dart:io';
+import 'package:dio/dio.dart';
 import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:path_provider/path_provider.dart';

 import 'attachment_viewer_page.dart';

-class CertificateViewerController extends GetxController {
+class CertificateViewerController extends GetxController with BaseControllerMixin{
  late final String title;
  late final 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;
+
+  @override
+  String get builderId => "certificateviewer";
+
  @override
  void onInit() {
    super.onInit();
-    // 从 Get.to 的 arguments 中获取标题和附件列表
    title = Get.arguments['title'] ?? '证件详情';
    attachments = List<String>.from(Get.arguments['attachments'] ?? []);
+
+    // --- 新增: 初始化时开始加载所有PDF ---
+    _loadAllPdfs();
  }

-  /// 导航到通用的附件查看器页面
+  /// 遍历所有附件，如果是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;
+    }
+  }
+
+  /// 导航到通用的附件查看器页面 (此方法保持不变)
  void openAttachment(String url) {
    if (url.isEmpty) {
      showErrorToast('附件链接无效');
@@ -23,15 +79,17 @@ class CertificateViewerController extends GetxController {
    }

    Get.to(
-      () => const AttachmentViewerPage(),
+          () => const AttachmentViewerPage(),
      arguments: {
-        'url': url, 
+        'url': url,
      },
    );
  }

-  /// 检查 URL 是否为 PDF，以便在视图中显示不同的图标
+  /// 检查 URL 是否为 PDF (此方法保持不变)
  bool isPdf(String url) {
    return url.toLowerCase().endsWith('.pdf');
  }
+
+
 }
--- a/ln_jq_app/lib/pages/c_page/car_info/certificate_viewer_page.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/certificate_viewer_page.dart
@@ -1,51 +1,114 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_pdfview/flutter_pdfview.dart'; // 引入PDFView
 import 'package:get/get.dart';
+import 'package:getx_scaffold/common/common.dart';

 import 'certificate_viewer_controller.dart';

 class CertificateViewerPage extends GetView<CertificateViewerController> {
-  const CertificateViewerPage({Key? key}) : super(key: key);
+  const CertificateViewerPage({super.key});

  @override
  Widget build(BuildContext context) {
-    Get.put(CertificateViewerController());
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(controller.title),
-        centerTitle: true,
-      ),
-      body: ListView.builder(
-        padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
-        itemCount: controller.attachments.length,
-        itemBuilder: (context, index) {
-          final url = controller.attachments[index];
-          // 从 URL 中提取文件名用于显示
-          final fileName = url.split('/').last;
-
-          return Card(
-            elevation: 2,
-            margin: const EdgeInsets.only(bottom: 12),
-            child: ListTile(
-              leading: Icon(
-                controller.isPdf(url)
-                    ? Icons.picture_as_pdf_rounded // PDF 图标
-                    : Icons.image_rounded, // 图片图标
-                color: controller.isPdf(url) ? Colors.red.shade700 : Colors.blue.shade700,
-                size: 32,
+    return GetBuilder<CertificateViewerController>(
+      init: CertificateViewerController(),
+      id: 'certificateviewer',
+      builder: (_) {
+        return Scaffold(
+          appBar: AppBar(title: Text(controller.title)),
+          body: Column(
+            children: [
+              SizedBox(height: 16,),
+              Text(
+                "点击可查看大图",
+                textAlign: TextAlign.center,
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
              ),
-              title: Text(
-                fileName,
-                style: const TextStyle(fontSize: 14),
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
+              Expanded(
+                child: ListView.builder(
+                  padding: const EdgeInsets.all(16.0),
+                  itemCount: controller.attachments.length,
+                  itemBuilder: (context, index) {
+                    final url = controller.attachments[index];
+                    return _buildAttachmentItem(url);
+                  },
+                ),
              ),
-              trailing: const Icon(Icons.arrow_forward_ios_rounded, size: 16, color: Colors.grey),
-              onTap: () => controller.openAttachment(url),
-            ),
-          );
-        },
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  /// 构建单个附件的显示项
+  Widget _buildAttachmentItem(String url) {
+    return GestureDetector(
+      onTap: () {
+        controller.openAttachment(url);
+      }, // 点击跳转到详情页
+      child: Card(
+        margin: const EdgeInsets.only(bottom: 16.0),
+        clipBehavior: Clip.antiAlias, // 确保内容不会溢出Card的圆角
+        elevation: 4,
+        // 等比缩放展示
+        child: 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(
+                        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：加载中指示器
+  Widget _buildLoadingIndicator() {
+    return const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()));
+  }
+
+  // 辅助Widget：错误指示器
+  Widget _buildErrorIndicator() {
+    return const SizedBox(
+      height: 200,
+      child: Center(child: Icon(Icons.error_outline, color: Colors.red, size: 48)),
+    );
+  }
 }
--- a/ln_jq_app/lib/pages/c_page/car_info/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/controller.dart
@@ -2,6 +2,7 @@ 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/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';

 import 'certificate_viewer_page.dart';
@@ -28,6 +29,36 @@ class CarInfoController extends GetxController with BaseControllerMixin {
    getUserBindCarInfo();
  }

+  @override
+  void onReady() {
+    super.onReady();
+    // 如果未绑定车辆，且本次会话尚未提示过，则弹出提示
+    if (!StorageService.to.hasShownBindVehicleDialog &&
+        StorageService.to.isLoggedIn &&
+        !StorageService.to.hasVehicleInfo) {
+      Future.delayed(const Duration(milliseconds: 500), () {
+        DialogX.to.showConfirmDialog(
+          title: '当前尚未绑定车辆',
+          confirmText: "去绑定",
+          cancelText: "稍后",
+          onConfirm: () {
+            doQrCode();
+          },
+        );
+        // 标记为已显示，本次会话不再提示
+        StorageService.to.markBindVehicleDialogAsShown();
+      });
+    }
+  }
+
+  void doQrCode() async {
+    var scanResult = await Get.to(() => const QrCodePage());
+    if (scanResult == true) {
+      getUserBindCarInfo();
+      refreshAppui();
+    }
+  }
+
  void getUserBindCarInfo() async {
    if (StorageService.to.hasVehicleInfo) {
      VehicleInfo? bean = StorageService.to.vehicleInfo;
@@ -43,7 +74,7 @@ class CarInfoController extends GetxController with BaseControllerMixin {
      final response = await HttpService.to.get(
        'appointment/vehicle/getPicInfoByVin?vin=$vin',
      );
-      
+
      if (response != null && response.data != null) {
        final result = BaseModel.fromJson(response.data);
        if (result.code == 0 && result.data != null) {
@@ -60,7 +91,9 @@ class CarInfoController extends GetxController with BaseControllerMixin {
          // 将解析出的 URL 列表赋值给对应的 RxList
          drivingAttachments.assignAll(parseAttachments(data['drivingAttachment']));
          operationAttachments.assignAll(parseAttachments(data['operationAttachment']));
-          hydrogenationAttachments.assignAll(parseAttachments(data['hydrogenationAttachment']));
+          hydrogenationAttachments.assignAll(
+            parseAttachments(data['hydrogenationAttachment']),
+          );
          registerAttachments.assignAll(parseAttachments(data['registerAttachment']));
        }
      }
@@ -70,7 +103,7 @@ class CarInfoController extends GetxController with BaseControllerMixin {

  /// 跳转到证件查看页面
  void navigateToCertificateViewer(String title, List<String> attachments) {
-    if(!StorageService.to.hasVehicleInfo){
+    if (!StorageService.to.hasVehicleInfo) {
      showToast('请先绑定车辆');
      return;
    }
@@ -80,10 +113,7 @@ class CarInfoController extends GetxController with BaseControllerMixin {
    }
    Get.to(
      () => const CertificateViewerPage(),
-      arguments: {
-        'title': title,
-        'attachments': attachments,
-      },
+      arguments: {'title': title, 'attachments': attachments},
    );
  }
 }
--- a/ln_jq_app/lib/pages/c_page/car_info/view.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/view.dart
@@ -173,12 +173,7 @@ class CarInfoPage extends GetView<CarInfoController> {
        isButton
            ? GestureDetector(
                onTap: () async {
-                  //判断是否绑定成功
-                  var scanResult = await Get.to(() => const QrCodePage());
-                  if (scanResult == true) {
-                    controller.getUserBindCarInfo();
-                    refreshAppui();
-                  }
+                  controller.doQrCode();
                },
                child: Container(
                  margin: EdgeInsetsGeometry.only(left: 10.w),
--- a/ln_jq_app/lib/pages/c_page/map/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/map/controller.dart
@@ -4,124 +4,133 @@ import 'dart:convert';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:permission_handler/permission_handler.dart'; // 确保引用这个做权限请求
+import 'package:permission_handler/permission_handler.dart';

-class MapController extends GetxController with BaseControllerMixin {
+class MapController extends GetxController with BaseControllerMixin ,WidgetsBindingObserver{
  @override
  String get builderId => 'map';

  InAppWebViewController? webViewController;
  StreamSubscription<Position>? positionStream;
-  final RxBool isLocationPermissionGranted = false.obs;

-  // 缓存最后一次的位置，防止 WebView 加载慢于定位
+  // --- 状态标志 ---
+  final RxBool isLocationPermissionGranted = false.obs;
+  final RxBool isMapReady = false.obs; // 跟踪地图是否加载完成
+
  Position? _lastKnownPosition;
-  // 是否已经初始化过地图中心
-  bool _hasInitializedMapCenter = false;

  @override
  void onInit() {
    super.onInit();
+    WidgetsBinding.instance.addObserver(this); // 注册监听
    requestLocationPermission();
  }

  @override
  void onClose() {
+    WidgetsBinding.instance.removeObserver(this); // 移除监听
    positionStream?.cancel();
    super.onClose();
  }

-  // 请求权限
-  void requestLocationPermission() async {
-    var status = await Permission.locationWhenInUse.request();
-
-    print("权限状态: $status"); // 在控制台看这个输出
-
-    if (status.isGranted) {
-      isLocationPermissionGranted.value = true;
-      showToast('定位权限已获取');
-      _startLocationTracking();
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed) {
+      // 回到前台，如果之前有权限且开启过，恢复定位
+      if(isLocationPermissionGranted.value) _startLocationTracking();
+    } else if (state == AppLifecycleState.paused) {
+      // 切到后台，取消定位流
+      positionStream?.cancel();
    }
-    else if (status.isPermanentlyDenied) {
-      // iOS 特性：如果你之前点过“不允许”，之后再请求都会直接进这里
-      isLocationPermissionGranted.value = false;
-      // 引导用户去设置页面开启
-      openAppSettings();
-    }
-    else {
-      // 第一次被拒绝，或者其他情况
-      isLocationPermissionGranted.value = false;
-      showErrorToast('需要定位权限才能显示您的位置');
-    }
-
  }

-  // 开启定位监听
-  void _startLocationTracking() async {
-    // 再次检查服务是否开启
+  /// WebView 创建完成时调用
+  void onWebViewCreated(InAppWebViewController controller) {
+    webViewController = controller;
+    // 添加 JS Handler 来监听来自网页的 'mapReady' 事件
+    controller.addJavaScriptHandler(
+      handlerName: 'mapReady',
+      callback: (args) {
+        print("Flutter<-JS: Map is ready, starting location tracking.");
+        isMapReady.value = true;
+        // 地图就绪后，如果已有权限和缓存的定位，则开始定位
+        if (isLocationPermissionGranted.value) {
+          _startLocationTracking();
+        }
+      },
+    );
+  }
+
+  /// 优化后的权限请求函数
+  void requestLocationPermission() async {
    bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
    if (!serviceEnabled) {
+      showErrorToast('请开启手机的定位服务');
+      return;
+    }
+
+    var status = await Permission.locationWhenInUse.request();
+
+    switch (status) {
+      case PermissionStatus.granted:
+        isLocationPermissionGranted.value = true;
+        // 权限已获取，如果地图也已就绪，则开始定位
+        if (isMapReady.value) {
+          _startLocationTracking();
+        }
+        break;
+      case PermissionStatus.denied:
+        showErrorToast('需要定位权限才能显示您的位置');
+        break;
+      case PermissionStatus.permanentlyDenied:
+        showErrorToast('定位权限已被永久拒绝，请到设置中手动开启');
+        openAppSettings();
+        break;
+      default:
+        showErrorToast('获取定位权限时发生未知错误');
+        break;
+    }
+  }
+
+  /// 开始定位监听 (不再需要 delay)
+  void _startLocationTracking() async {
+    if (!isLocationPermissionGranted.value ||
+        !await Geolocator.isLocationServiceEnabled()) {
      return;
    }

    const LocationSettings locationSettings = LocationSettings(
      accuracy: LocationAccuracy.high,
-      distanceFilter: 50, // 移动更新范围
+      distanceFilter: 10,
    );

-    // 先获取一次当前位置，用于快速初始化中心
-    Geolocator.getCurrentPosition().then((position) {
+    // 立即获取一次当前位置，用于快速初始化
+    try {
+      Position position = await Geolocator.getCurrentPosition();
      _lastKnownPosition = position;
-      _syncLocationToMap(position, isInit: true);
-    });
+      _syncLocationToMap(position);
+    } catch (e) {
+      print("Error getting initial position: $e");
+    }

-    // 持续监听
+    // 持续监听位置变化
+    positionStream?.cancel(); // 先取消旧的监听
    positionStream = Geolocator.getPositionStream(locationSettings: locationSettings)
        .listen((Position position) {
-      _lastKnownPosition = position;
-      _syncLocationToMap(position, isInit: false);
-    });
+          _lastKnownPosition = position;
+          _syncLocationToMap(position);
+        });
  }

-  // 将位置同步给 JS
-  void _syncLocationToMap(Position position, {required bool isInit}) {
-    if (webViewController == null) return;
+  // 将 Flutter 的定位数据同步给 JS
+  void _syncLocationToMap(Position position) {
+    if (webViewController == null || !isMapReady.value) return;
+    // 只有当 heading 有效且大于 0 时才传给 JS，否则传 null，让 JS 保持上一次的角度
+    String headingVal = (position.heading > 0) ? "${position.heading}" : "null";

-    // 如果是第一次定位，或者 WebView 刚加载完且从未设置过中心
-    if (isInit || !_hasInitializedMapCenter) {
-      webViewController!.evaluateJavascript(
-          source: "initLocation(${position.latitude}, ${position.longitude})"
-      );
-      _hasInitializedMapCenter = true;
-    } else {
-      // 后续只更新图标位置，不强行移动地图中心（防止用户拖动地图看别处时被拉回）
-      webViewController!.evaluateJavascript(
-          source: "updateMyLocation(${position.latitude}, ${position.longitude}, ${position.heading})"
-      );
-    }
+    webViewController!.evaluateJavascript(
+      source:
+          "updateMyLocation(${position.latitude}, ${position.longitude}, ${position.heading})",
+    );
  }
-
-  // WebView 加载完成回调
-  void onWebViewLoadStop() {
-    // 页面加载完了，如果我们已经拿到了定位数据，立刻设置地图中心
-    if (_lastKnownPosition != null) {
-      _syncLocationToMap(_lastKnownPosition!, isInit: true);
-    }
-
-    // 如果业务需要，可以在这里加载默认的推荐路径
-    // loadRecommendedRoute();
-  }
-
-  // 模拟：获取你的后台推荐路径
-  void loadRecommendedRoute() {
-    // 示例数据
-    List<List<double>> routePoints = [
-      [116.397428, 39.90923],
-      [116.398000, 39.90950],
-      [116.400000, 39.91000],
-    ];
-
-    String jsonPoints = jsonEncode(routePoints);
-    webViewController?.evaluateJavascript(source: "drawCustomRoute($jsonPoints)");
-  }
-}
+}
--- a/ln_jq_app/lib/pages/c_page/map/view.dart
+++ b/ln_jq_app/lib/pages/c_page/map/view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';

@@ -10,23 +11,21 @@ class MapPage extends GetView<MapController> {
    return Stack(
      children: [
        InAppWebView(
-          // 确保 pubspec.yaml 中声明了 assets/html/map.html
          initialFile: 'assets/html/map.html',
          initialSettings: InAppWebViewSettings(
            isInspectable: true,
-            geolocationEnabled: true,
-            // 允许 JS 弹窗 (Alert) 用于调试
-            javaScriptCanOpenWindowsAutomatically: true,
+            // 既然完全依赖 Flutter 定位，建议把 WebView 的定位彻底关掉，防止 JS 意外触发
+            geolocationEnabled: false,
+            javaScriptEnabled: true,
+            // Android 混合开发推荐配置
+            useHybridComposition: true, // 提升地图渲染性能（重要）
+            allowFileAccessFromFileURLs: true, // 允许本地 html 访问本地资源
+            allowUniversalAccessFromFileURLs: true,
          ),
-          onWebViewCreated: (c) {
-            controller.webViewController = c;
-          },
-          onLoadStop: (c, url) {
-            // 通知 Controller 页面加载完毕
-            controller.onWebViewLoadStop();
-          },
+          // 当 WebView 创建完成后，将 controller 实例传递给我们的 MapController
+          onWebViewCreated: controller.onWebViewCreated,
          onConsoleMessage: (controller, consoleMessage) {
-            // 方便在 Flutter 控制台看 JS 日志
+            // 方便在 Flutter 控制台查看来自 JS 的日志
            print("JS Log: ${consoleMessage.message}");
          },
        ),
--- a/ln_jq_app/lib/pages/c_page/reservation/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/controller.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -9,35 +11,87 @@ import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/model/station_model.dart';
 import 'package:ln_jq_app/common/model/vehicle_info.dart';
 import 'package:ln_jq_app/pages/b_page/site/controller.dart';
+import 'package:ln_jq_app/pages/c_page/reservation_edit/controller.dart';
+import 'package:ln_jq_app/pages/c_page/reservation_edit/view.dart';
+import 'package:ln_jq_app/pages/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';

 import '../../../common/styles/theme.dart';
+import 'reservation_list_bottomsheet.dart';
+
+/// Helper class for managing time slots
+class TimeSlot {
+  final TimeOfDay start;
+  final TimeOfDay end;
+
+  TimeSlot(this.start, this.end);
+
+  String get display {
+    final startStr =
+        '${start.hour.toString().padLeft(2, '0')}:${start.minute.toString().padLeft(2, '0')}';
+    final endStr =
+        '${end.hour.toString().padLeft(2, '0')}:${end.minute.toString().padLeft(2, '0')}';
+    return '$startStr - $endStr';
+  }
+}

 class C_ReservationController extends GetxController with BaseControllerMixin {
  @override
  String get builderId => 'reservation';

-  final Rx<DateTime> selectedDate = DateTime.now().obs;
-  final Rx<TimeOfDay> startTime = TimeOfDay.now().obs;
-  final Rx<TimeOfDay> endTime = TimeOfDay.fromDateTime(
-    DateTime.now().add(const Duration(minutes: 30)),
-  ).obs;
+  final DateTime _now = DateTime.now();
+
+  // 计算当前时间属于哪个半小时区间
+  late final TimeOfDay _initialStartTime = _calculateInitialStartTime(_now);
+  late final TimeOfDay _initialEndTime = TimeOfDay.fromDateTime(
+    _getDateTimeFromTimeOfDay(_initialStartTime).add(const Duration(minutes: 30)),
+  );
+  late final Rx<DateTime> selectedDate = DateTime(_now.year, _now.month, _now.day).obs;
+  late final Rx<TimeOfDay> startTime = _initialStartTime.obs;
+  late final Rx<TimeOfDay> endTime = _initialEndTime.obs;
+
+  /// 静态辅助方法，用于计算初始的开始时间
+  static TimeOfDay _calculateInitialStartTime(DateTime now) {
+    if (now.minute < 30) {
+      // 如果当前分钟小于30，则开始时间为当前小时的0分
+      return TimeOfDay(hour: now.hour, minute: 0);
+    } else {
+      // 如果当前分钟大于等于30，则开始时间为当前小时的30分
+      return TimeOfDay(hour: now.hour, minute: 30);
+    }
+  }
+
+  /// 静态辅助方法，将TimeOfDay转换为DateTime
+  static DateTime _getDateTimeFromTimeOfDay(TimeOfDay time) {
+    final now = DateTime.now();
+    return DateTime(now.year, now.month, now.day, time.hour, time.minute);
+  }

  final TextEditingController amountController = TextEditingController();
  TextEditingController plateNumberController = TextEditingController();

  final RxList<StationModel> stationOptions = <StationModel>[].obs;
-  final Rxn<String> selectedStationId = Rxn<String>(); // 用 ID 来选择
+  final Rxn<String> selectedStationId = Rxn<String>();

  String get formattedDate => DateFormat('yyyy-MM-dd').format(selectedDate.value);

-  String get formattedStartTime => _formatTimeOfDay(startTime.value);
-
-  String get formattedEndTime => _formatTimeOfDay(endTime.value);
+  /// 时间段
+  String get formattedTimeSlot =>
+      '${_formatTimeOfDay(startTime.value)} - ${_formatTimeOfDay(endTime.value)}';

  void pickDate(BuildContext context) {
    DateTime tempDate = selectedDate.value;

+    // 获取今天的日期 (不含时间)
+    final DateTime today = DateTime(
+      DateTime.now().year,
+      DateTime.now().month,
+      DateTime.now().day,
+    );
+
+    //计算明天的日期
+    final DateTime tomorrow = today.add(const Duration(days: 1));
+
    Get.bottomSheet(
      Container(
        height: 300,
@@ -65,8 +119,21 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
                  ),
                  CupertinoButton(
                    onPressed: () {
+                      final bool isChangingToToday =
+                          tempDate.isAtSameMomentAs(today) &&
+                          !selectedDate.value.isAtSameMomentAs(today);
+                      final bool isDateChanged = !tempDate.isAtSameMomentAs(
+                        selectedDate.value,
+                      );
+
+                      // 更新选中的日期
                      selectedDate.value = tempDate;
-                      Get.back();
+                      Get.back(); // 先关闭弹窗
+
+                      //  如果日期发生了变化，则重置时间
+                      if (isDateChanged) {
+                        resetTimeForSelectedDate();
+                      }
                    },
                    child: const Text(
                      '确认',
@@ -83,28 +150,12 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
            Expanded(
              child: CupertinoDatePicker(
                mode: CupertinoDatePickerMode.date,
-                initialDateTime:
-                    selectedDate.value.isBefore(
-                      DateTime(
-                        DateTime.now().year,
-                        DateTime.now().month,
-                        DateTime.now().day,
-                      ),
-                    )
-                    ? DateTime(
-                        DateTime.now().year,
-                        DateTime.now().month,
-                        DateTime.now().day,
-                      )
-                    : selectedDate.value,
-
-                // 设置最小可选日期为“今天凌晨0点”
-                minimumDate: DateTime(
-                  DateTime.now().year,
-                  DateTime.now().month,
-                  DateTime.now().day,
-                ),
-                maximumDate: DateTime.now().add(const Duration(days: 365)),
+                initialDateTime: selectedDate.value,
+                minimumDate: today,
+                // 最小可选日期为今天
+                maximumDate: tomorrow,
+                // 最大可选日期为明天
+                // ---------------------
                onDateTimeChanged: (DateTime newDate) {
                  tempDate = newDate;
                },
@@ -117,69 +168,94 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    );
  }

-  void pickTime(BuildContext context, bool isStartTime) {
-    //  确定当前操作的时间和初始值
-    TimeOfDay initialTime = isStartTime ? startTime.value : endTime.value;
-    DateTime now = DateTime.now();
-
-    // 计算最小可选时间
-    DateTime? minimumDateTime; // 默认为 null，即可选任意时间
-
-    // 获取当前选择的日期（年月日）
-    final selectedDay = DateTime(
-      selectedDate.value.year,
-      selectedDate.value.month,
-      selectedDate.value.day,
-    );
-
-    // 获取今天的日期（年月日）
+  void resetTimeForSelectedDate() {
+    final now = DateTime.now();
    final today = DateTime(now.year, now.month, now.day);

-    if (isStartTime) {
-      // 如果是选择开始时间并且日期是 今天
-      if (selectedDay.isAtSameMomentAs(today)) {
-        minimumDateTime = now; // 最小可选时间就是现在
-      }
+    // 判断新选择的日期是不是今天
+    if (selectedDate.value.isAtSameMomentAs(today)) {
+      // 如果是今天，就将时间重置为当前时间所在的半小时区间
+      startTime.value = _calculateInitialStartTime(now);
+      endTime.value = TimeOfDay.fromDateTime(
+        _getDateTimeFromTimeOfDay(startTime.value).add(const Duration(minutes: 30)),
+      );
    } else {
-      // 如果是选择结束时间
-      // 将开始时间转换为 DateTime 对象
-      final startDateTime = DateTime(
+      // 如果是明天（或其他未来日期），则可以将时间重置为一天的最早可用时间，例如 00:00
+      startTime.value = const TimeOfDay(hour: 0, minute: 0);
+      endTime.value = const TimeOfDay(hour: 0, minute: 30);
+    }
+  }
+
+  ///30 分钟为间隔 时间选择器
+  void pickTime(BuildContext context) {
+    final now = DateTime.now();
+    final isToday =
+        selectedDate.value.year == now.year &&
+        selectedDate.value.month == now.month &&
+        selectedDate.value.day == now.day;
+
+    final List<TimeSlot> availableSlots = [];
+    for (int i = 0; i < 48; i++) {
+      final startMinutes = i * 30;
+      final endMinutes = startMinutes + 30;
+
+      final startTime = TimeOfDay(hour: startMinutes ~/ 60, minute: startMinutes % 60);
+      final endTime = TimeOfDay(hour: (endMinutes ~/ 60) % 24, minute: endMinutes % 60);
+
+      final slotStartDateTime = DateTime(
        selectedDate.value.year,
        selectedDate.value.month,
        selectedDate.value.day,
-        startTime.value.hour,
-        startTime.value.minute,
+        startTime.hour,
+        startTime.minute,
      );

-      // 结束时间的最小值必须晚于开始时间
-      minimumDateTime = startDateTime;
+      // 如果不是今天，所有时间段都有效
+      if (!isToday) {
+        availableSlots.add(TimeSlot(startTime, endTime));
+      } else {
+        // 如果是今天，需要判断该时间段是否可选
+        // 创建时间段的结束时间对象
+        final slotEndDateTime = DateTime(
+          selectedDate.value.year,
+          selectedDate.value.month,
+          selectedDate.value.day,
+          endTime.hour,
+          endTime.minute,
+        );

-      // 如果日期是今天，并且开始时间早于现在，那么结束时间的最小值也应该是现在
-      if (selectedDay.isAtSameMomentAs(today) && startDateTime.isBefore(now)) {
-        minimumDateTime = now;
+        // 只要时间段的结束时间晚于当前时间，这个时间段就是可预约的
+        if (slotEndDateTime.isAfter(now)) {
+          availableSlots.add(TimeSlot(startTime, endTime));
+        }
      }
    }

-    // 初始显示时间
-    DateTime initialDateTime = DateTime(
-      selectedDate.value.year,
-      selectedDate.value.month,
-      selectedDate.value.day,
-      initialTime.hour,
-      initialTime.minute,
-    );
-
-    // 确保初始时间不早于最小时间
-    if (minimumDateTime != null && initialDateTime.isBefore(minimumDateTime)) {
-      initialDateTime = minimumDateTime;
+    if (availableSlots.isEmpty) {
+      showToast('今天已没有可预约的时间段');
+      return;
    }

-    DateTime tempTime = initialDateTime;
+    int initialItem = availableSlots.indexWhere(
+      (slot) =>
+          slot.start.hour == startTime.value.hour &&
+          (startTime.value.minute < 30
+              ? slot.start.minute == 0
+              : slot.start.minute == 30),
+    );
+    if (initialItem == -1) {
+      initialItem = 0;
+    }
+
+    TimeSlot tempSlot = availableSlots[initialItem];
+
+    final FixedExtentScrollController scrollController = FixedExtentScrollController(
+      initialItem: initialItem,
+    );

    Get.bottomSheet(
      Container(
        height: 300,
-        padding: const EdgeInsets.only(top: 6.0),
        decoration: const BoxDecoration(
          color: Colors.white,
          borderRadius: BorderRadius.only(
@@ -203,60 +279,8 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
                  ),
                  CupertinoButton(
                    onPressed: () {
-                      final pickedTempTime = TimeOfDay.fromDateTime(tempTime);
-
-                      // 验证条件1：不能选择过去的时间
-                      // 这个验证只在选择【今天】的【开始时间】或【结束时间】时有意义
-                      final selectedDay = DateTime(
-                        selectedDate.value.year,
-                        selectedDate.value.month,
-                        selectedDate.value.day,
-                      );
-                      final today = DateTime(
-                        DateTime.now().year,
-                        DateTime.now().month,
-                        DateTime.now().day,
-                      );
-
-                      if (selectedDay.isAtSameMomentAs(today) &&
-                          tempTime.isBefore(DateTime.now())) {
-                        showToast('不能选择过去的时间');
-                        return; // 中断执行，不关闭弹窗
-                      }
-
-                      //结束时间必须晚于开始时间
-                      if (isStartTime) {
-                        // 已有的结束时间 比较
-                        final pickedStartInMinutes =
-                            pickedTempTime.hour * 60 + pickedTempTime.minute;
-                        final endInMinutes =
-                            endTime.value.hour * 60 + endTime.value.minute;
-
-                        if (pickedStartInMinutes >= endInMinutes) {
-                          // 整结束时间
-                          startTime.value = pickedTempTime;
-                          final newEndDateTime = tempTime.add(
-                            const Duration(minutes: 30),
-                          );
-                          endTime.value = TimeOfDay.fromDateTime(newEndDateTime);
-                        } else {
-                          //设置开始时间
-                          startTime.value = pickedTempTime;
-                        }
-                      } else {
-                        // 如果当前正在设置结束时间，我们来和已有的开始时间比较
-                        final pickedEndInMinutes =
-                            pickedTempTime.hour * 60 + pickedTempTime.minute;
-                        final startInMinutes =
-                            startTime.value.hour * 60 + startTime.value.minute;
-
-                        if (pickedEndInMinutes <= startInMinutes) {
-                          showToast('结束时间必须晚于开始时间');
-                          return; // 中断执行，不关闭弹窗
-                        } else {
-                          endTime.value = pickedTempTime;
-                        }
-                      }
+                      startTime.value = tempSlot.start;
+                      endTime.value = tempSlot.end;
                      Get.back();
                    },
                    child: const Text(
@@ -272,14 +296,15 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
            ),
            const Divider(height: 1, color: Color(0xFFE5E5E5)),
            Expanded(
-              child: CupertinoDatePicker(
-                mode: CupertinoDatePickerMode.time,
-                use24hFormat: true,
-                initialDateTime: initialDateTime,
-                minimumDate: minimumDateTime,
-                onDateTimeChanged: (DateTime newTime) {
-                  tempTime = newTime;
+              child: CupertinoPicker(
+                scrollController: scrollController,
+                itemExtent: 40.0,
+                onSelectedItemChanged: (index) {
+                  tempSlot = availableSlots[index];
                },
+                children: availableSlots
+                    .map((slot) => Center(child: Text(slot.display)))
+                    .toList(),
              ),
            ),
          ],
@@ -289,6 +314,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    );
  }

+  // 用于存储上一次成功预约的信息
+  ReservationModel? lastSuccessfulReservation;
+
  /// 提交预约
  void submitReservation() async {
    if (plateNumber.isEmpty) {
@@ -300,33 +328,62 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      showToast("请输入需要预约的氢量");
      return;
    }
+    double ampuntDouble = (double.tryParse(ampuntStr) ?? 0.0);
+    if (ampuntDouble == 0) {
+      showToast("请输入需要预约的氢量");
+      return;
+    }
+    if (ampuntDouble > (double.tryParse(difference) ?? 0.0)) {
+      showToast('当前最大可预约氢量为${difference}(KG)');
+      return;
+    }
+
    if (selectedStationId.value == null || selectedStationId.value!.isEmpty) {
      showToast("请先选择加氢站");
      return;
    }
-     // 将选择的日期和时间组合成一个完整的 DateTime 对象
-    final reservationStartDateTime = DateTime(
+
+    final dateStr = formattedDate;
+    final startTimeStr =
+        '$dateStr ${_formatTimeOfDay(startTime.value)}:00'; // Use helper directly
+
+    if (lastSuccessfulReservation != null &&
+        lastSuccessfulReservation!.id == selectedStationId.value &&
+        lastSuccessfulReservation!.startTime == startTimeStr) {
+      showToast("请勿重复提交相同时间段的预约，可在“查看预约”中修改");
+      return;
+    }
+
+    final reservationEndDateTime = DateTime(
      selectedDate.value.year,
      selectedDate.value.month,
      selectedDate.value.day,
-      startTime.value.hour,
-      startTime.value.minute,
+      endTime.value.hour,
+      endTime.value.minute,
    );

-    // 检查预约时间是否在当前时间之前
-    if (reservationStartDateTime.isBefore(DateTime.now())) {
-      showToast("不可预约过去的时间");
+    //判断预约区间的结束时间是否早于当前时间（留出1分钟缓冲）
+    if (reservationEndDateTime.isBefore(
+      DateTime.now().subtract(const Duration(minutes: 1)),
+    )) {
+      showToast("无法预约已过去的时间段");
      return;
    }
+
    try {
-      showLoading("提交中");
      final selectedStation = stationOptions.firstWhere(
        (s) => s.hydrogenId == selectedStationId.value,
      );

-      final dateStr = formattedDate; // "yyyy-MM-dd"
-      final startTimeStr = '$dateStr ${formattedStartTime}:00'; // "yyyy-MM-dd HH:mm:ss"
-      final endTimeStr = '$dateStr ${formattedEndTime}:00';
+      if (selectedStation.siteStatusName != "营运中") {
+        showToast("该站点${selectedStation.siteStatusName}，暂无法预约");
+        return;
+      }
+
+      showLoading("提交中");
+
+      final endTimeStr =
+          '$dateStr ${_formatTimeOfDay(endTime.value)}:00'; // Use helper directly

      var responseData = await HttpService.to.post(
        'appointment/orderAddHyd/saveOrUpdate',
@@ -353,8 +410,35 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      var result = BaseModel.fromJson(responseData.data);
      if (result.code == 0) {
        showSuccessToast("预约成功");
+
+        lastSuccessfulReservation = ReservationModel(
+          id: selectedStationId.value!,
+          hydAmount: ampuntStr,
+          startTime: startTimeStr,
+          endTime: endTimeStr,
+          stationName: selectedStation.name,
+          plateNumber: '',
+          amount: '',
+          time: '',
+          contactPerson: '',
+          contactPhone: '',
+          contacts: '',
+          phone: '',
+          date: '',
+          state: '',
+          stateName: '',
+          addStatus: '',
+          addStatusName: '',
+          rejectReason: '',
+          hasEdit: true,
+        );
+
+        //打开预约列表
+        Future.delayed(const Duration(milliseconds: 500), () {
+          getReservationList(showPopup: true, addStatus: '');
+        });
      } else {
-        showErrorToast(result.message);
+        showToast(result.error);
      }
    } catch (e) {
      dismissLoading();
@@ -363,29 +447,45 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
  }

  /// 状态变量：是否有预约数据
-  bool hasReservationData = false;
+  final RxBool hasReservationData = false.obs;

  // 新增预约数据列表
-  List<ReservationModel> reservationList = [];
+  final RxList<ReservationModel> reservationList = <ReservationModel>[].obs;
+  final RxBool shouldShowReservationList = false.obs;
+
+  // --- 用于防抖的 Timer ---
+  Timer? _debounce;

  //查看预约列表
-  void getReservationList() async {
+  void getReservationList({bool showPopup = false, String? addStatus}) async {
+    //  增加 addStatus 参数
+    if (_debounce?.isActive ?? false) {
+      return;
+    }
+    _debounce = Timer(const Duration(seconds: 1), () {});
+
    showLoading("加载中");

    try {
+      final Map<String, dynamic> requestData = {
+        'phone': StorageService.to.phone,
+        'pageNum': 1,
+        'pageSize': 50,
+      };
+      //  将 addStatus 参数添加到请求中
+      if (addStatus != null && addStatus.isNotEmpty) {
+        requestData['addStatus'] = addStatus;
+      }
+
      var response = await HttpService.to.post(
        "appointment/orderAddHyd/driverOrderPage",
-        data: {
-          'phone': StorageService.to.phone, // 使用从 renderData 中获取到的 name
-          'pageNum': 1,
-          'pageSize': 50, // 暂时不考虑分页，一次获取30条
-        },
+        data: requestData,
      );

      if (response == null || response.data == null) {
        showToast('暂时无法获取预约数据');
-        hasReservationData = false;
-        reservationList = [];
+        hasReservationData.value = false;
+        reservationList.clear();
        return;
      }

@@ -393,194 +493,64 @@ class C_ReservationController extends GetxController with BaseControllerMixin {

      if (baseModel.code == 0 && baseModel.data != null) {
        final dataMap = baseModel.data as Map<String, dynamic>;
-        final List<dynamic> listFromServer = dataMap['list'] ?? [];
-        reservationList = listFromServer.map((item) {
+        final List<dynamic> listFromServer = dataMap['records'] ?? [];
+
+        // 使用 .value 来更新响应式列表
+        reservationList.value = listFromServer.map((item) {
          return ReservationModel.fromJson(item as Map<String, dynamic>);
        }).toList();

-        // 根据列表是否为空来更新 hasReservationData 状态
-        hasReservationData = reservationList.isNotEmpty;
+        // 更新 hasEdit 状态
+        for (var reservation in reservationList) {
+          try {
+            // 获取当前时间和预约的结束时间
+            final now = DateTime.now();
+            final endDateTime = DateTime.parse(reservation.endTime);
+
+            // 如果当前时间在结束时间之后，则不能编辑
+            if (now.isAfter(endDateTime) ||
+                plateNumber.isEmpty ||
+                reservation.addStatus != "0") {
+              reservation.hasEdit = false;
+            } else {
+              reservation.hasEdit = true;
+            }
+          } catch (e) {
+            reservation.hasEdit = false;
+          }
+        }
+
+        hasReservationData.value = reservationList.isNotEmpty;
+
+        if (showPopup) {
+          shouldShowReservationList.value = true;
+        }
      } else {
        showToast(baseModel.message);
-        hasReservationData = false;
-        reservationList = []; // 清空列表
+        hasReservationData.value = false;
+        reservationList.clear();
      }
    } catch (e) {
      showToast('获取预约数据失败');
-      hasReservationData = false;
-      reservationList = []; // 清空列表
+      hasReservationData.value = false;
+      reservationList.clear();
    } finally {
      dismissLoading();
    }
-
-    Get.bottomSheet(
-      Container(
-        height: Get.height * 0.55,
-        decoration: const BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.only(
-            topLeft: Radius.circular(16),
-            topRight: Radius.circular(16),
-          ),
-        ),
-        child: Column(
-          children: [
-            //标题
-            Container(
-              padding: const EdgeInsets.fromLTRB(20, 15, 20, 15),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  const Text(
-                    '我的预约',
-                    style: TextStyle(
-                      fontSize: 15,
-                      fontWeight: FontWeight.bold,
-                      color: Colors.black87,
-                    ),
-                  ),
-                  ElevatedButton(
-                    onPressed: () => Get.back(),
-                    style: ElevatedButton.styleFrom(
-                      elevation: 0,
-                      backgroundColor: Colors.grey[200],
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(5),
-                      ),
-                    ),
-                    child: const Text('关闭', style: TextStyle(color: Colors.black54)),
-                  ),
-                ],
-              ),
-            ),
-            const Divider(height: 1),
-            Expanded(
-              child: !hasReservationData
-                  ? Container(
-                      margin: EdgeInsets.only(top: 40),
-                      child: TextX.bodyLarge('暂无预约', weight: FontWeight.w500),
-                    )
-                  : ListView.builder(
-                      padding: const EdgeInsets.all(16),
-                      itemCount: reservationList.length,
-                      itemBuilder: (context, index) {
-                        final ReservationModel reservation = reservationList[index];
-                        return Card(
-                          color: Colors.white,
-                          margin: const EdgeInsets.only(bottom: 12.0),
-                          elevation: 1,
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(12),
-                          ),
-                          child: Padding(
-                            padding: EdgeInsets.all(10),
-                            child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    Container(
-                                      padding: const EdgeInsets.symmetric(
-                                        horizontal: 10,
-                                        vertical: 5,
-                                      ),
-                                      decoration: BoxDecoration(
-                                        color: const Color(
-                                          0xFFE6F7FF,
-                                        ), // Light blue background
-                                        borderRadius: BorderRadius.circular(4),
-                                        border: Border.all(
-                                          color: const Color(0xFF91D5FF),
-                                        ), // Blue border
-                                      ),
-                                      child: Text(
-                                        reservation.stateName,
-                                        style: const TextStyle(
-                                          color: Color(0xFF1890FF),
-                                          fontWeight: FontWeight.bold,
-                                        ),
-                                      ),
-                                    ),
-                                    Container(
-                                      padding: const EdgeInsets.symmetric(
-                                        horizontal: 12,
-                                        vertical: 4,
-                                      ),
-                                      decoration: BoxDecoration(
-                                        color: const Color(
-                                          0xFFFFF7E6,
-                                        ), // Light orange background
-                                        borderRadius: BorderRadius.circular(12),
-                                      ),
-                                      child: Text(
-                                        reservation.addStatusName,
-                                        style: const TextStyle(
-                                          color: Color(0xFFFA8C16),
-                                          fontWeight: FontWeight.bold,
-                                          fontSize: 12,
-                                        ),
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                                const SizedBox(height: 12),
-                                _buildDetailRow('车牌号:', reservation.plateNumber),
-                                _buildDetailRow('预约日期:', reservation.date),
-                                _buildDetailRow('预约氢量:', reservation.hydAmount),
-                                _buildDetailRow('加氢站:', reservation.stationName),
-                                _buildDetailRow('开始时间:', reservation.startTime),
-                                _buildDetailRow('结束时间:', reservation.endTime),
-                                _buildDetailRow('联系人:', reservation.contacts),
-                                _buildDetailRow('联系电话:', reservation.phone),
-                              ],
-                            ),
-                          ),
-                        );
-                      },
-                    ),
-            ),
-          ],
-        ),
-      ),
-      isScrollControlled: true,
-      backgroundColor:
-          Colors.transparent, // Make background transparent to see the rounded corners
-    );
  }

-  Widget _buildDetailRow(String label, String value) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 6.0),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          SizedBox(
-            width: 85,
-            child: Text(label, style: TextStyle(color: Colors.grey[600], fontSize: 14)),
-          ),
-          Expanded(
-            child: Text(
-              value,
-              style: const TextStyle(
-                fontWeight: FontWeight.w500,
-                fontSize: 14,
-                color: Colors.black87,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  String leftHydrogen = "0";
  String workEfficiency = "0";
  String fillingWeight = "0";
  String fillingTimes = "0";
  String plateNumber = "";
  String vin = "";
+  String leftHydrogen = "0";
+  num maxHydrogen = 0;
+  String difference = "";
+
+  //用来管理查看预约的弹窗
+  Worker? _sheetWorker;
+  bool init = false;

  @override
  bool get listenLifecycleEvent => true;
@@ -590,6 +560,32 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    super.onInit();
    getUserBindCarInfo();
    getSiteList();
+
+    if (!init) {
+      _setupListener();
+      init = true;
+    }
+  }
+
+  @override
+  void dispose() {
+    _sheetWorker?.dispose();
+    super.dispose();
+  }
+
+  void _setupListener() {
+    _sheetWorker = ever(shouldShowReservationList, (bool shouldShow) {
+      if (shouldShow) {
+        Get.bottomSheet(
+          const ReservationListBottomSheet(),
+          isScrollControlled: true, // 允许弹窗使用更多屏幕高度
+          backgroundColor: Colors.transparent,
+        );
+
+        // 重要：显示后立即将信号重置为 false，防止不必要的重复弹出
+        shouldShowReservationList.value = false;
+      }
+    });
  }

  void getUserBindCarInfo() {
@@ -601,11 +597,20 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      plateNumber = bean.plateNumber;
      vin = bean.vin;
      plateNumberController = TextEditingController(text: plateNumber);
+      maxHydrogen = bean.maxHydrogen;
      getCatinfo();
      getJqinfo();
    }
  }

+  void doQrCode() async {
+    var scanResult = await Get.to(() => const QrCodePage());
+    if (scanResult == true) {
+      getUserBindCarInfo();
+      refreshAppui();
+    }
+  }
+
  void getJqinfo() async {
    try {
      HttpService.to.setBaseUrl(AppTheme.test_service_url);
@@ -651,6 +656,14 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      leftHydrogen = result.data["leftHydrogen"].toString();
      workEfficiency = result.data["workEfficiency"].toString();

+      final leftHydrogenNum = double.tryParse(leftHydrogen) ?? 0.0;
+      difference = (maxHydrogen - leftHydrogenNum).toStringAsFixed(2);
+
+      int flooredDifference = (maxHydrogen - leftHydrogenNum).floor();
+      if (flooredDifference > 0) {
+        amountController.text = flooredDifference.toString();
+      }
+
      updateUi();
    } catch (e) {
    } finally {
@@ -659,7 +672,28 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
  }

  void getSiteList() async {
-    showLoading("加载中");
+    if (StorageService.to.phone == "13344444444") {
+      //该账号给stationOptions手动添加一个数据
+      final testStation = StationModel(
+        hydrogenId: '1142167389150920704',
+        name: '演示加氢站',
+        address: '上海市嘉定区于田南路111号于田大厦',
+        price: '35.00',
+        // 价格
+        siteStatusName: '营运中',
+        // 状态
+        isSelect: 1, // 默认可选
+      );
+      //    使用 assignAll 可以确保列表只包含这个测试数据
+      stationOptions.assignAll([testStation]);
+
+      if (stationOptions.isNotEmpty) {
+        selectedStationId.value = stationOptions.first.hydrogenId;
+      }
+      return;
+    }
+
+    showLoading("加氢站数据加载中");
    final originalHeaders = Map<String, dynamic>.from(HttpService.to.dio.options.headers);
    try {
      HttpService.to.setBaseUrl(AppTheme.jiaqing_service_url);
@@ -672,41 +706,68 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
        dismissLoading();
        return;
      }
+      dismissLoading();
+      var result = BaseModel.fromJson(responseData.data);
+      var stationDataList = result.data['data'] as List;

-      try {
-        dismissLoading();
-        var result = BaseModel.fromJson(responseData.data);
-        var stationDataList = result.data['data'] as List;
+      // 使用 map 将 List<dynamic> 转换为 List<StationModel>
+      var stations = stationDataList
+          .map((item) => StationModel.fromJson(item as Map<String, dynamic>))
+          .toList();

-        // 使用 map 将 List<dynamic> 转换为 List<StationModel>
-        var stations = stationDataList
-            .map((item) => StationModel.fromJson(item as Map<String, dynamic>))
-            .toList();
+      // 去重，确保每个 hydrogenId 唯一
+      var uniqueStationsMap = <String, StationModel>{}; // 使用 Map 来去重
+      for (var station in stations) {
+        uniqueStationsMap[station.hydrogenId] = station; // 使用 hydrogenId 作为键，确保唯一
+      }

-        // 去重，确保每个 hydrogenId 唯一
-        var uniqueStationsMap = <String, StationModel>{}; // 使用 Map 来去重
-        for (var station in stations) {
-          uniqueStationsMap[station.hydrogenId] = station; // 使用 hydrogenId 作为键，确保唯一
-        }
+      // 获取去重后的 List<StationModel>
+      var uniqueStations = uniqueStationsMap.values.toList();

-        // 获取去重后的 List<StationModel>
-        var uniqueStations = uniqueStationsMap.values.toList();
+      stationOptions.assignAll(uniqueStations);

-        stationOptions.assignAll(uniqueStations);
+      if (stationOptions.isEmpty) {
+        showToast('附近暂无可用加氢站');
+      } else {
+        showToast('站点列表已刷新');
+      }

-        if (stationOptions.isEmpty) {
-          showToast('附近暂无可用加氢站');
-        } else {
-          showToast('站点列表已刷新');
-        }
-      } catch (e) {
-        showToast('数据异常');
+      // 找到第一个可选的站点作为默认值
+      if (stationOptions.isNotEmpty) {
+        final firstSelectable = stationOptions.firstWhere(
+          (station) => station.isSelect == 1,
+          orElse: () => stationOptions.first, // 降级：如果没有可选的，就用第一个
+        );
+        selectedStationId.value = firstSelectable.hydrogenId;
+      } else {
+        // 如果列表为空，确保 selectedStationId 也为空
+        selectedStationId.value = null;
      }
    } catch (e) {
+      dismissLoading();
+      showToast('数据异常');
    } finally {
      dismissLoading();
      HttpService.to.setBaseUrl(AppTheme.test_service_url);
      HttpService.to.dio.options.headers = originalHeaders;
+
+      // 如果未绑定车辆，且本次会话尚未提示过，则弹出提示
+      if (!StorageService.to.hasShownBindVehicleDialog &&
+          StorageService.to.isLoggedIn &&
+          !StorageService.to.hasVehicleInfo) {
+        Future.delayed(const Duration(milliseconds: 500), () {
+          DialogX.to.showConfirmDialog(
+            title: '当前尚未绑定车辆',
+            confirmText: "去绑定",
+            cancelText: "稍后",
+            onConfirm: () {
+              doQrCode();
+            },
+          );
+          // 标记为已显示，本次会话不再提示
+          StorageService.to.markBindVehicleDialogAsShown();
+        });
+      }
    }
  }

@@ -720,6 +781,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
  void onClose() {
    amountController.dispose();
    plateNumberController.dispose();
+    if (_debounce != null) {
+      _debounce?.cancel();
+    }
    super.onClose();
  }
 }
--- a/ln_jq_app/lib/pages/c_page/reservation/reservation_list_bottomsheet.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/reservation_list_bottomsheet.dart
@@ -0,0 +1,245 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/common/index.dart';
+import 'package:ln_jq_app/pages/c_page/reservation/controller.dart';
+import 'package:ln_jq_app/pages/c_page/reservation_edit/controller.dart';
+import 'package:ln_jq_app/pages/c_page/reservation_edit/view.dart';
+
+//加氢预约列表
+class ReservationListBottomSheet extends StatefulWidget {
+  const ReservationListBottomSheet({super.key});
+
+  @override
+  State<ReservationListBottomSheet> createState() => _ReservationListBottomSheetState();
+}
+
+class _ReservationListBottomSheetState extends State<ReservationListBottomSheet> {
+  final C_ReservationController _controller = Get.find<C_ReservationController>();
+
+  final Map<String, String> _statusOptions = {
+    '': '所有状态', // 增加一个“所有状态”的选项
+    '0': '待加氢',
+    '1': '加氢完成',
+    '2': '未加氢',
+    '5': '拒绝加氢',
+  };
+  String _selectedStatus = ''; // 默认选中 '0' (待加氢)
+
+  @override
+  void initState() {
+    super.initState();
+    //  Widget 初始化时，立即调用接口加载默认状态（待加氢）的数据
+    _controller.getReservationList(addStatus: _selectedStatus);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: Get.height * 0.55,
+      decoration: const BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.only(
+          topLeft: Radius.circular(16),
+          topRight: Radius.circular(16),
+        ),
+      ),
+      child: Column(
+        children: [
+          // 构建标题和下拉框
+          _buildHeader(),
+          const Divider(height: 1),
+          // 下拉筛选框
+          _buildChoice(),
+          //  构建列表（使用 Obx 监听数据变化）
+          _buildList(),
+        ],
+      ),
+    );
+  }
+
+  Container _buildChoice() {
+    return Container(
+          padding: const EdgeInsets.fromLTRB(20, 8, 0, 0),
+          alignment: AlignmentGeometry.centerLeft,
+          child: Container(
+            padding: const EdgeInsets.symmetric(horizontal: 8),
+            decoration: BoxDecoration(
+              color: Colors.grey[100],
+              borderRadius: BorderRadius.circular(8),
+            ),
+            child: DropdownButton<String>(
+              value: _selectedStatus,
+              underline: const SizedBox.shrink(), // 隐藏下划线
+              items: _statusOptions.entries.map((entry) {
+                return DropdownMenuItem<String>(
+                  value: entry.key,
+                  child: Text(entry.value),
+                );
+              }).toList(),
+              onChanged: (newValue) {
+                if (newValue != null) {
+                  setState(() {
+                    _selectedStatus = newValue;
+                  });
+                  // 当选择新状态时，调用接口刷新数据
+                  _controller.getReservationList(addStatus: _selectedStatus);
+                }
+              },
+            ),
+          ),
+        );
+  }
+
+  /// 构建标题、关闭按钮和下拉筛选框
+  Widget _buildHeader() {
+    return Container(
+      padding: const EdgeInsets.fromLTRB(20, 8, 8, 8),
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          Center(child: const Text('我的预约', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),),
+          Align(
+            alignment: Alignment.centerRight,
+            child: ElevatedButton(
+              onPressed: () => Get.back(),
+              style: ElevatedButton.styleFrom(
+                elevation: 0,
+                backgroundColor: Colors.grey[200],
+                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
+              ),
+              child: const Text('关闭', style: TextStyle(color: Colors.black54)),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// 构建预约列表
+  Widget _buildList() {
+    return Expanded(
+      child: Obx(() {
+        if (!_controller.hasReservationData.value) {
+          return Container(
+            margin: const EdgeInsets.only(top: 40),
+            child: TextX.bodyLarge('暂无该状态下的预约', weight: FontWeight.w500),
+          );
+        }
+        return ListView.builder(
+          padding: const EdgeInsets.all(16),
+          itemCount: _controller.reservationList.length,
+          itemBuilder: (context, index) {
+            final reservation = _controller.reservationList[index];
+            return Card(
+              color: Colors.white,
+              margin: const EdgeInsets.only(bottom: 12.0),
+              elevation: 1,
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+              child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        // 状态标签
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 10,
+                            vertical: 5,
+                          ),
+                          decoration: BoxDecoration(
+                            color: const Color(0xFFE6F7FF),
+                            borderRadius: BorderRadius.circular(4),
+                            border: Border.all(color: const Color(0xFF91D5FF)),
+                          ),
+                          child: Text(
+                            "${reservation.stateName}-${reservation.addStatusName}",
+                            style: const TextStyle(
+                              color: Color(0xFF1890FF),
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ),
+                        // 修改按钮 (仅在 hasEdit 为 true 时显示)
+                        if (reservation.hasEdit)
+                          GestureDetector(
+                            onTap: () async {
+                              var result = await Get.to(
+                                () => ReservationEditPage(),
+                                arguments: {
+                                  'reservation': reservation,
+                                  'difference': _controller.difference,
+                                },
+                                binding: BindingsBuilder(() {
+                                  Get.put(ReservationEditController());
+                                }),
+                                preventDuplicates: false,
+                              );
+                              if (result == true) {
+                                _controller.getReservationList(
+                                  addStatus: _selectedStatus,
+                                );
+                              }
+                            },
+                            child: Container(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 12,
+                                vertical: 4,
+                              ),
+                              decoration: BoxDecoration(
+                                color: const Color(0xFFFFF7E6),
+                                borderRadius: BorderRadius.circular(12),
+                              ),
+                              child: const Text(
+                                "修改",
+                                style: TextStyle(
+                                  color: Color(0xFFFA8C16),
+                                  fontWeight: FontWeight.bold,
+                                  fontSize: 14,
+                                ),
+                              ),
+                            ),
+                          ),
+                      ],
+                    ),
+                    const SizedBox(height: 12),
+                    _buildDetailRow('车牌号:', reservation.plateNumber),
+                    _buildDetailRow('预约日期:', reservation.date),
+                    _buildDetailRow('预约氢量:', reservation.hydAmount),
+                    _buildDetailRow('加氢站:', reservation.stationName),
+                    _buildDetailRow('开始时间:', reservation.startTime),
+                    _buildDetailRow('结束时间:', reservation.endTime),
+                    _buildDetailRow('联系人:', reservation.contacts),
+                    _buildDetailRow('联系电话:', reservation.phone),
+                    reservation.addStatus == "5"
+                        ? _buildDetailRow('拒绝原因:', reservation.rejectReason)
+                        : SizedBox(),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      }),
+    );
+  }
+
+  /// 构建详情行 (这是一个辅助Widget)
+  Widget _buildDetailRow(String label, String value) {
+    return Padding(
+      padding: const EdgeInsets.only(top: 8.0),
+      child: Row(
+        children: [
+          Text(label, style: const TextStyle(color: Colors.grey)),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Text(value, style: const TextStyle(fontWeight: FontWeight.w500)),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/reservation/view.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/view.dart
@@ -7,10 +7,13 @@ import 'package:ln_jq_app/pages/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';

 import 'controller.dart';
+import 'reservation_list_bottomsheet.dart';

 ///加氢预约
 class ReservationPage extends GetView<C_ReservationController> {
-  const ReservationPage({super.key});
+  ReservationPage({super.key});
+
+

  @override
  Widget build(BuildContext context) {
@@ -18,6 +21,7 @@ class ReservationPage extends GetView<C_ReservationController> {
      init: C_ReservationController(),
      id: 'reservation',
      builder: (_) {
+
        return Scaffold(
          backgroundColor: Colors.grey[100],
          body: GestureDetector(
@@ -201,12 +205,7 @@ class ReservationPage extends GetView<C_ReservationController> {
        isButton
            ? GestureDetector(
                onTap: () async {
-                  //判断是否绑定成功
-                  var scanResult = await Get.to(() => const QrCodePage());
-                  if (scanResult == true) {
-                    controller.getUserBindCarInfo();
-                    refreshAppui();
-                  }
+                  controller.doQrCode();
                },
                child: Container(
                  margin: EdgeInsetsGeometry.only(left: 10.w),
@@ -263,21 +262,15 @@ class ReservationPage extends GetView<C_ReservationController> {
                onTap: () => controller.pickDate(context),
              ),
              _buildPickerRow(
-                label: '开始时间',
-                value: controller.formattedStartTime,
+                label: '预约时间',
+                value: controller.formattedTimeSlot,
                icon: Icons.access_time_outlined,
-                onTap: () => controller.pickTime(context, true),
-              ),
-              _buildPickerRow(
-                label: '结束时间',
-                value: controller.formattedEndTime,
-                icon: Icons.access_time_outlined,
-                onTap: () => controller.pickTime(context, false),
+                onTap: () => controller.pickTime(context),
              ),
              _buildTextField(
-                label: '预约氢量(kg)',
+                label: '预约氢量(KG)',
                controller: controller.amountController,
-                hint: '请输入氢量(kg)',
+                hint: '当前最大可预约氢量${controller.difference}(KG)',
                keyboardType: TextInputType.number,
              ),
              _buildTextField(
@@ -310,7 +303,9 @@ class ReservationPage extends GetView<C_ReservationController> {
                  const SizedBox(width: 16),
                  Expanded(
                    child: OutlinedButton(
-                      onPressed: controller.getReservationList,
+                      onPressed: () {
+                        controller.getReservationList(showPopup: true, addStatus: '');
+                      },
                      style: OutlinedButton.styleFrom(
                        minimumSize: const Size(double.infinity, 38), // 高度与另一个按钮保持一致
                        side: const BorderSide(color: Colors.blue),
@@ -337,6 +332,8 @@ class ReservationPage extends GetView<C_ReservationController> {
    );
  }

+
+
  // 表单中的可点击行 (用于日期和时间选择)
  Widget _buildPickerRow({
    required String label,
@@ -443,24 +440,45 @@ class ReservationPage extends GetView<C_ReservationController> {
                  .map(
                    (station) => DropdownMenuItem<String>(
                      value: station.hydrogenId, // value 是站点的唯一ID
+                      enabled: station.isSelect == 1,
                      child: _buildDropdownItem(station), // child 是自定义的 Widget
                    ),
                  )
                  .toList(),
-              value: controller.selectedStationId.value,
+              value:
+                  // 当前的站点 处理默认
+                  controller.selectedStationId.value ??
+                  (controller.stationOptions.isNotEmpty
+                      ? controller.stationOptions.first.hydrogenId
+                      : null),
              // 当前选中的是站点ID
              onChanged: (value) {
                if (value != null) {
                  controller.selectedStationId.value = value;
                }
              },
-              customButton: controller.selectedStationId.value == null
-                  ? null // 未选择时，显示默认的 hint
-                  : _buildSelectedStationButton(
-                      controller.stationOptions.firstWhere(
-                        (s) => s.hydrogenId == controller.selectedStationId.value,
-                      ),
-                    ),
+              customButton: Obx(() {
+                // 优先从已选中的 ID 查找
+                var selectedStation = controller.stationOptions.firstWhereOrNull(
+                  (s) => s.hydrogenId == controller.selectedStationId.value,
+                );
+
+                // 如果找不到已选中的（比如 ID 为空或列表里没有），并且列表不为空，则取第一个作为默认
+                final stationToShow =
+                    selectedStation ??
+                    (controller.stationOptions.isNotEmpty
+                        ? controller.stationOptions.first
+                        : null);
+
+                // 如果有要显示的站点，就构建按钮
+                if (stationToShow != null) {
+                  return _buildSelectedStationButton(stationToShow);
+                }
+
+                // 否则，返回一个空占位符，让 hint 生效
+                // DropdownButton2 内部会判断，如果 customButton 返回的不是一个有效Widget（或根据其内部逻辑），就会显示 hint
+                return const SizedBox.shrink();
+              }),
              buttonStyleData: ButtonStyleData(
                height: 40, // 增加高度以容纳两行文字
                padding: const EdgeInsets.symmetric(horizontal: 12.0),
@@ -489,7 +507,10 @@ class ReservationPage extends GetView<C_ReservationController> {

  /// 构建下拉菜单中的每一项
  Widget _buildDropdownItem(StationModel station) {
-    bool isMaintenance = (station.siteStatusName != '营运中');
+    bool isSelectable = (station.isSelect == 1);
+    //营运并且可用
+    bool isMaintenance = ((station.siteStatusName != '营运中') && isSelectable);
+    final textColor = isSelectable ? Colors.black : Colors.grey;
    return Padding(
      padding: const EdgeInsets.symmetric(vertical: 8.0),
      child: Row(
@@ -506,14 +527,22 @@ class ReservationPage extends GetView<C_ReservationController> {
                    Flexible(
                      child: Text(
                        station.name,
-                        style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
+                        style: TextStyle(
+                          color: textColor,
+                          fontSize: 14,
+                          fontWeight: FontWeight.w500,
+                        ),
                        overflow: TextOverflow.ellipsis,
                        maxLines: 1,
                      ),
                    ),
                    Text(
                      ' | ¥${station.price}/kg',
-                      style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
+                      style: TextStyle(
+                        color: textColor,
+                        fontSize: 14,
+                        fontWeight: FontWeight.w500,
+                      ),
                    ),
                    if (isMaintenance) const SizedBox(width: 8),
                    if (isMaintenance)
--- a/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart
@@ -0,0 +1,253 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:intl/intl.dart';
+import 'package:ln_jq_app/common/model/base_model.dart';
+import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // For ReservationModel
+import 'package:ln_jq_app/common/styles/theme.dart';
+
+class TimeSlot {
+  final TimeOfDay start;
+  final TimeOfDay end;
+
+  TimeSlot(this.start, this.end);
+
+  String get display {
+    final startStr =
+        '${start.hour.toString().padLeft(2, '0')}:${start.minute.toString().padLeft(2, '0')}';
+    final endStr =
+        '${end.hour.toString().padLeft(2, '0')}:${end.minute.toString().padLeft(2, '0')}';
+    return '$startStr - $endStr';
+  }
+}
+
+class ReservationEditController extends GetxController with BaseControllerMixin {
+  late final ReservationModel reservation;
+  late final String difference;
+
+  // --- State Variables ---
+  final Rx<DateTime> selectedDate = DateTime.now().obs;
+  final Rx<TimeOfDay> startTime = TimeOfDay.now().obs;
+  final Rx<TimeOfDay> endTime = TimeOfDay.now().obs;
+  final TextEditingController amountController = TextEditingController();
+
+  // --- Getters for UI display ---
+  String get formattedTimeSlot =>
+      '${_formatTimeOfDay(startTime.value)} - ${_formatTimeOfDay(endTime.value)}';
+
+  @override
+  void onInit() {
+    super.onInit();
+    // Expect a Map containing both the reservation and the difference
+    final args = Get.arguments as Map<String, dynamic>;
+    reservation = args['reservation'] as ReservationModel;
+    difference = args['difference'] as String? ?? '0';
+
+    try {
+      // Initialize the UI with the data from the passed reservation object
+      selectedDate.value = DateFormat('yyyy-MM-dd').parse(reservation.date);
+
+      final startDateTime = DateFormat(
+        'yyyy-MM-dd HH:mm:ss',
+      ).parse(reservation.startTime);
+      startTime.value = TimeOfDay.fromDateTime(startDateTime);
+
+      final endDateTime = DateFormat('yyyy-MM-dd HH:mm:ss').parse(reservation.endTime);
+      endTime.value = TimeOfDay.fromDateTime(endDateTime);
+
+      amountController.text = reservation.hydAmount.replaceAll('kg', '');
+    } catch (e) {
+      showErrorToast("加载预约数据时出错");
+      Get.back(); // Go back if data is invalid
+    }
+  }
+
+  @override
+  void onClose() {
+    amountController.dispose();
+    super.onClose();
+  }
+
+  /// Reusable time slot picker logic, copied from the reservation creation page.
+  void pickTime(BuildContext context) {
+    final now = DateTime.now();
+    final isToday =
+        selectedDate.value.year == now.year &&
+        selectedDate.value.month == now.month &&
+        selectedDate.value.day == now.day;
+
+    final List<TimeSlot> availableSlots = [];
+    for (int i = 0; i < 48; i++) {
+      final startMinutes = i * 30;
+      final endMinutes = startMinutes + 30;
+      final slotStartTime = TimeOfDay(
+        hour: startMinutes ~/ 60,
+        minute: startMinutes % 60,
+      );
+      final slotEndTime = TimeOfDay(
+        hour: (endMinutes ~/ 60) % 24,
+        minute: endMinutes % 60,
+      );
+
+      final slotStartDateTime = DateTime(
+        selectedDate.value.year,
+        selectedDate.value.month,
+        selectedDate.value.day,
+        slotStartTime.hour,
+        slotStartTime.minute,
+      );
+
+      if (!isToday || slotStartDateTime.isAfter(now)) {
+        availableSlots.add(TimeSlot(slotStartTime, slotEndTime));
+      }
+    }
+
+    if (availableSlots.isEmpty) {
+      showToast('今天已没有可预约的时间段');
+      return;
+    }
+
+    int initialItem = availableSlots.indexWhere(
+      (slot) =>
+          slot.start.hour == startTime.value.hour &&
+          (startTime.value.minute < 30
+              ? slot.start.minute == 0
+              : slot.start.minute == 30),
+    );
+    if (initialItem == -1) initialItem = 0;
+
+    TimeSlot tempSlot = availableSlots[initialItem];
+
+    Get.bottomSheet(
+      Container(
+        height: 300,
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.only(
+            topLeft: Radius.circular(16),
+            topRight: Radius.circular(16),
+          ),
+        ),
+        child: Column(
+          children: [
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  CupertinoButton(
+                    onPressed: () {
+                      if (Get.isBottomSheetOpen ?? false) {
+                        Navigator.of(Get.overlayContext!).pop(); // 更加安全的关闭当前弹窗的方式
+                      }
+                    },
+                    child: const Text(
+                      '取消',
+                      style: TextStyle(color: CupertinoColors.systemGrey),
+                    ),
+                  ),
+                  CupertinoButton(
+                    onPressed: () {
+                      startTime.value = tempSlot.start;
+                      endTime.value = tempSlot.end;
+                      if (Get.isBottomSheetOpen ?? false) {
+                        Navigator.of(Get.overlayContext!).pop(); // 更加安全的关闭当前弹窗的方式
+                      }
+                    },
+                    child: const Text(
+                      '确认',
+                      style: TextStyle(
+                        color: AppTheme.themeColor,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            const Divider(height: 1, color: Color(0xFFE5E5E5)),
+            Expanded(
+              child: CupertinoPicker(
+                scrollController: FixedExtentScrollController(initialItem: initialItem),
+                itemExtent: 40.0,
+                onSelectedItemChanged: (index) {
+                  tempSlot = availableSlots[index];
+                },
+                children: availableSlots
+                    .map((slot) => Center(child: Text(slot.display)))
+                    .toList(),
+              ),
+            ),
+          ],
+        ),
+      ),
+      backgroundColor: Colors.transparent,
+    );
+  }
+
+  /// This function will be called when the 'Save Changes' button is pressed.
+  void updateReservation() async {
+    String amountStr = amountController.text.toString();
+    if (amountStr.isEmpty) {
+      showToast("请输入需要预约的氢量");
+      return;
+    }
+    double amountDouble = (double.tryParse(amountStr) ?? 0.0);
+    if (amountDouble <= 0) {
+      showToast("预约氢量必须大于0");
+      return;
+    }
+    if (amountDouble > (double.tryParse(difference) ?? 0.0)) {
+      showToast('当前最大可预约氢量为$difference(KG)');
+      return;
+    }
+
+    showLoading("正在保存修改...");
+
+    final dateStr = DateFormat('yyyy-MM-dd').format(selectedDate.value);
+    final startTimeStr = '$dateStr ${_formatTimeOfDay(startTime.value)}:00';
+    final endTimeStr = '$dateStr ${_formatTimeOfDay(endTime.value)}:00';
+
+    try {
+      var responseData = await HttpService.to.post(
+        'appointment/orderAddHyd/saveOrUpdate',
+        data: {
+          'id': reservation.id,
+          'startTime': startTimeStr,
+          'endTime': endTimeStr,
+          'hydAmount': amountStr,
+        },
+      );
+
+      if (responseData == null || responseData.data == null) {
+        showToast('服务暂不可用，请稍后');
+        dismissLoading();
+        return;
+      }
+
+      var result = BaseModel.fromJson(responseData.data);
+
+      if (result.code == 0) {
+        showSuccessToast("修改成功");
+        //弹窗刷新数据
+        Get.back(result: true);
+      } else {
+        showToast(result.error);
+      }
+    } catch (e) {
+      showErrorToast("保存失败，请稍后再试");
+    } finally {
+      dismissLoading();
+    }
+  }
+
+  String _formatTimeOfDay(TimeOfDay time) {
+    final hour = time.hour.toString().padLeft(2, '0');
+    final minute = time.minute.toString().padLeft(2, '0');
+    return '$hour:$minute';
+  }
+
+  @override
+  String get builderId => "reservationeditpage";
+}
--- a/ln_jq_app/lib/pages/c_page/reservation_edit/view.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation_edit/view.dart
@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import 'controller.dart';
+
+class ReservationEditPage extends GetView<ReservationEditController> {
+  const ReservationEditPage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder(
+      init: ReservationEditController(),
+      id: 'reservationeditpage',
+      builder: (_) {
+        return Scaffold(
+          appBar: AppBar(title: const Text('修改预约'), centerTitle: true),
+          body: SingleChildScrollView(
+            padding: const EdgeInsets.all(16.0),
+            child: Card(
+              elevation: 2,
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Obx(
+                  () => Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      _buildPickerRow(
+                        label: '预约时间',
+                        value: controller.formattedTimeSlot,
+                        icon: Icons.access_time_outlined,
+                        onTap: () => controller.pickTime(context),
+                      ),
+                      _buildTextField(
+                        label: '预约氢量(KG)',
+                        controller: controller.amountController,
+                        // Use Obx to make the hint text responsive if needed, though here it's static.
+                        hint: '当前最大可预约氢量${controller.difference}(KG)',
+                        keyboardType: TextInputType.number,
+                      ),
+                      const SizedBox(height: 24),
+                      ElevatedButton(
+                        onPressed: controller.updateReservation,
+                        style: ElevatedButton.styleFrom(
+                          minimumSize: const Size(double.infinity, 48),
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(24),
+                          ),
+                        ),
+                        child: const Text(
+                          '保存修改',
+                          style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildPickerRow({
+    required String label,
+    required String value,
+    required IconData icon,
+    required VoidCallback onTap,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 12.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(label, style: TextStyle(color: Colors.grey[600], fontSize: 14)),
+          const SizedBox(height: 8),
+          InkWell(
+            onTap: onTap,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
+              decoration: BoxDecoration(
+                border: Border.all(color: Colors.grey[400]!),
+                borderRadius: BorderRadius.circular(8),
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Text(value, style: const TextStyle(fontSize: 16)),
+                  Icon(icon, color: Colors.grey, size: 20),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildTextField({
+    required String label,
+    required TextEditingController controller,
+    required String hint,
+    TextInputType? keyboardType,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 12.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(label, style: TextStyle(color: Colors.grey[600], fontSize: 14)),
+          const SizedBox(height: 8),
+          TextFormField(
+            controller: controller,
+            keyboardType: keyboardType,
+            decoration: InputDecoration(
+              hintText: hint,
+              border: OutlineInputBorder(borderRadius: BorderRadius.circular(8.0)),
+              contentPadding: const EdgeInsets.symmetric(horizontal: 12.0),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/ln_jq_app/lib/pages/login/view.dart
+++ b/ln_jq_app/lib/pages/login/view.dart
@@ -2,6 +2,7 @@ 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/model/base_model.dart';
+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';
@@ -174,8 +175,16 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
                      showToast('登录失败：无法获取凭证');
                      return;
                    }
+                    //登录信息处理
                    try {
                      var result = BaseModel.fromJson(responseData.data);
+
+                      if (result.code != 0) {
+                        showToast(result.error);
+                        dismissLoading();
+                        return;
+                      }
+
                      String token = result.data['token'] ?? '';
                      String idCard = result.data['idCard'] ?? '';
                      String name = result.data['name'] ?? '';
@@ -188,6 +197,22 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
                        name: name,
                        phone: phone,
                      );
+
+                      //登录后查询已绑定车辆信息
+                      var carInfo = await HttpService.to.get(
+                          "appointment/driver/getTruckInfoByDriver?phone=$phone"
+                      );
+                      if (carInfo != null) {
+                        var carInforesult = BaseModel.fromJson(carInfo.data);
+                        if (carInforesult.data != null) {
+                          final vehicle = VehicleInfo.fromJson(carInforesult.data as Map<String, dynamic>);
+                          //保存使用
+                          await StorageService.to.saveVehicleInfo(vehicle);
+                        }
+                      }
+
+
+                      //页面操作
                      dismissLoading();
                      showToast('登录成功，欢迎您');
                      Get.offAll(() => BaseWidgetsPage());
@@ -319,6 +344,13 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix

                    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'] ?? '';

--- a/ln_jq_app/lib/pages/qr_code/controller.dart
+++ b/ln_jq_app/lib/pages/qr_code/controller.dart
@@ -1,18 +1,13 @@
 import 'dart:io';
-import 'dart:typed_data';
-
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:image/image.dart' as img;
 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:qr_code_scanner_plus/qr_code_scanner_plus.dart';
-import 'package:zxing_lib/common.dart';
-import 'package:zxing_lib/qrcode.dart';
-import 'package:zxing_lib/zxing.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
+import 'package:permission_handler/permission_handler.dart';

 class QrCodeController extends GetxController
    with BaseControllerMixin, GetSingleTickerProviderStateMixin {
@@ -23,11 +18,13 @@ class QrCodeController extends GetxController
  late final AnimationController animationController;
  late final Animation<double> scanAnimation;

-  // --- QR Scanning ---
-  final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
-  QRViewController? qrViewController;
-  final Rx<Barcode?> result = Rx<Barcode?>(null);
+  // --- 使用 MobileScanner 的控制器 ---
+  final MobileScannerController scannerController = MobileScannerController();
+
  final RxBool isFlashOn = false.obs;
+  final RxBool isProcessingResult = false.obs;
+
+  final RxBool hasPermission = false.obs;

  @override
  void onInit() {
@@ -38,171 +35,214 @@ class QrCodeController extends GetxController
      duration: const Duration(milliseconds: 2500),
      vsync: this,
    );
-    scanAnimation = Tween<double>(begin: 0, end: 1).animate(animationController);
+    scanAnimation =
+        Tween<double>(begin: 0, end: 1).animate(animationController);
    animationController.repeat(reverse: false);
  }

-  /// 当 QRView 创建时调用
-  void onQRViewCreated(QRViewController controller) {
-    this.qrViewController = controller;
-    // 监听扫描到的数据
-    controller.scannedDataStream.listen((scanData) {
-      if (scanData.code != null && result.value?.code != scanData.code) {
-        result.value = scanData;
-        qrViewController?.pauseCamera();
+  /// MobileScanner 的 onDetect 回调方法
+  void onDetect(BarcodeCapture capture) {
+    if (isProcessingResult.value) return;

-        animationController.stop();
-
-        renderResult(scanData.code!);
-      }
-    });
+    final Barcode? barcode = capture.barcodes.firstOrNull;
+    if (barcode?.rawValue != null && barcode!.rawValue!.isNotEmpty) {
+      isProcessingResult.value = true;
+      scannerController.stop();
+      animationController.stop();
+      renderResult(barcode.rawValue!);
+    }
  }

+  /// 恢复扫描状态
  void resumeScanner() {
-    result.value = null;
-    qrViewController?.resumeCamera();
-    animationController.repeat(reverse: false);
+    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; // 用户取消了选择
-
-      qrViewController?.pauseCamera();
-      animationController.stop();
-
-      String? scanResult;
-      try {
-        final image = img.decodeImage(await File(imageFile.path).readAsBytes());
-        if (image != null) {
-          //扫描图片
-          final pixels = Int32List.fromList(
-            image.map((pixel) {
-              return (pixel.a.toInt() << 24) |
-                  (pixel.r.toInt() << 16) |
-                  (pixel.g.toInt() << 8) |
-                  pixel.b.toInt();
-            }).toList(),
-          );
-
-          final source = RGBLuminanceSource(image.width, image.height, pixels);
-
-          final bitmap = BinaryBitmap(HybridBinarizer(source));
-          final reader = QRCodeReader();
-          final result = reader.decode(bitmap);
-          scanResult = result.text;
-        }
-      } on NotFoundException {
-        scanResult = null;
-      } catch (e) {
-        //异常
-        scanResult = null;
+      final XFile? imageFile =
+      await ImagePicker().pickImage(source: ImageSource.gallery);
+      if (imageFile == null) {
+        return;
      }

-      if (scanResult != null) {
+      scannerController.stop();
+      animationController.stop();
+      showLoading("正在识别...");
+
+      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) {
-      showErrorToast('从相册选择失败');
+    } catch (e, stackTrace) {
+      dismissLoading();
+      showErrorToast('从相册选择失败，请稍后重试');
+      print("scanFromGallery Error: $e\n$stackTrace");
      resumeScanner();
    }
  }

  /// 切换闪光灯
  void toggleFlash() async {
-    await qrViewController?.toggleFlash();
-    isFlashOn.value = (await qrViewController?.getFlashStatus()) ?? false;
+    try {
+      await scannerController.toggleTorch();
+      final currentTorchState = scannerController.value.torchState;
+      isFlashOn.value = currentTorchState == TorchState.on;
+    } catch (e) {
+      print("切换闪光灯失败: $e");
+      showErrorToast("无法打开闪光灯");
+    }
  }

  /// 翻转相机
  void flipCamera() async {
-    await qrViewController?.flipCamera();
+    await scannerController.switchCamera();
  }

+  /// 请求相机权限
  void requestPermission() async {
-    if(Platform.isIOS){
-      var status = await Permission.camera.request();
-      if (status.isGranted) {
+    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('请授予相机权限以使用扫描功能');
      }
-      else if (status.isPermanentlyDenied) {
-        openAppSettings();
-      }
-      else {
-        showErrorToast('需要相机权限才能扫描二维码');
-      }
-      return;
    }

-    final bool results = await requestCameraPermission();
-    if (!results) {
-      showErrorToast('相机权限未被授予，请到权限管理中打开');
-    }
  }

  void requestPhotoPermission() async {
-    if (Platform.isAndroid) {
-      final bool results = await requestPhotosPermission();
-      if (!results) {
-        showErrorToast('相册权限未被授予，请到权限管理中打开');
-      } else {
-        scanFromGallery();
-      }
-    }
-    if(Platform.isIOS){
-      var status = await Permission.photos.request();
-      print("权限状态: $status"); // 在控制台看这个输出
-      if (status.isGranted) {
-        scanFromGallery();
-      }
-      else if (status.isPermanentlyDenied) {
-        openAppSettings();
-      }
-      else {
-        showErrorToast('需要相册权限才能从相册中选择图片');
-      }
+    var status = await Permission.photos.request();
+    if (status.isGranted) {
+      scanFromGallery();
+    } else if (status.isPermanentlyDenied) {
+      openAppSettings();
+    } else {
+      showErrorToast('需要相册权限才能从相册中选择图片');
    }
  }

-  //扫码结果处理
-  void renderResult(String resultStr) async {
+  /// 处理扫描结果
+  void renderResult(String resultStr, {plateNumber}) async {
    showLoading("正在获取车辆信息...");
    try {
-      var responseData = await HttpService.to.get(
-        "appointment/truck/base-info?vin=$resultStr",
+      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 || responseData.data == null) {
+      if (responseData == null) {
+        dismissLoading();
        showToast('无法获取车辆信息，请检查网络或稍后重试');
        resumeScanner();
        return;
      }
-
      var result = BaseModel.fromJson(responseData.data);
-      final vehicle = VehicleInfo.fromJson(result.data as Map<String, dynamic>);
-      //保存使用
-      await StorageService.to.saveVehicleInfo(vehicle);

+      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 (e) {
+
+    } on DioException catch (_) {
      showErrorToast("网络请求失败，请稍后重试");
      resumeScanner();
-    } catch (e, stackTrace) {
-      showErrorToast("处理失败，请稍后重试");
-      resumeScanner(); // 未知异常，恢复扫描
+    } catch (e, _) {
+      showErrorToast("处理失败，请稍后重舍");
+      resumeScanner();
    } finally {
-      dismissLoading();
+      if (Get.isDialogOpen ?? false) {
+        dismissLoading();
+      }
    }
  }

+  /// 显示绑定确认对话框
+  void showBindDialog(String resultStr) {
+    final TextEditingController plateNumberController = TextEditingController();
+    // 使用 showConfirmDialog，它有 onCancel 回调
+    DialogX.to.showConfirmDialog(
+      title: '请输入车牌号',
+      barrierDismissible: false,
+      content: TextField(
+        controller: plateNumberController,
+        autofocus: false,
+        decoration: const InputDecoration(
+          hintText: '请输入完整的车牌号',
+          border: OutlineInputBorder(),
+          contentPadding: EdgeInsets.symmetric(horizontal: 12.0),
+        ),
+      ),
+      confirmText: '确认绑定',
+      cancelText: '取消', // showConfirmDialog 有 cancelText
+      onConfirm: () {
+        final String plateNumber = plateNumberController.text.trim();
+        if (plateNumber.isEmpty) {
+          showToast("请输入车牌号");
+          // 返回 false 可以阻止弹窗关闭，让用户继续输入
+          return false;
+        }
+        renderResult(resultStr, plateNumber: plateNumber);
+        //关闭弹窗
+        return true;
+      },
+      onCancel: () {
+        // 如果用户点击取消，恢复扫描
+        resumeScanner();
+      },
+    );
+  }
+
  @override
  void onClose() {
-    qrViewController?.dispose();
+    scannerController.dispose();
    animationController.dispose();
    super.onClose();
  }
 }
+
--- a/ln_jq_app/lib/pages/qr_code/view.dart
+++ b/ln_jq_app/lib/pages/qr_code/view.dart
@@ -1,148 +1,205 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:qr_code_scanner_plus/qr_code_scanner_plus.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: (_) {
-        return Scaffold(
-          extendBodyBehindAppBar: true,
-          appBar: AppBar(
-            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(),
+    Get.put(QrCodeController());
+    return Scaffold(
+      extendBodyBehindAppBar: true,
+      appBar: AppBar(
+        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(),
+        ),
+        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: [
+        // 使用 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,
            ),
-            actions: [
-              TextButton(
-                onPressed: controller.requestPhotoPermission,
-                child: const Text(
-                  '相册',
-                  style: TextStyle(color: Colors.white, fontSize: 16),
-                ),
-              ),
-            ],
+            width: 250,
+            height: 250,
          ),
-          body: Stack(
-            children: <Widget>[
-              _buildQrView(context),
-              Positioned(
-                bottom: 80.h,
-                left: 0,
-                right: 0,
-                child: _buildControlButtons(),
-              ),
-            ],
-          ),
-        );
-      },
+        ),
+        // 扫描动画和覆盖层
+        _buildScannerOverlay(context),
+        // 底部的功能按钮
+        Positioned(bottom: 80, left: 0, right: 0, child: _buildActionButtons()),
+      ],
    );
  }

-  /// 构建二维码扫描视图（带动画）
-  Widget _buildQrView(BuildContext context) {
-    // 定义扫描区域的大小
-    var scanArea = (MediaQuery.of(context).size.width < 400 ||
-            MediaQuery.of(context).size.height < 400)
-        ? 250.0
-        : 300.0;
+  Widget _buildPermissionDeniedView() {
+    // 确保动画是停止的
+    if (controller.animationController.isAnimating) {
+      controller.animationController.stop();
+    }

-    return Stack(
+    return Container(
+      color: Colors.black,
      alignment: Alignment.center,
-      children: <Widget>[
-        // 底层是相机视图和半透明遮罩
-        QRView(
-          key: controller.qrKey,
-          onQRViewCreated: controller.onQRViewCreated,
-          overlay: QrScannerOverlayShape(
-            borderColor: Colors.blueAccent,
-            borderRadius: 10,
-            borderLength: 30,
-            borderWidth: 10,
-            cutOutSize: scanArea,
+      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(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
          ),
-        ),
-        // 上层是扫描动画
-        AnimatedBuilder(
-          animation: controller.scanAnimation,
-          builder: (context, child) {
-            return Positioned(
-              // 计算扫描框的顶部位置，以便动画从顶部开始
-              top: (MediaQuery.of(context).size.height - scanArea) / 2,
-              child: Transform.translate(
-                offset: Offset(0, controller.scanAnimation.value * scanArea),
+          const SizedBox(height: 8),
+          const Text(
+            '请授予相机权限以使用扫码功能。',
+            style: TextStyle(color: Colors.white70, fontSize: 14),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 24),
+          ElevatedButton(
+            onPressed: controller.requestPermission, // 点击按钮重新请求权限
+            child: const Text('授予权限'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// 构建扫描区域的覆盖层和动画
+  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(
-                  width: scanArea,
-                  height: 2, // 扫描线的高度
+                  margin: const EdgeInsets.only(bottom: 100), // 微调位置
+                  width: scanAreaSize,
+                  height: scanAreaSize,
                  decoration: BoxDecoration(
-                    color: Colors.blueAccent,
-                    boxShadow: [
-                      BoxShadow(
-                        color: Colors.blueAccent.withOpacity(0.7),
-                        blurRadius: 8,
-                        spreadRadius: 2,
-                      ),
-                    ],
+                    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 _buildControlButtons() {
-    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(() => Icon(
-                    controller.isFlashOn.value ? Icons.flash_on : Icons.flash_off,
-                    color: Colors.white,
-                    size: 28,
-                  )),
-            ),
-            // 翻转相机按钮
-            _buildIconButton(
-              onPressed: controller.flipCamera,
-              child: const Icon(
-                Icons.flip_camera_ios,
-                color: Colors.white,
-                size: 28,
+  /// 构建底部的功能按钮（闪光灯、相册）
+  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(
@@ -158,3 +215,71 @@ class QrCodePage extends GetView<QrCodeController> {
    );
  }
 }
+
+/// 扫描动画的绘制器
+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;
+  }
+}
--- a/ln_jq_app/lib/storage_service.dart
+++ b/ln_jq_app/lib/storage_service.dart
@@ -20,9 +20,10 @@ class StorageService extends GetxService {
  static const String _phoneKey = 'user_phone';
  static const String _idCardKey = 'user_id_card';
  static const String _vehicleInfoKey = 'vehicle_info';
-  // 加氢站登录凭证的键名
  static const String _stationAccountKey = 'station_account';
  static const String _stationPasswordKey = 'station_password';
+  // 新增：用于标记“绑定车辆”弹窗是否已在本会话中显示过
+  static const String _bindDialogShownKey = 'bind_vehicle_dialog_shown';


  static StorageService get to => Get.find();
@@ -41,10 +42,13 @@ class StorageService extends GetxService {
  String? get idCard => _box.read<String?>(_idCardKey);
  bool get hasVehicleInfo => _box.hasData(_vehicleInfoKey);

-  // 记住密码：获取加氢站账号和密码
  String? get stationAccount => _box.read<String?>(_stationAccountKey);
  String? get stationPassword => _box.read<String?>(_stationPasswordKey);

+  // 新增：获取“绑定车辆”弹窗是否已显示的标志
+  bool get hasShownBindVehicleDialog => _box.read<bool>(_bindDialogShownKey) ?? false;
+
+
  VehicleInfo? get vehicleInfo {
    final vehicleJson = _box.read<String?>(_vehicleInfoKey);
    if (vehicleJson != null) {
@@ -84,17 +88,21 @@ class StorageService extends GetxService {
    await _box.write(_vehicleInfoKey, vehicleInfoToJson(data));
  }

-  // 保存加氢站登录凭证
  Future<void> saveStationCredentials(String account, String password) async {
    await _box.write(_stationAccountKey, account);
    await _box.write(_stationPasswordKey, password);
  }

+  // 新增：标记“绑定车辆”弹窗已显示
+  Future<void> markBindVehicleDialogAsShown() async {
+    await _box.write(_bindDialogShownKey, true);
+  }
+
+
  Future<void> clearVehicleInfo() async {
    await _box.remove(_vehicleInfoKey);
  }

-  // 清除加氢站登录凭证
  Future<void> clearStationCredentials() async {
    await _box.remove(_stationAccountKey);
    await _box.remove(_stationPasswordKey);
@@ -108,6 +116,7 @@ class StorageService extends GetxService {
    await _box.remove(_phoneKey);
    await _box.remove(_idCardKey);
    await clearVehicleInfo();
-    // 注意：登出时我们不清除“记住的密码”，以便下次用户登录时仍然可以回填
+    // 登出时，清除“绑定车辆”弹窗的显示记录，以便下次登录时可以再次弹出
+    await _box.remove(_bindDialogShownKey);
  }
 }
--- a/ln_jq_app/pubspec.lock
+++ b/ln_jq_app/pubspec.lock
@@ -65,14 +65,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "1.4.0"
-  charset:
-    dependency: transitive
-    description:
-      name: charset
-      sha256: "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.1"
  clock:
    dependency: transitive
    description:
@@ -399,10 +391,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_pdfview
-      sha256: a9055bf920c7095bf08c2781db431ba23577aa5da5a056a7152dc89a18fbec6f
+      sha256: c0b2cc4ebf461a5a4bb9312a165222475a7d93845c7a0703f4abb7f442eb6d54
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.3.2"
+    version: "1.4.3"
  flutter_plugin_android_lifecycle:
    dependency: transitive
    description:
@@ -733,6 +725,14 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "2.0.0"
+  mobile_scanner:
+    dependency: "direct main"
+    description:
+      name: mobile_scanner
+      sha256: c6184bf2913dd66be244108c9c27ca04b01caf726321c44b0e7a7a1e32d41044
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "7.1.4"
  modal_bottom_sheet:
    dependency: transitive
    description:
@@ -925,14 +925,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "6.0.3"
-  qr_code_scanner_plus:
-    dependency: "direct main"
-    description:
-      name: qr_code_scanner_plus
-      sha256: b764e5004251c58d9dee0c295e6006e05bd8d249e78ac3383abdb5afe0a996cd
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.14"
  rational:
    dependency: transitive
    description:
@@ -1234,14 +1226,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "3.1.3"
-  zxing_lib:
-    dependency: "direct main"
-    description:
-      name: zxing_lib
-      sha256: f9170470b6bc947d21a6783486f88ef48aad66fc1380c8acd02b118418ec0ce0
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.4"
 sdks:
  dart: ">=3.9.0 <4.0.0"
  flutter: ">=3.35.0"
--- a/ln_jq_app/pubspec.yaml
+++ b/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.0.0+1
+version: 1.2.1+4

 environment:
  sdk: ^3.9.0
@@ -43,11 +43,10 @@ dependencies:

  flutter_native_splash: ^2.4.7
  dropdown_button2: ^2.3.8
-  qr_code_scanner_plus: ^2.0.14
  image_picker: ^1.2.1 # 用于从相册选择图片
  image: ^4.5.4
-  zxing_lib: ^1.1.4
-  flutter_pdfview: 1.3.2 #显示pdf
+  mobile_scanner: ^7.1.4
+  flutter_pdfview: 1.4.3 #显示pdf
  photo_view: ^0.15.0 #操作图片
  flutter_inappwebview: ^6.1.5 # WebView插件
  geolocator: ^14.0.2 # 获取精确定位
Author	SHA1	Message	Date
userGyl	6629c8047f	Merge branch 'dev'	2025-12-25 10:41:04 +08:00
userGyl	bfa615a7f4	扫码无权限优化，司机预约多弹窗	2025-12-25 10:40:26 +08:00
userGyl	288d629f99	bugfix	2025-12-24 10:53:34 +08:00
userGyl	15fdbc7043	v1.2.1	2025-12-23 10:43:12 +08:00
userGyl	f2f2348b54	逆地理编码	2025-12-23 10:18:44 +08:00
userGyl	9ba152b3c3	v1.2.1 待发布	2025-12-22 16:15:32 +08:00
userGyl	21a528d6d1	调整和修改	2025-12-19 13:18:04 +08:00
userGyl	62ca3888d3	历史统计数据，错误提示	2025-12-18 15:20:54 +08:00
userGyl	3ec56a925c	修改搜索条件	2025-12-18 10:33:24 +08:00
userGyl	95c08818cb	取消dark主题	2025-12-18 09:03:08 +08:00
userGyl	42355bd1ef	站点-新增历史记录	2025-12-17 17:40:02 +08:00
userGyl	fe2ce75cec	修改绑定车辆接口登录后查询车辆信息	2025-12-17 09:18:34 +08:00
userGyl	98cac8a0a5	预约列表增加筛选条件	2025-12-16 16:18:28 +08:00
userGyl	9ce46a0c7d	加氢站默认选择，演示账号数据附件默认显示，详情	2025-12-16 11:58:00 +08:00
userGyl	266a43c09d	主题色	2025-12-16 09:54:32 +08:00
userGyl	8434301d1f	版本号	2025-12-12 10:34:24 +08:00
userGyl	adfe3bf34e	版本号修改	2025-12-11 15:50:25 +08:00
userGyl	6a3c6db7a8	Merge branch 'dev' 司机端-加氢预约预约时间段修改 1、开始结束时间整合成一个 2、时间只开放当日和次日司机端-加氢预约提交预约不可提交限制 1、非营业站点 2、预约时间不可重复司机端-预约列表 1、新增到站时间、氢量修改 2、显示拒绝加氢原因加氢站-加氢预约 1、新增当日预约加车牌/手机号筛选 2、新增加氢总量未加氢量 3、确认拒绝流程优化：完成可填写具体加氢量，新增拒绝原因 # Conflicts: # ln_jq_app/lib/common/styles/theme.dart	2025-12-11 15:48:10 +08:00
userGyl	4ace3c9f27	刷新条件	2025-12-11 13:45:26 +08:00
userGyl	b52659df6c	司机预约显示拒绝原因	2025-12-11 13:27:28 +08:00
userGyl	20877a3eb1	增加弹窗限制条件	2025-12-11 10:36:59 +08:00
userGyl	69875f27ad	搜索字段	2025-12-10 17:51:00 +08:00
userGyl	829f5e454e	文本处理	2025-12-10 17:37:56 +08:00
userGyl	1c916a7fad	调整司机预约时间站点工单状态	2025-12-10 17:34:46 +08:00
userGyl	88b24b5228	修改配置ios	2025-12-10 13:16:10 +08:00
userGyl	ee8cbde296	logo	2025-12-09 13:16:09 +08:00
userGyl	f638704fba	ios 说明	2025-12-09 11:24:45 +08:00
userGyl	4c63d5ebf3	bugfix	2025-12-08 17:52:55 +08:00
userGyl	a3fb0d8018	站点确认拒绝流程	2025-12-08 09:32:06 +08:00
userGyl	88b16ca69e	今日预约搜索	2025-12-03 16:00:18 +08:00
userGyl	ba3467810c	新增数据	2025-12-03 15:04:58 +08:00
userGyl	0bfedd54cb	可编辑预约	2025-12-03 10:39:34 +08:00
userGyl	f25d7e4567	增加加氢站可用标记	2025-12-02 10:36:56 +08:00
userGyl	4cdedff654	默认时间段修改	2025-12-01 17:03:16 +08:00
userGyl	4f99ab4164	修改选择器	2025-12-01 15:27:00 +08:00
userGyl	cdc5af7f45	限制	2025-12-01 13:59:02 +08:00
userGyl	20e5e58ded	增加提交预约限制	2025-12-01 13:56:17 +08:00
userGyl	93a39e440a	v1.1.0	2025-11-28 14:48:03 +08:00
userGyl	ec1c554eb3	Merge branch 'dev' v1.1.0	2025-11-28 10:12:44 +08:00
userGyl	d3b7ab8fbe	先限制输入起点	2025-11-28 10:09:18 +08:00
userGyl	5609594439	地图修改	2025-11-27 17:21:07 +08:00
userGyl	da4149ec60	调整地图样式	2025-11-27 15:25:58 +08:00
userGyl	aa30d13b91	更新插件	2025-11-27 09:30:52 +08:00
userGyl	b854d295f9	调整预约时间格式	2025-11-26 17:33:04 +08:00
userGyl	26a24efeb8	限制条件	2025-11-26 13:44:00 +08:00
userGyl	496d77482d	logo 预约弹出列表车辆无绑定弹窗	2025-11-26 09:20:42 +08:00