ios build

ln_jq_app/android/app/build.gradle.kts

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

ln_jq_app/android/app/proguard-rules.pro

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

ln_jq_app/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'));
-  }
 }
 

ln_jq_app/lib/common/styles/theme.dart

@@ -5,7 +5,7 @@ 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;

ln_jq_app/lib/main.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:get_storage/get_storage.dart';
@@ -9,8 +8,8 @@ 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();
@@ -18,10 +17,8 @@ void main() async {
   WidgetsBinding widgetsBinding = await init(
     isDebug: true,
     logTag: '小羚羚',
-    supportedLocales: [const Locale('zh', 'CN')],
+    supportedLocales: [Locale('zh', 'CN')],
   );
-  
-  // 保持原生闪屏页，直到 WelcomeController 调用 remove()
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
 
   await GetStorage.init();
@@ -31,24 +28,36 @@ void main() async {
 
   runApp(
     GetxApp(
+      // 设计稿尺寸 单位：dp
       designSize: const Size(390, 844),
+      // Getx Log
       enableLog: true,
+      // 默认的跳转动画
       defaultTransition: Transition.rightToLeft,
+      // 主题模式
       themeMode: GlobalService.to.themeMode,
+      // 主题
       theme: AppTheme.light,
+      // Dark主题
       darkTheme: AppTheme.light,
+      // AppTitle
       title: '小羚羚',
-      // 将入口改为启动页
+      // 首页入口
-      home: const WelcomePage(),
+      home: HomePage(),
-      fallbackLocale: const Locale('zh', 'CN'),
+      //组件国际化
-      supportedLocales: const [Locale('zh', 'CN')],
+      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!;
       },
     ),
@@ -58,16 +67,20 @@ void main() async {
 void initHttpSet() {
   AppTheme.test_service_url = StorageService.to.hostUrl ?? AppTheme.test_service_url;
 
+  // 设置基础 URL
   HttpService.to.setBaseUrl(AppTheme.test_service_url);
+  //指定请求头
   HttpService.to.dio.interceptors.add(TokenInterceptor(tokenKey: 'asoco-token'));
+  // 设置全局响应处理器
   HttpService.to.setOnResponseHandler((response) async {
     try {
       final baseModel = BaseModel.fromJson(response.data);
       if (baseModel.code == 0 || baseModel.code == 200) {
+
         return null;
       } else if (baseModel.code == 401) {
         await StorageService.to.clearLoginInfo();
-        Get.offAll(() => const LoginPage());
+        Get.offAll(() => LoginPage());
         return baseModel.message;
       } else {
         return (baseModel.error.toString()).isEmpty

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

@@ -173,6 +173,10 @@ class HistoryPage extends GetView<HistoryController> {
         text = '未加氢';
         color = Colors.red;
         break;
+      case ReservationStatus.cancel:
+        text = '已取消';
+        color = Colors.red;
+        break;
       default:
         text = '未知状态';
         color = Colors.grey;

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

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

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

@@ -12,11 +12,13 @@ enum ReservationStatus {
   completed, // 完成 ( addStatus: 1)
   rejected, // 拒绝 ( -1)
   unadded, // 未加 ( 2)
+  cancel, // 取消预约
   unknown, // 未知状态
 }
 
 class ReservationModel {
   final String id;
+  final String stationId;
   final String plateNumber;
   String amount;
   final String time;
@@ -40,6 +42,7 @@ class ReservationModel {
 
   ReservationModel({
     required this.id,
+    required this.stationId,
     required this.plateNumber,
     required this.amount,
     required this.time,
@@ -80,6 +83,9 @@ class ReservationModel {
         case 2:
           currentStatus = ReservationStatus.unadded;
           break;
+        case 6:
+          currentStatus = ReservationStatus.cancel;
+          break;
         default:
           currentStatus = ReservationStatus.unknown;
       }
@@ -97,6 +103,7 @@ class ReservationModel {
     return ReservationModel(
       // 原始字段，用于UI兼容
       id: json['id']?.toString() ?? '',
+      stationId: json['stationId']?.toString() ?? '',
       plateNumber: json['plateNumber']?.toString() ?? '未知车牌',
       amount: '${json['hydAmount']?.toString() ?? '0'}kg',
       time: timeRange,
@@ -136,24 +143,32 @@ class SiteController extends GetxController with BaseControllerMixin {
   Timer? _refreshTimer;
 
   final TextEditingController searchController = TextEditingController();
-  bool isNotice = false;
+
+  @override
+  bool get listenLifecycleEvent => true;
 
   @override
   void onInit() {
     super.onInit();
     renderData();
-    _msgNotice();
+    msgNotice();
     startAutoRefresh();
   }
 
+  @override
+  void onPaused() {
+    stopAutoRefresh();
+    super.onPaused();
+  }
+
   @override
   void onClose() {
     stopAutoRefresh();
     searchController.dispose();
     super.onClose();
   }
-
+  bool isNotice = false;
-  Future<void> _msgNotice() async {
+  Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,
       'isRead': 1,
@@ -169,6 +184,7 @@ class SiteController extends GetxController with BaseControllerMixin {
       if (result.code == 0 && result.data != null) {
         String total = result.data["total"].toString();
         isNotice = int.parse(total) > 0;
+        updateUi();
       }
     }
   }
@@ -183,7 +199,7 @@ class SiteController extends GetxController with BaseControllerMixin {
     });
   }
 
-  /// 【6. 新增】停止定时器的方法
+  ///停止定时器的方法
   void stopAutoRefresh() {
     // 如果定时器存在并且是激活状态，就取消它
     _refreshTimer?.cancel();
@@ -205,6 +221,7 @@ class SiteController extends GetxController with BaseControllerMixin {
           'pageNum': 1,
           'pageSize': 50, // 暂时不考虑分页，一次获取30条
           'keyword': searchText, // 加氢站名称、手机号
+          'stationId': StorageService.to.userId
         },
       );
 

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

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

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

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

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

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

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

@@ -78,11 +78,18 @@ class CertificateViewerController extends GetxController with BaseControllerMixi
       return;
     }
 
-    Get.to(() => const AttachmentViewerPage(), arguments: {'url': url});
+    Get.to(
+          () => const AttachmentViewerPage(),
+      arguments: {
+        'url': url,
+      },
+    );
   }
 
   /// 检查 URL 是否为 PDF (此方法保持不变)
   bool isPdf(String url) {
     return url.toLowerCase().endsWith('.pdf');
   }
+
+
 }

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

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

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

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

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

@@ -19,6 +19,10 @@ class MessageController extends GetxController {
     _loadData(isRefresh: true);
   }
 
+  void onRefresh() => _loadData(isRefresh: true);
+
+  void onLoading() => _loadData(isRefresh: false);
+
   Future<void> _loadData({bool isRefresh = false}) async {
     final int targetPage = isRefresh ? 1 : _pageNum + 1;
 
@@ -100,9 +104,7 @@ class MessageController extends GetxController {
     }
   }
 
-  void onRefresh() => _loadData(isRefresh: true);
 
-  void onLoading() => _loadData(isRefresh: false);
 
   // 标记全部已读
   void markAllRead() async {

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

@@ -35,9 +35,9 @@ class MineController extends GetxController with BaseControllerMixin {
   String historyBreakRules = "";
   String vin = "";
   String plateNumber = "";
-  String violationTotal = "0";//违章总数
+  String violationTotal = "0";
-  String violationScore = "0";//扣分总数
+  String violationScore = "0";
-  String violationDispose = "0";//已处理
+  String violationDispose = "0";
   bool isNotice = false;
 
   void renderData() async {
@@ -57,7 +57,7 @@ class MineController extends GetxController with BaseControllerMixin {
         _fetchAccidentCount(), // 请求2：事故数
         _fetchBreakRulesCount(), // 请求3：违章数
         _rating(), // 司机评分
-        _msgNotice(), // 红点消息
+        msgNotice(), // 红点消息
       ]);
 
       await renderViolation();
@@ -69,7 +69,7 @@ class MineController extends GetxController with BaseControllerMixin {
     }
   }
 
-  Future<void> _msgNotice() async {
+  Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,
       'isRead': 1,
@@ -85,6 +85,7 @@ class MineController extends GetxController with BaseControllerMixin {
       if (result.code == 0 && result.data != null) {
         String total = result.data["total"].toString();
         isNotice = int.parse(total) > 0;
+        updateUi();
       }
     }
   }

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

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

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

@@ -335,12 +335,12 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
     final startTimeStr =
         '$dateStr ${_formatTimeOfDay(startTime.value)}:00'; // Use helper directly
 
-    if (lastSuccessfulReservation != null &&
+    /*if (lastSuccessfulReservation != null &&
         lastSuccessfulReservation!.id == selectedStationId.value &&
         lastSuccessfulReservation!.startTime == startTimeStr) {
       showToast("请勿重复提交相同时间段的预约，可在“查看预约”中修改");
       return;
-    }
+    }*/
 
     final reservationEndDateTime = DateTime(
       selectedDate.value.year,
@@ -401,6 +401,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
         lastSuccessfulReservation = ReservationModel(
           id: selectedStationId.value!,
+          stationId: '',
           hydAmount: ampuntStr,
           startTime: startTimeStr,
           endTime: endTimeStr,
@@ -535,11 +536,11 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
   String leftHydrogen = "0";
   num maxHydrogen = 0;
   String difference = "";
-  var progressValue = 0.0;
 
   //用来管理查看预约的弹窗
   Worker? _sheetWorker;
   bool init = false;
+  Timer? _refreshTimer;
 
   @override
   bool get listenLifecycleEvent => true;
@@ -549,40 +550,34 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
     super.onInit();
     getUserBindCarInfo();
     getSiteList();
-    _msgNotice();
+    startAutoRefresh();
-
     if (!init) {
       _setupListener();
       init = true;
     }
   }
 
-  bool isNotice = false;
-
-  Future<void> _msgNotice() async {
-    final Map<String, dynamic> requestData = {
-      'appFlag': 1,
-      'isRead': 1,
-      'pageNum': 1,
-      'pageSize': 5,
-    };
-    final response = await HttpService.to.get(
-      'appointment/unread_notice/page',
-      params: requestData,
-    );
-    if (response != null) {
-      final result = BaseModel.fromJson(response.data);
-      if (result.code == 0 && result.data != null) {
-        String total = result.data["total"].toString();
-        isNotice = int.parse(total) > 0;
-      }
-    }
-  }
-
   @override
-  void dispose() {
+  void onPaused() {
-    _sheetWorker?.dispose();
+    stopAutoRefresh();
-    super.dispose();
+    super.onPaused();
+  }
+
+  void startAutoRefresh() {
+    // 先停止已存在的定时器，防止重复启动
+    stopAutoRefresh();
+
+    // 创建一个每1分钟执行一次的周期性定时器
+    _refreshTimer = Timer.periodic(const Duration(minutes: 1), (timer) {
+      getSiteList();
+    });
+  }
+
+  ///停止定时器的方法
+  void stopAutoRefresh() {
+    // 如果定时器存在并且是激活状态，就取消它
+    _refreshTimer?.cancel();
+    _refreshTimer = null; // 置为null，方便判断
   }
 
   void _setupListener() {
@@ -649,8 +644,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
   void getCatinfo() async {
     try {
+      HttpService.to.setBaseUrl(AppTheme.car_service_url);
       var responseData = await HttpService.to.post(
-        'appointment/vehicle/getHydrogenInfoByPlateNumber',
+        'VehicleData/getHydrogenInfoByPlateNumber',
         data: {
           'userName': "xll@lingniu",
           'password': "4q%3!l6s0p",
@@ -675,29 +671,11 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
         amountController.text = flooredDifference.toString();
       }
 
-      if (maxHydrogen > 0) {
-        progressValue = leftHydrogenNum / maxHydrogen;
-
-        // 边界处理：确保值在 0 到 1 之间
-        if (progressValue > 1.0) progressValue = 1.0;
-        if (progressValue < 0.0) progressValue = 0.0;
-      }
-
       updateUi();
     } catch (e) {
+    } finally {
+      HttpService.to.setBaseUrl(AppTheme.test_service_url);
     }
-    renderSliderTheme();
-  }
-
-  double current = 0.0;
-  double maxVal = 0.0;
-
-  void renderSliderTheme() {
-    current = double.tryParse(amountController.text) ?? 0.0;
-    maxVal = double.tryParse(difference) ?? 100.0;
-    if (maxVal <= 0) maxVal = 100.0;
-
-    updateUi();
   }
 
   void getSiteList() async {
@@ -779,6 +757,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       // 如果未绑定车辆，且本次会话尚未提示过，则弹出提示
       if (!StorageService.to.hasShownBindVehicleDialog &&
           StorageService.to.isLoggedIn &&
+          StorageService.to.loginChannel == LoginChannel.driver &&
           !StorageService.to.hasVehicleInfo) {
         Future.delayed(const Duration(milliseconds: 500), () {
           DialogX.to.showConfirmDialog(
@@ -809,6 +788,8 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
     if (_debounce != null) {
       _debounce?.cancel();
     }
+    _sheetWorker?.dispose();
+    stopAutoRefresh();
     super.onClose();
   }
 }

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

@@ -132,7 +132,6 @@ class ReservationEditController extends GetxController with BaseControllerMixin
 
     TimeSlot tempSlot = availableSlots[initialItem];
 
-
     Get.bottomSheet(
       Container(
         height: 300,
@@ -228,6 +227,7 @@ class ReservationEditController extends GetxController with BaseControllerMixin
         'appointment/orderAddHyd/saveOrUpdate',
         data: {
           'id': reservation.id,
+          'stationId': reservation.stationId,
           'startTime': startTimeStr,
           'endTime': endTimeStr,
           'hydAmount': amountStr,

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

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

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

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

ln_jq_app/lib/pages/home/controller.dart

@@ -7,6 +7,7 @@ import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/b_page/base_widgets/view.dart';
 import 'package:ln_jq_app/pages/c_page/base_widgets/view.dart';
+import 'package:ln_jq_app/pages/c_page/message/view.dart';
 import 'package:ln_jq_app/pages/login/view.dart';
 
 import '../../storage_service.dart';
@@ -156,6 +157,7 @@ class HomeController extends GetxController with BaseControllerMixin {
 
   Future<void> _onNotificationOpened(Map<dynamic, dynamic> message) async {
     Logger.d('onNotificationOpened ====> $message');
+    await Get.to(() => const MessagePage());
   }
 
   Future<void> _onNotificationRemoved(Map<dynamic, dynamic> message) async {

ln_jq_app/lib/pages/login/controller.dart

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

ln_jq_app/lib/pages/url_host/controller.dart

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

ln_jq_app/lib/pages/welcome/controller.dart

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

ln_jq_app/lib/pages/welcome/view.dart

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

ln_jq_app/lib/storage_service.dart

@@ -142,7 +142,7 @@ class StorageService extends GetxService {
 
   void delAlias() async {
     String phoen = StorageService.to.phone ?? "";
-    var result = await _aliyunPush.removeAlias(phoen);
+    var result = await await _aliyunPush.unbindAccount();
     var code = result['code'];
     if (code == kAliyunPushSuccessCode) {
       Logger.d('删除别名$phoen成功');

ln_jq_app/pubspec.yaml

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