Merge branch 'dev'

v1.2.4
2026-03-04 14:58:45 +08:00
parent 35bd3a78a5 fe44848529
commit d5083c1939
52 changed files with 3747 additions and 1251 deletions
--- a/ln_jq_app/lib/common/AuthGuard.dart
+++ b/ln_jq_app/lib/common/AuthGuard.dart
@@ -0,0 +1,22 @@
+import 'package:getx_scaffold/common/index.dart';
+import 'package:ln_jq_app/pages/login/view.dart';
+import 'package:ln_jq_app/storage_service.dart';
+
+class AuthGuard {
+  static bool _handling401 = false;
+
+  static Future<void> handle401(String? message) async {
+    if (_handling401) return;
+    _handling401 = true;
+
+    try {
+      await StorageService.to.clearLoginInfo();
+      Get.offAll(() => const LoginPage());
+    } finally {
+      // 防止意外卡死，可视情况是否延迟重置
+      Future.delayed(const Duration(seconds: 1), () {
+        _handling401 = false;
+      });
+    }
+  }
+}
--- a/ln_jq_app/lib/common/model/station_model.dart
+++ b/ln_jq_app/lib/common/model/station_model.dart
@@ -4,7 +4,9 @@ class StationModel {
  final String address;
  final String price;
  final String siteStatusName; // 例如 "维修中"
-  final int isSelect; // 新增字段 1是可用 0是不可用
+  final int isSelect; // 1是可用 0是不可用
+  final String startBusiness; // 新增：可预约最早开始时间，如 "06:00:00"
+  final String endBusiness;   // 新增：可预约最晚结束时间，如 "22:00:00"

  StationModel({
    required this.hydrogenId,
@@ -13,9 +15,10 @@ class StationModel {
    required this.price,
    required this.siteStatusName,
    required this.isSelect,
+    required this.startBusiness,
+    required this.endBusiness,
  });

-  // 从 JSON map 创建对象的工厂构造函数
  factory StationModel.fromJson(Map<String, dynamic> json) {
    return StationModel(
      hydrogenId: json['hydrogenId'] ?? '',
@@ -23,7 +26,9 @@ class StationModel {
      address: json['address'] ?? '地址未知',
      price: json['price']?.toString() ?? '0.00',
      siteStatusName: json['siteStatusName'] ?? '',
-      isSelect: json['isSelect'] as int? ?? 0, // 新增字段的解析，默认为 0
+      isSelect: json['isSelect'] as int? ?? 0,
+      startBusiness: json['startBusiness'] ?? '00:00:00', // 默认全天
+      endBusiness: json['endBusiness'] ?? '23:59:59',     // 默认全天
    );
  }
 }
--- a/ln_jq_app/lib/main.dart
+++ b/ln_jq_app/lib/main.dart
@@ -3,6 +3,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/AuthGuard.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/token_interceptor.dart';
 import 'package:ln_jq_app/storage_service.dart';
@@ -20,7 +21,7 @@ void main() async {
    logTag: '小羚羚',
    supportedLocales: [const Locale('zh', 'CN')],
  );
-  
+
  // 保持原生闪屏页，直到 WelcomeController 调用 remove()
  FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);

@@ -65,6 +66,7 @@ void main() async {
 void initHttpSet() {
  AppTheme.test_service_url = StorageService.to.hostUrl ?? AppTheme.test_service_url;

+  HttpService.to.init(timeout: 15);
  HttpService.to.setBaseUrl(AppTheme.test_service_url);
  HttpService.to.dio.interceptors.add(TokenInterceptor(tokenKey: 'asoco-token'));
  HttpService.to.setOnResponseHandler((response) async {
@@ -76,8 +78,7 @@ void initHttpSet() {
      if (baseModel.code == 0 || baseModel.code == 200) {
        return null;
      } else if (baseModel.code == 401) {
-        await StorageService.to.clearLoginInfo();
-        Get.offAll(() => const LoginPage());
+        await AuthGuard.handle401(baseModel.message);
        return baseModel.message;
      } else {
        return (baseModel.error.toString()).isEmpty
--- a/ln_jq_app/lib/pages/b_page/history/controller.dart
+++ b/ln_jq_app/lib/pages/b_page/history/controller.dart
@@ -1,10 +1,11 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // Reuse ReservationModel

-class HistoryController extends GetxController {
+class HistoryController extends GetxController with BaseControllerMixin {
+  @override
+  String get builderId => 'history';
+
  // --- 定义 API 需要的日期格式化器 ---
  final DateFormat _apiDateFormat = DateFormat('yyyy-MM-dd');

@@ -13,8 +14,8 @@ class HistoryController extends GetxController {
  final Rx<DateTime> endDate = DateTime.now().obs;
  final TextEditingController plateNumberController = TextEditingController();

-  final RxString totalHydrogen = '0 kg'.obs;
-  final RxString totalCompletions = '0 次'.obs;
+  final RxString totalHydrogen = '0'.obs;
+  final RxString totalCompletions = '0'.obs;

  final RxList<ReservationModel> historyList = <ReservationModel>[].obs;
  final RxBool isLoading = true.obs;
@@ -23,14 +24,31 @@ class HistoryController extends GetxController {
  String get formattedStartDate => DateFormat('yyyy/MM/dd').format(startDate.value);

  String get formattedEndDate => DateFormat('yyyy/MM/dd').format(endDate.value);
+
  String stationName = "";

+  final Map<String, String> statusOptions = {
+    '': '全部',
+    '100': '未预约加氢',
+    '0': '待加氢',
+    '1': '已加氢',
+    '2': '未加氢',
+    '5': '拒绝加氢',
+  };
+
+  final RxString selectedStatus = ''.obs;
+  final RxString selectedDateType = ''.obs; // week, month, three_month
+
  @override
  void onInit() {
    super.onInit();
-
    final args = Get.arguments as Map<String, dynamic>;
-    stationName = args['stationName'] as String;
+    stationName = args['stationName'] as String? ?? "";
+    refreshData();
+  }
+
+  void refreshData() {
+    getAllOrderCounts();
    fetchHistoryData();
  }

@@ -38,51 +56,50 @@ class HistoryController extends GetxController {
    var response = await HttpService.to.post(
      "appointment/orderAddHyd/getAllOrderCounts",
      data: {
-        // --- 直接使用 DateFormat 来格式化日期 ---
-        'startTime': _apiDateFormat.format(startDate.value),
-        'endTime': _apiDateFormat.format(endDate.value),
+        /*'startTime': _apiDateFormat.format(startDate.value),
+        'endTime': _apiDateFormat.format(endDate.value),*/
        'plateNumber': plateNumberController.text,
-        'stationName': stationName, // 加氢站名称
+        'stationName': stationName,
+        "status": selectedStatus.value,
+        "dateType": selectedDateType.value,
      },
    );
    if (response == null || response.data == null) {
-      totalHydrogen.value = '0 kg';
-      totalCompletions.value = '0 次';
+      totalHydrogen.value = '0';
+      totalCompletions.value = '0';
      return;
    }
    try {
      final baseModel = BaseModel<dynamic>.fromJson(response.data);
      final dataMap = baseModel.data as Map<String, dynamic>;
-      totalHydrogen.value = '${dataMap['totalAddAmount'] ?? 0} kg';
-      totalCompletions.value = '${dataMap['orderCompleteCount'] ?? 0} 次';
+      totalHydrogen.value = '${dataMap['totalAddAmount'] ?? 0}';
+      totalCompletions.value = '${dataMap['orderCompleteCount'] ?? 0}';
    } catch (e) {
-      totalHydrogen.value = '0 kg';
-      totalCompletions.value = '0 次';
+      totalHydrogen.value = '0';
+      totalCompletions.value = '0';
    }
  }

  Future<void> fetchHistoryData() async {
    isLoading.value = true;
-
-    //获取数据
-    getAllOrderCounts();
+    updateUi();

    try {
      var response = await HttpService.to.post(
        "appointment/orderAddHyd/sitOrderPage",
        data: {
-          // --- 直接使用 DateFormat 来格式化日期 ---
-          'startTime': _apiDateFormat.format(startDate.value),
-          'endTime': _apiDateFormat.format(endDate.value),
+          /*'startTime': _apiDateFormat.format(startDate.value),
+          'endTime': _apiDateFormat.format(endDate.value),*/
          'plateNumber': plateNumberController.text,
          'pageNum': 1,
          'pageSize': 50,
-          'stationName': stationName, // 加氢站名称
+          'stationName': stationName,
+          "status": selectedStatus.value,
+          "dateType": selectedDateType.value,
        },
      );

      if (response == null || response.data == null) {
-        showToast('无法获取历史记录');
        _resetData();
        return;
      }
@@ -90,7 +107,6 @@ class HistoryController extends GetxController {
      final baseModel = BaseModel<dynamic>.fromJson(response.data);
      if (baseModel.code == 0 && baseModel.data != null) {
        final dataMap = baseModel.data as Map<String, dynamic>;
-
        final List<dynamic> listFromServer = dataMap['records'] ?? [];
        historyList.assignAll(
          listFromServer
@@ -99,14 +115,13 @@ class HistoryController extends GetxController {
        );
        hasData.value = historyList.isNotEmpty;
      } else {
-        showToast(baseModel.message);
        _resetData();
      }
    } catch (e) {
-      showToast('获取历史记录失败: $e');
      _resetData();
    } finally {
      isLoading.value = false;
+      updateUi();
    }
  }

@@ -115,97 +130,15 @@ class HistoryController extends GetxController {
    hasData.value = false;
  }

-  void pickDate(BuildContext context, bool isStartDate) {
-    //  确定当前操作的日期和临时存储变量
-    final DateTime initialDate = isStartDate ? startDate.value : endDate.value;
-    DateTime tempDate = initialDate;
+  void onStatusSelected(String status) {
+    if (selectedStatus.value == status) return;
+    selectedStatus.value = status;
+    refreshData();
+  }

-    //  定义全局的最早可选日期
-    final DateTime globalMinimumDate = DateTime(2025, 12, 1);
-
-    //  动态计算当前选择器的最小/最大日期范围
-    DateTime minimumDate;
-    DateTime? maximumDate; // 声明为可空，因为两个日期都可能没有最大限制
-
-    if (isStartDate) {
-      // 当选择【开始日期】时 它的最小日期就是全局最小日期
-      minimumDate = globalMinimumDate;
-      // 最大日期没有限制
-      maximumDate = null;
-    } else {
-      // 当选择【结束日期】时 它的最小日期不能早于当前的开始日期
-      minimumDate = startDate.value;
-      //  确认结束日期没有最大限制 ---
-      //最大日期没有限制
-      maximumDate = null;
-    }
-
-    Get.bottomSheet(
-      Container(
-        height: 300,
-        decoration: const BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.only(
-            topLeft: Radius.circular(16),
-            topRight: Radius.circular(16),
-          ),
-        ),
-        child: Column(
-          children: [
-            // 顶部的取消和确认按钮
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  TextButton(
-                    onPressed: () => Get.back(),
-                    child: const Text('取消', style: TextStyle(color: Colors.grey)),
-                  ),
-                  TextButton(
-                    onPressed: () {
-                      // 4. 确认后，更新对应的日期变量
-                      if (isStartDate) {
-                        startDate.value = tempDate;
-                        // 如果新的开始日期晚于结束日期，自动将结束日期调整为同一天
-                        if (tempDate.isAfter(endDate.value)) {
-                          endDate.value = tempDate;
-                        }
-                      } else {
-                        endDate.value = tempDate;
-                      }
-                      Get.back();
-
-                      // 选择日期后自动刷新数据
-                      fetchHistoryData();
-                    },
-                    child: const Text(
-                      '确认',
-                      style: TextStyle(fontWeight: FontWeight.bold),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const Divider(height: 1),
-            // 日期选择器
-            Expanded(
-              child: CupertinoDatePicker(
-                mode: CupertinoDatePickerMode.date,
-                initialDateTime: initialDate,
-                // 应用动态计算好的最小/最大日期
-                minimumDate: minimumDate,
-                maximumDate: maximumDate,
-                onDateTimeChanged: (DateTime newDate) {
-                  tempDate = newDate;
-                },
-              ),
-            ),
-          ],
-        ),
-      ),
-      backgroundColor: Colors.transparent, // 使底部工作表外的区域透明
-    );
+  void onDateTypeSelected(String type) {
+    selectedDateType.value = type;
+    refreshData();
  }

  @override
--- a/ln_jq_app/lib/pages/b_page/history/view.dart
+++ b/ln_jq_app/lib/pages/b_page/history/view.dart
@@ -1,107 +1,173 @@
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:ln_jq_app/common/styles/theme.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/history/controller.dart';
-import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // Reuse ReservationModel
+import 'package:ln_jq_app/pages/b_page/site/controller.dart';

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

  @override
  Widget build(BuildContext context) {
-    Get.put(HistoryController());
+    return GetBuilder<HistoryController>(
+      init: HistoryController(),
+      id: 'history',
+      builder: (_) {
+        return Scaffold(
+          backgroundColor: const Color(0xFFF7F8FA),
+          appBar: AppBar(
+            backgroundColor: Colors.white,
+            elevation: 0,
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back_ios, color: Colors.black, size: 20),
+              onPressed: () => Get.back(),
+            ),
+            title: _buildSearchBox(),
+          ),
+          body: Column(
+            children: [
+              _buildFilterBar(),
+              _buildSummaryCard(),
+              Expanded(child: _buildHistoryList()),
+            ],
+          ),
+        );
+      },
+    );
+  }

-    return Scaffold(
-      appBar: AppBar(title: const Text('历史记录'), centerTitle: true),
-      body: Padding(
-        padding: const EdgeInsets.all(12.0),
-        child: Column(
-          children: [
-            _buildFilterCard(context),
-            const SizedBox(height: 12),
-            _buildSummaryCard(),
-            const SizedBox(height: 12),
-            _buildListHeader(),
-            Expanded(child: _buildHistoryList()),
-          ],
+  Widget _buildSearchBox() {
+    return Container(
+      height: 36,
+      decoration: BoxDecoration(
+        color: const Color(0xFFF2F3F5),
+        borderRadius: BorderRadius.circular(18),
+      ),
+      child: TextField(
+        controller: controller.plateNumberController,
+        onSubmitted: (v) => controller.refreshData(),
+        decoration: const InputDecoration(
+          hintText: '搜索车牌号',
+          hintStyle: TextStyle(color: Color(0xFFBBBBBB), fontSize: 14),
+          prefixIcon: Icon(Icons.search_sharp, color: Color(0xFFBBBBBB), size: 20),
+          border: InputBorder.none,
+          contentPadding: EdgeInsets.only(bottom: 12),
        ),
      ),
    );
  }

-  Widget _buildFilterCard(BuildContext context) {
-    return Card(
-      elevation: 2,
-      child: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            const Text('时间范围', style: TextStyle(fontSize: 14, color: Colors.grey)),
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                Expanded(child: _buildDateField(context, true)),
-                const Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 8.0),
-                  child: Text('至'),
-                ),
-                Expanded(child: _buildDateField(context, false)),
-              ],
-            ),
-            const SizedBox(height: 16),
-            const Text('车牌号', style: TextStyle(fontSize: 14, color: Colors.grey)),
-            const SizedBox(height: 8),
-            SizedBox(
-              height: 44,
-              child: TextField(
-                controller: controller.plateNumberController,
-                decoration: InputDecoration(
-                  hintText: '请输入车牌号',
-                  border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
-                  contentPadding: const EdgeInsets.symmetric(horizontal: 12),
-                ),
+  Widget _buildFilterBar() {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      child: Row(
+        children: [
+          Expanded(
+            child: SingleChildScrollView(
+              scrollDirection: Axis.horizontal,
+              child: Row(
+                children: controller.statusOptions.entries.map((entry) {
+                  return Obx(() {
+                    bool isSelected = controller.selectedStatus.value == entry.key;
+                    return GestureDetector(
+                      onTap: () => controller.onStatusSelected(entry.key),
+                      child: Container(
+                        margin: const EdgeInsets.only(right: 12),
+                        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+                        decoration: BoxDecoration(
+                          color: isSelected ? const Color(0xFF006633) : Colors.white,
+                          borderRadius: BorderRadius.circular(15),
+                        ),
+                        child: Text(
+                          entry.value,
+                          style: TextStyle(
+                            color: isSelected
+                                ? Colors.white
+                                : Color.fromRGBO(148, 163, 184, 1),
+                            fontSize: 12.sp,
+                            fontWeight: isSelected ? FontWeight.bold : FontWeight.w600,
+                          ),
+                        ),
+                      ),
+                    );
+                  });
+                }).toList(),
              ),
            ),
-            const SizedBox(height: 16),
-            ElevatedButton.icon(
-              onPressed: () {
-                FocusScope.of(context).unfocus(); // Hide keyboard
-                controller.fetchHistoryData();
-              },
-              icon: const Icon(Icons.search, size: 20),
-              label: const Text('查询'),
-              style: ElevatedButton.styleFrom(
-                minimumSize: const Size(double.infinity, 44),
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-              ),
-            ),
-          ],
-        ),
+          ),
+          _buildTimeFilterIcon(),
+        ],
      ),
    );
  }

+  Widget _buildTimeFilterIcon() {
+    return PopupMenuButton<String>(
+      icon: LoginUtil.getAssImg("ic_ex_menu@2x"),
+      onSelected: controller.onDateTypeSelected,
+      itemBuilder: (context) => [
+        const PopupMenuItem(value: 'week', child: Text('最近一周')),
+        const PopupMenuItem(value: 'month', child: Text('最近一月')),
+        const PopupMenuItem(value: 'three_month', child: Text('最近三月')),
+      ],
+    );
+  }
+
  Widget _buildSummaryCard() {
-    return Card(
-      elevation: 2,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 20.0),
-        child: Obx(
-          () => Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: [
-              _buildSummaryItem('实际加氢总量', controller.totalHydrogen.value, Colors.blue),
-              const SizedBox(width: 1, height: 40, child: VerticalDivider()),
-              _buildSummaryItem(
-                '预约完成次数',
-                controller.totalCompletions.value,
-                Colors.green,
-              ),
-            ],
-          ),
+    return Container(
+      margin: const EdgeInsets.only(left: 16, right: 16,bottom: 12),
+      padding: const EdgeInsets.all(20),
+      height: 160,
+      width: double.infinity,
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(24),
+        image: const DecorationImage(
+          image: AssetImage('assets/images/history_bg.png'),
+          fit: BoxFit.cover,
        ),
      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const Text('加氢站', style: TextStyle(color: Colors.white70, fontSize: 12)),
+          Text(
+            controller.stationName,
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 20,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const Spacer(),
+          Obx(
+            () => Row(
+              children: [
+                _buildSummaryItem('实际加氢量', '${controller.totalHydrogen.value} Kg'),
+                const SizedBox(width: 40),
+                _buildSummaryItem('预约完成次数', '${controller.totalCompletions.value} 次'),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSummaryItem(String label, String value) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(label, style: const TextStyle(color: Colors.white60, fontSize: 12)),
+        const SizedBox(height: 4),
+        Text(
+          value,
+          style: const TextStyle(
+            color: Colors.white,
+            fontSize: 18,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+      ],
    );
  }

@@ -110,143 +176,138 @@ class HistoryPage extends GetView<HistoryController> {
      if (controller.isLoading.value) {
        return const Center(child: CircularProgressIndicator());
      }
-      if (!controller.hasData.value) {
-        return const Center(child: Text('没有找到相关记录'));
+      if (controller.historyList.isEmpty) {
+        return const Center(
+          child: Text('暂无相关记录', style: TextStyle(color: Color(0xFF999999))),
+        );
      }
      return ListView.builder(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
        itemCount: controller.historyList.length,
        itemBuilder: (context, index) {
-          final ReservationModel item = controller.historyList[index];
-          return Card(
-            margin: const EdgeInsets.only(bottom: 8),
-            child: ListTile(
-              title: Text('车牌号: ${item.plateNumber}'),
-              subtitle: Text.rich(
-                TextSpan(
-                  children: [
-                    TextSpan(
-                      text: '加氢站: ${item.stationName}\n',
-                      style: TextStyle(fontSize: 16),
-                    ),
-                    TextSpan(
-                      text: '时间: ${item.time}\n',
-                      style: TextStyle(fontSize: 16),
-                    ),
-                    TextSpan(
-                      text: '加氢量：',
-                    ),
-                    TextSpan(
-                      text: '${item.amount}',
-                      style: TextStyle(fontSize: 16, color: AppTheme.themeColor),
-                    ),
-                  ],
-                ),
-              )
-              ,
-              trailing:
-                  // 状态标签
-                  _buildStatusChip(item.status),
-            ),
-          );
+          return _buildHistoryItem(controller.historyList[index]);
        },
      );
    });
  }

-  Widget _buildStatusChip(ReservationStatus status) {
-    String text;
-    Color color;
+  Widget _buildHistoryItem(ReservationModel item) {
+    return Container(
+      margin: const EdgeInsets.only(bottom: 12),
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    '车牌号',
+                    style: TextStyle(
+                      color: Color.fromRGBO(148, 163, 184, 1),
+                      fontSize: 12.sp,
+                    ),
+                  ),
+                  const SizedBox(height: 4),
+                  Text(
+                    item.plateNumber,
+                    style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+                  ),
+                ],
+              ),
+              _buildStatusBadge(item.status),
+            ],
+          ),
+          const SizedBox(height: 16),
+          Row(
+            children: [
+              _buildInfoColumn('加氢时间：', item.time),
+              _buildInfoColumn('加氢量', '${item.amount} Kg', isRight: true),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildInfoColumn(String label, String value, {bool isRight = false}) {
+    return Expanded(
+      child: Column(
+        crossAxisAlignment: isRight ? CrossAxisAlignment.end : CrossAxisAlignment.start,
+        children: [
+          Text(
+            label,
+            style: TextStyle(color: Color.fromRGBO(148, 163, 184, 1), fontSize: 12.sp),
+          ),
+          const SizedBox(height: 4),
+          Text(
+            value,
+            style: TextStyle(
+              fontSize: isRight ? 16 : 13,
+              fontWeight: isRight ? FontWeight.bold : FontWeight.normal,
+              color: const Color(0xFF333333),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildStatusBadge(ReservationStatus status) {
+    String text = '未知';
+    Color bgColor = Colors.grey.shade100;
+    Color textColor = Colors.grey;
+
    switch (status) {
      case ReservationStatus.pending:
        text = '待加氢';
-        color = Colors.orange;
+        bgColor = const Color(0xFFFFF7E8);
+        textColor = const Color(0xFFFF9800);
        break;
      case ReservationStatus.completed:
        text = '已加氢';
-        color = Colors.greenAccent;
+        bgColor = const Color(0xFFE8F5E9);
+        textColor = const Color(0xFF4CAF50);
        break;
      case ReservationStatus.rejected:
        text = '拒绝加氢';
-        color = Colors.red;
+        bgColor = const Color(0xFFFFEBEE);
+        textColor = const Color(0xFFF44336);
        break;
      case ReservationStatus.unadded:
        text = '未加氢';
-        color = Colors.red;
+        bgColor = const Color(0xFFFFEBEE);
+        textColor = const Color(0xFFF44336);
        break;
      case ReservationStatus.cancel:
        text = '已取消';
-        color = Colors.red;
+        bgColor = const Color(0xFFFFEBEE);
+        textColor = const Color(0xFFF44336);
        break;
      default:
        text = '未知状态';
-        color = Colors.grey;
+        bgColor = Colors.grey;
+        textColor = Colors.grey;
        break;
    }
+
    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
      decoration: BoxDecoration(
-        color: color.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(12),
+        color: bgColor,
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: textColor.withOpacity(0.3)),
      ),
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Icon(Icons.circle, color: color, size: 8),
-          const SizedBox(width: 4),
-          Text(
-            text,
-            style: TextStyle(color: color, fontSize: 12, fontWeight: FontWeight.bold),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildDateField(BuildContext context, bool isStart) {
-    return Obx(
-      () => InkWell(
-        onTap: () => controller.pickDate(context, isStart),
-        child: Container(
-          height: 44,
-          padding: const EdgeInsets.symmetric(horizontal: 12),
-          decoration: BoxDecoration(
-            border: Border.all(color: Colors.grey.shade400),
-            borderRadius: BorderRadius.circular(8),
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text(isStart ? controller.formattedStartDate : controller.formattedEndDate),
-              const Icon(Icons.calendar_today, size: 18, color: Colors.grey),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSummaryItem(String label, String value, Color color) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Text(label, style: const TextStyle(color: Colors.grey, fontSize: 14)),
-        const SizedBox(height: 8),
-        Text(
-          value,
-          style: TextStyle(color: color, fontSize: 22, fontWeight: FontWeight.bold),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildListHeader() {
-    return const Padding(
-      padding: EdgeInsets.symmetric(vertical: 8.0, horizontal: 14.0),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text('加氢明细', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
-        ],
+      child: Text(
+        text,
+        style: TextStyle(color: textColor, fontSize: 12, fontWeight: FontWeight.bold),
      ),
    );
  }
--- a/ln_jq_app/lib/pages/b_page/reservation/view.dart
+++ b/ln_jq_app/lib/pages/b_page/reservation/view.dart
@@ -36,7 +36,7 @@ class ReservationPage extends GetView<ReservationController> {
                      _buildSystemTips(),
                      SizedBox(height: 24),
                      _buildLogoutButton(),
-                      SizedBox(height: 75.h),
+                      SizedBox(height: 95.h),
                    ],
                  ),
                ),
--- a/ln_jq_app/lib/pages/b_page/site/controller.dart
+++ b/ln_jq_app/lib/pages/b_page/site/controller.dart
--- a/ln_jq_app/lib/pages/b_page/site/view.dart
+++ b/ln_jq_app/lib/pages/b_page/site/view.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/login_util.dart';
-import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/b_page/history/view.dart';
 import 'package:ln_jq_app/pages/c_page/message/view.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -57,17 +56,33 @@ class SitePage extends GetView<SiteController> {
                    ),
                    GestureDetector(
                      onTap: () {
-                        Get.to(
-                          () => HistoryPage(),
-                          arguments: {'stationName': controller.name},
-                        );
+                        // 手动录入
+                        controller.confirmReservation("", isAdd: true);
                      },
-                      child: Text(
-                        '历史记录',
-                        style: TextStyle(
-                          fontSize: 14.sp,
-                          fontWeight: FontWeight.bold,
-                          color: Color.fromRGBO(156, 163, 175, 1),
+                      child: Container(
+                        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                        decoration: BoxDecoration(
+                          color: Colors.white,
+                          borderRadius: BorderRadius.circular(20),
+                          border: Border.all(color: const Color(0xFFEEEEEE)),
+                        ),
+                        child: Row(
+                          children: [
+                            const Icon(
+                              Icons.add_circle_outline,
+                              size: 18,
+                              color: Color(0xFF666666),
+                            ),
+                            const SizedBox(width: 4),
+                            Text(
+                              "无预约车辆加氢",
+                              style: TextStyle(
+                                color: Color.fromRGBO(51, 51, 51, 1),
+                                fontSize: 13.sp,
+                                fontWeight: FontWeight.w400
+                              ),
+                            ),
+                          ],
                        ),
                      ),
                    ),
@@ -78,12 +93,12 @@ class SitePage extends GetView<SiteController> {
              Column(
                children: [
                  _buildSearchView(),
+                  SizedBox(height: 15.h),
                  controller.hasReservationData
                      ? _buildReservationListView()
                      : _buildEmptyReservationView(),
                ],
              ),
-
              SizedBox(height: 35.h),
              //第三部分
              Container(
@@ -136,7 +151,7 @@ class SitePage extends GetView<SiteController> {
            ],
          ),
        ),
-        SizedBox(height: 75.h),
+        SizedBox(height: 105.h),
      ],
    );
  }
@@ -185,27 +200,7 @@ class SitePage extends GetView<SiteController> {
                  ],
                ),
              ),
-              IconButton(
-                onPressed: () async {
-                  var scanResult = await Get.to(() => const MessagePage());
-                  if (scanResult == null) {
-                    controller.msgNotice();
-                  }
-                },
-                style: IconButton.styleFrom(
-                  backgroundColor: Colors.grey[100],
-                  padding: const EdgeInsets.all(8),
-                ),
-                icon: Badge(
-                  smallSize: 8,
-                  backgroundColor: controller.isNotice ? Colors.red : Colors.transparent,
-                  child: const Icon(
-                    Icons.notifications_outlined,
-                    color: Colors.black87,
-                    size: 30,
-                  ),
-                ),
-              ),
+              _buildDropdownMenu(),
            ],
          ),
          const SizedBox(height: 25),
@@ -233,6 +228,40 @@ class SitePage extends GetView<SiteController> {
    );
  }

+  Widget _buildDropdownMenu() {
+    return PopupMenuButton<String>(
+      icon: Container(child: const Icon(Icons.grid_view_rounded, size: 24)),
+      onSelected: (value) async {
+        if (value == 'message') {
+          var scanResult = await Get.to(() => const MessagePage());
+          if (scanResult == null) {
+            controller.msgNotice();
+          }
+        } else if (value == 'history') {
+          Get.to(() => const HistoryPage(), arguments: {'stationName': controller.name});
+        }
+      },
+      itemBuilder: (context) => [
+        const PopupMenuItem(
+          value: 'message',
+          child: Row(
+            children: [
+              Icon(Icons.notifications_none, size: 20),
+              SizedBox(width: 8),
+              Text('消息中心'),
+            ],
+          ),
+        ),
+        const PopupMenuItem(
+          value: 'history',
+          child: Row(
+            children: [Icon(Icons.history, size: 20), SizedBox(width: 8), Text('加氢历史')],
+          ),
+        ),
+      ],
+    );
+  }
+
  Widget _buildStatBox(String title, String enTitle, String value, String unit) {
    return Expanded(
      child: Container(
@@ -391,8 +420,9 @@ class SitePage extends GetView<SiteController> {

  /// 构建“有预约数据”的列表视图
  Widget _buildReservationListView() {
-    return ListView.separated(
+    return ListView.builder(
      shrinkWrap: true,
+      padding: EdgeInsets.zero,
      physics: const NeverScrollableScrollPhysics(),
      // 因为外层已有滚动，这里禁用内部滚动
      itemCount: controller.reservationList.length,
@@ -401,7 +431,6 @@ class SitePage extends GetView<SiteController> {
        // 调用新的方法来构建每一项
        return _buildReservationItem(index, item);
      },
-      separatorBuilder: (context, index) => const SizedBox(height: 0), // 列表项之间的间距
    );
  }

@@ -466,7 +495,7 @@ class SitePage extends GetView<SiteController> {
  /// 右侧具体数据卡片
  Widget _buildInfoCard(ReservationModel item) {
    return Container(
-      padding: EdgeInsets.only(left: 16.w, top: 8.5, bottom: 8.5, right: 16.w),
+      padding: EdgeInsets.all(16),
      decoration: BoxDecoration(
        color: Colors.white,
        borderRadius: BorderRadius.circular(16),
@@ -508,59 +537,82 @@ class SitePage extends GetView<SiteController> {
          ),
          const SizedBox(height: 8),
          // 联系信息
-          Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: [
-              Text(
-                "${item.contactPerson} | ${item.contactPhone}",
-                style: TextStyle(
-                  color: Color(0xFF999999),
-                  fontSize: 13.sp,
-                  fontWeight: FontWeight.w400,
-                ),
-              ),
-            ],
+          Text(
+            item.contactPerson.isEmpty || item.contactPhone.isEmpty
+                ? ""
+                : "${item.contactPerson} | ${item.contactPhone}",
+            style: TextStyle(
+              color: Color(0xFF999999),
+              fontSize: 13.sp,
+              fontWeight: FontWeight.w400,
+            ),
          ),
-
-          //操作按钮（仅在待处理状态显示）
-          if (item.status == ReservationStatus.pending) ...[
-            const SizedBox(height: 15),
-            const Divider(height: 1, color: Color(0xFFF5F5F5)),
-            const SizedBox(height: 12),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                _buildSmallButton(
-                  "拒绝",
-                  isOutline: true,
-                  onTap: () {
-                    controller.rejectReservation(item.id);
-                  },
+          SizedBox(height: 6.h),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.end,
+            children: [
+              if (item.hasDrivingAttachment)
+                controller.buildInfoTag('行驶证',item.drivingAttachments),
+              if (item.hasHydrogenationAttachment) ...[
+                SizedBox(width: 8.w),
+                controller.buildInfoTag('加氢证',item.hydrogenationAttachments)
+              ],
+              Spacer(),
+              if (item.isEdit == "1") ...[
+                const SizedBox(height: 15),
+                const Divider(height: 1, color: Color(0xFFF5F5F5)),
+                const SizedBox(height: 12),
+                Align(
+                  alignment: Alignment.centerRight,
+                  child: _buildSmallButton(
+                    "修改信息",
+                    isOutline: true,
+                    onTap: () {
+                      controller.confirmReservation(item.id, isEdit: true);
+                    },
+                  ),
                ),
-                const SizedBox(width: 12),
-                _buildSmallButton(
-                  "确认",
-                  isOutline: false,
-                  onTap: () {
-                    controller.confirmReservation(item.id);
-                  },
+              ] else 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);
+    var kDangerRed = text.contains('修改') ? Colors.red : Color.fromRGBO(255, 142, 98, 1);

    return GestureDetector(
      onTap: onTap,
@@ -634,139 +686,4 @@ class SitePage extends GetView<SiteController> {
      ),
    );
  }
-
-  /// 右侧操作按钮（拒绝/确认）
-  Widget _buildActionButtons(ReservationModel item) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        // 拒绝按钮（空心）
-        GestureDetector(
-          onTap: () => controller.rejectReservation(item.id),
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(10),
-              border: Border.all(color: const Color(0xFFFF7D7D)),
-            ),
-            child: const Text(
-              "拒绝",
-              style: TextStyle(
-                color: Color(0xFFFF7D7D),
-                fontSize: 14,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-        ),
-        const SizedBox(width: 8),
-        // 确认按钮（实心深绿）
-        GestureDetector(
-          onTap: () => controller.confirmReservation(item.id),
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-            decoration: BoxDecoration(
-              color: const Color(0xFF006D35),
-              borderRadius: BorderRadius.circular(10),
-            ),
-            child: const Text(
-              "确认",
-              style: TextStyle(
-                color: Colors.white,
-                fontSize: 14,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  /// 构建状态标签
-  Widget _buildStatusChip(ReservationStatus status) {
-    String text;
-    Color color;
-    switch (status) {
-      case ReservationStatus.pending:
-        text = '待加氢';
-        color = Colors.orange;
-        break;
-      case ReservationStatus.completed:
-        text = '已加氢';
-        color = Colors.greenAccent;
-        break;
-      case ReservationStatus.rejected:
-        text = '拒绝加氢';
-        color = Colors.red;
-        break;
-      case ReservationStatus.unadded:
-        text = '未加氢';
-        color = Colors.red;
-        break;
-      case ReservationStatus.cancel:
-        text = '已取消';
-        color = Colors.red;
-        break;
-      default:
-        text = '未知状态';
-        color = Colors.grey;
-        break;
-    }
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-      decoration: BoxDecoration(
-        color: color.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(12),
-      ),
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Icon(Icons.circle, color: color, size: 8),
-          const SizedBox(width: 4),
-          Text(
-            text,
-            style: TextStyle(color: color, fontSize: 12, fontWeight: FontWeight.bold),
-          ),
-        ],
-      ),
-    );
-  }
-
-  /// 构建信息详情行
-  Widget _buildDetailRow(
-    IconData icon,
-    String label,
-    String value, {
-    Color valueColor = Colors.black87,
-  }) {
-    return Row(
-      children: [
-        Icon(icon, color: Colors.grey, size: 20),
-        const SizedBox(width: 8),
-        Text('$label: ', style: const TextStyle(fontSize: 14, color: Colors.grey)),
-        Expanded(
-          child: Text(
-            value,
-            style: TextStyle(
-              fontSize: 14,
-              color: valueColor,
-              fontWeight: FontWeight.w500,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  /// 底部构建带图标的提示信息行
-  Widget _buildInfoItem(IconData icon, String text) {
-    return Row(
-      children: [
-        Icon(icon, color: Colors.blue, size: 20),
-        const SizedBox(width: 8),
-        Text(text, style: const TextStyle(fontSize: 14, color: Colors.black54)),
-      ],
-    );
-  }
 }
--- a/ln_jq_app/lib/pages/c_page/base_widgets/view.dart
+++ b/ln_jq_app/lib/pages/c_page/base_widgets/view.dart
@@ -3,6 +3,7 @@ import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/pages/c_page/car_info/view.dart';
+import 'package:ln_jq_app/pages/c_page/mall/mall_view.dart';
 import 'package:ln_jq_app/pages/c_page/map/view.dart';
 import 'package:ln_jq_app/pages/c_page/mine/view.dart';
 import 'package:ln_jq_app/pages/c_page/reservation/view.dart';
@@ -33,14 +34,14 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
  }

  List<Widget> _buildPages() {
-    return [ReservationPage(), MapPage(), CarInfoPage(), MinePage()];
+    return [ReservationPage(), MapPage(), MallPage(), CarInfoPage(), MinePage()];
  }

  // 自定义导航栏 (悬浮胶囊样式)
  Widget _buildNavigationBar() {
    return SafeArea(
      child: Container(
-        height: 50.h,
+        height: Get.height * 0.05,
        margin: const EdgeInsets.fromLTRB(24, 0, 24, 10), // 悬浮边距
        decoration: BoxDecoration(
          color: Color.fromRGBO(240, 244, 247, 1), // 浅灰色背景
@@ -58,8 +59,9 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
          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"),
+            _buildNavItem(2, "ic_mall_select@2x", "ic_mall@2x"),
+            _buildNavItem(3, "ic_car_select@2x", "ic_car@2x"),
+            _buildNavItem(4, "ic_user_select@2x", "ic_user@2x"),
          ],
        ),
      ),
@@ -82,7 +84,8 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
        child: SizedBox(
          height: 24,
          width: 24,
-          child: LoginUtil.getAssImg(isSelected ? selectedIcon : icon),),
+          child: LoginUtil.getAssImg(isSelected ? selectedIcon : icon),
+        ),
      ),
    );
  }
--- a/ln_jq_app/lib/pages/c_page/car_info/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/controller.dart
@@ -1,5 +1,8 @@
 import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:getx_scaffold/getx_scaffold.dart' as dio;
+import 'package:image_picker/image_picker.dart';
+import 'package:image_picker_platform_interface/src/types/image_source.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/model/vehicle_info.dart';
 import 'package:ln_jq_app/pages/c_page/car_info/attachment_viewer_page.dart';
@@ -15,9 +18,9 @@ class CarInfoController extends GetxController with BaseControllerMixin {

  // --- 车辆基本信息 ---
  String plateNumber = "";
-  String vin = "未知";
-  String modelName = "未知";
-  String brandName = "未知";
+  String vin = "-";
+  String modelName = "-";
+  String brandName = "-";

  // --- 证件附件列表 ---
  final RxList<String> drivingAttachments = <String>[].obs;
@@ -89,6 +92,113 @@ class CarInfoController extends GetxController with BaseControllerMixin {
    }
  }

+  //上传证件照
+  void pickImage(String title, ImageSource source) async {
+    if (source == ImageSource.camera) {
+      takePhotoAndRecognize(title);
+    } else if (source == ImageSource.gallery) {
+      //相册选择逻辑
+      var status = await Permission.photos.request();
+      if (!status.isGranted) {
+        if (status.isPermanentlyDenied) openAppSettings();
+        showErrorToast("需要相册权限才能拍照上传");
+        return;
+      }
+      final XFile? image = await ImagePicker().pickImage(
+        source: ImageSource.gallery,
+        imageQuality: 80,
+      );
+      if (image != null) {
+        _uploadAndSaveCertificate(title, image.path);
+      }
+    }
+  }
+
+  void takePhotoAndRecognize(String title) async {
+    var status = await Permission.camera.request();
+    if (!status.isGranted) {
+      if (status.isPermanentlyDenied) openAppSettings();
+      showErrorToast("需要相机权限才能拍照上传");
+      return;
+    }
+
+    final XFile? photo = await ImagePicker().pickImage(
+      source: ImageSource.camera,
+      imageQuality: 80, // 压缩图片质量以加快上传
+    );
+    if (photo == null) return;
+
+    _uploadAndSaveCertificate(title, photo.path);
+  }
+
+  /// 提取共用的上传与关联证件逻辑
+  void _uploadAndSaveCertificate(String title, String filePath) async {
+    // 上传文件
+    String? imageUrl = await uploadFile(filePath);
+    if (imageUrl == null) return;
+
+    // 根据标题映射业务类型
+    String type = "";
+    switch (title) {
+      case "行驶证":
+        type = "9";
+        break;
+      case "营运证":
+        type = "10";
+        break;
+      case "加氢证":
+        type = "12";
+        break;
+      case "登记证":
+        type = "13";
+        break;
+      default:
+        return;
+    }
+
+    // 调用后台接口关联证件
+    var response = await HttpService.to.post(
+      "appointment/truck/uploadCertificatePic",
+      data: {
+        "plateNumber": plateNumber,
+        "imageUrl": imageUrl,
+        "type": type,
+      },
+    );
+
+    if (response != null) {
+      final result = BaseModel.fromJson(response.data);
+      if (result.code == 0) {
+        showSuccessToast("上传成功");
+        getUserBindCarInfo(); // 重新拉取数据更新UI
+      } else {
+        showErrorToast(result.error);
+      }
+    }
+  }
+
+  /// 上传图片
+  Future<String?> uploadFile(String filePath) async {
+    showLoading("正在上传...");
+    try {
+      dio.FormData formData = dio.FormData.fromMap({
+        'file': await dio.MultipartFile.fromFile(filePath, filename: 'ocr_identity.jpg'),
+      });
+
+      var response = await HttpService.to.post("appointment/ocr/upload", data: formData);
+      if (response != null) {
+        final result = BaseModel.fromJson(response.data);
+        if (result.code == 0) return result.data.toString();
+        showErrorToast(result.error);
+      }
+    } catch (e) {
+      showErrorToast("图片上传失败");
+    } finally {
+      dismissLoading();
+    }
+    return null;
+  }
+
  void getUserBindCarInfo() async {
    if (StorageService.to.hasVehicleInfo) {
      VehicleInfo? bean = StorageService.to.vehicleInfo;
@@ -102,7 +212,7 @@ class CarInfoController extends GetxController with BaseControllerMixin {

      // 获取证件信息
      final response = await HttpService.to.get(
-        'appointment/vehicle/getPicInfoByVin?vin=$vin',
+        'appointment/vehicle/getPicInfoByVin?vin=$vin&plateNumber=$plateNumber',
      );

      if (response != null && response.data != null) {
@@ -134,10 +244,10 @@ class CarInfoController extends GetxController with BaseControllerMixin {
            ...registerAttachments,
          ];

-           color = data['color'].toString();
-           hydrogenCapacity = data['hydrogenCapacity'].toString();
-           rentFromCompany = data['rentFromCompany'].toString();
-           address = data['address'].toString();
+          color = data['color'].toString();
+          hydrogenCapacity = data['hydrogenCapacity'].toString();
+          rentFromCompany = data['rentFromCompany'].toString();
+          address = data['address'].toString();

          loadAllPdfs();
        }
--- a/ln_jq_app/lib/pages/c_page/car_info/view.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/view.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_pdfview/flutter_pdfview.dart';
 import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/pages/c_page/message/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
@@ -133,7 +134,7 @@ class CarInfoPage extends GetView<CarInfoController> {
                  ),
                ),
                IconButton(
-                  onPressed: () async{
+                  onPressed: () async {
                    var scanResult = await Get.to(() => const MessagePage());
                    if (scanResult == null) {
                      controller.msgNotice();
@@ -163,11 +164,26 @@ class CarInfoPage extends GetView<CarInfoController> {
            child: Row(
              mainAxisAlignment: MainAxisAlignment.spaceBetween,
              children: [
-                _buildModernStatItem('本月里程数', 'Accumulated', '2,852km', ''),
+                _buildModernStatItem(
+                  '本月里程数',
+                  'Accumulated',
+                  StorageService.to.hasVehicleInfo ? '2,852km' : '-',
+                  '',
+                ),
                const SizedBox(width: 8),
-                _buildModernStatItem('总里程', 'Refuel Count', "2.5W km", ''),
+                _buildModernStatItem(
+                  '总里程',
+                  'Refuel Count',
+                  StorageService.to.hasVehicleInfo ? "2.5W km" : '-',
+                  '',
+                ),
                const SizedBox(width: 8),
-                _buildModernStatItem('服务评分', 'Driver rating', "4.9分", ''),
+                _buildModernStatItem(
+                  '服务评分',
+                  'Driver rating',
+                  StorageService.to.hasVehicleInfo ? "4.9分" : '-',
+                  '',
+                ),
              ],
            ),
          ),
@@ -300,20 +316,20 @@ class CarInfoPage extends GetView<CarInfoController> {
      children: [
        ClipRRect(
          borderRadius: BorderRadius.circular(4),
-          child: const LinearProgressIndicator(
-            value: 0.75,
+          child: LinearProgressIndicator(
+            value: StorageService.to.hasVehicleInfo ? 0.75 : 0,
            minHeight: 8,
            backgroundColor: Color(0xFFF0F2F5),
            valueColor: AlwaysStoppedAnimation<Color>(Color.fromRGBO(16, 185, 129, 1)),
          ),
        ),
        const SizedBox(height: 8),
-        const Row(
+        Row(
          mainAxisAlignment: MainAxisAlignment.spaceBetween,
          children: [
            Text("H2 Level", style: TextStyle(fontSize: 11, color: Colors.grey)),
            Text(
-              "75%",
+              StorageService.to.hasVehicleInfo ? "75%" : "0%",
              style: TextStyle(
                fontSize: 11,
                color: Color.fromRGBO(16, 185, 129, 1),
@@ -353,7 +369,7 @@ class CarInfoPage extends GetView<CarInfoController> {
              children: [
                _buildCertificateContent('行驶证', controller.drivingAttachments),
                _buildCertificateContent('营运证', controller.operationAttachments),
-                _buildCertificateContent('加氢资格证', controller.hydrogenationAttachments),
+                _buildCertificateContent('加氢证', controller.hydrogenationAttachments),
                _buildCertificateContent('登记证', controller.registerAttachments),
              ],
            ),
@@ -373,7 +389,7 @@ class CarInfoPage extends GetView<CarInfoController> {
        child: Padding(
          padding: EdgeInsets.all(16.0),
          child: attachments.isEmpty
-              ? const Center(child: Text('暂无相关证件信息'))
+              ? _buildEmptyCertificateState(title)
              : Column(
                  crossAxisAlignment: CrossAxisAlignment.center,
                  mainAxisAlignment: MainAxisAlignment.center,
@@ -382,7 +398,11 @@ class CarInfoPage extends GetView<CarInfoController> {
                    Row(
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
-                        _buildCertDetailItem('所属公司', controller.rentFromCompany, isFull: false),
+                        _buildCertDetailItem(
+                          '所属公司',
+                          controller.rentFromCompany,
+                          isFull: false,
+                        ),
                        _buildCertDetailItem('运营城市', controller.address),
                      ],
                    ),
@@ -421,6 +441,158 @@ class CarInfoPage extends GetView<CarInfoController> {
    });
  }

+  Widget _buildEmptyCertificateState(String title) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Image.asset(
+          'assets/images/ic_attention@2x.png', // 请替换为您的实际图片路径
+          width: 120,
+          height: 120,
+        ),
+        const SizedBox(height: 16),
+        Text(
+          '您未上传“$title”',
+          style: TextStyle(
+            fontSize: 16.sp,
+            fontWeight: FontWeight.w600,
+            color: Color.fromRGBO(51, 51, 51, 1),
+          ),
+        ),
+        const SizedBox(height: 8),
+        Text(
+          '上传后可提前通知加氢站报备\n大幅减少加氢站等待时间',
+          textAlign: TextAlign.center,
+          style: TextStyle(
+            fontSize: 12.sp,
+            color: Color.fromRGBO(156, 163, 175, 1),
+            height: 1.5,
+          ),
+        ),
+        const SizedBox(height: 24),
+        SizedBox(
+          width: 200,
+          height: 44,
+          child: ElevatedButton.icon(
+            onPressed: () {
+              _showUploadDialog(title);
+            },
+            icon: const Text(
+              '立即上传',
+              style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
+            ),
+            label: Image.asset(
+              'assets/images/ic_upload@2x.png',
+              height: 20.h,
+              width: 20.w,
+            ),
+            style: ElevatedButton.styleFrom(
+              backgroundColor: const Color(0xFF017137),
+              foregroundColor: Colors.white,
+              shape: StadiumBorder(),
+              elevation: 0,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _showUploadDialog(String title) {
+    Get.dialog(
+      Dialog(
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+        child: Container(
+          padding: const EdgeInsets.all(24),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                '上传$title',
+                style: const TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
+              const SizedBox(height: 12),
+              Text(
+                '请确保拍摄证件清晰可见，关键文字无反光遮挡，这将有助于快速通过审核',
+                style: TextStyle(fontSize: 13, color: Colors.grey[400], height: 1.5),
+              ),
+              const SizedBox(height: 24),
+              Row(
+                children: [
+                  Expanded(
+                    child: _buildUploadOption(
+                      icon: Icons.camera_alt_outlined,
+                      label: '拍照上传',
+                      onTap: () {
+                        controller.pickImage(title, ImageSource.camera);
+                        Get.back();
+                      },
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: _buildUploadOption(
+                      icon: Icons.image_outlined,
+                      label: '相册上传',
+                      onTap: () {
+                        controller.pickImage(title, ImageSource.gallery);
+                        Get.back();
+                      },
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  // 构建弹窗内的选择按钮
+  Widget _buildUploadOption({
+    required IconData icon,
+    required String label,
+    required VoidCallback onTap,
+  }) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        padding: const EdgeInsets.symmetric(vertical: 24),
+        decoration: BoxDecoration(
+          color: const Color(0xFFF2F9F7), // 浅绿色背景
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: Column(
+          children: [
+            Container(
+              padding: const EdgeInsets.all(12),
+              decoration: const BoxDecoration(
+                color: Color(0xFF017137), // 深绿色圆圈
+                shape: BoxShape.circle,
+              ),
+              child: Icon(icon, color: Colors.white, size: 28),
+            ),
+            const SizedBox(height: 12),
+            Text(
+              label,
+              style: const TextStyle(
+                fontSize: 14,
+                color: Color(0xFF333333),
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
  Widget _buildCertDetailItem(
    String label,
    String value, {
--- a/ln_jq_app/lib/pages/c_page/mall/detail/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/mall/detail/controller.dart
@@ -0,0 +1,113 @@
+import 'dart:developer';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/model/base_model.dart';
+import 'package:ln_jq_app/pages/c_page/mall/exchange_success/view.dart';
+
+import '../mall_controller.dart';
+
+class MallDetailController extends GetxController with BaseControllerMixin {
+  @override
+  String get builderId => 'mall_detail';
+
+  late final int goodsId;
+  final Rx<GoodsModel?> goodsDetail = Rx<GoodsModel?>(null);
+
+  final addressController = TextEditingController();
+  final nameController = TextEditingController();
+  final phoneController = TextEditingController();
+
+  final formKey = GlobalKey<FormState>();
+
+  @override
+  void onInit() {
+    super.onInit();
+    goodsId = Get.arguments['goodsId'] as int;
+    getGoodsDetail();
+  }
+
+  @override
+  bool get listenLifecycleEvent => true;
+
+  Future<void> getGoodsDetail() async {
+    try {
+      var response = await HttpService.to.post(
+        'appointment/score/getScoreGoodsDetail',
+        data: {'goodsId': goodsId},
+      );
+      if (response != null && response.data != null) {
+        var result = BaseModel<GoodsModel>.fromJson(
+          response.data,
+          dataBuilder: (dataJson) => GoodsModel.fromJson(dataJson),
+        );
+        if (result.code == 0 && result.data != null) {
+          goodsDetail.value = result.data;
+        } else {
+          showErrorToast('加载失败: ${result.message}');
+          Get.back();
+        }
+      }
+    } catch (e) {
+      log('获取商品详情失败: $e');
+      showErrorToast('网络异常，请稍后重试');
+      Get.back();
+    } finally {
+      updateUi();
+    }
+  }
+
+  /// 兑换商品
+  void exchange() async {
+    if (!formKey.currentState!.validate()) {
+      return;
+    }
+
+    /*
+    final mallController = Get.find<MallController>();
+    if (mallController.userScore.value < (goodsDetail.value?.score ?? 0)) {
+      showWarningToast('积分不足');
+      return;
+    }*/
+
+    // 接口调用预留
+    showLoading('兑换中...');
+
+    final goods = goodsDetail.value;
+    if (goods == null) {
+      showErrorToast('兑换失败，请稍后重试');
+      return;
+    }
+    try {
+      var response = await HttpService.to.post(
+        'appointment/score/scoreExchange',
+        data: {
+          "goodsId": goods.id,
+          "address": addressController.text,
+          "name": nameController.text,
+          "phone": phoneController.text,
+        },
+      );
+      if (response != null && response.data != null) {
+        var result = BaseModel.fromJson(response.data);
+        if (result.code == 0) {
+          Get.off(() => MallExchangeSuccessPage());
+        }
+      }
+    } catch (e) {
+      log('兑换失败: $e');
+      showErrorToast('兑换失败，请稍后重试');
+    } finally {
+      dismissLoading();
+    }
+  }
+
+  @override
+  void onClose() {
+    addressController.dispose();
+    nameController.dispose();
+    phoneController.dispose();
+    super.onClose();
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/mall/detail/view.dart
+++ b/ln_jq_app/lib/pages/c_page/mall/detail/view.dart
@@ -0,0 +1,281 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'controller.dart';
+
+class MallDetailPage extends GetView<MallDetailController> {
+  const MallDetailPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder<MallDetailController>(
+      init: MallDetailController(),
+      id: 'mall_detail',
+      builder: (_) {
+        return Scaffold(
+          backgroundColor: const Color(0xFFF7F8FA),
+          appBar: AppBar(
+            title: const Text('商品兑换'),
+            backgroundColor: Colors.white,
+            foregroundColor: Colors.black,
+            elevation: 0,
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back_ios, size: 20),
+              onPressed: () => Get.back(),
+            ),
+          ),
+          body: GestureDetector(
+            onTap: () {
+              hideKeyboard();
+            },
+            child: _buildBody(),
+          ),
+          bottomNavigationBar: _buildBottomButton(),
+        );
+      },
+    );
+  }
+
+  Widget _buildBody() {
+    final goods = controller.goodsDetail.value;
+    if (goods == null) return const Center(child: Text('商品信息不存在'));
+
+    return SingleChildScrollView(
+      padding: const EdgeInsets.all(16),
+      child: Form(
+        key: controller.formKey,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _buildGoodsInfoCard(goods),
+            const SizedBox(height: 24),
+            _buildSectionTitle('填写收货信息'),
+            const SizedBox(height: 16),
+            _buildInputLabel('详细地址'),
+            _buildTextField(
+              controller: controller.addressController,
+              hint: '请输入完整的收货地址',
+              icon: Icons.location_on_outlined,
+            ),
+            const SizedBox(height: 16),
+            _buildInputLabel('收货人姓名'),
+            _buildTextField(
+              controller: controller.nameController,
+              hint: '请输入收货人姓名',
+              icon: Icons.person_outline,
+            ),
+            const SizedBox(height: 16),
+            _buildInputLabel('联系电话'),
+            _buildTextField(
+              controller: controller.phoneController,
+              hint: '请输入手机号码',
+              icon: Icons.phone_android_outlined,
+              keyboardType: TextInputType.phone,
+            ),
+            const SizedBox(height: 40),
+            Center(
+              child: Text(
+                '兑换成功后，商品会在3个工作日内邮寄\n请注意查收',
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Color(0xFF999999),
+                  fontSize: 12.sp,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildGoodsInfoCard(goods) {
+    return Container(
+      padding: const EdgeInsets.all(17),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(16),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withOpacity(0.03),
+            blurRadius: 10,
+            offset: const Offset(0, 4),
+          ),
+        ],
+      ),
+      child: Row(
+        children: [
+          ClipRRect(
+            borderRadius: BorderRadius.circular(12),
+            child: goods.goodsImage != null
+                ? Image.network(
+                    goods.goodsImage!,
+                    width: 94.w,
+                    height: 94.h,
+                    fit: BoxFit.cover,
+                  )
+                : Container(
+                    width: 80,
+                    height: 80,
+                    color: Colors.grey[200],
+                    child: const Icon(Icons.image, color: Colors.grey),
+                  ),
+          ),
+          const SizedBox(width: 12),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  goods.goodsName,
+                  style: TextStyle(
+                    fontSize: 16.sp,
+                    fontWeight: FontWeight.w600,
+                    color: Color(0xFF333333),
+                  ),
+                ),
+                SizedBox(height: 8.h),
+                Row(
+                  children: [
+                    Text(
+                      '${goods.score}',
+                      style: TextStyle(
+                        fontSize: 20.sp,
+                        color: Color(0xFF4CAF50),
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    const SizedBox(width: 4),
+                    Text(
+                      '积分',
+                      style: TextStyle(
+                        fontSize: 10.sp,
+                        fontWeight: FontWeight.w600,
+                        color: Color(0xFF999999),
+                      ),
+                    ),
+                  ],
+                ),
+                SizedBox(height: 10.h),
+                Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+                  decoration: BoxDecoration(
+                    color: const Color(0xFFF2F3F5),
+                    borderRadius: BorderRadius.circular(4),
+                  ),
+                  child: Text(
+                    '数量: 1',
+                    style: TextStyle(
+                      fontSize: 10.sp,
+                      fontWeight: FontWeight.w500,
+                      color: Color(0xFF666666),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSectionTitle(String title) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Container(
+          width: 6.w,
+          height: 16.h,
+          decoration: BoxDecoration(
+            color: const Color(0xFF4CAF50),
+            borderRadius: BorderRadius.circular(2),
+          ),
+        ),
+        const SizedBox(width: 8),
+        Text(
+          title,
+          style: TextStyle(
+            fontSize: 14.sp,
+            fontWeight: FontWeight.w600,
+            color: Color.fromRGBO(148, 163, 184, 1),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildInputLabel(String label) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8),
+      child: Text(
+        label,
+        style: TextStyle(
+          fontSize: 12.sp,
+          fontWeight: FontWeight.w600,
+          color: Color.fromRGBO(100, 116, 139, 1),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTextField({
+    required TextEditingController controller,
+    required String hint,
+    required IconData icon,
+    TextInputType? keyboardType,
+  }) {
+    return Container(
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: TextFormField(
+        controller: controller,
+        keyboardType: keyboardType,
+        textAlign: TextAlign.start,
+        decoration: InputDecoration(
+          hintText: hint,
+          hintStyle: TextStyle(
+            color: Color.fromRGBO(134, 144, 156, 1),
+            fontSize: 14.sp,
+            fontWeight: FontWeight.w500,
+          ),
+          prefixIcon: Icon(icon, color: const Color(0xFF999999), size: 20),
+          border: InputBorder.none,
+          contentPadding: const EdgeInsets.symmetric(vertical: 12),
+        ),
+        validator: (value) {
+          if (value == null || value.isEmpty) {
+            return '内容不能为空';
+          }
+          return null;
+        },
+      ),
+    );
+  }
+
+  Widget _buildBottomButton() {
+    return Container(
+      padding: const EdgeInsets.fromLTRB(16, 10, 16, 30),
+      child: ElevatedButton(
+        onPressed: controller.exchange,
+        style: ElevatedButton.styleFrom(
+          backgroundColor: const Color(0xFF007A45),
+          minimumSize: const Size(double.infinity, 50),
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
+          elevation: 0,
+        ),
+        child: const Text(
+          '兑换商品',
+          style: TextStyle(
+            color: Colors.white,
+            fontSize: 16,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/mall/exchange_success/view.dart
+++ b/ln_jq_app/lib/pages/c_page/mall/exchange_success/view.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/common/index.dart';
+import 'package:ln_jq_app/common/login_util.dart';
+
+class MallExchangeSuccessPage extends StatelessWidget {
+  const MallExchangeSuccessPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        backgroundColor: Colors.white,
+        elevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_ios, size: 20, color: Colors.black),
+          onPressed: () => Get.back(), // 返回首页
+        ),
+        title: const Text('商品兑换', style: TextStyle(color: Colors.black, fontSize: 18)),
+      ),
+      body: Center(
+        child: Column(
+          children: [
+            SizedBox(height: 114.h),
+            _buildSuccessIcon(),
+            const SizedBox(height: 24),
+            Text(
+              '兑换成功',
+              style: TextStyle(
+                fontSize: 24.sp,
+                fontWeight: FontWeight.w600,
+                color: Color(0xFF333333),
+              ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              '预计 3 日内发货\n请留意查收',
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: 14.sp, color: Color(0xFF999999)),
+            ),
+            const SizedBox(height: 60),
+            ElevatedButton(
+              onPressed: () => Get.back(),
+              style: ElevatedButton.styleFrom(
+                backgroundColor: const Color(0xFF007A45),
+                minimumSize: const Size(140, 50),
+                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
+              ),
+              child: Text(
+                '返回首页',
+                style: TextStyle(
+                  color: Colors.white,
+                  fontWeight: FontWeight.w400,
+                  fontSize: 16.sp,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSuccessIcon() {
+    return Container(child: LoginUtil.getAssImg("mall_pay_success@2x"));
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/mall/mall_controller.dart
+++ b/ln_jq_app/lib/pages/c_page/mall/mall_controller.dart
@@ -0,0 +1,160 @@
+
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/model/base_model.dart';
+import 'package:ln_jq_app/pages/c_page/mall/detail/view.dart';
+import 'package:ln_jq_app/pages/c_page/mall/orders/view.dart';
+import 'package:ln_jq_app/pages/c_page/mall/rule/view.dart';
+
+class GoodsModel {
+  final int id;
+  final String categoryId;
+  final String goodsName;
+  final String? goodsImage;
+  final int originalScore;
+  final int score;
+  final int stock;
+  final int status;
+
+  GoodsModel({
+    required this.id,
+    required this.categoryId,
+    required this.goodsName,
+    this.goodsImage,
+    required this.originalScore,
+    required this.score,
+    required this.stock,
+    required this.status,
+  });
+
+  factory GoodsModel.fromJson(Map<String, dynamic> json) {
+    return GoodsModel(
+      id: json['id'] as int,
+      categoryId: json['categoryId']?.toString() ?? '',
+      goodsName: json['goodsName']?.toString() ?? '',
+      goodsImage: json['goodsImage'],
+      originalScore: json['originalScore'] as int? ?? 0,
+      score: json['score'] as int? ?? 0,
+      stock: json['stock'] as int? ?? 0,
+      status: json['status'] as int? ?? 1,
+    );
+  }
+}
+
+class UserScore {
+  final int score;
+  final int todaySign;
+
+  UserScore({required this.score, required this.todaySign});
+
+  factory UserScore.fromJson(Map<String, dynamic> json) {
+    return UserScore(
+      score: json['score'] as int? ?? 0,
+      todaySign: json['todaySign'] as int? ?? 1,
+    );
+  }
+}
+
+class MallController extends GetxController with BaseControllerMixin {
+  @override
+  String get builderId => 'mall';
+
+  final RxInt userScore = 0.obs;
+  final RxInt todaySign = 1.obs; // 0可签到，1已签到
+  final RxList<GoodsModel> goodsList = <GoodsModel>[].obs;
+  final RxBool isLoading = true.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    refreshData();
+  }
+
+  Future<void> refreshData() async {
+    isLoading.value = true;
+    await Future.wait([getUserScore(), getGoodsList()]);
+    isLoading.value = false;
+    updateUi();
+  }
+
+  /// 获取用户积分和签到状态
+  Future<void> getUserScore() async {
+    try {
+      var response = await HttpService.to.post('appointment/score/getUserScore');
+      if (response != null && response.data != null) {
+        var result = BaseModel<UserScore>.fromJson(
+          response.data,
+          dataBuilder: (dataJson) => UserScore.fromJson(dataJson),
+        );
+        if (result.code == 0 && result.data != null) {
+          userScore.value = result.data!.score;
+          todaySign.value = result.data!.todaySign;
+        }
+      }
+    } catch (e) {
+      log('获取积分失败: $e');
+    }
+  }
+
+  /// 签到逻辑
+  Future<void> signAction() async {
+    if (todaySign.value == 1) return;
+
+    showLoading('签到中...');
+    try {
+      var response = await HttpService.to.post('appointment/score/sign');
+      dismissLoading();
+      if (response != null && response.data != null) {
+        var result = BaseModel.fromJson(response.data);
+        if (result.code == 0) {
+          showSuccessToast('签到成功');
+          getUserScore(); // 签到成功后刷新积分
+        } else {
+          showErrorToast(result.message);
+        }
+      }
+    } catch (e) {
+      dismissLoading();
+      showErrorToast('签到异常');
+    }
+  }
+
+  /// 获取商品列表
+  Future<void> getGoodsList() async {
+    try {
+      var response = await HttpService.to.post(
+        'appointment/score/getScoreGoodsList',
+        data: {'categoryId': 0},
+      );
+      if (response != null && response.data != null) {
+        var result = BaseModel<List<GoodsModel>>.fromJson(
+          response.data,
+          dataBuilder: (dataJson) {
+            var list = dataJson as List;
+            return list.map((e) => GoodsModel.fromJson(e)).toList();
+          },
+        );
+        if (result.code == 0 && result.data != null) {
+          goodsList.assignAll(result.data!);
+        }
+      }
+    } catch (e) {
+      log('获取商品列表失败: $e');
+    }
+  }
+
+  /// 兑换商品
+  void exchangeGoods(GoodsModel goods) {
+    Get.to(() => const MallDetailPage(), arguments: {'goodsId': goods.id})
+        ?.then((_) => refreshData());
+  }
+
+  ///规则说明
+  void toRuleDes() {
+    Get.to(() => const MallRulePage());
+  }
+
+  ///历史订单
+  void toOrders() {
+    Get.to(() => const MallOrdersPage());
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/mall/mall_view.dart
+++ b/ln_jq_app/lib/pages/c_page/mall/mall_view.dart
@@ -0,0 +1,345 @@
+import 'package:flutter/material.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/login_util.dart';
+
+import 'mall_controller.dart';
+
+class MallPage extends GetView<MallController> {
+  const MallPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return GetX<MallController>(
+      init: MallController(),
+      builder: (_) {
+        return Scaffold(
+          backgroundColor: Color.fromRGBO(247, 249, 251, 1),
+          body: RefreshIndicator(
+            onRefresh: controller.refreshData,
+            child: CustomScrollView(
+              slivers: [
+                SliverToBoxAdapter(
+                  child: Container(
+                    padding: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 20.h),
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.only(
+                        bottomLeft: Radius.circular(20),
+                        bottomRight: Radius.circular(20),
+                      ),
+                    ),
+                    child: Column(children: [_buildAppBar(), _buildScoreCard()]),
+                  ),
+                ),
+                _buildSectionHeader(),
+                _buildGoodsGrid(),
+                SliverToBoxAdapter(child: SizedBox(height: 120.h)),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildAppBar() {
+    return Container(
+      padding: EdgeInsets.only(top: MediaQuery.of(Get.context!).padding.top, bottom: 0),
+      child: Row(
+        children: [
+          Container(
+            width: 40,
+            height: 40,
+            decoration: BoxDecoration(
+              color: const Color(0xFF4CAF50),
+              borderRadius: BorderRadius.circular(8),
+            ),
+            child: LoginUtil.getAssImg("mall_bar@2x"),
+          ),
+          const SizedBox(width: 10),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const Text(
+                  '氢能商城',
+                  style: TextStyle(
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                    color: Color(0xFF333333),
+                  ),
+                ),
+                Row(
+                  children: [
+                    const Text(
+                      'Hydrogen Energy Mall',
+                      style: TextStyle(fontSize: 12, color: Color(0xFF999999)),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+          /*IconButton(
+            onPressed: () {},
+            icon: const Icon(Icons.notifications_none, color: Color(0xFF333333)),
+          ),*/
+        ],
+      ),
+    );
+  }
+
+  Widget _buildScoreCard() {
+    return Container(
+      margin: EdgeInsets.only(top: 22.h),
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        gradient: const LinearGradient(
+          colors: [Color.fromRGBO(2, 27, 31, 1), Color.fromRGBO(11, 67, 67, 1)],
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+        ),
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      Text(
+                        '我的可用积分',
+                        style: TextStyle(color: Colors.white70, fontSize: 14.sp),
+                      ),
+                      const SizedBox(width: 4),
+                      GestureDetector(
+                        onTap: (){
+                          controller.toRuleDes();
+                        },
+                        child:  const Icon(Icons.help_outline, color: Colors.white70, size: 14),
+                      )
+
+                    ],
+                  ),
+                  Text(
+                    'Available points',
+                    style: TextStyle(color: Colors.white38, fontSize: 11.sp),
+                  ),
+                ],
+              ),
+              GestureDetector(
+                onTap: controller.signAction,
+                child: Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+                  decoration: BoxDecoration(
+                    color: controller.todaySign.value == 0
+                        ? Color.fromRGBO(78, 184, 49, 1)
+                        : Colors.grey,
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                  child: Text(
+                    controller.todaySign.value == 0 ? '立即签到' : '已签到',
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                controller.userScore.value.toString(),
+                style: TextStyle(
+                  color: Color.fromRGBO(236, 236, 236, 1),
+                  fontSize: 18.sp,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              TextButton(
+                onPressed: () {
+                  controller.toOrders();
+                },
+                child: Text(
+                  '历史订单',
+                  style: TextStyle(
+                    color: Color.fromRGBO(148, 163, 184, 1),
+                    fontSize: 12.sp,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSectionHeader() {
+    return SliverToBoxAdapter(
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+        child: Row(
+          children: [
+            Container(
+              width: 4.w,
+              height: 16.h,
+              decoration: BoxDecoration(
+                color: const Color(0xFF4CAF50),
+                borderRadius: BorderRadius.circular(2),
+              ),
+            ),
+            const SizedBox(width: 8),
+            Text(
+              '热门商品',
+              style: TextStyle(
+                fontSize: 14.sp,
+                fontWeight: FontWeight.w600,
+                color: Color.fromRGBO(78, 89, 105, 1),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildGoodsGrid() {
+    if (controller.goodsList.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.only(top: 50),
+            child: Text('暂无商品', style: TextStyle(color: Color(0xFF999999))),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverGrid(
+        gridDelegate:  SliverGridDelegateWithFixedCrossAxisCount(
+          crossAxisCount: 2,
+          mainAxisSpacing: 14.h,
+          crossAxisSpacing: 19.w,
+          childAspectRatio: 0.75,
+        ),
+        delegate: SliverChildBuilderDelegate((context, index) {
+          final goods = controller.goodsList[index];
+          return _buildGoodsItem(goods);
+        }, childCount: controller.goodsList.length),
+      ),
+    );
+  }
+
+  Widget _buildGoodsItem(GoodsModel goods) {
+    return Container(
+      padding: EdgeInsets.all(8),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(10),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withOpacity(0.05),
+            blurRadius: 10,
+            offset: const Offset(0, 4),
+          ),
+        ],
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(
+            child: ClipRRect(
+              borderRadius: const BorderRadius.all(Radius.circular(12)),
+              child: goods.goodsImage != null
+                  ? Image.network(
+                      goods.goodsImage!,
+                      fit: BoxFit.cover,
+                      width: double.infinity,
+                    )
+                  : Container(
+                      color: const Color(0xFFEEEEEE),
+                      child: const Center(
+                        child: Icon(Icons.image, color: Colors.grey, size: 40),
+                      ),
+                    ),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.all(10),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  goods.goodsName,
+                  style: TextStyle(
+                    fontSize: 14.sp,
+                    fontWeight: FontWeight.w600,
+                    color: Colors.black,
+                  ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Row(
+                      children: [
+                        Text(
+                          '${goods.score}',
+                          style: TextStyle(
+                            fontSize: 16.sp,
+                            color: Color(0xFF4CAF50),
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                        const SizedBox(width: 4),
+                        Text(
+                          '积分',
+                          style: TextStyle(
+                            fontSize: 12.sp,
+                            fontWeight: FontWeight.bold,
+                            color: Color(0xFF4CAF50),
+                          ),
+                        ),
+                      ],
+                    ),
+                    GestureDetector(
+                      onTap: () => controller.exchangeGoods(goods),
+                      child: Container(
+                        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+                        decoration: BoxDecoration(
+                          color: const Color(0xFFE8F5E9),
+                          borderRadius: BorderRadius.circular(20),
+                        ),
+                        child: Text(
+                          '兑换',
+                          style: TextStyle(
+                            color: Color(0xFF4CAF50),
+                            fontWeight: FontWeight.bold,
+                            fontSize: 13.sp,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/mall/orders/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/mall/orders/controller.dart
@@ -0,0 +1,94 @@
+
+import 'dart:developer';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/model/base_model.dart';
+
+class OrderModel {
+  final int id;
+  final int scoreGoodsId;
+  final String goodsName;
+  final String? goodsImage;
+  final String? goodsContent;
+  final String address;
+  final String createTime;
+  final String score;
+
+  OrderModel({
+    required this.id,
+    required this.scoreGoodsId,
+    required this.goodsName,
+    this.goodsImage,
+    this.goodsContent,
+    required this.address,
+    required this.createTime,
+    required this.score,
+  });
+
+  factory OrderModel.fromJson(Map<String, dynamic> json) {
+    return OrderModel(
+      id: json['id'] as int,
+      scoreGoodsId: json['scoreGoodsId'] as int,
+      goodsName: json['goodsName']?.toString() ?? '',
+      goodsImage: json['goodsImage'],
+      goodsContent: json['goodsContent'],
+      address: json['address']?.toString() ?? '',
+      createTime: json['createTime']?.toString() ?? '',
+      score: json['score']?.toString() ?? '',
+    );
+  }
+}
+
+class MallOrdersController extends GetxController with BaseControllerMixin {
+  @override
+  String get builderId => 'mall_orders';
+
+  final RxList<OrderModel> orderList = <OrderModel>[].obs;
+  final RxBool isLoading = true.obs;
+  int pageNum = 1;
+  final int pageSize = 50;
+
+  @override
+  void onInit() {
+    super.onInit();
+    getOrders();
+  }
+
+  Future<void> getOrders({bool isRefresh = true}) async {
+    if (isRefresh) {
+      pageNum = 1;
+      isLoading.value = true;
+      updateUi();
+    }
+
+    try {
+      var response = await HttpService.to.post(
+        'appointment/score/getScoreExchangeList',
+        data: {
+          "status": "",
+          "pageNum": pageNum.toString(),
+          "pageSize": pageSize.toString()
+        },
+      );
+
+      if (response != null && response.data != null) {
+        var result = BaseModel<Map<String, dynamic>>.fromJson(response.data);
+        if (result.code == 0 && result.data != null) {
+          var records = result.data!['records'] as List;
+          var list = records.map((e) => OrderModel.fromJson(e)).toList();
+          if (isRefresh) {
+            orderList.assignAll(list);
+          } else {
+            orderList.addAll(list);
+          }
+          pageNum++;
+        }
+      }
+    } catch (e) {
+      log('获取订单列表失败: $e');
+    } finally {
+      isLoading.value = false;
+      updateUi();
+    }
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/mall/orders/view.dart
+++ b/ln_jq_app/lib/pages/c_page/mall/orders/view.dart
@@ -0,0 +1,138 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
+import 'controller.dart';
+
+class MallOrdersPage extends GetView<MallOrdersController> {
+  const MallOrdersPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder<MallOrdersController>(
+      init: MallOrdersController(),
+      id: 'mall_orders',
+      builder: (_) {
+        return Scaffold(
+          backgroundColor: const Color(0xFFF7F8FA),
+          appBar: AppBar(
+            title: const Text('历史订单'),
+            backgroundColor: Colors.white,
+            foregroundColor: Colors.black,
+            elevation: 0,
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back_ios, size: 20),
+              onPressed: () => Get.back(),
+            ),
+          ),
+          body: RefreshIndicator(
+            onRefresh: () => controller.getOrders(isRefresh: true),
+            child: controller.isLoading.value && controller.orderList.isEmpty
+                ? const Center(child: CircularProgressIndicator())
+                : _buildOrderList(),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildOrderList() {
+    if (controller.orderList.isEmpty) {
+      return const Center(
+        child: Text('暂无订单记录', style: TextStyle(color: Color(0xFF999999))),
+      );
+    }
+
+    return ListView.builder(
+      padding: const EdgeInsets.all(16),
+      itemCount: controller.orderList.length,
+      itemBuilder: (context, index) {
+        final order = controller.orderList[index];
+        return _buildOrderItem(order);
+      },
+    );
+  }
+
+  Widget _buildOrderItem(OrderModel order) {
+    return Container(
+      margin: const EdgeInsets.only(bottom: 12),
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            '兑换时间：${order.createTime}',
+            style: TextStyle(
+              fontSize: 12.sp,
+              fontWeight: FontWeight.w500,
+              color: Color.fromRGBO(107, 114, 128, 1),
+            ),
+          ),
+          const SizedBox(height: 12),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              ClipRRect(
+                borderRadius: BorderRadius.circular(12),
+                child: order.goodsImage != null
+                    ? Image.network(
+                        order.goodsImage!,
+                        width: 80.w,
+                        height: 80.h,
+                        fit: BoxFit.cover,
+                      )
+                    : Container(
+                        width: 80.w,
+                        height: 80.h,
+                        color: Colors.grey[200],
+                        child: const Icon(Icons.image, color: Colors.grey),
+                      ),
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      order.goodsName,
+                      style: const TextStyle(
+                        fontSize: 15,
+                        fontWeight: FontWeight.bold,
+                        color: Color(0xFF333333),
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Row(
+                      children: [
+                        Text(
+                          order.score,
+                          style: TextStyle(
+                            fontSize: 16.sp,
+                            color: Color(0xFF4CAF50),
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                        SizedBox(width: 4),
+                        Text(
+                          '积分',
+                          style: TextStyle(fontSize: 11.sp, color: Color(0xFF4CAF50)),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+              Text(
+                'x1',
+                style: TextStyle(color: Color(0xFFCCCCCC), fontSize: 16.sp),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/mall/rule/view.dart
+++ b/ln_jq_app/lib/pages/c_page/mall/rule/view.dart
@@ -0,0 +1,131 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:getx_scaffold/common/index.dart';
+import 'package:ln_jq_app/common/login_util.dart';
+
+class MallRulePage extends StatelessWidget {
+  const MallRulePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Color.fromRGBO(64, 199, 154, 1),
+      appBar: AppBar(
+        backgroundColor: Colors.transparent,
+        elevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_ios, color: Colors.white, size: 20),
+          onPressed: () => Get.back(),
+        ),
+      ),
+      body: Stack(
+        children: [
+          // 顶部装饰图
+          Positioned(
+            top: 30,
+            right: Get.width * 0.15,
+            child: LoginUtil.getAssImg("rule_bg@2x"),
+          ),
+          Container(
+            margin: const EdgeInsets.fromLTRB(20, 100, 20, 20),
+            padding: const EdgeInsets.all(24),
+            width: double.infinity,
+            decoration: BoxDecoration(
+              image: DecorationImage(
+                image: AssetImage('assets/images/rule_bg_1@2x.png'),
+                fit: BoxFit.fill,
+              ),
+            ),
+            child: SingleChildScrollView(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const Text(
+                    '积分获取规则',
+                    style: TextStyle(
+                      fontSize: 22,
+                      fontWeight: FontWeight.bold,
+                      color: Color(0xFF2C3E50),
+                    ),
+                  ),
+                  const SizedBox(height: 30),
+                  _buildRuleItem(
+                    icon: 'tips_1@2x',
+                    title: '每日首次签到积分规则',
+                    content: '每日首签，立得 1 积分',
+                  ),
+                  _buildRuleItem(
+                    icon: 'tips_2@2x',
+                    title: '每日预约加氢积分规则',
+                    content: '每日前 2 次预约加氢，各得 1 积分',
+                  ),
+                  _buildRuleItem(
+                    icon: 'tips_3@2x',
+                    title: '连续签到累计赠分规则',
+                    content: '连续签到 3 天赠 2 积分，7 天赠 5 积分',
+                  ),
+                  _buildRuleItem(
+                    icon: 'tips_4@2x',
+                    title: '连续签到周期及断签重置规则',
+                    content: '7 天为一个签到周期，中途断签则重新从第 1 天计算',
+                  ),
+                  _buildRuleItem(
+                    icon: 'tips_5@2x',
+                    title: '积分使用规则',
+                    content:
+                        '积分有效期3个月。个人账户内累计的所有有效积分，可在平台积分商城中，用于兑换商城内上架的各类商品、权益或服务，兑换时将按照商品标注的积分值扣除对应积分，积分兑换后不支持撤销、退换，商品兑换规则以积分商城内公示为准。',
+                  ),
+                  const SizedBox(height: 40),
+                  const Center(
+                    child: Text(
+                      '本活动最终解释权归官方所有，如有疑问可咨询客服。',
+                      style: TextStyle(color: Color(0xFF999999), fontSize: 12),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildRuleItem({
+    required String icon,
+    required String title,
+    required String content,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 24),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              LoginUtil.getAssImg(icon),
+              const SizedBox(width: 8),
+              Text(
+                title,
+                style: TextStyle(
+                  fontSize: 15.sp,
+                  fontWeight: FontWeight.bold,
+                  color: Color(0xFF333333),
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 6),
+          Padding(
+            padding: const EdgeInsets.only(left: 0),
+            child: Text(
+              content,
+              style: TextStyle(fontSize: 13.sp, color: Color(0xFF666666), height: 1.5),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/ln_jq_app/lib/pages/c_page/message/view.dart
+++ b/ln_jq_app/lib/pages/c_page/message/view.dart
@@ -12,40 +12,63 @@ class MessagePage extends GetView<MessageController> {
    Get.put(MessageController());

    return Scaffold(
-      backgroundColor: const Color(0xFFF5F5F5),
-      appBar: AppBar(title: const Text('消息通知'), centerTitle: true),
-      body: Column(
+      backgroundColor: const Color(0xFFF7F9FB),
+      appBar: AppBar(
+        title: const Text('消息通知'),
+        centerTitle: true,
+        backgroundColor: Colors.white,
+        foregroundColor: Colors.black,
+        elevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_ios, size: 20),
+          onPressed: () => Get.back(),
+        ),
+      ),
+      body: Stack(
        children: [
-          Expanded(
-            child: Obx(() => SmartRefresher(
-              controller: controller.refreshController,
-              enablePullUp: true,
-              onRefresh: controller.onRefresh,
-              onLoading: controller.onLoading,
-              child: ListView.separated(
-                padding: const EdgeInsets.all(12),
-                itemCount: controller.messageList.length,
-                separatorBuilder: (_, __) => const SizedBox(height: 12),
-                itemBuilder: (context, index) {
-                  return _buildMessageItem(context, controller.messageList[index]);
-                },
-              ),
-            )),
-          ),
+          Obx(() => SmartRefresher(
+                controller: controller.refreshController,
+                enablePullUp: true,
+                onRefresh: controller.onRefresh,
+                onLoading: controller.onLoading,
+                child: ListView.builder(
+                  padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 20),
+                  itemCount: controller.messageList.length,
+                  itemBuilder: (context, index) {
+                    return _buildMessageItem(context, controller.messageList[index]);
+                  },
+                ),
+              )),
          Obx(() => !controller.allRead.value
-              ? Container(
-            padding: const EdgeInsets.all(16),
-            color: Colors.white,
-            child: ElevatedButton(
-              onPressed: controller.markAllRead,
-              style: ElevatedButton.styleFrom(
-                backgroundColor: Colors.blue,
-                minimumSize: const Size(double.infinity, 44),
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-              ),
-              child: const Text('全部标为已读', style: TextStyle(fontSize: 16, color: Colors.white)),
-            ),
-          )
+              ? Positioned(
+                  right: 20,
+                  bottom: 50,
+                  child: GestureDetector(
+                    onTap: controller.markAllRead,
+                    child: Container(
+                      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 14),
+                      decoration: BoxDecoration(
+                        color: const Color(0xFF007A45),
+                        borderRadius: BorderRadius.circular(30),
+                        boxShadow: [
+                          BoxShadow(
+                            color: Colors.black.withOpacity(0.1),
+                            blurRadius: 10,
+                            offset: const Offset(0, 4),
+                          ),
+                        ],
+                      ),
+                      child: const Text(
+                        '全部已读',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold,
+                          fontSize: 14,
+                        ),
+                      ),
+                    ),
+                  ),
+                )
              : const SizedBox.shrink()),
        ],
      ),
@@ -53,54 +76,92 @@ class MessagePage extends GetView<MessageController> {
  }

  Widget _buildMessageItem(BuildContext context, MessageModel item) {
-    return GestureDetector(
-      onTap: () {
-        controller.markRead(item);
-        _showMessageDialog(context, item);
-      },
-      child: Container(
-        padding: const EdgeInsets.all(16),
-        decoration: BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.circular(8),
-        ),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Container(
-              margin: const EdgeInsets.only(top: 6, right: 12),
-              width: 8,
-              height: 8,
-              decoration: BoxDecoration(
-                color: item.isRead == 1 ? Colors.grey[300] : const Color(0xFFFAAD14),
-                shape: BoxShape.circle,
+    return IntrinsicHeight(
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          // 左侧时间轴线条和圆点
+          SizedBox(
+            width: 40,
+            child: Stack(
+              alignment: Alignment.topCenter,
+              children: [
+                Container(
+                  width: 1.5,
+                  color: const Color(0xFFD8E2EE),
+                ),
+                Positioned(
+                  top: 25,
+                  child: Container(
+                    width: 12,
+                    height: 12,
+                    decoration: BoxDecoration(
+                      color: item.isRead == 1
+                          ? const Color(0xFFAAB6C3)
+                          : const Color(0xFF4CAF50),
+                      shape: BoxShape.circle,
+                      border: Border.all(color: Colors.white, width: 2),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          // 右侧内容卡片
+          Expanded(
+            child: GestureDetector(
+              onTap: () {
+                controller.markRead(item);
+                _showMessageDialog(context, item);
+              },
+              child: Container(
+                margin: const EdgeInsets.only(bottom: 16),
+                padding: const EdgeInsets.all(20),
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  borderRadius: BorderRadius.circular(24),
+                  boxShadow: [
+                    BoxShadow(
+                      color: Colors.black.withOpacity(0.02),
+                      blurRadius: 10,
+                      offset: const Offset(0, 4),
+                    ),
+                  ],
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      item.title,
+                      style: const TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.bold,
+                        color: Color(0xFF333333),
+                      ),
+                    ),
+                    const SizedBox(height: 10),
+                    Text(
+                      item.content,
+                      style: const TextStyle(
+                        fontSize: 14,
+                        color: Color(0xFF666666),
+                        height: 1.4,
+                      ),
+                    ),
+                    const SizedBox(height: 12),
+                    Text(
+                      item.createTime,
+                      style: const TextStyle(
+                        fontSize: 12,
+                        color: Color(0xFFCCCCCC),
+                      ),
+                    ),
+                  ],
+                ),
              ),
            ),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    item.title,
-                    style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.black87),
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    item.content,
-                    style: TextStyle(fontSize: 14, color: Colors.grey[600]),
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    item.createTime,
-                    style: TextStyle(fontSize: 12, color: Colors.grey[400]),
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
+          ),
+        ],
      ),
    );
  }
@@ -111,7 +172,7 @@ class MessagePage extends GetView<MessageController> {
      barrierDismissible: true,
      builder: (context) {
        return Dialog(
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
          child: Container(
            padding: const EdgeInsets.all(24),
            child: Column(
@@ -122,22 +183,22 @@ class MessagePage extends GetView<MessageController> {
                  item.title,
                  style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
                ),
-                const SizedBox(height: 12),
+                const SizedBox(height: 16),
                Text(
                  item.content,
-                  style: const TextStyle(fontSize: 15, height: 1.5, color: Colors.black87),
+                  style: const TextStyle(
+                      fontSize: 15, height: 1.5, color: Color(0xFF333333)),
                ),
                const SizedBox(height: 24),
                Align(
                  alignment: Alignment.centerRight,
-                  child: OutlinedButton(
+                  child: TextButton(
                    onPressed: () => Navigator.pop(context),
-                    style: OutlinedButton.styleFrom(
-                      side: const BorderSide(color: Colors.blue),
-                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
-                      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+                    style: TextButton.styleFrom(
+                      foregroundColor: const Color(0xFF007A45),
                    ),
-                    child: const Text('确认', style: TextStyle(color: Colors.blue)),
+                    child: const Text('确认',
+                        style: TextStyle(fontWeight: FontWeight.bold)),
                  ),
                ),
              ],
@@ -147,4 +208,4 @@ class MessagePage extends GetView<MessageController> {
      },
    );
  }
-}
+}
--- a/ln_jq_app/lib/pages/c_page/reservation/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/controller.dart
@@ -69,239 +69,34 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
  String get formattedTimeSlot =>
      '${_formatTimeOfDay(startTime.value)} - ${_formatTimeOfDay(endTime.value)}';

-  void pickDate(BuildContext context) {
-    DateTime tempDate = selectedDate.value;
-
-    // 获取今天的日期 (不含时间)
-    final DateTime today = DateTime(
-      DateTime.now().year,
-      DateTime.now().month,
-      DateTime.now().day,
-    );
-
-    //计算明天的日期
-    final DateTime tomorrow = today.add(const Duration(days: 1));
-
-    Get.bottomSheet(
-      Container(
-        height: 300,
-        padding: const EdgeInsets.only(top: 6.0),
-        decoration: const BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.only(
-            topLeft: Radius.circular(16),
-            topRight: Radius.circular(16),
-          ),
-        ),
-        child: Column(
-          children: [
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  CupertinoButton(
-                    onPressed: () => Get.back(),
-                    child: const Text(
-                      '取消',
-                      style: TextStyle(color: CupertinoColors.systemGrey),
-                    ),
-                  ),
-                  CupertinoButton(
-                    onPressed: () {
-                      final bool isChangingToToday =
-                          tempDate.isAtSameMomentAs(today) &&
-                          !selectedDate.value.isAtSameMomentAs(today);
-                      final bool isDateChanged = !tempDate.isAtSameMomentAs(
-                        selectedDate.value,
-                      );
-
-                      // 更新选中的日期
-                      selectedDate.value = tempDate;
-                      Get.back(); // 先关闭弹窗
-
-                      //  如果日期发生了变化，则重置时间
-                      if (isDateChanged) {
-                        resetTimeForSelectedDate();
-                      }
-                    },
-                    child: const Text(
-                      '确认',
-                      style: TextStyle(
-                        color: AppTheme.themeColor,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const Divider(height: 1, color: Color(0xFFE5E5E5)),
-            Expanded(
-              child: CupertinoDatePicker(
-                mode: CupertinoDatePickerMode.date,
-                initialDateTime: selectedDate.value,
-                minimumDate: today,
-                // 最小可选日期为今天
-                maximumDate: tomorrow,
-                // 最大可选日期为明天
-                // ---------------------
-                onDateTimeChanged: (DateTime newDate) {
-                  tempDate = newDate;
-                },
-              ),
-            ),
-          ],
-        ),
-      ),
-      backgroundColor: Colors.transparent,
-    );
-  }
-
  void resetTimeForSelectedDate() {
    final now = DateTime.now();
    final today = DateTime(now.year, now.month, now.day);

-    // 判断新选择的日期是不是今天
+    // 1. 获取当前站点
+    final station = stationOptions.firstWhereOrNull(
+      (s) => s.hydrogenId == selectedStationId.value,
+    );
+    if (station == null) return;
+
+    // 2. 解析营业开始和结束的小时
+    final bizStartHour = int.tryParse(station.startBusiness.split(':')[0]) ?? 0;
+    final bizEndHour = int.tryParse(station.endBusiness.split(':')[0]) ?? 23;
+
    if (selectedDate.value.isAtSameMomentAs(today)) {
-      // 如果是今天，就将时间重置为当前时间所在的半小时区间
-      startTime.value = _calculateInitialStartTime(now);
-      endTime.value = TimeOfDay.fromDateTime(
-        _getDateTimeFromTimeOfDay(startTime.value).add(const Duration(minutes: 30)),
-      );
+      // 如果是今天：起始时间 = max(当前小时, 营业开始小时)，且上限为营业结束小时
+      int targetHour = now.hour;
+      if (targetHour < bizStartHour) targetHour = bizStartHour;
+      if (targetHour > bizEndHour) targetHour = bizEndHour;
+
+      startTime.value = TimeOfDay(hour: targetHour, minute: 0);
    } else {
-      // 如果是明天（或其他未来日期），则可以将时间重置为一天的最早可用时间，例如 00:00
-      startTime.value = const TimeOfDay(hour: 0, minute: 0);
-      endTime.value = const TimeOfDay(hour: 0, minute: 30);
-    }
-  }
-
-  ///60 分钟为间隔 时间选择器
-  void pickTime(BuildContext context) {
-    final now = DateTime.now();
-    final isToday =
-        selectedDate.value.year == now.year &&
-        selectedDate.value.month == now.month &&
-        selectedDate.value.day == now.day;
-
-    final List<TimeSlot> availableSlots = [];
-    for (int i = 0; i < 24; i++) {
-      // 每次增加 60 分钟
-      final startMinutes = i * 60;
-      final endMinutes = startMinutes + 60;
-
-      final startTime = TimeOfDay(hour: startMinutes ~/ 60, minute: startMinutes % 60);
-      // 注意：endMinutes % 60 始终为 0，因为间隔是整小时
-      final endTime = TimeOfDay(hour: (endMinutes ~/ 60) % 24, minute: endMinutes % 60);
-
-      // 如果不是今天，所有时间段都有效
-      if (!isToday) {
-        availableSlots.add(TimeSlot(startTime, endTime));
-      } else {
-        // 如果是今天，需要判断该时间段是否可选
-        // 创建时间段的结束时间对象
-        final slotEndDateTime = DateTime(
-          selectedDate.value.year,
-          selectedDate.value.month,
-          selectedDate.value.day,
-          endTime.hour,
-          endTime.minute,
-        );
-
-        // 注意：如果是跨天的 00:00 (例如 23:00 - 00:00)，需要将日期加一天，否则 isAfter 判断会出错
-        // 但由于我们用的是 endTime.hour % 24，当变成 0 时，日期还是 selectedDate
-        // 这里做一个特殊处理：如果 endTime 是 00:00，意味着它实际上是明天的开始
-        DateTime realEndDateTime = slotEndDateTime;
-        if (endTime.hour == 0 && endTime.minute == 0) {
-          realEndDateTime = slotEndDateTime.add(const Duration(days: 1));
-        }
-
-        // 只要时间段的结束时间晚于当前时间，这个时间段就是可预约的
-        if (realEndDateTime.isAfter(now)) {
-          availableSlots.add(TimeSlot(startTime, endTime));
-        }
-      }
+      // 如果是明天：起始时间直接重置为营业开始小时
+      startTime.value = TimeOfDay(hour: bizStartHour, minute: 0);
    }

-    if (availableSlots.isEmpty) {
-      showToast('今天已没有可预约的时间段');
-      return;
-    }
-
-    // 查找当前选中的时间对应的新列表中的索引
-    int initialItem = availableSlots.indexWhere(
-      (slot) => slot.start.hour == startTime.value.hour,
-    );
-
-    if (initialItem == -1) {
-      initialItem = 0;
-    }
-
-    TimeSlot tempSlot = availableSlots[initialItem];
-
-    final FixedExtentScrollController scrollController = FixedExtentScrollController(
-      initialItem: initialItem,
-    );
-
-    Get.bottomSheet(
-      Container(
-        height: 300,
-        decoration: const BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.only(
-            topLeft: Radius.circular(16),
-            topRight: Radius.circular(16),
-          ),
-        ),
-        child: Column(
-          children: [
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  CupertinoButton(
-                    onPressed: () => Get.back(),
-                    child: const Text(
-                      '取消',
-                      style: TextStyle(color: CupertinoColors.systemGrey),
-                    ),
-                  ),
-                  CupertinoButton(
-                    onPressed: () {
-                      startTime.value = tempSlot.start;
-                      endTime.value = tempSlot.end;
-                      Get.back();
-                    },
-                    child: const Text(
-                      '确认',
-                      style: TextStyle(
-                        color: AppTheme.themeColor,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const Divider(height: 1, color: Color(0xFFE5E5E5)),
-            Expanded(
-              child: CupertinoPicker(
-                scrollController: scrollController,
-                itemExtent: 40.0,
-                onSelectedItemChanged: (index) {
-                  tempSlot = availableSlots[index];
-                },
-                children: availableSlots
-                    .map((slot) => Center(child: Text(slot.display)))
-                    .toList(),
-              ),
-            ),
-          ],
-        ),
-      ),
-      backgroundColor: Colors.transparent,
-    );
+    // 结束时间默认顺延1小时
+    endTime.value = TimeOfDay(hour: (startTime.value.hour + 1) % 24, minute: 0);
  }

  // 用于存储上一次成功预约的信息
@@ -426,8 +221,14 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
          stateName: '',
          addStatus: '',
          addStatusName: '',
-          rejectReason: '',
          hasEdit: true,
+          rejectReason: '',
+          isTruckAttachment: 0,
+          hasHydrogenationAttachment: true,
+          hasDrivingAttachment: true,
+          isEdit: '',
+          drivingAttachments: [],
+          hydrogenationAttachments: [], gunNumber: '',
        );

        //打开预约列表
@@ -458,7 +259,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    if (_debounce?.isActive ?? false) {
      return;
    }
-    _debounce = Timer(const Duration(seconds: 1), () {});
+    _debounce = Timer(const Duration(milliseconds: 200), () {});

    showLoading("加载中");

@@ -536,12 +337,13 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    }
  }

-  String workEfficiency = "0";
-  String fillingWeight = "0";
-  String fillingTimes = "0";
+  String workEfficiency = "-";
+  String fillingWeight = "-";
+  String fillingTimes = "-";
+  String modeImage = "";
  String plateNumber = "";
  String vin = "";
-  String leftHydrogen = "0";
+  String leftHydrogen = "-";
  num maxHydrogen = 0;
  String difference = "";
  var progressValue = 0.0;
@@ -597,7 +399,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {

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

@@ -650,7 +452,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    try {
      HttpService.to.setBaseUrl(AppTheme.test_service_url);
      var responseData = await HttpService.to.get(
-        'appointment/truck/history-filling-summary?vin=$vin',
+        'appointment/truck/history-filling-summary?vin=$vin&plateNumber=$plateNumber',
      );
      if (responseData == null || responseData.data == null) {
        showToast('服务暂不可用，请稍后');
@@ -664,6 +466,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {

      fillingWeight = "$formatted${result.data["fillingWeightUnit"]}";
      fillingTimes = "${result.data["fillingTimes"]}${result.data["fillingTimesUnit"]}";
+      modeImage = result.data["modeImage"].toString();

      updateUi();
    } catch (e) {
@@ -689,8 +492,8 @@ class C_ReservationController extends GetxController with BaseControllerMixin {

      var result = BaseModel.fromJson(responseData.data);

-      leftHydrogen = result.data["leftHydrogen"].toString();
-      workEfficiency = result.data["workEfficiency"].toString();
+      leftHydrogen = "${result.data["leftHydrogen"]}Kg";
+      workEfficiency = "${result.data["workEfficiency"]}Kg";

      final leftHydrogenNum = double.tryParse(leftHydrogen) ?? 0.0;
      difference = (maxHydrogen - leftHydrogenNum).toStringAsFixed(2);
@@ -724,7 +527,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    updateUi();
  }

-  void getSiteList() async {
+  void getSiteList({showloading = true}) async {
    if (StorageService.to.phone == "13344444444") {
      //该账号给stationOptions手动添加一个数据
      final testStation = StationModel(
@@ -735,7 +538,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
        // 价格
        siteStatusName: '营运中',
        // 状态
-        isSelect: 1, // 默认可选
+        isSelect: 1,
+        startBusiness: '08:00:00',
+        endBusiness: '20:00:00', // 默认可选
      );
      //    使用 assignAll 可以确保列表只包含这个测试数据
      stationOptions.assignAll([testStation]);
@@ -747,7 +552,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    }

    try {
-      showLoading("加氢站数据加载中");
+      if (showloading) {
+        showLoading("加氢站数据加载中");
+      }

      var responseData = await HttpService.to.get(
        "appointment/station/queryHydrogenSiteInfo",
--- a/ln_jq_app/lib/pages/c_page/reservation/reservation_list_bottomsheet.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/reservation_list_bottomsheet.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:getx_scaffold/common/index.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
+import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/c_page/reservation/controller.dart';
 import 'package:ln_jq_app/pages/c_page/reservation_edit/controller.dart';
 import 'package:ln_jq_app/pages/c_page/reservation_edit/view.dart';
@@ -36,19 +37,19 @@ class _ReservationListBottomSheetState extends State<ReservationListBottomSheet>
  @override
  Widget build(BuildContext context) {
    return Container(
-      height: Get.height * 0.55,
+      height: Get.height * 0.6,
      decoration: const BoxDecoration(
-        color: Colors.white,
+        color: Color.fromRGBO(247, 249, 251, 1),
        borderRadius: BorderRadius.only(
          topLeft: Radius.circular(16),
          topRight: Radius.circular(16),
        ),
      ),
      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          // 构建标题和下拉框
          _buildHeader(),
-          const Divider(height: 1),
          // 下拉筛选框
          _buildChoice(),
          //  构建列表（使用 Obx 监听数据变化）
@@ -58,60 +59,64 @@ class _ReservationListBottomSheetState extends State<ReservationListBottomSheet>
    );
  }

-  Container _buildChoice() {
-    return Container(
-          padding: const EdgeInsets.fromLTRB(20, 8, 0, 0),
-          alignment: AlignmentGeometry.centerLeft,
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 8),
-            decoration: BoxDecoration(
-              color: Colors.grey[100],
-              borderRadius: BorderRadius.circular(8),
+  Widget _buildChoice() {
+    return SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      child: Row(
+        children: _statusOptions.entries.map((entry) {
+          bool isSelected = _selectedStatus == entry.key;
+          return GestureDetector(
+            behavior: HitTestBehavior.opaque,
+            onTap: () {
+              if (_selectedStatus == entry.key) return;
+
+              // 立即执行刷新逻辑
+              _controller.getReservationList(addStatus: entry.key);
+
+              // 先更新本地状态改变 UI 选中效果
+              setState(() {
+                _selectedStatus = entry.key;
+              });
+            },
+            child: Container(
+              margin: const EdgeInsets.only(right: 12),
+              padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 8),
+              decoration: BoxDecoration(
+                // 选中色使用深绿色，未选中保持纯白
+                color: isSelected ? const Color(0xFF006633) : Colors.white,
+                borderRadius: BorderRadius.circular(25),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.black.withOpacity(0.04),
+                    blurRadius: 6,
+                    offset: const Offset(0, 2),
+                  ),
+                ],
+              ),
+              child: Text(
+                entry.key == '' ? '全部' : entry.value,
+                style: TextStyle(
+                  // 未选中文字颜色微调为图片中的灰蓝色
+                  color: isSelected ? Colors.white : const Color(0xFFAAB6C3),
+                  fontSize: 14.sp,
+                  fontWeight: isSelected ? FontWeight.bold : FontWeight.w500,
+                ),
+              ),
            ),
-            child: DropdownButton<String>(
-              value: _selectedStatus,
-              underline: const SizedBox.shrink(), // 隐藏下划线
-              items: _statusOptions.entries.map((entry) {
-                return DropdownMenuItem<String>(
-                  value: entry.key,
-                  child: Text(entry.value),
-                );
-              }).toList(),
-              onChanged: (newValue) {
-                if (newValue != null) {
-                  setState(() {
-                    _selectedStatus = newValue;
-                  });
-                  // 当选择新状态时，调用接口刷新数据
-                  _controller.getReservationList(addStatus: _selectedStatus);
-                }
-              },
-            ),
-          ),
-        );
+          );
+        }).toList(),
+      ),
+    );
  }

  /// 构建标题、关闭按钮和下拉筛选框
  Widget _buildHeader() {
    return Container(
-      padding: const EdgeInsets.fromLTRB(20, 8, 8, 8),
-      child: Stack(
-        alignment: Alignment.center,
-        children: [
-          Center(child: const Text('我的预约', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),),
-          Align(
-            alignment: Alignment.centerRight,
-            child: ElevatedButton(
-              onPressed: () => Get.back(),
-              style: ElevatedButton.styleFrom(
-                elevation: 0,
-                backgroundColor: Colors.grey[200],
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
-              ),
-              child: const Text('关闭', style: TextStyle(color: Colors.black54)),
-            ),
-          ),
-        ],
+      margin: const EdgeInsets.fromLTRB(20, 20, 8, 8),
+      child: const Text(
+        '我的预约',
+        style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
      ),
    );
  }
@@ -134,8 +139,8 @@ class _ReservationListBottomSheetState extends State<ReservationListBottomSheet>
            return Card(
              color: Colors.white,
              margin: const EdgeInsets.only(bottom: 12.0),
-              elevation: 1,
-              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+              elevation: 0,
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
              child: Padding(
                padding: const EdgeInsets.all(16),
                child: Column(
@@ -151,17 +156,20 @@ class _ReservationListBottomSheetState extends State<ReservationListBottomSheet>
                            vertical: 5,
                          ),
                          decoration: BoxDecoration(
-                            color: Colors.blue.shade50, // 淡蓝色背景
+                            color: reservation.state == "-1"
+                                ? Color.fromRGBO(241, 67, 56, 0.1)
+                                : Color.fromRGBO(230, 249, 243, 1),
                            borderRadius: BorderRadius.circular(4), // 小圆角
                            // 可以选择去掉边框，或者用极淡的边框
-                            border: Border.all(color: Colors.blue.shade100),
                          ),
                          child: Text(
                            "${reservation.stateName}-${reservation.addStatusName}",
                            style: TextStyle(
-                              color: Colors.blue.shade700,
-                              fontSize: 12,
-                              fontWeight: FontWeight.w500,
+                              color: reservation.state == "-1"
+                                  ? Color.fromRGBO(241, 67, 56, 0.8)
+                                  : Color.fromRGBO(49, 186, 133, 1),
+                              fontSize: 12.sp,
+                              fontWeight: FontWeight.w600,
                            ),
                          ),
                        ),
@@ -171,12 +179,10 @@ class _ReservationListBottomSheetState extends State<ReservationListBottomSheet>
                          SizedBox(
                            height: 28, // 限制按钮高度，显得精致
                            child: OutlinedButton(
-                              onPressed: () async{
+                              onPressed: () async {
                                var responseData = await HttpService.to.post(
                                  'appointment/orderAddHyd/vehicle-cancel',
-                                  data: {
-                                    'id': reservation.id,
-                                  },
+                                  data: {'id': reservation.id},
                                );

                                if (responseData == null || responseData.data == null) {
@@ -198,24 +204,27 @@ class _ReservationListBottomSheetState extends State<ReservationListBottomSheet>
                              },
                              style: OutlinedButton.styleFrom(
                                padding: const EdgeInsets.symmetric(horizontal: 12),
-                                side: BorderSide(color: Colors.grey.shade400), // 灰色边框
-                                shape: const StadiumBorder(), // 胶囊形状
+                                side: BorderSide(color: Colors.grey.shade400),
+                                shape: const StadiumBorder(),
                              ),
                              child: Text(
                                '取消预约',
-                                style: TextStyle(color: Colors.grey.shade600, fontSize: 12),
+                                style: TextStyle(
+                                  color: Colors.grey.shade600,
+                                  fontSize: 11.sp,
+                                ),
                              ),
                            ),
                          ),
-                        SizedBox(width: 10.w,),
+                        SizedBox(width: 10.w),
                        // 修改按钮 (仅在 hasEdit 为 true 时显示)
                        if (reservation.hasEdit)
                          SizedBox(
                            height: 28,
                            child: OutlinedButton(
-                              onPressed: () async{
+                              onPressed: () async {
                                var result = await Get.to(
-                                      () => ReservationEditPage(),
+                                  () => ReservationEditPage(),
                                  arguments: {
                                    'reservation': reservation,
                                    'difference': _controller.difference,
@@ -233,21 +242,22 @@ class _ReservationListBottomSheetState extends State<ReservationListBottomSheet>
                              },
                              style: OutlinedButton.styleFrom(
                                padding: const EdgeInsets.symmetric(horizontal: 12),
-                                side: const BorderSide(color: Colors.blue), // 蓝色边框
+                                side:  BorderSide(color: AppTheme.themeColor),
                                shape: const StadiumBorder(),
                                backgroundColor: Colors.white,
                              ),
-                              child: const Text(
+                              child:  Text(
                                '修改',
-                                style: TextStyle(color: Colors.blue, fontSize: 12),
+                                style: TextStyle(color: AppTheme.themeColor, fontSize: 11.sp),
                              ),
-                            ),),
+                            ),
+                          ),
                      ],
                    ),
                    const SizedBox(height: 12),
                    _buildDetailRow('车牌号:', reservation.plateNumber),
                    _buildDetailRow('预约日期:', reservation.date),
-                    _buildDetailRow('预约氢量:', reservation.hydAmount),
+                    _buildDetailRow('预约氢量:', "${reservation.hydAmount} KG"),
                    _buildDetailRow('加氢站:', reservation.stationName),
                    _buildDetailRow('开始时间:', reservation.startTime),
                    _buildDetailRow('结束时间:', reservation.endTime),
@@ -271,11 +281,26 @@ class _ReservationListBottomSheetState extends State<ReservationListBottomSheet>
    return Padding(
      padding: const EdgeInsets.only(top: 8.0),
      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
        children: [
-          Text(label, style: const TextStyle(color: Colors.grey)),
+          Text(
+            label,
+            style: TextStyle(
+              color: Color.fromRGBO(51, 51, 51, 0.6),
+              fontSize: 14.sp,
+              fontWeight: FontWeight.w400,
+            ),
+          ),
          const SizedBox(width: 8),
-          Expanded(
-            child: Text(value, style: const TextStyle(fontWeight: FontWeight.w500)),
+          Text(
+            value,
+            style: TextStyle(
+              color: label.contains("预约氢量:")
+                  ? Color.fromRGBO(27, 168, 85, 1)
+                  : Color.fromRGBO(51, 51, 51, 1),
+              fontSize: 14.sp,
+              fontWeight: FontWeight.w500,
+            ),
          ),
        ],
      ),
--- a/ln_jq_app/lib/pages/c_page/reservation/view.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/view.dart
@@ -49,7 +49,7 @@ class ReservationPage extends GetView<C_ReservationController> {
                Positioned(
                  left: 20.w,
                  right: 20.w,
-                  bottom: 110.h,
+                  bottom: Get.height * (Get.height < 826 ? 0.08 : 0.11),
                  child: _buildReservationItem(context),
                ),
              ],
@@ -148,9 +148,11 @@ class ReservationPage extends GetView<C_ReservationController> {
                ),
                IconButton(
                  onPressed: () async {
+                    controller.stopAutoRefresh();
                    var scanResult = await Get.to(() => const MessagePage());
                    if (scanResult == null) {
                      controller.msgNotice();
+                      controller.startAutoRefresh();
                    }
                  },
                  icon: Badge(
@@ -177,7 +179,12 @@ class ReservationPage extends GetView<C_ReservationController> {
                const SizedBox(width: 8),
                _buildModernStatItem('总加氢次数', '', controller.fillingTimes, ''),
                const SizedBox(width: 8),
-                _buildModernStatItem('今日里程', '', "7kg", ''),
+                _buildModernStatItem(
+                  '今日里程',
+                  '',
+                  StorageService.to.hasVehicleInfo ? "7kg" : "-",
+                  '',
+                ),
              ],
            ),
          ),
@@ -237,17 +244,33 @@ class ReservationPage extends GetView<C_ReservationController> {
        padding: const EdgeInsets.all(16.0),
        child: Row(
          children: [
-            Expanded(flex: 4, child: LoginUtil.getAssImg('ic_car_bg@2x')),
+            Expanded(
+              flex: 4,
+              child: Image.network(
+                controller.modeImage,
+                fit: BoxFit.cover,
+                loadingBuilder: (context, child, loadingProgress) {
+                  if (loadingProgress == null) return child;
+                  return Center(child: CircularProgressIndicator());
+                },
+                errorBuilder: (context, error, stackTrace) {
+                  return Center(child: LoginUtil.getAssImg('ic_car_select@2x'));
+                },
+              ),
+            ),
            const SizedBox(width: 16),
            Expanded(
              flex: 6,
              child: Column(
                children: [
-                  _buildCarDataItem('剩余电量', '36.8%'),
+                  _buildCarDataItem(
+                    '剩余电量',
+                    StorageService.to.hasVehicleInfo ? '36.8%' : '-',
+                  ),
                  const SizedBox(height: 8),
-                  _buildCarDataItem('剩余氢量', '${controller.leftHydrogen}Kg'),
+                  _buildCarDataItem('剩余氢量', controller.leftHydrogen),
                  const SizedBox(height: 8),
-                  _buildCarDataItem('百公里氢耗', '${controller.workEfficiency}Kg'),
+                  _buildCarDataItem('百公里氢耗', controller.workEfficiency),
                  const SizedBox(height: 12),
                  Column(
                    children: [
@@ -275,7 +298,7 @@ class ReservationPage extends GetView<C_ReservationController> {
                            ),
                          ),
                          Text(
-                            "${controller.leftHydrogen}Kg",
+                            controller.leftHydrogen,
                            style: const TextStyle(
                              fontSize: 10,
                              color: Color(0xFF006633),
@@ -434,8 +457,34 @@ class ReservationPage extends GetView<C_ReservationController> {
  /// 时间 Slider 选择器
  Widget _buildTimeSlider(BuildContext context) {
    return Obx(() {
-      // 这里的逻辑对应 Controller 中的 24 小时可用 Slot
-      int currentIdx = controller.startTime.value.hour;
+      //  获取站点信息
+      final station = controller.stationOptions.firstWhereOrNull(
+        (s) => s.hydrogenId == controller.selectedStationId.value,
+      );
+
+      // 如果没有站点数据，默认隐藏
+      if (station == null) {
+        return const SizedBox(height: 100);
+      }
+
+      // 解析营业范围
+      final startParts = station.startBusiness.split(':');
+      final endParts = station.endBusiness.split(':');
+      int bizStartHour = int.tryParse(startParts[0]) ?? 0;
+      int bizEndHour = int.tryParse(endParts[0]) ?? 23;
+      int bizEndMinute = (endParts.length > 1) ? (int.tryParse(endParts[1]) ?? 0) : 0;
+      if (bizEndMinute == 0 && bizEndHour > bizStartHour) bizEndHour--;
+
+      //确定当前滑块值
+      int currentHour = controller.startTime.value.hour;
+      double sliderValue = currentHour.toDouble().clamp(
+        bizStartHour.toDouble(),
+        bizEndHour.toDouble(),
+      );
+
+      double minVal = bizStartHour.toDouble();
+      double maxVal = bizEndHour.toDouble();
+      if (minVal >= maxVal) maxVal = minVal + 1;

      return Column(
        children: [
@@ -484,23 +533,20 @@ class ReservationPage extends GetView<C_ReservationController> {
              overlayColor: const Color(0xFF006633).withOpacity(0.1),
            ),
            child: Slider(
-              value: currentIdx.toDouble(),
-              min: 0,
-              max: 23,
-              divisions: 23,
+              value: sliderValue,
+              min: minVal,
+              max: maxVal,
+              // divisions: bizEndHour - bizStartHour > 0 ? bizEndHour - bizStartHour : 1,
              onChanged: (val) {
                int hour = val.toInt();
-                // 模拟 Controller 中的 pickTime 逻辑校验
                final now = DateTime.now();
                final isToday =
                    controller.selectedDate.value.year == now.year &&
                    controller.selectedDate.value.month == now.month &&
                    controller.selectedDate.value.day == now.day;

-                if (isToday && hour < now.hour) {
-                  // 如果是今天且小时数小于当前，则忽略
-                  return;
-                }
+                // 如果是今天，判断不可选过去的时间点
+                if (isToday && hour < now.hour) return;

                controller.startTime.value = TimeOfDay(hour: hour, minute: 0);
                controller.endTime.value = TimeOfDay(hour: (hour + 1) % 24, minute: 0);
@@ -627,6 +673,7 @@ class ReservationPage extends GetView<C_ReservationController> {
          onChanged: (value) {
            if (value != null) {
              controller.selectedStationId.value = value;
+              controller.resetTimeForSelectedDate();
            }
          },

--- a/ln_jq_app/lib/pages/home/controller.dart
+++ b/ln_jq_app/lib/pages/home/controller.dart
@@ -2,8 +2,11 @@ import 'dart:io';

 import 'package:aliyun_push_flutter/aliyun_push_flutter.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_app_update/flutter_app_update.dart';
+import 'package:flutter_app_update/result_model.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/b_page/base_widgets/view.dart';
 import 'package:ln_jq_app/pages/c_page/base_widgets/view.dart';
@@ -20,107 +23,195 @@ class HomeController extends GetxController with BaseControllerMixin {

  final _aliyunPush = AliyunPushFlutter();

+  @override
+  bool get listenLifecycleEvent => true;
+
  @override
  void onInit() {
    super.onInit();
    initAliyunPush();
    addPushCallback();
    FlutterNativeSplash.remove();
+    log('page-init');
+
+    // 页面初始化后执行版本检查
+    checkVersionInfo();
+  }
+
+  String downloadUrl = "";
+
+  /// 检查 App 更新信息，增加版本号比对逻辑
+  void checkVersionInfo() async {
+    try {
+      final response = await HttpService.to.get('appointment/appConfig/get');
+      if (response != null) {
+        final result = BaseModel.fromJson(response.data);
+        if (result.code == 0 && result.data != null) {
+          final data = result.data as Map<String, dynamic>;
+
+          bool hasUpdate = data['hasUpdate']?.toString().toLowerCase() == "true";
+          bool isForce = data['isForce']?.toString().toLowerCase() == "true";
+          String versionName = data['versionName'] ?? "新版本";
+          String updateContent = data['updateContent'] ?? "优化系统性能，提升用户体验";
+          downloadUrl = data['downloadUrl'].toString();
+
+          // 获取服务器配置的目标构建号
+          int serverVersionCode =
+              int.tryParse(data['versionCode']?.toString() ?? "0") ?? 0;
+          int serverIosBuildId = int.tryParse(data['iosBuildId']?.toString() ?? "0") ?? 0;
+
+          // 获取本地当前的构建号
+          String currentBuildStr = await getBuildNumber();
+          int currentBuild = int.tryParse(currentBuildStr) ?? 0;
+
+          bool needUpdate = false;
+          if (GetPlatform.isAndroid) {
+            needUpdate = currentBuild < serverVersionCode;
+          } else if (GetPlatform.isIOS) {
+            needUpdate = currentBuild < serverIosBuildId;
+          }
+
+          // 如果服务器标记有更新，且本地版本号确实较低，则弹出更新
+          if (hasUpdate && needUpdate) {
+            _showUpdateDialog("版本:$versionName\n\n更新内容:\n$updateContent", isForce);
+          }
+        }
+      }
+    } catch (e) {
+      Logger.d("版本检查失败: $e");
+    }
+  }
+
+  /// 显示更新弹窗
+  void _showUpdateDialog(String content, bool isForce) {
+    DialogX.to.showConfirmDialog(
+      title: '升级提醒',
+      confirmText: '立即升级',
+      content: _buildDialogContent(content),
+      // 如果是强制更新，取消按钮显示为空，即隐藏
+      cancelText: isForce ? "" : '以后再说',
+      // 设置为 false，禁止点击背景和物理返回键关闭
+      barrierDismissible: false,
+      onConfirm: () {
+        jumpUpdateApp();
+
+        // ios如果是强制更新，点击后维持弹窗，防止用户进入 App
+        if (isForce && GetPlatform.isIOS) {
+          Future.delayed(const Duration(milliseconds: 500), () {
+            _showUpdateDialog(content, isForce);
+          });
+        }
+      },
+    );
+  }
+
+  Widget _buildDialogContent(String content) {
+    return PopScope(
+      canPop: false, // 关键：禁止 pop
+      child: TextX.bodyMedium(content).padding(bottom: 16.h),
+    );
+  }
+
+  void jumpUpdateApp() {
+    if (GetPlatform.isIOS) {
+      // 跳转到 iOS 应用商店网页
+      openWebPage("https://apps.apple.com/cn/app/羚牛氢能/6756245815");
+    } else if (GetPlatform.isAndroid) {
+      // Android 执行下载安装流程
+      showAndroidDownloadDialog();
+    }
+  }
+
+  void showAndroidDownloadDialog() {
+    AzhonAppUpdate.listener((ResultModel model) {
+      if (model.type == ResultType.start) {
+        DialogX.to.showConfirmDialog(
+          content: PopScope(
+            canPop: false,
+            child: Center(
+              child: Column(
+                children: [
+                  TextX.bodyMedium('升级中...').padding(bottom: 45.h),
+                  CircularProgressIndicator(),
+                ],
+              ),
+            ),
+          ),
+          confirmText: '',
+          cancelText: "",
+          barrierDismissible: false,
+        );
+      } else if (model.type == ResultType.done) {
+        Get.back();
+      }
+    });
+
+    UpdateModel model = UpdateModel(downloadUrl, "xll.apk", "logo", '正在下载最新版本...');
+    AzhonAppUpdate.update(model);
  }

  // 根据登录状态和登录渠道返回不同的首页
  Widget getHomePage() {
    requestPermission();
-    //登录状态跳转
    if (StorageService.to.isLoggedIn) {
-      // 如果已登录，再判断是哪个渠道
      if (StorageService.to.loginChannel == LoginChannel.station) {
-        return B_BaseWidgetsPage(); // 站点首页
+        return B_BaseWidgetsPage();
      } else if (StorageService.to.loginChannel == LoginChannel.driver) {
-        return BaseWidgetsPage(); // 司机首页
+        return BaseWidgetsPage();
      } else {
        return LoginPage();
      }
    } else {
-      // 未登录，直接去登录页
      return LoginPage();
    }
  }

  void requestPermission() async {
    PermissionStatus status = await Permission.notification.status;
-    if (status.isGranted) {
-      Logger.d("通知权限已开启");
-      return;
-    }
+    if (status.isGranted) return;

    if (status.isDenied) {
-      // 建议此处增加一个应用内的 Rationale (解释说明) 弹窗
      status = await Permission.notification.request();
    }
    if (status.isGranted) {
-      // 授权成功
      Logger.d('通知已开启');
    } else if (status.isPermanentlyDenied) {
      Logger.d('通知权限已被拒绝，请到系统设置中开启');
-    } else if (status.isDenied) {
-      Logger.d('请授予通知权限，以便接收加氢站通知');
    }
  }

-  ///推送相关
+  ///推送相关初始化 (保持原样)
  Future<void> initAliyunPush() async {
-    // 1. 配置分离：建议将 Key 提取到外部或配置文件中
    final String appKey = Platform.isIOS ? AppTheme.ios_key : AppTheme.android_key;
    final String appSecret = Platform.isIOS
        ? AppTheme.ios_appsecret
        : AppTheme.android_appsecret;

    try {
-      //  初始化推送
      final result = await _aliyunPush.initPush(appKey: appKey, appSecret: appSecret);
-
-      if (result['code'] != kAliyunPushSuccessCode) {
-        Logger.d('初始化推送失败: ${result['code']} - ${result['errorMsg']}');
-        return;
-      }
-
-      Logger.d('阿里云推送初始化成功');
-      // 分平台配置
+      if (result['code'] != kAliyunPushSuccessCode) return;
      if (Platform.isIOS) {
        await _setupIOSConfig();
      } else if (Platform.isAndroid) {
        await _setupAndroidConfig();
      }
    } catch (e) {
-      Logger.d('初始化过程中发生异常: $e');
+      Logger.d('初始化异常: $e');
    }
  }

-  /// iOS 专属配置
  Future<void> _setupIOSConfig() async {
-    final res = await _aliyunPush.showIOSNoticeWhenForeground(true);
-    if (res['code'] == kAliyunPushSuccessCode) {
-      Logger.d('iOS 前台通知展示已开启');
-    } else {
-      Logger.d('iOS 前台通知开启失败: ${res['errorMsg']}');
-    }
+    await _aliyunPush.showIOSNoticeWhenForeground(true);
  }

-  /// Android 专属配置
  Future<void> _setupAndroidConfig() async {
    await _aliyunPush.setNotificationInGroup(true);
-    final res = await _aliyunPush.createAndroidChannel(
+    await _aliyunPush.createAndroidChannel(
      "xll_push_android",
      '新消息通知',
      4,
      '用于接收加氢站实时状态提醒',
    );
-    if (res['code'] == kAliyunPushSuccessCode) {
-      Logger.d('Android 通知通道创建成功');
-    } else {
-      Logger.d('Android 通道创建失败: ${res['code']} - ${res['errorMsg']}');
-    }
  }

  void addPushCallback() {
@@ -139,40 +230,23 @@ class HomeController extends GetxController with BaseControllerMixin {

  Future<void> _onAndroidNotificationClickedWithNoAction(
    Map<dynamic, dynamic> message,
-  ) async {
-    Logger.d('onAndroidNotificationClickedWithNoAction ====> $message');
-  }
+  ) async {}

-  Future<void> _onAndroidNotificationReceivedInApp(Map<dynamic, dynamic> message) async {
-    Logger.d('onAndroidNotificationReceivedInApp ====> $message');
-  }
+  Future<void> _onAndroidNotificationReceivedInApp(Map<dynamic, dynamic> message) async {}

-  Future<void> _onMessage(Map<dynamic, dynamic> message) async {
-    Logger.d('onMessage ====> $message');
-  }
+  Future<void> _onMessage(Map<dynamic, dynamic> message) async {}

-  Future<void> _onNotification(Map<dynamic, dynamic> message) async {
-    Logger.d('onNotification ====> $message');
-  }
+  Future<void> _onNotification(Map<dynamic, dynamic> message) async {}

  Future<void> _onNotificationOpened(Map<dynamic, dynamic> message) async {
-    Logger.d('onNotificationOpened ====> $message');
    await Get.to(() => const MessagePage());
  }

-  Future<void> _onNotificationRemoved(Map<dynamic, dynamic> message) async {
-    Logger.d('onNotificationRemoved ====> $message');
-  }
+  Future<void> _onNotificationRemoved(Map<dynamic, dynamic> message) async {}

-  Future<void> _onIOSChannelOpened(Map<dynamic, dynamic> message) async {
-    Logger.d('onIOSChannelOpened ====> $message');
-  }
+  Future<void> _onIOSChannelOpened(Map<dynamic, dynamic> message) async {}

-  Future<void> _onIOSRegisterDeviceTokenSuccess(Map<dynamic, dynamic> message) async {
-    Logger.d('onIOSRegisterDeviceTokenSuccess ====> $message');
-  }
+  Future<void> _onIOSRegisterDeviceTokenSuccess(Map<dynamic, dynamic> message) async {}

-  Future<void> _onIOSRegisterDeviceTokenFailed(Map<dynamic, dynamic> message) async {
-    Logger.d('onIOSRegisterDeviceTokenFailed====> $message');
-  }
+  Future<void> _onIOSRegisterDeviceTokenFailed(Map<dynamic, dynamic> message) async {}
 }
--- a/ln_jq_app/lib/pages/home/view.dart
+++ b/ln_jq_app/lib/pages/home/view.dart
@@ -5,18 +5,13 @@ import 'package:ln_jq_app/pages/home/controller.dart';
 class HomePage extends GetView<HomeController> {
  const HomePage({super.key});

-  // 主视图
-  Widget _buildView() {
-    return <Widget>[Text('主页面')].toColumn(mainAxisSize: MainAxisSize.min).center();
-  }
-
  @override
  Widget build(BuildContext context) {
    return GetBuilder<HomeController>(
      init: HomeController(),
      id: 'home',
      builder: (_) {
-        return controller.getHomePage();
+        return Scaffold(body: controller.getHomePage());
      },
    );
  }
--- a/ln_jq_app/lib/pages/login/view.dart
+++ b/ln_jq_app/lib/pages/login/view.dart
@@ -204,9 +204,9 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
          Row(
            children: [
              const Text(
-                "欢迎使用 ",
+                "欢迎使用小羚羚 ",
                style: TextStyle(
-                  fontSize: 24,
+                  fontSize: 22,
                  fontWeight: FontWeight.w500,
                  color: Color.fromRGBO(51, 51, 51, 1),
                ),
--- a/ln_jq_app/lib/pages/welcome/view.dart
+++ b/ln_jq_app/lib/pages/welcome/view.dart
@@ -23,7 +23,7 @@ class WelcomePage extends GetView<WelcomeController> {
              right: 0,
              child: Image.asset(
                'assets/images/welcome.png',
-                fit: BoxFit.fill
+                fit: BoxFit.cover
              ),
            ),
          ],