Merge branch 'dev_feature' into dev

ui调整
# Conflicts:
#	ln_jq_app/lib/pages/b_page/reservation/controller.dart
#	ln_jq_app/lib/pages/b_page/site/controller.dart
#	ln_jq_app/lib/pages/b_page/site/view.dart
#	ln_jq_app/lib/pages/c_page/mine/view.dart
#	ln_jq_app/lib/pages/c_page/reservation/controller.dart
#	ln_jq_app/lib/pages/c_page/reservation/view.dart
#	ln_jq_app/lib/pages/login/view.dart

ln_jq_app/android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -5,6 +8,14 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.inputStream().use { input ->
+        keystoreProperties.load(input.reader(Charsets.UTF_8))
+    }
+}
+
 android {
     namespace = "com.lnkj.ln_jq_app"
     compileSdk = flutter.compileSdkVersion
@@ -21,20 +32,35 @@ 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
         targetSdk = flutter.targetSdkVersion
-        versionCode = flutter.versionCode
-        versionName = flutter.versionName
+        versionCode = 5
+        versionName = "1.2.2"
+    }
+
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String?
+            keyPassword = keystoreProperties["keyPassword"] as String?
+            val storeFilePath = keystoreProperties["storeFile"] as String?
+            storeFile = if (storeFilePath != null) file(storeFilePath) else null
+            storePassword = keystoreProperties["storePassword"] as String?
+        }
     }
 
     buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.getByName("debug")
+        getByName("release") {
+            // 使用上面定义的 release 签名
+            signingConfig = signingConfigs.getByName("release")
+
+            // 修复混淆规则引用语法
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 }

ln_jq_app/android/app/proguard-rules.pro

@@ -0,0 +1,61 @@
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+
+# 忽略 Google Play Core 相关的缺失警告（解决你目前的报错）
+-dontwarn com.google.android.play.core.**
+
+    # Flutter 基础规则
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.** { *; }
+-keep class io.flutter.util.** { *; }
+-keep class io.flutter.view.** { *; }
+-keep class io.flutter.** { *; }
+-keep class io.flutter.plugins.** { *; }
+
+
+-dontwarn com.huawei.android.os.BuildEx$VERSION
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsConfig$Builder
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsConfig
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsInstance$Builder
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsInstance
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsManager
+-dontwarn com.huawei.hianalytics.util.HiAnalyticTools
+-dontwarn com.huawei.hms.availableupdate.UpdateAdapterMgr
+-dontwarn com.huawei.libcore.io.ExternalStorageFile
+-dontwarn com.huawei.libcore.io.ExternalStorageFileInputStream
+-dontwarn com.huawei.libcore.io.ExternalStorageFileOutputStream
+-dontwarn com.huawei.libcore.io.ExternalStorageRandomAccessFile
+-dontwarn org.android.netutil.PingEntry
+-dontwarn org.android.netutil.PingResponse
+-dontwarn org.android.netutil.PingTask
+-dontwarn org.bouncycastle.crypto.BlockCipher
+-dontwarn org.bouncycastle.crypto.engines.AESEngine
+-dontwarn org.bouncycastle.crypto.prng.SP800SecureRandom
+-dontwarn org.bouncycastle.crypto.prng.SP800SecureRandomBuilder
+
+
+-keepclasseswithmembernames class ** {
+    native <methods>;
+}
+-keepattributes Signature
+-keep class sun.misc.Unsafe { *; }
+-keep class com.taobao.** {*;}
+-keep class com.alibaba.** {*;}
+-keep class com.alipay.** {*;}
+-keep class com.ut.** {*;}
+-keep class com.ta.** {*;}
+-keep class anet.**{*;}
+-keep class anetwork.**{*;}
+-keep class org.android.spdy.**{*;}
+-keep class org.android.agoo.**{*;}
+-keep class android.os.**{*;}
+-keep class org.json.**{*;}
+-dontwarn com.taobao.**
+-dontwarn com.alibaba.**
+-dontwarn com.alipay.**
+-dontwarn anet.**
+-dontwarn org.android.spdy.**
+-dontwarn org.android.agoo.**
+-dontwarn anetwork.**
+-dontwarn com.ut.**
+-dontwarn com.ta.**

ln_jq_app/android/app/src/main/AndroidManifest.xml

@@ -15,11 +15,13 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
 
     <application
         android:label="小羚羚"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/logo">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -48,6 +50,64 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
+        <!-- 请填写你自己的- appKey -->
+        <meta-data android:name="com.alibaba.app.appkey" android:value="335642645"/>
+        <!-- 请填写你自己的appSecret -->
+        <meta-data android:name="com.alibaba.app.appsecret" android:value="39628204345a4240b5b645b68a5896c7"/>
+        <!-- 华为通道的参数appid -->
+        <meta-data android:name="com.huawei.hms.client.appid" android:value="" />
+
+        <!-- vivo通道的参数api_key为appkey -->
+        <meta-data android:name="com.vivo.push.api_key" android:value="" />
+        <meta-data android:name="com.vivo.push.app_id" android:value="" />
+
+        <!-- honor通道的参数-->
+        <meta-data android:name="com.hihonor.push.app_id" android:value="" />
+
+        <!-- oppo -->
+        <meta-data android:name="com.oppo.push.key" android:value="" />
+        <meta-data android:name="com.oppo.push.secret" android:value="" />
+
+        <!-- 小米-->
+        <meta-data android:name="com.xiaomi.push.id" android:value="id=2222222222222222222" />
+        <meta-data android:name="com.xiaomi.push.key" android:value="id=5555555555555" />
+
+        <!-- 魅族-->
+        <meta-data android:name="com.meizu.push.id" android:value="" />
+        <meta-data android:name="com.meizu.push.key" android:value="" />
+
+
+
+        <!-- 接收推送消息 -->
+        <receiver
+            android:name="com.aliyun.ams.push.AliyunPushMessageReceiver"
+            android:exported="false"> <!-- 为保证receiver安全，建议设置不可导出，如需对其他应用开放可通过android：permission进行限制 -->
+            <intent-filter>
+                <action android:name="com.alibaba.push2.action.NOTIFICATION_OPENED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.alibaba.push2.action.NOTIFICATION_REMOVED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.alibaba.sdk.android.push.RECEIVE" />
+            </intent-filter>
+        </receiver>
+
+        <!-- 辅助弹窗Activity -->
+        <activity
+            android:name="com.aliyun.ams.push.PushPopupActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="${applicationId}"
+                    android:path="/thirdpush"
+                    android:scheme="agoo" />
+            </intent-filter>
+        </activity>
 
     </application>
     <!-- Required to query activities that can process text, see:

ln_jq_app/android/build.gradle.kts

@@ -3,6 +3,17 @@ allprojects {
         // 使用阿里云镜像
         maven("https://maven.aliyun.com/repository/public")
         maven("https://maven.aliyun.com/repository/google")
+        maven(
+            "https://maven.aliyun.com/nexus/content/repositories/releases/"
+        )
+        // 集成华为通道需要配置 HMS Core SDK 的 Maven地址
+        maven(
+            "https://developer.huawei.com/repo/"
+        )
+
+        maven(
+            "https://developer.hihonor.com/repo"
+        )
         google()
         mavenCentral()
     }

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>

ln_jq_app/ios/Podfile

@@ -1,6 +1,9 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+platform :ios, '13.0'
 
+source 'https://cdn.cocoapods.org/'
+source 'https://gitee.com/aliyun/aliyun-specs.git'
+source 'https://github.com/aliyun/aliyun-specs.git'
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 

ln_jq_app/ios/Podfile.lock

@@ -1,4 +1,12 @@
 PODS:
+  - AlicloudELS (1.0.3)
+  - AlicloudPush (3.2.3):
+    - AlicloudELS (= 1.0.3)
+    - AlicloudUTDID (~> 1.0)
+  - AlicloudUTDID (1.6.1)
+  - aliyun_push_flutter (0.0.1):
+    - AlicloudPush (< 4.0, >= 3.2.3)
+    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
   - device_info_plus (0.0.1):
@@ -20,7 +28,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 +39,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
@@ -39,6 +46,7 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
+  - aliyun_push_flutter (from `.symlinks/plugins/aliyun_push_flutter/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
@@ -47,19 +55,25 @@ 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:
+  https://gitee.com/aliyun/aliyun-specs.git:
+    - AlicloudUTDID
+  https://github.com/aliyun/aliyun-specs.git:
+    - AlicloudELS
+    - AlicloudPush
   trunk:
-    - MTBBarcodeScanner
     - OrderedSet
 
 EXTERNAL SOURCES:
+  aliyun_push_flutter:
+    :path: ".symlinks/plugins/aliyun_push_flutter/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
@@ -76,37 +90,40 @@ 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:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
+  AlicloudELS: fbf821383330465a5af84a033f36f263ae46ca41
+  AlicloudPush: 95150880af380f64cf1741f5586047c17d36c1d9
+  AlicloudUTDID: 5d2f22d50e11eecd38f30bc7a48c71925ea90976
+  aliyun_push_flutter: 0fc2f048a08687ef256c0cfdd72dd7a550ef3347
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   device_info_plus: 71ffc6ab7634ade6267c7a93088ed7e4f74e5896
   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
 
-PODFILE CHECKSUM: 6416011b1bc721211379eaad259ff1cba3dbfad2
+PODFILE CHECKSUM: 357c01ff4e7591871e8c4fd6462220a8c7447220
 
 COCOAPODS: 1.16.2

ln_jq_app/ios/Runner.xcodeproj/project.pbxproj

@@ -50,6 +50,7 @@
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		4B58A54CFC9A912F2BA04FF2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		6AF04C5CFFF0B4098EEDA799 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		6D3F89E22F04C32900A154AD /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -143,6 +144,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				6D3F89E22F04C32900A154AD /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -487,7 +489,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				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 +500,89 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.1;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+					"-l\"swiftCoreGraphics\"",
+					"-framework",
+					"\"OrderedSet\"",
+					"-framework",
+					"\"connectivity_plus\"",
+					"-framework",
+					"\"device_info_plus\"",
+					"-framework",
+					"\"flutter_inappwebview_ios\"",
+					"-framework",
+					"\"flutter_native_splash\"",
+					"-framework",
+					"\"flutter_pdfview\"",
+					"-framework",
+					"\"geolocator_apple\"",
+					"-framework",
+					"\"image_picker_ios\"",
+					"-framework",
+					"\"mobile_scanner\"",
+					"-framework",
+					"\"package_info_plus\"",
+					"-framework",
+					"\"path_provider_foundation\"",
+					"-framework",
+					"\"permission_handler_apple\"",
+					"-framework",
+					"\"shared_preferences_foundation\"",
+					"-framework",
+					"\"url_launcher_ios\"",
+					"-framework",
+					"\"AlicloudELS\"",
+					"-framework",
+					"\"CloudPushSDK\"",
+					"-framework",
+					"\"aliyun_push_flutter\"",
+				);
+				"OTHER_LDFLAGS[arch=*]" = (
+					"$(inherited)",
+					"-ObjC",
+					"-l\"swiftCoreGraphics\"",
+					"-framework",
+					"\"OrderedSet\"",
+					"-framework",
+					"\"connectivity_plus\"",
+					"-framework",
+					"\"device_info_plus\"",
+					"-framework",
+					"\"flutter_inappwebview_ios\"",
+					"-framework",
+					"\"flutter_native_splash\"",
+					"-framework",
+					"\"flutter_pdfview\"",
+					"-framework",
+					"\"geolocator_apple\"",
+					"-framework",
+					"\"image_picker_ios\"",
+					"-framework",
+					"\"mobile_scanner\"",
+					"-framework",
+					"\"package_info_plus\"",
+					"-framework",
+					"\"path_provider_foundation\"",
+					"-framework",
+					"\"permission_handler_apple\"",
+					"-framework",
+					"\"shared_preferences_foundation\"",
+					"-framework",
+					"\"url_launcher_ios\"",
+				);
 				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 +757,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				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 +768,90 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.1;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+					"-l\"swiftCoreGraphics\"",
+					"-framework",
+					"\"OrderedSet\"",
+					"-framework",
+					"\"connectivity_plus\"",
+					"-framework",
+					"\"device_info_plus\"",
+					"-framework",
+					"\"flutter_inappwebview_ios\"",
+					"-framework",
+					"\"flutter_native_splash\"",
+					"-framework",
+					"\"flutter_pdfview\"",
+					"-framework",
+					"\"geolocator_apple\"",
+					"-framework",
+					"\"image_picker_ios\"",
+					"-framework",
+					"\"mobile_scanner\"",
+					"-framework",
+					"\"package_info_plus\"",
+					"-framework",
+					"\"path_provider_foundation\"",
+					"-framework",
+					"\"permission_handler_apple\"",
+					"-framework",
+					"\"shared_preferences_foundation\"",
+					"-framework",
+					"\"url_launcher_ios\"",
+					"-framework",
+					"\"AlicloudELS\"",
+					"-framework",
+					"\"CloudPushSDK\"",
+					"-framework",
+					"\"aliyun_push_flutter\"",
+				);
+				"OTHER_LDFLAGS[arch=*]" = (
+					"$(inherited)",
+					"-ObjC",
+					"-l\"swiftCoreGraphics\"",
+					"-framework",
+					"\"OrderedSet\"",
+					"-framework",
+					"\"connectivity_plus\"",
+					"-framework",
+					"\"device_info_plus\"",
+					"-framework",
+					"\"flutter_inappwebview_ios\"",
+					"-framework",
+					"\"flutter_native_splash\"",
+					"-framework",
+					"\"flutter_pdfview\"",
+					"-framework",
+					"\"geolocator_apple\"",
+					"-framework",
+					"\"image_picker_ios\"",
+					"-framework",
+					"\"mobile_scanner\"",
+					"-framework",
+					"\"package_info_plus\"",
+					"-framework",
+					"\"path_provider_foundation\"",
+					"-framework",
+					"\"permission_handler_apple\"",
+					"-framework",
+					"\"shared_preferences_foundation\"",
+					"-framework",
+					"\"url_launcher_ios\"",
+				);
 				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 +862,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				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 +873,56 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.1;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+					"-l\"swiftCoreGraphics\"",
+					"-framework",
+					"\"OrderedSet\"",
+					"-framework",
+					"\"connectivity_plus\"",
+					"-framework",
+					"\"device_info_plus\"",
+					"-framework",
+					"\"flutter_inappwebview_ios\"",
+					"-framework",
+					"\"flutter_native_splash\"",
+					"-framework",
+					"\"flutter_pdfview\"",
+					"-framework",
+					"\"geolocator_apple\"",
+					"-framework",
+					"\"image_picker_ios\"",
+					"-framework",
+					"\"mobile_scanner\"",
+					"-framework",
+					"\"package_info_plus\"",
+					"-framework",
+					"\"path_provider_foundation\"",
+					"-framework",
+					"\"permission_handler_apple\"",
+					"-framework",
+					"\"shared_preferences_foundation\"",
+					"-framework",
+					"\"url_launcher_ios\"",
+					"-framework",
+					"\"AlicloudELS\"",
+					"-framework",
+					"\"CloudPushSDK\"",
+					"-framework",
+					"\"aliyun_push_flutter\"",
+				);
 				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;

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
   }
 }

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,14 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>uses</key>
+	<string></string>
 
-	<key>NSCameraUsageDescription</key>
-    <string>需要访问您的相机以扫描二维码</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>需要访问您的相册以选择二维码图片进行识别</string>
-    <key>NSPhotoLibraryAddUsageDescription</key>
-    <string>需要访问您的相册以选择二维码图片进行识别</string>
+	<key>UIBackgroundModes</key>
+    	<array>
+    		<string>remote-notification</string>
+    		<string>fetch</string>
+    	</array>
 
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>

ln_jq_app/ios/Runner/Runner.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>

ln_jq_app/lib/common/login_util.dart

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

ln_jq_app/lib/common/model/base_model.dart

@@ -6,7 +6,6 @@ class BaseModel<T> {
   final String message; // 消息，例如 "success"
   final String msg; // 消息，例如 "success"
   final T? data; // 核心数据，使用泛型 T，可以是任何类型
-  final int time; // 时间戳
   final dynamic error; // 错误信息，可以是任何类型或 null
 
   BaseModel({
@@ -15,7 +14,6 @@ class BaseModel<T> {
     required this.message,
     required this.msg,
     this.data, // data 可以为 null
-    required this.time,
     this.error, // error 可以为 null
   });
 
@@ -60,7 +58,6 @@ class BaseModel<T> {
       status: json['status'] as bool? ?? false,
       message: json['message'] ?? '暂不可用，请稍后',
       msg: json['msg'] ?? '暂不可用，请稍后',
-      time: _parseInt(json['time']),
       data: finalData,
       error: json['error'],
     );
@@ -72,7 +69,6 @@ class BaseModel<T> {
     'status': status,
     'message': message,
     'msg': msg,
-    'time': time,
     'data': data,
     'error': error,
   };

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
     );
   }
 }

ln_jq_app/lib/common/model/vehicle_info.dart

@@ -15,7 +15,7 @@ class VehicleInfo {
     final String engineNum;
     final String truckNum;
     final num hydrogenCapacity;
-    final num maxHydrogen;
+    final String maxHydrogen;
 
     VehicleInfo({
         required this.plateNumber,
@@ -36,7 +36,7 @@ class VehicleInfo {
         engineNum: json["engineNum"] ?? '',
         truckNum: json["truckNum"] ?? '',
         hydrogenCapacity: json["hydrogenCapacity"] ?? 0,
-        maxHydrogen: json["maxHydrogen"] ?? 0,
+        maxHydrogen: json["maxHydrogen"] ?? '',
     );
 
     Map<String, dynamic> toJson() => {

ln_jq_app/lib/common/styles/theme.dart

@@ -5,13 +5,20 @@ class AppTheme {
 
   static const String Font_YuYang = 'YuYang';
 
-  static const Color themeColor = Color(0xFF0c83c3);
+  static const Color themeColor = Color(0xFF017137);
 
+  //是否开放域名切换
+  static const bool is_show_host = true;
 
-  static const String test_service_url = "http://47.100.49.118:8090/api/";
+  //http://192.168.110.222:8080/
+  //http://192.168.110.44:8080/
+  static String test_service_url = "https://beta-esg.api.lnh2e.com/";
   static const String release_service_url = "";
+
   //加氢站相关查询
-  static const String jiaqing_service_url = "https://lnh2e.com/api/lingniu-manager-v1/v1/";
+  static const String jiaqing_service_url =
+      "https://beta.lnh2e.com/api/lingniu-manager-v1/v1/";
+
   //车辆信息
   static const String car_service_url = "http://47.99.166.38:20000/";
 
@@ -19,6 +26,11 @@ class AppTheme {
 
   static const Color darkThemeColor = Color(0xFF032896);
 
+  static const String android_key = "335642645";
+  static const String android_appsecret = "39628204345a4240b5b645b68a5896c7";
+  static const String ios_key = "335642649";
+  static const String ios_appsecret = "173bc08bd5df422da20c8e3ffbf0521b";
+
   /// 亮色主题样式
   static ThemeData light = ThemeData(
     useMaterial3: false,
@@ -56,12 +68,9 @@ class AppTheme {
     appBarTheme: const AppBarTheme(
       backgroundColor: Color.fromARGB(255, 34, 34, 34),
       centerTitle: true,
-      titleTextStyle: TextStyle(
-        fontSize: 18,
-        fontWeight: FontWeight.bold,
-      ),
+      titleTextStyle: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
     ),
-    bottomAppBarTheme:  BottomAppBarThemeData(
+    bottomAppBarTheme: BottomAppBarThemeData(
       color: Color.fromARGB(255, 34, 34, 34),
       elevation: 4.0,
     ),

ln_jq_app/lib/common/token_interceptor.dart

@@ -1,16 +1,20 @@
+import 'dart:io';
+
 import 'package:dio/dio.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/storage_service.dart';
 
 /// 专门用于处理和添加 Token 的拦截器
 class TokenInterceptor extends Interceptor {
   // 定义您想要使用的 Token Key
   final String tokenKey;
+  final String sourceKey;
 
   // 构造函数，允许外部传入自定义的 Key，默认为 'Authorization'
-  TokenInterceptor({this.tokenKey = 'Authorization'});
+  TokenInterceptor({this.tokenKey = 'Authorization', this.sourceKey = 'source'});
 
   @override
-  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+  void onRequest(RequestOptions options, RequestInterceptorHandler handler) async{
     // 从 StorageService 中获取已保存的 token
     final String? token = StorageService.to.token;
 
@@ -23,6 +27,21 @@ class TokenInterceptor extends Interceptor {
       }
     }
 
+    String platformSource;
+    if (Platform.isAndroid) {
+      platformSource = 'Android';
+    } else if (Platform.isIOS) {
+      platformSource = 'iOS';
+    } else {
+      platformSource = '';
+    }
+    if (!options.headers.containsKey(sourceKey)) {
+      options.headers[sourceKey] = platformSource;
+    }
+
+    options.headers['appVersion'] = await getVersion();
+    options.headers['brand'] = await getDeviceModel();
+
     // 调用 handler.next(options) 以继续执行请求
     // 这一步至关重要，否则请求会被中断
     super.onRequest(options, handler);

ln_jq_app/lib/main.dart

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

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

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

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();
+  }
+}

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

@@ -0,0 +1,253 @@
+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;
+      case ReservationStatus.cancel:
+        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)),
+        ],
+      ),
+    );
+  }
+}

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

@@ -1,42 +1,194 @@
+import 'dart:async';
+
+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/login/view.dart';
 
+import '../../../common/styles/theme.dart';
 import '../../../storage_service.dart';
 
 class ReservationController extends GetxController with BaseControllerMixin {
   @override
-  String get builderId => 'b_reservation'; // 确保ID与View中一致
+  String get builderId => 'b_reservation';
 
-  // --- 运营状态下拉菜单所需的状态 ---
-  // 下拉菜单的选项列表
   final List<String> operationStatusOptions = ["营运中", "维修中", "暂停营业", "站点关闭"];
-
-  // 当前选中的值，默认为'运营中'
   String selectedOperationStatus = "营运中";
 
+  // --- 其它状态下的时间选择 ---
+  DateTime? customStartTime;
+  DateTime? customEndTime;
+
+  String get customStartTimeStr => customStartTime != null
+      ? DateFormat('yyyy-MM-dd HH:mm').format(customStartTime!)
+      : '点击选择开始时间';
+
+  String get customEndTimeStr => customEndTime != null
+      ? DateFormat('yyyy-MM-dd HH:mm').format(customEndTime!)
+      : '点击选择结束时间';
+
+  // --- 站点广播相关 ---
+  final TextEditingController broadcastTitleController = TextEditingController();
+  final TextEditingController broadcastContentController = TextEditingController();
+  final RxInt selectedTabIndex = 0.obs;
+
+  @override
+  bool get listenLifecycleEvent => true;
+
   @override
   void onInit() {
     super.onInit();
+    // 1. 初始化默认时间
+    customStartTime = DateTime.now();
+    customEndTime = customStartTime!.add(const Duration(days: 1));
     renderData();
+    _msgNotice(); // 红点消息
+    startAutoRefresh();
+  }
+
+  @override
+  void onPaused() {
+    stopAutoRefresh();
+    super.onPaused();
+  }
+
+  @override
+  void onClose() {
+    stopAutoRefresh();
+    broadcastTitleController.dispose();
+    broadcastContentController.dispose();
+    super.onClose();
+  }
+
+  void startAutoRefresh() {
+    // 先停止已存在的定时器，防止重复启动
+    stopAutoRefresh();
+
+    // 创建一个每5分钟执行一次的周期性定时器
+    _refreshTimer = Timer.periodic(const Duration(minutes: 5), (timer) {
+      renderData();
+    });
+  }
+
+  ///停止定时器的方法
+  void stopAutoRefresh() {
+    // 如果定时器存在并且是激活状态，就取消它
+    _refreshTimer?.cancel();
+    _refreshTimer = null; // 置为null，方便判断
   }
 
   String name = "";
   String address = "";
   String phone = "";
-  String costPrice = ""; //氢气价格
-  String customerPrice = ""; //官方价格
+  String costPrice = "";
+  String customerPrice = "";
   String startBusiness = "";
   String endBusiness = "";
   String timeStr = "";
   String operatingEnterprise = "";
   String hydrogenId = "";
 
+  String jobTipStr = "";
+  String jobDetailsStr = "";
+  String jobId = "";
+  Timer? _refreshTimer;
+  bool isNotice = false;
+
   Future<void> renderData() async {
     showLoading("加载中");
-
     try {
+      //获取加氢站未执行的状态修改任务信息
+      var jobData = await HttpService.to.get('appointment/job/hyd/un-executed');
+      if (jobData != null) {
+        final jobDataResult = BaseModel.fromJson(jobData.data);
+        if (jobDataResult.code == 0) {
+          try {
+            final List<dynamic> dataList = jobDataResult.data is List
+                ? jobDataResult.data
+                : [];
+            final firstJob = dataList[0];
+
+            jobId = firstJob["id"] ?? "";
+            String endTime = firstJob["endTime"] ?? "";
+            String beginTime = firstJob["beginTime"] ?? "";
+            String hydStatus = firstJob["hydStatus"].toString() ?? "";
+            String hydStatusStr = "";
+            if (hydStatus == "0") {
+              hydStatusStr = "营运中";
+            } else if (hydStatus == "1") {
+              hydStatusStr = "维修中";
+            } else if (hydStatus == "2") {
+              hydStatusStr = "站点关闭";
+            } else if (hydStatus == "3") {
+              hydStatusStr = "暂停营业";
+            }
+
+            //现在的时间晚于开始时间就不显示文案
+            bool isJobStarted = false;
+            try {
+              if (beginTime.isNotEmpty) {
+                DateTime beginDateTime = DateTime.parse(beginTime);
+                if (DateTime.now().isAfter(beginDateTime)) {
+                  isJobStarted = true;
+                }
+              }
+            } catch (e) {
+              print("开始时间解析失败: $e");
+            }
+            if (isJobStarted) {
+              jobTipStr = "";
+            }
+
+            //结束时间
+            if (endTime.isNotEmpty) {
+              try {
+                // 解析时间字符串
+                DateTime endDateTime = DateTime.parse(endTime);
+                DateTime beginDateTime = DateTime.parse(beginTime);
+                DateTime now = DateTime.now(); //计算时间差 (endTime - now)
+                Duration diff = endDateTime.difference(now);
+
+                // 计算小时数 (允许小数，例如 0.5)
+                // inMinutes / 60 可以得到更精确的小数小时
+                double hoursLeft = diff.inMinutes / 60.0;
+
+                //计算当前时间-开始时间
+                Duration startDiff = beginDateTime.difference(now);
+                double hoursUntilStart = startDiff.inMinutes / 60.0;
+
+
+                // 只有在【当前时间早于开始时间】且【剩余时间大于0】时才显示文案
+                if (now.isBefore(beginDateTime) && hoursLeft > 0) {
+                  // 如果是正数，表示还有多久结束
+                  String timeTip = "  ${hoursUntilStart.toStringAsFixed(2)}小时后";
+                  jobTipStr = "$timeTip$hydStatusStr";
+                } else {
+                  jobTipStr = "";
+                }
+
+                jobDetailsStr =
+                "当前站点已设置$beginTime至$endTime，共${hoursLeft.toStringAsFixed(2)}小时，为$hydStatusStr状态";
+
+                //  如果是处于非营运状态，自动回填开始和结束时间
+                // 假设 customStartTime 是现在，customEndTime 是接口返回的结束时间
+                customStartTime = beginDateTime;
+                customEndTime = endDateTime;
+              } catch (e) {
+                print("时间解析失败: $e");
+              }
+            }
+          } catch (e) {
+            Logger.d("解析失败或者没返回信息: $e");
+
+            jobTipStr = "";
+          }
+        }
+      }
+
+      //获取站点信息
       var responseData = await HttpService.to.get(
         'appointment/station/getStationInfoById?hydrogenId=${StorageService.to.userId}',
       );
@@ -49,32 +201,30 @@ class ReservationController extends GetxController with BaseControllerMixin {
 
       try {
         var result = BaseModel.fromJson(responseData.data);
-
-        name = result.data["name"];
+        name = result.data["name"] ?? "";
         hydrogenId = result.data["hydrogenId"].toString();
-        address = result.data["address"];
-        var rawCostPrice = result.data["costPrice"];
-        if (rawCostPrice != null && rawCostPrice.toString().isNotEmpty) {
-          costPrice = "¥$rawCostPrice";
-        } else {
-          costPrice = "暂无价格";
-        }
-        var customerPriceTemp = result.data["customerPrice"];
-        if (customerPriceTemp != null && customerPriceTemp.toString().isNotEmpty) {
-          customerPrice = "$customerPriceTemp";
-        } else {
-          customerPrice = "暂无价格";
-        }
+        address = result.data["address"] ?? "";
 
-        phone = result.data["phone"];
-        startBusiness = result.data["startBusiness"];
-        endBusiness = result.data["endBusiness"];
+        var rawCostPrice = result.data["costPrice"];
+        costPrice = (rawCostPrice != null && rawCostPrice.toString().isNotEmpty)
+            ? "¥$rawCostPrice"
+            : "暂无价格";
+
+        var customerPriceTemp = result.data["customerPrice"];
+        customerPrice =
+        (customerPriceTemp != null && customerPriceTemp.toString().isNotEmpty)
+            ? "$customerPriceTemp"
+            : "暂无价格";
+
+        phone = result.data["phone"] ?? "";
+        startBusiness = result.data["startBusiness"] ?? "";
+        endBusiness = result.data["endBusiness"] ?? "";
         operatingEnterprise = result.data["operatingEnterprise"].toString();
+
         String temp = result.data["siteStatusName"].toString();
         selectedOperationStatus = (temp.isEmpty || temp == "null") ? "营运中" : temp;
 
         if (startBusiness.isNotEmpty && endBusiness.isNotEmpty) {
-          // 营业时间为24小时的特殊处理
           if (startBusiness == "00:00:00" && endBusiness == "23:59:59") {
             timeStr = "24小时营业";
           } else {
@@ -86,19 +236,38 @@ class ReservationController extends GetxController with BaseControllerMixin {
 
         operatingEnterprise = operatingEnterprise.isEmpty ? "暂未设置" : operatingEnterprise;
 
-        updateUi();
         dismissLoading();
       } catch (e) {
-        // 如果解析 JSON 失败
         dismissLoading();
         showToast('数据异常');
       }
     } catch (e) {
       dismissLoading();
+    } finally {
+      updateUi();
+    }
+  }
+
+  Future<void> _msgNotice() async {
+    final Map<String, dynamic> requestData = {
+      'appFlag': 1,
+      'isRead': 1,
+      'pageNum': 1,
+      'pageSize': 5,
+    };
+    final response = await HttpService.to.get(
+      'appointment/unread_notice/page',
+      params: requestData,
+    );
+    if (response != null) {
+      final result = BaseModel.fromJson(response.data);
+      if (result.code == 0 && result.data != null) {
+        String total = result.data["total"].toString();
+        isNotice = int.parse(total) > 0;
+      }
     }
   }
 
-  /// 更新运营状态的方法
   void onOperationStatusChanged(String? newValue) {
     if (newValue != null) {
       selectedOperationStatus = newValue;
@@ -106,14 +275,105 @@ class ReservationController extends GetxController with BaseControllerMixin {
     }
   }
 
-  void saveInfo() async {
-    showLoading("保存中");
+  /// 使用底部滚轮形式选择时间（下拉框效果）
+  void pickDateTime(BuildContext context, bool isStart) {
+    DateTime now = DateTime.now();
+    DateTime initialDate = isStart ? (customStartTime ?? now) : (customEndTime ?? now);
 
+    DateTime minLimit = isStart
+        ? now.subtract(const Duration(minutes: 1))
+        : (customStartTime ?? now).subtract(const Duration(minutes: 1));
+
+    if (initialDate.isBefore(minLimit)) {
+      initialDate = isStart ? now : (customStartTime ?? now);
+    }
+
+    DateTime tempDate = initialDate;
+
+    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, vertical: 8.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  CupertinoButton(
+                    onPressed: () => Get.back(),
+                    child: const Text('取消', style: TextStyle(color: Colors.grey)),
+                  ),
+                  CupertinoButton(
+                    onPressed: () {
+                      if (isStart) {
+                        customStartTime = tempDate;
+                        if (customEndTime != null &&
+                            customEndTime!.isBefore(customStartTime!)) {
+                          customEndTime = customStartTime!.add(const Duration(days: 1));
+                        }
+                      } else {
+                        if (tempDate.isBefore(customStartTime ?? DateTime.now())) {
+                          showToast('结束时间不能早于开始时间');
+                          return;
+                        }
+                        customEndTime = tempDate;
+                      }
+                      updateUi();
+                      Get.back();
+                    },
+                    child: const Text(
+                      '确定',
+                      style: TextStyle(
+                        color: AppTheme.themeColor,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            const Divider(height: 1),
+            Expanded(
+              child: CupertinoDatePicker(
+                mode: CupertinoDatePickerMode.dateAndTime,
+                initialDateTime: initialDate,
+                minimumDate: minLimit,
+                use24hFormat: true,
+                onDateTimeChanged: (DateTime newDate) {
+                  tempDate = newDate;
+                },
+              ),
+            ),
+          ],
+        ),
+      ),
+      backgroundColor: Colors.transparent,
+    );
+  }
+
+  void saveInfo() async {
+    if (selectedOperationStatus != "营运中") {
+      if (customStartTime == null || customEndTime == null) {
+        showToast("请选择开始和结束时间");
+        return;
+      }
+    }
+
+    showLoading("保存中");
     try {
       var responseData = await HttpService.to.post(
         'appointment/station/updateStationStatus',
         data: {
           'hydrogenId': hydrogenId,
+          'name': name,
           'siteStatus': selectedOperationStatus == "营运中"
               ? "0"
               : selectedOperationStatus == "维修中"
@@ -123,18 +383,27 @@ class ReservationController extends GetxController with BaseControllerMixin {
               : selectedOperationStatus == "暂停营业"
               ? "3"
               : 0,
+          'beginTime': selectedOperationStatus == "营运中"
+              ? null
+              : DateFormat('yyyy-MM-dd HH:mm:ss').format(customStartTime!),
+          'endTime': selectedOperationStatus == "营运中"
+              ? null
+              : DateFormat('yyyy-MM-dd HH:mm:ss').format(customEndTime!),
           'updateTime': getNowDateTimeString(),
         },
       );
 
-      if (responseData == null && responseData!.data == null) {
+      if (responseData == null || responseData.data == null) {
         dismissLoading();
         showToast('服务暂不可用，请稍后');
         return;
       }
       var result = BaseModel.fromJson(responseData.data);
       if (result.code == 0) {
-        showSuccessToast("保存成功");
+        showSuccessToast("保存成功，已同步通知对应司机");
+
+        //重新刷新页面
+        renderData();
       }
       dismissLoading();
     } catch (e) {
@@ -142,11 +411,87 @@ class ReservationController extends GetxController with BaseControllerMixin {
     }
   }
 
-  void logout() async {
-    // TODO: 在这里执行退出登录的逻辑
-    //清理本地缓存的用户信息 导航到登录页面
-    await StorageService.to.clearLoginInfo();
+  /// 显示当前未执行任务的详情弹窗
+  void showJob() {
+    if (jobDetailsStr.isEmpty) {
+      showToast("当前没有正在生效的任务设置");
+      return;
+    }
 
+    DialogX.to.showConfirmDialog(
+      title: '当前设置详情',
+      content: Text(jobDetailsStr, style: const TextStyle(fontSize: 15, height: 1.5)),
+      confirmText: '好的',
+      cancelText: '取消设置',
+      onCancel: () {
+        // 点击“取消设置”调用删除接口
+        _cancelJob();
+      },
+    );
+  }
+
+  /// 内部私有方法：调用取消/删除任务接口
+  void _cancelJob() async {
+    showLoading("正在取消...");
+    try {
+      var response = await HttpService.to.delete('appointment/job/hyd/$jobId');
+
+      dismissLoading();
+      if (response != null) {
+        var result = BaseModel.fromJson(response.data);
+        if (result.code == 0) {
+          showSuccessToast("已成功取消该设置");
+          // 成功后重新刷新页面数据，重置状态
+          renderData();
+        } else {
+          showErrorToast(result.error);
+        }
+      }
+    } catch (e) {
+      dismissLoading();
+      showErrorToast("取消失败，请稍后重试");
+      Logger.d("取消任务失败: $e");
+    }
+  }
+
+  /// 发送站点广播
+  void sendBroadcast() async {
+    String title = broadcastTitleController.text.trim();
+    String content = broadcastContentController.text.trim();
+
+    if (title.isEmpty) {
+      showToast("请输入通知标题");
+      return;
+    }
+    if (content.isEmpty) {
+      showToast("请输入通知内容");
+      return;
+    }
+
+    showLoading("发送中...");
+    try {
+      var responseData = await HttpService.to.post(
+        'appointment/notice/push/station/broadcast',
+        data: {'title': title, 'content': content},
+      );
+
+      dismissLoading();
+      if (responseData != null) {
+        var result = BaseModel.fromJson(responseData.data);
+        if (result.code == 0) {
+          showSuccessToast("广播发送成功");
+        } else {
+          showErrorToast(result.error);
+        }
+      }
+    } catch (e) {
+      dismissLoading();
+      showToast("发送失败，请稍后重试");
+    }
+  }
+
+  void logout() async {
+    await StorageService.to.clearLoginInfo();
     Get.offAll(() => LoginPage());
   }
 }

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

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

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

@@ -1,20 +1,26 @@
 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)
+  cancel, // 取消预约
   unknown, // 未知状态
 }
 
 class ReservationModel {
   final String id;
+  final String stationId;
   final String plateNumber;
-  final String amount;
+  String amount;
   final String time;
   final String contactPerson;
   final String contactPhone;
@@ -22,6 +28,7 @@ class ReservationModel {
 
   final String contacts;
   final String phone;
+  final String rejectReason;
   final String stationName;
   final String startTime;
   final String endTime;
@@ -31,14 +38,17 @@ class ReservationModel {
   final String stateName;
   final String addStatus;
   final String addStatusName;
+  bool hasEdit;
 
   ReservationModel({
     required this.id,
+    required this.stationId,
     required this.plateNumber,
     required this.amount,
     required this.time,
     required this.contactPerson,
     required this.contactPhone,
+    required this.hasEdit,
     this.status = ReservationStatus.pending,
     required this.contacts,
     required this.phone,
@@ -51,38 +61,49 @@ 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;
+        case 6:
+          currentStatus = ReservationStatus.cancel;
+          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
         : '时间未定';
 
     return ReservationModel(
       // 原始字段，用于UI兼容
       id: json['id']?.toString() ?? '',
+      stationId: json['stationId']?.toString() ?? '',
       plateNumber: json['plateNumber']?.toString() ?? '未知车牌',
       amount: '${json['hydAmount']?.toString() ?? '0'}kg',
       time: timeRange,
@@ -102,6 +123,8 @@ class ReservationModel {
       addStatus: statusFromServer.toString(),
       addStatusName: json['addStatusName']?.toString() ?? '',
       stateName: json['stateName']?.toString() ?? '',
+      rejectReason: json['rejectReason']?.toString() ?? '',
+      hasEdit: true,
     );
   }
 }
@@ -119,31 +142,65 @@ class SiteController extends GetxController with BaseControllerMixin {
   List<ReservationModel> reservationList = [];
   Timer? _refreshTimer;
 
+  final TextEditingController searchController = TextEditingController();
+  bool isNotice = false;
+
+  @override
+  bool get listenLifecycleEvent => true;
+
   @override
   void onInit() {
     super.onInit();
     renderData();
-
+    msgNotice();
     startAutoRefresh();
   }
 
+  @override
+  void onPaused() {
+    stopAutoRefresh();
+    super.onPaused();
+  }
+
   @override
   void onClose() {
     stopAutoRefresh();
+    searchController.dispose();
     super.onClose();
   }
 
+  Future<void> msgNotice() async {
+    final Map<String, dynamic> requestData = {
+      'appFlag': 1,
+      'isRead': 1,
+      'pageNum': 1,
+      'pageSize': 5,
+    };
+    final response = await HttpService.to.get(
+      'appointment/unread_notice/page',
+      params: requestData,
+    );
+    if (response != null) {
+      final result = BaseModel.fromJson(response.data);
+      if (result.code == 0 && result.data != null) {
+        String total = result.data["total"].toString();
+        isNotice = int.parse(total) > 0;
+        updateUi();
+      }
+    }
+  }
+
   void startAutoRefresh() {
     // 先停止已存在的定时器，防止重复启动
     stopAutoRefresh();
 
     // 创建一个每5分钟执行一次的周期性定时器
     _refreshTimer = Timer.periodic(const Duration(minutes: 5), (timer) {
-      fetchReservationData();
+      renderData();
     });
   }
 
-  /// 【6. 新增】停止定时器的方法
+  ///停止定时器的方法
   void stopAutoRefresh() {
     // 如果定时器存在并且是激活状态，就取消它
     _refreshTimer?.cancel();
@@ -155,13 +212,17 @@ 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, // 加氢站名称、手机号
+          'stationId': StorageService.to.userId
         },
       );
 
@@ -170,6 +231,7 @@ class SiteController extends GetxController with BaseControllerMixin {
         showToast('暂时无法获取预约数据');
         hasReservationData = false;
         reservationList = [];
+        dismissLoading();
         return;
       }
 
@@ -179,7 +241,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 +270,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 +566,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 +585,8 @@ class SiteController extends GetxController with BaseControllerMixin {
   String orderAmount = "";
   String completedAmount = "";
   String name = "";
+  String orderTotalAmount = "";
+  String orderUnfinishedAmount = "";
 
   Future<void> renderData() async {
     try {
@@ -286,14 +606,21 @@ 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();
+    }
   }
 }

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

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

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

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

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');

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

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

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

@@ -1,36 +1,87 @@
+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('附件链接无效');
       return;
     }
 
-    Get.to(
-      () => const AttachmentViewerPage(),
-      arguments: {
-        'url': url, 
-      },
-    );
+    Get.to(() => const AttachmentViewerPage(), arguments: {'url': url});
   }
 
-  /// 检查 URL 是否为 PDF，以便在视图中显示不同的图标
+  /// 检查 URL 是否为 PDF (此方法保持不变)
   bool isPdf(String url) {
     return url.toLowerCase().endsWith('.pdf');
   }

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)),
+    );
+  }
 }

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

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

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

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

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)");
-  }
-}
+}

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}");
           },
         ),

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

@@ -0,0 +1,153 @@
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/model/base_model.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
+
+import 'model.dart';
+
+class MessageController extends GetxController {
+  final RefreshController refreshController = RefreshController(initialRefresh: false);
+  final RxList<MessageModel> messageList = <MessageModel>[].obs;
+  int _pageNum = 1;
+  final int _pageSize = 20;
+
+  // 是否所有已读状态
+  final RxBool allRead = false.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    _loadData(isRefresh: true);
+  }
+
+  void onRefresh() => _loadData(isRefresh: true);
+
+  void onLoading() => _loadData(isRefresh: false);
+
+  Future<void> _loadData({bool isRefresh = false}) async {
+    final int targetPage = isRefresh ? 1 : _pageNum + 1;
+
+    try {
+      final Map<String, dynamic> requestData = {
+        'appFlag': 1,
+        'pageNum': targetPage,
+        'pageSize': _pageSize,
+      };
+
+      final response = await HttpService.to.get(
+        'appointment/unread_notice/page',
+        params: requestData,
+      );
+
+      if (response == null) {
+        throw Exception("Response is null");
+      }
+
+      final result = BaseModel.fromJson(response.data);
+
+      if (result.code != 0) {
+        throw Exception(result.message ?? "Business error");
+      }
+
+      final recordsList = result.data?["records"] as List? ?? [];
+
+      final List<MessageModel> newData = recordsList.map((e) {
+        return MessageModel(
+          id: e['id']?.toString() ?? '',
+          title: e['noticeTitle'] ?? '',
+          content: e['noticeContent'] ?? '',
+          createTime: e['createTime'] ?? '',
+          isRead: int.tryParse(e['isRead']?.toString() ?? '0') ?? 0,
+        );
+      }).toList();
+
+      if (isRefresh) {
+        messageList.assignAll(newData);
+        _pageNum = 1; // 只有成功了才重置页码
+      } else {
+        messageList.addAll(newData);
+        if (newData.isNotEmpty) {
+          _pageNum++; // 只有成功且有数据才+1
+        }
+      }
+
+      _updateRefreshState(isRefresh, newData.length);
+
+      // 检查是否全部已读
+      _checkAllRead();
+    } catch (e) {
+      Logger.d("加载失败: $e"); // 建议加上日志
+      if (isRefresh) {
+        refreshController.refreshFailed();
+      } else {
+        refreshController.loadFailed();
+      }
+    }
+  }
+
+  /// 处理 RefreshController 状态
+  void _updateRefreshState(bool isRefresh, int count) {
+    if (isRefresh) {
+      refreshController.refreshCompleted();
+      // 如果刷新后的数据量小于 pageSize，说明没有更多数据了
+      if (count < _pageSize) {
+        refreshController.loadNoData();
+      } else {
+        // 必须重置 footer 状态，否则之前如果是 NoData 状态无法再加载
+        refreshController.resetNoData();
+      }
+    } else {
+      if (count == 0) {
+        refreshController.loadNoData();
+      } else {
+        refreshController.loadComplete();
+      }
+    }
+  }
+
+
+
+  // 标记全部已读
+  void markAllRead() async {
+    showLoading('正在标记...');
+    try {
+      final response = await HttpService.to.post('appointment/unread_notice/read/all');
+      if (response != null) {
+        final result = BaseModel.fromJson(response.data);
+        if (result.code == 0) {
+          for (var msg in messageList) {
+            msg.isRead = 0;
+          }
+          messageList.refresh();
+          allRead.value = true;
+
+          dismissLoading();
+          showSuccessToast('全部已读');
+        }
+      }
+    } catch (e) {
+      dismissLoading();
+      showErrorToast('操作失败');
+    }
+  }
+
+  // 标记单条已读（弹窗显示时调用）
+  void markRead(MessageModel message) async {
+    if (message.isRead == 0) return;
+
+    final response = await HttpService.to.post(
+      '/appointment/unread_notice/read/${message.id}',
+    );
+    if (response != null) {
+      final result = BaseModel.fromJson(response.data);
+      if (result.code == 0) {
+        message.isRead = 0;
+        messageList.refresh();
+        _checkAllRead();
+      }
+    }
+  }
+
+  void _checkAllRead() {
+    allRead.value = messageList.every((msg) => msg.isRead == 0);
+  }
+}

ln_jq_app/lib/pages/c_page/message/model.dart

@@ -0,0 +1,25 @@
+class MessageModel {
+  final String id;
+  final String title;
+  final String content;
+  final String createTime;
+  int isRead; // 0: 已读, 1: 未读
+
+  MessageModel({
+    required this.id,
+    required this.title,
+    required this.content,
+    required this.createTime,
+    required this.isRead,
+  });
+
+  factory MessageModel.fromJson(Map<String, dynamic> json) {
+    return MessageModel(
+      id: json['id']?.toString() ?? '',
+      title: json['title']?.toString() ?? '消息通知',
+      content: json['content']?.toString() ?? '',
+      createTime: json['createTime']?.toString() ?? '',
+      isRead: json['isRead'] as int? ?? 0,
+    );
+  }
+}

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

@@ -0,0 +1,150 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
+import 'controller.dart';
+import 'model.dart';
+
+class MessagePage extends GetView<MessageController> {
+  const MessagePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    Get.put(MessageController());
+
+    return Scaffold(
+      backgroundColor: const Color(0xFFF5F5F5),
+      appBar: AppBar(title: const Text('消息通知'), centerTitle: true),
+      body: Column(
+        children: [
+          Expanded(
+            child: Obx(() => SmartRefresher(
+              controller: controller.refreshController,
+              enablePullUp: true,
+              onRefresh: controller.onRefresh,
+              onLoading: controller.onLoading,
+              child: ListView.separated(
+                padding: const EdgeInsets.all(12),
+                itemCount: controller.messageList.length,
+                separatorBuilder: (_, __) => const SizedBox(height: 12),
+                itemBuilder: (context, index) {
+                  return _buildMessageItem(context, controller.messageList[index]);
+                },
+              ),
+            )),
+          ),
+          Obx(() => !controller.allRead.value
+              ? Container(
+            padding: const EdgeInsets.all(16),
+            color: Colors.white,
+            child: ElevatedButton(
+              onPressed: controller.markAllRead,
+              style: ElevatedButton.styleFrom(
+                backgroundColor: Colors.blue,
+                minimumSize: const Size(double.infinity, 44),
+                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+              ),
+              child: const Text('全部标为已读', style: TextStyle(fontSize: 16, color: Colors.white)),
+            ),
+          )
+              : const SizedBox.shrink()),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildMessageItem(BuildContext context, MessageModel item) {
+    return GestureDetector(
+      onTap: () {
+        controller.markRead(item);
+        _showMessageDialog(context, item);
+      },
+      child: Container(
+        padding: const EdgeInsets.all(16),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(8),
+        ),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Container(
+              margin: const EdgeInsets.only(top: 6, right: 12),
+              width: 8,
+              height: 8,
+              decoration: BoxDecoration(
+                color: item.isRead == 1 ? Colors.grey[300] : const Color(0xFFFAAD14),
+                shape: BoxShape.circle,
+              ),
+            ),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    item.title,
+                    style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.black87),
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    item.content,
+                    style: TextStyle(fontSize: 14, color: Colors.grey[600]),
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    item.createTime,
+                    style: TextStyle(fontSize: 12, color: Colors.grey[400]),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _showMessageDialog(BuildContext context, MessageModel item) {
+    showDialog(
+      context: context,
+      barrierDismissible: true,
+      builder: (context) {
+        return Dialog(
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+          child: Container(
+            padding: const EdgeInsets.all(24),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  item.title,
+                  style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+                ),
+                const SizedBox(height: 12),
+                Text(
+                  item.content,
+                  style: const TextStyle(fontSize: 15, height: 1.5, color: Colors.black87),
+                ),
+                const SizedBox(height: 24),
+                Align(
+                  alignment: Alignment.centerRight,
+                  child: OutlinedButton(
+                    onPressed: () => Navigator.pop(context),
+                    style: OutlinedButton.styleFrom(
+                      side: const BorderSide(color: Colors.blue),
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
+                      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+                    ),
+                    child: const Text('确认', style: TextStyle(color: Colors.blue)),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

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

@@ -16,7 +16,6 @@ class MineController extends GetxController with BaseControllerMixin {
   void onInit() {
     super.onInit();
     renderData();
-    renderViolation();
   }
 
   @override
@@ -31,13 +30,15 @@ class MineController extends GetxController with BaseControllerMixin {
   }
 
   String rate = "";
+  String rating = "";
   String accident = "";
   String historyBreakRules = "";
   String vin = "";
   String plateNumber = "";
-  String violationTotal = "0";
-  String violationScore = "0";
-  String violationDispose = "0";
+  String violationTotal = "0";//违章总数
+  String violationScore = "0";//扣分总数
+  String violationDispose = "0";//已处理
+  bool isNotice = false;
 
   void renderData() async {
     if (StorageService.to.hasVehicleInfo) {
@@ -49,14 +50,17 @@ class MineController extends GetxController with BaseControllerMixin {
       plateNumber = bean.plateNumber;
     }
 
-    showLoading("加载中");
-
     try {
+      showLoading("加载中");
       await Future.wait([
         _fetchCompletionRate(), // 请求1：完成率
         _fetchAccidentCount(), // 请求2：事故数
         _fetchBreakRulesCount(), // 请求3：违章数
+        _rating(), // 司机评分
+        msgNotice(), // 红点消息
       ]);
+
+      await renderViolation();
     } catch (e, stackTrace) {
       showErrorToast("加载数据失败，请稍后重试 $e");
     } finally {
@@ -65,6 +69,38 @@ class MineController extends GetxController with BaseControllerMixin {
     }
   }
 
+  Future<void> msgNotice() async {
+    final Map<String, dynamic> requestData = {
+      'appFlag': 1,
+      'isRead': 1,
+      'pageNum': 1,
+      'pageSize': 5,
+    };
+    final response = await HttpService.to.get(
+      'appointment/unread_notice/page',
+      params: requestData,
+    );
+    if (response != null) {
+      final result = BaseModel.fromJson(response.data);
+      if (result.code == 0 && result.data != null) {
+        String total = result.data["total"].toString();
+        isNotice = int.parse(total) > 0;
+        updateUi();
+      }
+    }
+  }
+
+  Future<void> _rating() async {
+    final response = await HttpService.to.get('appointment/rating/driver');
+
+    if (response != null) {
+      final result = BaseModel.fromJson(response.data);
+      if (result.code == 0 && result.data != null) {
+        rating = result.data.toString();
+      }
+    }
+  }
+
   Future<void> _fetchCompletionRate() async {
     final response = await HttpService.to.get(
       'appointment/orderAddHyd/driverAppointmentCompletionRate?phone=${StorageService.to.phone}',
@@ -104,15 +140,11 @@ class MineController extends GetxController with BaseControllerMixin {
     }
   }
 
-  void renderViolation() async {
+  Future<void> renderViolation() async {
     // 违章信息查询
-    final originalHeaders = Map<String, dynamic>.from(HttpService.to.dio.options.headers);
     try {
-      HttpService.to.setBaseUrl(AppTheme.jiaqing_service_url);
-      HttpService.to.dio.options.headers['appId'] = '97ad10eeb6b346f79e0d6ffd81e4d3c3';
-
       var responseData = await HttpService.to.get(
-        "vehicleService/violation/queryViolationInfo_V2?plateNum=${plateNumber}",
+        "appointment/truck/queryViolationInfo_V2?plateNum=${plateNumber}",
       );
 
       if (responseData == null || responseData.data == null) {
@@ -139,8 +171,6 @@ class MineController extends GetxController with BaseControllerMixin {
       }
     } catch (e) {
     } finally {
-      HttpService.to.setBaseUrl(AppTheme.test_service_url);
-      HttpService.to.dio.options.headers = originalHeaders;
       updateUi();
     }
   }

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

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

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

@@ -0,0 +1,284 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/common/index.dart';
+import 'package:ln_jq_app/common/model/base_model.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(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        // 状态标签
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 10,
+                            vertical: 5,
+                          ),
+                          decoration: BoxDecoration(
+                            color: Colors.blue.shade50, // 淡蓝色背景
+                            borderRadius: BorderRadius.circular(4), // 小圆角
+                            // 可以选择去掉边框，或者用极淡的边框
+                            border: Border.all(color: Colors.blue.shade100),
+                          ),
+                          child: Text(
+                            "${reservation.stateName}-${reservation.addStatusName}",
+                            style: TextStyle(
+                              color: Colors.blue.shade700,
+                              fontSize: 12,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                        Spacer(),
+                        //取消预约
+                        if (reservation.hasEdit)
+                          SizedBox(
+                            height: 28, // 限制按钮高度，显得精致
+                            child: OutlinedButton(
+                              onPressed: () async{
+                                var responseData = await HttpService.to.post(
+                                  'appointment/orderAddHyd/vehicle-cancel',
+                                  data: {
+                                    'id': reservation.id,
+                                  },
+                                );
+
+                                if (responseData == null || responseData.data == null) {
+                                  showToast('服务暂不可用，请稍后');
+                                  dismissLoading();
+                                  return;
+                                }
+
+                                var result = BaseModel.fromJson(responseData.data);
+
+                                if (result.code == 0) {
+                                  showSuccessToast("已取消");
+                                  _controller.getReservationList(
+                                    addStatus: _selectedStatus,
+                                  );
+                                } else {
+                                  showToast(result.error);
+                                }
+                              },
+                              style: OutlinedButton.styleFrom(
+                                padding: const EdgeInsets.symmetric(horizontal: 12),
+                                side: BorderSide(color: Colors.grey.shade400), // 灰色边框
+                                shape: const StadiumBorder(), // 胶囊形状
+                              ),
+                              child: Text(
+                                '取消预约',
+                                style: TextStyle(color: Colors.grey.shade600, fontSize: 12),
+                              ),
+                            ),
+                          ),
+                        SizedBox(width: 10.w,),
+                        // 修改按钮 (仅在 hasEdit 为 true 时显示)
+                        if (reservation.hasEdit)
+                          SizedBox(
+                            height: 28,
+                            child: OutlinedButton(
+                              onPressed: () 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,
+                                  );
+                                }
+                              },
+                              style: OutlinedButton.styleFrom(
+                                padding: const EdgeInsets.symmetric(horizontal: 12),
+                                side: const BorderSide(color: Colors.blue), // 蓝色边框
+                                shape: const StadiumBorder(),
+                                backgroundColor: Colors.white,
+                              ),
+                              child: const Text(
+                                '修改',
+                                style: TextStyle(color: Colors.blue, 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),
+                    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)),
+          ),
+        ],
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,267 @@
+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 < 24; i++) {
+      // 每次增加 60 分钟
+      final startMinutes = i * 60;
+      final endMinutes = startMinutes + 60;
+
+      final startTime = TimeOfDay(hour: startMinutes ~/ 60, minute: startMinutes % 60);
+      // 注意：endMinutes % 60 始终为 0，因为间隔是整小时
+      final endTime = TimeOfDay(hour: (endMinutes ~/ 60) % 24, minute: endMinutes % 60);
+
+      // 如果不是今天，所有时间段都有效
+      if (!isToday) {
+        availableSlots.add(TimeSlot(startTime, endTime));
+      } else {
+        // 如果是今天，需要判断该时间段是否可选
+        // 创建时间段的结束时间对象
+        final slotEndDateTime = DateTime(
+          selectedDate.value.year,
+          selectedDate.value.month,
+          selectedDate.value.day,
+          endTime.hour,
+          endTime.minute,
+        );
+
+        // 注意：如果是跨天的 00:00 (例如 23:00 - 00:00)，需要将日期加一天，否则 isAfter 判断会出错
+        // 但由于我们用的是 endTime.hour % 24，当变成 0 时，日期还是 selectedDate
+        // 这里做一个特殊处理：如果 endTime 是 00:00，意味着它实际上是明天的开始
+        DateTime realEndDateTime = slotEndDateTime;
+        if (endTime.hour == 0 && endTime.minute == 0) {
+          realEndDateTime = slotEndDateTime.add(const Duration(days: 1));
+        }
+
+        // 只要时间段的结束时间晚于当前时间，这个时间段就是可预约的
+        if (realEndDateTime.isAfter(now)) {
+          availableSlots.add(TimeSlot(startTime, endTime));
+        }
+      }
+    }
+
+    if (availableSlots.isEmpty) {
+      showToast('今天已没有可预约的时间段');
+      return;
+    }
+
+    // 查找当前选中的时间对应的新列表中的索引
+    int initialItem = availableSlots.indexWhere(
+      (slot) => slot.start.hour == startTime.value.hour,
+    );
+
+    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,
+          'stationId': reservation.stationId,
+          '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";
+}

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),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

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

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

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

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

ln_jq_app/lib/pages/home/controller.dart

@@ -1,7 +1,13 @@
+import 'dart:io';
+
+import 'package:aliyun_push_flutter/aliyun_push_flutter.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_native_splash/flutter_native_splash.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/base_widgets/view.dart';
 import 'package:ln_jq_app/pages/c_page/base_widgets/view.dart';
+import 'package:ln_jq_app/pages/c_page/message/view.dart';
 import 'package:ln_jq_app/pages/login/view.dart';
 
 import '../../storage_service.dart';
@@ -12,14 +18,19 @@ class HomeController extends GetxController with BaseControllerMixin {
 
   HomeController();
 
+  final _aliyunPush = AliyunPushFlutter();
+
   @override
   void onInit() {
     super.onInit();
+    initAliyunPush();
+    addPushCallback();
     FlutterNativeSplash.remove();
   }
 
   // 根据登录状态和登录渠道返回不同的首页
   Widget getHomePage() {
+    requestPermission();
     //登录状态跳转
     if (StorageService.to.isLoggedIn) {
       // 如果已登录，再判断是哪个渠道
@@ -35,4 +46,133 @@ class HomeController extends GetxController with BaseControllerMixin {
       return LoginPage();
     }
   }
+
+  void requestPermission() async {
+    PermissionStatus status = await Permission.notification.status;
+    if (status.isGranted) {
+      Logger.d("通知权限已开启");
+      return;
+    }
+
+    if (status.isDenied) {
+      // 建议此处增加一个应用内的 Rationale (解释说明) 弹窗
+      status = await Permission.notification.request();
+    }
+    if (status.isGranted) {
+      // 授权成功
+      Logger.d('通知已开启');
+    } else if (status.isPermanentlyDenied) {
+      Logger.d('通知权限已被拒绝，请到系统设置中开启');
+    } else if (status.isDenied) {
+      Logger.d('请授予通知权限，以便接收加氢站通知');
+    }
+  }
+
+  ///推送相关
+  Future<void> initAliyunPush() async {
+    // 1. 配置分离：建议将 Key 提取到外部或配置文件中
+    final String appKey = Platform.isIOS ? AppTheme.ios_key : AppTheme.android_key;
+    final String appSecret = Platform.isIOS
+        ? AppTheme.ios_appsecret
+        : AppTheme.android_appsecret;
+
+    try {
+      //  初始化推送
+      final result = await _aliyunPush.initPush(appKey: appKey, appSecret: appSecret);
+
+      if (result['code'] != kAliyunPushSuccessCode) {
+        Logger.d('初始化推送失败: ${result['code']} - ${result['errorMsg']}');
+        return;
+      }
+
+      Logger.d('阿里云推送初始化成功');
+      // 分平台配置
+      if (Platform.isIOS) {
+        await _setupIOSConfig();
+      } else if (Platform.isAndroid) {
+        await _setupAndroidConfig();
+      }
+    } catch (e) {
+      Logger.d('初始化过程中发生异常: $e');
+    }
+  }
+
+  /// iOS 专属配置
+  Future<void> _setupIOSConfig() async {
+    final res = await _aliyunPush.showIOSNoticeWhenForeground(true);
+    if (res['code'] == kAliyunPushSuccessCode) {
+      Logger.d('iOS 前台通知展示已开启');
+    } else {
+      Logger.d('iOS 前台通知开启失败: ${res['errorMsg']}');
+    }
+  }
+
+  /// Android 专属配置
+  Future<void> _setupAndroidConfig() async {
+    await _aliyunPush.setNotificationInGroup(true);
+    final res = await _aliyunPush.createAndroidChannel(
+      "xll_push_android",
+      '新消息通知',
+      4,
+      '用于接收加氢站实时状态提醒',
+    );
+    if (res['code'] == kAliyunPushSuccessCode) {
+      Logger.d('Android 通知通道创建成功');
+    } else {
+      Logger.d('Android 通道创建失败: ${res['code']} - ${res['errorMsg']}');
+    }
+  }
+
+  void addPushCallback() {
+    _aliyunPush.addMessageReceiver(
+      onNotification: _onNotification,
+      onNotificationOpened: _onNotificationOpened,
+      onNotificationRemoved: _onNotificationRemoved,
+      onMessage: _onMessage,
+      onAndroidNotificationReceivedInApp: _onAndroidNotificationReceivedInApp,
+      onAndroidNotificationClickedWithNoAction: _onAndroidNotificationClickedWithNoAction,
+      onIOSChannelOpened: _onIOSChannelOpened,
+      onIOSRegisterDeviceTokenSuccess: _onIOSRegisterDeviceTokenSuccess,
+      onIOSRegisterDeviceTokenFailed: _onIOSRegisterDeviceTokenFailed,
+    );
+  }
+
+  Future<void> _onAndroidNotificationClickedWithNoAction(
+    Map<dynamic, dynamic> message,
+  ) async {
+    Logger.d('onAndroidNotificationClickedWithNoAction ====> $message');
+  }
+
+  Future<void> _onAndroidNotificationReceivedInApp(Map<dynamic, dynamic> message) async {
+    Logger.d('onAndroidNotificationReceivedInApp ====> $message');
+  }
+
+  Future<void> _onMessage(Map<dynamic, dynamic> message) async {
+    Logger.d('onMessage ====> $message');
+  }
+
+  Future<void> _onNotification(Map<dynamic, dynamic> message) async {
+    Logger.d('onNotification ====> $message');
+  }
+
+  Future<void> _onNotificationOpened(Map<dynamic, dynamic> message) async {
+    Logger.d('onNotificationOpened ====> $message');
+    await Get.to(() => const MessagePage());
+  }
+
+  Future<void> _onNotificationRemoved(Map<dynamic, dynamic> message) async {
+    Logger.d('onNotificationRemoved ====> $message');
+  }
+
+  Future<void> _onIOSChannelOpened(Map<dynamic, dynamic> message) async {
+    Logger.d('onIOSChannelOpened ====> $message');
+  }
+
+  Future<void> _onIOSRegisterDeviceTokenSuccess(Map<dynamic, dynamic> message) async {
+    Logger.d('onIOSRegisterDeviceTokenSuccess ====> $message');
+  }
+
+  Future<void> _onIOSRegisterDeviceTokenFailed(Map<dynamic, dynamic> message) async {
+    Logger.d('onIOSRegisterDeviceTokenFailed====> $message');
+  }
 }

ln_jq_app/lib/pages/login/controller.dart

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

ln_jq_app/lib/pages/login/view.dart

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

ln_jq_app/lib/pages/qr_code/controller.dart

@@ -1,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();
   }
 }
+

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;
+  }
+}