更换logo

ln_jq_app/android/app/build.gradle.kts

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

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

@@ -1,50 +1,47 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
-    <uses-permission
-        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <!--定位权限-->
-    <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" />
+    <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:requestLegacyExternalStorage="true"
+        android:label="小羚羚"
         android:name="${applicationName}"
-        android:icon="@mipmap/logo"
-        android:label="小羚羚">
+        android:icon="@mipmap/logo">
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
-            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:taskAffinity=""
             android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme" />
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -54,54 +51,31 @@
             android:value="2" />
 
         <!-- 请填写你自己的- appKey -->
-        <meta-data
-            android:name="com.alibaba.app.appkey"
-            android:value="335642645" />
+        <meta-data android:name="com.alibaba.app.appkey" android:value="335642645"/>
         <!-- 请填写你自己的appSecret -->
-        <meta-data
-            android:name="com.alibaba.app.appsecret"
-            android:value="39628204345a4240b5b645b68a5896c7" />
+        <meta-data android:name="com.alibaba.app.appsecret" android:value="39628204345a4240b5b645b68a5896c7"/>
         <!-- 华为通道的参数appid -->
-        <meta-data
-            android:name="com.huawei.hms.client.appid"
-            android:value="" />
+        <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="" />
+        <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="" />
+        <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.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.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="" />
+        <meta-data android:name="com.meizu.push.id" android:value="" />
+        <meta-data android:name="com.meizu.push.key" android:value="" />
+
 
 
         <!-- 接收推送消息 -->
@@ -125,7 +99,6 @@
             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" />
 
@@ -144,8 +117,8 @@
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
         <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT" />
-            <data android:mimeType="text/plain" />
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
         </intent>
     </queries>
 </manifest>

ln_jq_app/assets/html/map.html

@@ -25,41 +25,6 @@
             display: none !important;
         }
 
-        /* 去除高德默认的 label 边框 and 背景 */
-        .amap-marker-label {
-            border: none !important;
-            background-color: transparent !important;
-        }
-
-        /* 自定义气泡样式 */
-        .custom-bubble {
-            position: relative;
-            background: rgba(51, 51, 51, 0.7);
-            /* #33333399 对应 rgba(51,51,51,0.7) */
-            color: #fff;
-            padding: 6px 15px;
-            border-radius: 20px;
-            /* 圆角 */
-            font-size: 13px;
-            white-space: nowrap;
-            box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
-            text-align: center;
-            line-height: 1.4;
-        }
-
-        /* 气泡下方的向下小箭头 */
-        .custom-bubble::after {
-            content: '';
-            position: absolute;
-            bottom: -6px;
-            /* 箭头高度 */
-            left: 50%;
-            transform: translateX(-50%);
-            border-width: 6px 6px 0 6px;
-            border-style: solid;
-            border-color: rgba(51, 51, 51, 0.7) transparent transparent transparent;
-        }
-
         #panel .amap-call {
             display: none;
         }
@@ -67,7 +32,7 @@
         /* --- 搜索栏样式 --- */
         #search-box {
             position: absolute;
-            top: 40px;
+            top: 10px;
             left: 10px;
             right: 10px;
             z-index: 100;
@@ -98,7 +63,7 @@
         button {
             padding: 0 15px;
             height: 38px;
-            background: #017143FF;
+            background: #3366FF;
             color: #fff;
             border: none;
             border-radius: 4px;
@@ -109,7 +74,7 @@
         /* --- 导航结果面板 (底部弹出) --- */
         #panel {
             position: fixed;
-            bottom: 95px;
+            bottom: 0;
             left: 0;
             width: 100%;
             height: 35%;
@@ -129,7 +94,7 @@
         #location-btn {
             position: fixed;
             right: 10px;
-            bottom: 105px;
+            bottom: 50px;
             /* 默认位置 */
             width: 44px;
             height: 44px;
@@ -156,24 +121,9 @@
             fill: #555;
         }
 
-        /* --- 调整比例尺位置 --- */
-        .amap-scalecontrol {
-            /* 初始状态：避开底部的定位按钮或留出安全间距 */
-            bottom: 110px !important;
-            left: 10px !important;
-            transition: bottom 0.3s ease;
-            /* 增加平滑动画 */
-        }
-
-        /* --- 当路径规划面板显示时，比例尺自动上移 --- */
-        body.panel-active .amap-scalecontrol {
-            bottom: 38% !important;
-            /* 移动到面板上方 (面板高度35% + 3%间距) */
-        }
-
         /* --- 关键：当 body 有 panel-active 类时，按钮上移 --- */
         body.panel-active #location-btn {
-            bottom: 45%;
+            bottom: 38%;
             /* 对应 #panel 的 height + 一点间距 */
         }
     </style>
@@ -195,10 +145,10 @@
 
     <div id="search-box">
         <div class="input-row">
-            <input id="startInput" placeholder="起点: 请输入当前地点" onfocus="this.select()" />
+            <input id="startInput" placeholder="起点: 请输入当前地点" />
         </div>
         <div class="input-row">
-            <input id="endInput" placeholder="终点: 请输入目的地" onfocus="this.select()" />
+            <input id="endInput" placeholder="终点: 请输入目的地" />
             <button onclick="startRouteSearch()">路径规划</button>
         </div>
     </div>
@@ -217,17 +167,16 @@
     </div>
 
     <script>
-        var map, marker, destMarker, driving, truckDriving, geocoder;
+        var map, marker, driving, truckDriving, geocoder;
         var currentLat, currentLng;
         var isTruckMode = false;
         var isInitialLocationSet = false;
-        var stationMarkers = []; // 存储所有站点的标记
 
 
         function initMap() {
             map = new AMap.Map('container', {
                 resizeEnable: true,
-                zoom: 17,
+                zoom: 15,
                 viewMode: '3D'
             });
 
@@ -244,11 +193,6 @@
                 }
             });
 
-            // 点击地图空白处重置状态
-            map.on('click', function() {
-                resetSearchState();
-            });
-
             // 添加基础控件
             map.addControl(new AMap.Scale());
             map.addControl(new AMap.ToolBar({
@@ -290,23 +234,10 @@
             });
         }
 
-        /**
-         * 重置搜索状态，隐藏面板和路线
-         */
-        function resetSearchState() {
-            if (document.body.classList.contains('panel-active')) {
-                console.log("JS->: 重置地图状态");
-                document.body.classList.remove('panel-active');
-                var panel = document.getElementById('panel');
-                panel.style.display = 'none';
-                if (driving) driving.clear();
-            }
-        }
-
         /**
          * 核心功能 1: 接收 Flutter 传来的定位数据
          * Flutter 端调用: webViewController.evaluateJavascript("updateMyLocation(...)")
-         *  纬度 经度
+         *  经度  维度
          */
         function updateMyLocation(lat, lng, angle) {
             var rawLat = parseFloat(lat);
@@ -332,7 +263,6 @@
                             angle: isNaN(rawAngle) ? 0 : rawAngle,
                         });
                         map.setCenter(position);
-                        map.setZoom(13);
                     } else {
                         marker.moveTo(position, {
                             duration: 1000,
@@ -351,12 +281,6 @@
                                 const addressComponent = regeo.addressComponent;
                                 const pois = regeo.pois;
 
-                                console.log("地理：" + JSON.stringify(result));
-                                fetchStationInfo(addressComponent.province, addressComponent.city,
-                                    addressComponent.district, lat, lng);
-
-                                fetchStationInfoList(lat, lng);
-
                                 // 策略1: 优先使用最近的、类型合适的POI的名称
                                 if (pois && pois.length > 0) {
                                     // 查找第一个类型不是“商务住宅”或“地名地址信息”的POI，这类POI通常是具体的建筑或地点名
@@ -371,9 +295,8 @@
                                 }
                                 // 策略2: 如果没有POI，使用"道路+门牌号"
                                 else if (addressComponent.street && addressComponent.streetNumber) {
-                                    shortAddress = addressComponent.district +
-                                        addressComponent.township +
-                                        addressComponent.street + addressComponent.streetNumber;
+                                    shortAddress = addressComponent.street + addressComponent
+                                        .streetNumber;
                                 }
                                 // 策略3: 如果还没有，使用"区+乡镇"
                                 else if (addressComponent.district) {
@@ -407,163 +330,7 @@
         }
 
         /**
-         *  调用后端接口获取站点
-         */
-        function fetchStationInfo(province, city, district, lat, lng) {
-            // 注意：某些直辖市在高德中 city 字段可能为空，需做兼容处理
-            console.log("JS->: 开始请求." + province + city + district);
-            var cityName = (typeof city === 'string' && city.length > 0) ? city : province;
-
-            fetch('https://beta-esg.api.lnh2e.com/appointment/station/getStationInfoByArea', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({
-                        province: province,
-                        city: cityName,
-                        district: district,
-                        longitude: lng,
-                        latitude: lat,
-                    })
-                })
-                .then(response => {
-                    if (!response.ok) {
-                        throw new Error('网络响应错误: ' + response.status);
-                    }
-                    return response.json(); // 解析 JSON
-                })
-                .then(res => {
-                    // 打印完整的返回结果，方便调试观察结构
-                    console.log("JS->: 接口完整返回:", JSON.stringify(res));
-
-                    // 安全校验：判断 res.data 是否存在
-                    if (res.code === 0 && res.data) {
-                        if (res.data.address) {
-                            console.log("JS->: 找到地址:", res.data.address);
-                            var destAddress = res.data.address;
-                            document.getElementById('endInput').value = destAddress;
-                            // 标记终点
-                            markDestination(destAddress, res.data.name || "目的地",
-                                res.data.longitude, res.data.latitude
-                            );
-                        } else {
-                            console.log("JS->: 接口请求成功，但该区域暂无站点地址");
-                        }
-                    } else {
-                        console.log("JS->: 业务报错或无数据:", res.message);
-                    }
-                })
-                .catch(err => console.error('JS->:获取站点信息失败:', err));
-        }
-
-        /**
-         * 获取站点列表
-         */
-        function fetchStationInfoList(lat, lng) {
-            fetch('https://beta-esg.api.lnh2e.com/appointment/station/getNearbyHydrogenStationsByLocation', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({
-                        longitude: lng,
-                        latitude: lat,
-                    })
-                })
-                .then(response => {
-                    if (!response.ok) {
-                        throw new Error('网络响应错误: ' + response.status);
-                    }
-                    return response.json(); // 解析 JSON
-                })
-                .then(res => {
-                    console.log("JS->:2 接口完整返回:", JSON.stringify(res));
-                    if (res.code === 0 && res.data && Array.isArray(res.data)) {
-                        // 1. 清除旧的站点标记
-                        stationMarkers.forEach(m => m.setMap(null));
-                        stationMarkers = [];
-
-                        // 2. 循环标记所有加氢站
-                        res.data.forEach(station => {
-                            var stationIcon = new AMap.Icon({
-                                size: new AMap.Size(32, 32),
-                                image: 'ic_tag.png',
-                                imageSize: new AMap.Size(32, 32)
-                            });
-
-                            var sMarker = new AMap.Marker({
-                                map: map,
-                                position: [station.longitude, station.latitude],
-                                icon: stationIcon,
-                                offset: new AMap.Pixel(-16, -32),
-                                title: station.name,
-                                label: {
-                                    content: '<div class="custom-bubble">' + station.name +
-                                        '</div>',
-                                    direction: 'top'
-                                }
-                            });
-
-                            // 3. 绑定点击事件：选中即为目的地，并开始规划
-                            sMarker.on('click', function () {
-                                var stationName = station.name || "目的地";
-                                document.getElementById('endInput').value = station.address ||
-                                    stationName;
-
-                                // 更新当前的 destMarker
-                                if (destMarker && destMarker !== sMarker) destMarker.setMap(null);
-                                destMarker = sMarker;
-
-                                // 直接传入坐标对象，避免关键字搜索失败
-                                var loc = new AMap.LngLat(station.longitude, station.latitude);
-                                startRouteSearch(loc);
-                            });
-
-                            stationMarkers.push(sMarker);
-                        });
-
-                    } else {
-                        console.log("JS->: 业务报错或无数据:", res.message);
-                    }
-                })
-                .catch(err => console.error('JS->:获取站点信息失败:', err));
-        }
-
-        /**
-         *  地理编码并在地图标记终点
-         */
-        function markDestination(address, name, longitude, latitude) {
-
-
-            // 1. 清除旧的终点标记
-            if (destMarker) destMarker.setMap(null);
-
-            // 2. 创建自定义图标
-            var destIcon = new AMap.Icon({
-                size: new AMap.Size(32, 32), // 图标尺寸
-                image: 'ic_tag.png', // 本地图片路径
-                imageSize: new AMap.Size(32, 32) // 图片在图标内拉伸的大小
-            });
-
-            // 3. 创建标记
-            destMarker = new AMap.Marker({
-                map: map,
-                position: [longitude, latitude],
-                icon: destIcon, // 使用自定义图标
-                offset: new AMap.Pixel(-16, -32),
-                title: name,
-                label: {
-                    content: '<div class="custom-bubble">' + name + '</div>',
-                    direction: 'top'
-                }
-            });
-
-            console.log("JS->: 终点标记已添加", address);
-        }
-
-        /**
-         * 点击按钮回到当前位置
+         * 核心功能 2: 点击按钮回到当前位置
          */
         function backToLocation() {
             if (currentLng && currentLat) {
@@ -578,12 +345,11 @@
             }
         }
 
-        
         /**
-         * 路径规划
-         * @param {AMap.LngLat} [destLoc] 可选的终点坐标
+         * 核心功能 3: 路径规划
          */
-        function startRouteSearch(destLoc) {
+        function startRouteSearch() {
+            // 获取输入框的文字
             var startKw = document.getElementById('startInput').value;
             var endKw = document.getElementById('endInput').value;
 
@@ -591,59 +357,63 @@
                 alert("请输入起点");
                 return;
             }
+
             if (!endKw) {
                 alert("请输入终点");
                 return;
             }
 
+            // 清除旧路线
             if (driving) driving.clear();
+
+            // 收起键盘
             document.getElementById('startInput').blur();
             document.getElementById('endInput').blur();
 
+            // --- 构造路径规划的点 (使用数组方式，更灵活) ---
             var points = [];
 
-            // 1. 起点逻辑
-            if (!startKw || startKw === '我的位置' || startKw.includes('当前位置')) {
+            // 1. 处理起点逻辑
+            // 如果输入框是空的，或者写着 "我的位置"，则使用 GPS 坐标
+            if (!startKw || startKw === '我的位置') {
                 if (!currentLng || !currentLat) {
-                    if (window.flutter_inappwebview) window.flutter_inappwebview.callHandler('requestLocation');
+                    // 如果还没获取到定位
+                    if (window.flutter_inappwebview) {
+                        window.flutter_inappwebview.callHandler('requestLocation');
+                    }
                     alert("正在获取定位，请稍后...");
                     return;
                 }
+                // 使用精准坐标对象 (避免高德去猜 '我的位置' 关键词)
                 points.push({
-                    keyword: '我的位置',
-                    location: new AMap.LngLat(currentLng, currentLat)
+                    keyword: '我的位置', // 用于显示的名字
+                    location: new AMap.LngLat(currentLng, currentLat) // 实际导航用的坐标
                 });
             } else {
+                // 如果用户手动输入了地点 (例如 "北京南站")
+                // 直接存入关键词，让高德自己去搜
                 points.push({
                     keyword: startKw
                 });
             }
 
-            // 2. 终点逻辑：如果有传入坐标，则直接使用坐标导航，成功率最高
-            if (destLoc) {
-                points.push({
-                    keyword: endKw,
-                    location: destLoc // 关键：使用精确坐标
-                });
-            } else {
-                points.push({
-                    keyword: endKw
-                });
-            }
+            // 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("规划失败，请检查起终点名称");
                 }
-                // else {
-                //     console.error('JS: 规划失败', result);
-                //     // 如果坐标规划都失败了，通常是由于起终点距离过近或政策限制（如货车禁行）
-                //     alert("路径规划未成功，请尝试微调起终点");
-                // }
             });
         }
 

ln_jq_app/ios/Podfile.lock

@@ -12,8 +12,6 @@ PODS:
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
-  - flutter_app_update (0.0.1):
-    - Flutter
   - flutter_inappwebview_ios (0.0.1):
     - Flutter
     - flutter_inappwebview_ios/Core (= 0.0.1)
@@ -41,8 +39,6 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
-  - saver_gallery (0.0.1):
-    - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -54,7 +50,6 @@ DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
-  - flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`)
   - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_pdfview (from `.symlinks/plugins/flutter_pdfview/ios`)
@@ -64,7 +59,6 @@ DEPENDENCIES:
   - 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`)
-  - saver_gallery (from `.symlinks/plugins/saver_gallery/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
@@ -86,8 +80,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
     :path: Flutter
-  flutter_app_update:
-    :path: ".symlinks/plugins/flutter_app_update/ios"
   flutter_inappwebview_ios:
     :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_native_splash:
@@ -106,8 +98,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  saver_gallery:
-    :path: ".symlinks/plugins/saver_gallery/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   url_launcher_ios:
@@ -121,7 +111,6 @@ SPEC CHECKSUMS:
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   device_info_plus: 71ffc6ab7634ade6267c7a93088ed7e4f74e5896
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_pdfview: 32bf27bda6fd85b9dd2c09628a824df5081246cf
@@ -132,7 +121,6 @@ SPEC CHECKSUMS:
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
-  saver_gallery: af2d0c762dafda254e0ad025ef0dabd6506cd490
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
 

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

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

ln_jq_app/ios/Runner/Info.plist

@@ -70,17 +70,5 @@
     		<string>fetch</string>
     	</array>
 
-<key>CFBundleLocalizations</key>
-<array>
-    <string>zh-Hans</string>
-    <string>en</string>
-</array>
-
-<key>UIFileSharingEnabled</key>
-<true/>
-<!-- 允许在“文件”App中直接打开文档 -->
-<key>LSSupportsOpeningDocumentsInPlace</key>
-<true/>
-
 </dict>
 </plist>

ln_jq_app/lib/common/AuthGuard.dart

@@ -1,22 +0,0 @@
-import 'package:getx_scaffold/common/index.dart';
-import 'package:ln_jq_app/pages/login/view.dart';
-import 'package:ln_jq_app/storage_service.dart';
-
-class AuthGuard {
-  static bool _handling401 = false;
-
-  static Future<void> handle401(String? message) async {
-    if (_handling401) return;
-    _handling401 = true;
-
-    try {
-      await StorageService.to.clearLoginInfo();
-      Get.offAll(() => const LoginPage());
-    } finally {
-      // 防止意外卡死，可视情况是否延迟重置
-      Future.delayed(const Duration(seconds: 1), () {
-        _handling401 = false;
-      });
-    }
-  }
-}

ln_jq_app/lib/common/login_util.dart

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

ln_jq_app/lib/common/model/station_model.dart

@@ -4,9 +4,7 @@ class StationModel {
   final String address;
   final String price;
   final String siteStatusName; // 例如 "维修中"
-  final int isSelect; // 1是可用 0是不可用
-  final String startBusiness; // 新增：可预约最早开始时间，如 "06:00:00"
-  final String endBusiness;   // 新增：可预约最晚结束时间，如 "22:00:00"
+  final int isSelect; // 新增字段 1是可用 0是不可用
 
   StationModel({
     required this.hydrogenId,
@@ -15,10 +13,9 @@ class StationModel {
     required this.price,
     required this.siteStatusName,
     required this.isSelect,
-    required this.startBusiness,
-    required this.endBusiness,
   });
 
+  // 从 JSON map 创建对象的工厂构造函数
   factory StationModel.fromJson(Map<String, dynamic> json) {
     return StationModel(
       hydrogenId: json['hydrogenId'] ?? '',
@@ -26,9 +23,7 @@ class StationModel {
       address: json['address'] ?? '地址未知',
       price: json['price']?.toString() ?? '0.00',
       siteStatusName: json['siteStatusName'] ?? '',
-      isSelect: json['isSelect'] as int? ?? 0,
-      startBusiness: json['startBusiness'] ?? '00:00:00', // 默认全天
-      endBusiness: json['endBusiness'] ?? '23:59:59',     // 默认全天
+      isSelect: json['isSelect'] as int? ?? 0, // 新增字段的解析，默认为 0
     );
   }
 }

ln_jq_app/lib/common/styles/theme.dart

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

ln_jq_app/lib/main.dart

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

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

@@ -1,25 +1,22 @@
 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(), // 页面的列表
     );
   }
 
@@ -28,59 +25,33 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
     controller.updateUi(); // 更新 UI
     _pageController.jumpToPage(controller.pageIndex);
   }
-
   // 对应的页面
   List<Widget> _buildPages() {
-    return [SitePage(), ReservationPage()];
+    return [
+      SitePage(),
+      ReservationPage(),
+    ];
   }
 
-  // 自定义导航栏 (悬浮胶囊样式)
+  //导航栏
   Widget _buildNavigationBar() {
-    return SafeArea(
-      child: Container(
-        height: 50.h,
-        margin: const EdgeInsets.fromLTRB(24, 0, 24, 10), // 悬浮边距
-        decoration: BoxDecoration(
-          color: Color.fromRGBO(240, 244, 247, 1), // 浅灰色背景
-          borderRadius: BorderRadius.circular(30),
-          boxShadow: [
-            BoxShadow(
-              color: Colors.black.withOpacity(0.05),
-              blurRadius: 10,
-              offset: const Offset(0, 5),
-            ),
-          ],
+    return NavigationX(
+      currentIndex: controller.pageIndex, // 当前选中的tab索引
+      onTap: (index) {
+        jumpTabAndPage(index);
+      }, // 切换tab事件
+      items: [
+        NavigationItemModel(
+          label: '加氢预约',
+          icon: AntdIcon.orderedlist,
+          selectedIcon: AntdIcon.calendar_fill,
         ),
-        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"),
-          ],
+        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:  EdgeInsets.symmetric(horizontal: 50.w, vertical: 8),
-        decoration: BoxDecoration(
-          color: isSelected ? const Color(0xFF006633) : Colors.transparent, // 选中时的深绿色背景
-          borderRadius: BorderRadius.circular(20),
-        ),
-        child: SizedBox(
-          height: 24,
-          width: 24,
-          child: LoginUtil.getAssImg(isSelected ? selectedIcon : icon),
-        ),
-      ),
+      ],
     );
   }
 
@@ -91,10 +62,10 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
       id: 'b_baseWidgets',
       builder: (_) {
         return Scaffold(
-          extendBody: true,
+          extendBody: false,
           resizeToAvoidBottomInset: false,
           bottomNavigationBar: _buildNavigationBar(),
-          body: _buildView(),
+          body: SafeArea(child: _buildView()),
         );
       },
     );

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

@@ -1,11 +1,10 @@
+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 with BaseControllerMixin {
-  @override
-  String get builderId => 'history';
-
+class HistoryController extends GetxController {
   // --- 定义 API 需要的日期格式化器 ---
   final DateFormat _apiDateFormat = DateFormat('yyyy-MM-dd');
 
@@ -14,8 +13,8 @@ class HistoryController extends GetxController with BaseControllerMixin {
   final Rx<DateTime> endDate = DateTime.now().obs;
   final TextEditingController plateNumberController = TextEditingController();
 
-  final RxString totalHydrogen = '0'.obs;
-  final RxString totalCompletions = '0'.obs;
+  final RxString totalHydrogen = '0 kg'.obs;
+  final RxString totalCompletions = '0 次'.obs;
 
   final RxList<ReservationModel> historyList = <ReservationModel>[].obs;
   final RxBool isLoading = true.obs;
@@ -24,31 +23,14 @@ class HistoryController extends GetxController with BaseControllerMixin {
   String get formattedStartDate => DateFormat('yyyy/MM/dd').format(startDate.value);
 
   String get formattedEndDate => DateFormat('yyyy/MM/dd').format(endDate.value);
-
   String stationName = "";
 
-  final Map<String, String> statusOptions = {
-    '': '全部',
-    '100': '未预约加氢',
-    '0': '待加氢',
-    '1': '已加氢',
-    '2': '未加氢',
-    '5': '拒绝加氢',
-  };
-
-  final RxString selectedStatus = ''.obs;
-  final RxString selectedDateType = ''.obs; // week, month, three_month
-
   @override
   void onInit() {
     super.onInit();
-    final args = Get.arguments as Map<String, dynamic>;
-    stationName = args['stationName'] as String? ?? "";
-    refreshData();
-  }
 
-  void refreshData() {
-    getAllOrderCounts();
+    final args = Get.arguments as Map<String, dynamic>;
+    stationName = args['stationName'] as String;
     fetchHistoryData();
   }
 
@@ -56,50 +38,51 @@ class HistoryController extends GetxController with BaseControllerMixin {
     var response = await HttpService.to.post(
       "appointment/orderAddHyd/getAllOrderCounts",
       data: {
-        /*'startTime': _apiDateFormat.format(startDate.value),
-        'endTime': _apiDateFormat.format(endDate.value),*/
+        // --- 直接使用 DateFormat 来格式化日期 ---
+        'startTime': _apiDateFormat.format(startDate.value),
+        'endTime': _apiDateFormat.format(endDate.value),
         'plateNumber': plateNumberController.text,
-        'stationName': stationName,
-        "status": selectedStatus.value,
-        "dateType": selectedDateType.value,
+        'stationName': stationName, // 加氢站名称
       },
     );
     if (response == null || response.data == null) {
-      totalHydrogen.value = '0';
-      totalCompletions.value = '0';
+      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}';
-      totalCompletions.value = '${dataMap['orderCompleteCount'] ?? 0}';
+      totalHydrogen.value = '${dataMap['totalAddAmount'] ?? 0} kg';
+      totalCompletions.value = '${dataMap['orderCompleteCount'] ?? 0} 次';
     } catch (e) {
-      totalHydrogen.value = '0';
-      totalCompletions.value = '0';
+      totalHydrogen.value = '0 kg';
+      totalCompletions.value = '0 次';
     }
   }
 
   Future<void> fetchHistoryData() async {
     isLoading.value = true;
-    updateUi();
+
+    //获取数据
+    getAllOrderCounts();
 
     try {
       var response = await HttpService.to.post(
         "appointment/orderAddHyd/sitOrderPage",
         data: {
-          /*'startTime': _apiDateFormat.format(startDate.value),
-          'endTime': _apiDateFormat.format(endDate.value),*/
+          // --- 直接使用 DateFormat 来格式化日期 ---
+          'startTime': _apiDateFormat.format(startDate.value),
+          'endTime': _apiDateFormat.format(endDate.value),
           'plateNumber': plateNumberController.text,
           'pageNum': 1,
           'pageSize': 50,
-          'stationName': stationName,
-          "status": selectedStatus.value,
-          "dateType": selectedDateType.value,
+          'stationName': stationName, // 加氢站名称
         },
       );
 
       if (response == null || response.data == null) {
+        showToast('无法获取历史记录');
         _resetData();
         return;
       }
@@ -107,6 +90,7 @@ class HistoryController extends GetxController with BaseControllerMixin {
       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
@@ -115,13 +99,14 @@ class HistoryController extends GetxController with BaseControllerMixin {
         );
         hasData.value = historyList.isNotEmpty;
       } else {
+        showToast(baseModel.message);
         _resetData();
       }
     } catch (e) {
+      showToast('获取历史记录失败: $e');
       _resetData();
     } finally {
       isLoading.value = false;
-      updateUi();
     }
   }
 
@@ -130,15 +115,97 @@ class HistoryController extends GetxController with BaseControllerMixin {
     hasData.value = false;
   }
 
-  void onStatusSelected(String status) {
-    if (selectedStatus.value == status) return;
-    selectedStatus.value = status;
-    refreshData();
-  }
+  void pickDate(BuildContext context, bool isStartDate) {
+    //  确定当前操作的日期和临时存储变量
+    final DateTime initialDate = isStartDate ? startDate.value : endDate.value;
+    DateTime tempDate = initialDate;
 
-  void onDateTypeSelected(String type) {
-    selectedDateType.value = type;
-    refreshData();
+    //  定义全局的最早可选日期
+    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

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

@@ -1,173 +1,107 @@
 import 'package:flutter/material.dart';
-import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/login_util.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';
+import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // Reuse ReservationModel
 
 class HistoryPage extends GetView<HistoryController> {
-  const HistoryPage({super.key});
+  const HistoryPage({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return GetBuilder<HistoryController>(
-      init: HistoryController(),
-      id: 'history',
-      builder: (_) {
-        return Scaffold(
-          backgroundColor: const Color(0xFFF7F8FA),
-          appBar: AppBar(
-            backgroundColor: Colors.white,
-            elevation: 0,
-            leading: IconButton(
-              icon: const Icon(Icons.arrow_back_ios, color: Colors.black, size: 20),
-              onPressed: () => Get.back(),
-            ),
-            title: _buildSearchBox(),
-          ),
-          body: Column(
-            children: [
-              _buildFilterBar(),
-              _buildSummaryCard(),
-              Expanded(child: _buildHistoryList()),
-            ],
-          ),
-        );
-      },
-    );
-  }
+    Get.put(HistoryController());
 
-  Widget _buildSearchBox() {
-    return Container(
-      height: 36,
-      decoration: BoxDecoration(
-        color: const Color(0xFFF2F3F5),
-        borderRadius: BorderRadius.circular(18),
-      ),
-      child: TextField(
-        controller: controller.plateNumberController,
-        onSubmitted: (v) => controller.refreshData(),
-        decoration: const InputDecoration(
-          hintText: '搜索车牌号',
-          hintStyle: TextStyle(color: Color(0xFFBBBBBB), fontSize: 14),
-          prefixIcon: Icon(Icons.search_sharp, color: Color(0xFFBBBBBB), size: 20),
-          border: InputBorder.none,
-          contentPadding: EdgeInsets.only(bottom: 12),
+    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 _buildFilterBar() {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      child: Row(
-        children: [
-          Expanded(
-            child: SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: Row(
-                children: controller.statusOptions.entries.map((entry) {
-                  return Obx(() {
-                    bool isSelected = controller.selectedStatus.value == entry.key;
-                    return GestureDetector(
-                      onTap: () => controller.onStatusSelected(entry.key),
-                      child: Container(
-                        margin: const EdgeInsets.only(right: 12),
-                        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
-                        decoration: BoxDecoration(
-                          color: isSelected ? const Color(0xFF006633) : Colors.white,
-                          borderRadius: BorderRadius.circular(15),
-                        ),
-                        child: Text(
-                          entry.value,
-                          style: TextStyle(
-                            color: isSelected
-                                ? Colors.white
-                                : Color.fromRGBO(148, 163, 184, 1),
-                            fontSize: 12.sp,
-                            fontWeight: isSelected ? FontWeight.bold : FontWeight.w600,
-                          ),
-                        ),
-                      ),
-                    );
-                  });
-                }).toList(),
+  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),
+                ),
               ),
             ),
-          ),
-          _buildTimeFilterIcon(),
-        ],
+            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 _buildTimeFilterIcon() {
-    return PopupMenuButton<String>(
-      icon: LoginUtil.getAssImg("ic_ex_menu@2x"),
-      onSelected: controller.onDateTypeSelected,
-      itemBuilder: (context) => [
-        const PopupMenuItem(value: 'week', child: Text('最近一周')),
-        const PopupMenuItem(value: 'month', child: Text('最近一月')),
-        const PopupMenuItem(value: 'three_month', child: Text('最近三月')),
-      ],
-    );
-  }
-
   Widget _buildSummaryCard() {
-    return Container(
-      margin: const EdgeInsets.only(left: 16, right: 16,bottom: 12),
-      padding: const EdgeInsets.all(20),
-      height: 160,
-      width: double.infinity,
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(24),
-        image: const DecorationImage(
-          image: AssetImage('assets/images/history_bg.png'),
-          fit: BoxFit.cover,
-        ),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const Text('加氢站', style: TextStyle(color: Colors.white70, fontSize: 12)),
-          Text(
-            controller.stationName,
-            style: const TextStyle(
-              color: Colors.white,
-              fontSize: 20,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-          const Spacer(),
-          Obx(
-            () => Row(
-              children: [
-                _buildSummaryItem('实际加氢量', '${controller.totalHydrogen.value} Kg'),
-                const SizedBox(width: 40),
-                _buildSummaryItem('预约完成次数', '${controller.totalCompletions.value} 次'),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildSummaryItem(String label, String value) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(label, style: const TextStyle(color: Colors.white60, fontSize: 12)),
-        const SizedBox(height: 4),
-        Text(
-          value,
-          style: const TextStyle(
-            color: Colors.white,
-            fontSize: 18,
-            fontWeight: FontWeight.bold,
+    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,
+              ),
+            ],
           ),
         ),
-      ],
+      ),
     );
   }
 
@@ -176,138 +110,143 @@ class HistoryPage extends GetView<HistoryController> {
       if (controller.isLoading.value) {
         return const Center(child: CircularProgressIndicator());
       }
-      if (controller.historyList.isEmpty) {
-        return const Center(
-          child: Text('暂无相关记录', style: TextStyle(color: Color(0xFF999999))),
-        );
+      if (!controller.hasData.value) {
+        return const Center(child: Text('没有找到相关记录'));
       }
       return ListView.builder(
-        padding: const EdgeInsets.symmetric(horizontal: 16),
         itemCount: controller.historyList.length,
         itemBuilder: (context, index) {
-          return _buildHistoryItem(controller.historyList[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 _buildHistoryItem(ReservationModel item) {
-    return Container(
-      margin: const EdgeInsets.only(bottom: 12),
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    '车牌号',
-                    style: TextStyle(
-                      color: Color.fromRGBO(148, 163, 184, 1),
-                      fontSize: 12.sp,
-                    ),
-                  ),
-                  const SizedBox(height: 4),
-                  Text(
-                    item.plateNumber,
-                    style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
-                  ),
-                ],
-              ),
-              _buildStatusBadge(item.status),
-            ],
-          ),
-          const SizedBox(height: 16),
-          Row(
-            children: [
-              _buildInfoColumn('加氢时间：', item.time),
-              _buildInfoColumn('加氢量', '${item.amount} Kg', isRight: true),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildInfoColumn(String label, String value, {bool isRight = false}) {
-    return Expanded(
-      child: Column(
-        crossAxisAlignment: isRight ? CrossAxisAlignment.end : CrossAxisAlignment.start,
-        children: [
-          Text(
-            label,
-            style: TextStyle(color: Color.fromRGBO(148, 163, 184, 1), fontSize: 12.sp),
-          ),
-          const SizedBox(height: 4),
-          Text(
-            value,
-            style: TextStyle(
-              fontSize: isRight ? 16 : 13,
-              fontWeight: isRight ? FontWeight.bold : FontWeight.normal,
-              color: const Color(0xFF333333),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildStatusBadge(ReservationStatus status) {
-    String text = '未知';
-    Color bgColor = Colors.grey.shade100;
-    Color textColor = Colors.grey;
-
+  Widget _buildStatusChip(ReservationStatus status) {
+    String text;
+    Color color;
     switch (status) {
       case ReservationStatus.pending:
         text = '待加氢';
-        bgColor = const Color(0xFFFFF7E8);
-        textColor = const Color(0xFFFF9800);
+        color = Colors.orange;
         break;
       case ReservationStatus.completed:
         text = '已加氢';
-        bgColor = const Color(0xFFE8F5E9);
-        textColor = const Color(0xFF4CAF50);
+        color = Colors.greenAccent;
         break;
       case ReservationStatus.rejected:
         text = '拒绝加氢';
-        bgColor = const Color(0xFFFFEBEE);
-        textColor = const Color(0xFFF44336);
+        color = Colors.red;
         break;
       case ReservationStatus.unadded:
         text = '未加氢';
-        bgColor = const Color(0xFFFFEBEE);
-        textColor = const Color(0xFFF44336);
+        color = Colors.red;
         break;
       case ReservationStatus.cancel:
         text = '已取消';
-        bgColor = const Color(0xFFFFEBEE);
-        textColor = const Color(0xFFF44336);
+        color = Colors.red;
         break;
       default:
         text = '未知状态';
-        bgColor = Colors.grey;
-        textColor = Colors.grey;
+        color = Colors.grey;
         break;
     }
-
     return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
       decoration: BoxDecoration(
-        color: bgColor,
-        borderRadius: BorderRadius.circular(8),
-        border: Border.all(color: textColor.withOpacity(0.3)),
+        color: color.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(12),
       ),
-      child: Text(
-        text,
-        style: TextStyle(color: textColor, fontSize: 12, fontWeight: FontWeight.bold),
+      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

@@ -45,7 +45,6 @@ class ReservationController extends GetxController with BaseControllerMixin {
     customStartTime = DateTime.now();
     customEndTime = customStartTime!.add(const Duration(days: 1));
     renderData();
-    msgNotice(); // 红点消息
     startAutoRefresh();
   }
 
@@ -95,7 +94,6 @@ class ReservationController extends GetxController with BaseControllerMixin {
   String jobDetailsStr = "";
   String jobId = "";
   Timer? _refreshTimer;
-  bool isNotice = false;
 
   Future<void> renderData() async {
     showLoading("加载中");
@@ -170,7 +168,7 @@ class ReservationController extends GetxController with BaseControllerMixin {
                 }
 
                 jobDetailsStr =
-                "当前站点已设置$beginTime至$endTime，共${hoursLeft.toStringAsFixed(2)}小时，为$hydStatusStr状态";
+                    "当前站点已设置$beginTime至$endTime，共${hoursLeft.toStringAsFixed(2)}小时，为$hydStatusStr状态";
 
                 //  如果是处于非营运状态，自动回填开始和结束时间
                 // 假设 customStartTime 是现在，customEndTime 是接口返回的结束时间
@@ -212,7 +210,7 @@ class ReservationController extends GetxController with BaseControllerMixin {
 
         var customerPriceTemp = result.data["customerPrice"];
         customerPrice =
-        (customerPriceTemp != null && customerPriceTemp.toString().isNotEmpty)
+            (customerPriceTemp != null && customerPriceTemp.toString().isNotEmpty)
             ? "$customerPriceTemp"
             : "暂无价格";
 
@@ -248,27 +246,6 @@ class ReservationController extends GetxController with BaseControllerMixin {
     }
   }
 
-  Future<void> msgNotice() async {
-    final Map<String, dynamic> requestData = {
-      'appFlag': 1,
-      'isRead': 1,
-      'pageNum': 1,
-      'pageSize': 5,
-    };
-    final response = await HttpService.to.get(
-      'appointment/unread_notice/page',
-      params: requestData,
-    );
-    if (response != null) {
-      final result = BaseModel.fromJson(response.data);
-      if (result.code == 0 && result.data != null) {
-        String total = result.data["total"].toString();
-        isNotice = int.parse(total) > 0;
-        updateUi();
-      }
-    }
-  }
-
   void onOperationStatusChanged(String? newValue) {
     if (newValue != null) {
       selectedOperationStatus = newValue;

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

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

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

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
+import 'package:getx_scaffold/common/index.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/pages/c_page/car_info/view.dart';
-import 'package:ln_jq_app/pages/c_page/mall/mall_view.dart';
 import 'package:ln_jq_app/pages/c_page/map/view.dart';
 import 'package:ln_jq_app/pages/c_page/mine/view.dart';
 import 'package:ln_jq_app/pages/c_page/reservation/view.dart';
@@ -11,10 +9,9 @@ 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(
@@ -23,70 +20,54 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
       onPageChanged: (index) {
         jumpTabAndPage(index);
       },
-      children: _buildPages(),
+      children: _buildPages(), // 页面的列表
     );
   }
 
   void jumpTabAndPage(int index) {
-    controller.pageIndex = index;
-    controller.updateUi();
+    controller.pageIndex = index; // 更新页面索引
+    controller.updateUi(); // 更新 UI
     _pageController.jumpToPage(controller.pageIndex);
   }
-
+  // 对应的页面
   List<Widget> _buildPages() {
-    return [ReservationPage(), MapPage(), MallPage(), CarInfoPage(), MinePage()];
+    return [
+      ReservationPage(),
+      MapPage(),
+      CarInfoPage(),
+      MinePage(),
+    ];
   }
 
-  // 自定义导航栏 (悬浮胶囊样式)
+  //导航栏
   Widget _buildNavigationBar() {
-    return SafeArea(
-      child: Container(
-        height: Get.height * 0.05,
-        margin: const EdgeInsets.fromLTRB(24, 0, 24, 10), // 悬浮边距
-        decoration: BoxDecoration(
-          color: Color.fromRGBO(240, 244, 247, 1), // 浅灰色背景
-          borderRadius: BorderRadius.circular(30),
-          boxShadow: [
-            BoxShadow(
-              color: Colors.black.withOpacity(0.05),
-              blurRadius: 10,
-              offset: const Offset(0, 5),
-            ),
-          ],
+    return NavigationX(
+      currentIndex: controller.pageIndex, // 当前选中的tab索引
+      onTap: (index) {
+        jumpTabAndPage(index);
+      }, // 切换tab事件
+      items: [
+        NavigationItemModel(
+          label: '加氢预约',
+          icon: AntdIcon.orderedlist,
+          selectedIcon: AntdIcon.calendar_fill,
         ),
-        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_mall_select@2x", "ic_mall@2x"),
-            _buildNavItem(3, "ic_car_select@2x", "ic_car@2x"),
-            _buildNavItem(4, "ic_user_select@2x", "ic_user@2x"),
-          ],
+        NavigationItemModel(
+          label: '地图',
+          icon: AntdIcon.location,
+          selectedIcon: AntdIcon.location_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.car,
+          selectedIcon: AntdIcon.car_fill,
         ),
-        child: SizedBox(
-          height: 24,
-          width: 24,
-          child: LoginUtil.getAssImg(isSelected ? selectedIcon : icon),
+        NavigationItemModel(
+          label: '我的',
+          icon: AntdIcon.user,
+          selectedIcon: AntdIcon.user,
         ),
-      ),
+      ],
     );
   }
 
@@ -97,10 +78,10 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
       id: 'baseWidgets',
       builder: (_) {
         return Scaffold(
-          extendBody: true, // 重要：让 body 延伸到导航栏后面
+          extendBody: false,
           resizeToAvoidBottomInset: false,
           bottomNavigationBar: _buildNavigationBar(),
-          body: _buildView(), // 移除 SafeArea 以获得更好的全屏沉浸感
+          body: SafeArea(child: _buildView()),
         );
       },
     );

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

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

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

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

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

@@ -1,16 +1,11 @@
 import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:getx_scaffold/getx_scaffold.dart' as dio;
-import 'package:image_picker/image_picker.dart';
-import 'package:image_picker_platform_interface/src/types/image_source.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
@@ -18,47 +13,20 @@ class CarInfoController extends GetxController with BaseControllerMixin {
 
   // --- 车辆基本信息 ---
   String plateNumber = "";
-  String vin = "-";
-  String modelName = "-";
-  String brandName = "-";
+  String vin = "未知";
+  String modelName = "未知";
+  String brandName = "未知";
 
   // --- 证件附件列表 ---
   final RxList<String> drivingAttachments = <String>[].obs;
   final RxList<String> operationAttachments = <String>[].obs;
   final RxList<String> hydrogenationAttachments = <String>[].obs;
   final RxList<String> registerAttachments = <String>[].obs;
-  String color = "";
-  String hydrogenCapacity = "";
-  String rentFromCompany = "";
-  String address = "";
-  bool isNotice = false;
 
   @override
   void onInit() {
     super.onInit();
     getUserBindCarInfo();
-    msgNotice();
-  }
-
-  Future<void> msgNotice() async {
-    final Map<String, dynamic> requestData = {
-      'appFlag': 1,
-      'isRead': 1,
-      'pageNum': 1,
-      'pageSize': 5,
-    };
-    final response = await HttpService.to.get(
-      'appointment/unread_notice/page',
-      params: requestData,
-    );
-    if (response != null) {
-      final result = BaseModel.fromJson(response.data);
-      if (result.code == 0 && result.data != null) {
-        String total = result.data["total"].toString();
-        isNotice = int.parse(total) > 0;
-        updateUi();
-      }
-    }
   }
 
   @override
@@ -92,113 +60,6 @@ class CarInfoController extends GetxController with BaseControllerMixin {
     }
   }
 
-  //上传证件照
-  void pickImage(String title, ImageSource source) async {
-    if (source == ImageSource.camera) {
-      takePhotoAndRecognize(title);
-    } else if (source == ImageSource.gallery) {
-      //相册选择逻辑
-      var status = await Permission.photos.request();
-      if (!status.isGranted) {
-        if (status.isPermanentlyDenied) openAppSettings();
-        showErrorToast("需要相册权限才能拍照上传");
-        return;
-      }
-      final XFile? image = await ImagePicker().pickImage(
-        source: ImageSource.gallery,
-        imageQuality: 80,
-      );
-      if (image != null) {
-        _uploadAndSaveCertificate(title, image.path);
-      }
-    }
-  }
-
-  void takePhotoAndRecognize(String title) async {
-    var status = await Permission.camera.request();
-    if (!status.isGranted) {
-      if (status.isPermanentlyDenied) openAppSettings();
-      showErrorToast("需要相机权限才能拍照上传");
-      return;
-    }
-
-    final XFile? photo = await ImagePicker().pickImage(
-      source: ImageSource.camera,
-      imageQuality: 80, // 压缩图片质量以加快上传
-    );
-    if (photo == null) return;
-
-    _uploadAndSaveCertificate(title, photo.path);
-  }
-
-  /// 提取共用的上传与关联证件逻辑
-  void _uploadAndSaveCertificate(String title, String filePath) async {
-    // 上传文件
-    String? imageUrl = await uploadFile(filePath);
-    if (imageUrl == null) return;
-
-    // 根据标题映射业务类型
-    String type = "";
-    switch (title) {
-      case "行驶证":
-        type = "9";
-        break;
-      case "营运证":
-        type = "10";
-        break;
-      case "加氢证":
-        type = "12";
-        break;
-      case "登记证":
-        type = "13";
-        break;
-      default:
-        return;
-    }
-
-    // 调用后台接口关联证件
-    var response = await HttpService.to.post(
-      "appointment/truck/uploadCertificatePic",
-      data: {
-        "plateNumber": plateNumber,
-        "imageUrl": imageUrl,
-        "type": type,
-      },
-    );
-
-    if (response != null) {
-      final result = BaseModel.fromJson(response.data);
-      if (result.code == 0) {
-        showSuccessToast("上传成功");
-        getUserBindCarInfo(); // 重新拉取数据更新UI
-      } else {
-        showErrorToast(result.error);
-      }
-    }
-  }
-
-  /// 上传图片
-  Future<String?> uploadFile(String filePath) async {
-    showLoading("正在上传...");
-    try {
-      dio.FormData formData = dio.FormData.fromMap({
-        'file': await dio.MultipartFile.fromFile(filePath, filename: 'ocr_identity.jpg'),
-      });
-
-      var response = await HttpService.to.post("appointment/ocr/upload", data: formData);
-      if (response != null) {
-        final result = BaseModel.fromJson(response.data);
-        if (result.code == 0) return result.data.toString();
-        showErrorToast(result.error);
-      }
-    } catch (e) {
-      showErrorToast("图片上传失败");
-    } finally {
-      dismissLoading();
-    }
-    return null;
-  }
-
   void getUserBindCarInfo() async {
     if (StorageService.to.hasVehicleInfo) {
       VehicleInfo? bean = StorageService.to.vehicleInfo;
@@ -212,7 +73,7 @@ class CarInfoController extends GetxController with BaseControllerMixin {
 
       // 获取证件信息
       final response = await HttpService.to.get(
-        'appointment/vehicle/getPicInfoByVin?vin=$vin&plateNumber=$plateNumber',
+        'appointment/vehicle/getPicInfoByVin?vin=$vin',
       );
 
       if (response != null && response.data != null) {
@@ -235,21 +96,6 @@ class CarInfoController extends GetxController with BaseControllerMixin {
             parseAttachments(data['hydrogenationAttachment']),
           );
           registerAttachments.assignAll(parseAttachments(data['registerAttachment']));
-
-          // 初始化时开始加载所有PDF
-          attachments = [
-            ...drivingAttachments,
-            ...operationAttachments,
-            ...hydrogenationAttachments,
-            ...registerAttachments,
-          ];
-
-          color = data['color'].toString();
-          hydrogenCapacity = data['hydrogenCapacity'].toString();
-          rentFromCompany = data['rentFromCompany'].toString();
-          address = data['address'].toString();
-
-          loadAllPdfs();
         }
       }
       updateUi();
@@ -271,69 +117,4 @@ class CarInfoController extends GetxController with BaseControllerMixin {
       arguments: {'title': title, 'attachments': attachments},
     );
   }
-
-  /// 导航到通用的附件查看器页面
-  void openAttachment(String url) {
-    if (url.isEmpty) {
-      showErrorToast('附件链接无效');
-      return;
-    }
-
-    Get.to(() => const AttachmentViewerPage(), arguments: {'url': url});
-  }
-
-  /// 检查 URL 是否为 PDF
-  bool isPdf(String url) {
-    return url.toLowerCase().endsWith('.pdf');
-  }
-
-  List<String> attachments = [];
-
-  // --- 新增: 状态管理 ---
-  /// 用于存储网络PDF的本地路径，key是网络url，value是本地路径
-  final RxMap<String, String> localPdfPaths = <String, String>{}.obs;
-
-  /// 用于跟踪每个附件的加载状态，key是网络url
-  final RxMap<String, bool> isLoading = <String, bool>{}.obs;
-
-  /// 遍历所有附件，如果是PDF则进行下载
-  void loadAllPdfs() {
-    for (var url in attachments) {
-      if (isPdf(url)) {
-        _downloadPdf(url);
-      }
-    }
-  }
-
-  /// 下载单个PDF文件
-  Future<void> _downloadPdf(String url) async {
-    if (url.isEmpty) return;
-
-    // 开始加载
-    isLoading[url] = true;
-
-    try {
-      final dio = Dio();
-      final Directory tempDir = await getTemporaryDirectory();
-      final String savePath = '${tempDir.path}/${url.split('/').last}';
-
-      // 检查文件是否已存在，避免重复下载
-      if (await File(savePath).exists()) {
-        localPdfPaths[url] = savePath;
-        isLoading[url] = false;
-        return;
-      }
-
-      await dio.download(url, savePath);
-
-      // 下载成功后，更新本地路径
-      localPdfPaths[url] = savePath;
-    } catch (e) {
-      print('PDF download error for $url: $e');
-      // 出错时也可以更新状态，以便UI显示错误提示
-    } finally {
-      // 结束加载
-      isLoading[url] = false;
-    }
-  }
 }

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

@@ -1,14 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_pdfview/flutter_pdfview.dart';
-import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:ln_jq_app/common/login_util.dart';
-import 'package:ln_jq_app/pages/c_page/message/view.dart';
+import 'package:ln_jq_app/common/styles/theme.dart';
+import 'package:ln_jq_app/pages/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
-import 'package:photo_view/photo_view.dart';
 
-import '../../../common/styles/theme.dart';
 import 'controller.dart';
 
 class CarInfoPage extends GetView<CarInfoController> {
@@ -21,26 +16,22 @@ class CarInfoPage extends GetView<CarInfoController> {
       id: 'car_info',
       builder: (_) {
         return Scaffold(
-          backgroundColor: const Color.fromRGBO(240, 244, 247, 0.4),
+          backgroundColor: Colors.grey[100],
           body: SingleChildScrollView(
-            child: Column(
-              children: [
-                _buildUserInfoCard(),
-                Padding(
-                  padding: EdgeInsets.only(left: 20.w, right: 20.w),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      const SizedBox(height: 16),
-                      _buildCarInfoCard(),
-                      _buildCertificatesCard(context),
-                      const SizedBox(height: 12),
-                      _buildSafetyReminderCard(),
-                      SizedBox(height: 95.h),
-                    ],
-                  ),
-                ),
-              ],
+            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(),
+                ],
+              ),
             ),
           ),
         );
@@ -48,247 +39,55 @@ class CarInfoPage extends GetView<CarInfoController> {
     );
   }
 
-  Widget _buildUserInfoCard() {
+  /// 构建顶部的司机信息卡片
+  Widget _buildDriverInfoCard() {
     return Card(
-      elevation: 1,
-      color: Colors.white,
+      elevation: 2,
       margin: EdgeInsets.zero,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.only(
-          bottomLeft: Radius.circular(20),
-          bottomRight: Radius.circular(20),
-        ),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
       child: Column(
         children: [
           Padding(
-            padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 16, top: 50),
+            padding: const EdgeInsets.all(16.0),
             child: Row(
               children: [
-                Stack(
-                  children: [
-                    CircleAvatar(
-                      radius: 25,
-                      backgroundColor: Colors.white,
-                      child: LoginUtil.getAssImg('ic_user_logo@2x'),
-                    ),
-                    Positioned(
-                      right: 0,
-                      bottom: 0,
-                      child: SizedBox(
-                        height: 16.h,
-                        width: 16.w,
-                        child: LoginUtil.getAssImg('ic_logo@2x'),
-                      ),
-                    ),
-                  ],
+                const CircleAvatar(
+                  radius: 20,
+                  backgroundColor: Colors.blue,
+                  child: Icon(Icons.person, color: Colors.white, size: 34),
                 ),
-                SizedBox(width: 8.w),
+                const SizedBox(width: 12),
                 Expanded(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Row(
-                        children: [
-                          Text(
-                            "${StorageService.to.name}",
-                            style: const TextStyle(
-                              fontSize: 14,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                          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,
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                        ],
+                      Text(
+                        "${StorageService.to.name}",
+                        style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
                       ),
                       const SizedBox(height: 4),
                       Text(
-                        "羚牛ID：${StorageService.to.phone}",
-                        style: const TextStyle(color: Colors.grey, fontSize: 11),
+                        "${StorageService.to.phone}",
+                        style: TextStyle(color: Colors.grey, fontSize: 11),
                       ),
                     ],
                   ),
                 ),
-                IconButton(
-                  onPressed: () async {
-                    var scanResult = await Get.to(() => const MessagePage());
-                    if (scanResult == null) {
-                      controller.msgNotice();
-                    }
-                  },
-                  style: IconButton.styleFrom(
-                    backgroundColor: Colors.grey[100],
-                    padding: const EdgeInsets.all(8),
-                  ),
-                  icon: Badge(
-                    smallSize: 8,
-                    backgroundColor: controller.isNotice
-                        ? Colors.red
-                        : Colors.transparent,
-                    child: const Icon(
-                      Icons.notifications_outlined,
-                      color: Colors.black87,
-                      size: 30,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-          Padding(
-            padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 20),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                _buildModernStatItem(
-                  '本月里程数',
-                  'Accumulated',
-                  StorageService.to.hasVehicleInfo ? '2,852km' : '-',
-                  '',
-                ),
-                const SizedBox(width: 8),
-                _buildModernStatItem(
-                  '总里程',
-                  'Refuel Count',
-                  StorageService.to.hasVehicleInfo ? "2.5W km" : '-',
-                  '',
-                ),
-                const SizedBox(width: 8),
-                _buildModernStatItem(
-                  '服务评分',
-                  'Driver rating',
-                  StorageService.to.hasVehicleInfo ? "4.9分" : '-',
-                  '',
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildModernStatItem(String title, String subtitle, String value, String unit) {
-    return Expanded(
-      child: Container(
-        padding: const EdgeInsets.all(12.0),
-        decoration: BoxDecoration(
-          color: const Color(0xFFF8F9FA),
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              title,
-              style: const TextStyle(
-                fontSize: 12,
-                fontWeight: FontWeight.bold,
-                color: Colors.black87,
-              ),
-            ),
-            Text(subtitle, style: const TextStyle(fontSize: 9, color: Colors.grey)),
-            const SizedBox(height: 8),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.baseline,
-              textBaseline: TextBaseline.alphabetic,
-              children: [
-                Text(
-                  value,
-                  style: const TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.w600,
-                    color: Colors.black87,
-                  ),
-                ),
-                Text(unit, style: const TextStyle(fontSize: 10, color: Colors.black54)),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildCarInfoCard() {
-    return Card(
-      elevation: 2,
-      color: Colors.white,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-      child: Padding(
-        padding: const EdgeInsets.all(20.0),
-        child: Column(
-          children: [
-            _buildDetailRow('车牌号', controller.plateNumber, isPlate: true),
-            const SizedBox(height: 11),
-            _buildDetailRow('车架号', controller.vin),
-            const SizedBox(height: 11),
-            _buildDetailRow('车辆型号', controller.modelName),
-            const SizedBox(height: 11),
-            _buildDetailRow('车辆品牌', controller.brandName),
-            const SizedBox(height: 10),
-            _buildH2LevelProgress(),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildDetailRow(String label, String value, {bool isPlate = false}) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: [
-        Text(label, style: const TextStyle(fontSize: 13, color: Colors.grey)),
-        Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            if (isPlate)
-              GestureDetector(
-                onTap: () => controller.doQrCode(),
-                child: Container(
-                  margin: const EdgeInsets.only(right: 10),
-                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+                Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
                   decoration: BoxDecoration(
-                    border: Border.all(color: const Color.fromRGBO(71, 174, 208, 1)),
+                    color: Colors.blue[50],
                     borderRadius: BorderRadius.circular(12),
-                    color: const Color.fromRGBO(235, 250, 255, 1),
+                    border: Border.all(color: Colors.blue, width: 0.5),
                   ),
-                  child: Row(
+                  child: const Row(
                     children: [
-                      const Icon(
-                        Icons.sync,
-                        size: 12,
-                        color: Color.fromRGBO(71, 174, 208, 1),
-                      ),
-                      const SizedBox(width: 4),
+                      Icon(Icons.shield_outlined, color: Colors.blue, size: 14),
+                      SizedBox(width: 4),
                       Text(
-                        StorageService.to.hasVehicleInfo ? "换车牌" : "扫码绑定",
-                        style: const TextStyle(
-                          color: Color.fromRGBO(71, 174, 208, 1),
+                        '已认证',
+                        style: TextStyle(
+                          color: Colors.blue,
                           fontSize: 10,
                           fontWeight: FontWeight.bold,
                         ),
@@ -296,81 +95,18 @@ class CarInfoPage extends GetView<CarInfoController> {
                     ],
                   ),
                 ),
-              ),
-            Text(
-              value,
-              style: const TextStyle(
-                fontSize: 14,
-                fontWeight: FontWeight.w600,
-                color: Colors.black87,
-              ),
+              ],
             ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  Widget _buildH2LevelProgress() {
-    return Column(
-      children: [
-        ClipRRect(
-          borderRadius: BorderRadius.circular(4),
-          child: LinearProgressIndicator(
-            value: StorageService.to.hasVehicleInfo ? 0.75 : 0,
-            minHeight: 8,
-            backgroundColor: Color(0xFFF0F2F5),
-            valueColor: AlwaysStoppedAnimation<Color>(Color.fromRGBO(16, 185, 129, 1)),
           ),
-        ),
-        const SizedBox(height: 8),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text("H2 Level", style: TextStyle(fontSize: 11, color: Colors.grey)),
-            Text(
-              StorageService.to.hasVehicleInfo ? "75%" : "0%",
-              style: TextStyle(
-                fontSize: 11,
-                color: Color.fromRGBO(16, 185, 129, 1),
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  /// 3. 构建车辆证件卡片 (重构为 TabView 样式)
-  Widget _buildCertificatesCard(BuildContext context) {
-    return DefaultTabController(
-      length: 4,
-      child: Column(
-        children: [
-          TabBar(
-            isScrollable: false,
-            indicatorColor: Color.fromRGBO(16, 185, 129, 1),
-            labelColor: Color.fromRGBO(16, 185, 129, 1),
-            unselectedLabelColor: Colors.grey,
-            labelStyle: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
-            indicatorSize: TabBarIndicatorSize.label,
-            tabs: const [
-              Tab(text: '行驶证'),
-              Tab(text: '营运证'),
-              Tab(text: '加氢证'),
-              Tab(text: '登记证'),
-            ],
-          ),
-          const SizedBox(height: 9),
-          SizedBox(
-            height: 356.h, // 给定一个高度，或者使用别的方式布局
-            child: TabBarView(
+          const Divider(height: 1, indent: 16, endIndent: 16),
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: [
-                _buildCertificateContent('行驶证', controller.drivingAttachments),
-                _buildCertificateContent('营运证', controller.operationAttachments),
-                _buildCertificateContent('加氢证', controller.hydrogenationAttachments),
-                _buildCertificateContent('登记证', controller.registerAttachments),
+                _buildStatItem('156', '服务天数'),
+                _buildStatItem('4.9', '评分'),
+                _buildStatItem('98%', '准时率'),
               ],
             ),
           ),
@@ -379,213 +115,134 @@ class CarInfoPage extends GetView<CarInfoController> {
     );
   }
 
-  /// 构建单个证件的展示内容
-  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
-              ? _buildEmptyCertificateState(title)
-              : Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    //证件文字
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        _buildCertDetailItem(
-                          '所属公司',
-                          controller.rentFromCompany,
-                          isFull: false,
-                        ),
-                        _buildCertDetailItem('运营城市', controller.address),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        _buildCertDetailItem(
-                          '车辆颜色',
-                          controller.color,
-                          valueColor: const Color(0xFF52C41A),
-                        ),
-                        _buildCertDetailItem('氢瓶容量', controller.hydrogenCapacity),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-                    // 附件预览部分
-                    GestureDetector(
-                      onTap: () {
-                        controller.navigateToCertificateViewer(title, attachments);
-                      },
-                      child: Container(
-                        height: 184.h,
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(16),
-                          border: Border.all(color: Color.fromRGBO(226, 232, 240, 1)),
-                          color: Color.fromRGBO(248, 250, 252, 1),
-                        ),
-                        child: Center(child: _buildAttachmentPreview(attachments[0])),
-                      ),
-                    ),
-                  ],
-                ),
-        ),
-      );
-    });
-  }
-
-  Widget _buildEmptyCertificateState(String title) {
+  // 司机信息卡片中的小统计项
+  Widget _buildStatItem(String value, String label) {
     return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        Image.asset(
-          'assets/images/ic_attention@2x.png', // 请替换为您的实际图片路径
-          width: 120,
-          height: 120,
-        ),
-        const SizedBox(height: 16),
         Text(
-          '您未上传“$title”',
-          style: TextStyle(
-            fontSize: 16.sp,
-            fontWeight: FontWeight.w600,
-            color: Color.fromRGBO(51, 51, 51, 1),
-          ),
-        ),
-        const SizedBox(height: 8),
-        Text(
-          '上传后可提前通知加氢站报备\n大幅减少加氢站等待时间',
-          textAlign: TextAlign.center,
-          style: TextStyle(
-            fontSize: 12.sp,
-            color: Color.fromRGBO(156, 163, 175, 1),
-            height: 1.5,
-          ),
-        ),
-        const SizedBox(height: 24),
-        SizedBox(
-          width: 200,
-          height: 44,
-          child: ElevatedButton.icon(
-            onPressed: () {
-              _showUploadDialog(title);
-            },
-            icon: const Text(
-              '立即上传',
-              style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
-            ),
-            label: Image.asset(
-              'assets/images/ic_upload@2x.png',
-              height: 20.h,
-              width: 20.w,
-            ),
-            style: ElevatedButton.styleFrom(
-              backgroundColor: const Color(0xFF017137),
-              foregroundColor: Colors.white,
-              shape: StadiumBorder(),
-              elevation: 0,
-            ),
+          value,
+          style: const TextStyle(
+            fontSize: 18,
+            fontWeight: FontWeight.bold,
+            color: Colors.blue,
           ),
         ),
+        const SizedBox(height: 4),
+        Text(label, style: const TextStyle(color: Colors.grey, fontSize: 12)),
       ],
     );
   }
 
-  void _showUploadDialog(String title) {
-    Get.dialog(
-      Dialog(
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-        child: Container(
-          padding: const EdgeInsets.all(24),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                '上传$title',
-                style: const TextStyle(
-                  fontSize: 18,
-                  fontWeight: FontWeight.bold,
-                  color: Colors.black,
-                ),
-              ),
-              const SizedBox(height: 12),
-              Text(
-                '请确保拍摄证件清晰可见，关键文字无反光遮挡，这将有助于快速通过审核',
-                style: TextStyle(fontSize: 13, color: Colors.grey[400], height: 1.5),
-              ),
-              const SizedBox(height: 24),
-              Row(
+  /// 构建车辆绑定信息卡片
+  Widget _buildCarBindingCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Row(
+          children: [
+            Expanded(
+              child: Column(
                 children: [
-                  Expanded(
-                    child: _buildUploadOption(
-                      icon: Icons.camera_alt_outlined,
-                      label: '拍照上传',
-                      onTap: () {
-                        controller.pickImage(title, ImageSource.camera);
-                        Get.back();
-                      },
-                    ),
-                  ),
-                  const SizedBox(width: 16),
-                  Expanded(
-                    child: _buildUploadOption(
-                      icon: Icons.image_outlined,
-                      label: '相册上传',
-                      onTap: () {
-                        controller.pickImage(title, ImageSource.gallery);
-                        Get.back();
-                      },
-                    ),
-                  ),
+                  _buildInfoRow('车牌号:   ${controller.plateNumber}', '扫码绑定'),
+                  const SizedBox(height: 12),
+                  _buildInfoRow('车架号:', '${controller.vin}'),
+                  const SizedBox(height: 12),
+                  _buildInfoRow('车辆型号:', '${controller.modelName}'),
+                  const SizedBox(height: 12),
+                  _buildInfoRow('车辆品牌:', '${controller.brandName}'),
                 ],
               ),
-            ],
-          ),
+            ),
+            const SizedBox(width: 8),
+            Icon(Icons.propane_rounded, size: 50, color: Colors.blue.withOpacity(0.5)),
+          ],
         ),
       ),
     );
   }
 
-  // 构建弹窗内的选择按钮
-  Widget _buildUploadOption({
-    required IconData icon,
-    required String label,
-    required VoidCallback onTap,
-  }) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Container(
-        padding: const EdgeInsets.symmetric(vertical: 24),
-        decoration: BoxDecoration(
-          color: const Color(0xFFF2F9F7), // 浅绿色背景
-          borderRadius: BorderRadius.circular(12),
-        ),
+  // 车辆绑定卡片中的信息行
+  Widget _buildInfoRow(String label, String value) {
+    bool isButton = value == '扫码绑定';
+    return Row(
+      children: [
+        Text(label, style: const TextStyle(fontSize: 13)),
+        const SizedBox(width: 8),
+        isButton
+            ? GestureDetector(
+                onTap: () async {
+                  controller.doQrCode();
+                },
+                child: Container(
+                  margin: EdgeInsetsGeometry.only(left: 10.w),
+                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),
+                  decoration: BoxDecoration(
+                    border: Border.all(color: Colors.blue.shade300, width: 1),
+                    borderRadius: BorderRadius.circular(5),
+                    color: Colors.blue.withOpacity(0.05),
+                  ),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min, // Keep the row compact
+                    children: [
+                      Icon(
+                        StorageService.to.hasVehicleInfo ? Icons.repeat : Icons.search,
+                        size: 13,
+                        color: Colors.blue,
+                      ),
+                      const SizedBox(width: 3),
+                      Text(
+                        StorageService.to.hasVehicleInfo ? "换车牌" : value,
+                        style: const TextStyle(
+                          color: Colors.blue,
+                          fontSize: 11,
+                          fontWeight: FontWeight.w500,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              )
+            : Text(
+                value,
+                style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
+              ),
+      ],
+    );
+  }
+
+  /// 3. 构建车辆证件卡片
+  Widget _buildCertificatesCard() {
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
         child: Column(
           children: [
-            Container(
-              padding: const EdgeInsets.all(12),
-              decoration: const BoxDecoration(
-                color: Color(0xFF017137), // 深绿色圆圈
-                shape: BoxShape.circle,
-              ),
-              child: Icon(icon, color: Colors.white, size: 28),
+            _buildCertificateRow(
+              icon: Icons.credit_card_rounded,
+              title: '行驶证',
+              attachments: controller.drivingAttachments,
             ),
-            const SizedBox(height: 12),
-            Text(
-              label,
-              style: const TextStyle(
-                fontSize: 14,
-                color: Color(0xFF333333),
-                fontWeight: FontWeight.w500,
-              ),
+            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,
             ),
           ],
         ),
@@ -593,134 +250,72 @@ class CarInfoPage extends GetView<CarInfoController> {
     );
   }
 
-  Widget _buildCertDetailItem(
-    String label,
-    String value, {
-    Color? valueColor,
-    bool isFull = false,
+  /// 证件展示
+  Widget _buildCertificateRow({
+    required IconData icon,
+    required String title,
+    required List<String> attachments,
   }) {
-    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,
-          ),
-        ],
+    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'),
+          ],
+        ),
       ),
     );
   }
 
-  /// 附件预览组件 (智能判断 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)),
-          ),
-        ],
-      ),
+  // 提示信息卡片中的列表项
+  Widget _buildTipItem(IconData icon, String text) {
+    return Row(
+      children: [
+        Icon(icon, color: Colors.blue, size: 20),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Text(text, style: const TextStyle(fontSize: 12, color: Colors.black54)),
+        ),
+      ],
     );
   }
 }

ln_jq_app/lib/pages/c_page/mall/detail/controller.dart

@@ -1,113 +0,0 @@
-import 'dart:developer';
-
-import 'package:flutter/material.dart';
-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/pages/c_page/mall/exchange_success/view.dart';
-
-import '../mall_controller.dart';
-
-class MallDetailController extends GetxController with BaseControllerMixin {
-  @override
-  String get builderId => 'mall_detail';
-
-  late final int goodsId;
-  final Rx<GoodsModel?> goodsDetail = Rx<GoodsModel?>(null);
-
-  final addressController = TextEditingController();
-  final nameController = TextEditingController();
-  final phoneController = TextEditingController();
-
-  final formKey = GlobalKey<FormState>();
-
-  @override
-  void onInit() {
-    super.onInit();
-    goodsId = Get.arguments['goodsId'] as int;
-    getGoodsDetail();
-  }
-
-  @override
-  bool get listenLifecycleEvent => true;
-
-  Future<void> getGoodsDetail() async {
-    try {
-      var response = await HttpService.to.post(
-        'appointment/score/getScoreGoodsDetail',
-        data: {'goodsId': goodsId},
-      );
-      if (response != null && response.data != null) {
-        var result = BaseModel<GoodsModel>.fromJson(
-          response.data,
-          dataBuilder: (dataJson) => GoodsModel.fromJson(dataJson),
-        );
-        if (result.code == 0 && result.data != null) {
-          goodsDetail.value = result.data;
-        } else {
-          showErrorToast('加载失败: ${result.message}');
-          Get.back();
-        }
-      }
-    } catch (e) {
-      log('获取商品详情失败: $e');
-      showErrorToast('网络异常，请稍后重试');
-      Get.back();
-    } finally {
-      updateUi();
-    }
-  }
-
-  /// 兑换商品
-  void exchange() async {
-    if (!formKey.currentState!.validate()) {
-      return;
-    }
-
-    /*
-    final mallController = Get.find<MallController>();
-    if (mallController.userScore.value < (goodsDetail.value?.score ?? 0)) {
-      showWarningToast('积分不足');
-      return;
-    }*/
-
-    // 接口调用预留
-    showLoading('兑换中...');
-
-    final goods = goodsDetail.value;
-    if (goods == null) {
-      showErrorToast('兑换失败，请稍后重试');
-      return;
-    }
-    try {
-      var response = await HttpService.to.post(
-        'appointment/score/scoreExchange',
-        data: {
-          "goodsId": goods.id,
-          "address": addressController.text,
-          "name": nameController.text,
-          "phone": phoneController.text,
-        },
-      );
-      if (response != null && response.data != null) {
-        var result = BaseModel.fromJson(response.data);
-        if (result.code == 0) {
-          Get.off(() => MallExchangeSuccessPage());
-        }
-      }
-    } catch (e) {
-      log('兑换失败: $e');
-      showErrorToast('兑换失败，请稍后重试');
-    } finally {
-      dismissLoading();
-    }
-  }
-
-  @override
-  void onClose() {
-    addressController.dispose();
-    nameController.dispose();
-    phoneController.dispose();
-    super.onClose();
-  }
-}

ln_jq_app/lib/pages/c_page/mall/detail/view.dart

@@ -1,281 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:getx_scaffold/getx_scaffold.dart';
-import 'controller.dart';
-
-class MallDetailPage extends GetView<MallDetailController> {
-  const MallDetailPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return GetBuilder<MallDetailController>(
-      init: MallDetailController(),
-      id: 'mall_detail',
-      builder: (_) {
-        return Scaffold(
-          backgroundColor: const Color(0xFFF7F8FA),
-          appBar: AppBar(
-            title: const Text('商品兑换'),
-            backgroundColor: Colors.white,
-            foregroundColor: Colors.black,
-            elevation: 0,
-            leading: IconButton(
-              icon: const Icon(Icons.arrow_back_ios, size: 20),
-              onPressed: () => Get.back(),
-            ),
-          ),
-          body: GestureDetector(
-            onTap: () {
-              hideKeyboard();
-            },
-            child: _buildBody(),
-          ),
-          bottomNavigationBar: _buildBottomButton(),
-        );
-      },
-    );
-  }
-
-  Widget _buildBody() {
-    final goods = controller.goodsDetail.value;
-    if (goods == null) return const Center(child: Text('商品信息不存在'));
-
-    return SingleChildScrollView(
-      padding: const EdgeInsets.all(16),
-      child: Form(
-        key: controller.formKey,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            _buildGoodsInfoCard(goods),
-            const SizedBox(height: 24),
-            _buildSectionTitle('填写收货信息'),
-            const SizedBox(height: 16),
-            _buildInputLabel('详细地址'),
-            _buildTextField(
-              controller: controller.addressController,
-              hint: '请输入完整的收货地址',
-              icon: Icons.location_on_outlined,
-            ),
-            const SizedBox(height: 16),
-            _buildInputLabel('收货人姓名'),
-            _buildTextField(
-              controller: controller.nameController,
-              hint: '请输入收货人姓名',
-              icon: Icons.person_outline,
-            ),
-            const SizedBox(height: 16),
-            _buildInputLabel('联系电话'),
-            _buildTextField(
-              controller: controller.phoneController,
-              hint: '请输入手机号码',
-              icon: Icons.phone_android_outlined,
-              keyboardType: TextInputType.phone,
-            ),
-            const SizedBox(height: 40),
-            Center(
-              child: Text(
-                '兑换成功后，商品会在3个工作日内邮寄\n请注意查收',
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                  color: Color(0xFF999999),
-                  fontSize: 12.sp,
-                  fontWeight: FontWeight.w500,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildGoodsInfoCard(goods) {
-    return Container(
-      padding: const EdgeInsets.all(17),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(16),
-        boxShadow: [
-          BoxShadow(
-            color: Colors.black.withOpacity(0.03),
-            blurRadius: 10,
-            offset: const Offset(0, 4),
-          ),
-        ],
-      ),
-      child: Row(
-        children: [
-          ClipRRect(
-            borderRadius: BorderRadius.circular(12),
-            child: goods.goodsImage != null
-                ? Image.network(
-                    goods.goodsImage!,
-                    width: 94.w,
-                    height: 94.h,
-                    fit: BoxFit.cover,
-                  )
-                : Container(
-                    width: 80,
-                    height: 80,
-                    color: Colors.grey[200],
-                    child: const Icon(Icons.image, color: Colors.grey),
-                  ),
-          ),
-          const SizedBox(width: 12),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  goods.goodsName,
-                  style: TextStyle(
-                    fontSize: 16.sp,
-                    fontWeight: FontWeight.w600,
-                    color: Color(0xFF333333),
-                  ),
-                ),
-                SizedBox(height: 8.h),
-                Row(
-                  children: [
-                    Text(
-                      '${goods.score}',
-                      style: TextStyle(
-                        fontSize: 20.sp,
-                        color: Color(0xFF4CAF50),
-                        fontWeight: FontWeight.w600,
-                      ),
-                    ),
-                    const SizedBox(width: 4),
-                    Text(
-                      '积分',
-                      style: TextStyle(
-                        fontSize: 10.sp,
-                        fontWeight: FontWeight.w600,
-                        color: Color(0xFF999999),
-                      ),
-                    ),
-                  ],
-                ),
-                SizedBox(height: 10.h),
-                Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-                  decoration: BoxDecoration(
-                    color: const Color(0xFFF2F3F5),
-                    borderRadius: BorderRadius.circular(4),
-                  ),
-                  child: Text(
-                    '数量: 1',
-                    style: TextStyle(
-                      fontSize: 10.sp,
-                      fontWeight: FontWeight.w500,
-                      color: Color(0xFF666666),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildSectionTitle(String title) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Container(
-          width: 6.w,
-          height: 16.h,
-          decoration: BoxDecoration(
-            color: const Color(0xFF4CAF50),
-            borderRadius: BorderRadius.circular(2),
-          ),
-        ),
-        const SizedBox(width: 8),
-        Text(
-          title,
-          style: TextStyle(
-            fontSize: 14.sp,
-            fontWeight: FontWeight.w600,
-            color: Color.fromRGBO(148, 163, 184, 1),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildInputLabel(String label) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 8),
-      child: Text(
-        label,
-        style: TextStyle(
-          fontSize: 12.sp,
-          fontWeight: FontWeight.w600,
-          color: Color.fromRGBO(100, 116, 139, 1),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTextField({
-    required TextEditingController controller,
-    required String hint,
-    required IconData icon,
-    TextInputType? keyboardType,
-  }) {
-    return Container(
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(8),
-      ),
-      child: TextFormField(
-        controller: controller,
-        keyboardType: keyboardType,
-        textAlign: TextAlign.start,
-        decoration: InputDecoration(
-          hintText: hint,
-          hintStyle: TextStyle(
-            color: Color.fromRGBO(134, 144, 156, 1),
-            fontSize: 14.sp,
-            fontWeight: FontWeight.w500,
-          ),
-          prefixIcon: Icon(icon, color: const Color(0xFF999999), size: 20),
-          border: InputBorder.none,
-          contentPadding: const EdgeInsets.symmetric(vertical: 12),
-        ),
-        validator: (value) {
-          if (value == null || value.isEmpty) {
-            return '内容不能为空';
-          }
-          return null;
-        },
-      ),
-    );
-  }
-
-  Widget _buildBottomButton() {
-    return Container(
-      padding: const EdgeInsets.fromLTRB(16, 10, 16, 30),
-      child: ElevatedButton(
-        onPressed: controller.exchange,
-        style: ElevatedButton.styleFrom(
-          backgroundColor: const Color(0xFF007A45),
-          minimumSize: const Size(double.infinity, 50),
-          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/c_page/mall/exchange_success/view.dart

@@ -1,68 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:getx_scaffold/common/index.dart';
-import 'package:ln_jq_app/common/login_util.dart';
-
-class MallExchangeSuccessPage extends StatelessWidget {
-  const MallExchangeSuccessPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.white,
-      appBar: AppBar(
-        backgroundColor: Colors.white,
-        elevation: 0,
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios, size: 20, color: Colors.black),
-          onPressed: () => Get.back(), // 返回首页
-        ),
-        title: const Text('商品兑换', style: TextStyle(color: Colors.black, fontSize: 18)),
-      ),
-      body: Center(
-        child: Column(
-          children: [
-            SizedBox(height: 114.h),
-            _buildSuccessIcon(),
-            const SizedBox(height: 24),
-            Text(
-              '兑换成功',
-              style: TextStyle(
-                fontSize: 24.sp,
-                fontWeight: FontWeight.w600,
-                color: Color(0xFF333333),
-              ),
-            ),
-            const SizedBox(height: 8),
-            Text(
-              '预计 3 日内发货\n请留意查收',
-              textAlign: TextAlign.center,
-              style: TextStyle(fontSize: 14.sp, color: Color(0xFF999999)),
-            ),
-            const SizedBox(height: 60),
-            ElevatedButton(
-              onPressed: () => Get.back(),
-              style: ElevatedButton.styleFrom(
-                backgroundColor: const Color(0xFF007A45),
-                minimumSize: const Size(140, 50),
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
-              ),
-              child: Text(
-                '返回首页',
-                style: TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.w400,
-                  fontSize: 16.sp,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSuccessIcon() {
-    return Container(child: LoginUtil.getAssImg("mall_pay_success@2x"));
-  }
-}

ln_jq_app/lib/pages/c_page/mall/mall_controller.dart

@@ -1,160 +0,0 @@
-
-import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/model/base_model.dart';
-import 'package:ln_jq_app/pages/c_page/mall/detail/view.dart';
-import 'package:ln_jq_app/pages/c_page/mall/orders/view.dart';
-import 'package:ln_jq_app/pages/c_page/mall/rule/view.dart';
-
-class GoodsModel {
-  final int id;
-  final String categoryId;
-  final String goodsName;
-  final String? goodsImage;
-  final int originalScore;
-  final int score;
-  final int stock;
-  final int status;
-
-  GoodsModel({
-    required this.id,
-    required this.categoryId,
-    required this.goodsName,
-    this.goodsImage,
-    required this.originalScore,
-    required this.score,
-    required this.stock,
-    required this.status,
-  });
-
-  factory GoodsModel.fromJson(Map<String, dynamic> json) {
-    return GoodsModel(
-      id: json['id'] as int,
-      categoryId: json['categoryId']?.toString() ?? '',
-      goodsName: json['goodsName']?.toString() ?? '',
-      goodsImage: json['goodsImage'],
-      originalScore: json['originalScore'] as int? ?? 0,
-      score: json['score'] as int? ?? 0,
-      stock: json['stock'] as int? ?? 0,
-      status: json['status'] as int? ?? 1,
-    );
-  }
-}
-
-class UserScore {
-  final int score;
-  final int todaySign;
-
-  UserScore({required this.score, required this.todaySign});
-
-  factory UserScore.fromJson(Map<String, dynamic> json) {
-    return UserScore(
-      score: json['score'] as int? ?? 0,
-      todaySign: json['todaySign'] as int? ?? 1,
-    );
-  }
-}
-
-class MallController extends GetxController with BaseControllerMixin {
-  @override
-  String get builderId => 'mall';
-
-  final RxInt userScore = 0.obs;
-  final RxInt todaySign = 1.obs; // 0可签到，1已签到
-  final RxList<GoodsModel> goodsList = <GoodsModel>[].obs;
-  final RxBool isLoading = true.obs;
-
-  @override
-  void onInit() {
-    super.onInit();
-    refreshData();
-  }
-
-  Future<void> refreshData() async {
-    isLoading.value = true;
-    await Future.wait([getUserScore(), getGoodsList()]);
-    isLoading.value = false;
-    updateUi();
-  }
-
-  /// 获取用户积分和签到状态
-  Future<void> getUserScore() async {
-    try {
-      var response = await HttpService.to.post('appointment/score/getUserScore');
-      if (response != null && response.data != null) {
-        var result = BaseModel<UserScore>.fromJson(
-          response.data,
-          dataBuilder: (dataJson) => UserScore.fromJson(dataJson),
-        );
-        if (result.code == 0 && result.data != null) {
-          userScore.value = result.data!.score;
-          todaySign.value = result.data!.todaySign;
-        }
-      }
-    } catch (e) {
-      log('获取积分失败: $e');
-    }
-  }
-
-  /// 签到逻辑
-  Future<void> signAction() async {
-    if (todaySign.value == 1) return;
-
-    showLoading('签到中...');
-    try {
-      var response = await HttpService.to.post('appointment/score/sign');
-      dismissLoading();
-      if (response != null && response.data != null) {
-        var result = BaseModel.fromJson(response.data);
-        if (result.code == 0) {
-          showSuccessToast('签到成功');
-          getUserScore(); // 签到成功后刷新积分
-        } else {
-          showErrorToast(result.message);
-        }
-      }
-    } catch (e) {
-      dismissLoading();
-      showErrorToast('签到异常');
-    }
-  }
-
-  /// 获取商品列表
-  Future<void> getGoodsList() async {
-    try {
-      var response = await HttpService.to.post(
-        'appointment/score/getScoreGoodsList',
-        data: {'categoryId': 0},
-      );
-      if (response != null && response.data != null) {
-        var result = BaseModel<List<GoodsModel>>.fromJson(
-          response.data,
-          dataBuilder: (dataJson) {
-            var list = dataJson as List;
-            return list.map((e) => GoodsModel.fromJson(e)).toList();
-          },
-        );
-        if (result.code == 0 && result.data != null) {
-          goodsList.assignAll(result.data!);
-        }
-      }
-    } catch (e) {
-      log('获取商品列表失败: $e');
-    }
-  }
-
-  /// 兑换商品
-  void exchangeGoods(GoodsModel goods) {
-    Get.to(() => const MallDetailPage(), arguments: {'goodsId': goods.id})
-        ?.then((_) => refreshData());
-  }
-
-  ///规则说明
-  void toRuleDes() {
-    Get.to(() => const MallRulePage());
-  }
-
-  ///历史订单
-  void toOrders() {
-    Get.to(() => const MallOrdersPage());
-  }
-}

ln_jq_app/lib/pages/c_page/mall/mall_view.dart

@@ -1,345 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/login_util.dart';
-
-import 'mall_controller.dart';
-
-class MallPage extends GetView<MallController> {
-  const MallPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return GetX<MallController>(
-      init: MallController(),
-      builder: (_) {
-        return Scaffold(
-          backgroundColor: Color.fromRGBO(247, 249, 251, 1),
-          body: RefreshIndicator(
-            onRefresh: controller.refreshData,
-            child: CustomScrollView(
-              slivers: [
-                SliverToBoxAdapter(
-                  child: Container(
-                    padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 20.h),
-                    decoration: BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.only(
-                        bottomLeft: Radius.circular(20),
-                        bottomRight: Radius.circular(20),
-                      ),
-                    ),
-                    child: Column(children: [_buildAppBar(), _buildScoreCard()]),
-                  ),
-                ),
-                _buildSectionHeader(),
-                _buildGoodsGrid(),
-                SliverToBoxAdapter(child: SizedBox(height: 120.h)),
-              ],
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildAppBar() {
-    return Container(
-      padding: EdgeInsets.only(top: MediaQuery.of(Get.context!).padding.top, bottom: 0),
-      child: Row(
-        children: [
-          Container(
-            width: 40,
-            height: 40,
-            decoration: BoxDecoration(
-              color: const Color(0xFF4CAF50),
-              borderRadius: BorderRadius.circular(8),
-            ),
-            child: LoginUtil.getAssImg("mall_bar@2x"),
-          ),
-          const SizedBox(width: 10),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const Text(
-                  '氢能商城',
-                  style: TextStyle(
-                    fontSize: 18,
-                    fontWeight: FontWeight.bold,
-                    color: Color(0xFF333333),
-                  ),
-                ),
-                Row(
-                  children: [
-                    const Text(
-                      'Hydrogen Energy Mall',
-                      style: TextStyle(fontSize: 12, color: Color(0xFF999999)),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-          /*IconButton(
-            onPressed: () {},
-            icon: const Icon(Icons.notifications_none, color: Color(0xFF333333)),
-          ),*/
-        ],
-      ),
-    );
-  }
-
-  Widget _buildScoreCard() {
-    return Container(
-      margin: EdgeInsets.only(top: 22.h),
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        gradient: const LinearGradient(
-          colors: [Color.fromRGBO(2, 27, 31, 1), Color.fromRGBO(11, 67, 67, 1)],
-          begin: Alignment.topLeft,
-          end: Alignment.bottomRight,
-        ),
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      Text(
-                        '我的可用积分',
-                        style: TextStyle(color: Colors.white70, fontSize: 14.sp),
-                      ),
-                      const SizedBox(width: 4),
-                      GestureDetector(
-                        onTap: (){
-                          controller.toRuleDes();
-                        },
-                        child:  const Icon(Icons.help_outline, color: Colors.white70, size: 14),
-                      )
-
-                    ],
-                  ),
-                  Text(
-                    'Available points',
-                    style: TextStyle(color: Colors.white38, fontSize: 11.sp),
-                  ),
-                ],
-              ),
-              GestureDetector(
-                onTap: controller.signAction,
-                child: Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
-                  decoration: BoxDecoration(
-                    color: controller.todaySign.value == 0
-                        ? Color.fromRGBO(78, 184, 49, 1)
-                        : Colors.grey,
-                    borderRadius: BorderRadius.circular(10),
-                  ),
-                  child: Text(
-                    controller.todaySign.value == 0 ? '立即签到' : '已签到',
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text(
-                controller.userScore.value.toString(),
-                style: TextStyle(
-                  color: Color.fromRGBO(236, 236, 236, 1),
-                  fontSize: 18.sp,
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-              TextButton(
-                onPressed: () {
-                  controller.toOrders();
-                },
-                child: Text(
-                  '历史订单',
-                  style: TextStyle(
-                    color: Color.fromRGBO(148, 163, 184, 1),
-                    fontSize: 12.sp,
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildSectionHeader() {
-    return SliverToBoxAdapter(
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
-        child: Row(
-          children: [
-            Container(
-              width: 4.w,
-              height: 16.h,
-              decoration: BoxDecoration(
-                color: const Color(0xFF4CAF50),
-                borderRadius: BorderRadius.circular(2),
-              ),
-            ),
-            const SizedBox(width: 8),
-            Text(
-              '热门商品',
-              style: TextStyle(
-                fontSize: 14.sp,
-                fontWeight: FontWeight.w600,
-                color: Color.fromRGBO(78, 89, 105, 1),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildGoodsGrid() {
-    if (controller.goodsList.isEmpty) {
-      return const SliverToBoxAdapter(
-        child: Center(
-          child: Padding(
-            padding: EdgeInsets.only(top: 50),
-            child: Text('暂无商品', style: TextStyle(color: Color(0xFF999999))),
-          ),
-        ),
-      );
-    }
-
-    return SliverPadding(
-      padding: const EdgeInsets.symmetric(horizontal: 16),
-      sliver: SliverGrid(
-        gridDelegate:  SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: 2,
-          mainAxisSpacing: 14.h,
-          crossAxisSpacing: 19.w,
-          childAspectRatio: 0.75,
-        ),
-        delegate: SliverChildBuilderDelegate((context, index) {
-          final goods = controller.goodsList[index];
-          return _buildGoodsItem(goods);
-        }, childCount: controller.goodsList.length),
-      ),
-    );
-  }
-
-  Widget _buildGoodsItem(GoodsModel goods) {
-    return Container(
-      padding: EdgeInsets.all(8),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(10),
-        boxShadow: [
-          BoxShadow(
-            color: Colors.black.withOpacity(0.05),
-            blurRadius: 10,
-            offset: const Offset(0, 4),
-          ),
-        ],
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Expanded(
-            child: ClipRRect(
-              borderRadius: const BorderRadius.all(Radius.circular(12)),
-              child: goods.goodsImage != null
-                  ? Image.network(
-                      goods.goodsImage!,
-                      fit: BoxFit.cover,
-                      width: double.infinity,
-                    )
-                  : Container(
-                      color: const Color(0xFFEEEEEE),
-                      child: const Center(
-                        child: Icon(Icons.image, color: Colors.grey, size: 40),
-                      ),
-                    ),
-            ),
-          ),
-          Padding(
-            padding: const EdgeInsets.all(10),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  goods.goodsName,
-                  style: TextStyle(
-                    fontSize: 14.sp,
-                    fontWeight: FontWeight.w600,
-                    color: Colors.black,
-                  ),
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                ),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Row(
-                      children: [
-                        Text(
-                          '${goods.score}',
-                          style: TextStyle(
-                            fontSize: 16.sp,
-                            color: Color(0xFF4CAF50),
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                        const SizedBox(width: 4),
-                        Text(
-                          '积分',
-                          style: TextStyle(
-                            fontSize: 12.sp,
-                            fontWeight: FontWeight.bold,
-                            color: Color(0xFF4CAF50),
-                          ),
-                        ),
-                      ],
-                    ),
-                    GestureDetector(
-                      onTap: () => controller.exchangeGoods(goods),
-                      child: Container(
-                        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
-                        decoration: BoxDecoration(
-                          color: const Color(0xFFE8F5E9),
-                          borderRadius: BorderRadius.circular(20),
-                        ),
-                        child: Text(
-                          '兑换',
-                          style: TextStyle(
-                            color: Color(0xFF4CAF50),
-                            fontWeight: FontWeight.bold,
-                            fontSize: 13.sp,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

ln_jq_app/lib/pages/c_page/mall/orders/controller.dart

@@ -1,94 +0,0 @@
-
-import 'dart:developer';
-import 'package:get/get.dart';
-import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:ln_jq_app/common/model/base_model.dart';
-
-class OrderModel {
-  final int id;
-  final int scoreGoodsId;
-  final String goodsName;
-  final String? goodsImage;
-  final String? goodsContent;
-  final String address;
-  final String createTime;
-  final String score;
-
-  OrderModel({
-    required this.id,
-    required this.scoreGoodsId,
-    required this.goodsName,
-    this.goodsImage,
-    this.goodsContent,
-    required this.address,
-    required this.createTime,
-    required this.score,
-  });
-
-  factory OrderModel.fromJson(Map<String, dynamic> json) {
-    return OrderModel(
-      id: json['id'] as int,
-      scoreGoodsId: json['scoreGoodsId'] as int,
-      goodsName: json['goodsName']?.toString() ?? '',
-      goodsImage: json['goodsImage'],
-      goodsContent: json['goodsContent'],
-      address: json['address']?.toString() ?? '',
-      createTime: json['createTime']?.toString() ?? '',
-      score: json['score']?.toString() ?? '',
-    );
-  }
-}
-
-class MallOrdersController extends GetxController with BaseControllerMixin {
-  @override
-  String get builderId => 'mall_orders';
-
-  final RxList<OrderModel> orderList = <OrderModel>[].obs;
-  final RxBool isLoading = true.obs;
-  int pageNum = 1;
-  final int pageSize = 50;
-
-  @override
-  void onInit() {
-    super.onInit();
-    getOrders();
-  }
-
-  Future<void> getOrders({bool isRefresh = true}) async {
-    if (isRefresh) {
-      pageNum = 1;
-      isLoading.value = true;
-      updateUi();
-    }
-
-    try {
-      var response = await HttpService.to.post(
-        'appointment/score/getScoreExchangeList',
-        data: {
-          "status": "",
-          "pageNum": pageNum.toString(),
-          "pageSize": pageSize.toString()
-        },
-      );
-
-      if (response != null && response.data != null) {
-        var result = BaseModel<Map<String, dynamic>>.fromJson(response.data);
-        if (result.code == 0 && result.data != null) {
-          var records = result.data!['records'] as List;
-          var list = records.map((e) => OrderModel.fromJson(e)).toList();
-          if (isRefresh) {
-            orderList.assignAll(list);
-          } else {
-            orderList.addAll(list);
-          }
-          pageNum++;
-        }
-      }
-    } catch (e) {
-      log('获取订单列表失败: $e');
-    } finally {
-      isLoading.value = false;
-      updateUi();
-    }
-  }
-}

ln_jq_app/lib/pages/c_page/mall/orders/view.dart

@@ -1,138 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:getx_scaffold/getx_scaffold.dart';
-import 'controller.dart';
-
-class MallOrdersPage extends GetView<MallOrdersController> {
-  const MallOrdersPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return GetBuilder<MallOrdersController>(
-      init: MallOrdersController(),
-      id: 'mall_orders',
-      builder: (_) {
-        return Scaffold(
-          backgroundColor: const Color(0xFFF7F8FA),
-          appBar: AppBar(
-            title: const Text('历史订单'),
-            backgroundColor: Colors.white,
-            foregroundColor: Colors.black,
-            elevation: 0,
-            leading: IconButton(
-              icon: const Icon(Icons.arrow_back_ios, size: 20),
-              onPressed: () => Get.back(),
-            ),
-          ),
-          body: RefreshIndicator(
-            onRefresh: () => controller.getOrders(isRefresh: true),
-            child: controller.isLoading.value && controller.orderList.isEmpty
-                ? const Center(child: CircularProgressIndicator())
-                : _buildOrderList(),
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildOrderList() {
-    if (controller.orderList.isEmpty) {
-      return const Center(
-        child: Text('暂无订单记录', style: TextStyle(color: Color(0xFF999999))),
-      );
-    }
-
-    return ListView.builder(
-      padding: const EdgeInsets.all(16),
-      itemCount: controller.orderList.length,
-      itemBuilder: (context, index) {
-        final order = controller.orderList[index];
-        return _buildOrderItem(order);
-      },
-    );
-  }
-
-  Widget _buildOrderItem(OrderModel order) {
-    return Container(
-      margin: const EdgeInsets.only(bottom: 12),
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(16),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            '兑换时间：${order.createTime}',
-            style: TextStyle(
-              fontSize: 12.sp,
-              fontWeight: FontWeight.w500,
-              color: Color.fromRGBO(107, 114, 128, 1),
-            ),
-          ),
-          const SizedBox(height: 12),
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              ClipRRect(
-                borderRadius: BorderRadius.circular(12),
-                child: order.goodsImage != null
-                    ? Image.network(
-                        order.goodsImage!,
-                        width: 80.w,
-                        height: 80.h,
-                        fit: BoxFit.cover,
-                      )
-                    : Container(
-                        width: 80.w,
-                        height: 80.h,
-                        color: Colors.grey[200],
-                        child: const Icon(Icons.image, color: Colors.grey),
-                      ),
-              ),
-              const SizedBox(width: 12),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      order.goodsName,
-                      style: const TextStyle(
-                        fontSize: 15,
-                        fontWeight: FontWeight.bold,
-                        color: Color(0xFF333333),
-                      ),
-                    ),
-                    const SizedBox(height: 8),
-                    Row(
-                      children: [
-                        Text(
-                          order.score,
-                          style: TextStyle(
-                            fontSize: 16.sp,
-                            color: Color(0xFF4CAF50),
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                        SizedBox(width: 4),
-                        Text(
-                          '积分',
-                          style: TextStyle(fontSize: 11.sp, color: Color(0xFF4CAF50)),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-              Text(
-                'x1',
-                style: TextStyle(color: Color(0xFFCCCCCC), fontSize: 16.sp),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}

ln_jq_app/lib/pages/c_page/mall/rule/view.dart

@@ -1,131 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:getx_scaffold/common/index.dart';
-import 'package:ln_jq_app/common/login_util.dart';
-
-class MallRulePage extends StatelessWidget {
-  const MallRulePage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Color.fromRGBO(64, 199, 154, 1),
-      appBar: AppBar(
-        backgroundColor: Colors.transparent,
-        elevation: 0,
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios, color: Colors.white, size: 20),
-          onPressed: () => Get.back(),
-        ),
-      ),
-      body: Stack(
-        children: [
-          // 顶部装饰图
-          Positioned(
-            top: 30,
-            right: Get.width * 0.15,
-            child: LoginUtil.getAssImg("rule_bg@2x"),
-          ),
-          Container(
-            margin: const EdgeInsets.fromLTRB(20, 100, 20, 20),
-            padding: const EdgeInsets.all(24),
-            width: double.infinity,
-            decoration: BoxDecoration(
-              image: DecorationImage(
-                image: AssetImage('assets/images/rule_bg_1@2x.png'),
-                fit: BoxFit.fill,
-              ),
-            ),
-            child: SingleChildScrollView(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const Text(
-                    '积分获取规则',
-                    style: TextStyle(
-                      fontSize: 22,
-                      fontWeight: FontWeight.bold,
-                      color: Color(0xFF2C3E50),
-                    ),
-                  ),
-                  const SizedBox(height: 30),
-                  _buildRuleItem(
-                    icon: 'tips_1@2x',
-                    title: '每日首次签到积分规则',
-                    content: '每日首签，立得 1 积分',
-                  ),
-                  _buildRuleItem(
-                    icon: 'tips_2@2x',
-                    title: '每日预约加氢积分规则',
-                    content: '每日前 2 次预约加氢，各得 1 积分',
-                  ),
-                  _buildRuleItem(
-                    icon: 'tips_3@2x',
-                    title: '连续签到累计赠分规则',
-                    content: '连续签到 3 天赠 2 积分，7 天赠 5 积分',
-                  ),
-                  _buildRuleItem(
-                    icon: 'tips_4@2x',
-                    title: '连续签到周期及断签重置规则',
-                    content: '7 天为一个签到周期，中途断签则重新从第 1 天计算',
-                  ),
-                  _buildRuleItem(
-                    icon: 'tips_5@2x',
-                    title: '积分使用规则',
-                    content:
-                        '积分有效期3个月。个人账户内累计的所有有效积分，可在平台积分商城中，用于兑换商城内上架的各类商品、权益或服务，兑换时将按照商品标注的积分值扣除对应积分，积分兑换后不支持撤销、退换，商品兑换规则以积分商城内公示为准。',
-                  ),
-                  const SizedBox(height: 40),
-                  const Center(
-                    child: Text(
-                      '本活动最终解释权归官方所有，如有疑问可咨询客服。',
-                      style: TextStyle(color: Color(0xFF999999), fontSize: 12),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildRuleItem({
-    required String icon,
-    required String title,
-    required String content,
-  }) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 24),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              LoginUtil.getAssImg(icon),
-              const SizedBox(width: 8),
-              Text(
-                title,
-                style: TextStyle(
-                  fontSize: 15.sp,
-                  fontWeight: FontWeight.bold,
-                  color: Color(0xFF333333),
-                ),
-              ),
-            ],
-          ),
-          const SizedBox(height: 6),
-          Padding(
-            padding: const EdgeInsets.only(left: 0),
-            child: Text(
-              content,
-              style: TextStyle(fontSize: 13.sp, color: Color(0xFF666666), height: 1.5),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

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

@@ -12,63 +12,40 @@ class MessagePage extends GetView<MessageController> {
     Get.put(MessageController());
 
     return Scaffold(
-      backgroundColor: const Color(0xFFF7F9FB),
-      appBar: AppBar(
-        title: const Text('消息通知'),
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        foregroundColor: Colors.black,
-        elevation: 0,
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios, size: 20),
-          onPressed: () => Get.back(),
-        ),
-      ),
-      body: Stack(
+      backgroundColor: const Color(0xFFF5F5F5),
+      appBar: AppBar(title: const Text('消息通知'), centerTitle: true),
+      body: Column(
         children: [
-          Obx(() => SmartRefresher(
-                controller: controller.refreshController,
-                enablePullUp: true,
-                onRefresh: controller.onRefresh,
-                onLoading: controller.onLoading,
-                child: ListView.builder(
-                  padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 20),
-                  itemCount: controller.messageList.length,
-                  itemBuilder: (context, index) {
-                    return _buildMessageItem(context, controller.messageList[index]);
-                  },
-                ),
-              )),
+          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
-              ? Positioned(
-                  right: 20,
-                  bottom: 50,
-                  child: GestureDetector(
-                    onTap: controller.markAllRead,
-                    child: Container(
-                      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 14),
-                      decoration: BoxDecoration(
-                        color: const Color(0xFF007A45),
-                        borderRadius: BorderRadius.circular(30),
-                        boxShadow: [
-                          BoxShadow(
-                            color: Colors.black.withOpacity(0.1),
-                            blurRadius: 10,
-                            offset: const Offset(0, 4),
-                          ),
-                        ],
-                      ),
-                      child: const Text(
-                        '全部已读',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontWeight: FontWeight.bold,
-                          fontSize: 14,
-                        ),
-                      ),
-                    ),
-                  ),
-                )
+              ? 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()),
         ],
       ),
@@ -76,92 +53,54 @@ class MessagePage extends GetView<MessageController> {
   }
 
   Widget _buildMessageItem(BuildContext context, MessageModel item) {
-    return IntrinsicHeight(
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          // 左侧时间轴线条和圆点
-          SizedBox(
-            width: 40,
-            child: Stack(
-              alignment: Alignment.topCenter,
-              children: [
-                Container(
-                  width: 1.5,
-                  color: const Color(0xFFD8E2EE),
-                ),
-                Positioned(
-                  top: 25,
-                  child: Container(
-                    width: 12,
-                    height: 12,
-                    decoration: BoxDecoration(
-                      color: item.isRead == 1
-                          ? const Color(0xFFAAB6C3)
-                          : const Color(0xFF4CAF50),
-                      shape: BoxShape.circle,
-                      border: Border.all(color: Colors.white, width: 2),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-          // 右侧内容卡片
-          Expanded(
-            child: GestureDetector(
-              onTap: () {
-                controller.markRead(item);
-                _showMessageDialog(context, item);
-              },
-              child: Container(
-                margin: const EdgeInsets.only(bottom: 16),
-                padding: const EdgeInsets.all(20),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(24),
-                  boxShadow: [
-                    BoxShadow(
-                      color: Colors.black.withOpacity(0.02),
-                      blurRadius: 10,
-                      offset: const Offset(0, 4),
-                    ),
-                  ],
-                ),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      item.title,
-                      style: const TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.bold,
-                        color: Color(0xFF333333),
-                      ),
-                    ),
-                    const SizedBox(height: 10),
-                    Text(
-                      item.content,
-                      style: const TextStyle(
-                        fontSize: 14,
-                        color: Color(0xFF666666),
-                        height: 1.4,
-                      ),
-                    ),
-                    const SizedBox(height: 12),
-                    Text(
-                      item.createTime,
-                      style: const TextStyle(
-                        fontSize: 12,
-                        color: Color(0xFFCCCCCC),
-                      ),
-                    ),
-                  ],
-                ),
+    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]),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }
@@ -172,7 +111,7 @@ class MessagePage extends GetView<MessageController> {
       barrierDismissible: true,
       builder: (context) {
         return Dialog(
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
           child: Container(
             padding: const EdgeInsets.all(24),
             child: Column(
@@ -183,22 +122,22 @@ class MessagePage extends GetView<MessageController> {
                   item.title,
                   style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
                 ),
-                const SizedBox(height: 16),
+                const SizedBox(height: 12),
                 Text(
                   item.content,
-                  style: const TextStyle(
-                      fontSize: 15, height: 1.5, color: Color(0xFF333333)),
+                  style: const TextStyle(fontSize: 15, height: 1.5, color: Colors.black87),
                 ),
                 const SizedBox(height: 24),
                 Align(
                   alignment: Alignment.centerRight,
-                  child: TextButton(
+                  child: OutlinedButton(
                     onPressed: () => Navigator.pop(context),
-                    style: TextButton.styleFrom(
-                      foregroundColor: const Color(0xFF007A45),
+                    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(fontWeight: FontWeight.bold)),
+                    child: const Text('确认', style: TextStyle(color: Colors.blue)),
                   ),
                 ),
               ],
@@ -208,4 +147,4 @@ class MessagePage extends GetView<MessageController> {
       },
     );
   }
-}
+}