From 5ee4e077fb8b1c4120b48e2a16bf1ebe5c4e8406 Mon Sep 17 00:00:00 2001
From: Doubleyin <953994191@qq.com>
Date: Sun, 19 Oct 2025 23:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 213 +++++++-
 backend-api.md                                |   2 +-
 miniprogram/app.json                          |   7 +-
 miniprogram/images/crown.png                  | Bin 1999 -> 2415 bytes
 miniprogram/images/truck.png                  | Bin 1999 -> 23760 bytes
 miniprogram/images/trucks.png                 | Bin 1999 -> 0 bytes
 miniprogram/pages/admin/admin.ts              |  19 +-
 miniprogram/pages/admin/admin.wxml            |   7 +-
 miniprogram/pages/admin/admin.wxss            |  28 +
 miniprogram/pages/index/index.ts              | 251 ++++-----
 miniprogram/pages/index/index.wxml            |  45 +-
 miniprogram/pages/index/modules/dataModule.ts |   6 +-
 .../index/modules/deliveryPersonModule.ts     |  34 +-
 .../pages/index/modules/locationModule.ts     | 239 +++++----
 .../pages/index/modules/loginModule.ts        | 130 ++---
 .../pages/index/modules/mainPageModule.ts     |  21 +-
 miniprogram/pages/index/modules/mapModule.ts  | 129 +++--
 miniprogram/pages/staff/admin-dashboard.json  |  10 +
 miniprogram/pages/staff/admin-dashboard.ts    | 187 +++++++
 miniprogram/pages/staff/admin-dashboard.wxml  |  66 +++
 miniprogram/pages/staff/admin-dashboard.wxss  | 262 ++++++++++
 .../pages/staff/employee-dashboard.json       |  10 +
 miniprogram/pages/staff/employee-dashboard.ts | 160 ++++++
 .../pages/staff/employee-dashboard.wxml       |  85 +++
 .../pages/staff/employee-dashboard.wxss       | 323 ++++++++++++
 .../pages/staff/employee-management.json      |   9 +
 .../pages/staff/employee-management.ts        | 362 +++++++++++++
 .../pages/staff/employee-management.wxml      | 168 ++++++
 .../pages/staff/employee-management.wxss      | 395 ++++++++++++++
 miniprogram/pages/staff/order-management.json |   9 +
 miniprogram/pages/staff/order-management.ts   | 433 +++++++++++++++
 miniprogram/pages/staff/order-management.wxml | 164 ++++++
 miniprogram/pages/staff/order-management.wxss | 491 ++++++++++++++++++
 miniprogram/pages/staff/staff.json            |   9 +
 miniprogram/pages/staff/staff.ts              |  82 +++
 miniprogram/pages/staff/staff.wxml            |  37 ++
 miniprogram/pages/staff/staff.wxss            | 157 ++++++
 .../pages/staff/warehouse-management.json     |   9 +
 .../pages/staff/warehouse-management.ts       | 324 ++++++++++++
 .../pages/staff/warehouse-management.wxml     | 219 ++++++++
 .../pages/staff/warehouse-management.wxss     | 421 +++++++++++++++
 miniprogram/services/apiService.ts            | 172 +-----
 .../services/locationTrackingService.ts       | 444 +++++++---------
 miniprogram/services/mapService.ts            |   2 +-
 miniprogram/services/orderService.ts          |   2 +-
 miniprogram/types/index.ts                    |   3 +
 46 files changed, 5263 insertions(+), 883 deletions(-)
 delete mode 100644 miniprogram/images/trucks.png
 create mode 100644 miniprogram/pages/staff/admin-dashboard.json
 create mode 100644 miniprogram/pages/staff/admin-dashboard.ts
 create mode 100644 miniprogram/pages/staff/admin-dashboard.wxml
 create mode 100644 miniprogram/pages/staff/admin-dashboard.wxss
 create mode 100644 miniprogram/pages/staff/employee-dashboard.json
 create mode 100644 miniprogram/pages/staff/employee-dashboard.ts
 create mode 100644 miniprogram/pages/staff/employee-dashboard.wxml
 create mode 100644 miniprogram/pages/staff/employee-dashboard.wxss
 create mode 100644 miniprogram/pages/staff/employee-management.json
 create mode 100644 miniprogram/pages/staff/employee-management.ts
 create mode 100644 miniprogram/pages/staff/employee-management.wxml
 create mode 100644 miniprogram/pages/staff/employee-management.wxss
 create mode 100644 miniprogram/pages/staff/order-management.json
 create mode 100644 miniprogram/pages/staff/order-management.ts
 create mode 100644 miniprogram/pages/staff/order-management.wxml
 create mode 100644 miniprogram/pages/staff/order-management.wxss
 create mode 100644 miniprogram/pages/staff/staff.json
 create mode 100644 miniprogram/pages/staff/staff.ts
 create mode 100644 miniprogram/pages/staff/staff.wxml
 create mode 100644 miniprogram/pages/staff/staff.wxss
 create mode 100644 miniprogram/pages/staff/warehouse-management.json
 create mode 100644 miniprogram/pages/staff/warehouse-management.ts
 create mode 100644 miniprogram/pages/staff/warehouse-management.wxml
 create mode 100644 miniprogram/pages/staff/warehouse-management.wxss

diff --git a/README.md b/README.md
index d9bc23f..9d8b16f 100644
--- a/README.md
+++ b/README.md
@@ -41,11 +41,110 @@
 - **位置历史记录**: 记录货运人员位置历史轨迹
 - **位置列表更新机制**: 系统通过WebSocket被动接收服务器推送的位置列表更新，不主动请求刷新
 
+### 🐛 问题修复记录
+
+#### 2024年12月19日修复
+
+**1. TypeError错误修复**
+- **问题**: `mainPageModule.ts`中`MainPageModule`接口声明了`cleanup()`方法但类实现中缺失该方法
+- **错误表现**: 页面销毁时调用`detached`生命周期方法触发TypeError
+- **修复方案**: 在`MainPageModule`类中添加`cleanup()`方法实现，包含资源清理日志和调用`locationModule.cleanup()`
+
+**2. 签退后签到按钮不显示问题**
+- **问题**: 用户签退后签到按钮不再显示
+- **根本原因**: 签退后调用`refreshAllData()`方法触发登录状态检查，导致`authStatus.hasWxCode`被重置为`false`
+- **修复方案**: 移除签退后调用`refreshAllData()`的逻辑，确保签退后用户状态更新为`signed_out`且`authStatus.hasWxCode`保持`true`
+- **显示条件**: 签到按钮显示需要满足：已获取微信code、用户状态为registered/signed_out且非游客角色
+
+**3. 管理界面跳转导致页面销毁问题**
+- **问题**: 点击管理按钮跳转后，返回时页面状态丢失
+- **根本原因**: `goToManagementPage()`方法使用`wx.redirectTo()`跳转，导致当前页面被销毁触发`detached`生命周期清理资源
+- **修复方案**: 将跳转方式改为`wx.navigateTo()`，保持页面栈状态
+- **效果**: 用户返回时页面状态和登录数据得以保留，签到按钮正常显示
+
 ### 🔧 系统管理功能
 - **API配置管理**: 可以配置API服务器地址等参数
 - **调试信息显示**: 显示系统运行状态和调试信息
 - **模块化架构**: 基于模块化设计，便于功能扩展和维护
 
+### 👑 管理员管理逻辑
+
+#### 管理员界面 (admin-dashboard)
+- **功能菜单**: 提供6个核心管理功能入口
+  - 员工管理 (👥): 管理员工信息
+  - 订单管理 (📦): 处理订单分配
+  - 仓库管理 (🏭): 管理库存信息
+  - 数据统计 (📊): 查看业务数据
+  - 系统设置 (⚙️): 系统配置管理
+  - 地图监控 (🗺️): 实时位置监控
+- **系统概览**: 显示员工总数、订单总数、仓库数量等关键指标
+- **权限验证**: 自动验证用户是否为管理员角色
+
+#### 员工管理 (employee-management)
+**核心方法**:
+- `loadEmployees()`: 加载员工列表，支持搜索过滤
+- `submitAddForm()`: 提交添加员工表单，包含表单验证
+- `deleteEmployee()`: 删除员工，包含确认对话框
+- `validateForm()`: 验证员工信息（姓名、手机号、角色）
+- `getFilteredEmployees()`: 根据关键词过滤员工列表
+
+**功能特性**:
+- **双标签页设计**: 员工列表页和添加员工页
+- **实时搜索**: 支持按姓名、手机号、角色搜索
+- **表单验证**: 手机号格式验证、必填项检查
+- **权限控制**: 过滤当前登录用户，防止误删
+- **角色管理**: 支持管理员和配送员角色分配
+
+#### 订单管理 (order-management)
+**核心方法**:
+- `refreshData()`: 刷新订单和员工数据
+- `createOrder()`: 创建新订单，包含完整表单验证
+- `assignOrder()`: 指派订单给合适的货运人员
+- `updateOrderStatus()`: 更新订单状态
+- `filterOrders()`: 按状态过滤订单列表
+
+**功能特性**:
+- **多状态管理**: 支持pending/assigned/in_transit/delivered/cancelled状态
+- **智能指派**: 自动筛选空闲状态的货运人员
+- **订单详情**: 显示订单起点、终点、货物信息
+- **实时更新**: 下拉刷新获取最新数据
+- **批量操作**: 支持批量指派和状态更新
+
+#### 仓库管理 (warehouse-management)
+**核心方法**:
+- `loadWarehouses()`: 加载仓库列表
+- `submitAddForm()`: 提交添加仓库表单
+- `deleteWarehouse()`: 删除仓库，包含确认对话框
+- `filterWarehouses()`: 按名称、地址、联系人搜索仓库
+- `getWarehouseInventoryStatus()`: 获取库存状态评估
+
+**功能特性**:
+- **库存监控**: 实时显示库存状态（充足/正常/偏低/不足）
+- **位置管理**: 支持仓库经纬度坐标管理
+- **容量管理**: 设置仓库最大容量限制
+- **状态管理**: 支持营业中/已关闭/维护中状态
+- **联系人管理**: 仓库联系人和电话信息
+
+#### 员工界面 (employee-dashboard)
+**功能菜单**:
+- 我的订单 (📦): 查看分配订单
+- 位置上报 (📍): 上报当前位置
+- 工作安排 (📅): 查看工作计划
+- 个人信息 (👤): 个人资料管理
+- 消息通知 (📨): 查看系统消息
+- 帮助中心 (❓): 使用帮助文档
+
+**工作统计**:
+- 今日订单数量
+- 已完成订单数量
+- 待处理订单数量
+
+#### 权限控制机制
+- **角色验证**: 管理员界面自动验证用户角色
+- **访问限制**: 非管理员用户自动跳转回首页
+- **数据隔离**: 员工列表过滤当前登录用户
+- **功能权限**: 不同角色显示不同的功能菜单
+
 ## 技术架构
 
 ### 模块化架构设计
@@ -92,19 +191,52 @@
    - 响应: `{ user: UserInfo, token: string, openid: string, session_key: string }`
 
 2. **用户签到** - `POST /user/signin`
-   - 请求: `{ userId: number }`
-   - 响应: `{ success: boolean, userInfo: UserInfo, message?: string }`
+   - **请求参数**: `{ latitude: number, longitude: number, timestamp: number }`
+   - **成功响应**: 
+   ```json
+   {
+     "success": true,
+     "userInfo": {
+       "id": 123,
+       "name": "张三",
+       "phone": "13800138000",
+       "role": "DELIVERY_PERSON",
+       "openid": "oK4fS5ABCDEF123456"
+     }
+   }
+   ```
+   - **失败响应**: 
+   ```json
+   {
+     "success": false,
+     "message": "错误信息"
+   }
+   ```
 
 3. **用户签退** - `POST /user/signout`
-   - 请求: `{ userId: number }`
-   - 响应: `{ success: boolean, message?: string }`
+   - **请求参数**: `{ userId: number }`
+   - **成功响应**: 
+   ```json
+   {
+     "success": true,
+     "message": "签退成功"
+   }
+   ```
+   - **失败响应**: 
+   ```json
+   {
+     "success": false,
+     "message": "错误信息"
+   }
+   ```
 
 4. **获取用户状态** - `GET /user/status`
    - 响应: `{ status: 'signed_in' | 'signed_out' | 'registered' | 'unregistered'; lastSignInTime?: string; lastSignOutTime?: string }`
 
-5. **用户注册** - `POST /user/register`
-   - 请求: `{ name: string, phone: string }`
-   - 响应: `{ success: boolean, employeeInfo: EmployeeInfo, message?: string }`
+5.2. **用户注册** - `POST /user/register`
+   - **请求参数**: `{ name: string, phone: string }`
+   - **服务器响应**: `{ success: boolean, userInfo: UserInfoResponse, message?: string }`
+   - **说明**: 服务器采用统一的DTO响应格式，包含success字段和userInfo对象
 
 6. **获取用户信息** - `GET /user/info`
    - 响应: `UserInfo`
@@ -300,36 +432,63 @@
    }
    ```
 
-3. **签到响应**
-   ```json
-   {
-     "success": boolean,    // 签到是否成功
-     "message": "string",  // 签到结果消息
-     "userInfo": {         // 更新后的用户信息
-       "id": number,
-       "name": "string",
-       "avatarUrl": "string",
-       "nickName": "string",
-       "phone": "string",
-       "role": "string",
-       "lastSignInTime": number
-     }
-   }
-   ```
+3. **签到响应（服务器DTO格式）**
+```json
+{
+  "success": true,
+  "userInfo": {
+    "id": 123,
+    "name": "张三",
+    "phone": "13800138000",
+    "role": "DELIVERY_PERSON"
+  },
+  "message": "签到成功"
+}
+```
+
+4. **前端转换后的签到响应格式**
+```json
+{
+  "success": true,       // 签到是否成功
+  "employeeInfo": {      // 员工信息
+    "id": number,
+    "name": "string",
+    "phone": "string",
+    "role": "string"
+  },
+  "message": "签到成功" // 签到结果消息
+}
+```
+
+5. **签退响应（服务器DTO格式）**
+```json
+{
+  "success": true,
+  "message": "签退成功"
+}
+```
+
+6. **前端转换后的签退响应格式**
+```json
+{
+  "success": true,       // 签退是否成功
+  "message": "签退成功" // 签退结果消息
+}
+```
+
+**重要说明**: 服务器现在采用统一的DTO响应格式，包含success字段和message字段。前端代码已适配新的DTO格式，直接使用服务器返回的success和message字段。签到和注册接口返回userInfo对象，前端转换为employeeInfo格式以保持兼容性。
 
 4. **注册响应**
    ```json
    {
      "success": boolean,    // 注册是否成功
-     "message": "string",  // 注册结果消息
      "userInfo": {         // 注册后的用户信息
        "id": number,
        "name": "string",
-       "avatarUrl": "string",
-       "nickName": "string",
        "phone": "string",
        "role": "string"
-     }
+     },
+     "message": "string"  // 注册结果消息
    }
    ```
 
diff --git a/backend-api.md b/backend-api.md
index 3e62419..686248a 100644
--- a/backend-api.md
+++ b/backend-api.md
@@ -72,7 +72,7 @@
     "id": 101,
     "name": "张师傅",
     "phone": "13812345678",
-    "avatarUrl": "/images/trucks.png",
+    "avatarUrl": "/images/truck.png",
     "status": "idle",
     "currentLocation": {
       "longitude": 102.714585,
diff --git a/miniprogram/app.json b/miniprogram/app.json
index f46db04..d76bcb4 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -3,7 +3,12 @@
     "pages/index/index",
     "pages/admin/admin",
     "pages/apply/apply",
-    "pages/employee/employee"
+    "pages/employee/employee",
+    "pages/staff/admin-dashboard",
+    "pages/staff/employee-dashboard",
+    "pages/staff/employee-management",
+    "pages/staff/order-management",
+    "pages/staff/warehouse-management"
   ],
   "requiredPrivateInfos": [
     "getLocation"
diff --git a/miniprogram/images/crown.png b/miniprogram/images/crown.png
index f737be68d36ada99a58aa8e1598c784f29472034..4c7fd172d94ff030a7cc7f3a8eebb5cc012f4ae5 100644
GIT binary patch
literal 2415
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

literal 1999
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
E0h7ytYXATM

diff --git a/miniprogram/images/truck.png b/miniprogram/images/truck.png
index f737be68d36ada99a58aa8e1598c784f29472034..e2a541792c0764c27fd0fa7aeaf3a4580f3ec657 100644
GIT binary patch
literal 23760
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
LNkvXXu0mjfiO;M=

literal 1999
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
E0h7ytYXATM

diff --git a/miniprogram/images/trucks.png b/miniprogram/images/trucks.png
deleted file mode 100644
index f737be68d36ada99a58aa8e1598c784f29472034..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1999
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
E0h7ytYXATM

diff --git a/miniprogram/pages/admin/admin.ts b/miniprogram/pages/admin/admin.ts
index 9f56d4d..76bca3f 100644
--- a/miniprogram/pages/admin/admin.ts
+++ b/miniprogram/pages/admin/admin.ts
@@ -195,9 +195,10 @@ Page({
   },
 
   // 获取员工状态对应的图标
-  getStaffStatusIcon(_status: string): string {
-    // 统一使用trucks.png作为货运人员图标
-    return '/images/trucks.png';
+  getStaffStatusIcon(staff: any): string {
+    // 根据员工角色返回不同的图标
+    const userRole = staff?.role || 'employee';
+    return userRole === 'ADMIN' ? '/images/crown.png' : '/images/truck.png';
   },
 
   // 获取状态文本
@@ -569,5 +570,17 @@ Page({
       const minute = date.getMinutes();
       return `${month}月${day}日 ${hour}:${minute < 10 ? '0' + minute : minute}`;
     }
+  },
+
+  // 返回上一页
+  goBack() {
+    // 尝试使用navigateBack，如果失败则使用redirectTo返回首页
+    wx.navigateBack({
+      fail: () => {
+        wx.redirectTo({
+          url: '/pages/index/index'
+        });
+      }
+    });
   }
 });
\ No newline at end of file
diff --git a/miniprogram/pages/admin/admin.wxml b/miniprogram/pages/admin/admin.wxml
index ad5f70c..a902cb6 100644
--- a/miniprogram/pages/admin/admin.wxml
+++ b/miniprogram/pages/admin/admin.wxml
@@ -2,7 +2,12 @@
 <view class="admin-container">
   <!-- 顶部导航栏 -->
   <view class="top-nav">
-    <text class="nav-title">配送管理系统</text>
+    <view class="header-left">
+      <view class="back-icon" bindtap="goBack">
+        <text class="back-arrow">‹</text>
+      </view>
+      <text class="nav-title">配送管理系统</text>
+    </view>
     <view class="user-info" wx:if="{{userInfo}}">
       <image class="user-avatar" src="/images/user-avatar.png" mode="aspectFill"></image>
       <text class="user-name">{{userInfo.name || '管理员'}}</text>
diff --git a/miniprogram/pages/admin/admin.wxss b/miniprogram/pages/admin/admin.wxss
index 2d1544a..669b34b 100644
--- a/miniprogram/pages/admin/admin.wxss
+++ b/miniprogram/pages/admin/admin.wxss
@@ -20,11 +20,39 @@
   box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
 }
 
+.header-left {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+}
+
 .nav-title {
   font-size: 36rpx;
   font-weight: bold;
 }
 
+/* 微信风格返回按钮 */
+.back-icon {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background-color: rgba(255, 255, 255, 0.2);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: background-color 0.3s;
+}
+
+.back-icon:active {
+  background-color: rgba(255, 255, 255, 0.4);
+}
+
+.back-arrow {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: white;
+}
+
 .user-info {
   display: flex;
   align-items: center;
diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts
index 42c3103..9b1c60d 100644
--- a/miniprogram/pages/index/index.ts
+++ b/miniprogram/pages/index/index.ts
@@ -1,34 +1,48 @@
 // index.ts
 
 // 引入服务和工具函数
-import { showToast } from '../../utils/helpers';
+
 import userService from '../../services/userService';
-import locationTrackingService from '../../services/locationTrackingService';
 
 // 引入主页面模块
 import { MainPageModule } from './modules/mainPageModule';
 
-// 主页面组件接口定义
-interface IndexPageComponent {
-  data: {
-    mainPageModule: MainPageModule | null;
-    // 核心UI状态
-    showUserPanel: boolean;
-    showOrderPanel: boolean;
-    showDeliveryPersonModal: boolean;
-    showWarehouseModal: boolean;
-  };
-}
+// 导入类型定义
+import { IndexPageComponent } from '../../types';
 
 // 主页面组件
-Component<IndexPageComponent>({
+Component<IndexPageComponent['data'], any, any, any, false>({
   data: {
-    mainPageModule: null as MainPageModule | null,
-    // 核心UI状态
+    longitude: 116.397428,
+    latitude: 39.90923,
+    scale: 16,
+    markers: [],
+    userInfo: null,
+    authStatus: {
+      hasWxCode: false,
+      userStatus: 'unknown'
+    },
     showUserPanel: false,
     showOrderPanel: false,
+    currentOrder: null,
+    currentDeliveryPerson: null,
+    currentWarehouse: null,
+    currentPanelPosition: { x: 0, y: 0 },
+    polyline: null,
+    pendingOrders: [],
+    currentRoute: null,
+    showRoute: false,
+    routeDistance: 0,
+    routeDuration: 0,
+    showWarehouseModal: false,
     showDeliveryPersonModal: false,
-    showWarehouseModal: false
+    warehouseModalState: 'bottom',
+    deliveryPersonModalState: 'bottom',
+    showSignOutButton: false,
+    showSignInButton: false,
+    showRegisterButton: false,
+    showAuthButton: true,
+// mainPageModule: null as MainPageModule | null
   },
 
   lifetimes: {
@@ -45,21 +59,21 @@ Component<IndexPageComponent>({
       }
     },
     
-    show() {
-      console.log('index page show');
-      // 页面显示时调用主页面模块的onShow方法
-      if (this.data.mainPageModule) {
-        this.data.mainPageModule.onShow();
-      }
-    },
+    // show() {
+    //   console.log('index page show');
+    //   // 页面显示时调用主页面模块的onShow方法
+    //   if (this.data.mainPageModule) {
+    //     this.data.mainPageModule.onShow();
+    //   }
+    // },
     
-    hide() {
-      console.log('index page hide');
-      // 页面隐藏时调用主页面模块的onHide方法
-      if (this.data.mainPageModule) {
-        this.data.mainPageModule.onHide();
-      }
-    }
+    // hide() {
+    //   console.log('index page hide');
+    //   // 页面隐藏时调用主页面模块的onHide方法
+    //   if (this.data.mainPageModule) {
+    //     this.data.mainPageModule.onHide();
+    //   }
+    // }
   },
 
   methods: {
@@ -82,26 +96,17 @@ Component<IndexPageComponent>({
 
     // 初始化页面
     async initPage() {
-      const app = getApp<any>();
-      
       // 初始化主页面模块
       this.setData({
         mainPageModule: new MainPageModule(this)
       });
       
-      // 设置globalData中的loginModule引用，用于废弃方法的重定向
-      if (this.data.mainPageModule) {
-        app.globalData.loginModule = this.data.mainPageModule.getLoginModule();
-      }
-      
       // 异步检查登录状态
       await this.checkAndUpdateLoginStatus();
     },
     
     // 异步检查并更新登录状态
     async checkAndUpdateLoginStatus() {
-      const app = getApp<any>();
-      
       try {
         // 获取登录模块
         if (!this.data.mainPageModule) {
@@ -154,7 +159,9 @@ Component<IndexPageComponent>({
     },
     
     // 异步检查登录状态
-    async asyncCheckLoginStatus(loginModule: any): Promise<boolean> {
+      async asyncCheckLoginStatus(loginModule: any): Promise<boolean> {
+        getApp<any>();
+      
       const app = getApp<any>();
       
       // 首先检查本地是否有登录状态
@@ -181,9 +188,11 @@ Component<IndexPageComponent>({
       try {
         const loginResult = await userService.wxLogin();
         if (loginResult.success && loginResult.userInfo) {
-          // 登录成功，更新全局用户信息
-          app.globalData.userInfo = loginResult.userInfo;
-          app.globalData.isLoggedIn = true;
+          const app = getApp<any>();
+        
+        // 登录成功，更新全局用户信息
+        app.globalData.userInfo = loginResult.userInfo;
+        app.globalData.isLoggedIn = true;
           
           // 登录成功后，此时已经有token，可以安全获取用户状态
           const userStatus = await loginModule.determineUserStatus(loginResult.userInfo);
@@ -243,18 +252,19 @@ Component<IndexPageComponent>({
     },
     
     // 登录成功后统一刷新页面
-    async refreshPageAfterLogin() {
-      if (!this.data.mainPageModule) {
-        console.error('mainPageModule未初始化');
-        return;
-      }
-      
-      const loginModule = this.data.mainPageModule.getLoginModule();
-      const app = getApp<any>();
+      async refreshPageAfterLogin() {
+        if (!this.data.mainPageModule) {
+          console.error('mainPageModule未初始化');
+          return;
+        }
+        
+        const loginModule = this.data.mainPageModule.getLoginModule();
+        getApp<any>();
       
       console.log('🔄 === 全局登录流程完成，执行统一页面刷新 ===');
       
       // 1. 更新页面登录状态
+      const app = getApp<any>();
       loginModule.updatePageAfterLogin(app.globalData.userInfo);
       
       // 2. 更新按钮显示状态
@@ -265,7 +275,7 @@ Component<IndexPageComponent>({
       
       // 4. 登录成功后只加载公开数据（仓库等），不加载业务数据
       // 业务数据（员工位置等）只有在用户签到后才应该加载
-      if (app.globalData.isLoggedIn) {
+      if (app.globalData.isLoggedIn && this.data.authStatus.userStatus === 'signed_in') {
         console.log('🔍 登录成功，开始加载公开数据...');
         await this.data.mainPageModule.loadPublicData();
         console.log('✅ 公开数据加载完成');
@@ -307,6 +317,8 @@ Component<IndexPageComponent>({
       }
     },
 
+
+
     // 处理授权登录 - 已迁移到LoginModule
     async handleAuthLogin() {
       if (!this.data.mainPageModule) {
@@ -335,107 +347,24 @@ Component<IndexPageComponent>({
       }
     },
     
-    // 处理退出登录
-    async handleLogout() {
-      try {
-        wx.showLoading({
-          title: '正在退出...',
-          mask: true
-        });
-        
-        // 调用loginModule的logout方法
-        if (!this.data.mainPageModule) {
-          console.error('mainPageModule未初始化');
-          return;
-        }
-        const loginModule = this.data.mainPageModule.getLoginModule();
-        await loginModule.logout();
-        
-        // 更新页面状态
-        this.setData({
-          userInfo: null,
-          'authStatus.hasWxCode': false,
-          'authStatus.userStatus': 'unknown',
-          showUserPanel: false
-        });
-        
+
+    
+    // 处理签退 - 已迁移到LoginModule
+    async handleSignOut() {
+      if (!this.data.mainPageModule) {
+        console.error('mainPageModule未初始化');
+        return;
+      }
+      
+      const loginModule = this.data.mainPageModule.getLoginModule();
+      const success = await loginModule.handleSignOut();
+      
+      if (success) {
         // 更新按钮显示状态
         this.updateButtonDisplayStatus();
         
-        wx.hideLoading();
-        showToast('已退出登录');
-        console.log('用户已退出登录');
-      } catch (error) {
-        wx.hideLoading();
-        console.error('退出登录失败:', error);
-        showToast('退出登录失败');
-      }
-    },
-    
-    // 处理签退
-    async handleSignOut() {
-      try {
-        console.log('调试信息 - 开始执行签退流程');
-        wx.showLoading({
-          title: '正在签退...',
-          mask: true
-        });
-        
-        // 停止位置追踪服务
-        try {
-          await locationTrackingService.stopTracking();
-          console.log('调试信息 - 位置追踪服务已停止');
-        } catch (trackingError) {
-          console.warn('调试信息 - 停止位置追踪失败:', trackingError);
-        }
-        
-        // 停止位置模块的实时跟踪
-        try {
-          if (this.data.mainPageModule) {
-            const locationModule = this.data.mainPageModule.getLocationModule();
-            if (locationModule) {
-              await locationModule.stopRealTimeTracking();
-              console.log('调试信息 - 位置模块实时跟踪已停止');
-            }
-          }
-        } catch (trackingError) {
-          console.warn('调试信息 - 停止位置模块实时跟踪失败:', trackingError);
-        }
-        
-        // 保存签退状态到本地存储，防止自动重新登录
-        console.log('调试信息 - 保存签退状态到本地存储');
-        wx.setStorageSync('userStatus', 'signed_out');
-        
-        // 验证签退状态是否保存成功
-        const savedStatus = wx.getStorageSync('userStatus');
-        console.log('调试信息 - 验证保存的签退状态:', savedStatus);
-        
-        // 更新用户状态为已签退（不调用doGlobalLogout，保持登录状态）
-        this.setData({
-          'authStatus.userStatus': 'signed_out',
-          showSignOutButton: false,
-          showSignInButton: true
-        });
-        
-        // 清除所有员工图标
-        if (this.data.mainPageModule) {
-          const employeeModule = this.data.mainPageModule.getEmployeeModule();
-          if (employeeModule) {
-            // 清除员工标记点
-            const { markers } = this.data;
-            const filteredMarkers = markers.filter((marker: any) => marker.type !== 'employee');
-            this.setData({ markers: filteredMarkers });
-            console.log('调试信息 - 已清除所有员工图标');
-          }
-        }
-        
-        wx.hideLoading();
-        showToast('签退成功');
-        console.log('调试信息 - 用户签退完成');
-      } catch (error) {
-        wx.hideLoading();
-        console.error('调试信息 - 签退失败:', error);
-        showToast('签退失败');
+        // 刷新页面数据
+        await this.data.mainPageModule.refreshAllData();
       }
     },
     
@@ -503,6 +432,26 @@ Component<IndexPageComponent>({
       this.setData({ showUserPanel: true });
     },
 
+    // 跳转到管理界面（基于用户角色）
+    goToManagementPage() {
+      if (this.data.userInfo && this.data.userInfo.role) {
+        if (this.data.userInfo.role === 'ADMIN') {
+          // 管理员跳转到管理员界面 - 使用navigateTo保持当前页面状态
+          wx.navigateTo({
+            url: '/pages/staff/admin-dashboard'
+          });
+        } else {
+          // 员工跳转到员工界面 - 使用navigateTo保持当前页面状态
+          wx.navigateTo({
+            url: '/pages/staff/employee-dashboard'
+          });
+        }
+      } else {
+        // 未登录用户显示用户面板
+        this.setData({ showUserPanel: true });
+      }
+    },
+
     // 隐藏用户面板
     hideUserPanel() {
       this.setData({ showUserPanel: false });
diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml
index 2e112da..f71459b 100644
--- a/miniprogram/pages/index/index.wxml
+++ b/miniprogram/pages/index/index.wxml
@@ -16,7 +16,7 @@
 
   <!-- 右侧控制按钮组 -->
   <view class="right-controls-container">
-    <!-- 签到、注册、授权登录按钮 -->
+    <!-- 签到/签退按钮 -->
     <view class="auth-buttons">
       <!-- 签到按钮 - 已授权用户 -->
       <button 
@@ -30,30 +30,6 @@
         <text class="btn-text">签到</text>
       </button>
       
-      <!-- 注册按钮 - 游客用户 -->
-      <button 
-        wx:if="{{showRegisterButton}}" 
-        class="control-btn register-btn" 
-        bindtap="showApplyForm" 
-        type="default" 
-        size="mini"
-      >
-        <text class="btn-icon">📝</text>
-        <text class="btn-text">注册</text>
-      </button>
-      
-      <!-- 授权登录按钮 - 未授权用户 -->
-      <button 
-        wx:if="{{showAuthButton}}" 
-        class="control-btn auth-btn" 
-        bindtap="handleAuthLogin" 
-        type="warn" 
-        size="mini"
-      >
-        <text class="btn-icon">🔑</text>
-        <text class="btn-text">登录</text>
-      </button>
-      
       <!-- 签退按钮 - 已签到用户 -->
       <button 
         wx:if="{{showSignOutButton}}" 
@@ -76,21 +52,15 @@
     </view>
     
     <!-- 用户头像 -->
-    <view wx:if="{{authStatus.hasWxCode}}" 
+    <view wx:if="{{authStatus.hasWxCode && authStatus.userStatus === 'signed_in'}}" 
           class="control-btn reset-btn"
-          bindtap="showUserPanel">
+          bindtap="goToManagementPage">
       <text class="btn-icon">👤</text>
       <text class="btn-text">我的</text>
       <view wx:if="{{userInfo.role === 'ADMIN'}}" class="admin-badge"/>
     </view>
     
-    <!-- 员工管理按钮（仅管理员可见） -->
-    <view wx:if="{{authStatus.hasWxCode && userInfo.role === 'ADMIN'}}" 
-          class="control-btn staff-management-btn"
-          bindtap="goToEmployeeManagement">
-      <text class="btn-icon">👥</text>
-      <text class="btn-text">员工</text>
-    </view>
+
   </view>
   
 <!-- 用户信息面板 -->
@@ -103,7 +73,7 @@
     <view class="user-panel-content" bindtap="stopPropagation">
       <view class="user-avatar">
         <image 
-          src="/images/trucks.png"
+          src="/images/truck.png"
           mode="aspectFill"
           class="avatar-image"
         ></image>
@@ -114,9 +84,6 @@
         <text class="user-id">ID: {{userInfo.id || '未获取'}}</text>
         <text class="user-phone">电话：{{userInfo.phone || '未设置'}}</text>
         <text class="user-role">角色：{{userInfo.role === 'ADMIN' ? '管理员' : '货运员'}}</text>
-        
-        <!-- 退出后台代码 -->
-        <button class="btn-logout" bindtap="handleLogout" size="mini">退出登录</button>
       </view>
     </view>
   </view>
@@ -257,7 +224,7 @@
       <view class="modal-header">
         <view class="delivery-person-header">
           <view class="delivery-person-avatar">
-            <image src="{{currentDeliveryPerson.avatarUrl || '/images/trucks.png'}}" mode="aspectFill"></image>
+            <image src="{{currentDeliveryPerson.avatarUrl || '/images/truck.png'}}" mode="aspectFill"></image>
           </view>
           <view class="person-info-header">
             <view class="modal-title">{{currentDeliveryPerson.name}}</view>
diff --git a/miniprogram/pages/index/modules/dataModule.ts b/miniprogram/pages/index/modules/dataModule.ts
index 13222b3..0386b6b 100644
--- a/miniprogram/pages/index/modules/dataModule.ts
+++ b/miniprogram/pages/index/modules/dataModule.ts
@@ -148,12 +148,16 @@ export class DataModule {
       this.updateMarkers(updatedMarkers);
     } else {
       // 创建新的用户标记点
+      const userInfo = this.pageContext.data.userInfo;
+      const userRole = userInfo?.role || 'employee';
+      const iconPath = userRole === 'ADMIN' ? '/images/crown.png' : '/images/truck.png';
+      
       const newUserMarker = {
         id: targetUserId,
         title: markerTitle,
         longitude: longitude,
         latitude: latitude,
-        iconPath: '/images/trucks.png',
+        iconPath: iconPath,
         width: 40,
         height: 40,
         zIndex: targetUserId === -1 ? 99 : 98 // 当前用户层级更高
diff --git a/miniprogram/pages/index/modules/deliveryPersonModule.ts b/miniprogram/pages/index/modules/deliveryPersonModule.ts
index 0a03e54..491e2c4 100644
--- a/miniprogram/pages/index/modules/deliveryPersonModule.ts
+++ b/miniprogram/pages/index/modules/deliveryPersonModule.ts
@@ -1,6 +1,6 @@
 // 员工模块 - 处理所有员工（管理员和货运人员）管理、位置跟踪、交互
 import employeeService from '../../../services/employeeService';
-import { Role } from '../../../utils/roleUtils';
+
 // getApp是微信小程序全局函数，无需导入
 
 import { showToast } from '../../../utils/helpers';
@@ -30,37 +30,7 @@ export class EmployeeModule {
     }
   }
 
-  /**
-   * 获取员工角色对应的图标
-   */
-  private getEmployeeIcon(role: string): string {
-    console.log(`获取员工图标，角色: ${role}`);
-    
-    // 根据角色使用不同的图标
-    let iconPath = '';
-    
-    switch (role) {
-      case Role.ADMIN:
-        // 管理员使用皇冠图标
-        iconPath = '/images/crown.png'; 
-        console.log('使用管理员图标（👑）');
-        break;
-      case Role.DELIVERY_PERSON:
-        // 货运人员使用货车图标
-        iconPath = '/images/truck.png';
-        console.log('使用货运人员图标（🚚）');
-        break;
-      default:
-        // 默认使用货车图标
-        iconPath = '/images/truck.png';
-        console.log('使用默认图标（🚚）');
-        break;
-    }
-    
-    console.log(`最终使用图标路径: ${iconPath}`);
-    
-    return iconPath;
-  }
+
   
   /**
    * 显示货运人员详情面板
diff --git a/miniprogram/pages/index/modules/locationModule.ts b/miniprogram/pages/index/modules/locationModule.ts
index 41cf950..f84c305 100644
--- a/miniprogram/pages/index/modules/locationModule.ts
+++ b/miniprogram/pages/index/modules/locationModule.ts
@@ -1,8 +1,7 @@
 // 位置模块 - 处理位置追踪、位置更新和地图标记点更新
-import { DataModule } from './dataModule';
 import { showToast } from '../../../utils/helpers';
-import  locationTrackingService  from '../../../services/locationTrackingService';
-import { OnlineUserInfo } from '../../../services/locationTrackingService';
+import { DataModule } from './dataModule';
+import locationTrackingService from '../../../services/locationTrackingService';
 
 // 位置模块接口定义
 export interface LocationModule {
@@ -10,21 +9,15 @@ export interface LocationModule {
   cleanup(): void;
   startRealTimeTracking(): Promise<void>;
   stopRealTimeTracking(): Promise<void>;
-  updateEmployeeLocation(employeeId: number, location: { longitude: number, latitude: number }): Promise<void>;
 }
 
 export class LocationModule {
-  private pageContext: any;
   private dataModule: DataModule;
   private isTracking: boolean;
   
-  constructor(pageContext: any, dataModule: DataModule) {
-    this.pageContext = pageContext;
+  constructor(_pageContext: any, dataModule: DataModule) {
     this.dataModule = dataModule;
     this.isTracking = false;
-    
-    // 绑定回调方法
-    this.handleLocationUpdates = this.handleLocationUpdates.bind(this);
   }
   
   /**
@@ -33,10 +26,28 @@ export class LocationModule {
   async initialize(): Promise<void> {
     console.log('位置模块初始化');
     
-    // 订阅位置更新
-    this.subscribeToLocationUpdates();
+    // 注册位置更新回调，当位置追踪服务有更新时自动刷新地图标记
+    this.setupLocationUpdateCallback();
+ 
+    console.log('✅ 位置模块初始化完成');
+  }
+
+  /**
+   * 设置位置更新回调
+   */
+  private setupLocationUpdateCallback(): void {
+    console.log('📝 [LocationModule] 设置位置更新回调');
     
-    console.log('位置模块初始化完成');
+    // 注册位置更新回调
+    locationTrackingService.subscribeToLocationUpdates((onlineUsers) => {
+      console.log('🔔 [LocationModule] 收到位置更新通知');
+      console.log('👥 [LocationModule] 在线用户数量:', onlineUsers.length);
+      
+      // 调用updateEmployeeMarkers方法更新地图标记
+      this.updateEmployeeMarkers(onlineUsers);
+    });
+    
+    console.log('✅ [LocationModule] 位置更新回调设置完成');
   }
   
   /**
@@ -44,16 +55,15 @@ export class LocationModule {
    */
   cleanup(): void {
     console.log('清理位置模块');
-    
-    // 取消位置更新订阅
-    this.unsubscribeFromLocationUpdates();
-    
+
     // 停止实时跟踪
     if (this.isTracking) {
       this.stopRealTimeTracking().catch(error => {
         console.error('停止实时跟踪失败:', error);
       });
     }
+    
+    console.log('✅ 位置模块清理完成');
   }
   
   /**
@@ -67,8 +77,8 @@ export class LocationModule {
         throw new Error('用户信息获取失败');
       }
       
-      // 启动位置跟踪订阅
-      await locationTrackingService.startTrackingAfterSignIn();
+      // 启动位置跟踪订阅（WebSocket连接）
+      await locationTrackingService.startTracking();
       
       this.isTracking = true;
       showToast('已开始实时跟踪');
@@ -104,74 +114,13 @@ export class LocationModule {
     }
   }
   
-  /**
-   * 更新员工位置
-   */
-  async updateEmployeeLocation(employeeId: number, location: { longitude: number, latitude: number }): Promise<void> {
-    try {
-      console.log(`员工 ${employeeId} 位置更新:`, location);
-      
-      // 通过locationTrackingService更新位置
-      await locationTrackingService.updateUserLocation(location);
-      
-      console.log(`员工 ${employeeId} 位置更新完成`);
-    } catch (error) {
-      console.error('更新员工位置失败:', error);
-      showToast('更新位置失败');
-      throw error;
-    }
-  }
-  
-  /**
-   * 订阅位置更新
-   */
-  private subscribeToLocationUpdates(): void {
-    console.log('订阅位置更新');
-    locationTrackingService.subscribeToLocationUpdates(this.handleLocationUpdates);
-  }
-  
-  /**
-   * 取消订阅位置更新
-   */
-  private unsubscribeFromLocationUpdates(): void {
-    console.log('取消订阅位置更新');
-    locationTrackingService.unsubscribeFromLocationUpdates(this.handleLocationUpdates);
-  }
-  
-  /**
-   * 处理位置更新回调
-   */
-  private handleLocationUpdates(locationData: any): void {
-    console.log('🔔 [LocationModule] 收到位置更新回调');
-    console.log('📊 [LocationModule] 回调数据类型:', locationData.type || '未知类型');
-    console.log('📋 [LocationModule] 回调数据内容:', JSON.stringify(locationData, null, 2));
-    
-    if (locationData.type === 'onlineUserList' && locationData.users) {
-      // 处理在线用户列表更新
-      console.log('👥 [LocationModule] 处理在线用户列表，用户数量:', locationData.users.length);
-      this.updateEmployeeMarkers(locationData.users);
-    } else if (Array.isArray(locationData)) {
-      // 处理位置更新数组（旧格式）
-      console.log('📋 [LocationModule] 处理位置更新数组，用户数量:', locationData.length);
-      this.updateEmployeeMarkers(locationData);
-    } else if (locationData.userId && locationData.latitude && locationData.longitude) {
-      // 处理单个用户位置更新
-      console.log('👤 [LocationModule] 处理单个用户位置更新:', locationData.userId);
-      this.updateSingleEmployeeMarker(locationData);
-    } else {
-      console.warn('❌ [LocationModule] 未知的位置数据格式:', locationData);
-    }
-    
-    console.log('🏁 [LocationModule] 位置更新回调处理完成');
-  }
-  
+
   /**
    * 更新员工标记点
    */
-  private updateEmployeeMarkers(onlineUsers: any[]): void {
+  public updateEmployeeMarkers(onlineUsers: any[]): void {
     console.log('📍 [LocationModule] 开始更新员工标记点');
     console.log('👥 [LocationModule] 传入用户数量:', onlineUsers.length);
-    console.log('📋 [LocationModule] 用户数据示例:', JSON.stringify(onlineUsers[0], null, 2));
     
     // 获取地图模块来更新标记点
     const mapModule = this.dataModule.getMapModule();
@@ -180,8 +129,13 @@ export class LocationModule {
       return;
     }
     
+    // 获取当前地图上的所有标记点
+    const { markers } = this.dataModule.getData();
+    const currentEmployeeMarkers = markers.filter((marker: any) => marker.type === 'employee');
+    console.log('🗺️ [LocationModule] 当前地图上员工标记点数量:', currentEmployeeMarkers.length);
+    
     // 为每个在线用户创建标记点
-    const employeeMarkers = onlineUsers.map((user, index) => {
+    const newEmployeeMarkers = onlineUsers.map((user, index) => {
       console.log(`🔍 [LocationModule] 处理第 ${index + 1} 个用户:`, user.userId || '未知ID');
       
       // 获取用户角色信息
@@ -215,55 +169,94 @@ export class LocationModule {
       return employeeMarker;
     });
     
-    console.log('📍 [LocationModule] 生成标记点数量:', employeeMarkers.length);
-    console.log('📋 [LocationModule] 标记点数据示例:', JSON.stringify(employeeMarkers[0], null, 2));
+    console.log('📍 [LocationModule] 新生成标记点数量:', newEmployeeMarkers.length);
     
-    // 调用地图模块更新员工标记点
-    mapModule.updateEmployeeMarkers(employeeMarkers);
+    // 对比新旧标记点，精确更新
+    this.updateMarkersPrecisely(mapModule, currentEmployeeMarkers, newEmployeeMarkers);
     
     console.log('✅ [LocationModule] 员工标记点更新完成');
   }
 
   /**
-   * 更新单个员工标记点
+   * 精确更新标记点 - 通过对比新旧标记点来添加、更新和删除
    */
-  private updateSingleEmployeeMarker(locationUpdate: any): void {
-    console.log('更新单个员工标记点:', locationUpdate.userId);
+  private updateMarkersPrecisely(mapModule: any, currentMarkers: any[], newMarkers: any[]): void {
+    console.log('🎯 [LocationModule] 开始精确更新标记点');
     
-    // 获取地图模块
-    const mapModule = this.dataModule.getMapModule();
-    if (!mapModule) {
-      console.error('地图模块未找到，无法更新员工标记点');
-      return;
-    }
-    
-    // 获取用户角色信息
-    const userRole = this.getUserRole(locationUpdate.userId);
-    
-    // 创建单个员工标记点
-    const employeeMarker = {
-      id: 10000 + locationUpdate.userId,
-      type: 'employee',
-      title: `员工${locationUpdate.userId}`,
-      longitude: locationUpdate.longitude,
-      latitude: locationUpdate.latitude,
-      iconPath: this.getEmployeeIcon(locationUpdate.userId, userRole),
-      width: 32,
-      height: 32,
-      zIndex: 30,
-      data: {
-        userId: locationUpdate.userId,
-        role: userRole,
-        lastUpdateTime: locationUpdate.timestamp || Date.now()
+    // 创建用户ID到标记点的映射
+    const currentMarkerMap = new Map();
+    currentMarkers.forEach(marker => {
+      if (marker.data && marker.data.userId) {
+        currentMarkerMap.set(marker.data.userId, marker);
       }
-    };
+    });
     
-    // 调用地图模块更新单个标记点
-    mapModule.updateSingleEmployeeMarker(employeeMarker);
+    const newMarkerMap = new Map();
+    newMarkers.forEach(marker => {
+      if (marker.data && marker.data.userId) {
+        newMarkerMap.set(marker.data.userId, marker);
+      }
+    });
     
-    console.log('单个员工标记点更新完成');
+    console.log('📊 [LocationModule] 当前标记点用户ID:', Array.from(currentMarkerMap.keys()));
+    console.log('📊 [LocationModule] 新标记点用户ID:', Array.from(newMarkerMap.keys()));
+    
+    // 找出需要删除的标记点（在当前但不在新的）
+    const markersToRemove = currentMarkers.filter(marker => {
+      if (marker.data && marker.data.userId) {
+        return !newMarkerMap.has(marker.data.userId);
+      }
+      return false;
+    });
+    
+    // 找出需要添加的标记点（在新的但不在当前的）
+    const markersToAdd = newMarkers.filter(marker => {
+      if (marker.data && marker.data.userId) {
+        return !currentMarkerMap.has(marker.data.userId);
+      }
+      return false;
+    });
+    
+    // 找出需要更新的标记点（位置或信息有变化）
+    const markersToUpdate = newMarkers.filter(marker => {
+      if (marker.data && marker.data.userId) {
+        const currentMarker = currentMarkerMap.get(marker.data.userId);
+        if (currentMarker) {
+          // 检查位置是否变化
+          return currentMarker.longitude !== marker.longitude || 
+                 currentMarker.latitude !== marker.latitude ||
+                 currentMarker.title !== marker.title ||
+                 currentMarker.iconPath !== marker.iconPath;
+        }
+      }
+      return false;
+    });
+    
+    console.log(`🗑️ [LocationModule] 需要删除的标记点数量: ${markersToRemove.length}`);
+    console.log(`➕ [LocationModule] 需要添加的标记点数量: ${markersToAdd.length}`);
+    console.log(`🔄 [LocationModule] 需要更新的标记点数量: ${markersToUpdate.length}`);
+    
+    // 执行删除操作
+    markersToRemove.forEach(marker => {
+      console.log(`🗑️ [LocationModule] 删除标记点: 用户 ${marker.data.userId}`);
+      mapModule.removeEmployeeMarker(marker.id);
+    });
+    
+    // 执行添加操作
+    markersToAdd.forEach(marker => {
+      console.log(`➕ [LocationModule] 添加标记点: 用户 ${marker.data.userId}`);
+      mapModule.addEmployeeMarker(marker);
+    });
+    
+    // 执行更新操作
+    markersToUpdate.forEach(marker => {
+      console.log(`🔄 [LocationModule] 更新标记点: 用户 ${marker.data.userId}`);
+      mapModule.updateSingleEmployeeMarker(marker);
+    });
+    
+    console.log('🎯 [LocationModule] 精确更新标记点完成');
   }
-  
+
   /**
    * 获取用户角色
    */
@@ -281,12 +274,14 @@ export class LocationModule {
   /**
    * 获取员工图标
    */
-  private getEmployeeIcon(userId: number, userRole: string): string {
+  private getEmployeeIcon(_userId: number, userRole: string): string {
     // 根据用户角色返回不同的图标
     if (userRole === 'ADMIN') {
       return '/images/crown.png'; // 管理员图标
+    } else if (userRole === 'DRIVER') {
+      return '/images/truck.png'; // 司机图标
     } else {
-      return '/images/trucks.png'; // 货运人员图标
+      return '👤'; // 普通员工图标（表情符号）
     }
   }
 }
\ No newline at end of file
diff --git a/miniprogram/pages/index/modules/loginModule.ts b/miniprogram/pages/index/modules/loginModule.ts
index 4cbc267..990d3cf 100644
--- a/miniprogram/pages/index/modules/loginModule.ts
+++ b/miniprogram/pages/index/modules/loginModule.ts
@@ -183,6 +183,71 @@ export class LoginModule {
     });
   }
 
+  /**
+   * 处理签退流程
+   */
+  public async handleSignOut(): Promise<boolean> {
+    try {
+      // 显示加载中提示
+      wx.showLoading({
+        title: '签退中...',
+      });
+      
+      // 调用签退接口
+      const signOutResult = await userService.signOut();
+      
+      wx.hideLoading();
+      
+      if (signOutResult.success) {
+        console.log('签退成功:', signOutResult);
+        wx.showToast({
+          title: '签退成功',
+          icon: 'success',
+          duration: 2000
+        });
+        
+        // 停止位置追踪服务
+        try {
+          await locationTrackingService.stopTracking();
+          console.log('位置追踪服务已停止');
+        } catch (trackingError) {
+          console.warn('停止位置追踪失败，但不影响签退:', trackingError);
+        }
+        
+        // 设置用户状态为已签退
+        if (this.pageContext && this.pageContext.setData) {
+          this.pageContext.setData({
+            'authStatus.userStatus': 'signed_out'
+          });
+          
+          // 更新按钮显示状态
+          if (this.pageContext.updateButtonDisplayStatus) {
+            this.pageContext.updateButtonDisplayStatus();
+          }
+        }
+        
+        return true;
+      } else {
+        console.warn('签退失败:', signOutResult.message);
+        wx.showToast({
+          title: signOutResult.message || '签退失败',
+          icon: 'none',
+          duration: 2000
+        });
+        return false;
+      }
+    } catch (error) {
+      console.error('签退过程中发生错误:', error);
+      wx.hideLoading();
+      wx.showToast({
+        title: '签退失败，请重试',
+        icon: 'none',
+        duration: 2000
+      });
+      return false;
+    }
+  }
+
   /**
    * 处理签到流程
    */
@@ -248,37 +313,11 @@ export class LoginModule {
           }
         }
         
-        // 启动位置追踪服务
+        // 启动位置追踪服务（WebSocket连接）
         try {
-          // 先启动位置追踪服务
-          await locationTrackingService.startTrackingAfterSignIn();
+          // 启动位置追踪服务（建立WebSocket连接）
+          await locationTrackingService.startTracking();
           console.log('位置追踪服务已启动');
-          
-          // 然后调用位置模块的实时跟踪功能
-          const locationModule = this.dataModule.getLocationModule();
-          if (locationModule) {
-            await locationModule.startRealTimeTracking();
-            console.log('位置模块实时跟踪已启动');
-          }
-          
-          // 订阅位置更新回调，采用统一方式更新所有用户位置
-          locationTrackingService.subscribeToLocationUpdates((onlineUsers) => {
-            console.log('🚚 位置更新回调 - 在线用户列表已更新，用户数量:', onlineUsers.length);
-            
-            // 统一更新所有在线用户的位置标记点
-            onlineUsers.forEach(user => {
-              if (user.lastLocation) {
-                console.log(`📍 更新用户 ${user.userId} 标记点位置:`, user.lastLocation);
-                // 统一调用数据模块更新用户标记点位置
-                this.dataModule.updateUserMarkerPosition(
-                  user.lastLocation.longitude, 
-                  user.lastLocation.latitude,
-                  user.userId
-                );
-              }
-            });
-          });
-          
         } catch (trackingError) {
           console.warn('启动位置追踪失败，但不影响签到:', trackingError);
         }
@@ -355,23 +394,6 @@ export class LoginModule {
       userInfo.role !== 'GUEST'
     );
     
-    // 调试信息：打印不满足条件的原因
-    if (!result) {
-      console.log('签到按钮不显示原因:');
-      if (!authStatus.hasWxCode) console.log('  - 未获取微信code');
-      if (authStatus.userStatus === 'signed_in') console.log('  - 用户状态为已签到');
-      if (authStatus.userStatus === 'unregistered') console.log('  - 用户状态为未注册');
-      if (userInfo === null) console.log('  - 用户信息为空');
-      if (userInfo && userInfo.role === 'GUEST') console.log('  - 用户角色为游客');
-      console.log('当前状态:', { 
-        hasWxCode: authStatus.hasWxCode, 
-        userStatus: authStatus.userStatus,
-        userInfo: userInfo ? { role: userInfo.role } : null 
-      });
-    } else {
-      console.log('签到按钮显示条件满足');
-    }
-    
     return result;
   }
 
@@ -392,21 +414,7 @@ export class LoginModule {
       userInfo.role === 'GUEST'
     );
     
-    // 调试信息：打印不满足条件的原因
-    if (!result) {
-      console.log('注册按钮不显示原因:');
-      if (!authStatus.hasWxCode) console.log('  - 未获取微信code');
-      if (authStatus.userStatus !== 'unregistered') console.log(`  - 用户状态为${authStatus.userStatus}，不是未注册`);
-      if (userInfo === null) console.log('  - 用户信息为空');
-      if (userInfo && userInfo.role !== 'GUEST') console.log(`  - 用户角色为${userInfo.role}，不是游客`);
-      console.log('当前状态:', { 
-        hasWxCode: authStatus.hasWxCode, 
-        userStatus: authStatus.userStatus,
-        userInfo: userInfo ? { role: userInfo.role } : null 
-      });
-    } else {
-      console.log('注册按钮显示条件满足');
-    }
+    // 调试信息已删除
     
     return result;
   }
diff --git a/miniprogram/pages/index/modules/mainPageModule.ts b/miniprogram/pages/index/modules/mainPageModule.ts
index 26b65ca..fa95e07 100644
--- a/miniprogram/pages/index/modules/mainPageModule.ts
+++ b/miniprogram/pages/index/modules/mainPageModule.ts
@@ -23,13 +23,13 @@ export interface MainPageModule {
 
 export class MainPageModule {
   private pageContext: any;
+  private dataModule: DataModule;
   private loginModule: LoginModule;
   private mapModule: MapModule;
   private orderModule: OrderModule;
   private warehouseModule: WarehouseModule;
   private employeeModule: EmployeeModule;
   private locationModule: LocationModule;
-  private dataModule: DataModule;
   
   constructor(pageContext: any) {
     this.pageContext = pageContext;
@@ -198,13 +198,15 @@ export class MainPageModule {
    * 重置用户标记点
    */
   private resetUserMarker(): void {
-    const { markers } = this.pageContext.data;
+    const { markers, userInfo } = this.pageContext.data;
+    const userRole = userInfo?.role || 'employee';
+    const iconPath = userRole === 'ADMIN' ? '/images/crown.png' : '/images/truck.png';
     
     const updatedMarkers = markers.map((marker: any) => {
       if (marker.id === -1) {
         return {
           ...marker,
-          iconPath: '/images/trucks.png'
+          iconPath: iconPath
         };
       }
       return marker;
@@ -334,6 +336,19 @@ export class MainPageModule {
     }
   }
   
+  /**
+   * 清理资源
+   */
+  cleanup(): void {
+    console.log('清理主页面模块资源');
+    
+    // 清理位置模块
+    this.locationModule.cleanup();
+    
+    // 这里可以添加其他需要清理的资源
+    console.log('✅ 主页面模块清理完成');
+  }
+  
   /**
    * 处理错误
    */
diff --git a/miniprogram/pages/index/modules/mapModule.ts b/miniprogram/pages/index/modules/mapModule.ts
index 492e868..6551e65 100644
--- a/miniprogram/pages/index/modules/mapModule.ts
+++ b/miniprogram/pages/index/modules/mapModule.ts
@@ -171,55 +171,17 @@ export class MapModule {
     
     const markers: Marker[] = [];
     
-    // 获取用户位置
-    const userLocation = this.pageContext.data.userLocation;
-    if (userLocation && userLocation.longitude && userLocation.latitude) {
-      // 添加用户位置标记点
-      markers.push({
-        id: -1,
-        title: '用户位置',
-        longitude: userLocation.longitude,
-        latitude: userLocation.latitude,
-        iconPath: '/images/trucks.png',
-        width: 40,
-        height: 40,
-        zIndex: 99
-      });
-      
-      console.log('已添加用户位置标记点');
-    }
+    // 地图自带用户位置显示功能，无需手动添加用户位置标记点
     
     return markers;
   }
   
   /**
    * 更新用户标记图标为用户头像
+   * 注意：由于地图自带用户位置显示功能，此方法已不再需要
    */
   updateUserMarkerIcon(): void {
-    const { authStatus, userInfo, markers } = this.pageContext.data;
-    
-    if (!authStatus.hasWxCode || !userInfo) {
-      console.warn('未登录或用户信息为空，无法更新头像');
-      return;
-    }
-    
-    // 使用默认头像
-    const avatarUrl = '/images/trucks.png';
-    
-    const updatedMarkers = markers.map((marker: Marker) => {
-      if (marker.id === -1) {
-        return {
-          ...marker,
-          iconPath: avatarUrl
-        };
-      }
-      return marker;
-    });
-    
-    // 更新数据模块中的标记点
-    this.dataModule.updateMarkers(updatedMarkers);
-    
-    console.log('用户头像已更新');
+    console.log('地图自带用户位置显示功能，无需更新用户标记图标');
   }
   
   /**
@@ -244,6 +206,91 @@ export class MapModule {
     console.log('员工标记点更新完成，总标记点数量:', updatedMarkers.length);
   }
 
+  /**
+   * 清除所有员工标记点
+   */
+  clearEmployeeMarkers(): void {
+    console.log('开始清除所有员工标记点');
+    
+    const { markers } = this.pageContext.data;
+    
+    // 过滤掉员工标记点，只保留其他类型的标记点
+    const filteredMarkers = markers.filter((marker: any) => 
+      marker.type !== 'employee'
+    );
+    
+    // 更新数据模块中的标记点
+    this.dataModule.updateMarkers(filteredMarkers);
+    
+    console.log('员工标记点清除完成，剩余标记点数量:', filteredMarkers.length);
+  }
+
+  /**
+   * 删除单个员工标记点
+   */
+  removeEmployeeMarker(markerId: number): void {
+    console.log('删除单个员工标记点:', markerId);
+    
+    const { markers } = this.pageContext.data;
+    
+    // 只删除员工类型的标记点，避免误删其他类型标记点
+    const filteredMarkers = markers.filter((marker: any) => 
+      !(marker.id === markerId && marker.type === 'employee')
+    );
+    
+    // 检查是否真的删除了标记点
+    const originalCount = markers.length;
+    const newCount = filteredMarkers.length;
+    
+    if (originalCount === newCount) {
+      console.warn('未找到员工标记点，可能标记点不存在或不是员工类型:', markerId);
+    } else {
+      console.log('成功删除员工标记点:', markerId);
+    }
+    
+    // 更新数据模块中的标记点
+    this.dataModule.updateMarkers(filteredMarkers);
+    
+    console.log('单个员工标记点删除完成，剩余标记点数量:', filteredMarkers.length);
+  }
+
+  /**
+   * 添加单个员工标记点
+   */
+  addEmployeeMarker(employeeMarker: Marker): void {
+    console.log('添加单个员工标记点:', employeeMarker.id);
+    
+    // 确保标记点类型为员工
+    const markerWithType = {
+      ...employeeMarker,
+      type: 'employee'
+    };
+    
+    const { markers } = this.pageContext.data;
+    
+    // 检查是否已存在相同ID的标记点
+    const existingIndex = markers.findIndex((marker: any) => 
+      marker.id === markerWithType.id && marker.type === 'employee'
+    );
+    
+    let updatedMarkers;
+    if (existingIndex !== -1) {
+      // 如果已存在相同ID的员工标记点，则更新
+      updatedMarkers = [...markers];
+      updatedMarkers[existingIndex] = markerWithType;
+      console.log('员工标记点已存在，执行更新操作');
+    } else {
+      // 如果不存在，则添加新的员工标记点
+      updatedMarkers = [...markers, markerWithType];
+      console.log('员工标记点不存在，执行添加操作');
+    }
+    
+    // 更新数据模块中的标记点
+    this.dataModule.updateMarkers(updatedMarkers);
+    
+    console.log('单个员工标记点添加完成，总标记点数量:', updatedMarkers.length);
+  }
+
   /**
    * 更新单个员工标记点
    */
diff --git a/miniprogram/pages/staff/admin-dashboard.json b/miniprogram/pages/staff/admin-dashboard.json
new file mode 100644
index 0000000..fdcfafb
--- /dev/null
+++ b/miniprogram/pages/staff/admin-dashboard.json
@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "管理员面板",
+  "navigationBarBackgroundColor": "#667eea",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#f8f9fa",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": true,
+  "disableScroll": false,
+  "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/admin-dashboard.ts b/miniprogram/pages/staff/admin-dashboard.ts
new file mode 100644
index 0000000..d0a32d7
--- /dev/null
+++ b/miniprogram/pages/staff/admin-dashboard.ts
@@ -0,0 +1,187 @@
+// 管理员界面 - 全屏管理面板
+import { UserInfo } from '../../types';
+
+Page({
+  data: {
+    userInfo: null as UserInfo | null,
+    // Grid布局的功能菜单
+    menuItems: [
+      {
+        id: 'employee',
+        name: '员工管理',
+        icon: '👥',
+        color: '#3498db',
+        description: '管理员工信息'
+      },
+      {
+        id: 'order',
+        name: '订单管理',
+        icon: '📦',
+        color: '#e74c3c',
+        description: '处理订单分配'
+      },
+      {
+        id: 'warehouse',
+        name: '仓库管理',
+        icon: '🏭',
+        color: '#f39c12',
+        description: '管理库存信息'
+      },
+      {
+        id: 'statistics',
+        name: '数据统计',
+        icon: '📊',
+        color: '#9b59b6',
+        description: '查看业务数据'
+      },
+      {
+        id: 'settings',
+        name: '系统设置',
+        icon: '⚙️',
+        color: '#34495e',
+        description: '系统配置管理'
+      },
+      {
+        id: 'map',
+        name: '地图监控',
+        icon: '🗺️',
+        color: '#27ae60',
+        description: '实时位置监控'
+      }
+    ],
+    // 统计数据
+    stats: {
+      employeeCount: 0,
+      orderCount: 0,
+      warehouseCount: 0
+    },
+    // 当前时间
+    currentTime: ''
+  },
+
+  onLoad() {
+    this.getUserInfo();
+    this.loadStatistics();
+    this.updateCurrentTime();
+    // 每秒更新一次时间
+    setInterval(() => {
+      this.updateCurrentTime();
+    }, 1000);
+  },
+
+  onShow() {
+    this.loadStatistics();
+    this.updateCurrentTime();
+  },
+
+  /**
+   * 获取用户信息
+   */
+  getUserInfo() {
+    const app = getApp<any>();
+    if (app.globalData.userInfo) {
+      const userInfo = app.globalData.userInfo;
+      this.setData({ userInfo });
+      
+      // 验证是否为管理员
+      if (userInfo.role !== 'ADMIN') {
+        wx.showToast({
+          title: '无权限访问',
+          icon: 'none'
+        });
+        wx.navigateBack();
+      }
+    }
+  },
+
+  /**
+   * 加载统计数据
+   */
+  loadStatistics() {
+    // 模拟加载统计数据
+    this.setData({
+      stats: {
+        employeeCount: 25,
+        orderCount: 156,
+        warehouseCount: 8
+      }
+    });
+  },
+
+  /**
+   * 菜单项点击事件
+   */
+  onMenuItemTap(e: any) {
+    const itemId = e.currentTarget.dataset.id;
+    
+    switch (itemId) {
+      case 'employee':
+        wx.navigateTo({
+          url: '/pages/staff/employee-management'
+        });
+        break;
+      case 'order':
+        wx.navigateTo({
+          url: '/pages/staff/order-management'
+        });
+        break;
+      case 'warehouse':
+        wx.navigateTo({
+          url: '/pages/staff/warehouse-management'
+        });
+        break;
+      case 'statistics':
+        wx.navigateTo({
+          url: '/pages/staff/statistics'
+        });
+        break;
+      case 'settings':
+        wx.navigateTo({
+          url: '/pages/staff/settings'
+        });
+        break;
+      case 'map':
+        wx.navigateTo({
+          url: '/pages/map/map'
+        });
+        break;
+    }
+  },
+
+  /**
+   * 返回首页
+   */
+  goBack() {
+     wx.navigateBack();
+  },
+
+  /**
+   * 刷新数据
+   */
+  onRefresh() {
+    this.loadStatistics();
+    this.updateCurrentTime();
+    wx.showToast({
+      title: '数据已刷新',
+      icon: 'success'
+    });
+  },
+
+  /**
+   * 更新当前时间
+   */
+  updateCurrentTime() {
+    const now = new Date();
+    const timeString = now.toLocaleString('zh-CN', {
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit'
+    });
+    this.setData({
+      currentTime: timeString
+    });
+  }
+});
\ No newline at end of file
diff --git a/miniprogram/pages/staff/admin-dashboard.wxml b/miniprogram/pages/staff/admin-dashboard.wxml
new file mode 100644
index 0000000..d603d02
--- /dev/null
+++ b/miniprogram/pages/staff/admin-dashboard.wxml
@@ -0,0 +1,66 @@
+<!-- 管理员界面 - 全屏管理面板 -->
+<view class="admin-container">
+  <!-- 顶部导航栏 -->
+  <view class="admin-header">
+    <view class="header-left">
+      <!-- 微信风格返回按钮 -->
+      <view class="back-icon" bindtap="goBack">
+        <text class="back-arrow">‹</text>
+      </view>
+      <view class="admin-avatar">👑</view>
+      <view class="admin-info">
+        <text class="admin-name">{{userInfo.name || '管理员'}}</text>
+        <text class="admin-role">系统管理员</text>
+      </view>
+    </view>
+    <view class="header-right">
+      <button class="refresh-btn" bindtap="onRefresh">刷新</button>
+    </view>
+  </view>
+
+  <!-- 统计卡片 -->
+  <view class="stats-section">
+    <view class="stats-title">
+      <text class="stats-text">系统概览</text>
+    </view>
+    <view class="stats-grid">
+      <view class="stat-card">
+        <view class="stat-icon employee-icon">👥</view>
+        <text class="stat-value">{{stats.employeeCount}}</text>
+        <text class="stat-label">员工总数</text>
+      </view>
+      <view class="stat-card">
+        <view class="stat-icon order-icon">📦</view>
+        <text class="stat-value">{{stats.orderCount}}</text>
+        <text class="stat-label">订单总数</text>
+      </view>
+      <view class="stat-card">
+        <view class="stat-icon warehouse-icon">🏭</view>
+        <text class="stat-value">{{stats.warehouseCount}}</text>
+        <text class="stat-label">仓库数量</text>
+      </view>
+    </view>
+  </view>
+
+  <!-- 功能菜单 Grid 布局 -->
+  <view class="menu-section">
+    <view class="menu-title">
+      <text class="menu-text">功能菜单</text>
+    </view>
+    <view class="menu-grid">
+      <view wx:for="{{menuItems}}" wx:key="id" class="menu-item" data-id="{{item.id}}" bindtap="onMenuItemTap">
+        <view class="menu-icon" style="background-color: {{item.color}}">
+          <text class="icon-text">{{item.icon}}</text>
+        </view>
+        <text class="menu-name">{{item.name}}</text>
+        <text class="menu-desc">{{item.description}}</text>
+      </view>
+    </view>
+  </view>
+
+  <!-- 底部操作栏 -->
+  <view class="admin-footer">
+    <text class="footer-text">管理员系统 v1.0</text>
+    <text class="footer-time">{{currentTime}}</text>
+  </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/staff/admin-dashboard.wxss b/miniprogram/pages/staff/admin-dashboard.wxss
new file mode 100644
index 0000000..75824a6
--- /dev/null
+++ b/miniprogram/pages/staff/admin-dashboard.wxss
@@ -0,0 +1,262 @@
+/* 管理员界面样式 */
+.admin-container {
+  height: 100vh;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  display: flex;
+  flex-direction: column;
+  padding: 0;
+}
+
+/* 顶部导航栏样式 */
+.admin-header {
+  background: rgba(255, 255, 255, 0.95);
+  padding: 30rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+}
+
+/* 微信风格返回按钮 */
+.back-icon {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 20rpx;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+}
+
+.back-icon:active {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.back-arrow {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  line-height: 1;
+}
+
+.admin-avatar {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  margin-right: 20rpx;
+  border: 3rpx solid #667eea;
+}
+
+.admin-info {
+  display: flex;
+  flex-direction: column;
+}
+
+.admin-name {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 5rpx;
+}
+
+.admin-role {
+  font-size: 24rpx;
+  color: #666;
+  background: #f0f0f0;
+  padding: 4rpx 12rpx;
+  border-radius: 12rpx;
+  align-self: flex-start;
+}
+
+.header-right {
+  display: flex;
+  gap: 20rpx;
+}
+
+.refresh-btn, .back-btn {
+  padding: 15rpx 25rpx;
+  border: none;
+  border-radius: 8rpx;
+  font-size: 26rpx;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.refresh-btn {
+  background: #3498db;
+  color: white;
+}
+
+.back-btn {
+  background: #95a5a6;
+  color: white;
+}
+
+.refresh-btn:active, .back-btn:active {
+  transform: translateY(1rpx);
+}
+
+/* 统计区域样式 */
+.stats-section {
+  padding: 40rpx;
+  background: rgba(255, 255, 255, 0.9);
+  margin: 20rpx;
+  border-radius: 15rpx;
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.stats-title {
+  margin-bottom: 30rpx;
+}
+
+.stats-text {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.stats-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 20rpx;
+}
+
+.stat-card {
+  background: white;
+  padding: 30rpx;
+  border-radius: 12rpx;
+  text-align: center;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  transition: transform 0.3s ease;
+}
+
+.stat-card:active {
+  transform: translateY(-2rpx);
+}
+
+.stat-icon {
+  font-size: 48rpx;
+  margin-bottom: 15rpx;
+}
+
+.employee-icon {
+  color: #3498db;
+}
+
+.order-icon {
+  color: #e74c3c;
+}
+
+.warehouse-icon {
+  color: #f39c12;
+}
+
+.stat-value {
+  display: block;
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 5rpx;
+}
+
+.stat-label {
+  font-size: 24rpx;
+  color: #666;
+}
+
+/* 菜单区域样式 */
+.menu-section {
+  flex: 1;
+  padding: 40rpx;
+  background: rgba(255, 255, 255, 0.9);
+  margin: 0 20rpx 20rpx 20rpx;
+  border-radius: 15rpx;
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.menu-title {
+  margin-bottom: 30rpx;
+}
+
+.menu-text {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.menu-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 25rpx;
+}
+
+.menu-item {
+  background: white;
+  padding: 30rpx;
+  border-radius: 12rpx;
+  text-align: center;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  transition: all 0.3s ease;
+  cursor: pointer;
+}
+
+.menu-item:active {
+  transform: translateY(-2rpx);
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.menu-icon {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 auto 20rpx auto;
+}
+
+.icon-text {
+  font-size: 48rpx;
+  line-height: 1;
+}
+
+.menu-name {
+  display: block;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 8rpx;
+}
+
+.menu-desc {
+  font-size: 22rpx;
+  color: #666;
+}
+
+/* 底部样式 */
+.admin-footer {
+  background: rgba(255, 255, 255, 0.9);
+  padding: 20rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-top: 1rpx solid #eee;
+}
+
+.footer-text {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.footer-time {
+  font-size: 22rpx;
+  color: #999;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/employee-dashboard.json b/miniprogram/pages/staff/employee-dashboard.json
new file mode 100644
index 0000000..83020ab
--- /dev/null
+++ b/miniprogram/pages/staff/employee-dashboard.json
@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "工作面板",
+  "navigationBarBackgroundColor": "#4ecdc4",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#f8f9fa",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": true,
+  "disableScroll": false,
+  "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/employee-dashboard.ts b/miniprogram/pages/staff/employee-dashboard.ts
new file mode 100644
index 0000000..155d3ff
--- /dev/null
+++ b/miniprogram/pages/staff/employee-dashboard.ts
@@ -0,0 +1,160 @@
+// 员工界面 - 全屏工作面板
+import { UserInfo } from '../../types';
+
+Page({
+  data: {
+    userInfo: null as UserInfo | null,
+    // Grid布局的功能菜单
+    menuItems: [
+      {
+        id: 'orders',
+        name: '我的订单',
+        icon: '📦',
+        color: '#3498db',
+        description: '查看分配订单'
+      },
+      {
+        id: 'location',
+        name: '位置上报',
+        icon: '📍',
+        color: '#e74c3c',
+        description: '上报当前位置'
+      },
+      {
+        id: 'schedule',
+        name: '工作安排',
+        icon: '📅',
+        color: '#f39c12',
+        description: '查看工作计划'
+      },
+      {
+        id: 'profile',
+        name: '个人信息',
+        icon: '👤',
+        color: '#9b59b6',
+        description: '个人资料管理'
+      },
+      {
+        id: 'messages',
+        name: '消息通知',
+        icon: '📨',
+        color: '#34495e',
+        description: '查看系统消息'
+      },
+      {
+        id: 'help',
+        name: '帮助中心',
+        icon: '❓',
+        color: '#27ae60',
+        description: '使用帮助文档'
+      }
+    ],
+    // 工作统计
+    workStats: {
+      todayOrders: 0,
+      completedOrders: 0,
+      pendingOrders: 0
+    }
+  },
+
+  onLoad() {
+    this.getUserInfo();
+    this.loadWorkStats();
+  },
+
+  onShow() {
+    this.loadWorkStats();
+  },
+
+  /**
+   * 获取用户信息
+   */
+  getUserInfo() {
+    const app = getApp<any>();
+    if (app.globalData.userInfo) {
+      const userInfo = app.globalData.userInfo;
+      this.setData({ userInfo });
+    }
+  },
+
+  /**
+   * 加载工作统计数据
+   */
+  loadWorkStats() {
+    // 模拟加载工作统计数据
+    this.setData({
+      workStats: {
+        todayOrders: 8,
+        completedOrders: 5,
+        pendingOrders: 3
+      }
+    });
+  },
+
+  /**
+   * 菜单项点击事件
+   */
+  onMenuItemTap(e: any) {
+    const itemId = e.currentTarget.dataset.id;
+    
+    switch (itemId) {
+      case 'orders':
+        wx.navigateTo({
+          url: '/pages/staff/my-orders'
+        });
+        break;
+      case 'location':
+        wx.navigateTo({
+          url: '/pages/staff/location-report'
+        });
+        break;
+      case 'schedule':
+        wx.navigateTo({
+          url: '/pages/staff/work-schedule'
+        });
+        break;
+      case 'profile':
+        wx.navigateTo({
+          url: '/pages/staff/profile'
+        });
+        break;
+      case 'messages':
+        wx.navigateTo({
+          url: '/pages/staff/messages'
+        });
+        break;
+      case 'help':
+        wx.navigateTo({
+          url: '/pages/staff/help'
+        });
+        break;
+    }
+  },
+
+  /**
+   * 返回首页
+   */
+  goBack() {
+    wx.navigateBack();
+  },
+
+  /**
+   * 刷新数据
+   */
+  onRefresh() {
+    this.loadWorkStats();
+    wx.showToast({
+      title: '数据已刷新',
+      icon: 'success'
+    });
+  },
+
+  /**
+   * 紧急联系
+   */
+  onEmergencyContact() {
+    wx.makePhoneCall({
+      phoneNumber: '400-123-4567'
+    });
+  }
+});
\ No newline at end of file
diff --git a/miniprogram/pages/staff/employee-dashboard.wxml b/miniprogram/pages/staff/employee-dashboard.wxml
new file mode 100644
index 0000000..6b189d4
--- /dev/null
+++ b/miniprogram/pages/staff/employee-dashboard.wxml
@@ -0,0 +1,85 @@
+<!-- 员工界面 - 全屏工作面板 -->
+<view class="employee-container">
+  <!-- 顶部导航栏 -->
+  <view class="employee-header">
+    <view class="header-left">
+      <!-- 微信风格返回按钮 -->
+      <view class="back-icon" bindtap="goBack">
+        <text class="back-arrow">‹</text>
+      </view>
+      <view class="employee-avatar">👤</view>
+      <view class="employee-info">
+        <text class="employee-name">{{userInfo.name || '员工'}}</text>
+        <text class="employee-role">工作人员</text>
+      </view>
+    </view>
+    <view class="header-right">
+      <button class="refresh-btn" bindtap="onRefresh">刷新</button>
+      <button class="emergency-btn" bindtap="onEmergencyContact">紧急联系</button>
+    </view>
+  </view>
+
+  <!-- 工作统计 -->
+  <view class="work-stats-section">
+    <view class="stats-title">
+      <text class="stats-text">今日工作统计</text>
+    </view>
+    <view class="stats-grid">
+      <view class="stat-card">
+        <view class="stat-icon today-icon">📋</view>
+        <text class="stat-value">{{workStats.todayOrders}}</text>
+        <text class="stat-label">今日订单</text>
+      </view>
+      <view class="stat-card">
+        <view class="stat-icon completed-icon">✅</view>
+        <text class="stat-value">{{workStats.completedOrders}}</text>
+        <text class="stat-label">已完成</text>
+      </view>
+      <view class="stat-card">
+        <view class="stat-icon pending-icon">⏳</view>
+        <text class="stat-value">{{workStats.pendingOrders}}</text>
+        <text class="stat-label">待处理</text>
+      </view>
+    </view>
+  </view>
+
+  <!-- 功能菜单 Grid 布局 -->
+  <view class="menu-section">
+    <view class="menu-title">
+      <text class="menu-text">工作功能</text>
+    </view>
+    <view class="menu-grid">
+      <view wx:for="{{menuItems}}" wx:key="id" class="menu-item" data-id="{{item.id}}" bindtap="onMenuItemTap">
+        <view class="menu-icon" style="background-color: {{item.color}}">
+          <text class="icon-text">{{item.icon}}</text>
+        </view>
+        <text class="menu-name">{{item.name}}</text>
+        <text class="menu-desc">{{item.description}}</text>
+      </view>
+    </view>
+  </view>
+
+  <!-- 快捷操作 -->
+  <view class="quick-actions">
+    <view class="actions-title">
+      <text class="actions-text">快捷操作</text>
+    </view>
+    <view class="actions-grid">
+      <button class="action-btn location-btn" bindtap="onMenuItemTap" data-id="location">
+        <text class="btn-text">📍 位置上报</text>
+      </button>
+      <button class="action-btn orders-btn" bindtap="onMenuItemTap" data-id="orders">
+        <text class="btn-text">📦 查看订单</text>
+      </button>
+      <button class="action-btn schedule-btn" bindtap="onMenuItemTap" data-id="schedule">
+        <text class="btn-text">📅 工作安排</text>
+      </button>
+    </view>
+  </view>
+
+  <!-- 底部信息栏 -->
+  <view class="employee-footer">
+    <text class="footer-text">员工工作系统 v1.0</text>
+    <text class="footer-time">{{currentTime}}</text>
+  </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/staff/employee-dashboard.wxss b/miniprogram/pages/staff/employee-dashboard.wxss
new file mode 100644
index 0000000..408835c
--- /dev/null
+++ b/miniprogram/pages/staff/employee-dashboard.wxss
@@ -0,0 +1,323 @@
+/* 员工界面样式 */
+.employee-container {
+  height: 100vh;
+  background: linear-gradient(135deg, #4ecdc4 0%, #44a08d 100%);
+  display: flex;
+  flex-direction: column;
+  padding: 0;
+}
+
+/* 顶部导航栏样式 */
+.employee-header {
+  background: rgba(255, 255, 255, 0.95);
+  padding: 30rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+}
+
+/* 微信风格返回按钮 */
+.back-icon {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 20rpx;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+}
+
+.back-icon:active {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.back-arrow {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  line-height: 1;
+}
+
+.employee-avatar {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  margin-right: 20rpx;
+  border: 3rpx solid #4ecdc4;
+}
+
+.employee-info {
+  display: flex;
+  flex-direction: column;
+}
+
+.employee-name {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 5rpx;
+}
+
+.employee-role {
+  font-size: 24rpx;
+  color: #666;
+  background: #f0f0f0;
+  padding: 4rpx 12rpx;
+  border-radius: 12rpx;
+  align-self: flex-start;
+}
+
+.header-right {
+  display: flex;
+  gap: 20rpx;
+}
+
+.refresh-btn, .emergency-btn {
+  padding: 15rpx 25rpx;
+  border: none;
+  border-radius: 8rpx;
+  font-size: 26rpx;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.refresh-btn {
+  background: #3498db;
+  color: white;
+}
+
+.emergency-btn {
+  background: #e74c3c;
+  color: white;
+}
+
+.refresh-btn:active, .emergency-btn:active {
+  transform: translateY(1rpx);
+}
+
+/* 工作统计区域样式 */
+.work-stats-section {
+  padding: 40rpx;
+  background: rgba(255, 255, 255, 0.9);
+  margin: 20rpx;
+  border-radius: 15rpx;
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.stats-title {
+  margin-bottom: 30rpx;
+}
+
+.stats-text {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.stats-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 20rpx;
+}
+
+.stat-card {
+  background: white;
+  padding: 30rpx;
+  border-radius: 12rpx;
+  text-align: center;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  transition: transform 0.3s ease;
+}
+
+.stat-card:active {
+  transform: translateY(-2rpx);
+}
+
+.stat-icon {
+  font-size: 48rpx;
+  margin-bottom: 15rpx;
+}
+
+.today-icon {
+  color: #3498db;
+}
+
+.completed-icon {
+  color: #27ae60;
+}
+
+.pending-icon {
+  color: #f39c12;
+}
+
+.stat-value {
+  display: block;
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 5rpx;
+}
+
+.stat-label {
+  font-size: 24rpx;
+  color: #666;
+}
+
+/* 菜单区域样式 */
+.menu-section {
+  flex: 1;
+  padding: 40rpx;
+  background: rgba(255, 255, 255, 0.9);
+  margin: 0 20rpx 20rpx 20rpx;
+  border-radius: 15rpx;
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.menu-title {
+  margin-bottom: 30rpx;
+}
+
+.menu-text {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.menu-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 25rpx;
+}
+
+.menu-item {
+  background: white;
+  padding: 30rpx;
+  border-radius: 12rpx;
+  text-align: center;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  transition: all 0.3s ease;
+  cursor: pointer;
+}
+
+.menu-item:active {
+  transform: translateY(-2rpx);
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.menu-icon {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 auto 20rpx auto;
+}
+
+.icon-text {
+  font-size: 48rpx;
+  line-height: 1;
+}
+
+.menu-name {
+  display: block;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 8rpx;
+}
+
+.menu-desc {
+  font-size: 22rpx;
+  color: #666;
+}
+
+/* 快捷操作区域样式 */
+.quick-actions {
+  padding: 40rpx;
+  background: rgba(255, 255, 255, 0.9);
+  margin: 0 20rpx 20rpx 20rpx;
+  border-radius: 15rpx;
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.actions-title {
+  margin-bottom: 30rpx;
+}
+
+.actions-text {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.actions-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 20rpx;
+}
+
+.action-btn {
+  background: white;
+  border: none;
+  padding: 25rpx;
+  border-radius: 12rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  transition: all 0.3s ease;
+  cursor: pointer;
+}
+
+.action-btn:active {
+  transform: translateY(-2rpx);
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.btn-text {
+  font-size: 26rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.location-btn {
+  background: linear-gradient(135deg, #ff6b6b, #ee5a52);
+  color: white;
+}
+
+.orders-btn {
+  background: linear-gradient(135deg, #4ecdc4, #44a08d);
+  color: white;
+}
+
+.schedule-btn {
+  background: linear-gradient(135deg, #f39c12, #e67e22);
+  color: white;
+}
+
+/* 底部样式 */
+.employee-footer {
+  background: rgba(255, 255, 255, 0.9);
+  padding: 20rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-top: 1rpx solid #eee;
+}
+
+.footer-text {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.footer-time {
+  font-size: 22rpx;
+  color: #999;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/employee-management.json b/miniprogram/pages/staff/employee-management.json
new file mode 100644
index 0000000..c8ae431
--- /dev/null
+++ b/miniprogram/pages/staff/employee-management.json
@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "员工管理",
+  "navigationBarBackgroundColor": "#667eea",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#f8f9fa",
+  "enablePullDownRefresh": true,
+  "disableScroll": false,
+  "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/employee-management.ts b/miniprogram/pages/staff/employee-management.ts
new file mode 100644
index 0000000..543f41d
--- /dev/null
+++ b/miniprogram/pages/staff/employee-management.ts
@@ -0,0 +1,362 @@
+// 员工管理页面 - 集成到管理员界面
+import { EmployeeInfo } from '../../types';
+import employeeService from '../../services/employeeService';
+import { Role, getRoleOptions } from '../../utils/roleUtils';
+
+Page({
+  data: {
+    // 员工列表
+    employees: [] as EmployeeInfo[],
+    filteredEmployees: [] as EmployeeInfo[],
+    
+    // 页面状态
+    currentTab: 'list', // list: 列表页, add: 添加页
+    loading: false,
+    
+    // 添加员工表单数据
+    addForm: {
+      name: '',
+      phone: '',
+      role: Role.DELIVERY_PERSON
+    },
+    
+    // 错误信息
+    errorMessage: '',
+    successMessage: '',
+    
+    // 搜索关键词
+    searchKeyword: '',
+    
+    // 角色选项
+    roleOptions: getRoleOptions(),
+    
+    // 用户信息
+    userInfo: null as any
+  },
+
+  onLoad() {
+    this.getUserInfo();
+    this.loadEmployees();
+  },
+
+  onShow() {
+    this.loadEmployees();
+  },
+
+  /**
+   * 获取用户信息
+   */
+  getUserInfo() {
+    const app = getApp<any>();
+    if (app.globalData.userInfo) {
+      const userInfo = app.globalData.userInfo;
+      this.setData({ userInfo });
+      
+      // 验证是否为管理员
+      if (userInfo.role !== 'ADMIN') {
+        wx.showToast({
+          title: '无权限访问',
+          icon: 'none'
+        });
+        wx.navigateBack();
+      }
+    }
+  },
+
+  /**
+   * 加载员工列表
+   */
+  async loadEmployees() {
+    this.setData({
+      loading: true,
+      errorMessage: '',
+      successMessage: ''
+    });
+
+    try {
+      const employees = await employeeService.getEmployees();
+      // 获取过滤后的员工列表
+      const filteredEmployees = this.getFilteredEmployees(employees);
+      
+      this.setData({
+        employees,
+        filteredEmployees,
+        loading: false
+      });
+    } catch (error) {
+      console.error('加载员工列表失败:', error);
+      this.setData({
+        loading: false,
+        errorMessage: '加载员工列表失败，请稍后重试'
+      });
+    }
+  },
+
+  /**
+   * 切换页面标签
+   */
+  switchTab(e: any) {
+    const tab = e.currentTarget.dataset.tab;
+    this.setData({
+      currentTab: tab,
+      errorMessage: '',
+      successMessage: ''
+    });
+
+    if (tab === 'list') {
+      this.loadEmployees();
+    }
+  },
+
+  /**
+   * 处理添加员工表单输入
+   */
+  onFormInput(e: any) {
+    const { field } = e.currentTarget.dataset;
+    const value = e.detail.value;
+    
+    this.setData({
+      [`addForm.${field}`]: value,
+      errorMessage: '',
+      successMessage: ''
+    });
+  },
+
+  /**
+   * 处理角色选择
+   */
+  onRoleChange(e: any) {
+    const index = e.detail.value;
+    const selectedRole = this.data.roleOptions[index].value;
+    this.setData({
+      'addForm.role': selectedRole
+    });
+  },
+
+  /**
+   * 验证表单数据
+   */
+  validateForm(): boolean {
+    const { name, phone, role } = this.data.addForm;
+    
+    if (!name.trim()) {
+      this.setData({
+        errorMessage: '请输入员工姓名'
+      });
+      return false;
+    }
+
+    if (!phone.trim()) {
+      this.setData({
+        errorMessage: '请输入手机号'
+      });
+      return false;
+    }
+
+    // 简单的手机号格式验证
+    const phoneRegex = /^1[3-9]\d{9}$/;
+    if (!phoneRegex.test(phone)) {
+      this.setData({
+        errorMessage: '请输入正确的手机号格式'
+      });
+      return false;
+    }
+
+    if (!role) {
+      this.setData({
+        errorMessage: '请选择员工角色'
+      });
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * 提交添加员工表单
+   */
+  async submitAddForm() {
+    if (!this.validateForm()) {
+      return;
+    }
+
+    this.setData({
+      loading: true,
+      errorMessage: '',
+      successMessage: ''
+    });
+
+    try {
+      await employeeService.addEmployee(this.data.addForm);
+      
+      this.setData({
+        loading: false,
+        successMessage: '员工添加成功',
+        addForm: {
+          name: '',
+          phone: '',
+          role: Role.DELIVERY_PERSON
+        }
+      });
+      
+      // 添加成功后自动切换到列表页
+      setTimeout(() => {
+        this.setData({
+          currentTab: 'list'
+        });
+        this.loadEmployees();
+      }, 1500);
+    } catch (error) {
+      console.error('添加员工失败:', error);
+      this.setData({
+        loading: false,
+        errorMessage: (error as Error).message || '添加员工失败，请稍后重试'
+      });
+    }
+  },
+
+  /**
+   * 删除员工
+   */
+  async deleteEmployee(e: any) {
+    const employeeId = e.currentTarget.dataset.id;
+    const employee = this.data.employees.find(emp => emp.id === employeeId);
+    
+    if (!employee) {
+      return;
+    }
+
+    wx.showModal({
+      title: '确认删除',
+      content: `确定要删除员工 ${employee.name} (${employee.phone}) 吗？此操作不可恢复。`,
+      confirmText: '删除',
+      confirmColor: '#ff4d4f',
+      cancelText: '取消',
+      success: async (res) => {
+        if (res.confirm) {
+          this.setData({
+            loading: true,
+            errorMessage: '',
+            successMessage: ''
+          });
+
+          try {
+            const result = await employeeService.deleteEmployee(employeeId);
+            
+            if (result.success) {
+              this.setData({
+                loading: false,
+                successMessage: result.message || '员工删除成功'
+              });
+              
+              // 重新加载员工列表
+              this.loadEmployees();
+            } else {
+              this.setData({
+                loading: false,
+                errorMessage: result.message || '删除员工失败'
+              });
+            }
+          } catch (error) {
+            console.error('删除员工失败:', error);
+            this.setData({
+              loading: false,
+              errorMessage: '删除员工失败，请稍后重试'
+            });
+          }
+        }
+      }
+    });
+  },
+
+  /**
+   * 搜索员工
+   */
+  onSearchInput(e: any) {
+    const keyword = e.detail.value;
+    this.setData({
+      searchKeyword: keyword
+    });
+    
+    // 更新过滤后的员工列表
+    this.updateFilteredEmployees();
+  },
+
+  /**
+   * 更新过滤后的员工列表
+   */
+  updateFilteredEmployees() {
+    const { employees } = this.data;
+    const filteredEmployees = this.getFilteredEmployees(employees);
+    this.setData({
+      filteredEmployees
+    });
+  },
+
+  /**
+   * 获取过滤后的员工列表
+   */
+  getFilteredEmployees(employees?: EmployeeInfo[]): EmployeeInfo[] {
+    const { searchKeyword } = this.data;
+    
+    // 如果employees为空，返回空数组
+    if (!employees || !Array.isArray(employees)) {
+      return [];
+    }
+    
+    // 获取当前登录用户信息
+    const app = getApp();
+    const currentUser = app.globalData.userInfo;
+    
+    // 过滤掉当前登录用户
+    let filteredEmployees = employees.filter(emp => {
+      // 如果没有当前用户信息，显示所有员工
+      if (!currentUser || !currentUser.id) {
+        return true;
+      }
+      // 过滤掉当前用户
+      return emp.id !== currentUser.id;
+    });
+    
+    // 更严格的搜索关键词检查
+    if (!searchKeyword || typeof searchKeyword !== 'string' || !searchKeyword.trim()) {
+      return filteredEmployees;
+    }
+
+    const keyword = searchKeyword.toLowerCase();
+    return filteredEmployees.filter(emp => 
+      emp.name.toLowerCase().includes(keyword) ||
+      emp.phone.includes(keyword) ||
+      (emp.role || '').toLowerCase().includes(keyword)
+    );
+  },
+
+  /**
+   * 获取角色显示文本
+   */
+  getRoleText(role: string): string {
+    const roleMap: Record<string, string> = {
+      'ADMIN': '管理员',
+      'DELIVERY_PERSON': '配送员',
+      'EMPLOYEE': '员工'
+    };
+    return roleMap[role] || role;
+  },
+
+  /**
+   * 清空消息
+   */
+  clearMessages() {
+    this.setData({
+      errorMessage: '',
+      successMessage: ''
+    });
+  },
+
+  /**
+   * 返回上一页
+   */
+  goBack() {
+    wx.navigateBack();
+  }
+});
\ No newline at end of file
diff --git a/miniprogram/pages/staff/employee-management.wxml b/miniprogram/pages/staff/employee-management.wxml
new file mode 100644
index 0000000..89b2938
--- /dev/null
+++ b/miniprogram/pages/staff/employee-management.wxml
@@ -0,0 +1,168 @@
+<!-- 员工管理页面 - 新界面设计 -->
+<view class="employee-management-container">
+  <!-- 顶部导航栏 -->
+  <view class="management-header">
+    <view class="header-left">
+      <!-- 微信风格返回按钮 -->
+      <view class="back-icon" bindtap="goBack">
+        <text class="back-arrow">‹</text>
+      </view>
+      <text class="header-title">员工管理</text>
+    </view>
+    <view class="header-right">
+      <text class="employee-count">共{{filteredEmployees.length}}名员工</text>
+    </view>
+  </view>
+
+  <!-- 页面标签 -->
+  <view class="page-tabs">
+    <view 
+      class="tab-item {{currentTab === 'list' ? 'active' : ''}}" 
+      bindtap="switchTab" 
+      data-tab="list"
+    >
+      <text class="tab-text">员工列表</text>
+    </view>
+    <view 
+      class="tab-item {{currentTab === 'add' ? 'active' : ''}}" 
+      bindtap="switchTab" 
+      data-tab="add"
+    >
+      <text class="tab-text">添加员工</text>
+    </view>
+  </view>
+
+  <!-- 消息提示 -->
+  <view class="message-container">
+    <view wx:if="{{errorMessage}}" class="error-message">
+      <text class="message-text">{{errorMessage}}</text>
+      <text class="close-btn" bindtap="clearMessages">×</text>
+    </view>
+    <view wx:if="{{successMessage}}" class="success-message">
+      <text class="message-text">{{successMessage}}</text>
+      <text class="close-btn" bindtap="clearMessages">×</text>
+    </view>
+  </view>
+
+  <!-- 加载状态 -->
+  <view wx:if="{{loading}}" class="loading-container">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">加载中...</text>
+  </view>
+
+  <!-- 员工列表页面 -->
+  <view wx:if="{{currentTab === 'list'}}" class="list-container">
+    <!-- 搜索框 -->
+    <view class="search-container">
+      <view class="search-input-wrapper">
+        <input 
+          class="search-input" 
+          placeholder="搜索员工姓名、手机号或角色"
+          bindinput="onSearchInput"
+          value="{{searchKeyword}}"
+        />
+        <text class="search-icon">🔎</text>
+      </view>
+    </view>
+
+    <!-- 员工列表 -->
+    <scroll-view class="employee-list" scroll-y>
+      <view wx:for="{{filteredEmployees}}" wx:key="id" class="employee-item">
+        <view class="employee-info">
+          <view class="employee-avatar">
+            <text class="avatar-text">{{item.name.charAt(0)}}</text>
+          </view>
+          <view class="employee-details">
+            <view class="employee-name-row">
+              <text class="employee-name">{{item.name}}</text>
+              <text class="employee-role {{item.role === 'ADMIN' ? 'admin-role' : ''}}">
+                <text class="role-icon">{{item.role === 'ADMIN' ? '👑' : '🚚'}}</text>
+                {{getRoleText(item.role)}}
+              </text>
+            </view>
+            <text class="employee-phone">{{item.phone}}</text>
+            <text class="employee-id">ID: {{item.id}}</text>
+          </view>
+        </view>
+        <view class="employee-actions">
+          <button 
+            class="delete-btn" 
+            bindtap="deleteEmployee" 
+            data-id="{{item.id}}"
+            size="mini"
+          >
+            删除
+          </button>
+        </view>
+      </view>
+
+      <!-- 空状态 -->
+      <view wx:if="{{filteredEmployees.length === 0}}" class="empty-state">
+        <text class="empty-icon">👥</text>
+        <text class="empty-text">
+          {{searchKeyword ? '没有找到匹配的员工' : '暂无员工数据'}}
+        </text>
+        <text wx:if="{{!searchKeyword}}" class="empty-hint">点击"添加员工"开始管理</text>
+      </view>
+    </scroll-view>
+  </view>
+
+  <!-- 添加员工页面 -->
+  <view wx:if="{{currentTab === 'add'}}" class="add-container">
+    <view class="form-container">
+      <view class="form-item">
+        <text class="form-label">员工姓名</text>
+        <input 
+          class="form-input" 
+          placeholder="请输入员工姓名"
+          value="{{addForm.name}}"
+          bindinput="onFormInput"
+          data-field="name"
+        />
+      </view>
+
+      <view class="form-item">
+        <text class="form-label">手机号码</text>
+        <input 
+          class="form-input" 
+          placeholder="请输入手机号码"
+          type="number"
+          value="{{addForm.phone}}"
+          bindinput="onFormInput"
+          data-field="phone"
+        />
+      </view>
+
+      <view class="form-item">
+        <text class="form-label">员工角色</text>
+        <picker 
+          class="form-picker"
+          bindchange="onRoleChange"
+          range="{{roleOptions}}"
+          range-key="label"
+        >
+          <view class="picker-display">
+            <text class="picker-text">
+              {{addForm.role === 'ADMIN' ? '管理员' : addForm.role === 'DELIVERY_PERSON' ? '配送员' : '请选择角色'}}
+            </text>
+            <text class="picker-arrow">▼</text>
+          </view>
+        </picker>
+      </view>
+
+      <view class="form-hint">
+        <text class="hint-text">
+          提示：添加员工后，用户可以使用该员工的姓名和手机号进行注册
+        </text>
+      </view>
+
+      <button 
+        class="submit-btn" 
+        bindtap="submitAddForm"
+        disabled="{{loading}}"
+      >
+        {{loading ? '添加中...' : '添加员工'}}
+      </button>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/staff/employee-management.wxss b/miniprogram/pages/staff/employee-management.wxss
new file mode 100644
index 0000000..79eb5e5
--- /dev/null
+++ b/miniprogram/pages/staff/employee-management.wxss
@@ -0,0 +1,395 @@
+/* 员工管理页面样式 */
+.employee-management-container {
+  height: 100vh;
+  background: #f8f9fa;
+  display: flex;
+  flex-direction: column;
+}
+
+/* 顶部导航栏样式 */
+.management-header {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  padding: 30rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: white;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+}
+
+/* 微信风格返回按钮 */
+.back-icon {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+}
+
+.back-icon:active {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.back-arrow {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  line-height: 1;
+}
+
+.back-btn {
+  background: rgba(255, 255, 255, 0.2);
+  border: none;
+  color: white;
+  font-size: 36rpx;
+  padding: 15rpx 20rpx;
+  border-radius: 8rpx;
+  margin-right: 20rpx;
+}
+
+.header-title {
+  font-size: 32rpx;
+  font-weight: bold;
+}
+
+.employee-count {
+  font-size: 26rpx;
+  opacity: 0.9;
+}
+
+/* 页面标签样式 */
+.page-tabs {
+  display: flex;
+  background: white;
+  border-bottom: 1rpx solid #eee;
+}
+
+.tab-item {
+  flex: 1;
+  padding: 25rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #666;
+  border-bottom: 4rpx solid transparent;
+  transition: all 0.3s ease;
+}
+
+.tab-item.active {
+  color: #667eea;
+  border-bottom-color: #667eea;
+  font-weight: bold;
+}
+
+/* 消息提示样式 */
+.message-container {
+  padding: 0 40rpx;
+}
+
+.error-message, .success-message {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 25rpx;
+  border-radius: 8rpx;
+  margin: 20rpx 0;
+  font-size: 26rpx;
+}
+
+.error-message {
+  background: #ffeaea;
+  color: #e74c3c;
+  border: 1rpx solid #fadbd8;
+}
+
+.success-message {
+  background: #e8f6ef;
+  color: #27ae60;
+  border: 1rpx solid #d4efdf;
+}
+
+.close-btn {
+  font-size: 32rpx;
+  cursor: pointer;
+  padding: 5rpx 10rpx;
+}
+
+/* 加载状态样式 */
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60rpx;
+}
+
+.loading-spinner {
+  width: 60rpx;
+  height: 60rpx;
+  border: 4rpx solid #f3f3f3;
+  border-top: 4rpx solid #667eea;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 20rpx;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+  font-size: 28rpx;
+  color: #666;
+}
+
+/* 列表容器样式 */
+.list-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+/* 搜索框样式 */
+.search-container {
+  padding: 30rpx 40rpx;
+  background: white;
+  border-bottom: 1rpx solid #eee;
+}
+
+.search-input-wrapper {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+
+.search-input {
+  flex: 1;
+  padding: 25rpx 60rpx 25rpx 30rpx;
+  border: 1rpx solid #ddd;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  background: #f8f9fa;
+}
+
+.search-icon {
+  position: absolute;
+  right: 30rpx;
+  font-size: 28rpx;
+  color: #999;
+}
+
+/* 员工列表样式 */
+.employee-list {
+  flex: 1;
+  padding: 0 40rpx;
+}
+
+.employee-item {
+  background: white;
+  padding: 30rpx;
+  margin: 20rpx 0;
+  border-radius: 12rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  transition: transform 0.3s ease;
+}
+
+.employee-item:active {
+  transform: translateY(-2rpx);
+}
+
+.employee-info {
+  display: flex;
+  align-items: center;
+  flex: 1;
+}
+
+.employee-avatar {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 25rpx;
+  color: white;
+  font-size: 32rpx;
+  font-weight: bold;
+}
+
+.employee-details {
+  flex: 1;
+}
+
+.employee-name-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10rpx;
+}
+
+.employee-name {
+  font-size: 30rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.employee-role {
+  font-size: 24rpx;
+  background: #f0f0f0;
+  padding: 8rpx 16rpx;
+  border-radius: 20rpx;
+  color: #666;
+}
+
+.employee-role.admin-role {
+  background: #ffeaa7;
+  color: #e17055;
+}
+
+.role-icon {
+  margin-right: 5rpx;
+}
+
+.employee-phone {
+  display: block;
+  font-size: 26rpx;
+  color: #666;
+  margin-bottom: 5rpx;
+}
+
+.employee-id {
+  font-size: 22rpx;
+  color: #999;
+}
+
+.employee-actions {
+  margin-left: 20rpx;
+}
+
+.delete-btn {
+  background: #e74c3c;
+  color: white;
+  border: none;
+  padding: 15rpx 25rpx;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+}
+
+/* 空状态样式 */
+.empty-state {
+  text-align: center;
+  padding: 100rpx 40rpx;
+  color: #999;
+}
+
+.empty-icon {
+  font-size: 80rpx;
+  margin-bottom: 20rpx;
+}
+
+.empty-text {
+  display: block;
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+
+.empty-hint {
+  font-size: 24rpx;
+  color: #ccc;
+}
+
+/* 添加员工页面样式 */
+.add-container {
+  flex: 1;
+  padding: 40rpx;
+  background: white;
+}
+
+.form-container {
+  max-width: 600rpx;
+  margin: 0 auto;
+}
+
+.form-item {
+  margin-bottom: 40rpx;
+}
+
+.form-label {
+  display: block;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 15rpx;
+}
+
+.form-input {
+  width: 100%;
+  padding: 25rpx;
+  border: 1rpx solid #ddd;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  background: #f8f9fa;
+}
+
+.form-picker {
+  width: 100%;
+}
+
+.picker-display {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 25rpx;
+  border: 1rpx solid #ddd;
+  border-radius: 8rpx;
+  background: #f8f9fa;
+}
+
+.picker-text {
+  font-size: 28rpx;
+  color: #333;
+}
+
+.picker-arrow {
+  color: #999;
+  font-size: 24rpx;
+}
+
+.form-hint {
+  background: #e8f6ef;
+  padding: 20rpx;
+  border-radius: 8rpx;
+  margin-bottom: 40rpx;
+}
+
+.hint-text {
+  font-size: 24rpx;
+  color: #27ae60;
+}
+
+.submit-btn {
+  width: 100%;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: white;
+  border: none;
+  padding: 30rpx;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+}
+
+.submit-btn:disabled {
+  opacity: 0.6;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/order-management.json b/miniprogram/pages/staff/order-management.json
new file mode 100644
index 0000000..288ab1d
--- /dev/null
+++ b/miniprogram/pages/staff/order-management.json
@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "订单管理",
+  "navigationBarBackgroundColor": "#667eea",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#f8f9fa",
+  "enablePullDownRefresh": true,
+  "disableScroll": false,
+  "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/order-management.ts b/miniprogram/pages/staff/order-management.ts
new file mode 100644
index 0000000..0b5dc4a
--- /dev/null
+++ b/miniprogram/pages/staff/order-management.ts
@@ -0,0 +1,433 @@
+// 订单管理页面 - 处理订单的增删改查和状态管理
+import { Order, UserInfo, DeliveryPerson, WarehouseInfo } from '../../types';
+import orderService from '../../services/orderService';
+import deliveryService from '../../services/deliveryPersonService';
+import warehouseService from '../../services/warehouseService';
+
+Page({
+  data: {
+    userInfo: null as UserInfo | null,
+    
+    // 订单相关数据
+    orders: [] as Order[],
+    filteredOrders: [] as Order[],
+    activeTab: 'all',
+    
+    // 员工相关数据
+    deliveryPersons: [] as DeliveryPerson[],
+    availableStaff: [] as DeliveryPerson[],
+    
+    // 仓库数据
+    warehouses: [] as WarehouseInfo[],
+    
+    // 弹窗状态
+    showAssignModal: false,
+    showAddModal: false,
+    selectedOrderId: 0,
+    
+    // 新增订单表单数据
+    warehouseIndex: 0,
+    endName: '',
+    goodsType: '',
+    goodsWeight: 0,
+    
+    // 页面状态
+    loading: false,
+    errorMessage: '',
+    successMessage: ''
+  },
+
+  onLoad() {
+    // 获取用户信息
+    this.getUserInfo();
+    // 初始化数据
+    this.initData();
+  },
+
+  onShow() {
+    // 页面显示时刷新数据
+    this.refreshData();
+  },
+
+  onPullDownRefresh() {
+    // 下拉刷新
+    this.refreshData().then(() => {
+      wx.stopPullDownRefresh();
+    });
+  },
+
+  // 获取用户信息
+  getUserInfo() {
+    try {
+      const userInfo = wx.getStorageSync('userInfo');
+      if (userInfo) {
+        this.setData({
+          userInfo
+        });
+      }
+    } catch (error) {
+      console.error('获取用户信息失败:', error);
+    }
+  },
+
+  // 初始化数据
+  initData() {
+    // 获取仓库数据
+    warehouseService.getWarehouses().then(warehouses => {
+      this.setData({
+        warehouses
+      });
+    }).catch(error => {
+      console.error('获取仓库数据失败:', error);
+      this.showError('获取仓库数据失败');
+    });
+  },
+
+  // 刷新数据
+  async refreshData() {
+    this.setData({
+      loading: true,
+      errorMessage: '',
+      successMessage: ''
+    });
+
+    try {
+      // 获取订单数据
+      const orders = await orderService.getPendingOrders();
+      
+      // 获取员工数据
+      const deliveryPersons = await deliveryService.getDeliveryPersons();
+      
+      this.setData({
+        orders,
+        deliveryPersons,
+        loading: false
+      });
+      
+      // 过滤订单
+      this.filterOrders();
+      
+    } catch (error) {
+      console.error('刷新数据失败:', error);
+      this.setData({
+        loading: false
+      });
+      this.showError('刷新数据失败，请重试');
+    }
+  },
+
+  // 过滤订单
+  filterOrders() {
+    const { orders, activeTab } = this.data;
+    let filteredOrders = orders;
+    
+    if (activeTab !== 'all') {
+      filteredOrders = orders.filter(order => order.status === activeTab);
+    }
+    
+    this.setData({
+      filteredOrders
+    });
+  },
+
+  // 切换订单标签
+  switchTab(e: any) {
+    const tab = e.currentTarget.dataset.tab;
+    this.setData({
+      activeTab: tab
+    });
+    this.filterOrders();
+  },
+
+  // 处理订单点击
+  handleOrderTap(e: any) {
+    const orderId = e.currentTarget.dataset.id;
+    const order = this.data.orders.find(o => o.id === orderId);
+    
+    if (!order) return;
+    
+    if (order.status === 'pending') {
+      // 未分配的订单，显示分配弹窗
+      const availableStaff = this.data.deliveryPersons.filter(person => person.status === 'idle');
+      this.setData({
+        showAssignModal: true,
+        selectedOrderId: orderId,
+        availableStaff
+      });
+    } else {
+      // 显示订单详情
+      this.showOrderDetail(order);
+    }
+  },
+
+  // 显示订单详情
+  showOrderDetail(order: Order) {
+    wx.showModal({
+      title: `订单 #${order.id}`,
+      content: `起点: ${order.startPoint.name}\n终点: ${order.endPoint.name}\n货物: ${order.goodsType} ${order.goodsWeight}kg\n状态: ${this.getStatusText(order.status)}`,
+      showCancel: false
+    });
+  },
+
+  // 显示新增订单弹窗
+  showAddOrderModal() {
+    this.setData({
+      showAddModal: true,
+      endName: '',
+      goodsType: '',
+      goodsWeight: 0,
+      warehouseIndex: 0
+    });
+  },
+
+  // 隐藏新增订单弹窗
+  hideAddModal() {
+    this.setData({
+      showAddModal: false
+    });
+  },
+
+  // 隐藏分配弹窗
+  hideAssignModal() {
+    this.setData({
+      showAssignModal: false
+    });
+  },
+
+  // 仓库选择变化
+  onWarehouseChange(e: any) {
+    this.setData({
+      warehouseIndex: e.detail.value
+    });
+  },
+
+  // 终点名称输入
+  onEndNameInput(e: any) {
+    this.setData({
+      endName: e.detail.value
+    });
+  },
+
+  // 货物类型输入
+  onGoodsTypeInput(e: any) {
+    this.setData({
+      goodsType: e.detail.value
+    });
+  },
+
+  // 货物重量输入
+  onGoodsWeightInput(e: any) {
+    this.setData({
+      goodsWeight: parseFloat(e.detail.value) || 0
+    });
+  },
+
+  // 创建订单
+  createOrder() {
+    const { warehouses, warehouseIndex, endName, goodsType, goodsWeight } = this.data;
+    
+    // 表单验证
+    if (!warehouses[warehouseIndex]) {
+      this.showError('请选择仓库');
+      return;
+    }
+    
+    if (!endName) {
+      this.showError('请输入终点名称');
+      return;
+    }
+    
+    if (!goodsType) {
+      this.showError('请输入货物类型');
+      return;
+    }
+    
+    if (goodsWeight <= 0) {
+      this.showError('请输入有效的货物重量');
+      return;
+    }
+    
+    // 获取仓库信息
+    const warehouse = warehouses[warehouseIndex];
+    
+    // 创建订单数据
+    const newOrder: Omit<Order, 'id' | 'createTime'> = {
+      startPoint: {
+        id: warehouse.id,
+        name: warehouse.name,
+        longitude: warehouse.longitude || 102.715,
+        latitude: warehouse.latitude || 25.045
+      },
+      endPoint: {
+        name: endName,
+        longitude: 102.715 + (Math.random() - 0.5) * 0.1,
+        latitude: 25.045 + (Math.random() - 0.5) * 0.1
+      },
+      status: 'pending',
+      goodsType,
+      goodsWeight
+    };
+    
+    // 调用服务创建订单
+    orderService.createOrder(newOrder).then(() => {
+      this.showSuccess('订单创建成功');
+      this.refreshData();
+    }).catch(error => {
+      console.error('创建订单失败:', error);
+      this.showError('创建订单失败');
+    });
+    
+    this.hideAddModal();
+  },
+
+  // 分配订单
+  assignOrder(e: any) {
+    const staffId = e.currentTarget.dataset.id;
+    const { selectedOrderId } = this.data;
+    
+    if (!selectedOrderId || !staffId) {
+      this.showError('请选择订单和货运人员');
+      return;
+    }
+
+    // 分配订单
+    orderService.assignOrder(selectedOrderId, staffId).then(result => {
+      if (result.success) {
+        this.showSuccess('订单指派成功');
+        this.refreshData();
+      } else {
+        this.showError(result.message || '指派失败');
+      }
+    }).catch(error => {
+      console.error('指派订单失败:', error);
+      this.showError('指派失败，请重试');
+    });
+    
+    this.hideAssignModal();
+  },
+
+  // 删除订单
+  deleteOrder(e: any) {
+    const orderId = e.currentTarget.dataset.id;
+    
+    wx.showModal({
+      title: '确认删除',
+      content: '确定要删除这个订单吗？',
+      success: (res) => {
+        if (res.confirm) {
+          // 调用删除订单接口
+          // orderService.deleteOrder(orderId).then(() => {
+          //   this.showSuccess('订单删除成功');
+          //   this.refreshData();
+          // }).catch(error => {
+          //   console.error('删除订单失败:', error);
+          //   this.showError('删除订单失败');
+          // });
+          
+          // 暂时使用模拟删除
+          const orders = this.data.orders.filter(order => order.id !== orderId);
+          this.setData({
+            orders
+          });
+          this.filterOrders();
+          this.showSuccess('订单删除成功');
+        }
+      }
+    });
+  },
+
+  // 更新订单状态
+  updateOrderStatus(e: any) {
+    const orderId = e.currentTarget.dataset.id;
+    const status = e.currentTarget.dataset.status;
+    
+    // 调用更新订单状态接口
+    orderService.updateOrderStatus(orderId, status).then(result => {
+      if (result.success) {
+        this.showSuccess('订单状态更新成功');
+        this.refreshData();
+      } else {
+        this.showError(result.message || '更新失败');
+      }
+    }).catch(error => {
+      console.error('更新订单状态失败:', error);
+      this.showError('更新失败，请重试');
+    });
+  },
+
+  // 获取状态文本
+  getStatusText(status: string): string {
+    const statusMap: Record<string, string> = {
+      'pending': '未分配',
+      'assigned': '已分配',
+      'in_transit': '配送中',
+      'delivered': '已完成',
+      'cancelled': '已取消'
+    };
+    return statusMap[status] || status;
+  },
+
+  // 格式化时间
+  formatTime(time: number): string {
+    const date = new Date(time);
+    const now = new Date();
+    const diff = now.getTime() - date.getTime();
+    
+    if (diff < 60000) {
+      return '刚刚';
+    } else if (diff < 3600000) {
+      return `${Math.floor(diff / 60000)}分钟前`;
+    } else if (diff < 86400000) {
+      return `${Math.floor(diff / 3600000)}小时前`;
+    } else {
+      const month = date.getMonth() + 1;
+      const day = date.getDate();
+      const hour = date.getHours();
+      const minute = date.getMinutes();
+      return `${month}月${day}日 ${hour}:${minute < 10 ? '0' + minute : minute}`;
+    }
+  },
+
+  // 显示错误消息
+  showError(message: string) {
+    this.setData({
+      errorMessage: message,
+      successMessage: ''
+    });
+    
+    // 3秒后自动清除
+    setTimeout(() => {
+      this.setData({
+        errorMessage: ''
+      });
+    }, 3000);
+  },
+
+  // 显示成功消息
+  showSuccess(message: string) {
+    this.setData({
+      successMessage: message,
+      errorMessage: ''
+    });
+    
+    // 3秒后自动清除
+    setTimeout(() => {
+      this.setData({
+        successMessage: ''
+      });
+    }, 3000);
+  },
+
+  // 清除消息
+  clearMessage() {
+    this.setData({
+      errorMessage: '',
+      successMessage: ''
+    });
+  },
+
+  // 返回上一页
+  goBack() {
+    wx.navigateBack();
+  }
+});
\ No newline at end of file
diff --git a/miniprogram/pages/staff/order-management.wxml b/miniprogram/pages/staff/order-management.wxml
new file mode 100644
index 0000000..d19a8cf
--- /dev/null
+++ b/miniprogram/pages/staff/order-management.wxml
@@ -0,0 +1,164 @@
+<!-- 订单管理页面 -->
+<view class="order-management-container">
+  <!-- 顶部导航栏 -->
+  <view class="management-header">
+    <view class="header-left">
+      <!-- 微信风格返回按钮 -->
+      <view class="back-icon" bindtap="goBack">
+        <text class="back-arrow">‹</text>
+      </view>
+      <view>
+        <text class="header-title">订单管理</text>
+        <text class="order-count" wx:if="{{filteredOrders.length > 0}}">共{{filteredOrders.length}}个订单</text>
+      </view>
+    </view>
+    <button class="add-btn" bindtap="showAddOrderModal">新增订单</button>
+  </view>
+
+  <!-- 消息提示 -->
+  <view class="message-container" wx:if="{{errorMessage || successMessage}}">
+    <view class="error-message" wx:if="{{errorMessage}}">
+      <text>{{errorMessage}}</text>
+      <text class="close-btn" bindtap="clearMessage">×</text>
+    </view>
+    <view class="success-message" wx:if="{{successMessage}}">
+      <text>{{successMessage}}</text>
+      <text class="close-btn" bindtap="clearMessage">×</text>
+    </view>
+  </view>
+
+  <!-- 加载状态 -->
+  <view class="loading-container" wx:if="{{loading}}">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">加载中...</text>
+  </view>
+
+  <!-- 订单标签页 -->
+  <view class="order-tabs">
+    <text class="tab-item {{activeTab === 'all' ? 'active' : ''}}" 
+           bindtap="switchTab" data-tab="all">全部</text>
+    <text class="tab-item {{activeTab === 'pending' ? 'active' : ''}}" 
+           bindtap="switchTab" data-tab="pending">未分配</text>
+    <text class="tab-item {{activeTab === 'assigned' ? 'active' : ''}}" 
+           bindtap="switchTab" data-tab="assigned">已分配</text>
+    <text class="tab-item {{activeTab === 'in_transit' ? 'active' : ''}}" 
+           bindtap="switchTab" data-tab="in_transit">配送中</text>
+    <text class="tab-item {{activeTab === 'delivered' ? 'active' : ''}}" 
+           bindtap="switchTab" data-tab="delivered">已完成</text>
+  </view>
+
+  <!-- 订单列表 -->
+  <scroll-view class="order-list" scroll-y wx:if="{{!loading}}">
+    <view wx:for="{{filteredOrders}}" wx:key="id" class="order-item" bindtap="handleOrderTap" data-id="{{item.id}}">
+      <view class="order-header">
+        <text class="order-id">订单#{{item.id}}</text>
+        <text class="order-status {{item.status}}">{{getStatusText(item.status)}}</text>
+      </view>
+      
+      <view class="order-info">
+        <view class="route-info">
+          <text class="route-icon">📍</text>
+          <text class="route-text">{{item.startPoint.name}} → {{item.endPoint.name}}</text>
+        </view>
+        
+        <view class="goods-info">
+          <text class="goods-icon">📦</text>
+          <text class="goods-text">{{item.goodsType}} {{item.goodsWeight}}kg</text>
+        </view>
+        
+        <view class="time-info">
+          <text class="time-icon">🕐</text>
+          <text class="time-text">{{formatTime(item.createTime)}}</text>
+        </view>
+      </view>
+
+      <!-- 操作按钮 -->
+      <view class="order-actions" wx:if="{{item.status === 'pending'}}">
+        <button class="action-btn assign-btn" bindtap="handleOrderTap" data-id="{{item.id}}">分配</button>
+        <button class="action-btn delete-btn" bindtap="deleteOrder" data-id="{{item.id}}">删除</button>
+      </view>
+      
+      <view class="order-actions" wx:if="{{item.status === 'assigned'}}">
+        <button class="action-btn transit-btn" bindtap="updateOrderStatus" data-id="{{item.id}}" data-status="in_transit">开始配送</button>
+      </view>
+      
+      <view class="order-actions" wx:if="{{item.status === 'in_transit'}}">
+        <button class="action-btn complete-btn" bindtap="updateOrderStatus" data-id="{{item.id}}" data-status="delivered">完成配送</button>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view class="empty-state" wx:if="{{filteredOrders.length === 0 && !loading}}">
+      <text class="empty-icon">📋</text>
+      <text class="empty-text">暂无订单</text>
+      <text class="empty-hint">点击右上角按钮创建新订单</text>
+    </view>
+  </scroll-view>
+
+  <!-- 分配订单弹窗 -->
+  <view class="modal-mask" wx:if="{{showAssignModal}}" bindtap="hideAssignModal"></view>
+  <view class="modal-content" wx:if="{{showAssignModal}}">
+    <view class="modal-header">
+      <text class="modal-title">分配订单</text>
+      <text class="modal-close" bindtap="hideAssignModal">×</text>
+    </view>
+    <view class="modal-body">
+      <text class="modal-text">请选择配送人员:</text>
+      <scroll-view class="staff-select-list" scroll-y>
+        <view wx:for="{{availableStaff}}" wx:key="id" class="staff-select-item" bindtap="assignOrder" data-id="{{item.id}}">
+          <view class="staff-avatar">{{item.name.charAt(0)}}</view>
+          <view class="staff-info">
+            <text class="staff-name">{{item.name}}</text>
+            <text class="staff-phone">{{item.phone}}</text>
+            <text class="staff-status">{{getStatusText(item.status)}}</text>
+          </view>
+        </view>
+        
+        <view class="empty-staff" wx:if="{{availableStaff.length === 0}}">
+          <text class="empty-text">暂无空闲配送人员</text>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+
+  <!-- 新增订单弹窗 -->
+  <view class="modal-mask" wx:if="{{showAddModal}}" bindtap="hideAddModal"></view>
+  <view class="modal-content large" wx:if="{{showAddModal}}">
+    <view class="modal-header">
+      <text class="modal-title">新增订单</text>
+      <text class="modal-close" bindtap="hideAddModal">×</text>
+    </view>
+    <view class="modal-body">
+      <view class="form-hint">
+        <text class="hint-text">请填写订单信息</text>
+      </view>
+      
+      <view class="form-item">
+        <text class="form-label">选择仓库:</text>
+        <picker bindchange="onWarehouseChange" value="{{warehouseIndex}}" range="{{warehouses}}" range-key="name">
+          <view class="picker-display">
+            <text class="picker-text">{{warehouses[warehouseIndex] ? warehouses[warehouseIndex].name : '请选择仓库'}}</text>
+            <text class="picker-arrow">▼</text>
+          </view>
+        </picker>
+      </view>
+      
+      <view class="form-item">
+        <text class="form-label">终点名称:</text>
+        <input class="form-input" bindinput="onEndNameInput" value="{{endName}}" placeholder="请输入终点名称"/>
+      </view>
+      
+      <view class="form-item">
+        <text class="form-label">货物类型:</text>
+        <input class="form-input" bindinput="onGoodsTypeInput" value="{{goodsType}}" placeholder="请输入货物类型"/>
+      </view>
+      
+      <view class="form-item">
+        <text class="form-label">货物重量(kg):</text>
+        <input class="form-input" bindinput="onGoodsWeightInput" value="{{goodsWeight}}" type="number" placeholder="请输入货物重量"/>
+      </view>
+      
+      <button class="submit-btn" bindtap="createOrder">创建订单</button>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/staff/order-management.wxss b/miniprogram/pages/staff/order-management.wxss
new file mode 100644
index 0000000..1560741
--- /dev/null
+++ b/miniprogram/pages/staff/order-management.wxss
@@ -0,0 +1,491 @@
+/* 订单管理页面样式 */
+.order-management-container {
+  height: 100vh;
+  background: #f8f9fa;
+  display: flex;
+  flex-direction: column;
+}
+
+/* 顶部导航栏样式 */
+.management-header {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  padding: 30rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: white;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+}
+
+.back-btn {
+  background: rgba(255, 255, 255, 0.2);
+  border: none;
+  color: white;
+  font-size: 36rpx;
+  padding: 15rpx 20rpx;
+  border-radius: 8rpx;
+  margin-right: 20rpx;
+}
+
+/* 微信风格返回按钮 */
+.back-icon {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+}
+
+.back-icon:active {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.back-arrow {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  line-height: 1;
+}
+
+.header-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  display: block;
+  margin-bottom: 5rpx;
+}
+
+.order-count {
+  font-size: 24rpx;
+  opacity: 0.9;
+}
+
+.add-btn {
+  background: rgba(255, 255, 255, 0.2);
+  border: none;
+  color: white;
+  font-size: 28rpx;
+  padding: 15rpx 25rpx;
+  border-radius: 8rpx;
+}
+
+/* 消息提示样式 */
+.message-container {
+  padding: 0 40rpx;
+}
+
+.error-message, .success-message {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 25rpx;
+  border-radius: 8rpx;
+  margin: 20rpx 0;
+  font-size: 26rpx;
+}
+
+.error-message {
+  background: #ffeaea;
+  color: #e74c3c;
+  border: 1rpx solid #fadbd8;
+}
+
+.success-message {
+  background: #e8f6ef;
+  color: #27ae60;
+  border: 1rpx solid #d4efdf;
+}
+
+.close-btn {
+  font-size: 32rpx;
+  cursor: pointer;
+  padding: 5rpx 10rpx;
+}
+
+/* 加载状态样式 */
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 100rpx;
+}
+
+.loading-spinner {
+  width: 60rpx;
+  height: 60rpx;
+  border: 4rpx solid #f3f3f3;
+  border-top: 4rpx solid #667eea;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 20rpx;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+  font-size: 28rpx;
+  color: #666;
+}
+
+/* 订单标签页样式 */
+.order-tabs {
+  display: flex;
+  background: white;
+  border-bottom: 1rpx solid #eee;
+}
+
+.tab-item {
+  flex: 1;
+  padding: 25rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #666;
+  border-bottom: 4rpx solid transparent;
+  transition: all 0.3s ease;
+}
+
+.tab-item.active {
+  color: #667eea;
+  border-bottom-color: #667eea;
+  font-weight: bold;
+}
+
+/* 订单列表样式 */
+.order-list {
+  flex: 1;
+  padding: 20rpx 40rpx;
+}
+
+.order-item {
+  background: white;
+  padding: 30rpx;
+  margin: 20rpx 0;
+  border-radius: 12rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  transition: transform 0.3s ease;
+}
+
+.order-item:active {
+  transform: translateY(-2rpx);
+}
+
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+
+.order-id {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.order-status {
+  font-size: 24rpx;
+  padding: 8rpx 16rpx;
+  border-radius: 20rpx;
+  font-weight: bold;
+}
+
+.order-status.pending {
+  background: #fff7e6;
+  color: #fa8c16;
+}
+
+.order-status.assigned {
+  background: #e6f7ff;
+  color: #1890ff;
+}
+
+.order-status.in_transit {
+  background: #f6ffed;
+  color: #52c41a;
+}
+
+.order-status.delivered {
+  background: #f6f6f6;
+  color: #666;
+}
+
+.order-info {
+  margin-bottom: 20rpx;
+}
+
+.route-info, .goods-info, .time-info {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10rpx;
+}
+
+.route-icon, .goods-icon, .time-icon {
+  font-size: 24rpx;
+  margin-right: 10rpx;
+  opacity: 0.7;
+}
+
+.route-text, .goods-text, .time-text {
+  font-size: 26rpx;
+  color: #666;
+}
+
+/* 操作按钮样式 */
+.order-actions {
+  display: flex;
+  gap: 15rpx;
+}
+
+.action-btn {
+  flex: 1;
+  border: none;
+  padding: 15rpx 20rpx;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+  font-weight: bold;
+}
+
+.assign-btn {
+  background: #1890ff;
+  color: white;
+}
+
+.delete-btn {
+  background: #f5222d;
+  color: white;
+}
+
+.transit-btn {
+  background: #52c41a;
+  color: white;
+}
+
+.complete-btn {
+  background: #722ed1;
+  color: white;
+}
+
+/* 空状态样式 */
+.empty-state {
+  text-align: center;
+  padding: 100rpx 40rpx;
+  color: #999;
+}
+
+.empty-icon {
+  font-size: 80rpx;
+  margin-bottom: 20rpx;
+  display: block;
+}
+
+.empty-text {
+  display: block;
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+
+.empty-hint {
+  font-size: 24rpx;
+  color: #ccc;
+}
+
+/* 弹窗样式 */
+.modal-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+}
+
+.modal-content {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  background: white;
+  border-radius: 12rpx;
+  width: 80%;
+  max-width: 600rpx;
+  z-index: 1001;
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.2);
+}
+
+.modal-content.large {
+  width: 90%;
+  max-width: 700rpx;
+}
+
+.modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1rpx solid #eee;
+}
+
+.modal-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.modal-close {
+  font-size: 36rpx;
+  color: #999;
+  cursor: pointer;
+  padding: 10rpx;
+}
+
+.modal-body {
+  padding: 30rpx;
+}
+
+.modal-text {
+  font-size: 28rpx;
+  color: #666;
+  margin-bottom: 20rpx;
+  display: block;
+}
+
+/* 员工选择列表 */
+.staff-select-list {
+  max-height: 400rpx;
+}
+
+.staff-select-item {
+  display: flex;
+  align-items: center;
+  padding: 20rpx;
+  border: 1rpx solid #eee;
+  border-radius: 8rpx;
+  margin-bottom: 15rpx;
+  transition: all 0.3s ease;
+}
+
+.staff-select-item:active {
+  background: #f5f5f5;
+}
+
+.staff-avatar {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 20rpx;
+  color: white;
+  font-size: 24rpx;
+  font-weight: bold;
+}
+
+.staff-info {
+  flex: 1;
+}
+
+.staff-name {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+  display: block;
+  margin-bottom: 5rpx;
+}
+
+.staff-phone {
+  font-size: 24rpx;
+  color: #666;
+  display: block;
+  margin-bottom: 5rpx;
+}
+
+.staff-status {
+  font-size: 22rpx;
+  color: #999;
+}
+
+.empty-staff {
+  text-align: center;
+  padding: 40rpx;
+  color: #999;
+}
+
+/* 表单样式 */
+.form-hint {
+  background: #e8f6ef;
+  padding: 20rpx;
+  border-radius: 8rpx;
+  margin-bottom: 30rpx;
+}
+
+.hint-text {
+  font-size: 24rpx;
+  color: #27ae60;
+}
+
+.form-item {
+  margin-bottom: 40rpx;
+}
+
+.form-label {
+  display: block;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 15rpx;
+}
+
+.form-input {
+  width: 100%;
+  padding: 25rpx;
+  border: 1rpx solid #ddd;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  background: #f8f9fa;
+}
+
+.picker-display {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 25rpx;
+  border: 1rpx solid #ddd;
+  border-radius: 8rpx;
+  background: #f8f9fa;
+}
+
+.picker-text {
+  font-size: 28rpx;
+  color: #333;
+}
+
+.picker-arrow {
+  color: #999;
+  font-size: 24rpx;
+}
+
+.submit-btn {
+  width: 100%;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: white;
+  border: none;
+  padding: 30rpx;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-top: 20rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/staff.json b/miniprogram/pages/staff/staff.json
new file mode 100644
index 0000000..7c8faaa
--- /dev/null
+++ b/miniprogram/pages/staff/staff.json
@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "员工管理",
+  "navigationBarBackgroundColor": "#667eea",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#f8f9fa",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": false,
+  "disableScroll": true
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/staff.ts b/miniprogram/pages/staff/staff.ts
new file mode 100644
index 0000000..d50a2b4
--- /dev/null
+++ b/miniprogram/pages/staff/staff.ts
@@ -0,0 +1,82 @@
+// 员工管理主界面 - 根据用户角色跳转到不同界面
+import { UserInfo } from '../../types';
+
+Page({
+  data: {
+    userInfo: null as UserInfo | null,
+    isAdmin: false,
+    loading: true
+  },
+
+  onLoad() {
+    // 获取用户信息
+    this.getUserInfo();
+  },
+
+  onShow() {
+    // 页面显示时重新获取用户信息
+    this.getUserInfo();
+  },
+
+  /**
+   * 获取用户信息并判断角色
+   */
+  getUserInfo() {
+    this.setData({ loading: true });
+    
+    // 从全局数据获取用户信息
+    const app = getApp<any>();
+    if (app.globalData.userInfo) {
+      const userInfo = app.globalData.userInfo;
+      const isAdmin = userInfo.role === 'ADMIN';
+      
+      this.setData({
+        userInfo,
+        isAdmin,
+        loading: false
+      });
+      
+      // 根据角色自动跳转到对应界面
+      this.redirectToRolePage();
+    } else {
+      // 如果没有用户信息，跳转到登录页面
+      wx.redirectTo({
+        url: '/pages/index/index'
+      });
+    }
+  },
+
+  /**
+   * 根据用户角色跳转到对应页面
+   */
+  redirectToRolePage() {
+    const { isAdmin } = this.data;
+    
+    if (isAdmin) {
+      // 管理员跳转到管理员界面
+      wx.redirectTo({
+        url: '/pages/staff/admin-dashboard'
+      });
+    } else {
+      // 员工跳转到员工界面
+      wx.redirectTo({
+        url: '/pages/staff/employee-dashboard'
+      });
+    }
+  },
+
+  /**
+   * 手动选择界面（用于测试或特殊情况）
+   */
+  goToAdminPage() {
+    wx.redirectTo({
+      url: '/pages/staff/admin-dashboard'
+    });
+  },
+
+  goToEmployeePage() {
+    wx.redirectTo({
+      url: '/pages/staff/employee-dashboard'
+    });
+  }
+});
\ No newline at end of file
diff --git a/miniprogram/pages/staff/staff.wxml b/miniprogram/pages/staff/staff.wxml
new file mode 100644
index 0000000..42f6976
--- /dev/null
+++ b/miniprogram/pages/staff/staff.wxml
@@ -0,0 +1,37 @@
+<!-- 员工管理主界面 -->
+<view class="container">
+  <!-- 加载状态 -->
+  <view wx:if="{{loading}}" class="loading-container">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">正在加载用户信息...</text>
+  </view>
+
+  <!-- 主界面内容 -->
+  <view wx:else class="main-content">
+    <!-- 头部信息 -->
+    <view class="header">
+      <view class="user-info">
+        <view class="user-avatar">👤</view>
+        <view class="user-details">
+          <text class="user-name">{{userInfo.name || '用户'}}</text>
+          <text class="user-role">{{isAdmin ? '管理员' : '员工'}}</text>
+        </view>
+      </view>
+      <view class="welcome-text">
+        <text class="welcome">欢迎使用员工管理系统</text>
+        <text class="subtitle">正在为您跳转到{{isAdmin ? '管理员' : '员工'}}界面...</text>
+      </view>
+    </view>
+
+    <!-- 手动选择按钮（用于测试） -->
+    <view class="manual-buttons">
+      <button class="btn-admin" bindtap="goToAdminPage">管理员界面</button>
+      <button class="btn-employee" bindtap="goToEmployeePage">员工界面</button>
+    </view>
+
+    <!-- 加载提示 -->
+    <view class="redirect-info">
+      <text class="redirect-text">如果页面没有自动跳转，请点击上方按钮</text>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/staff/staff.wxss b/miniprogram/pages/staff/staff.wxss
new file mode 100644
index 0000000..a335aef
--- /dev/null
+++ b/miniprogram/pages/staff/staff.wxss
@@ -0,0 +1,157 @@
+/* 员工管理主界面样式 */
+.container {
+  height: 100vh;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40rpx;
+}
+
+/* 加载状态样式 */
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background: rgba(255, 255, 255, 0.95);
+  padding: 60rpx;
+  border-radius: 20rpx;
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
+}
+
+.loading-spinner {
+  width: 80rpx;
+  height: 80rpx;
+  border: 6rpx solid #f3f3f3;
+  border-top: 6rpx solid #667eea;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 30rpx;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+  font-size: 32rpx;
+  color: #666;
+}
+
+/* 主内容样式 */
+.main-content {
+  width: 100%;
+  max-width: 600rpx;
+  background: rgba(255, 255, 255, 0.95);
+  border-radius: 20rpx;
+  padding: 60rpx;
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
+}
+
+/* 头部信息样式 */
+.header {
+  text-align: center;
+  margin-bottom: 60rpx;
+}
+
+.user-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 40rpx;
+}
+
+.user-avatar {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 50%;
+  margin-right: 30rpx;
+  border: 4rpx solid #667eea;
+}
+
+.user-details {
+  text-align: left;
+}
+
+.user-name {
+  display: block;
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+
+.user-role {
+  display: block;
+  font-size: 28rpx;
+  color: #666;
+  background: #f0f0f0;
+  padding: 8rpx 16rpx;
+  border-radius: 20rpx;
+}
+
+.welcome-text {
+  text-align: center;
+}
+
+.welcome {
+  display: block;
+  font-size: 32rpx;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+
+.subtitle {
+  display: block;
+  font-size: 26rpx;
+  color: #666;
+}
+
+/* 手动选择按钮样式 */
+.manual-buttons {
+  display: flex;
+  gap: 30rpx;
+  margin-bottom: 40rpx;
+}
+
+.btn-admin, .btn-employee {
+  flex: 1;
+  padding: 25rpx;
+  border: none;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.btn-admin {
+  background: linear-gradient(135deg, #ff6b6b, #ee5a52);
+  color: white;
+}
+
+.btn-employee {
+  background: linear-gradient(135deg, #4ecdc4, #44a08d);
+  color: white;
+}
+
+.btn-admin:active, .btn-employee:active {
+  transform: translateY(2rpx);
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.2);
+}
+
+/* 跳转信息样式 */
+.redirect-info {
+  text-align: center;
+  padding: 30rpx;
+  background: #f8f9fa;
+  border-radius: 12rpx;
+}
+
+.redirect-text {
+  font-size: 26rpx;
+  color: #666;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/warehouse-management.json b/miniprogram/pages/staff/warehouse-management.json
new file mode 100644
index 0000000..ba4d602
--- /dev/null
+++ b/miniprogram/pages/staff/warehouse-management.json
@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "仓库管理",
+  "navigationBarBackgroundColor": "#667eea",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#f8f9fa",
+  "enablePullDownRefresh": true,
+  "disableScroll": false,
+  "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/miniprogram/pages/staff/warehouse-management.ts b/miniprogram/pages/staff/warehouse-management.ts
new file mode 100644
index 0000000..b5d50be
--- /dev/null
+++ b/miniprogram/pages/staff/warehouse-management.ts
@@ -0,0 +1,324 @@
+// 仓库管理页面 - 处理仓库的增删改查和库存管理
+import { showToast } from '../../utils/helpers';
+import { WarehouseInfo } from '../../types';
+import warehouseService from '../../services/warehouseService';
+
+Page({
+  data: {
+    // 仓库列表
+    warehouses: [] as WarehouseInfo[],
+    filteredWarehouses: [] as WarehouseInfo[],
+    
+    // 页面状态
+    currentTab: 'list', // list: 列表页, add: 添加页
+    loading: false,
+    
+    // 添加仓库表单数据
+    addForm: {
+      name: '',
+      address: '',
+      contact: '',
+      phone: '',
+      description: '',
+      capacity: 500,
+      longitude: 102.833722,
+      latitude: 24.880095
+    },
+    
+    // 错误信息
+    errorMessage: '',
+    successMessage: '',
+    
+    // 搜索关键词
+    searchKeyword: '',
+    
+    // 用户信息
+    userInfo: null as any
+  },
+
+  onLoad() {
+    this.loadWarehouses();
+  },
+
+  onShow() {
+    // 页面显示时刷新数据
+    this.loadWarehouses();
+  },
+
+  // 加载仓库列表
+  async loadWarehouses() {
+    this.setData({
+      loading: true,
+      errorMessage: ''
+    });
+
+    try {
+      const warehouses = await warehouseService.getWarehouses();
+      this.setData({
+        warehouses,
+        filteredWarehouses: warehouses,
+        loading: false
+      });
+    } catch (error) {
+      console.error('加载仓库列表失败:', error);
+      this.setData({
+        loading: false,
+        errorMessage: '加载仓库列表失败，请重试'
+      });
+    }
+  },
+
+  // 切换标签页
+  switchTab(e: any) {
+    const tab = e.currentTarget.dataset.tab;
+    this.setData({
+      currentTab: tab
+    });
+  },
+
+  // 搜索仓库
+  onSearchInput(e: any) {
+    const keyword = e.detail.value.trim();
+    this.setData({
+      searchKeyword: keyword
+    });
+    this.filterWarehouses(keyword);
+  },
+
+  // 过滤仓库列表
+  filterWarehouses(keyword: string) {
+    const { warehouses } = this.data;
+    
+    if (!keyword) {
+      this.setData({
+        filteredWarehouses: warehouses
+      });
+      return;
+    }
+
+    const filtered = warehouses.filter(warehouse => 
+      warehouse.name.includes(keyword) ||
+      warehouse.address.includes(keyword) ||
+      warehouse.contact?.includes(keyword) ||
+      warehouse.phone?.includes(keyword)
+    );
+
+    this.setData({
+      filteredWarehouses: filtered
+    });
+  },
+
+  // 表单输入处理
+  onNameInput(e: any) {
+    this.setData({
+      'addForm.name': e.detail.value
+    });
+  },
+
+  onAddressInput(e: any) {
+    this.setData({
+      'addForm.address': e.detail.value
+    });
+  },
+
+  onContactInput(e: any) {
+    this.setData({
+      'addForm.contact': e.detail.value
+    });
+  },
+
+  onPhoneInput(e: any) {
+    this.setData({
+      'addForm.phone': e.detail.value
+    });
+  },
+
+  onDescriptionInput(e: any) {
+    this.setData({
+      'addForm.description': e.detail.value
+    });
+  },
+
+  onCapacityInput(e: any) {
+    this.setData({
+      'addForm.capacity': parseInt(e.detail.value) || 500
+    });
+  },
+
+  // 验证表单
+  validateForm(): boolean {
+    const { name, address, contact, phone } = this.data.addForm;
+    
+    if (!name.trim()) {
+      this.setData({
+        errorMessage: '请输入仓库名称'
+      });
+      return false;
+    }
+
+    if (!address.trim()) {
+      this.setData({
+        errorMessage: '请输入仓库地址'
+      });
+      return false;
+    }
+
+    if (!contact?.trim()) {
+      this.setData({
+        errorMessage: '请输入联系人'
+      });
+      return false;
+    }
+
+    if (!phone?.trim()) {
+      this.setData({
+        errorMessage: '请输入联系电话'
+      });
+      return false;
+    }
+
+    return true;
+  },
+
+  // 提交添加仓库表单
+  async submitAddForm() {
+    this.setData({
+      errorMessage: '',
+      successMessage: ''
+    });
+
+    if (!this.validateForm()) {
+      return;
+    }
+
+    this.setData({
+      loading: true
+    });
+
+    try {
+      await warehouseService.createWarehouse(this.data.addForm);
+      
+      this.setData({
+        loading: false,
+        successMessage: '仓库添加成功',
+        currentTab: 'list'
+      });
+
+      // 重置表单
+      this.resetForm();
+      
+      // 重新加载仓库列表
+      this.loadWarehouses();
+      
+      showToast('仓库添加成功');
+      
+    } catch (error) {
+      console.error('添加仓库失败:', error);
+      this.setData({
+        loading: false,
+        errorMessage: '添加仓库失败，请重试'
+      });
+    }
+  },
+
+  // 重置表单
+  resetForm() {
+    this.setData({
+      addForm: {
+        name: '',
+        address: '',
+        contact: '',
+        phone: '',
+        description: '',
+        capacity: 500,
+        longitude: 102.833722,
+        latitude: 24.880095
+      }
+    });
+  },
+
+  // 删除仓库
+  async deleteWarehouse(e: any) {
+    const warehouseId = e.currentTarget.dataset.id;
+    const warehouseName = e.currentTarget.dataset.name;
+    
+    wx.showModal({
+      title: '确认删除',
+      content: `确定要删除仓库"${warehouseName}"吗？此操作不可恢复。`,
+      confirmText: '删除',
+      confirmColor: '#ff4757',
+      cancelText: '取消',
+      success: async (res) => {
+        if (res.confirm) {
+          try {
+            await warehouseService.deleteWarehouse(warehouseId);
+            showToast('仓库删除成功');
+            
+            // 重新加载仓库列表
+            this.loadWarehouses();
+            
+          } catch (error) {
+            console.error('删除仓库失败:', error);
+            showToast('删除仓库失败');
+          }
+        }
+      }
+    });
+  },
+
+  // 获取仓库状态文本
+  getWarehouseStatusText(status: 'open' | 'closed' | 'maintenance' | undefined): string {
+    const statusMap: Record<string, string> = {
+      'open': '营业中',
+      'closed': '已关闭', 
+      'maintenance': '维护中'
+    };
+    return statusMap[status || 'open'] || '未知状态';
+  },
+
+  // 获取仓库库存状态
+  getWarehouseInventoryStatus(currentStock: number, capacity: number): string {
+    const percentage = (currentStock / capacity) * 100;
+    if (percentage >= 90) return '库存充足';
+    if (percentage >= 60) return '库存正常';
+    if (percentage >= 30) return '库存偏低';
+    return '库存不足';
+  },
+
+  // 获取库存状态对应的颜色
+  getInventoryStatusColor(currentStock: number, capacity: number): string {
+    const percentage = (currentStock / capacity) * 100;
+    if (percentage >= 90) return '#52c41a'; // 绿色
+    if (percentage >= 60) return '#1890ff'; // 蓝色
+    if (percentage >= 30) return '#faad14'; // 橙色
+    return '#f5222d'; // 红色
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.loadWarehouses().finally(() => {
+      wx.stopPullDownRefresh();
+    });
+  },
+
+  // 清除错误信息
+  clearError() {
+    this.setData({
+      errorMessage: ''
+    });
+  },
+
+  // 清除成功信息
+  clearSuccess() {
+    this.setData({
+      successMessage: ''
+    });
+  },
+
+  /**
+   * 返回上一页
+   */
+  goBack() {
+    wx.navigateBack();
+  }
+});
\ No newline at end of file
diff --git a/miniprogram/pages/staff/warehouse-management.wxml b/miniprogram/pages/staff/warehouse-management.wxml
new file mode 100644
index 0000000..bb561d2
--- /dev/null
+++ b/miniprogram/pages/staff/warehouse-management.wxml
@@ -0,0 +1,219 @@
+<!-- 仓库管理页面 -->
+<view class="warehouse-container">
+  <!-- 顶部导航栏 -->
+  <view class="page-header">
+    <view class="header-content">
+      <view class="header-left">
+        <!-- 微信风格返回按钮 -->
+        <view class="back-icon" bindtap="goBack">
+          <text class="back-arrow">‹</text>
+        </view>
+        <text class="header-title">仓库管理</text>
+      </view>
+      <view class="header-actions">
+        <button class="refresh-btn" bindtap="loadWarehouses">刷新</button>
+      </view>
+    </view>
+  </view>
+
+  <!-- 消息提示 -->
+  <view wx:if="{{errorMessage}}" class="error-message">
+    <text>{{errorMessage}}</text>
+    <text class="close-btn" bindtap="clearError">×</text>
+  </view>
+  
+  <view wx:if="{{successMessage}}" class="success-message">
+    <text>{{successMessage}}</text>
+    <text class="close-btn" bindtap="clearSuccess">×</text>
+  </view>
+
+  <!-- 加载状态 -->
+  <view wx:if="{{loading}}" class="loading-container">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">加载中...</text>
+  </view>
+
+  <!-- 页面标签 -->
+  <view class="tab-container">
+    <view 
+      class="tab-item {{currentTab === 'list' ? 'active' : ''}}"
+      data-tab="list"
+      bindtap="switchTab"
+    >
+      <text>仓库列表</text>
+    </view>
+    <view 
+      class="tab-item {{currentTab === 'add' ? 'active' : ''}}"
+      data-tab="add"
+      bindtap="switchTab"
+    >
+      <text>添加仓库</text>
+    </view>
+  </view>
+
+  <!-- 仓库列表页面 -->
+  <view wx:if="{{currentTab === 'list'}}" class="list-page">
+    <!-- 搜索框 -->
+    <view class="search-container">
+      <view class="search-input-wrapper">
+        <input 
+          class="search-input" 
+          placeholder="搜索仓库名称、地址、联系人..."
+          bindinput="onSearchInput"
+          value="{{searchKeyword}}"
+        />
+        <text class="search-icon">🔍</text>
+      </view>
+    </view>
+
+    <!-- 仓库列表 -->
+    <scroll-view class="warehouse-list" scroll-y>
+      <view wx:if="{{filteredWarehouses.length === 0}}" class="empty-state">
+        <text class="empty-icon">🏭</text>
+        <text class="empty-text">
+          {{searchKeyword ? '未找到相关仓库' : '暂无仓库数据'}}
+        </text>
+      </view>
+
+      <view wx:for="{{filteredWarehouses}}" wx:key="id" class="warehouse-item">
+        <view class="warehouse-header">
+          <view class="warehouse-info">
+            <text class="warehouse-name">{{item.name}}</text>
+            <view class="warehouse-status">
+              <text class="status-badge {{item.status}}">
+                {{getWarehouseStatusText(item.status)}}
+              </text>
+            </view>
+          </view>
+          <view class="warehouse-actions">
+            <button 
+              class="delete-btn" 
+              data-id="{{item.id}}"
+              data-name="{{item.name}}"
+              bindtap="deleteWarehouse"
+            >删除</button>
+          </view>
+        </view>
+
+        <view class="warehouse-details">
+          <view class="detail-row">
+            <text class="detail-label">地址：</text>
+            <text class="detail-value">{{item.address}}</text>
+          </view>
+          
+          <view class="detail-row">
+            <text class="detail-label">联系人：</text>
+            <text class="detail-value">{{item.contact || '未设置'}}</text>
+          </view>
+          
+          <view class="detail-row">
+            <text class="detail-label">电话：</text>
+            <text class="detail-value">{{item.phone || '未设置'}}</text>
+          </view>
+          
+          <view class="detail-row">
+            <text class="detail-label">库存状态：</text>
+            <text 
+              class="detail-value inventory-status"
+              style="color: {{getInventoryStatusColor(item)}}"
+            >
+              {{getWarehouseInventoryStatus(item)}}
+            </text>
+          </view>
+          
+          <view class="detail-row">
+            <text class="detail-label">容量：</text>
+            <text class="detail-value">{{item.capacity || 0}} 件</text>
+          </view>
+          
+          <view wx:if="{{item.description}}" class="detail-row">
+            <text class="detail-label">描述：</text>
+            <text class="detail-value description">{{item.description}}</text>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+
+  <!-- 添加仓库页面 -->
+  <view wx:if="{{currentTab === 'add'}}" class="add-page">
+    <scroll-view class="form-container" scroll-y>
+      <view class="form-section">
+        <text class="section-title">基本信息</text>
+        
+        <view class="form-group">
+          <text class="form-label">仓库名称 *</text>
+          <input 
+            class="form-input" 
+            placeholder="请输入仓库名称"
+            bindinput="onNameInput"
+            value="{{addForm.name}}"
+          />
+        </view>
+
+        <view class="form-group">
+          <text class="form-label">仓库地址 *</text>
+          <input 
+            class="form-input" 
+            placeholder="请输入仓库地址"
+            bindinput="onAddressInput"
+            value="{{addForm.address}}"
+          />
+        </view>
+
+        <view class="form-group">
+          <text class="form-label">联系人 *</text>
+          <input 
+            class="form-input" 
+            placeholder="请输入联系人姓名"
+            bindinput="onContactInput"
+            value="{{addForm.contact}}"
+          />
+        </view>
+
+        <view class="form-group">
+          <text class="form-label">联系电话 *</text>
+          <input 
+            class="form-input" 
+            placeholder="请输入联系电话"
+            bindinput="onPhoneInput"
+            value="{{addForm.phone}}"
+            type="number"
+          />
+        </view>
+
+        <view class="form-group">
+          <text class="form-label">仓库容量</text>
+          <input 
+            class="form-input" 
+            placeholder="请输入仓库容量（件数）"
+            bindinput="onCapacityInput"
+            value="{{addForm.capacity}}"
+            type="number"
+          />
+        </view>
+      </view>
+
+      <view class="form-section">
+        <text class="section-title">其他信息</text>
+        
+        <view class="form-group">
+          <text class="form-label">仓库描述</text>
+          <textarea 
+            class="form-textarea" 
+            placeholder="请输入仓库描述信息（可选）"
+            bindinput="onDescriptionInput"
+            value="{{addForm.description}}"
+            maxlength="200"
+          />
+          <text class="textarea-counter">{{addForm.description ? addForm.description.length : 0}}/200</text>
+        </view>
+      </view>
+
+      <view class="form-actions">
+        <button class="submit-btn" bindtap="submitAddForm">添加仓库</button>
+        <button class="reset-btn" bindtap="resetForm">重置表单</button>
+      </view>
+    </scroll-view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/staff/warehouse-management.wxss b/miniprogram/pages/staff/warehouse-management.wxss
new file mode 100644
index 0000000..79a0815
--- /dev/null
+++ b/miniprogram/pages/staff/warehouse-management.wxss
@@ -0,0 +1,421 @@
+/* 仓库管理页面样式 */
+.warehouse-container {
+  min-height: 100vh;
+  background-color: #f8f9fa;
+}
+
+/* 顶部导航栏 */
+.page-header {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  padding: 20rpx 30rpx;
+  color: white;
+}
+
+.header-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+}
+
+/* 微信风格返回按钮 */
+.back-icon {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+}
+
+.back-icon:active {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.back-arrow {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  line-height: 1;
+}
+
+.header-title {
+  font-size: 36rpx;
+  font-weight: 600;
+}
+
+.header-actions {
+  display: flex;
+  gap: 20rpx;
+}
+
+.refresh-btn {
+  background: rgba(255, 255, 255, 0.2);
+  color: white;
+  border: none;
+  padding: 12rpx 24rpx;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+}
+
+/* 消息提示 */
+.error-message, .success-message {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 30rpx;
+  margin: 20rpx 30rpx;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+}
+
+.error-message {
+  background-color: #fff2f0;
+  border: 1rpx solid #ffccc7;
+  color: #a8071a;
+}
+
+.success-message {
+  background-color: #f6ffed;
+  border: 1rpx solid #b7eb8f;
+  color: #389e0d;
+}
+
+.close-btn {
+  font-size: 36rpx;
+  cursor: pointer;
+}
+
+/* 加载状态 */
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 100rpx 0;
+}
+
+.loading-spinner {
+  width: 60rpx;
+  height: 60rpx;
+  border: 6rpx solid #f3f3f3;
+  border-top: 6rpx solid #667eea;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 20rpx;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+  font-size: 28rpx;
+  color: #666;
+}
+
+/* 页面标签 */
+.tab-container {
+  display: flex;
+  background: white;
+  border-bottom: 1rpx solid #e8e8e8;
+}
+
+.tab-item {
+  flex: 1;
+  text-align: center;
+  padding: 24rpx 0;
+  font-size: 28rpx;
+  color: #666;
+  border-bottom: 4rpx solid transparent;
+  transition: all 0.3s;
+}
+
+.tab-item.active {
+  color: #667eea;
+  border-bottom-color: #667eea;
+  font-weight: 600;
+}
+
+/* 列表页面样式 */
+.list-page {
+  padding: 30rpx;
+}
+
+/* 搜索框 */
+.search-container {
+  margin-bottom: 30rpx;
+}
+
+.search-input-wrapper {
+  position: relative;
+  background: white;
+  border-radius: 12rpx;
+  padding: 20rpx 60rpx 20rpx 30rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.1);
+}
+
+.search-input {
+  font-size: 28rpx;
+  color: #333;
+}
+
+.search-icon {
+  position: absolute;
+  right: 30rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 28rpx;
+  color: #999;
+}
+
+/* 仓库列表 */
+.warehouse-list {
+  max-height: calc(100vh - 400rpx);
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 100rpx 0;
+  color: #999;
+}
+
+.empty-icon {
+  font-size: 80rpx;
+  margin-bottom: 20rpx;
+}
+
+.empty-text {
+  font-size: 28rpx;
+}
+
+.warehouse-item {
+  background: white;
+  border-radius: 12rpx;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.1);
+}
+
+.warehouse-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 20rpx;
+}
+
+.warehouse-info {
+  flex: 1;
+}
+
+.warehouse-name {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 10rpx;
+  display: block;
+}
+
+.warehouse-status {
+  display: flex;
+  gap: 10rpx;
+}
+
+.status-badge {
+  padding: 6rpx 16rpx;
+  border-radius: 20rpx;
+  font-size: 22rpx;
+  font-weight: 500;
+}
+
+.status-badge.open {
+  background-color: #f6ffed;
+  color: #52c41a;
+  border: 1rpx solid #b7eb8f;
+}
+
+.status-badge.closed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border: 1rpx solid #ffccc7;
+}
+
+.status-badge.maintenance {
+  background-color: #fff7e6;
+  color: #fa8c16;
+  border: 1rpx solid #ffd591;
+}
+
+.warehouse-actions {
+  display: flex;
+  gap: 10rpx;
+}
+
+.delete-btn {
+  background: #ff4757;
+  color: white;
+  border: none;
+  padding: 12rpx 20rpx;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+}
+
+/* 仓库详情 */
+.warehouse-details {
+  border-top: 1rpx solid #f0f0f0;
+  padding-top: 20rpx;
+}
+
+.detail-row {
+  display: flex;
+  margin-bottom: 12rpx;
+  font-size: 26rpx;
+}
+
+.detail-label {
+  color: #666;
+  min-width: 120rpx;
+}
+
+.detail-value {
+  color: #333;
+  flex: 1;
+}
+
+.inventory-status {
+  font-weight: 600;
+}
+
+.description {
+  line-height: 1.5;
+}
+
+/* 添加页面样式 */
+.add-page {
+  padding: 30rpx;
+}
+
+.form-container {
+  max-height: calc(100vh - 300rpx);
+}
+
+.form-section {
+  background: white;
+  border-radius: 12rpx;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.1);
+}
+
+.section-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 20rpx;
+  display: block;
+}
+
+.form-group {
+  margin-bottom: 24rpx;
+}
+
+.form-group:last-child {
+  margin-bottom: 0;
+}
+
+.form-label {
+  display: block;
+  font-size: 26rpx;
+  color: #333;
+  margin-bottom: 12rpx;
+  font-weight: 500;
+}
+
+.form-input, .form-textarea {
+  width: 100%;
+  border: 1rpx solid #e8e8e8;
+  border-radius: 8rpx;
+  padding: 20rpx;
+  font-size: 26rpx;
+  background: #fafafa;
+  box-sizing: border-box;
+}
+
+.form-input:focus, .form-textarea:focus {
+  border-color: #667eea;
+  background: white;
+}
+
+.form-textarea {
+  min-height: 120rpx;
+  resize: none;
+}
+
+.textarea-counter {
+  display: block;
+  text-align: right;
+  font-size: 22rpx;
+  color: #999;
+  margin-top: 8rpx;
+}
+
+.form-actions {
+  display: flex;
+  gap: 20rpx;
+  margin-top: 40rpx;
+}
+
+.submit-btn {
+  flex: 2;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: white;
+  border: none;
+  padding: 24rpx;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  font-weight: 600;
+}
+
+.reset-btn {
+  flex: 1;
+  background: #f0f0f0;
+  color: #666;
+  border: none;
+  padding: 24rpx;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+}
+
+/* 响应式设计 */
+@media (max-width: 750rpx) {
+  .warehouse-header {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  
+  .warehouse-actions {
+    margin-top: 20rpx;
+    width: 100%;
+    justify-content: flex-end;
+  }
+  
+  .form-actions {
+    flex-direction: column;
+  }
+  
+  .submit-btn, .reset-btn {
+    flex: none;
+  }
+}
\ No newline at end of file
diff --git a/miniprogram/services/apiService.ts b/miniprogram/services/apiService.ts
index efab06f..90fa6fe 100644
--- a/miniprogram/services/apiService.ts
+++ b/miniprogram/services/apiService.ts
@@ -1,4 +1,5 @@
 import { WarehouseInfo, UserInfo, DeliveryPerson, Order, EmployeeInfo } from '../types';
+import locationTrackingService from './locationTrackingService';
 
 
 /**
@@ -7,7 +8,7 @@ import { WarehouseInfo, UserInfo, DeliveryPerson, Order, EmployeeInfo } from '..
  */
 
 // API基础URL配置
-const IS_LOCAL_DEV = true; // true: 本地开发环境, false: 生产环境
+const IS_LOCAL_DEV = false; // true: 本地开发环境, false: 生产环境
 const API_BASE_URL = IS_LOCAL_DEV ? 'http://localhost:8080' : 'https://www.doubleyin.cn';
 
 console.log(`当前API地址: ${API_BASE_URL} (${IS_LOCAL_DEV ? '本地开发环境' : '生产环境'})`);
@@ -23,16 +24,7 @@ console.log(`当前API地址: ${API_BASE_URL} (${IS_LOCAL_DEV ? '本地开发环
  * 封装了所有与后端API交互的方法，并按照功能模块进行组织
  */
 class ApiService {
-  /**
-   * 位置更新回调函数集合
-   */
-  private locationUpdateCallbacks: Set<(location: any) => void> | null;
-  
-  /**
-   * 在线用户列表回调函数集合
-   */
-  private onlineUserListCallbacks: Set<(userList: any) => void> | null;
-  
+
   /**
    * 位置更新WebSocket连接
    */
@@ -42,8 +34,6 @@ class ApiService {
    * 构造函数
    */
   constructor() {
-    this.locationUpdateCallbacks = null;
-    this.onlineUserListCallbacks = null;
     this.locationWebSocket = null;
   }
   
@@ -148,28 +138,27 @@ async ServerLogin(code: string) {
     
     // 构建请求数据，必须包含位置数据
     const requestData: any = { 
-      userId,
       latitude: initialLocation.latitude,
       longitude: initialLocation.longitude,
       timestamp: initialLocation.timestamp
     };
     
-    // 服务器返回的是用户对象，需要转换为前端期望的格式
+    // 服务器现在返回统一的DTO格式，直接使用
     const response = await this.request<any>('/user/signin', {
       method: 'POST',
       data: requestData,
     });
     
-    // 转换响应格式
+    // 服务器返回格式：{ success: boolean, userInfo: UserInfoResponse }
     return {
-      success: true,
+      success: response.success,
       employeeInfo: {
-        id: response.id,
-        name: response.name,
-        phone: response.phone,
-        role: response.role || 'DELIVERY_PERSON'
+        id: response.userInfo.id,
+        name: response.userInfo.name,
+        phone: response.userInfo.phone,
+        role: response.userInfo.role || 'DELIVERY_PERSON'
       },
-      message: '签到成功'
+      message: response.message
     };
   }
 
@@ -181,22 +170,21 @@ async ServerLogin(code: string) {
   async userRegister(userInfo: { name: string; phone: string }): Promise<{ success: boolean; employeeInfo: EmployeeInfo; message?: string }> {
     console.log('API userRegister调用，参数userInfo:', userInfo);
     
-    // 服务器返回的是用户对象，需要转换为前端期望的格式
+    // 服务器现在返回统一的DTO格式：{ success: boolean, userInfo: UserInfoResponse }
     const response = await this.request<any>('/user/register', {
       method: 'POST',
       data: userInfo,
     });
     
-    // 转换响应格式
     return {
-      success: true,
+      success: response.success,
       employeeInfo: {
-        id: response.id,
-        name: response.name || userInfo.name, // 如果服务器返回null，使用用户输入的值
-        phone: response.phone || userInfo.phone, // 如果服务器返回null，使用用户输入的值
-        role: response.role || 'DELIVERY_PERSON'
+        id: response.userInfo.id,
+        name: response.userInfo.name || userInfo.name, // 如果服务器返回null，使用用户输入的值
+        phone: response.userInfo.phone || userInfo.phone, // 如果服务器返回null，使用用户输入的值
+        role: response.userInfo.role || 'DELIVERY_PERSON'
       },
-      message: '注册成功'
+      message: response.message
     };
   }
 
@@ -217,10 +205,16 @@ async ServerLogin(code: string) {
   async userSignOut(userId: number): Promise<{ success: boolean; message?: string }> {
     console.log('API userSignOut调用，参数userId:', userId);
     
-    return await this.request('/user/signout', {
+    // 服务器现在返回统一的DTO格式：{ success: boolean, message: string }
+    const response = await this.request<any>('/user/signout', {
       method: 'POST',
       data: { userId },
     });
+    
+    return {
+      success: response.success,
+      message: response.message
+    };
   }
 
   /**
@@ -571,27 +565,6 @@ async ServerLogin(code: string) {
     }
   }
   
-
-
-  /**
-   * 注册在线用户列表回调函数
-   * @param callback 在线用户列表回调函数
-   * @returns 取消订阅函数
-   */
-  onOnlineUserList(callback: (userList: any) => void): () => void {
-    // 添加回调到集合
-    if (!this.onlineUserListCallbacks) {
-      this.onlineUserListCallbacks = new Set();
-    }
-    this.onlineUserListCallbacks.add(callback);
-    
-    // 返回取消订阅函数
-    return () => {
-      if (this.onlineUserListCallbacks) {
-        this.onlineUserListCallbacks.delete(callback);
-      }
-    };
-  }
   
   // ===== 私有属性和方法 =====
   
@@ -710,100 +683,9 @@ async ServerLogin(code: string) {
       console.warn('收到无效的WebSocket消息:', message);
       return;
     }
-    
-    console.log(`📡 收到WebSocket消息类型: ${message.type}`, message);
-    
-    switch (message.type) {
-      case 'onlineUserList':
-        // 处理在线用户列表消息（服务器发送当前在线用户列表）
-        console.log('👥 处理在线用户列表，用户数量:', message.users ? message.users.length : 0);
-         if (message.users && Array.isArray(message.users)) {
-        this.triggerOnlineUserListCallbacks({
-          type: 'onlineUserList',
-          users: message.users.map((user: any) => ({
-            userId: user.userId,
-            name: user.name,
-            role: user.role,
-            userStatus: user.userStatus,
-            lastUpdateTime: user.lastUpdateTime,
-            latitude: user.locationData?.latitude || user.latitude,
-            longitude: user.locationData?.longitude || user.longitude,
-            timestamp: user.locationData?.timestamp || user.timestamp
-          }))
-        });
-      }else {
-          console.warn('❌ onlineUserList消息格式错误，users字段不存在或不是数组');
-        }
-        break;
-         case 'userLocationList':
-        // 处理用户位置列表消息（服务器每30秒发送所有在线用户的位置列表）
-        console.log('👥 处理用户位置列表，用户数量:', message.users ? message.users.length : 0);
-        
-        // 确保用户列表存在且是数组
-        if (message.users && Array.isArray(message.users)) {
-          // 转换用户数据格式，确保与位置追踪服务兼容
-          const formattedUsers = message.users.map((user: any) => {
-            // 支持多种数据格式：locationData字段或直接字段
-            const locationData = user.locationData || user;
-            return {
-              userId: user.userId || locationData.userId,
-              name: user.name || user.userName || `用户${user.userId || locationData.userId}`,
-              role: user.role || 'employee',
-              userStatus: user.userStatus !== false, // 转换为布尔值
-              lastUpdateTime: user.lastUpdateTime || locationData.timestamp || Date.now(),
-              latitude: locationData.latitude,
-              longitude: locationData.longitude,
-              timestamp: locationData.timestamp || user.timestamp || Date.now()
-            };
-          });
-          
-          console.log('📊 转换后的用户位置数据:', formattedUsers);
-          
-          this.triggerOnlineUserListCallbacks({
-            type: 'userLocationList',
-            users: formattedUsers
-          });
-        } else {
-          console.warn('❌ userLocationList消息格式错误，users字段不存在或不是数组');
-        }
-        break;
-      default:
-        console.warn('收到未知类型的WebSocket消息:', message);
-        break;
-    }
+     locationTrackingService.handleWebSocketMessage(message);
   }
 
-
-
-  /**
-   * 触发在线用户列表回调
-   * @param userList 在线用户列表信息
-   */
-  private triggerOnlineUserListCallbacks(userList: any): void {
-    console.log('🔔 [apiService] 开始触发在线用户列表回调，消息类型:', userList.type);
-    console.log('📊 [apiService] 回调数据内容:', JSON.stringify(userList, null, 2));
-    
-    if (this.onlineUserListCallbacks) {
-      console.log(`📞 [apiService] 准备执行 ${this.onlineUserListCallbacks.size} 个回调函数`);
-      let index = 0;
-      this.onlineUserListCallbacks.forEach((callback) => {
-        try {
-          console.log(`🔄 [apiService] 执行第 ${index + 1} 个回调函数`);
-          // 传递正确的数据格式：只传递users数组，而不是整个消息对象
-          callback(userList.users);
-          console.log(`✅ [apiService] 第 ${index + 1} 个回调函数执行成功`);
-          index++;
-        } catch (error) {
-          console.error(`❌ [apiService] 第 ${index + 1} 个回调函数执行失败:`, error);
-          index++;
-        }
-      });
-    } else {
-      console.warn('⚠️ [apiService] 没有注册的在线用户列表回调函数');
-    }
-    console.log('🏁 [apiService] 在线用户列表回调触发完成');
-  }
-  
   /**
    * 发送WebSocket消息
    * @param message 要发送的消息对象
@@ -844,7 +726,7 @@ async ServerLogin(code: string) {
    * 取消订阅位置更新（服务器自动处理，无需发送消息）
    * @param userId 用户ID
    */
-  async unsubscribeFromLocationUpdates(userId: number): Promise<void> {
+  async unsubscribeFromLocationUpdates(_userId: number): Promise<void> {
     // 服务器会自动处理取消订阅逻辑，无需发送取消订阅消息
     console.log('位置取消订阅已初始化，服务器将自动处理取消订阅逻辑');
   }
diff --git a/miniprogram/services/locationTrackingService.ts b/miniprogram/services/locationTrackingService.ts
index 9425291..c2f6ac0 100644
--- a/miniprogram/services/locationTrackingService.ts
+++ b/miniprogram/services/locationTrackingService.ts
@@ -1,5 +1,5 @@
 // 位置追踪服务 - 处理用户签到后的位置追踪和状态管理
-import { UserInfo, LocationData } from '../types';
+import { LocationData } from '../types';
 import apiService from './apiService';
 import userService from './userService';
 import mapService from './mapService';
@@ -22,29 +22,25 @@ export interface OnlineUserInfo {
  * 提供用户签到后的位置追踪、状态管理和位置分发功能
  */
 class LocationTrackingService {
-  // 在线用户列表
+  // 在线用户列表（仅通过服务器WebSocket推送更新）
   private onlineUsers: Map<number, OnlineUserInfo>;
   
-  // 位置更新定时器
+  // 位置更新定时器（仅用于向服务器发送位置信息）
   private locationUpdateTimer: number | null;
   
-  // 状态检查定时器
-  private statusCheckTimer: number | null;
-  
-  // 位置更新回调集合
-  private locationUpdateCallbacks: Set<(locations: OnlineUserInfo[]) => void>;
-  
-  // 用户状态变化回调集合
-  private userStatusCallbacks: Set<(userId: number, status: 'online' | 'offline' | 'timeout') => void>;
-  
+  // 用户状态变化回调函数（单一方法赋值）
+  private userStatusCallback: ((userId: number, status: 'online' | 'offline' | 'timeout') => void) | null;
+
+  /**
+   * 位置更新回调函数类型
+   */
+  private locationUpdateCallback: ((onlineUsers: OnlineUserInfo[]) => void) | null;
+
   // 当前用户是否已签到
   private isSignedIn: boolean;
   
-  // 用户信息缓存
-  private userInfo: UserInfo | null;
-  
   // 取消订阅回调函数
-  private unsubscribeCallback: (() => void) | null;
+  private unsubscribeCallback: (() => void) | null = null;
   
   /**
    * 构造函数
@@ -52,62 +48,27 @@ class LocationTrackingService {
   constructor() {
     this.onlineUsers = new Map();
     this.locationUpdateTimer = null;
-    this.statusCheckTimer = null;
-    this.locationUpdateCallbacks = new Set();
-    this.userStatusCallbacks = new Set();
+    this.userStatusCallback = null;
+    this.locationUpdateCallback = null;
     this.isSignedIn = false;
-    this.userInfo = null;
     this.unsubscribeCallback = null;
   }
   
   /**
-   * 用户签到后启动位置追踪
+   * 启动位置追踪服务（WebSocket连接）
    */
-  public async startTrackingAfterSignIn(): Promise<void> {
+  public async startTracking(): Promise<void> {
     const userInfo = userService.getGlobalUserInfo();
     if (!userInfo || !userInfo.id) {
       throw new Error('用户未登录，无法启动位置追踪');
     }
     
-    // 先获取当前位置数据
-    let initialLocation: { latitude: number; longitude: number; timestamp: number } ;
-   
-      const location = await this.getCurrentLocation();
-      initialLocation = {
-        latitude: location.latitude,
-        longitude: location.longitude,
-        timestamp: Math.floor(Date.now() / 1000)
-      }
-     
-      console.log('获取到初始位置数据:', initialLocation);
-
-      // 调用签到接口，传递位置数据
-    try {
-      await userService.signIn(initialLocation);
-      console.log('签到成功，位置数据已发送到服务器');
-    } catch (error) {
-      console.error('签到失败:', error);
-      throw error;
-    }
-    
     this.isSignedIn = true;
     
-    // 将当前用户添加到在线列表
-    await this.addUserToOnlineList(userInfo);
-    
     // 设置实时位置订阅（初始化WebSocket连接）
     await this.setupRealTimeSubscription();
     
-    // WebSocket连接成功后立即发送第一次位置信息
-    try {
-      const location = await this.getCurrentLocation();
-      await this.updateUserLocation(location);
-      console.log('WebSocket连接成功后立即发送第一次位置信息');
-    } catch (error) {
-      console.error('立即发送位置信息失败:', error);
-    }
-    
-    // 启动位置更新定时器（每30秒更新一次）
+    // 启动位置更新定时器（每30秒向服务器发送位置信息）
     this.startLocationUpdateTimer();
     
     console.log('位置追踪服务已启动');
@@ -117,23 +78,11 @@ class LocationTrackingService {
    * 初始化位置追踪服务
    */
   public async initialize(): Promise<void> {
-    try {
-      // 注册在线用户列表回调
-      apiService.onOnlineUserList((userList) => {
-        this.handleOnlineUserList(userList);
-      });
-      
-      console.log('[LocationTrackingService] 位置追踪服务初始化完成');
-    } catch (error) {
-      console.error('[LocationTrackingService] 初始化失败:', error);
-      throw error;
-    }
+   
   }
   
-
-  
   /**
-   * 用户签退后停止位置追踪
+   * 停止位置追踪服务（WebSocket断开时调用）
    */
   public async stopTracking(): Promise<void> {
     const userInfo = userService.getGlobalUserInfo();
@@ -143,26 +92,30 @@ class LocationTrackingService {
     
     this.isSignedIn = false;
     
-    // 签退消息已通过REST API处理，服务器会自动处理取消订阅逻辑
+    // 停止位置更新定时器
+    this.stopLocationUpdateTimer();
     
-    // 从在线列表中移除用户
-    this.removeUserFromOnlineList(userInfo.id);
+    // 关闭WebSocket连接
+    try {
+      await this.teardownRealTimeSubscription();
+      console.log('调试信息 - WebSocket连接已关闭');
+    } catch (error) {
+      console.warn('调试信息 - 关闭WebSocket连接失败:', error);
+    }
     
-    // 停止定时器
-    this.stopTimers();
+    // 清空在线用户列表（WebSocket断开时清空所有数据）
+    this.onlineUsers.clear();
     
+    // 通知所有位置更新回调，清空地图标记点
+    this.notifyLocationUpdateCallbacks();
     
-    
-    // 关闭实时位置订阅（服务器会自动处理取消订阅）
-    this.teardownRealTimeSubscription();
-    
-    console.log('位置追踪服务已停止');
+    console.log('位置追踪服务已停止，在线用户列表已清空');
   }
 
 
   
   /**
-   * 手动更新用户位置
+   * 向服务器发送位置更新（仅发送，不更新本地缓存）
    */
   public async updateUserLocation(location: { longitude: number; latitude: number }): Promise<void> {
     const userInfo = userService.getGlobalUserInfo();
@@ -171,28 +124,15 @@ class LocationTrackingService {
       return;
     }
     
-    console.log('[位置追踪服务] 前端发送给服务器的位置信息:');
+    console.log('[位置追踪服务] 向服务器发送位置信息:');
     console.log(`- 用户ID: ${userInfo.id}`);
     console.log(`- 经度: ${location.longitude}`);
     console.log(`- 纬度: ${location.latitude}`);
-    const timestamp = Math.floor(Date.now() / 1000);
-    console.log(`- 时间戳: ${timestamp}`);
     
-    const locationData: LocationData = {
-      userId: userInfo.id,
-      longitude: location.longitude,
-      latitude: location.latitude,
-      timestamp: timestamp
-    };
-    
-    // 真实模式：通过WebSocket发送位置更新
-    console.log('[位置追踪服务] 真实模式：通过WebSocket发送位置更新');
+    // 通过WebSocket发送位置更新给服务器
     await apiService.sendLocationUpdate(userInfo.id, location.latitude, location.longitude);
     
-    // 同时更新本地缓存
-    this.updateLocalUserLocation(userInfo.id, locationData);
-    
-    console.log('[位置追踪服务] 位置更新完成');
+    console.log('[位置追踪服务] 位置信息已发送到服务器');
   }
   
   /**
@@ -204,35 +144,26 @@ class LocationTrackingService {
     );
   }
   
-  /**
-   * 订阅位置更新
-   */
-  public subscribeToLocationUpdates(callback: (locations: OnlineUserInfo[]) => void): void {
-    console.log('📝 [LocationTrackingService] 注册位置更新回调函数');
-    console.log('📍 [LocationTrackingService] 当前已注册回调数量:', this.locationUpdateCallbacks.size);
-    this.locationUpdateCallbacks.add(callback);
-    console.log('✅ [LocationTrackingService] 位置更新回调注册完成，当前回调数量:', this.locationUpdateCallbacks.size);
-  }
   
   /**
-   * 取消订阅位置更新
+   * 订阅用户状态变化（单一方法赋值）
+   * @param callback 用户状态变化回调函数
+   * @returns 取消订阅函数
    */
-  public unsubscribeFromLocationUpdates(callback: (locations: OnlineUserInfo[]) => void): void {
-    this.locationUpdateCallbacks.delete(callback);
-  }
-  
-  /**
-   * 订阅用户状态变化
-   */
-  public subscribeToUserStatusChanges(callback: (userId: number, status: 'online' | 'offline' | 'timeout') => void): void {
-    this.userStatusCallbacks.add(callback);
-  }
-  
-  /**
-   * 取消订阅用户状态变化
-   */
-  public unsubscribeFromUserStatusChanges(callback: (userId: number, status: 'online' | 'offline' | 'timeout') => void): void {
-    this.userStatusCallbacks.delete(callback);
+  public subscribeToUserStatusChanges(callback: (userId: number, status: 'online' | 'offline' | 'timeout') => void): () => void {
+    console.log('📝 [LocationTrackingService] 注册用户状态变化回调函数');
+    
+    // 直接赋值，覆盖之前的回调
+    this.userStatusCallback = callback;
+    console.log('✅ [LocationTrackingService] 用户状态变化回调注册完成');
+    
+    // 返回取消订阅函数
+    return () => {
+      if (this.userStatusCallback === callback) {
+        this.userStatusCallback = null;
+        console.log('✅ [LocationTrackingService] 用户状态变化回调已取消');
+      }
+    };
   }
   
   /**
@@ -245,59 +176,6 @@ class LocationTrackingService {
   
   // ===== 私有方法 =====
   
-  /**
-   * 添加用户到在线列表
-   */
-  private async addUserToOnlineList(userInfo: UserInfo): Promise<void> {
-    const currentLocation = await this.getCurrentLocation();
-    
-    const onlineUser: OnlineUserInfo = {
-      userId: userInfo.id,
-      name: userInfo.name || '未知用户',
-      avatarUrl: '/images/user-avatar.png',
-      role: userInfo.role || 'delivery_person', // 用户角色
-      lastLocation: currentLocation,
-      lastUpdateTime: Math.floor(Date.now() / 1000),
-      status: 'online'
-    };
-    
-    this.onlineUsers.set(userInfo.id, onlineUser);
-    
-    
-    
-    console.log(`用户 ${userInfo.id} 已添加到在线列表`);
-  }
-  
-  /**
-   * 从在线列表中移除用户
-   */
-  private removeUserFromOnlineList(userId: number): void {
-    if (this.onlineUsers.has(userId)) {
-      this.onlineUsers.delete(userId);
-      
-
-      
-      // 通知状态变化回调
-      this.notifyUserStatusChange(userId, 'offline');
-      
-      console.log(`用户 ${userId} 已从在线列表移除`);
-    }
-  }
-  
-  /**
-   * 更新本地用户位置
-   */
-  private updateLocalUserLocation(userId: number, location: LocationData): void {
-    const userInfo = this.onlineUsers.get(userId);
-    if (userInfo) {
-      userInfo.lastLocation = location;
-      userInfo.lastUpdateTime = Date.now();
-      userInfo.status = 'online';
-      
-      this.onlineUsers.set(userId, userInfo);
-    }
-  }
-  
   /**
    * 启动位置更新定时器
    */
@@ -316,35 +194,7 @@ class LocationTrackingService {
     }, 30000); // 每30秒更新一次
   }
   
-  /**
-   * 启动状态检查定时器
-   */
-  private startStatusCheckTimer(): void {
-    this.stopStatusCheckTimer();
-    
-    this.statusCheckTimer = setInterval(() => {
-      this.checkUserStatuses();
-    }, 60000); // 每60秒检查一次
-  }
-  
-  /**
-   * 检查用户状态
-   */
-  private checkUserStatuses(): void {
-    const now = Date.now();
-    const timeoutThreshold = 120000; // 2分钟无更新视为超时
-    
-    this.onlineUsers.forEach((userInfo, userId) => {
-      if (now - userInfo.lastUpdateTime > timeoutThreshold) {
-        // 用户超时
-        userInfo.status = 'timeout';
-        this.onlineUsers.set(userId, userInfo);
-        this.notifyUserStatusChange(userId, 'timeout');
-        
-        console.log(`用户 ${userId} 因超时被标记为离线`);
-      }
-    });
-  }
+
   
   /**
    * 获取当前位置
@@ -380,20 +230,6 @@ class LocationTrackingService {
     }
   }
   
-
-  
-  /**
-   * 取消订阅位置更新
-   */
-  private async unsubscribeFromLocations(): Promise<void> {
-    // 真实模式：取消WebSocket订阅
-    await this.teardownRealTimeSubscription();
-  }
-  
-
-  
-
-  
   /**
    * 设置实时位置订阅
    */
@@ -405,8 +241,7 @@ class LocationTrackingService {
       return;
     }
     
-    // 缓存用户信息
-    this.userInfo = userInfo;
+    // 缓存用户信息（已移除）
 
     // 真实环境：初始化WebSocket连接（服务器会自动处理订阅逻辑）
     try {
@@ -464,14 +299,6 @@ class LocationTrackingService {
     }
   }
   
-  /**
-   * 停止所有定时器
-   */
-  private stopTimers(): void {
-    this.stopLocationUpdateTimer();
-    this.stopStatusCheckTimer();
-  }
-  
   /**
    * 停止位置更新定时器
    */
@@ -482,18 +309,6 @@ class LocationTrackingService {
     }
   }
   
-  /**
-   * 停止状态检查定时器
-   */
-  private stopStatusCheckTimer(): void {
-    if (this.statusCheckTimer) {
-      clearInterval(this.statusCheckTimer);
-      this.statusCheckTimer = null;
-    }
-  }
-  
-
-  
   /**
    * 通知位置更新回调
    */
@@ -501,37 +316,160 @@ class LocationTrackingService {
     const onlineUsers = this.getOnlineUsers();
     console.log('🔔 [LocationTrackingService] 开始通知位置更新回调');
     console.log('👥 [LocationTrackingService] 在线用户数量:', onlineUsers.length);
-    console.log('📞 [LocationTrackingService] 准备执行', this.locationUpdateCallbacks.size, '个回调函数');
     
-    this.locationUpdateCallbacks.forEach((callback, index) => {
+    // 触发位置更新回调
+    if (this.locationUpdateCallback) {
       try {
-        console.log(`🔄 [LocationTrackingService] 执行第 ${index + 1} 个位置更新回调`);
-        callback(onlineUsers);
-        console.log(`✅ [LocationTrackingService] 第 ${index + 1} 个位置更新回调执行成功`);
+        console.log('🔄 [LocationTrackingService] 执行位置更新回调');
+        this.locationUpdateCallback(onlineUsers);
+        console.log('✅ [LocationTrackingService] 位置更新回调执行成功');
       } catch (error) {
-        console.error(`❌ [LocationTrackingService] 第 ${index + 1} 个位置更新回调执行失败:`, error);
+        console.error('❌ [LocationTrackingService] 位置更新回调执行失败:', error);
       }
-    });
+    } else {
+      console.log('⚠️ [LocationTrackingService] 没有注册位置更新回调');
+    }
     
     console.log('🏁 [LocationTrackingService] 位置更新回调通知完成');
   }
+
+  /**
+   * 手动触发位置更新（公共方法，可从外部调用）
+   * 用于手动刷新地图上的用户标记
+   */
+  public triggerLocationUpdate(): void {
+    console.log('🔔 [LocationTrackingService] 手动触发位置更新');
+    this.notifyLocationUpdateCallbacks();
+  }
+
+  /**
+   * 订阅位置更新（用于locationModule注册回调）
+   * @param callback 位置更新回调函数
+   * @returns 取消订阅函数
+   */
+  public subscribeToLocationUpdates(callback: (onlineUsers: OnlineUserInfo[]) => void): () => void {
+    console.log('📝 [LocationTrackingService] 注册位置更新回调函数');
+    
+    // 直接赋值，覆盖之前的回调
+    this.locationUpdateCallback = callback;
+    console.log('✅ [LocationTrackingService] 位置更新回调注册完成');
+    
+    // 返回取消订阅函数
+    return () => {
+      if (this.locationUpdateCallback === callback) {
+        this.locationUpdateCallback = null;
+        console.log('✅ [LocationTrackingService] 位置更新回调已取消');
+      }
+    };
+  }
   
   /**
    * 通知用户状态变化回调
    */
   private notifyUserStatusChange(userId: number, status: 'online' | 'offline' | 'timeout'): void {
-    this.userStatusCallbacks.forEach(callback => {
+    console.log(`🔔 [LocationTrackingService] 开始通知用户状态变化回调: 用户 ${userId} 状态变为 ${status}`);
+    
+    if (this.userStatusCallback) {
       try {
-        callback(userId, status);
+        console.log('🔄 [LocationTrackingService] 执行用户状态变化回调');
+        this.userStatusCallback(userId, status);
+        console.log('✅ [LocationTrackingService] 用户状态变化回调执行成功');
       } catch (error) {
-        console.error('用户状态变化回调执行失败:', error);
+        console.error('❌ [LocationTrackingService] 用户状态变化回调执行失败:', error);
       }
-    });
+    } else {
+      console.log('⚠️ [LocationTrackingService] 没有注册用户状态变化回调');
+    }
+    
+    console.log('🏁 [LocationTrackingService] 用户状态变化回调通知完成');
   }
 
+  /**
+   * 处理WebSocket消息
+   * @param message 服务器下发的消息
+   */
+  public handleWebSocketMessage(message: any){
 
+     console.log(`📡 收到WebSocket消息类型: ${message.type}`, message);
+    switch (message.type) {
+      case 'onlineUserList':
+        // 处理在线用户列表消息（服务器发送当前在线用户列表）
+        console.log('👥 处理在线用户列表，用户数量:', message.users ? message.users.length : 0);
+         if (message.users && Array.isArray(message.users)) {
+        this.triggerOnlineUserListCallbacks({
+          type: 'onlineUserList',
+          users: message.users.map((user: any) => ({
+            userId: user.userId,
+            name: user.name,
+            role: user.role,
+            userStatus: user.userStatus,
+            lastUpdateTime: user.lastUpdateTime,
+            latitude: user.locationData?.latitude || user.latitude,
+            longitude: user.locationData?.longitude || user.longitude,
+            timestamp: user.locationData?.timestamp || user.timestamp
+          }))
+        });
+      }else {
+          console.warn('❌ onlineUserList消息格式错误，users字段不存在或不是数组');
+        }
+        break;
+         case 'userLocationList':
+        // 处理用户位置列表消息（服务器每30秒发送所有在线用户的位置列表）
+        console.log('👥 处理用户位置列表，用户数量:', message.users ? message.users.length : 0);
+        
+        // 确保用户列表存在且是数组
+        if (message.users && Array.isArray(message.users)) {
+          // 转换用户数据格式，确保与位置追踪服务兼容
+          const formattedUsers = message.users.map((user: any) => {
+            // 支持多种数据格式：locationData字段或直接字段
+            const locationData = user.locationData || user;
+            return {
+              userId: user.userId || locationData.userId,
+              name: user.name || user.userName || `用户${user.userId || locationData.userId}`,
+              role: user.role || 'employee',
+              userStatus: user.userStatus !== false, // 转换为布尔值
+              lastUpdateTime: user.lastUpdateTime || locationData.timestamp || Date.now(),
+              latitude: locationData.latitude,
+              longitude: locationData.longitude,
+              timestamp: locationData.timestamp || user.timestamp || Date.now()
+            };
+          });
+          
+          console.log('📊 转换后的用户位置数据:', formattedUsers);
+          
+          this.triggerOnlineUserListCallbacks({
+            type: 'userLocationList',
+            users: formattedUsers
+          });
+        } else {
+          console.warn('❌ userLocationList消息格式错误，users字段不存在或不是数组');
+        }
+        break;
+      default:
+        console.warn('收到未知类型的WebSocket消息:', message);
+        break;
+    }
+}
 
-
+  /**
+   * 触发在线用户列表回调函数
+   * @param userList 在线用户列表数据
+   */
+  private triggerOnlineUserListCallbacks(userList: any): void {
+    console.log('🔔 [apiService] 开始触发在线用户列表回调，消息类型:', userList.type);
+    console.log('📊 [apiService] 回调数据内容:', JSON.stringify(userList, null, 2));
+    
+   
+      try {
+        console.log('🔄 [apiService] 执行在线用户列表回调函数');
+        // 传递正确的数据格式：只传递users数组，而不是整个消息对象
+        this.handleOnlineUserList(userList.users);
+        console.log('✅ [apiService] 在线用户列表回调函数执行成功');
+      } catch (error) {
+        console.error('❌ [apiService] 在线用户列表回调函数执行失败:', error);
+      }
+    console.log('🏁 [apiService] 在线用户列表回调触发完成');
+  }
 
   /**
    * 处理在线用户列表
diff --git a/miniprogram/services/mapService.ts b/miniprogram/services/mapService.ts
index 0e346a8..e19d1ac 100644
--- a/miniprogram/services/mapService.ts
+++ b/miniprogram/services/mapService.ts
@@ -1,6 +1,6 @@
 // 地图服务 - 处理地图相关的功能，包括定位、路线规划、地理编码等
 
-import { AMapRegeoResponse, RoutePlanResult, SearchResult, LocationData } from '../types';
+import { AMapRegeoResponse, RoutePlanResult, SearchResult } from '../types';
 
 /**
  * 地图服务类
diff --git a/miniprogram/services/orderService.ts b/miniprogram/services/orderService.ts
index 7ba97de..5ba643d 100644
--- a/miniprogram/services/orderService.ts
+++ b/miniprogram/services/orderService.ts
@@ -70,7 +70,7 @@ class OrderService {
    */
   async deleteOrder(orderId: number): Promise<{ success: boolean; message?: string }> {
     try {
-      const result = await apiService.deleteOrder(orderId);
+      await apiService.deleteOrder(orderId);
       return { success: true, message: '删除成功' };
     } catch (error) {
       console.error('删除订单失败:', error);
diff --git a/miniprogram/types/index.ts b/miniprogram/types/index.ts
index ba469a0..b1b8d21 100644
--- a/miniprogram/types/index.ts
+++ b/miniprogram/types/index.ts
@@ -58,6 +58,8 @@ export interface Marker {
   width?: number;
   height?: number;
   zIndex?: number;
+  type?: string; // 标记点类型：'employee' | 'warehouse' | 'user' | 'order' 等
+  data?: any; // 附加数据
   callout?: {
     content: string;
     color?: string;
@@ -79,6 +81,7 @@ export interface WarehouseInfo {
   description?: string;
   status?: 'open' | 'closed' | 'maintenance';
   capacity: number; // 仓库容量（吨）
+  currentStock?: number; // 当前库存（吨）
   longitude: number;
   latitude: number;
 }