初版

api/index.js

@@ -1,7 +1,7 @@
 // api.jshttp://zlink.bjdexn.cn
-const baseUrl = 'http://192.168.8.187:8080';  // 替换为您的接口基础 URL
+// const baseUrl = 'http://192.168.8.102:8088';  // 替换为您的接口基础 URL
 const esosUrl = 'https://esos-iot.bjdexn.cn';  // 线上
-// const baseUrl = 'https://esos-iot.bjdexn.cn:8443';  // 线上
+const baseUrl = 'https://esos-iot.bjdexn.cn:9443';  // 线上
 
 // const baseUrl = 'http://192.168.8.105:8888';  // 替换为您的接口基础 URL
 //  

app.js

@@ -1,35 +1,385 @@
 // app.js
-const QQMapWX = require('./libs/qqmap-wx-jssdk.min.js');
-
+const api = require('./api/index.js'); // 注意路径
 App({
+  globalData: {
+    socketTask: null,
+    isConnected: false,
+    reconnectTimer: null,
+    heartbeatTimer: null,
+    currentWorkorderId: '',
+    userInfo: wx.getStorageSync('user') || {}
+  },
+
   onLaunch() {
-    // 初始化腾讯地图SDK
-    this.qqmapsdk = new QQMapWX({
-      key: 'VRGBZ-ZFRHB-SKIUP-NHHJ3-TXGJT-ZIFG3' // 请替换为你自己的腾讯地图KEY
-    });
+    // wx.setStorageSync('user', { userId: 'driver_1001', operationRole: 4 }); 
+    this.initWebSocketService();
+    wx.onAppShow(() => this.handleAppShow());
+    wx.onAppHide(() => this.handleAppHide());
+    this.locationService = {
+      isTracking: false,
+      currentWorkorderId: '', // 存储当前跟踪的工单ID
+      isLocationUpdateStarted: false // 标记是否已启动定位服务
+    };
+  },
+
+  initWebSocketService() {
+    if (!this.wsService) {
+      this.wsService = {
+        connect: (url) => {
+          const that = this;
+          if (that.globalData.socketTask) {
+            that.wsService.close();
+          }
+
+          console.log('正在连接WebSocket:', url);
+          const socketTask = wx.connectSocket({ url, header: { 'content-type': 'application/json' } });
+
+          socketTask.onOpen(() => {
+            console.log('WebSocket 连接成功');
+            that.globalData.isConnected = true;
+            that.globalData.socketTask = socketTask;
+            that.clearReconnectTimer();
+            // that.startHeartbeat();
+            if (that.globalData.currentWorkorderId) {
+              that.wsService.send({ type: 'subscribe', workorderId: that.globalData.currentWorkorderId });
+            }
+            wx.$emit('socketOpen');
+          });
+
+          socketTask.onMessage((res) => {
+            try {
+              console.log(res);
+              const message = JSON.parse(res.data);
+              console.log('收到消息:', message);
+              wx.$emit('wsMessage', message);
+            } catch (err) { console.error('消息解析失败', err); }
+          });
+
+          socketTask.onClose((res) => {
+            console.log('WebSocket 连接关闭, 状态码:', res.code);
+            that.globalData.isConnected = false;
+            that.globalData.socketTask = null;
+            that.stopHeartbeat();
+            wx.$emit('socketClose');
+            if (res.code !== 1000) { that.startReconnect(); }
+          });
+
+          socketTask.onError((err) => {
+            console.error('WebSocket 连接错误:', err);
+            that.globalData.isConnected = false;
+            that.globalData.socketTask = null;
+            that.stopHeartbeat();
+            wx.$emit('socketError', err);
+          });
+        },
+
+        send: (data) => {
+          const that = this;
+          if (that.globalData.isConnected && that.globalData.socketTask) {
+            try {
+              that.globalData.socketTask.send({
+                data: JSON.stringify(data),
+                fail: (err) => {
+                  console.error('消息发送失败:', err);
+                  wx.showToast({ title: '消息发送失败', icon: 'none' });
+                }
+              });
+            } catch (e) { console.error('消息序列化失败:', e); }
+          } else {
+            console.warn('WebSocket 未连接');
+            wx.showToast({ title: '网络连接中...', icon: 'none' });
+          }
+        },
+
+        close: (code = 1000, reason = 'normal close') => {
+          const that = this;
+          if (that.globalData.socketTask) {
+            console.log(`关闭WebSocket连接: ${code} - ${reason}`);
+            that.globalData.socketTask.close({ code, reason });
+          }
+        }
+      };
+    }
+  },
+
+  handleAppShow() {
+    const that = this;
+    console.log(!that.globalData.isConnected);
+    console.log(!that.globalData.reconnectTimer);
+    if (!that.globalData.isConnected && !that.globalData.reconnectTimer) {
+      const { operationId, operationRole } = that.globalData.userInfo;
+      console.log(operationRole);
+      // 修复：startReconnect 中用了 operationId，这里统一字段
+      if (!operationId) {
+        console.error('用户operationId不存在，无法连接WebSocket');
+        return;
+      }
+      const wsUrl = `wss://esos-iot.bjdexn.cn:9443/communication/update/${operationId}`;
+      that.wsService.connect(wsUrl);
+    }
+  },
+
+  handleAppHide() {
+    // 可以选择在后台关闭连接
+    // this.wsService.close(1001, 'app enter background');
+  },
+
+  startHeartbeat() {
+    const that = this;
+    that.stopHeartbeat();
+    that.heartbeatTimer = setInterval(() => {
+      if (that.globalData.isConnected) {
+        that.wsService.send({ type: 'heartbeat', timestamp: Date.now() });
+      }
+    }, 5000);
+  },
+
+  stopHeartbeat() {
+    if (this.heartbeatTimer) {
+      clearInterval(this.heartbeatTimer);
+      this.heartbeatTimer = null;
+    }
+  },
+
+  startReconnect() {
+    const that = this;
+    that.clearReconnectTimer();
+    let delay = 1000;
+    that.globalData.reconnectTimer = setInterval(() => {
+      if (!that.globalData.isConnected) {
+        console.log(`尝试重连 in ${delay}ms...`);
+        const { operationId, operationRole } = that.globalData.userInfo; // 修复：用 operationId 而非 userId
+        if (operationId) {
+          const wsUrl = `wss://esos-iot.bjdexn.cn:9443/communication/update/${operationId}`;
+          that.wsService.connect(wsUrl);
+        }
+        delay = Math.min(delay * 2, 8000);
+      } else {
+        that.clearReconnectTimer();
+      }
+    }, delay);
+  },
+
+  clearReconnectTimer() {
+    if (this.globalData.reconnectTimer) {
+      clearInterval(this.globalData.reconnectTimer);
+      this.globalData.reconnectTimer = null;
+    }
+  },
 
-    // 检查是否授权获取位置信息
+  /**
+   * 司机端开始后台定位并上传（单工单）
+   * @param {string} workorderId - 当前工单ID
+   */
+  startDriverLocationUpload(workorderId) {
+    const service = this.locationService;
+
+    // 入参校验
+    if (!workorderId) {
+      console.error('工单ID不能为空');
+      wx.showToast({ title: '工单ID异常', icon: 'none' });
+      return;
+    }
+
+    // 如果已经在为当前订单上传，则忽略
+    if (service.isTracking && service.currentWorkorderId === workorderId) {
+      console.log(`已经在为订单 ${workorderId} 上传位置`);
+      return;
+    }
+
+    // 如果已经在为其他订单上传，先停止
+    if (service.isTracking && service.currentWorkorderId !== workorderId) {
+      console.log(`当前正在为订单 ${service.currentWorkorderId} 上传，切换到 ${workorderId}，先停止旧定位`);
+      this.stopDriverLocationUpload();
+    }
+
+    // 权限校验
     wx.getSetting({
-      success: res => {
-        if (!res.authSetting['scope.userLocation']) {
+      success: (res) => {
+        if (!res.authSetting['scope.userLocationBackground']) {
           wx.authorize({
-            scope: 'scope.userLocation',
+            scope: 'scope.userLocationBackground',
             success: () => {
-              console.log('位置授权成功');
+              this._doStartLocationUpload(workorderId, service);
             },
             fail: () => {
-              console.log('位置授权失败');
-              wx.showToast({
-                title: '请开启位置权限',
-                icon: 'none'
+              wx.showModal({
+                title: '权限不足',
+                content: '需要开启后台定位权限才能实时上传位置，请前往设置页开启',
+                confirmText: '去设置',
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    wx.openSetting({
+                      success: (settingRes) => {
+                        if (settingRes.authSetting['scope.userLocationBackground']) {
+                          this._doStartLocationUpload(workorderId, service);
+                        }
+                      }
+                    });
+                  }
+                }
               });
-            }
+            } 
           });
+        } else {
+          this._doStartLocationUpload(workorderId, service);
         }
       }
     });
   },
-  globalData: {
-    userInfo: null
-  }
+
+  /**
+   * 私有方法：执行真正的定位启动逻辑（核心修复：兼容低版本，改用 wx.onLocationChange）
+   */
+  _doStartLocationUpload(workorderId, service) {
+    console.log(`开始为订单 ${workorderId} 启动后台定位上传...`);
+    service.currentWorkorderId = workorderId;
+
+    // 修复1：先移除旧的定位监听（防止重复监听）
+    this._removeLocationListener();
+
+    // 修复2：启动后台定位（兼容低版本，用 startLocationUpdate 兜底）
+    const startLocationApi = wx.startLocationUpdateBackground || wx.startLocationUpdate;
+    startLocationApi({
+      type: 'gcj02',
+      success: (res) => {
+        console.log('定位服务已启动', res);
+        service.isLocationUpdateStarted = true;
+
+        // 修复3：改用低版本支持的 wx.onLocationChange（替代 wx.watchPosition）
+        wx.onLocationChange((location) => {
+          console.log('位置变化，准备上传:', location);
+          this._uploadLocation(location, workorderId);
+        });
+
+        // 标记定位中状态
+        service.isTracking = true;
+        console.log('位置监听已注册，开始实时上传');
+      },
+      fail: (err) => {
+        let errMsg = '启动定位失败';
+        if (err.errMsg.includes('auth deny')) errMsg = '定位权限被拒绝';
+        else if (err.errMsg.includes('system')) errMsg = '系统不支持定位';
+        
+        console.error(errMsg, err);
+        wx.showToast({ title: errMsg, icon: 'none', duration: 2000 });
+      }
+    });
+  },
+
+  /**
+   * 司机端停止定位上传（核心修复：对应移除 wx.onLocationChange 监听）
+   */
+  stopDriverLocationUpload() {
+    const service = this.locationService;
+
+    if (!service.isTracking) {
+      return;
+    }
+
+    console.log(`停止为订单 ${service.currentWorkorderId} 上传位置`);
+
+    // 1. 移除位置监听（wx.onLocationChange 对应 wx.offLocationChange）
+    this._removeLocationListener();
+
+    // 2. 停止定位服务（兼容低版本，用 stopLocationUpdate 兜底）
+    this._stopLocationService();
+
+    // 3. 重置状态
+    service.isTracking = false;
+    service.currentWorkorderId = '';
+    service.isLocationUpdateStarted = false;
+  },
+
+  /**
+   * 私有方法：移除位置监听（兼容低版本）
+   */
+  _removeLocationListener() {
+    if (wx.offLocationChange) {
+      wx.offLocationChange();
+      console.log('位置监听已移除');
+    } else {
+      console.warn('当前基础库不支持 wx.offLocationChange，可能存在重复监听风险');
+    }
+  },
+
+  /**
+   * 私有方法：统一停止定位服务（兼容低版本）
+   */
+  _stopLocationService() {
+    const stopLocationApi = wx.stopLocationUpdateBackground || wx.stopLocationUpdate;
+    if (stopLocationApi && this.locationService.isLocationUpdateStarted) {
+      stopLocationApi({
+        success: (res) => {
+          console.log('定位服务已停止', res);
+        },
+        fail: (err) => {
+          console.error('停止定位服务失败:', err);
+        }
+      });
+    }
+  },
+
+  /**
+   * 私有方法：上传位置到服务器（无改动）
+   */
+  _uploadLocation(location, workorderId, retryCount = 0) {
+    const maxRetry = 2;
+    const isLatValid = location.latitude >= 3.86 && location.latitude <= 53.55;
+    const isLngValid = location.longitude >= 73.66 && location.longitude <= 135.05;
+
+    if (!isLatValid || !isLngValid) {
+      console.warn(`无效位置信息（订单: ${workorderId}），跳过上传`, location);
+      return;
+    }
+
+    const data = {
+      workorderId: workorderId,
+      latitude: location.latitude,
+      longitude: location.longitude,
+      createTime: Date.now(),
+      accuracy: location.accuracy
+    };
+
+    api.request(`/sysworkorder/insercoordinateredis`, 'post', data, { isPublic: false })
+      .then((response) => {
+        if (response.code !== 200) {
+          throw new Error(`响应码异常: ${response.code}`);
+        }
+        console.log(`位置上传成功 (订单: ${workorderId})`, data);
+      })
+      .catch((err) => {
+        console.error(`位置上传失败（第${retryCount+1}次）(订单: ${workorderId})`, err);
+        if (retryCount < maxRetry) {
+          setTimeout(() => {
+            this._uploadLocation(location, workorderId, retryCount + 1);
+          }, 10000 * (retryCount + 1));
+        } else {
+          wx.showToast({ title: '位置上传失败，请检查网络', icon: 'none' });
+        }
+      });
+  },
 });
+
+// 全局事件总线
+wx.$on = function (eventName, callback) {
+  if (!this.$events) this.$events = {};
+  if (!this.$events[eventName]) this.$events[eventName] = [];
+  this.$events[eventName].push(callback);
+};
+
+wx.$emit = function (eventName, data) {
+  if (!this.$events || !this.$events[eventName]) return;
+  this.$events[eventName].forEach(callback => callback(data));
+};
+
+wx.$off = function (eventName, callback) {
+  if (!this.$events || !this.$events[eventName]) return;
+  if (callback) {
+    this.$events[eventName] = this.$events[eventName].filter(cb => cb !== callback);
+  } else {
+    this.$events[eventName] = [];
+  }
+};
+// 司机端增加人脸识别与指纹识别，
+// 云平台12月份电价整理

app.json

@@ -5,11 +5,15 @@
     "pages/tool/index",
     "pages/equipment/index"
   ],
+  "requiredBackgroundModes": ["location"],
+ 
   "requiredPrivateInfos": [
     "getLocation",
+    "onLocationChange",
     "startLocationUpdate",
     "startLocationUpdateBackground"
   ],
+
   "permission": {
     "scope.userLocation": {
       "desc": "你的位置信息将用于展示轨迹和计算距离"
@@ -17,15 +21,19 @@
     "scope.setClipboardData": {
       "desc": "用于复制内容到剪贴板，方便用户分享或使用"
     },
+    "scope.userLocationBackground": {
+      "desc": "你的位置信息将用于小程序后台定位功能"
+    },
     "scope.phoneNumber": {
       "desc": "为了快速完成账号注册与登录，验证您的身份信息，保障账号安全，我们需要获取您的手机号。我们将严格按照隐私政策保护您的信息，不会用于其他用途。"
     }
   },
   "window": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "晟运能源",
+    "navigationBarTitleText": "电速宝",
     "navigationBarBackgroundColor": "#ffffff"
   },
+  
   "plugins": {
     "route-plan": {
       "version": "2.0.1",
@@ -51,12 +59,7 @@
         "iconPath": "static/55.png",
         "selectedIconPath": "static/66.png"
       },
-      {
-        "pagePath": "pages/equipment/index",
-        "text": "设备",
-        "iconPath": "static/3.png",
-        "selectedIconPath": "static/4.png"
-      },
+   
       {
         "pagePath": "pages/setup/index",
         "text": "我的",
@@ -83,7 +86,10 @@
       "pages": [
         "pages/createorder/index",
         "pages/driver/index",
-        "pages/address/index"
+        "pages/address/index",
+        "pages/newaddress/index",
+        "pages/mapSelect/index"
+        
       ]
     },
     {

package-map/pages/map/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "晟能能源",
+  "navigationBarTitleText": "电速宝",
   "permission": {
     "scope.userLocation": {
       "desc": "你的位置信息将用于展示行驶轨迹"

package-map/pages/map/index.wxml

@@ -1,15 +1,5 @@
 <view class="container">
-   <!-- 地图组件 -->
-   <!-- <map 
-    id="map"
-    class="map"
-    longitude="{{longitude}}"
-    latitude="{{latitude}}"
-    scale="16"
-    markers="{{markers}}"
-    polyline="{{polyline}}"
-    show-location
-  ></map> -->
+  <!-- 地图组件 -->
   <map 
     id="map"
     class="map"
@@ -17,19 +7,20 @@
     latitude="{{latitude}}"
     markers="{{markers}}"
     polyline="{{plannedRoute}}"
+    include-points="{{trackPoints}}"
     bindcontroltap="controltap"
     show-location
     scale="16"
+    enable-zoom="{{true}}"
+    enable-scroll="{{true}}"
+    enable-rotate="{{false}}"
   ></map>
-   <!-- 规划路线叠加显示 -->
-   <!-- controls="{{controls}}" -->
- 
- 
   
   <!-- 信息提示 -->
-  <view class="info" wx:if="{{infoText}}">
+  <view class="info toast" wx:if="{{infoText}}">
     {{infoText}}
   </view>
+  
   <!-- 加载提示 -->
   <view wx:if="{{loading}}" class="loading-mask">
     <view class="loading-view">
@@ -38,84 +29,14 @@
   </view>
 
   <!-- 错误提示 -->
-  <view wx:if="{{error && !loading}}" class="error-message">
+  <view wx:if="{{error && !loading}}" class="error-message toast">
     {{error}}
   </view>
-<view class="storagecartext">
-<view>
-  <view class="destination-title">
-      目的地：{{orderdata.addressName}}
-    </view>
-    <view class="destination-font">需求：光伏/放电/100kW</view>
-
-    <view class="destination-font" wx:if="{{userdata.operationRole==5}}">{{orderdata.driverName}}·{{orderdata.carName}} <t-icon name="call-1-filled" size="28rpx" data-name="call-1-filled" data-phone="{{orderdata.driverphone}}" bind:tap="ontelephone" style="margin-left:20rpx"/> </view>
-    <view class="destination-font" wx:if="{{userdata.operationRole==4}}">客户:{{orderdata.customerName}} <t-icon name="call-1-filled" size="28rpx" data-name="call-1-filled" data-phone="{{orderdata.customerphone}}" bind:tap="ontelephone" style="margin-left:20rpx"/> </view>
-    <!-- <view class="destination-font">·</view> -->
-    <view class="destination-font">
-      <text wx:if="{{orderdata.workorderType==1}}">待处理</text>
-      <text wx:if="{{orderdata.workorderType==2}}">行驶中</text>
-      <text wx:if="{{orderdata.workorderType==3}}">到达指定地点</text>
-     <text wx:if="{{orderdata.workorderType==4}}">工作中</text>
-     <text wx:if="{{orderdata.workorderType==5}}">完成工作</text>
-    </view>
-
-</view>
-  <image class="storagecar" src="https://esos-iot.bjdexn.cn/myminio/project/c152026b9bc2485f83b39a6132df3ce7.png" mode="heightFix"/>
-</view>
-<!-- <view class="viewmore" bind:tap="navigation">查看更多</view> -->
-<!-- <view bind:tap="navigation">导航</view> -->
-  <!-- 路线列表 -->
-
- <!-- 控制按钮区域 -->
- <view class="control-panel">
-    <slide-confirm 
-    wx:if="{{orderdata.workorderType==1&&userdata.operationRole==1}}"
-    id="mySlideConfirm"
-data-type="{{orderdata.workorderType}}"
-
-  bind:success="onSlideSuccess" 
-  width="300" 
-  height="50"
-  defaultText="开始出发"
-  successText="验证通过"
-/>
-
-<slide-confirm 
-wx:if="{{orderdata.workorderType==2&&userdata.operationRole==1}}"
-id="mySlideConfirm"
-data-type="{{orderdata.workorderType}}"
-
-  bind:success="onSlideSuccess" 
-  width="300" 
-  height="50"
-  defaultText="到达目的地"
-  successText="验证通过"
-/>
-<slide-confirm 
-wx:if="{{orderdata.workorderType==3&&userdata.operationRole==1}}"
-id="mySlideConfirm"
-data-type="{{orderdata.workorderType}}"
-  bind:success="showVerificationPopup" 
-  width="300" 
-  height="50"
-  defaultText="开始工作"
-  successText="验证通过"
-/>
-<slide-confirm 
-wx:if="{{orderdata.workorderType==4&&userdata.operationRole==1}}"
-id="mySlideConfirm"
-data-type="{{orderdata.workorderType}}"
-
-  bind:success="onSlideSuccess" 
-  width="300" 
-  height="50"
-  defaultText="完成工作"
-  successText="验证通过"
-/>
-     
   
-  </view>
+  <view class="detailsbox"></view>
 </view>
+
+<!-- 验证码弹窗组件 -->
 <verification-popup 
   isShow="{{showVerification}}"
   phoneNumber="{{phoneNumber}}"
@@ -124,4 +45,335 @@ data-type="{{orderdata.workorderType}}"
   bind:confirm="onCodeConfirm"
   bind:resend="onResendCode"
   bind:complete="onCodeComplete"
-/>
+/>
+
+<!-- 底部可拖动卡片 -->
+<view class="taxi-card-container">
+  <!-- 背景遮罩 -->
+  <view 
+    class="mask" 
+    wx:if="{{cardHeight !== 'min'}}"
+    style="opacity: {{maskOpacity}};"
+    bindtap="closeCard"
+  ></view>
+
+  <!-- 可拖动卡片 -->
+  <view 
+    class="taxi-card"
+    style="height: {{currentHeight}}px;bottom: 0;transition: height 0.3s ease;border-radius: {{cardHeight === 'max' ? '0' : '16px 16px 0 0'}};" bindtouchstart="handleTouchStart" bindtouchmove="handleTouchMove" bindtouchend="handleTouchEnd"
+  >
+    <!-- 拖动指示器 -->
+    <view class="drag-handler" wx:if="{{cardHeight !== 'max'}}">
+      <view class="drag-bar"></view>
+    </view>
+    
+    <!-- 卡片内容 -->
+    <view class="card-content" style="padding-top: {{cardHeight === 'max' ? '40rpx' : '20rpx'}};">
+      <!-- 订单状态和基本信息 -->
+      <view class="storagecartext_box">
+      <view class="storagecartext">
+
+        <view class="destination-title1" style="margin-top: 10rpx;">
+          目的地：{{orderdata.poiName}}
+          <!-- 显示预计到达时间 -->
+        
+        </view>
+        
+        <!-- 客户/司机信息 -->
+        <view class="contact-info" wx:if="{{userdata.operationRole==5}}">
+          <view class="driver-info" wx:if="{{orderdata.driverphone==''}}">
+            司机：<text class="text-warning">分配中</text>
+          </view>
+          <view class="driver-info" wx:else>
+            司机：{{orderdata.driverName}}·{{orderdata.carName}}
+            <!-- 乘客视角显示预计到达时间 -->
+            <!-- <text wx:if="{{estimatedArrivalTime}}" class="estimated-time">
+              预计{{estimatedArrivalTime}}到达
+            </text> -->
+          </view>
+        </view>
+        
+        <view class="contact-info" wx:if="{{userdata.operationRole==4}}">
+          客户：{{orderdata.receiver}}  
+          <t-icon 
+            name="call-1-filled" 
+            size="28rpx" 
+            data-phone="{{orderdata.phone}}" 
+            bind:tap="ontelephone" 
+            class="icon-call"
+          />
+      
+        </view>
+        <view class="order-status">
+          <text wx:if="{{orderdata.workorderType==0}}" class="section-title">分配中</text>
+          <text wx:if="{{orderdata.workorderType==1}}" class="section-title">待出发</text>
+          <text wx:if="{{orderdata.workorderType==2}}" class="section-title">行驶中</text>
+          <text wx:if="{{orderdata.workorderType==3}}" class="section-title">到达地点</text>
+          <text wx:if="{{orderdata.workorderType==4}}" class="section-title">工作中</text>
+          <text wx:if="{{orderdata.workorderType==5}}" class="section-title">订单完成</text>
+          <text wx:if="{{estimatedArrivalTime && orderdata.workorderType==2}}" class="estimated-time">预计{{estimatedArrivalTime}}到达</text>
+        </view>
+        
+      </view>
+      
+      <!-- 操作图片 -->
+      <view class="action-images">
+        <image 
+          wx:if="{{userdata.operationRole==5}}" 
+          class="storagecar" 
+          src="https://esos-iot.bjdexn.cn/myminio/project/c152026b9bc2485f83b39a6132df3ce7.png" 
+          mode="heightFix"
+        />
+        <image 
+          wx:if="{{userdata.operationRole==4}}" 
+          class="storagecar1" 
+          src="https://esos-iot.bjdexn.cn/myminio/project/d98e4fde125f40819f8bd8fe872e409c.png" 
+          bind:tap="navigation" 
+          mode="heightFix"
+        />
+      </view>
+    </view>
+      
+      <!-- 更多操作按钮 -->
+      <view class="card_more" wx:if="{{userdata.operationRole==5&&orderdata.workorderType!=0}}">
+        <view class="card_morebox">联系客服</view>
+        <view class="card_morebox" data-phone="{{orderdata.driverphone}}" bind:tap="ontelephone">联系司机</view>
+        <view class="card_morebox" bind:tap="cancel">取消订单</view>
+        <view wx:if="{{orderdata.workorderType==5}}" class="card_morebox">开发票</view>
+        <view wx:if="{{orderdata.workorderType!=5}}" class="card_morebox" bind:tap="editorder">编辑订单</view>
+
+      </view>
+      
+      <!-- 客户视角内容 -->
+      <view class="card_box" wx:if="{{userdata.operationRole==5}}">
+        <!-- 订单详情 -->
+        <view class="detail-section" style="border-bottom: 1rpx solid #f5f5f5;">
+          <view class="section-header" bind:tap="onmore">
+            <view class="section-title">订单详情</view>
+            <view class="section-action">
+              <text>{{moretype ? '收起' : '展开详情'}}</text>
+              <t-icon name="{{moretype ? 'chevron-up' : 'chevron-down'}}" size="22px"/>
+            </view>
+          </view>
+          
+          <view class="detail-list" wx:if="{{moretype}}">
+            <view class="detail-item">
+              <view class="item-label">订单号</view>
+              <view class="item-value">{{orderdata.workorderId}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">创建时间</view>
+              <view class="item-value">{{orderdata.workorderCreatetime}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">订单类型</view>
+              <view class="item-value">{{orderdata.chargedischargeType==1 ? '充电' : '放电'}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">需求电量</view>
+              <view class="item-value">{{orderdata.workorderElectricity}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">SOC</view>
+              <view class="item-value">{{orderdata.soc}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">车型</view>
+              <view class="item-value">{{orderdata.carMondel}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">里程</view>
+              <view class="item-value">12.5km</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType<3}}">
+              <view class="item-label">预计时长</view>
+              <view class="item-value">{{estimatedDuration || '50分钟'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType>=3}}">
+              <view class="item-label">时长</view>
+              <view class="item-value">{{estimatedDuration || '50分钟'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType<3}}">
+              <view class="item-label">预计到达时间</view>
+              <view class="item-value">{{estimatedArrivalTime || '--'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType==3}}">
+              <view class="item-label">到达时间</view>
+              <view class="item-value">{{orderdata.arrivaltime || '--'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType==4}}">
+              <view class="item-label">开始工作时间</view>
+              <view class="item-value">{{orderdata.startworktime || '--'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType==5}}">
+              <view class="item-label">工作结束时间</view>
+              <view class="item-value">{{orderdata.endworktime || '--'}}</view>
+            </view>
+          </view>
+          
+          <view style="height: 20rpx;" wx:if="{{moretype}}"></view>
+        </view>
+        
+        <!-- 费用明细 -->
+        <view class="detail-section">
+          <view class="section-header" bind:tap="oncostdetails">
+            <view class="section-title">预估金额</view>
+            <view class="section-action">
+              <view class="section-title1">100.1 <text class="section_yuan">元</text>
+              </view>
+              <t-icon name="{{costdetails ? 'chevron-up' : 'chevron-down'}}" size="22px"/>
+            </view>
+          </view>
+          
+          <view class="fee-list" wx:if="{{costdetails}}">
+            <view class="fee-item">
+              <view class="fee-label">电费</view>
+              <view class="fee-value">¥5.00</view>
+            </view>
+            <view class="fee-item">
+              <view class="fee-label">服务费</view>
+              <view class="fee-value">¥5.00</view>
+            </view>
+            <!-- <view class="fee-item">
+              <view class="fee-label">起步价</view>
+              <view class="fee-value">¥13.00</view>
+            </view> -->
+            <!-- <view class="fee-item">
+              <view class="fee-label">里程费</view>
+              <view class="fee-value">¥32.00</view>
+            </view> -->
+            <!-- <view class="fee-item">
+              <view class="fee-label">时长费</view>
+              <view class="fee-value">¥8.50</view>
+            </view> --> 
+           
+         
+          </view>
+          
+          <view style="height: 1rpx;"></view>
+        </view>
+      </view>
+      <!---->
+      <!-- 司机视角内容 -->
+      <view class="card_box" wx:if="{{userdata.operationRole==4}}">
+        <!-- 订单详情 -->
+        <view class="detail-section" style="border-bottom: 1rpx solid #f5f5f5;">
+          <view class="section-header" bind:tap="onmore">
+            <view class="section-title">订单详情</view>
+            <view class="section-action">
+              <text>{{moretype ? '收起' : '展开详情'}}</text>
+              <t-icon name="{{moretype ? 'chevron-up' : 'chevron-down'}}" size="22px"/>
+            </view>
+          </view>
+          
+          <view class="detail-list" wx:if="{{moretype}}">
+            <view class="detail-item">
+              <view class="item-label">订单号</view>
+              <view class="item-value">{{orderdata.workorderId}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">创建时间</view>
+              <view class="item-value">{{orderdata.workorderCreatetime}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">订单类型</view>
+              <view class="item-value">{{orderdata.chargedischargeType==1 ? '充电' : '放电'}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">需求电量</view>
+              <view class="item-value">{{orderdata.workorderElectricity}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">SOC</view>
+              <view class="item-value">{{orderdata.soc}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">车型</view>
+              <view class="item-value">{{orderdata.carMondel}}</view>
+            </view>
+            <view class="detail-item">
+              <view class="item-label">里程</view>
+              <view class="item-value">{{distance}} km</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType<3}}">
+              <view class="item-label">预计时长</view>
+              <view class="item-value">{{estimatedDuration || '50分钟'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType>=3}}">
+              <view class="item-label">时长</view>
+              <view class="item-value">{{estimatedDuration || '50分钟'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType<3}}">
+              <view class="item-label">预计到达时间</view>
+              <view class="item-value">{{estimatedArrivalTime || '--'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType==3}}">
+              <view class="item-label">到达时间</view>
+              <view class="item-value">{{orderdata.arrivaltime || '--'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType==4}}">
+              <view class="item-label">开始工作时间</view>
+              <view class="item-value">{{orderdata.startworktime || '--'}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.workorderType==5}}">
+              <view class="item-label">工作结束时间</view>
+              <view class="item-value">{{orderdata.endworktime || '--'}}</view>
+            </view>
+          </view>
+          
+          <view style="height: 20rpx;" wx:if="{{moretype}}"></view>
+        </view>
+      </view>
+      
+      <view style="height: 140rpx;" wx:if="{{moretype}}"></view>
+      
+      <!-- 控制按钮区域 -->
+      <view class="control-panel" wx:if="{{userdata.operationRole==4}}">
+        <slide-confirm 
+          wx:if="{{orderdata.workorderType==1}}"
+          id="mySlideConfirm"
+          data-type="{{orderdata.workorderType}}"
+          bind:success="onrecognize" 
+          width="300" 
+          height="50"
+          defaultText="开始出发"
+          successText="验证中"
+        />
+        
+        <slide-confirm 
+          wx:if="{{orderdata.workorderType==2}}"
+          id="mySlideConfirm"
+          data-type="{{orderdata.workorderType}}"
+          bind:success="onarrivalposition" 
+          width="300" 
+          height="50"
+          defaultText="到达目的地"
+          successText="验证中"
+        />
+        
+        <slide-confirm 
+          wx:if="{{orderdata.workorderType==3}}"
+          id="mySlideConfirm"
+          data-type="{{orderdata.workorderType}}"
+          bind:success="showVerificationPopup" 
+          width="300" 
+          height="50"
+          defaultText="开始工作"
+          successText="验证中"
+        />
+        
+        <slide-confirm 
+          wx:if="{{orderdata.workorderType==4}}"
+          id="mySlideConfirm"
+          data-type="{{orderdata.workorderType}}"
+          bind:success="onSlideSuccess" 
+          width="300" 
+          height="50"
+          defaultText="完成工作"
+          successText="验证中"
+        />
+        
+      </view>
+    </view>
+  </view>
+</view>

package-map/pages/map/index.wxss

@@ -10,9 +10,8 @@
 }
 
 .map {
-  
   width: 100%;
-  height: 70%;
+  height: 60%;
 }
 
 .control-panel {
@@ -98,6 +97,10 @@
   padding-bottom: 10rpx;
   /* border-bottom: 1px solid #f0f0f0; */
 }
+/* 目的地标题 */
+.destination-title1 {
+  color: #333;
+}
 .destination-font {
   font-size: 28rpx;
   width: 100%;
@@ -105,7 +108,7 @@
   align-items: center;
   justify-content: space-between;
   color: #333;
-  margin-top: 20rpx;
+  margin-top: 10rpx;
   /* border-bottom: 1px solid #f0f0f0; */
 }
 .route{
@@ -188,18 +191,465 @@
 }
 .storagecartext{
   width:100%;
+  margin-bottom: 10rpx;
 display: flex;
+flex-direction: column;
 justify-content: space-between;
-/* justify-content:space-around; */
-align-items: center;
-padding-left:20rpx;
+/* align-items: center; */
 box-sizing: border-box;
-margin-top: 20rpx;
-    }
+}
+.storagecartext_box{
+  display: flex;
+}
+.contact-info{
+  display: flex;
+  align-items: center;
+  margin-top: 20rpx;
+}
+.icon-call{
+  margin-left: 10rpx;
+}
+.action-images{
+  
+}
 .storagecar{
   width: 260rpx;
   height: 180rpx;
 }
+.storagecar1{
+  width: 200rpx;
+  height: 100rpx;
+  margin-right: 30rpx;
+}
+.driver{
+  display: flex;
+}
+.detailsbox{
+ width: 100%;
+ background-color: #ffffff;
+border-radius: 40rpx;
+padding: 0rpx 20rpx;
+box-sizing: border-box;
+}
 .viewmore{
+  width: 100%;
   margin-top: 20rpx;
+  background-color: #ffffff;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+  border-radius: 20rpx;
+  padding: 0rpx 20rpx;
+
+box-sizing: border-box;
+
+}
+.viewmore_box{
+  width: 100%;
+  height: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  
+}
+.viewmore_left{
+font-size: 32rpx;
+}
+.viewmore_right{
+  font-size: 26rpx;
+display: flex;
+}
+
+.viewmore_content{
+
+}
+.viewmore_details{
+width: 100%;
+height: 100rpx;
+}
+/* 1111111111111111111111111 */
+/* pages/taxi-detail/taxi-detail.wxss */
+.taxi-card-container {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: -1;
+  transition: opacity 0.3s ease;
+}
+
+.taxi-card {
+  width: 100%;
+  background: #fff;
+  box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+  position: relative;
+}
+
+/* 拖动指示器 */
+.drag-handler {
+  display: flex;
+  justify-content: center;
+  padding: 12rpx 0;
+  background: #f8f9fa;
+}
+
+.drag-bar {
+  width: 60rpx;
+  height: 8rpx;
+  background: #ddd;
+  border-radius: 4rpx;
+}
+
+/* 卡片内容样式 */
+.card-content {
+  /* padding: 0 20rpx 20rpx; */
+  padding: 0rpx 20rpx 20rpx;
+  height: calc(100% - 52rpx);
+  overflow-y: auto;
+  box-sizing: border-box;
+}
+
+/* 全屏模式样式 */
+.fullscreen-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 30rpx;
+  padding-bottom: 16rpx;
+  border-bottom: 1px solid #f5f5f5;
+}
+
+.header-title {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+.close-fullscreen {
+  width: 60rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  padding: 0;
+  font-size: 40rpx;
+  color: #666;
+  background: transparent;
+}
+
+.close-fullscreen::after {
+  border: none;
+}
+
+.fee-list {
+  margin-bottom: 30rpx;
+}
+
+/* 基础内容样式保持不变 */
+.card-section .section-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  margin-bottom: 20rpx;
+  color: #333;
+}
+
+.price-tag {
+  font-size: 36rpx;
+  font-weight: 700;
+  color: #ff4d4f;
+  margin-bottom: 12rpx;
+}
+
+.route-brief {
+  font-size: 28rpx;
+  color: #666;
+}
+
+.route-detail {
+  margin-bottom: 20rpx;
+}
+
+.route-point {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 12rpx;
+  display: flex;
+  align-items: center;
+}
+
+.route-point:before {
+  content: '';
+  width: 16rpx;
+  height: 16rpx;
+  border-radius: 50%;
+  background: #ff4d4f;
+  margin-right: 12rpx;
+  display: inline-block;
+}
+
+.route-point:last-child:before {
+  background: #00b42a;
+}
+
+.route-line {
+  width: 4rpx;
+  height: 40rpx;
+  background: #eee;
+  margin-left: 8rpx;
+  margin-bottom: 12rpx;
 }
+
+.trip-meta {
+  display: flex;
+  justify-content: space-between;
+  font-size: 26rpx;
+  color: #666;
+  background: #f8f9fa;
+  padding: 16rpx;
+  border-radius: 12rpx;
+}
+
+.fee-item {
+  display: flex;
+  justify-content: space-between;
+  font-size: 28rpx;
+  padding: 16rpx 0;
+  border-bottom: 1px solid #f5f5f5;
+}
+
+.fee-item:last-child {
+  border-bottom: none;
+}
+
+.fee-label {
+  color: #666;
+}
+
+.fee-value {
+  color: #333;
+  font-weight: 500;
+}
+
+.fee-total .fee-label {
+  font-weight: 600;
+  color: #333;
+}
+
+.fee-total .fee-value {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #ff4d4f;
+}
+
+.confirm-btn {
+  width: 100%;
+  height: 96rpx;
+  line-height: 96rpx;
+  background: #ff4d4f;
+  color: #fff;
+  font-size: 32rpx;
+  border-radius: 48rpx;
+  margin-top: 30rpx;
+}
+
+.confirm-btn::after {
+  border: none;
+}
+/* 详情区块通用样式 */
+.detail-section {
+  /* margin-bottom: 30rpx; */
+}
+.card_more{
+  display: flex;
+  justify-content: space-between;
+  border-top: 1rpx solid #f5f5f5;
+  padding-top: 20rpx;
+}
+.card_morebox{
+  width: 140rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50rpx;
+  background-color: #fff;
+  box-shadow: 0 -2rpx 12px rgba(0, 0, 0, 0.1);
+
+}
+.card_box{
+  width: 100%;
+border-radius: 10rpx;
+margin-top:16rpx;
+padding: 0rpx 20rpx;
+  box-shadow: 0 -2rpx 12px rgba(0, 0, 0, 0.1);
+  box-sizing: border-box;
+}
+.section-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 20rpx;
+  padding-top: 10rpx;
+  
+}
+.section-action{
+  display: flex;
+  align-items: center;
+}
+.section-title1 {
+  font-size: 38rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 20rpx;
+  padding-top: 10rpx;
+  
+}
+.section_yuan{
+  font-size: 28rpx;
+
+}
+/* 司机信息样式 */
+.driver-section {
+  display: flex;
+  align-items: center;
+  background-color: #fafafa;
+  border-radius: 20rpx;
+  padding: 20rpx;
+}
+
+.driver-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  margin-right: 20rpx;
+}
+.order-status{
+  display: flex;
+  align-items: center;
+}
+.driver-info {
+  flex: 1;
+}
+
+.driver-name {
+  font-size: 26rpx;
+  font-weight: 500;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+
+.driver-grade {
+  font-size: 22rpx;
+  color: #ffc53d;
+  margin-left: 10rpx;
+}
+
+.car-info {
+  font-size: 22rpx;
+  color: #666;
+  margin-bottom: 10rpx;
+}
+
+.contact-btn {
+  background-color: #40a9ff;
+  color: #fff;
+  font-size: 22rpx;
+  padding: 5rpx 15rpx;
+  border-radius: 15rpx;
+  border: none;
+}
+
+/* 详情列表样式 */
+.detail-list {
+  background-color: #fafafa;
+  border-radius: 20rpx;
+  padding: 20rpx;
+}
+
+.detail-item {
+  display: flex;
+  justify-content: space-between;
+  padding: 15rpx 0;
+  border-bottom: 1rpx solid #eee;
+}
+
+.detail-item:last-child {
+  border-bottom: none;
+}
+
+.item-label {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.item-value {
+  font-size: 24rpx;
+  color: #333;
+  text-align: right;
+}
+
+/* 费用明细样式 */
+.fee-list {
+  background-color: #fafafa;
+  border-radius: 20rpx;
+  padding: 20rpx;
+}
+
+.fee-item {
+  display: flex;
+  justify-content: space-between;
+  padding: 15rpx 0;
+  border-bottom: 1rpx solid #eee;
+}
+
+.fee-item:last-child {
+  border-bottom: none;
+}
+
+.fee-label {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.fee-value {
+  font-size: 24rpx;
+  color: #333;
+}
+
+.total-fee .fee-label {
+  font-weight: 600;
+  color: #333;
+  font-size: 26rpx;
+}
+
+.total-fee .fee-value {
+  font-weight: 600;
+  color: #ff4d4f;
+  font-size: 28rpx;
+}
+.estimated-time {
+  font-size: 24rpx;
+  color: #ff6b00;
+margin-left: 20rpx;
+}
+
+.destination-title1 .estimated-time {
+  /* display: block; */
+  margin-left: 0;
+}
+.section-header{
+ height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}

package-map/pages/map/indexcopy.js

@@ -0,0 +1,917 @@
+const api = require('../../../api/index.js');
+
+Page({
+  data: {
+    // 地图中心坐标
+    longitude: 0,
+    latitude: 0,
+    
+    // 标记点（包含起点、终点）
+    markers: [],
+    
+    // 轨迹线（实际轨迹）- 核心修改：将颜色改为红色（#ff0000）
+    // polyline: [{
+    //   points: [],
+    //   color: "#999999", // 已走过的路线颜色：灰色
+    //   width: 6,
+    //   dottedLine: false
+    // }],
+    
+    // 规划路线 - 优化：改为灰色（#999999），与已走路线形成对比
+    plannedRoute: [{
+      points: [],
+      color: "#2f693c", // 未走的规划路线颜色：绿色
+      width: 4,
+      dottedLine: false,
+      arrowLine: true
+    }],
+    
+    // 追踪状态
+    isTracking: false,
+    
+    // 信息提示文本
+    infoText: "",
+    
+    // 位置更新计时器
+    locationTimer: null,
+    
+    // 终点位置
+    destination: null,
+    
+    // 路线规划状态
+    routePlanned: false,
+    
+    // 腾讯位置服务Key
+    qqMapKey: 'VRGBZ-ZFRHB-SKIUP-NHHJ3-TXGJT-ZIFG3',
+    
+    // 偏离阈值(米)和偏离状态
+    deviationThreshold: 50,  // 超过50米视为偏离
+    isDeviated: false,
+    
+    // 重新规划相关
+    isReplanning: false,     // 是否正在重新规划
+    deviationCount: 0,       // 连续偏离计数
+    replanThreshold: 3,       // 连续偏离多少次后重新规划
+    orderdata:{},
+    optionsid:'',
+    showVerification: false,
+    phoneNumber: "138****6789",
+    userdata:[],
+    moretype:false,
+    // 拖动
+    cardHeight: 'min', // 初始高度档位：min/mid/max
+    currentHeight: 0, // 当前实际高度（px）
+    startY: 0, // 触摸起始Y坐标
+    maskOpacity: 0.3, // 遮罩透明度
+    windowHeight: 0, // 屏幕可用高度（px）
+    // 三个固定高度（max改为屏幕高度）
+    heightConfig: {
+      min: 320,    // 最低高度（仅显示价格和路线简要）
+      mid: 520,    // 中间高度（显示行程详情）
+      max: 0       // 占位，将在onLoad中设置为屏幕高度
+    },
+    costdetails:false,
+    trackPoints: [],
+    distance:'',
+    obtainindex:0,
+    driverLocation:[]
+  },
+  onReady() {
+    // 创建地图上下文
+    // 提取轨迹线的所有节点作为include-points的目标点
+
+  },
+   onLoad(options) {
+     // 获取屏幕可用高度（不含导航栏）
+     const systemInfo = wx.getSystemInfoSync();
+     const windowHeight = systemInfo.windowHeight;
+     
+     // 更新heightConfig，max设为屏幕高度
+     this.setData({
+       windowHeight,
+       heightConfig: {
+         ...this.data.heightConfig,
+         max: windowHeight
+       },
+       currentHeight: this.data.heightConfig.min // 初始高度为min档
+     });
+    this.setData({
+      userdata:wx.getStorageSync('user')
+    })
+   
+    console.log(options);
+    this.setData({
+      optionsid:options.id
+    })
+    // 初始化地图，获取当前位置
+    this.getoneworkorder()
+
+
+    // 引入SDK核心类
+    this.qqmapsdk = require('../../../libs/qqmap-wx-jssdk.min.js');
+    // 初始化SDK
+    this.mapSdk = new this.qqmapsdk({
+      key: this.data.qqMapKey
+    });
+
+    
+  },
+   getoneworkorder(){
+    let data = {
+      workorderId:this.data.optionsid
+    }
+    api.request(`/sysworkorder/selectworkorderId`, 'post',data,{ isPublic: false })       
+    .then((data) => {
+      console.log(data.data);
+      if (data.code==200) {
+        this.setData({
+          orderdata:data.data
+        })
+        this.initMap();
+     
+
+      }
+    })
+    .catch((err) => {
+      console.error('请求失败：', err);
+    });
+  },
+  getworkorder(){
+    let data = {
+      workorderId:this.data.optionsid
+    }
+    api.request(`/sysworkorder/selectworkorderId`, 'post',data,{ isPublic: false })       
+    .then((data) => {
+      console.log(data.data);
+      if (data.code==200) {
+        this.setData({
+          orderdata:data.data
+        })
+      }
+    })
+    .catch((err) => {
+      console.error('请求失败：', err);
+    });
+  },
+ 
+  
+  // 初始化地图
+  initMap() {
+    const that = this;
+    
+    // 获取用户当前位置
+    wx.getLocation({
+      type: 'gcj02', // 腾讯地图坐标体系
+      success(res) {
+     
+        const longitude = res.longitude;
+        const latitude = res.latitude;
+        //     // 设置地图中心为当前位置
+            that.setData({
+              longitude,
+              latitude,
+     
+             
+            });
+            if (that.data.userdata.operationRole==4) {
+              that.uploadLocation(res);
+              }
+        //     that.showInfo("已获取当前位置");
+      
+        that.setDestination();
+      },
+      fail(err) {
+        console.error("获取位置失败：", err);
+        that.showInfo("请授权位置权限以使用地图功能");
+        
+        // 引导用户开启权限
+        wx.openSetting({
+          success(res) {
+            if (res.authSetting['scope.userLocation']) {
+              that.initMap();
+            }
+          }
+        });
+      }
+    });
+  },
+
+  // 设置终点位置
+  setDestination() {
+    // 1. 定义常量，提高可维护性
+    const ICON_PATH = {
+      start: "https://esos-iot.bjdexn.cn/myminio/project/0b0593293af54ea097b168cea479c25c.png",
+      end: "https://esos-iot.bjdexn.cn/myminio/project/6dc37b15321b462f9ab59c47263dd224.png",
+      driver: "https://esos-iot.bjdexn.cn/myminio/project/driver_marker.png" // 司机图标路径
+    };
+    const MARKER_SIZE = { width: 30, height: 30 };
+    const MAP_PADDING = [100, 100, 100, 100];
+    const ROUTE_COLOR = "#ff0000";
+    const ROUTE_WIDTH = 6;
+  
+    // 2. 准备请求数据
+    const requestData = {
+      workorderId: this.data.optionsid
+    };
+  
+    // 3. 发起请求并处理响应
+    api.request(`/sysworkorder/selectworkorderredis`, 'post', requestData, { isPublic: false })
+      .then((response) => {
+        console.log(response.data);
+        
+        // 4. 数据校验
+        if (response.code !== 200) {
+          this.showInfo("获取数据失败，请重试");
+          return;
+        }
+        
+        if (!response.data || !response.data[0] || !this.data.orderdata) {
+          this.showInfo("数据格式异常");
+          return;
+        }
+  
+        const startPoint = response.data[0];
+        const endPoint = this.data.orderdata;
+        // 假设司机位置数据存储在 this.data.driverLocation 中
+        const driverPoint = this.data.driverLocation || {
+          longitude: startPoint.longitude, // 默认位置（可以根据实际情况调整）
+          latitude: startPoint.latitude + 0.001 // 稍微偏移，避免与起点重叠
+        };
+  
+        // 5. 构建地图标记
+        const markers = [
+          {
+            id: 0,
+            longitude: startPoint.longitude,
+            latitude: startPoint.latitude,
+            iconPath: ICON_PATH.start,
+            ...MARKER_SIZE,
+            title: "起点"
+          },
+          {
+            id: 1,
+            longitude: endPoint.longitude,
+            latitude: endPoint.latitude,
+            iconPath: ICON_PATH.end,
+            ...MARKER_SIZE,
+            title: "终点",
+            name: endPoint.poiName
+          },
+          {
+            id: 2, // 司机标记ID
+            longitude: driverPoint.longitude,
+            latitude: driverPoint.latitude,
+            iconPath: ICON_PATH.driver,
+            ...MARKER_SIZE,
+            width: 35, // 司机图标可以稍大一些
+            height: 35,
+            title: "司机位置",
+            callout: { // 可选：添加气泡提示
+              content: "司机正在赶来",
+              display: "BYCLICK" // 点击显示
+            }
+          }
+        ];
+  
+        // 6. 构建路线数据
+        const polyline = [{
+          points: [
+            { longitude: startPoint.longitude, latitude: startPoint.latitude },
+            { longitude: endPoint.longitude, latitude: endPoint.latitude }
+          ],
+          color: ROUTE_COLOR,
+          width: ROUTE_WIDTH,
+          dottedLine: false
+        }];
+  
+        // 7. 更新页面数据
+        this.setData({
+          markers,
+          destination: { longitude: endPoint.longitude, latitude: endPoint.latitude },
+          polyline
+        });
+  
+        this.showInfo("已设置终点位置");
+  
+        // 8. 调整地图视野（包含所有标记点）
+        const mapCtx = wx.createMapContext('map');
+        mapCtx.includePoints({
+          points: [
+            { longitude: startPoint.longitude, latitude: startPoint.latitude },
+            { longitude: endPoint.longitude, latitude: endPoint.latitude },
+            { longitude: driverPoint.longitude, latitude: driverPoint.latitude } // 包含司机位置
+          ],
+          padding: MAP_PADDING
+        });
+  
+        // 9. 规划路线
+        this.planRoute();
+      })
+      .catch((err) => {
+        console.error('请求失败：', err);
+        this.showInfo("网络请求失败，请检查网络"); // 添加错误提示
+      });
+  },
+
+  // 规划路线 - 通用方法，可被初始规划和重新规划调用
+  planRoute(isReplan = false) {
+    const that = this;
+    const { longitude, latitude, destination } = this.data;
+    
+    if (!destination) {
+      this.showInfo("请先设置终点");
+      return;
+    }
+    
+    // 如果是重新规划，更新状态
+    if (isReplan) {
+      this.setData({ isReplanning: true });
+      this.showInfo("正在重新规划路线...");
+    } else {
+      this.showInfo("正在规划路线...");
+    }
+    
+    // 调用腾讯地图路线规划API
+    this.mapSdk.direction({
+      mode: 'driving', // 驾车模式，可选值：'driving', 'walking', 'transit'
+      policy:'REAL_TRAFFIC',
+      from: {
+        latitude: this.data.markers[0].longitude,
+        longitude: this.data.markers[0].latitude
+      },
+      to: {
+        latitude: destination.latitude,
+        longitude: destination.longitude
+      },
+      success(res) {
+        console.log("路线规划结果：", res);
+   
+        if (res.status === 0 && res.result.routes.length > 0) {
+       
+          var result = res.result
+          var route = result.routes[0]
+          // 提取路线点
+          var coors = route.polyline, pl = [];
+          //坐标解压（返回的点串坐标，通过前向差分进行压缩）
+          var kr = 1000000;
+          for (var i = 2; i < coors.length; i++) {
+            coors[i] = Number(coors[i - 2]) + Number(coors[i]) / kr;
+          }
+          //将解压后的坐标放入点串数组pl中
+          for (var i = 0; i < coors.length; i += 2) {
+            pl.push({ latitude: coors[i], longitude: coors[i + 1] })
+          }
+  
+          // 更新路线数据（规划路线颜色已设为灰色）
+          let distance = (result.routes[0].distance/1000).toFixed(1)
+          that.setData({
+            plannedRoute: [{
+              name: that.data.orderdata.poiName,
+              points: pl,
+              color: '#2f693c', // 与data中保持一致，确保规划路线颜色正确
+              width: 6,
+              borderColor: '#2f693c',
+              borderWidth: 1
+            }],
+            // trackPoints:[],
+            routePlanned: true,
+            isReplanning: false,
+            deviationCount: 0,  // 重置偏离计数
+            distance:[distance]
+          });
+          console.log(that.data.plannedRoute);
+        
+          // 显示规划结果
+          const message = isReplan 
+            ? `已重新规划路线，距离${(result.routes[0].distance/1000).toFixed(1)}公里，约${Math.ceil(result.routes[0].duration)}分钟`
+            : `路线规划完成，距离${(result.routes[0].distance/1000).toFixed(1)}公里，约${Math.ceil(result.routes[0].duration)}分钟`;
+            
+          that.showInfo(message);
+
+        } else {
+          that.setData({ isReplanning: false });
+          that.showInfo("路线规划失败，请重试");
+        }
+      },
+      fail(err) {
+        console.error("路线规划失败：", err);
+        that.setData({ isReplanning: false });
+        that.showInfo("路线规划失败，请检查网络");
+      }
+    });
+  },
+  // 获取历史轨迹线
+  historytrajectory(){
+    let data = {
+      workorderId:this.data.optionsid
+    }
+    api.request(`/sysworkorder/selectworkorderredis`, 'post',data,{ isPublic: false })       
+    .then((data) => {
+      console.log(data.data);
+      if (data.code==200) {
+          // 设置地图中心为当前位置
+          this.updateDriverLocation(data.data[data.data.length-1])
+    
+      }
+    })
+    .catch((err) => {
+      console.error('请求失败：', err);
+    });
+  },
+  updateDriverLocation(newDriverLocation) {
+    // 更新司机位置数据
+    this.setData({
+      driverLocation: newDriverLocation
+    });
+    
+    // 获取当前标记数组
+    const markers = [...this.data.markers];
+    // 找到司机标记（id:2）并更新位置
+    const driverMarkerIndex = markers.findIndex(marker => marker.id === 2);
+    
+    if (driverMarkerIndex !== -1) {
+      markers[driverMarkerIndex] = {
+        ...markers[driverMarkerIndex],
+        longitude: newDriverLocation.longitude,
+        latitude: newDriverLocation.latitude
+      };
+      // 更新标记
+      this.setData({ markers });
+
+    }
+  },
+  // 显示信息提示
+  showInfo(text) {
+    this.setData({ infoText: text });
+    
+    // 3秒后自动隐藏非状态类信息
+    if (!text.includes("正在") && !text.includes("距离") && !text.includes("偏离")) {
+      setTimeout(() => {
+        this.setData({ infoText: "" });
+      }, 3000);
+    }
+  },
+  
+  // 导航功能
+  navigation(){
+    // 使用在腾讯位置服务申请的key
+    const key = this.data.qqMapKey;
+    // 调用插件的app的名称
+    const referer = '电速宝';
+    // 是否启用智能规划
+    const enableAI = true;
+    // 是否开启导航功能
+    const navigation = 1;
+    // 终点（建议替换为orderdata中的实际终点，当前为示例值）
+    const endPoint = JSON.stringify({
+      name: this.data.orderdata.poiName || '目的地',
+      latitude: this.data.orderdata.latitude,
+      longitude: this.data.orderdata.longitude,
+    });
+    // 个性化图层
+    const layerStyle = 1;
+    wx.navigateTo({
+      url: `plugin://route-plan/index?key=${key}&referer=${referer}&endPoint=${endPoint}&enableAI=${enableAI}&navigation=${navigation}&layerStyle=${layerStyle}`,
+    });
+  },
+
+
+ 
+    // 显示验证码弹窗
+    showVerificationPopup() {
+      let data = {
+        workorderId:this.data.optionsid
+      }
+      api.request(`/sysworkorder/createverify`, 'post',data,{ isPublic: false })       
+      .then((data) => {
+        console.log(data);
+        if (data.code==200) {
+          wx.showToast({
+            title: data.msg,
+            icon: 'none',
+          });
+      this.setData({ showVerification: true });
+            
+        }
+      })
+      .catch((err) => {
+        console.error('请求失败：', err);
+      });
+    },
+    
+    // 关闭弹窗
+    onPopupClose() {
+      this.setData({ showVerification: false });
+      setTimeout(() => {
+        const slideComponent = this.selectComponent("#mySlideConfirm");
+        // 2. 调用组件的reset方法
+        slideComponent.reset();
+      }, 1000);
+    },
+    
+    // 确认验证码
+    onCodeConfirm(e) {
+      console.log("确认验证码:", e.detail.code);
+      // 验证逻辑...
+      this.setData({ showVerification: false });
+    },
+    
+    // 重新发送验证码
+    onResendCode() {
+      console.log("重新发送验证码");
+      // 重新发送逻辑...
+    },
+    
+    // 验证码输入完成
+    onCodeComplete(e) {
+      console.log("验证码输入完成:", e.detail.code);
+      // 自动验证逻辑...
+      let data = {
+        carId:this.data.optionsid,
+        verifyCode: e.detail.code,
+        workorderId:this.data.orderdata.workorderId
+      }
+      api.request(`/sysworkorder/submitworkorder`, 'post',data,{ isPublic: false })
+      .then((data) => {
+        console.log(data.data);
+        if (data.code==200) {
+          wx.showToast({
+            title: data.msg,
+            icon: 'none',
+          });
+          this.getworkorder();
+        
+          this.setData({ showVerification: false });
+      
+        }
+      })
+      .catch((err) => {
+        setTimeout(() => {
+          const slideComponent = this.selectComponent("#mySlideConfirm");
+          // 2. 调用组件的reset方法
+          slideComponent.reset();
+        }, 5000);
+        console.error('请求失败：', err);
+      });
+    },
+    onSlideSuccess(e){
+      console.log(e.currentTarget.dataset.type);
+     
+      // 3. 更新页面状态，隐藏按钮和提示
+      let data = {
+        carId:this.data.orderdata.carId,
+        verifyCode:'',
+        workorderId:this.data.orderdata.workorderId
+      }
+      api.request(`/sysworkorder/submitworkorder`, 'post',data,{ isPublic: false })
+      .then((data) => {
+        console.log(data.data);
+        if (data.code==200) {
+          if(e.currentTarget.dataset.type==1){
+this.startBackgroundLocation();
+
+      }else if(e.currentTarget.dataset.type==4){
+        wx.stopLocationUpdateBackground({
+          success: (res) => {
+            console.log('后台定位已停止', res);
+          },
+          fail: (err) => {
+            console.error('停止后台定位失败', err);
+          },
+        });
+        // 移除位置监听
+        wx.offLocationChange();
+      }
+          this.getworkorder();
+          setTimeout(() => {
+            const slideComponent = this.selectComponent("#mySlideConfirm");
+            // 2. 调用组件的reset方法
+            slideComponent.reset();
+          }, 5000);
+      
+        }
+      })
+      .catch((err) => {
+        setTimeout(() => {
+          const slideComponent = this.selectComponent("#mySlideConfirm");
+          // 2. 调用组件的reset方法
+          slideComponent.reset();
+        }, 5000);
+        console.error('请求失败：', err);
+      });
+    },
+    ontelephone(e){
+      console.log(e.currentTarget.dataset.phone);
+        const phoneNumber = e.currentTarget.dataset.phone;
+        wx.showModal({
+          title: '确认拨打电话',
+          content: '是否拨打' + phoneNumber + '？',
+          success: (res) => {
+            if (res.confirm) {
+              wx.makePhoneCall({
+                phoneNumber: phoneNumber
+              });
+            }
+          }
+        });
+    },
+    onmore(){
+      this.setData({
+        moretype:!this.data.moretype
+      })
+    },
+    oncostdetails(){
+      this.setData({
+        costdetails:!this.data.costdetails
+      })
+    },
+// 拖动功能
+     // 触摸开始
+  handleTouchStart(e) {
+    this.setData({
+      startY: e.changedTouches[0].clientY
+    });
+  },
+
+  // 触摸移动（优化全屏拖动体验）
+  handleTouchMove(e) {
+    const currentY = e.changedTouches[0].clientY;
+    const deltaY = currentY - this.data.startY; // 向下为正
+    const { min, max } = this.data.heightConfig;
+    
+    // 计算新高度（向下拖动增加高度，向上拖动减少高度）
+    let newHeight = this.data.currentHeight - deltaY;
+    
+    // 限制高度范围（min~max）
+    newHeight = Math.max(min, Math.min(max, newHeight));
+    
+    // 优化遮罩逻辑：仅mid档显示遮罩，max档不显示
+    let maskOpacity = this.data.maskOpacity;
+    if (newHeight < max && newHeight > min) {
+      // mid档范围：透明度随高度变化（0.3~0.5）
+      maskOpacity = 0.3 + (newHeight - min) / (this.data.heightConfig.mid - min) * 0.2;
+    } else {
+      maskOpacity = 0; // min或max档隐藏遮罩
+    }
+    
+    this.setData({
+      currentHeight: newHeight,
+      maskOpacity
+    });
+    
+    // 更新起始Y坐标
+    this.setData({
+      startY: currentY
+    });
+  },
+
+  // 触摸结束：优化全屏吸附逻辑
+  handleTouchEnd() {
+    const { currentHeight } = this.data;
+    const { min, mid, max } = this.data.heightConfig;
+    
+    // 定义吸附阈值（全屏档阈值更大，避免误触）
+    const minThreshold = 50; // 距离min档小于50px吸附到min
+    const maxThreshold = 80; // 距离max档小于80px吸附到max
+    const midThreshold = 60; // 距离mid档小于60px吸附到mid
+    
+    // 计算距离
+    const distToMin = Math.abs(currentHeight - min);
+    const distToMid = Math.abs(currentHeight - mid);
+    const distToMax = Math.abs(currentHeight - max);
+    
+    // 吸附逻辑（优先判断全屏和最小档）
+    let targetHeight, targetMode;
+    if (distToMax <= maxThreshold) {
+      // 接近全屏，吸附到max
+      targetHeight = max;
+      targetMode = 'max';
+    } else if (distToMin <= minThreshold) {
+      // 接近最小档，吸附到min
+      targetHeight = min;
+      targetMode = 'min';
+    } else if (distToMid <= midThreshold) {
+      // 接近中间档，吸附到mid
+      targetHeight = mid;
+      targetMode = 'mid';
+    } else {
+      // 其他情况：吸附到最近的档位
+      const minDist = Math.min(distToMin, distToMid, distToMax);
+      if (minDist === distToMin) {
+        targetHeight = min;
+        targetMode = 'min';
+      } else if (minDist === distToMid) {
+        targetHeight = mid;
+        targetMode = 'mid';
+      } else {
+        targetHeight = max;
+        targetMode = 'max';
+      }
+    }
+    
+    // 平滑过渡到目标高度
+    this.setData({
+      currentHeight: targetHeight,
+      cardHeight: targetMode,
+      maskOpacity: targetMode === 'mid' ? 0.5 : 0 // 仅mid档显示遮罩
+    });
+  },
+
+  // 点击遮罩关闭卡片（回到min档）
+  closeCard() {
+    this.setData({
+      currentHeight: this.data.heightConfig.min,
+      cardHeight: 'min',
+      maskOpacity: 0
+    });
+  },
+
+  // 全屏模式关闭按钮（回到min档）
+  closeFullscreen() {
+    this.setData({
+      currentHeight: this.data.heightConfig.min,
+      cardHeight: 'min',
+      maskOpacity: 0
+    });
+  },
+   // 开启后台定位
+   async startBackgroundLocation() {
+    try {
+      // 1. 检查并申请后台定位权限
+      await this.checkBackgroundLocationPermission();
+
+      // 2. 开启后台定位
+      wx.startLocationUpdateBackground({
+        success: (res) => {
+          console.log('后台定位已开启', res);
+          // 3. 监听位置变化
+          this.onLocationChange();
+        },
+        fail: (err) => {
+          console.error('开启后台定位失败', err);
+          wx.showToast({
+            title: '开启定位失败',
+            icon: 'none',
+          });
+        },
+      });
+    } catch (err) {
+      console.error('权限申请失败', err);
+      wx.showToast({
+        title: err.message,
+        icon: 'none',
+      });
+    }
+  },
+
+  // 监听位置变化
+  onLocationChange() {
+    wx.onLocationChange((res) => {
+      console.log('位置变化', res);
+      this.setData({
+        location: res, // 更新位置信息
+      });
+      // 在这里可以处理位置数据，如上传到服务器
+      this.uploadLocation(res);
+    });
+  },
+
+  // 上传位置信息到服务器
+  uploadLocation(location) {
+    // 示例：调用接口上传经纬度
+ 
+    let data = {
+      workorderId:this.data.optionsid,
+      latitude:location.latitude,
+      longitude:location.longitude,
+      createTime:new Date().getTime(),
+    }
+    api.request(`/sysworkorder/insercoordinateredis`, 'post',data,{ isPublic: false })       
+    .then((data) => {
+      console.log(data);
+      if (data.code==200) {
+        that.historytrajectory();
+      
+      }
+    })
+    .catch((err) => {
+      console.error('请求失败：', err);
+    });
+  },
+
+  // 停止后台定位（页面卸载时调用）
+  onUnload() {
+ 
+  },
+  // 检查并申请后台定位权限
+checkBackgroundLocationPermission() {
+  return new Promise((resolve, reject) => {
+    // 1. 检查后台定位权限
+    wx.getSetting({
+      success: (res) => {
+        if (res.authSetting['scope.userLocationBackground']) {
+          // 已授权后台定位权限
+          resolve(true);
+        } else {
+          // 2. 检查是否已授权前台定位权限（后台定位权限需要前台权限为前提）
+          if (res.authSetting['scope.userLocation']) {
+            // 已授权前台定位，直接申请后台定位权限
+            wx.authorize({
+              scope: 'scope.userLocationBackground',
+              success: () => {
+                resolve(true);
+              },
+              fail: (err) => {
+                // 用户拒绝了后台定位权限，引导用户去设置页开启
+                wx.showModal({
+                  title: '提示',
+                  content: '需要开启后台定位权限才能使用该功能，请前往设置页开启',
+                  confirmText: '前往设置',
+                  success: (modalRes) => {
+                    if (modalRes.confirm) {
+                      wx.openSetting({
+                        success: (settingRes) => {
+                          if (settingRes.authSetting['scope.userLocationBackground']) {
+                            resolve(true);
+                          } else {
+                            reject(new Error('用户未开启后台定位权限'));
+                          }
+                        }
+                      });
+                    } else {
+                      reject(new Error('用户拒绝开启后台定位权限'));
+                    }
+                  }
+                });
+              }
+            });
+          } else {
+            // 未授权前台定位，先申请前台定位权限
+            wx.authorize({
+              scope: 'scope.userLocation',
+              success: () => {
+                // 前台定位授权成功后，再申请后台定位权限
+                wx.authorize({
+                  scope: 'scope.userLocationBackground',
+                  success: () => {
+                    resolve(true);
+                  },
+                  fail: (err) => {
+                    // 用户拒绝后台定位权限
+                    wx.showModal({
+                      title: '提示',
+                      content: '需要开启后台定位权限才能使用该功能，请前往设置页开启',
+                      confirmText: '前往设置',
+                      success: (modalRes) => {
+                        if (modalRes.confirm) {
+                          wx.openSetting({
+                            success: (settingRes) => {
+                              if (settingRes.authSetting['scope.userLocationBackground']) {
+                                resolve(true);
+                              } else {
+                                reject(new Error('用户未开启后台定位权限'));
+                              }
+                            }
+                          });
+                        } else {
+                          reject(new Error('用户拒绝开启后台定位权限'));
+                        }
+                      }
+                    });
+                  }
+                });
+              },
+              fail: (err) => {
+                // 用户拒绝前台定位权限，引导用户去设置页开启
+                wx.showModal({
+                  title: '提示',
+                  content: '需要开启定位权限才能使用该功能，请前往设置页开启',
+                  confirmText: '前往设置',
+                  success: (modalRes) => {
+                    if (modalRes.confirm) {
+                      wx.openSetting({
+                        success: (settingRes) => {
+                          if (settingRes.authSetting['scope.userLocation'] && settingRes.authSetting['scope.userLocationBackground']) {
+                            resolve(true);
+                          } else {
+                            reject(new Error('用户未开启定位权限'));
+                          }
+                        }
+                      });
+                    } else {
+                      reject(new Error('用户拒绝开启定位权限'));
+                    }
+                  }
+                });
+              }
+            });
+          }
+        }
+      },
+      fail: (err) => {
+        reject(err);
+      }
+    });
+  });
+}
+});

package-map/pages/map/indexcopy.wxml

@@ -0,0 +1,309 @@
+<view class="container">
+   <!-- 地图组件 -->
+   <!-- <map 
+    id="map"
+    class="map"
+    longitude="{{longitude}}"
+    latitude="{{latitude}}"
+    scale="16"
+    markers="{{markers}}"
+    polyline="{{polyline}}"
+    show-location
+  ></map> -->
+  <map 
+    id="map"
+    class="map"
+    longitude="{{longitude}}"
+    latitude="{{latitude}}"
+    markers="{{markers}}"
+    polyline="{{plannedRoute}}"
+    include-points="{{trackPoints}}"
+    bindcontroltap="controltap"
+    show-location
+  ></map>
+   <!-- 规划路线叠加显示 -->
+   <!-- controls="{{controls}}" -->
+ 
+ 
+  
+  <!-- 信息提示 -->
+  <view class="info" wx:if="{{infoText}}">
+    {{infoText}}
+  </view>
+  <!-- 加载提示 -->
+  <view wx:if="{{loading}}" class="loading-mask">
+    <view class="loading-view">
+      <loading size="large" color="#007aff">获取路线中...</loading>
+    </view>
+  </view>
+
+  <!-- 错误提示 -->
+  <view wx:if="{{error && !loading}}" class="error-message">
+    {{error}}
+  </view>
+  <view class="detailsbox">
+
+ 
+</view>
+ 
+</view>
+<verification-popup 
+  isShow="{{showVerification}}"
+  phoneNumber="{{phoneNumber}}"
+  countdownSeconds="60"
+  bind:close="onPopupClose"
+  bind:confirm="onCodeConfirm"
+  bind:resend="onResendCode"
+  bind:complete="onCodeComplete"
+/>
+
+<!-- pages/taxi-detail/taxi-detail.wxml -->
+<view class="taxi-card-container">
+  <!-- 背景遮罩（仅非全屏/非最小档显示） -->
+  <view 
+    class="mask" 
+    wx:if="{{cardHeight !== 'min' && cardHeight !== 'mid' && cardHeight !== 'max'}}"
+    style="opacity: {{maskOpacity}};"
+    bindtap="closeCard"
+  ></view>
+
+  <!-- 可拖动卡片（全屏时取消底部圆角） -->
+  <view 
+    class="taxi-card"
+    style="height: {{currentHeight}}px;bottom: 0;transition: height 0.3s ease;border-top-left-radius: {{cardHeight === 'max' ? '0' : '16px'}};border-top-right-radius: {{cardHeight === 'max' ? '0' : '16px'}};" bindtouchstart="handleTouchStart" bindtouchmove="handleTouchMove" bindtouchend="handleTouchEnd">
+    <!-- 拖动指示器（全屏时隐藏） -->
+    <view class="drag-handler">
+      <view class="drag-bar"></view>
+    </view>
+    <!-- 卡片内容（全屏时增加内边距适配导航栏） -->
+    <view class="card-content" style="padding-top: {{cardHeight === 'max' ? '40rpx' : '20rpx'}};">
+      <view class="storagecartext">
+<view>
+  <view class="destination-title">
+     <text wx:if="{{orderdata.workorderType==0}}" style="font-weight: 600;">待处理</text>
+      <text wx:if="{{orderdata.workorderType==1}}" style="font-weight: 600;">待处理</text>
+      <text wx:if="{{orderdata.workorderType==2}}">行驶中</text>
+      <text wx:if="{{orderdata.workorderType==3}}">到达指定地点</text>
+     <text wx:if="{{orderdata.workorderType==4}}">工作中</text>
+     <text wx:if="{{orderdata.workorderType==5}}">完成工作</text>
+    </view>
+  <view class="destination-title1" style="margin-top: 20rpx;">
+      目的地：{{orderdata.poiName}}
+    </view>
+    <view class="destination-font" wx:if="{{userdata.operationRole==5}}">
+    <view class="driver" wx:if="{{orderdata.driverphone==''}}">司机：<text style="color: #ff6b00;">待接单</text> </view>
+    <view class="driver" wx:else>司机：{{orderdata.driverName}}·{{orderdata.carName}} 
+    
+    </view> 
+    </view>
+    <view class="destination-font" wx:if="{{userdata.operationRole==4}}">客户：{{orderdata.receiver}} <t-icon name="call-1-filled" size="28rpx" data-name="call-1-filled" data-phone="{{orderdata.phone}}" bind:tap="ontelephone" style="margin-left:20rpx"/> </view>
+
+</view>
+  <image wx:if="{{userdata.operationRole==5}}" class="storagecar" src="https://esos-iot.bjdexn.cn/myminio/project/c152026b9bc2485f83b39a6132df3ce7.png" mode="heightFix"/>
+ 
+<image wx:if="{{userdata.operationRole==4}}" class="storagecar1" src="https://esos-iot.bjdexn.cn/myminio/project/d98e4fde125f40819f8bd8fe872e409c.png" bind:tap="navigation" mode="heightFix"/>
+</view> 
+<view class="card_more" wx:if="{{userdata.operationRole==5&&orderdata.workorderType!=0}}">
+<view class="card_morebox">开发票</view>
+<view class="card_morebox">联系客服</view>
+<view class="card_morebox" data-phone="{{orderdata.driverphone}}" bind:tap="ontelephone">打电话</view>
+<view class="card_morebox">再来一单</view>
+</view>
+<view class="card_box" wx:if="{{userdata.operationRole==5}}">
+ 
+   <!-- 行程详情 -->
+   <view class="detail-section" style="border-bottom: 1rpx solid #f5f5f5;">
+    <view class="viewmore_box" bind:tap="onmore">
+  <view class="section-title">订单详情</view>
+<view class="viewmore_right">
+ <text wx:if="{{!moretype}}">展开详情</text> 
+ <text wx:if="{{moretype}}">收起</text> 
+<t-icon name="chevron-up" wx:if="{{moretype}}" size="22px" data-name="chevron-up"/>
+<t-icon name="chevron-down" wx:if="{{!moretype}}" size="22px" data-name="chevron-down"/>
+</view>
+</view>
+      <view class="detail-list" wx:if="{{moretype}}">
+        <view class="detail-item">
+          <view class="item-label">订单号</view>
+          <view class="item-value">{{orderdata.workorderId}}</view>
+        </view>
+        <view class="detail-item">
+          <view class="item-label">创建时间</view>
+          <view class="item-value">{{orderdata.workorderCreatetime}}</view>
+        </view>
+        <view class="detail-item">
+          <view class="item-label">订单类型</view>
+          <view class="item-value" wx:if="{{orderdata.chargedischargeType==1}}">充电</view>
+          <view class="item-value" wx:if="{{orderdata.chargedischargeType==2}}">放电</view>
+        </view>
+        <view class="detail-item">
+          <view class="item-label">需求电量</view>
+          <view class="item-value">{{orderdata.workorderElectricity}}</view>
+        </view>
+        <view class="detail-item">
+          <view class="item-label">SOC</view>
+          <view class="item-value">{{orderdata.soc}}</view>
+        </view>
+        <view class="detail-item">
+          <view class="item-label">车型</view>
+          <view class="item-value">{{orderdata.carMondel}}</view>
+        </view>
+        <view class="detail-item">
+          <view class="item-label">里程</view>
+          <view class="item-value">12.5km</view>
+        </view>
+        <view class="detail-item">
+          <view class="item-label">预计时长</view>
+          <view class="item-value">50分钟</view>
+        </view>
+      </view>
+      <view style="height: 20rpx;" wx:if="{{moretype}}"></view>
+
+    </view>
+
+   <!-- 费用明细 -->
+ <view class="detail-section">
+      <view class="viewmore_box" bind:tap="oncostdetails">
+  <view class="section-title1">100.1 <text class="section_yuan">元</text> </view>
+<view class="viewmore_right">
+ <text wx:if="{{!costdetails}}">费用明细</text> 
+ <text wx:if="{{costdetails}}">费用明细</text> 
+<t-icon name="chevron-up" wx:if="{{costdetails}}" size="22px" data-name="chevron-up"/>
+<t-icon name="chevron-down" wx:if="{{!costdetails}}" size="22px" data-name="chevron-down"/>
+</view>
+</view>
+      <view class="fee-list" wx:if="{{costdetails}}">
+        <view class="fee-item">
+          <view class="fee-label">起步价</view>
+          <view class="fee-value">¥13.00</view>
+        </view>
+        <view class="fee-item">
+          <view class="fee-label">里程费</view>
+          <view class="fee-value">¥32.00</view>
+        </view>
+        <view class="fee-item">
+          <view class="fee-label">时长费</view>
+          <view class="fee-value">¥8.50</view>
+        </view>
+        <view class="fee-item">
+          <view class="fee-label">服务费</view>
+          <view class="fee-value">¥5.00</view>
+        </view>
+        <view class="fee-item">
+          <view class="fee-label">电费</view>
+          <view class="fee-value">¥5.00</view>
+        </view>
+     
+        <!-- <view class="fee-item total-fee">
+          <view class="fee-label">实付款</view>
+          <view class="fee-value">¥58.50</view>
+        </view> -->
+      </view>
+      <view style="height: 1rpx;"></view>
+    </view>
+  </view> 
+  <view class="card_box" wx:if="{{userdata.operationRole==4}}">
+ 
+ <!-- 行程详情 -->
+ <view class="detail-section" style="border-bottom: 1rpx solid #f5f5f5;">
+  <view class="viewmore_box" bind:tap="onmore">
+<view class="section-title">订单详情</view>
+<view class="viewmore_right">
+<text wx:if="{{!moretype}}">展开详情</text> 
+<text wx:if="{{moretype}}">收起</text> 
+<t-icon name="chevron-up" wx:if="{{moretype}}" size="22px" data-name="chevron-up"/>
+<t-icon name="chevron-down" wx:if="{{!moretype}}" size="22px" data-name="chevron-down"/>
+</view>
+</view>
+    <view class="detail-list" wx:if="{{moretype}}">
+      <view class="detail-item">
+        <view class="item-label">订单号</view>
+        <view class="item-value">{{orderdata.workorderId}}</view>
+      </view>
+      <view class="detail-item">
+        <view class="item-label">创建时间</view>
+        <view class="item-value">{{orderdata.workorderCreatetime}}</view>
+      </view>
+      <view class="detail-item">
+        <view class="item-label">订单类型</view>
+        <view class="item-value" wx:if="{{orderdata.chargedischargeType==1}}">充电</view>
+        <view class="item-value" wx:if="{{orderdata.chargedischargeType==2}}">放电</view>
+      </view>
+      <view class="detail-item">
+        <view class="item-label">需求电量</view>
+        <view class="item-value">{{orderdata.workorderElectricity}}</view>
+      </view>
+      <view class="detail-item">
+        <view class="item-label">SOC</view>
+        <view class="item-value">{{orderdata.soc}}</view>
+      </view>
+      <view class="detail-item">
+        <view class="item-label">车型</view>
+        <view class="item-value">{{orderdata.carMondel}}</view>
+      </view>
+      <view class="detail-item">
+        <view class="item-label">里程</view>
+        <view class="item-value">{{distance}} km</view>
+      </view>
+      <view class="detail-item">
+        <view class="item-label">约定时间</view>
+        <view class="item-value">{{orderdata.workorderStarttime}}</view>
+      </view>
+    </view>
+    <view style="height: 20rpx;" wx:if="{{moretype}}"></view>
+
+  </view>
+
+</view> 
+  <view style="height: 140rpx;" wx:if="{{moretype}}"></view>
+  <!-- 控制按钮区域 -->
+  <view class="control-panel">
+    <slide-confirm 
+    wx:if="{{orderdata.workorderType==1&&userdata.operationRole==4}}"
+    id="mySlideConfirm"
+data-type="{{orderdata.workorderType}}"
+  bind:success="onSlideSuccess" 
+  width="300" 
+  height="50"
+  defaultText="开始出发"
+  successText="验证通过"
+/>
+
+<slide-confirm 
+wx:if="{{orderdata.workorderType==2&&userdata.operationRole==4}}"
+id="mySlideConfirm"
+data-type="{{orderdata.workorderType}}"
+
+  bind:success="onSlideSuccess" 
+  width="300" 
+  height="50"
+  defaultText="到达目的地"
+  successText="验证通过"
+/>
+<slide-confirm 
+wx:if="{{orderdata.workorderType==3&&userdata.operationRole==4}}"
+id="mySlideConfirm"
+data-type="{{orderdata.workorderType}}"
+  bind:success="showVerificationPopup" 
+  width="300" 
+  height="50"
+  defaultText="开始工作"
+  successText="验证通过"
+/>
+<slide-confirm 
+wx:if="{{orderdata.workorderType==4&&userdata.operationRole==4}}"
+id="mySlideConfirm"
+data-type="{{orderdata.workorderType}}"
+
+  bind:success="onSlideSuccess" 
+  width="300" 
+  height="50"
+  defaultText="完成工作"
+  successText="验证通过"
+/>
+     
+  
+  </view>
+    </view>
+  </view>
+</view>

package-order/pages/address/index.js

@@ -28,16 +28,53 @@ Page({
       address:data.data
     })
   }
-  //  wx.navigateTo({
-  //   url: '/pages/map/index',
-  // })
+ 
     })
     .catch((err) => {
    
       console.error('请求失败：', err);
     });
   },
-  /**
+  onIconTap(item){
+    console.log(item.currentTarget.dataset.item);
+
+    if (item.currentTarget.dataset.item=='add') {
+      wx.navigateTo({
+        url: `/package-order/pages/newaddress/index`,
+      })
+    }else{
+      console.log(item.currentTarget.dataset.item);
+      let obj = item.currentTarget.dataset.item
+      wx.setStorageSync("editAddress", obj);
+    wx.navigateTo({
+      url: `/package-order/pages/newaddress/index`,
+    })
+    }
+  
+  },
+  onDelete(id){
+    console.log(id.currentTarget.dataset.id);
+    let data ={
+      addressId:id.currentTarget.dataset.id
+    }
+    api.request(`/sysaddress/deleteaddress`, 'post',data,{ isPublic: false })
+    .then((data) => {
+  console.log(data.data);
+  if (data.code==200) {
+ this.getaddress()
+  }
+ 
+    })
+    .catch((err) => {
+   
+      console.error('请求失败：', err);
+    });
+  },
+  radioChange(e){
+   console.log(e.detail.value);
+
+  },
+    /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {

package-order/pages/address/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "t-icon": "tdesign-miniprogram/icon/icon"
+    "t-icon": "tdesign-miniprogram/icon/icon",
+    "t-swipe-cell": "tdesign-miniprogram/swipe-cell/swipe-cell"
   }
 }

package-order/pages/address/index.wxml

@@ -1,12 +1,20 @@
 <!--pages/userlist/index.wxml-->
 <view class="setup">
-  <view class="driver-info" wx:for="{{address}}" wx:key="addressId">
+  <radio-group bindchange="radioChange">
+    <t-swipe-cell wx:for="{{address}}" wx:key="addressId">
+  <view class="driver-info">
       <view class="driver-details">
-        <view class="driver-car">{{item.addressName}}</view>
-        <view class="driver-name">晟运能源</view>
-        <view class="driver-arrive">经纬度 {{item.addressLatitudelongitude}}</view>
+        <view class="driver-car">{{item.addressDetails}}</view>
+        <view class="driver-name">{{item.poiName||item.addressDetails}}</view>
+        <view class="driver-arrive"><radio value="{{item.addressId}}" checked="true"/>{{item.receiver}} {{item.phone}}</view>
       </view>
       <!-- <button class="cancel-btn" bindtap="cancelOrder">去查看</button> -->
-      <t-icon name="edit-2" size="40rpx" data-name="edit-2" bind:tap="onIconTap" />
+      <t-icon name="edit-2" size="40rpx" data-name="edit-2" data-item="{{item}}" bind:tap="onIconTap" />
     </view>
+      <view slot="right" class="btn delete-btn" data-id="{{item.addressId}}" bind:tap="onDelete">删除</view>
+    </t-swipe-cell>
+  </radio-group>
+</view>
+<view class="address">
+<view class="addressbox" data-item="add" bind:tap="onIconTap">新增地址</view>
 </view>

package-order/pages/address/index.wxss

@@ -7,6 +7,11 @@ page{
   box-sizing: border-box;
 
 }
+.setup{
+  width: 100%;
+  padding-bottom: 180rpx;
+  box-sizing: border-box;
+}
 .driver-info {
   background-color: white;
   border-radius: 16rpx;
@@ -58,4 +63,53 @@ page{
   border: 1rpx solid #FF5252;
   background-color: white;
   border-radius: 32rpx;
+}
+.address{
+  width: 100%;
+  height: 140rpx;
+  display: flex;
+  /* align-items: center; */
+  padding-top:10rpx;
+  justify-content: center;
+  background-color: #ffffff;
+position: fixed;
+bottom: 0rpx;
+left: 0rpx;
+box-sizing: border-box;
+}
+.addressbox{
+  width: 400rpx;
+  height: 80rpx;
+  display: flex;
+align-items: center;
+justify-content: center;
+color: #ffffff;
+  border-radius: 10rpx;
+  background-color: #2C85FF;
+
+  box-sizing: border-box;
+}
+.btn-wrapper {
+  height: 100%;
+}
+
+.btn {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: 120rpx;
+  height: 100%;
+  color: white;
+}
+
+.delete-btn {
+  background-color: #e34d59;
+}
+
+.edit-btn {
+  background-color: #ed7b2f;
+}
+
+.favor-btn {
+  background-color: var(--td-brand-color, #0052d9);
 }

package-order/pages/createorder/index.js

@@ -7,30 +7,77 @@ Page({
    * 页面的初始数据
    */
   data: {
-    cartype:0,
+    cartype:1,
     index:0,
     objectArray: [],
     objdriver: [],
     driverindex:0,
-    date: '2016-09-01',
+    date: '',
+    time: '',       // 初始时间
     userdata:[],
     userindex:0,
-    addressindex:0,
+    addressindex:'',
     address: [],
     items: [
       {value: 1, name: '光伏'},
       {value: 2, name: '风电'},
       {value: 3, name: '网电'},
-    ]
+    ],
+    greenelectricity:0,
+    workorderpower:'',
+    orderdata:[],
+    orderid:'',
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
- this.getdriver()
-this.getvehicle()
- this.getselectcompany()
+    console.log(options);
+this.getaddress()
+
+    if (options.order!='') {
+      this.setData({
+        orderid:options.order
+      })
+     this.getoneworkorder()
+    }
+   
+//  this.getdriver()
+// this.getvehicle()
+  },
+  // 订单详情
+  getoneworkorder() {
+    const data = {
+      workorderId: this.data.orderid
+    };
+    
+    api.request(`/sysworkorder/selectworkorderId`, 'post', data, { isPublic: false })       
+      .then((data) => {
+        if (data.code == 200) {
+       
+          this.setData({
+            cartype:data.data.chargedischargeType,
+            workorderElectricity:data.data.workorderElectricity,
+            workorderpower:data.data.workorderPower,
+            greenelectricity:data.data.greenelectricity,
+            date:data.data.workorderStarttime.slice(0,10),
+            time:data.data.workorderStarttime.slice(11,16),
+          })
+          for (let index = 0; index < this.data.address.length; index++) {
+            if (data.data.addressId==this.data.address[index].addressId) {
+              this.setData({
+               addressindex:index
+              })
+            }
+       }
+  
+        }
+      })
+      .catch((err) => {
+        console.error('获取工单信息失败：', err);
+        this.showInfo('获取工单信息失败');
+      });
   },
   // 司机
   getdriver(){
@@ -98,27 +145,11 @@ this.getvehicle()
       console.error('请求失败：', err);
     });
   },
-    // 用户
-    getselectcompany(){
-     
-      api.request(`/SysCompany/selectcompany`, 'post',{ isPublic: false })
-      .then((data) => {
-       console.log(data.data);
-       this.setData({
-        userdata:data.data
-       })
- this.getaddress()
 
-      })
-      .catch((err) => {
-     
-        console.error('请求失败：', err);
-      });
-    },
   // 地址
   getaddress(){
     let data ={
-      operationId:this.data.userdata[this.data.userindex].companyId
+      operationId:''
     }
     api.request(`/sysaddress/selectaddress`, 'post',data,{ isPublic: false })
     .then((data) => {
@@ -138,23 +169,42 @@ this.setData({
   cartype:e.currentTarget.dataset.index
 })
   },
-  bindDateChange: function(e) {
+  bindDateChange(e) {
     console.log('picker发送选择改变，携带值为', e.detail.value)
     this.setData({
       date: e.detail.value
     })
   },
+    // 时间选择变化
+    bindTimeChange(e) {
+      this.setData({ time: e.detail.value });
+    },
+  // 需求电量
+  bindKeyInput (e) {
+    this.setData({
+      workorderElectricity: e.detail.value
+    })
+  },
+  bindintentionInput (e) {
+    this.setData({
+      workorderpower: e.detail.value
+    })
+  },
   details(){
- 
+   if (this.data.workorderElectricity==''||this.data.date==''||this.data.time==''||this.data.workorderpower=='') {
+    wx.showToast({
+      title: '请填写完整消息',
+      icon: 'none'
+    });
+    return
+   }
     let data ={
-      workorderName:this.data.cartype,
       addressId:this.data.address[this.data.addressindex].addressId,
-      driverId:this.data.objdriver[this.data.driverindex].id,
-      carId:this.data.objectArray[this.data.index].id,
-      customerId:this.data.userdata[this.data.userindex].companyId,
-      workorderContent:'',
-      workorderElectricity:'230',
-      chargedischargeType:this.data.cartype
+      workorderElectricity:this.data.workorderElectricity,
+      chargedischargeType:this.data.cartype,
+      greenelectricity:this.data.greenelectricity,
+      workorderStarttime:this.data.date+' '+this.data.time,
+      workorderpower:this.data.workorderpower
     }
     api.request(`/sysworkorder/addworkorder`, 'post',data,{ isPublic: false })
     .then((data) => {
@@ -170,6 +220,38 @@ this.setData({
     });
  
   },
+  // 编辑
+  editdetails(){
+    if (this.data.workorderElectricity==''||this.data.date==''||this.data.time==''||this.data.workorderpower=='') {
+     wx.showToast({
+       title: '请填写完整消息',
+       icon: 'none'
+     });
+     return
+    }
+     let data ={
+      workorderId:this.data.orderid,
+       addressId:this.data.address[this.data.addressindex].addressId,
+       workorderElectricity:this.data.workorderElectricity,
+       chargedischargeType:this.data.cartype,
+       greenelectricity:this.data.greenelectricity,
+       workorderStarttime:this.data.date+' '+this.data.time,
+       workorderpower:this.data.workorderpower
+     }
+     api.request(`/sysworkorder/updateworkorder`, 'post',data,{ isPublic: false })
+     .then((data) => {
+  console.log(data);
+  wx.switchTab({
+   url: '/pages/tool/index',
+ })
+ 
+     })
+     .catch((err) => {
+    
+       console.error('请求失败：', err);
+     });
+  
+   },
    //  司机
    bindectArrayChange(e){
     console.log(e.detail.value);
@@ -192,7 +274,7 @@ this.setData({
 })
     },
       // 地址
-      binduserChange(e){
+      bindPickerChange(e){
         console.log(e);
         this.setData({
           addressindex:e.detail.value
@@ -201,15 +283,22 @@ this.setData({
            radioChange(e) {
             console.log('radio发生change事件，携带value值为：', e.detail.value)
         
-            const items = this.data.items
-            for (let i = 0, len = items.length; i < len; ++i) {
-              items[i].checked = items[i].value === e.detail.value
-            }
+            // const items = this.data.items
+            // for (let i = 0, len = items.length; i < len; ++i) {
+            //   items[i].checked = items[i].value === e.detail.value
+            // }
         
             this.setData({
-              items
+              greenelectricity:e.detail.value
             })
+            console.log(this.data.greenelectricity);
+          },
+          toconfigure(){
+    wx.navigateTo({
+            url: '/package-order/pages/address/index',
+          });
           },
+      
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -221,6 +310,7 @@ this.setData({
    * 生命周期函数--监听页面显示
    */
   onShow() {
+    this.getaddress()
 
   },
 

package-order/pages/createorder/index.wxml

@@ -5,24 +5,34 @@
 <text style="color: red;">*</text> 用车类型
 </view>
 <view class="car_right">
-  <view class="{{cartype== 1 ?'cartbuy':'carsell'}}" data-index="0" bind:tap="oncar">买电</view>
-  <view class="{{cartype== 0 ?'cartbuy':'carsell'}}" data-index="1" bind:tap="oncar">卖电</view>
+  <view class="{{cartype== 2 ?'cartbuy':'carsell'}}" data-index="1" bind:tap="oncar">买电</view>
+  <view class="{{cartype== 1 ?'cartbuy':'carsell'}}" data-index="2" bind:tap="oncar">卖电</view>
 </view>
 </view>
 <view class="car">
 <view>
-<text style="color: red;">*</text> <text wx:if="{{cartype==1}}"> 出售电量</text> <text wx:if="{{cartype==0}}"> 需求电量</text> 
+<text style="color: red;">*</text> <text wx:if="{{cartype==2}}"> 出售电量</text> <text wx:if="{{cartype==1}}"> 需求电量</text> 
 </view>
 <view class="model_right">
-<input class="powerlevel" type="text" placeholder="请输入电量"/>
+<input class="powerlevel" type="text" value="{{workorderElectricity}}" bindinput="bindKeyInput" placeholder="请输入电量"/>kWh
 </view>
 </view>
-<view class="car" wx:if="{{cartype==1}}">
+<!-- <view class="car" wx:if="{{cartype==1}}">
 <view>
 <text style="color: red;">*</text> 意向电价
 </view>
 <view class="model_right">
-<input class="powerlevel" type="text" placeholder="请输入需求用电"/>
+<input class="powerlevel" type="text" bindinput="binddemandInput" placeholder="请输入需求用电"/>
+</view>
+</view> -->
+
+<!-- 网电 -->
+<view class="car">
+<view style="margin-left: 18rpx;">
+ 变压器容量
+</view>
+<view class="model_right">
+<input class="powerlevel" value="{{workorderpower}}" bindinput="bindintentionInput" type="text" placeholder="请输入需求用电"/>kVA
 </view>
 </view>
 <view class="car">
@@ -34,22 +44,13 @@
         <label class="weui-cell weui-check__label" wx:for="{{items}}" wx:key="value">
 
           <view class="weui-cell__hd">
-            <radio value="{{item.value}}" checked="true"/>
+            <radio value="{{item.value}}" checked="{{item.value == greenelectricity}}"/>
           </view>
           <view class="weui-cell__bd">{{item.name}}</view>
         </label>
       </radio-group>
 </view>
 </view>
-<!-- 网电 -->
-<view class="car">
-<view style="margin-left: 18rpx;">
- 变压器容量
-</view>
-<view class="model_right">
-<input class="powerlevel" type="text" placeholder="请输入需求用电"/>
-</view>
-</view>
 <!-- <view class="car">
 <view>
 <text style="color: red;">*</text> 司机
@@ -63,7 +64,7 @@
   </picker>
 </view>
 </view> -->
-<view class="car">
+<!-- <view class="car">
 <view style="margin-left: 18rpx;">
 车长车型
 </view>
@@ -75,7 +76,7 @@
     </view>
   </picker>
 </view>
-</view>
+</view> -->
 <!-- <view class="car">
 <view>
 <text style="color: red;">*</text> 用户
@@ -89,39 +90,73 @@
   </picker>
 </view>
 </view> -->
- 
-<view class="car">
+
+<view class="car1">
 <view>
 <text style="color: red;">*</text> 地址
 </view>
 <view class="model_right">
-  <picker bindchange="bindPickerChange" value="{{addressindex}}" range="{{address}}" range-key="addressDetails">
+  <picker bindchange="bindPickerChange" value="{{addressindex}}" range="{{address}}" range-key="poiName" wx:if="{{address.length>0}}">
     <view class="picker">
-    {{address[addressindex].addressDetails}}
+    <view>
+    </view>
+    <view style="display: flex;">
+      <text  wx:if="{{addressindex===''}}" style="color: #cccccc;">请选择完整</text>
+    <text wx:else> {{address[addressindex].poiName}}</text>
+
 <t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
     </view>
+   
+    </view>
   </picker>
+  <view class="picker" wx:else bind:tap="toconfigure">
+    新增地址
+<t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
+    </view>
 </view>
 </view>
-<view class="car">
+<view class="car1">
 <view>
-<text style="color: red;">*</text> 预计到达时间
+<text style="color: red;">*</text> 期望到达日期
 </view>
 <view class="model_right">
-  <picker mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
+  <picker mode="date" value="{{date}}" start="2020-09-01" end="2030-09-01" bindchange="bindDateChange">
     <view class="picker">
-     {{date}}
+    <view></view>
+    <view style="display:flex;">
+    <text wx:if="{{date!=''}}">{{date}}</text> 
+    <text wx:else style="color: #cccccc;">请选择日期</text> 
 <t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
     </view>
+    </view>
   </picker>
 </view>
 </view>
-
+<view class="car1">
+<view>
+<text style="color: red;">*</text> 期望到达时间
+</view>
+<view class="model_right">
+  <!-- 时间选择器 -->
+<picker mode="time" value="{{time}}" start="00:00" end="23:59" bindchange="bindTimeChange">
+  <view class="picker">
+  <view></view>
+  <view style="display: flex;">
+   <text wx:if="{{time}}">{{time}}</text> 
+   <text wx:else style="color: #cccccc;">请选择时间</text> 
+    <t-icon name="chevron-right-s" size="40rpx" color="#cccccc" />
+  </view>
+  </view>
+</picker>
+</view>
+</view>
 </view>
 <!-- 
 
 --->
-<button class="call-btn" bindtap="details">
+<button class="call-btn" bindtap="details" wx:if="{{orderid==''}}"> 
       <text class="call-btn_left_electricity">预约</text>
 </button> 
-        
+<button class="call-btn" bindtap="editdetails" wx:else>
+      <text class="call-btn_left_electricity">保存</text>
+</button> 

package-order/pages/createorder/index.wxss

@@ -18,6 +18,15 @@ box-sizing: border-box;
   display: flex;
   justify-content: space-between;
 }
+.car1{
+  margin-top: 20rpx;
+  padding: 0rpx 30rpx;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+ 
 .car_right{
   width: 240rpx;
   display: flex;
@@ -38,7 +47,11 @@ box-sizing: border-box;
   justify-content: space-between;
 }
 .picker{
+  width: 400rpx;
+  height: 80rpx;
   display: flex;
+align-items: center;
+ justify-content: space-between;
 }
 .call-btn {
   position: absolute;

package-order/pages/mapSelect/index.js

@@ -0,0 +1,209 @@
+// const app = getApp();
+// const api = require('../../../api/index.js');
+
+const QQMapWX = require('../../../libs/qqmap-wx-jssdk.min.js'); // 引入QQ地图SDK（需自行下载）
+// this.qqmapsdk = require('../../../libs/qqmap-wx-jssdk.min.js');
+
+// 初始化QQ地图API（需在腾讯地图开放平台申请key）
+const qqmapsdk = new QQMapWX({
+  key: 'VRGBZ-ZFRHB-SKIUP-NHHJ3-TXGJT-ZIFG3' // 替换为自己的API密钥（https://lbs.qq.com/dev/console/application/mine）
+});
+
+Page({
+  data: {
+    latitude: 0,        // 纬度
+    longitude: 0,       // 经度
+    searchKey: '',      // 搜索关键词
+    poiList: [],        // 附近地点列表
+    markers: [],        // 地图标记点
+    loading: false      // 加载状态
+  },
+
+  // 保持原有逻辑不变，仅需确保接收省市区参数正常
+onLoad(options) {
+  if (options.params) {
+    try {
+      this.setData({
+        prevParams: JSON.parse(decodeURIComponent(options.params))
+      });
+    } catch (err) {
+      console.error('参数解析失败：', err);
+    }
+  }
+  this.getLocation();
+  },
+
+  // 获取用户当前定位
+  getLocation() {
+    wx.showLoading({
+      title: '获取位置中...'
+    });
+
+    wx.getLocation({
+      type: 'gcj02', // 国测局坐标系（微信地图默认）
+      success: (res) => {
+        const { latitude, longitude } = res;
+        this.setData({
+          latitude,
+          longitude,
+          // 添加当前位置标记点
+          markers: [{
+            id: 0,
+            latitude,
+            longitude,
+            iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/0b0593293af54ea097b168cea479c25c.png', // 可自行添加定位图标
+            width: 30,
+            height: 30,
+            anchor: { x: 0.5, y: 0.5 }
+          }]
+        });
+        // 获取附近地点
+        this.getNearbyPoi(latitude, longitude);
+      },
+      fail: (err) => {
+        wx.hideLoading();
+        wx.showToast({
+          title: '获取定位失败，请开启定位权限',
+          icon: 'none',
+          duration: 2000
+        });
+        // 若定位失败，使用上一页已选地址的经纬度（如果有）
+        const { province, city, district } = this.data.prevFormData;
+        if (province && city && district) {
+          this.geocoder(`${province}${city}${district}`);
+        }
+      }
+    });
+  },
+
+  // 地址转经纬度（地理编码）
+  geocoder(address) {
+    qqmapsdk.geocoder({
+      address: address,
+      success: (res) => {
+        if (res.result && res.result.location) {
+          const { lat, lng } = res.result.location;
+          this.setData({
+            latitude: lat,
+            longitude: lng,
+            markers: [{
+              id: 0,
+              latitude: lat,
+              longitude: lng,
+              iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/0b0593293af54ea097b168cea479c25c.png',
+              width: 30,
+              height: 30,
+              anchor: { x: 0.5, y: 0.5 }
+            }]
+          });
+          this.getNearbyPoi(lat, lng);
+        }
+      },
+      fail: () => {
+        wx.showToast({
+          title: '地址解析失败',
+          icon: 'none'
+        });
+      }
+    });
+  },
+
+  // 获取附近地点（POI搜索）
+  getNearbyPoi(latitude, longitude) {
+    this.setData({ loading: true });
+
+    qqmapsdk.search({
+      keyword: this.data.searchKey || '小区,商铺,写字楼,学校,医院', // 默认搜索关键词
+      location: `${latitude},${longitude}`,
+      radius: 2000, // 搜索半径（2000米）
+      page_size: 20, // 每页结果数
+      success: (res) => {
+        wx.hideLoading();
+        this.setData({
+          poiList: res.data,
+          loading: false
+        });
+      },
+      fail: (err) => {
+        wx.hideLoading();
+        this.setData({ loading: false });
+        wx.showToast({
+          title: '获取附近地点失败',
+          icon: 'none'
+        });
+      }
+    });
+  },
+
+  // 搜索输入事件
+  handleSearchInput(e) {
+    this.setData({ searchKey: e.detail.value });
+  },
+
+  // 搜索确认
+  handleSearchConfirm() {
+    const { searchKey, latitude, longitude } = this.data;
+    if (searchKey.trim()) {
+      // 关键词搜索
+      this.getNearbyPoi(latitude, longitude);
+    }
+  },
+
+  // 地图视野变化事件（拖动地图后刷新附近地点）
+  handleRegionChange(e) {
+    if (e.type === 'end' && e.causedBy === 'drag') {
+      const { latitude, longitude } = this.data.mapCtx.getCenterLocation();
+      this.setData({ latitude, longitude });
+      this.getNearbyPoi(latitude, longitude);
+    }
+  },
+
+  // 点击地图标记点
+  handleMarkerTap(e) {
+    const { id } = e.markerId;
+    const { poiList } = this.data;
+    if (id > 0 && poiList[id - 1]) {
+      this.selectPoi({ currentTarget: { dataset: { poi: poiList[id - 1] } } });
+    }
+  },
+
+  // 选择地点
+  selectPoi(e) {
+    console.log(e);
+    const selectedPoi = e.currentTarget.dataset.poi;
+    if (!selectedPoi) return;
+
+    // 解析地址信息（省市区+详细地址）
+    const {ad_info,address, title, location } = selectedPoi;
+    const detailAddress = address + title;
+
+    // 组装地址数据addressDetails
+    const addressData = {
+      province:ad_info.province,
+      city:ad_info.city,
+      district:ad_info.district,
+      addressDetails: detailAddress,
+      latitude: location.lat,
+      longitude: location.lng,
+      poiName: title // 标记点名称（如小区名、商铺名）
+    };
+    console.log(addressData);
+
+    // 返回上一页并传递选择的地址数据
+    const pages = getCurrentPages();
+    const prevPage = pages[pages.length - 2];
+    if (prevPage) {
+      prevPage.setData({
+        'formData.province': ad_info.province,
+        'formData.city': ad_info.city,
+        'formData.district': ad_info.district,
+        'formData.addressDetails': detailAddress,
+        'formData.poiName': title,
+        'formData.latitude': location.lat,
+        'formData.longitude': location.lng
+      });
+    }
+
+    wx.navigateBack({ delta: 1 });
+  }
+});

package-order/pages/mapSelect/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "选择地址",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "usingComponents": {}
+}

package-order/pages/mapSelect/index.wxml

@@ -0,0 +1,49 @@
+<view class="map-container">
+  <!-- 搜索框 -->
+  <view class="search-bar">
+    <input 
+      class="search-input" 
+      placeholder="搜索附近地点、小区、商铺等"
+      value="{{searchKey}}"
+      bindinput="handleSearchInput"
+      bindconfirm="handleSearchConfirm"
+    />
+    <button 
+      class="search-btn" 
+      bindtap="handleSearchConfirm"
+    >
+      搜索
+    </button>
+  </view>
+  
+  <!-- 地图组件 -->
+  <map 
+    class="map"
+    longitude="{{longitude}}"
+    latitude="{{latitude}}"
+    markers="{{markers}}"
+    show-location
+    bindmarkertap="handleMarkerTap"
+    bindregionchange="handleRegionChange"
+  ></map>
+  
+  <!-- 附近地点列表 -->
+  <view class="poi-list">
+    <view 
+      class="poi-item"
+      wx:for="{{poiList}}"
+      wx:key="id"
+      bindtap="selectPoi"
+      data-poi="{{item}}"
+    >
+      <view class="poi-name">{{item.title}}</view>
+      <view class="poi-address">{{item.address}}</view>
+    </view>
+  </view>
+  
+  <!-- 加载提示 -->
+  <view class="loading" wx:if="{{loading}}">加载中...</view>
+  <view class="no-result" wx:if="{{!loading && poiList.length === 0 && searchKey.trim()}}">
+    未找到相关地点，请更换关键词
+  </view>
+</view>

package-order/pages/mapSelect/index.wxss

@@ -0,0 +1,84 @@
+page {
+  height: 100%;
+  background-color: #fff;
+}
+
+.map-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+/* 搜索框 */
+.search-bar {
+  width: 100%;
+  padding: 15rpx 30rpx;
+  border-bottom: 1rpx solid #f1f1f1;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+}
+
+.search-input {
+  flex: 1;
+  height: 60rpx;
+  background-color: #f5f5f5;
+  border-radius: 30rpx;
+  padding: 0 20rpx;
+  font-size: 26rpx;
+}
+
+.search-btn {
+  margin-left: 15rpx;
+  padding: 0 20rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  background-color: #2C85FF;
+  color: #ffffff;
+  font-size: 26rpx;
+  border-radius: 30rpx;
+}
+
+.search-btn::after {
+  border: none;
+}
+
+/* 地图 */
+.map {
+  flex: 1;
+  width: 100%;
+}
+
+/* 附近地点列表 */
+.poi-list {
+  max-height: 600rpx;
+  min-height: 300rpx;
+  overflow-y: auto;
+  border-top: 1rpx solid #f1f1f1;
+  padding-bottom:80rpx;
+}
+
+.poi-item {
+  padding: 20rpx 30rpx;
+  border-bottom: 1rpx solid #f1f1f1;
+}
+
+.poi-name {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 8rpx;
+}
+
+.poi-address {
+  font-size: 24rpx;
+  color: #666;
+  line-height: 1.4;
+}
+
+/* 加载提示 */
+.loading, .no-result {
+  padding: 20rpx;
+  text-align: center;
+  font-size: 26rpx;
+  color: #999;
+}

package-order/pages/newaddress/index.js

@@ -0,0 +1,265 @@
+const app = getApp();
+const api = require('../../../api/index.js');
+ 
+// 全局常量定义
+const PHONE_REG = /^1[3-9]\d{9}$/; // 手机号正则
+const EMPTY_REGION_TIP = '请选择省/市/区'; // 地区空提示
+
+Page({
+  data: {
+    formData: {
+      receiver: '',
+      phone: '',
+      province: '',       // 省份名称（原生组件返回）
+      city: '',           // 城市名称（原生组件返回）
+      district: '',       // 区县名称（原生组件返回）
+      provincecode: '',   // 省份编码（原生组件返回）
+      citycode: '',       // 城市编码（原生组件返回）
+      districtcode: '',   // 区县编码（原生组件返回）
+      addressDetails: '',
+      isDefault: false,
+      poiName: '',
+      latitude: '',
+      longitude: '',
+      addressId:''
+    },
+    regionValue: [],     // 原生选择器绑定值（['省', '市', '区']）
+    customItem: EMPTY_REGION_TIP, // 选择器默认提示
+    isSubmitting: false  // 防止重复提交
+  },
+
+  onLoad(options) {
+    console.log(options);
+    if (wx.getStorageSync("editAddress")) {
+      const parsedAddress = wx.getStorageSync("editAddress") || {};
+      console.log(parsedAddress);
+      this.setData({
+        formData:parsedAddress
+      })
+    }
+  
+    wx.removeStorageSync("editAddress"); // 用完立即删除
+    // 初始化：优先使用定位获取当前地区（可选）
+    this.getLocationRegion();
+    // 支持编辑模式
+    this.initEditMode(options);
+  },
+  onShow(){
+ 
+  },
+ 
+  /**
+   * 初始化编辑模式（从地址列表传递数据）
+   */
+  initEditMode(options) {
+    console.log(options);
+    if (options.address) {
+      try {
+        const address = JSON.parse(decodeURIComponent(options.address));
+        this.setData({
+          formData: { ...this.data.formData, ...address },
+          regionValue: [address.province, address.city, address.district]
+        });
+      } catch (err) {
+        console.error('编辑地址数据解析失败：', err);
+        wx.showToast({ title: '地址数据异常', icon: 'none' });
+      }
+    }
+  },
+
+  /**
+   * 获取当前定位地区（优化初始体验）
+   */
+  getLocationRegion() {
+    wx.getLocation({
+      type: 'gcj02',
+      success: (res) => {
+        // 逆地理编码：通过经纬度获取省市区信息
+        wx.request({
+          url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=VRGBZ-ZFRHB-SKIUP-NHHJ3-TXGJT-ZIFG3`,
+          success: (geoRes) => {
+            if (geoRes.data.status === 0) {
+              const { province, city, district, adcode } = geoRes.data.result.ad_info;
+              const regionValue = [province, city, district];
+              this.setData({
+                regionValue,
+                'formData.province': province,
+                'formData.city': city,
+                'formData.district': district,
+                'formData.provincecode': adcode.slice(0, 2) + '0000', // 省份编码（前2位+0000）
+                'formData.citycode': adcode.slice(0, 4) + '00',     // 城市编码（前4位+00）
+                'formData.districtcode': adcode,                   // 区县编码
+                'formData.latitude': res.latitude,
+                'formData.longitude': res.longitude
+              });
+            }
+          }
+        });
+      },
+      fail: () => {
+        console.warn('获取定位失败，使用默认选择器');
+        // 定位失败不影响，用户可手动选择
+      }
+    });
+  },
+
+  /**
+   * 省市区选择器变更事件（完全原生实现）
+   */
+  handlePickerChange(e) {
+    const { value, code } = e.detail; // 原生组件返回：value=名称数组，code=编码数组
+    const [province, city, district] = value;
+    const [provincecode, citycode, districtcode] = code;
+
+    // 直接使用原生返回的名称和编码，无需自定义映射
+    this.setData({
+      regionValue: value,
+      'formData.province': province,
+      'formData.provincecode': provincecode,
+      'formData.city': city,
+      'formData.citycode': citycode,
+      'formData.district': district,
+      'formData.districtcode': districtcode
+    });
+
+    console.log('选中省市区：', {
+      name: `${province}-${city}-${district}`,
+      code: `${provincecode}-${citycode}-${districtcode}`
+    });
+  },
+
+  /**
+   * 输入框事件（保持原有限制）
+   */
+  handleInput(e) {
+    const { key } = e.currentTarget.dataset;
+    let { value } = e.detail;
+
+    // 针对性输入限制
+    switch (key) {
+      case 'receiver':
+        value = value.trim().slice(0, 10); // 收货人最多10个字
+        break;
+      case 'phone':
+        value = value.replace(/\D/g, ''); // 只保留数字
+        break;
+      
+      case 'addressDetails':
+        value = value.trim().slice(0, 50); // 详细地址最多50个字
+        break;
+    }
+
+    this.setData({
+      [`formData.${key}`]: value
+    });
+  },
+  /**
+   * 开关切换事件
+   */
+  handleSwitchChange(e) {
+    const isDefault = e.detail.value;
+    this.setData({
+      'formData.isDefault': isDefault
+    });
+
+    if (isDefault) {
+      wx.showToast({
+        title: '将设为默认收货地址',
+        icon: 'none',
+        duration: 1500
+      });
+    }
+  },
+
+  /**
+   * 跳转地图选址
+   */
+  navigateToMapSelect() {
+    const { formData } = this.data;
+    console.log(formData);
+    const params = {
+      province: formData.province,
+      city: formData.city,
+      district: formData.district
+    };
+
+    wx.navigateTo({
+      url: `/package-order/pages/mapSelect/index?params=${encodeURIComponent(JSON.stringify(params))}`
+    });
+  },
+
+  /**
+   * 表单提交（保持原有校验）
+   */
+  formSubmit(e) {
+    const { formData, isSubmitting } = this.data;
+
+    // 防止重复提交
+    if (isSubmitting) return;
+    console.log(formData);
+
+    // 完整表单校验
+    if (!formData.receiver.trim()) {
+      wx.showToast({ title: '请输入收货人姓名', icon: 'none' });
+      return;
+    }
+
+    if (!PHONE_REG.test(formData.phone)) {
+      wx.showToast({ title: '请输入正确的手机号码', icon: 'none' });
+      return;
+    }
+
+    if (!formData.province || !formData.city || !formData.district) {
+      wx.showToast({ title: '请选择所在地区', icon: 'none' });
+      return;
+    }
+
+    if (!formData.addressDetails.trim()) {
+      wx.showToast({ title: '请输入详细地址', icon: 'none' });
+      return;
+    }
+      if (formData.poiName=='') {
+        formData.poiName = formData.addressDetails
+        formData.addressDetails = formData.province+formData.city+formData.district+formData.addressDetails
+      }
+    // 开始提交
+    this.setData({ isSubmitting: true });
+    // 模拟接口请求（实际项目替换为真实接口）
+    if (formData.addressId=='') {
+      api.request(`/sysaddress/addaddress`, 'post',formData,{ isPublic: false })
+      .then((data) => {
+    console.log(data.data);
+    if (data.code==200) {
+    wx.navigateTo({
+      url: '/package-order/pages/address/index',
+    })
+    this.setData({ isSubmitting: false });
+  
+    }
+      })
+      .catch((err) => {
+        this.setData({ isSubmitting: false });
+     
+        console.error('请求失败：', err);
+      });
+    }else{
+      api.request(`/sysaddress/updateaddress`, 'post',formData,{ isPublic: false })
+      .then((data) => {
+    console.log(data.data);
+    if (data.code==200) {
+    wx.navigateTo({
+      url: '/package-order/pages/address/index',
+    })
+    this.setData({ isSubmitting: false });
+  
+    }
+      })
+      .catch((err) => {
+        this.setData({ isSubmitting: false });
+     
+        console.error('请求失败：', err);
+      });
+    }
+  
+  }
+});

package-order/pages/newaddress/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "选择地址",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "usingComponents": {
+    "t-icon": "tdesign-miniprogram/icon/icon"
+  }
+}

package-order/pages/newaddress/index.wxml

@@ -0,0 +1,120 @@
+<view class="address-container">
+  <!-- 表单区域 -->
+  <form bindsubmit="formSubmit">
+    <!-- 收货人 -->
+    <view class="form-item">
+      <label class="form-label required">联系人</label>
+      <input 
+        class="form-input" 
+        name="receiver" 
+        placeholder="请输入收货人姓名" 
+        value="{{formData.receiver}}"
+        bindinput="handleInput"
+        data-key="receiver"
+      />
+    </view>
+    
+    <!-- 手机号码 -->
+    <view class="form-item">
+      <label class="form-label required">手机号码</label>
+      <input 
+        class="form-input" 
+        name="phone" 
+        placeholder="请输入手机号码" 
+        type="number"
+        value="{{formData.phone}}"
+        bindinput="handleInput"
+        data-key="phone"
+        maxlength="11"
+      />
+    </view>
+    
+    <!-- 省市区选择 -->
+    <!-- <view class="form-item">
+  <label class="form-label required">所在地区</label>
+  <picker 
+    mode="region" 
+    bindchange="handlePickerChange" 
+    value="{{regionValue}}"
+    custom-item="{{customItem}}"
+  >
+    <view class="area-picker">
+    
+      <text class="area-text">{{regionValue[0]}}，{{regionValue[1]}}，{{regionValue[2]}}</text>
+      <icon class="right-icon" type="right" size="16" color="#999" />
+    </view>
+  </picker>
+</view> -->
+
+    
+    <!-- 详细地址 -->
+   <!-- 详细地址（新增地图入口） -->
+<view class="form-item">
+  <label class="form-label required">详细地址</label>
+  <view class="detail-address-wrapper" bindtap="navigateToMapSelect">
+    <input 
+      class="form-input" 
+      name="addressDetails" 
+      placeholder="街道、门牌号等（可点击地图选择）" 
+      value="{{formData.addressDetails}}"
+      bindinput="handleInput"
+      data-key="addressDetails"
+      disabled="false"
+    />
+    <!-- <button 
+      class="map-btn" 
+      size="mini"
+    > -->
+      <!-- <image src="/images/map-icon.png" class="map-icon" /> -->
+      <t-icon name="location" size="40rpx" data-name="location"/>
+
+    <!-- </button> -->
+  </view>
+  <!-- 选中的POI名称提示 -->
+  <!-- <view class="poi-tip" wx:if="{{formData.poiName}}">
+    已选择：{{formData.poiName}}
+  </view> -->
+</view>
+    
+    <!-- 邮政编码 -->
+    <!-- <view class="form-item">
+      <label class="form-label">邮政编码</label>
+      <input 
+        class="form-input" 
+        name="zipCode" 
+        placeholder="选填" 
+        type="number"
+        value="{{formData.zipCode}}"
+        bindinput="handleInput1"
+        data-key="zipCode"
+        maxlength="100"
+      />
+    </view> -->
+    
+    <!-- 默认地址开关 -->
+    <view class="form-item switch-item">
+      <label class="form-label">默认地址</label>
+      <switch 
+        checked="{{formData.isDefault}}"
+        bindchange="handleSwitchChange"
+      />
+    </view>
+    
+    <!-- 提交按钮 -->
+    <button 
+    type="primary"
+      form-type="submit" 
+      class="submit-btn"
+      disabled="{{!formData.receiver || !formData.phone || !formData.province || !formData.city || !formData.district || !formData.addressDetails}}"
+    >
+      保存地址
+    </button>
+  </form>
+
+  <!-- 遮罩层 -->
+  <view 
+    wx:if="{{showAreaPicker}}"
+    class="mask"
+    bindtap="closeAreaPicker"
+  ></view>
+</view>

package-order/pages/newaddress/index.wxss

@@ -0,0 +1,194 @@
+/* 全局样式 */
+page {
+  background-color: #f5f5f5;
+}
+
+.address-container {
+  padding-bottom: 20rpx;
+}
+
+/* 表单项目 */
+.form-item {
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  padding: 0 30rpx;
+  height: 100rpx;
+  border-bottom: 1rpx solid #f1f1f1;
+}
+
+.form-label {
+  font-size: 28rpx;
+  color: #333;
+  width: 160rpx;
+}
+
+.required::after {
+  content: '*';
+  color: #ff4d4f;
+  margin-left: 4rpx;
+}
+
+.form-input {
+  flex: 1;
+  height: 100%;
+  font-size: 28rpx;
+  color: #333;
+  padding: 0 10rpx;
+}
+
+.form-input::placeholder {
+  color: #999;
+  font-size: 26rpx;
+}
+
+/* 地区选择器 */
+.area-picker {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.area-text {
+  font-size: 28rpx;
+  color: #333;
+  margin-right: 10rpx;
+}
+
+.right-icon {
+  margin-left: auto;
+}
+
+/* 开关项 */
+.switch-item {
+  justify-content: space-between;
+}
+
+/* 提交按钮 */
+.submit-btn {
+  margin: 40rpx 30rpx;
+  height: 90rpx;
+  line-height: 90rpx;
+  background-color: #2C85FF;
+  color: #fff;
+  font-size: 32rpx;
+  border-radius: 45rpx;
+  margin-top: 100rpx;
+}
+
+.submit-btn::after {
+  border: none;
+  /* background-color: #cccccc; */
+
+}
+
+.submit-btn:disabled {
+  color: #ffffff;
+
+}
+
+/* 省市区选择器 */
+.area-picker-view {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 400rpx;
+  background-color: #fff;
+  z-index: 100;
+}
+
+.picker-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  color: #333;
+}
+
+/* 遮罩层 */
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 99;
+}
+/* 详细地址容器 */
+.detail-address-wrapper {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
+
+/* 地图按钮 */
+.map-btn {
+  width: 50rpx;
+  height: 50rpx;
+  padding: 0;
+  margin-left: 10rpx;
+  background: transparent;
+}
+
+.map-icon {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+/* POI提示文字 */
+.poi-tip {
+  position: absolute;
+  left: 190rpx;
+  top: 70rpx;
+  font-size: 22rpx;
+  color: #666;
+}
+/* 优化选择器容器样式，与原生组件适配 */
+.area-picker {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-right: 10rpx;
+}
+
+.area-text {
+  font-size: 28rpx;
+  color: #333;
+  /* 处理文字溢出 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/* 空状态文字颜色区分 */
+.area-text:empty::before {
+  content: '请选择省/市/区';
+  color: #999;
+}
+
+.right-icon {
+  margin-left: 10rpx;
+}
+/* 保持原有样式不变 */
+.form-item {
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  padding: 0 30rpx;
+  height: 100rpx;
+  border-bottom: 1rpx solid #f1f1f1;
+}
+
+.area-picker {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-right: 10rpx;
+}
+
+/* 其他样式保持不变 */

package-order/utils/parseFullAddress.js

@@ -0,0 +1,317 @@
+// utils/parseFullAddress.js
+// 完整的独立地址解析函数（支持返回完整格式：含代码、经纬度、POI等）
+
+// ===================== 基础配置 - 可根据实际需求扩展 =====================
+// 1. 省市区名称+代码映射表（简化版，如需完整数据可从areaData导入）
+const AREA_CODE_MAP = {
+  // 省份映射（名称 -> { code, 下属城市 }）
+  province: {
+    "北京市": { code: "110000", cities: ["北京市"] },
+    "天津市": { code: "120000", cities: ["天津市"] },
+    "河北省": { code: "130000", cities: ["石家庄市", "唐山市", "秦皇岛市"] },
+    "山西省": { code: "140000", cities: ["太原市", "大同市"] },
+    "内蒙古自治区": { code: "150000", cities: ["呼和浩特市", "包头市"] },
+    "辽宁省": { code: "210000", cities: ["沈阳市", "大连市"] },
+    "吉林省": { code: "220000", cities: ["长春市", "吉林市"] },
+    "黑龙江省": { code: "230000", cities: ["哈尔滨市", "齐齐哈尔市"] },
+    "上海市": { code: "310000", cities: ["上海市"] },
+    "江苏省": { code: "320000", cities: ["南京市", "无锡市", "苏州市"] },
+    "浙江省": { code: "330000", cities: ["杭州市", "宁波市", "温州市"] },
+    "安徽省": { code: "340000", cities: ["合肥市", "芜湖市"] },
+    "福建省": { code: "350000", cities: ["福州市", "厦门市"] },
+    "江西省": { code: "360000", cities: ["南昌市", "九江市"] },
+    "山东省": { code: "370000", cities: ["济南市", "青岛市"] },
+    "河南省": { code: "410000", cities: ["郑州市", "洛阳市"] },
+    "湖北省": { code: "420000", cities: ["武汉市", "宜昌市"] },
+    "湖南省": { code: "430000", cities: ["长沙市", "株洲市"] },
+    "广东省": { code: "440000", cities: ["广州市", "深圳市", "佛山市"] },
+    "广西壮族自治区": { code: "450000", cities: ["南宁市", "柳州市"] },
+    "海南省": { code: "460000", cities: ["海口市", "三亚市"] },
+    "重庆市": { code: "500000", cities: ["重庆市"] },
+    "四川省": { code: "510000", cities: ["成都市", "绵阳市"] },
+    "贵州省": { code: "520000", cities: ["贵阳市", "遵义市"] },
+    "云南省": { code: "530000", cities: ["昆明市", "大理市"] },
+    "西藏自治区": { code: "540000", cities: ["拉萨市"] },
+    "陕西省": { code: "610000", cities: ["西安市", "宝鸡市"] },
+    "甘肃省": { code: "620000", cities: ["兰州市", "天水市"] },
+    "青海省": { code: "630000", cities: ["西宁市"] },
+    "宁夏回族自治区": { code: "640000", cities: ["银川市"] },
+    "新疆维吾尔自治区": { code: "650000", cities: ["乌鲁木齐市"] },
+    "台湾省": { code: "710000", cities: ["台北市", "高雄市"] },
+    "香港特别行政区": { code: "810000", cities: ["香港特别行政区"] },
+    "澳门特别行政区": { code: "820000", cities: ["澳门特别行政区"] }
+  },
+  // 城市映射（名称 -> { code, 下属区县 }）
+  city: {
+    "北京市": { code: "110100", districts: ["东城区", "西城区", "朝阳区", "海淀区", "顺义区"] },
+    "天津市": { code: "120100", districts: ["和平区", "河东区", "西青区", "北辰区"] },
+    "深圳市": { code: "440300", districts: ["罗湖区", "福田区", "南山区", "宝安区", "龙岗区"] },
+    "广州市": { code: "440100", districts: ["越秀区", "海珠区", "天河区"] },
+    "上海市": { code: "310100", districts: ["黄浦区", "徐汇区", "长宁区"] },
+    "杭州市": { code: "330100", districts: ["上城区", "拱墅区", "西湖区"] }
+  },
+  // 区县映射（名称 -> { code, 经纬度 }）
+  district: {
+    "东城区": { code: "110101", lat: 39.938874, lng: 116.407413 },
+    "西城区": { code: "110102", lat: 39.914745, lng: 116.366761 },
+    "朝阳区": { code: "110105", lat: 39.948859, lng: 116.487501 },
+    "海淀区": { code: "110108", lat: 39.992947, lng: 116.316486 },
+    "顺义区": { code: "110113", lat: 40.111562, lng: 116.658249 }, // 修正你示例中的错误代码（120101是天津和平区）
+    "南山区": { code: "440305", lat: 22.542895, lng: 113.941649 },
+    "福田区": { code: "440304", lat: 22.543096, lng: 114.057865 },
+    "罗湖区": { code: "440303", lat: 22.552726, lng: 114.104663 }
+  }
+};
+
+// 2. 标准省市区名称集合（从映射表中提取，用于匹配）
+const PROVINCES = Object.keys(AREA_CODE_MAP.province);
+const CITIES = Object.keys(AREA_CODE_MAP.city);
+const DISTRICTS = Object.keys(AREA_CODE_MAP.district);
+
+// 3. POI关键词（用于提取建筑物名称）
+const POI_KEYWORDS = ["大厦", "小区", "花园", "公寓", "写字楼", "酒店", "广场", "中心", "别墅", "商铺"];
+
+// ===================== 工具函数 =====================
+/**
+ * 提取手机号（纯函数）
+ * @param {string} text - 输入文本
+ * @returns {string} 提取的手机号
+ */
+function extractPhone(text) {
+  if (!text) return '';
+  const phoneReg = /1[3-9]\d{9}|1[3-9]\d{2}[- ]?\d{4}[- ]?\d{4}/g;
+  const match = text.match(phoneReg);
+  return match ? match[0].replace(/\D/g, '') : '';
+}
+
+/**
+ * 提取姓名（纯函数）
+ * @param {string} text - 输入文本
+ * @returns {string} 提取的姓名
+ */
+function extractName(text) {
+  if (!text) return '';
+  const nameReg = /[\u4e00-\u9fa5]{2,4}/;
+  const match = text.match(nameReg);
+  return match ? match[0] : '';
+}
+
+/**
+ * 提取POI名称（从详细地址中提取建筑物名称）
+ * @param {string} detail - 详细地址
+ * @returns {string} POI名称
+ */
+function extractPOIName(detail) {
+  if (!detail) return '';
+  // 匹配包含POI关键词的连续字符（2-10字）
+  const poiReg = new RegExp(`[\\u4e00-\\u9fa5a-zA-Z0-9]{2,10}(${POI_KEYWORDS.join('|')})`, 'g');
+  const matches = detail.match(poiReg);
+  return matches && matches.length > 0 ? matches[0] : '';
+}
+
+/**
+ * 获取行政区划代码
+ * @param {string} province - 省份名称
+ * @param {string} city - 城市名称
+ * @param {string} district - 区县名称
+ * @returns {object} { provinceCode, cityCode, districtCode }
+ */
+function getAreaCodes(province, city, district) {
+  return {
+    provinceCode: AREA_CODE_MAP.province[province]?.code || '',
+    cityCode: AREA_CODE_MAP.city[city]?.code || '',
+    districtCode: AREA_CODE_MAP.district[district]?.code || ''
+  };
+}
+
+/**
+ * 获取经纬度（优先区县，无则城市，无则省份）
+ * @param {string} province - 省份名称
+ * @param {string} city - 城市名称
+ * @param {string} district - 区县名称
+ * @returns {object} { latitude, longitude }
+ */
+function getLatLng(province, city, district) {
+  // 区县经纬度
+  if (district && AREA_CODE_MAP.district[district]) {
+    return {
+      latitude: AREA_CODE_MAP.district[district].lat,
+      longitude: AREA_CODE_MAP.district[district].lng
+    };
+  }
+  // 城市默认经纬度（可扩展城市经纬度映射）
+  const cityLatLngMap = {
+    "北京市": { lat: 39.9042, lng: 116.4074 },
+    "上海市": { lat: 31.2304, lng: 121.4737 },
+    "深圳市": { lat: 22.5431, lng: 114.0579 },
+    "广州市": { lat: 23.1289, lng: 113.2655 }
+  };
+  if (city && cityLatLngMap[city]) {
+    return {
+      latitude: cityLatLngMap[city].lat,
+      longitude: cityLatLngMap[city].lng
+    };
+  }
+  // 省份默认经纬度
+  const provinceLatLngMap = {
+    "广东省": { lat: 23.1289, lng: 113.2655 },
+    "江苏省": { lat: 32.0473, lng: 118.7624 },
+    "浙江省": { lat: 30.2795, lng: 120.1576 }
+  };
+  if (province && provinceLatLngMap[province]) {
+    return {
+      latitude: provinceLatLngMap[province].lat,
+      longitude: provinceLatLngMap[province].lng
+    };
+  }
+  // 默认经纬度（北京）
+  return { latitude: 39.9042, longitude: 116.4074 };
+}
+
+/**
+ * 识别省市区（纯函数，基于映射表优化匹配准确性）
+ * @param {string} text - 输入文本
+ * @returns {object} { province, city, district, remainingText }
+ */
+function recognizeArea(text) {
+  if (!text) return { province: '', city: '', district: '', remainingText: '' };
+
+  let province = '';
+  let city = '';
+  let district = '';
+  let remainingText = text.trim();
+
+  // 1. 匹配省份（优先长名称，避免短名称误匹配）
+  const sortedProvinces = [...PROVINCES].sort((a, b) => b.length - a.length);
+  for (const p of sortedProvinces) {
+    if (remainingText.includes(p)) {
+      province = p;
+      remainingText = remainingText.replace(p, '').trim();
+      break;
+    }
+  }
+
+  // 2. 匹配城市（基于已选省份过滤，提升准确性）
+  let candidateCities = [...CITIES].sort((a, b) => b.length - a.length);
+  if (province && AREA_CODE_MAP.province[province].cities) {
+    candidateCities = candidateCities.filter(c => AREA_CODE_MAP.province[province].cities.includes(c));
+  }
+  for (const c of candidateCities) {
+    if (remainingText.includes(c)) {
+      city = c;
+      remainingText = remainingText.replace(c, '').trim();
+      break;
+    }
+  }
+
+  // 3. 匹配区县（基于已选城市过滤）
+  let candidateDistricts = [...DISTRICTS].sort((a, b) => b.length - a.length);
+  if (city && AREA_CODE_MAP.city[city].districts) {
+    candidateDistricts = candidateDistricts.filter(d => AREA_CODE_MAP.city[city].districts.includes(d));
+  }
+  for (const d of candidateDistricts) {
+    if (remainingText.includes(d)) {
+      district = d;
+      remainingText = remainingText.replace(d, '').trim();
+      break;
+    }
+  }
+
+  return { province, city, district, remainingText };
+}
+
+/**
+ * 完整地址解析（返回完整格式：含代码、经纬度、POI等）
+ * @param {string} text - 输入文本
+ * @param {object} [options] - 可选配置
+ * @param {boolean} [options.isDefault=false] - 是否默认地址
+ * @returns {object} 完整解析结果
+ */
+const parseFullAddress = (text, options = {}) => {
+  const { isDefault = false } = options;
+  if (!text) return {
+    receiver: '',
+    phone: '',
+    province: '',
+    provinceCode: '',
+    city: '',
+    cityCode: '',
+    district: '',
+    districtCode: '',
+    detail: '',
+    poiName: '',
+    latitude: 0,
+    longitude: 0,
+    isDefault
+  };
+
+  let remainingText = text.trim();
+
+  // 1. 提取手机号
+  const phone = extractPhone(remainingText);
+  if (phone) {
+    const phoneReg = new RegExp(
+      phone.replace(/(\d)/g, '\\d') + '|' + 
+      phone.replace(/(\d{3})(\d{4})(\d{4})/, '$1[- ]?$2[- ]?$3'), 
+      'g'
+    );
+    remainingText = remainingText.replace(phoneReg, '').replace(/\s+/g, ' ').trim();
+  }
+
+  // 2. 识别省市区
+  const { province, city, district, remainingText: textAfterArea } = recognizeArea(remainingText);
+  remainingText = textAfterArea;
+
+  // 3. 提取姓名
+  let receiver = extractName(remainingText);
+  if (receiver) {
+    remainingText = remainingText.replace(receiver, '').trim();
+  } else {
+    const reverseText = remainingText.split('').reverse().join('');
+    const reverseName = extractName(reverseText);
+    if (reverseName) {
+      receiver = reverseName.split('').reverse().join('');
+      remainingText = remainingText.replace(new RegExp(receiver + '$'), '').trim();
+    }
+  }
+
+  // 4. 处理详细地址（过滤重复省市区）
+  let detail = remainingText;
+  const areaPrefix = [
+    `${province}${city}${district}`,
+    `${province}${city}`,
+    `${city}${district}`
+  ];
+  for (const prefix of areaPrefix) {
+    if (detail.includes(prefix)) {
+      detail = detail.replace(prefix, '').trim();
+      break;
+    }
+  }
+
+  // 5. 补充扩展字段
+  const { provinceCode, cityCode, districtCode } = getAreaCodes(province, city, district);
+  const { latitude, longitude } = getLatLng(province, city, district);
+  const poiName = extractPOIName(detail);
+
+  return {
+    receiver,          // 收件人姓名
+    phone,             // 手机号
+    province,          // 省份名称
+    provinceCode,      // 省份代码（如：440000）
+    city,              // 城市名称
+    cityCode,          // 城市代码（如：440300）
+    district,          // 区县名称
+    districtCode,      // 区县代码（如：440305）
+    detail,            // 详细地址
+    poiName,           // POI名称（建筑物/小区名称）
+    latitude,          // 纬度
+    longitude,         // 经度
+    isDefault          // 是否默认地址（默认false）
+  };
+};
+
+// 导出函数
+module.exports = { parseFullAddress };
+
+

package-user/components/captcha/index.js

@@ -106,7 +106,13 @@ Component({
     
     // 关闭弹窗
     onClose() {
-      this.triggerEvent('close');
+         // 1. 强制让输入框失焦，关闭手机键盘
+         this.setData({ isFocus: false });
+         // 2. 触发关闭事件（可加微延时确保失焦生效，可选）
+         setTimeout(() => {
+           this.triggerEvent('close');
+         }, 100);
+      // this.triggerEvent('close');
     },
     
     // 确认
@@ -154,6 +160,8 @@ Component({
     
     // 清除倒计时
     clearCountdown() {
+      this.setData({ isFocus: false });
+
       if (this.data.timer) {
         clearInterval(this.data.timer);
         this.setData({ timer: null });

package-user/components/slide-confirm/index.wxss

@@ -50,6 +50,7 @@
   position: absolute;
   top: 0;
   background-color: #fff;
+  margin-top: 3rpx;
   border-radius: 40px;
   display: flex;
   align-items: center;

package-user/pages/login/index.js

@@ -48,12 +48,12 @@ Loginswitch:true
   checkboxChange(e) {
     let _this = this
     console.log('checkbox发生change事件，携带value值为：', e.currentTarget.dataset.value)
-  
+ 
    wx.requestSubscribeMessage({
-    tmplIds: ['G_37RkJ_mwZeTdPv5A0fjBlYW6_lRQIW9_SywmUAX7Q','AhToqLaCeOvSvSSQ7RvZYd2WgGA11Da13j1PMvqcGqQ'],
+    tmplIds: ['t46217wOQ7HBvw0MfP78Zo8FuwYTKBESaGYIpaXccFw','lLN0xmyLgBSnvveLAOhHiEHvHUi286idSuv-kO61TMI'],
     success(res) {
       console.log(res);
-    if(res['G_37RkJ_mwZeTdPv5A0fjBlYW6_lRQIW9_SywmUAX7Q'] === 'accept') {
+    if(res['t46217wOQ7HBvw0MfP78Zo8FuwYTKBESaGYIpaXccFw'] === 'accept') {
     // 用户同意订阅
     console.log(2222222);
     console.log(!e.currentTarget.dataset.value);
@@ -91,20 +91,6 @@ Loginswitch:true
       }
   });
   },
-  authorizationbtn(){
-       
-    wx.requestSubscribeMessage({
-      tmplIds: ['G_37RkJ_mwZeTdPv5A0fjBlYW6_lRQIW9_SywmUAX7Q','AhToqLaCeOvSvSSQ7RvZYd2WgGA11Da13j1PMvqcGqQ'],
-      success(res) {
-        console.log(res);
-      if(res['G_37RkJ_mwZeTdPv5A0fjBlYW6_lRQIW9_SywmUAX7Q','AhToqLaCeOvSvSSQ7RvZYd2WgGA11Da13j1PMvqcGqQ'] === 'accept') {
-      // 用户同意订阅
-      }
-      }
-      })
-    
-  },
-
     bindKeyInput1: function (e) {
       this.setData({
         account: e.detail.value
@@ -133,14 +119,7 @@ onGetPhoneNumber(e) {
   
     });
   }
-  // wx.requestSubscribeMessage({
-  //   tmplIds: ['G_37RkJ_mwZeTdPv5A0fjBlYW6_lRQIW9_SywmUAX7Q','AhToqLaCeOvSvSSQ7RvZYd2WgGA11Da13j1PMvqcGqQ'],
-  //   success(res) {
-  //     console.log(res);
-  //   if(res['G_37RkJ_mwZeTdPv5A0fjBlYW6_lRQIW9_SywmUAX7Q'] === 'accept') {
-  //   // 用户同意订阅
-  //   console.log(2222222);
-
+ 
     wx.login({
       success: ress => {
         console.log(ress);
@@ -149,7 +128,8 @@ onGetPhoneNumber(e) {
       // 这里的 your_server_url 需要替换成你自己的服务器地址
       
       let obj = {
-        phonecode:e.detail.code,
+        // phonecode:e.detail.code,
+        phonecode:this.data.account,
         code:code
       }
       api.request(`/sysoperation/login`, 'post',obj,{ isPublic: true })
@@ -157,7 +137,7 @@ onGetPhoneNumber(e) {
    console.log(data);
    if (data.code == 200) {
 
-           // 设置数据到本地存储
+                // 设置数据到本地存储
 wx.setStorage({
   key: 'token',  // 存储的key值
   data:data.data.token,
@@ -174,6 +154,8 @@ wx.setStorage({
 
   }
 });
+ 
+
    }else{
     wx.showToast({
       title: data.msg,
@@ -191,19 +173,7 @@ wx.setStorage({
       });
       }
       })
-    // }else{
-    //   wx.showToast({
-    //     title: '您将收不到新工单通知',
-    //     icon: 'success',
-    //   });
-    // }
-    // },fail: (err) => {
-    //   // console.error('请求失败:', err);
-    //   console.log(err);
-    //   wx.showToast({ title: '请开启订阅消息通知', icon: 'none' });
-    // }
     
-    // })
 
 
 

package-user/pages/login/index.wxml

@@ -3,15 +3,24 @@
   <view class="navigation-container" style="{{'height: ' + navStatusBarHeight +'px'}}">
   <view style="{{'height: ' + statusBarHeight +'px'}}"></view>
   <view class="navigation-bar" style="{{'height:' + navBarHeight +'px'}}">
-    <view class="title">晟运能源</view>
+    <view class="title">电速宝</view>
   </view>
 </view>
 <!-- <view style="width: 100%; {{'height: ' + navStatusBarHeight +'px'}}"></view> -->
 
  <view><image class="log_image" src="https://esos-iot.bjdexn.cn/myminio/project/fd2b0ab2aadb44bbafd940156bf0cdd7.png" mode="widthFix"/></view>
+ <view class="account_number">
+ <view>
+  <view class="account">手机号</view>
+  <view class="password">
+  <image class="login_imgae1" src="https://esos-iot.bjdexn.cn/myminio/project/0458af22ef764cc386d77a76ee665917.png" mode=""/>
+  <input class="weui-input"	value="{{account}}" placeholder="请输入手机号"  bindinput="bindKeyInput1"/></view>
+ </view>
+
+ </view>
  <view class="loginbotton">
   <!-- <button wx:if="{{!Loginswitch}}" class="button_button" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber">手机号一键登录</button> -->
-
+ 
  <!-- <button wx:if="{{!Loginswitch}}" bindphoneoneclicklogin="onHandleLogin" open-type="phoneOneClickLogin">一键登录按钮</button> -->
  <button wx:if="{{checked}}" class="button_button" color="#00BA6E" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber">手机号一键登录</button>
  <button wx:if="{{!checked}}" class="button_button" color="#00BA6E" bind:tap="promptcheck">手机号一键登录</button>

package-user/pages/login/index.wxss

@@ -142,7 +142,9 @@ background-color: #00C775;
   color:#00C775;
   margin:0rpx 6rpx;
 }
- 
+ .t-radio{
+  background: rgba(255, 255, 255, 0) !important;
+ }
 .t-radio__icon-dot::after{
   background: var(--td-radio-icon-checked-color, var(--td-brand-color, var(--td-primary-color-7, #00C775))) !important;
 }
@@ -203,3 +205,26 @@ background-color: #00C775;
 .shake {
   animation: shake 0.5s;
 }
+.account_number{
+  width: 100%;
+  padding: 20rpx;
+  box-sizing: border-box;
+}
+.number{
+  margin-top: 40rpx;
+}
+.account{
+font-size: 32rpx;
+}
+.weui-input{
+  flex: 1;
+  height: 100rpx;
+}
+.password{
+  display: flex;
+  align-items: center;
+font-size: 28rpx;
+margin-top: 10rpx;
+padding-bottom: 0rpx;
+border-bottom:1rpx #cccccc solid;
+}

package-user/pages/userlist/index.js

@@ -7,7 +7,13 @@ Page({
    * 页面的初始数据
    */
   data: {
-  userdata:[]
+  userdata:[],
+  visible:false,
+  selectdriveralldata:[],
+  selectcaralldata:[],
+  workorderId:'',
+  driverindex:0,
+  carindex:0
   },
 
   /**
@@ -15,15 +21,14 @@ Page({
    */
   onLoad(options) {
  this.getuser()
+ this.onselectdriverall()
+ this.onselectcarall()
   },  
 getuser(){
   let data ={
-    operationId:'',
-    operationname:'',
-    operationphone:'',
-    addressId:''
+    workorderType:0
   }
-  api.request(`/syscustomer/selectcustomer`, 'post',data,{ isPublic: false })
+  api.request(`/sysworkorder/selectworkorderlist`, 'post',data,{ isPublic: false })
   .then((data) => {
 console.log(data.data);
 if (data.code==200) {
@@ -31,17 +36,99 @@ if (data.code==200) {
     userdata:data.data
   })
 }
-//  wx.navigateTo({
-//   url: '/pages/map/index',
-// })
   })
   .catch((err) => {
- 
+    console.error('请求失败：', err);
+  });
+},
+cancelOrder(e){
+  console.log(e.currentTarget.dataset.id);
+ this.setData({
+  workorderId:e.currentTarget.dataset.id,
+  visible:true
+ })
+},
+// 查询全部司机
+onselectdriverall(){
+  let data = {
+    operationId:'',
+    driverType:'',
+    driverName:''
+  }
+  api.request(`/sysdriver/selectdriverall`, 'post',data,{ isPublic: false })
+  .then((data) => {
+console.log(data.data);
+if (data.code==200) {
+  this.setData({
+    selectdriveralldata:data.data
+  })
+}
+  })
+  .catch((err) => {
+    console.error('请求失败：', err);
+  });
+},
+// 查询全部车辆
+onselectcarall(){
+  let data = {
+    
+  }
+  api.request(`/syscar/selectcarall`, 'post',data,{ isPublic: false })
+  .then((data) => {
+if (data.code==200) {
+  this.setData({
+    selectcaralldata:data.data
+  })
+}
+  })
+  .catch((err) => {
+    console.error('请求失败：', err);
+  });
+},
+ondriverChange(){
+ this.setData({
+  visible:false
+ })
+},
+onVisibleChange1() {
+  this.setData({
+    visible:false
+  })
+},
+onVisibleChange(e) {
+  this.setData({
+    driverindex: e.detail.value,
+  });
+},
+oncarChange(e) {
+  console.log(e);
+  this.setData({
+    carindex: e.detail.value,
+  });
+},
+submit(){
+  let data = {
+    driverId:this.data.selectdriveralldata[this.data.driverindex].operationId,
+    carId:this.data.selectcaralldata[this.data.carindex].carId,
+    workorderId:this.data.workorderId
+  }
+  api.request(`/sysoperationsstaff/allocatedriver`, 'post',data,{ isPublic: false })
+  .then((data) => {
+if (data.code==200) {
+ console.log(data);
+ this.setData({
+  visible:false
+ })
+ this.getuser()
+
+}
+  })
+  .catch((err) => {
     console.error('请求失败：', err);
   });
 },
   /**
-   * 生命周期函数--监听页面初次渲染完成
+   *
    */
   onReady() {
 
@@ -59,7 +146,7 @@ if (data.code==200) {
    */
   onHide() {
 
-  },
+  }, 
 
   /**
    * 生命周期函数--监听页面卸载

package-user/pages/userlist/index.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "用户列表",
-  "usingComponents": {}
+  "usingComponents": {
+    "t-popup": "tdesign-miniprogram/popup/popup"
+  }
 }

package-user/pages/userlist/index.wxml

@@ -3,10 +3,37 @@
   <view class="driver-info" wx:for="{{userdata}}" wx:key="operationId">
       <image src="https://esos-iot.bjdexn.cn/myminio/project/2a1b32553c3d4ef992bc797d26cf1614.png" class="driver-avatar"></image>
       <view class="driver-details">
-        <view class="driver-name">公司: 晟运能源有限公司</view>
-        <view class="driver-car">昵称: {{item.operationName}}</view>
-        <view class="driver-arrive">电话：{{item.operationPhone}}</view>
+        <view class="driver-name">目的地: {{item.poiName}}</view>
+        <view class="driver-arrive">电话：{{item.phone}}</view>
+        <view class="driver-car">预约时间: {{item.workorderStarttime}}</view>
       </view>
-      <!-- <button class="cancel-btn" bindtap="cancelOrder">去查看</button> -->
+      <button class="cancel-btn" data-id="{{item.workorderId}}" bindtap="cancelOrder">分配订单</button>
     </view>
-</view>
+</view>
+<t-popup
+  visible="{{visible}}"
+  bind:visible-change="onVisibleChange1"
+  placement="bottom"
+>
+<view class="driverpopup">
+
+<view class="driverpopup_box">
+  <picker bindchange="onVisibleChange" value="{{driverindex}}" range="{{selectdriveralldata}}" range-key="operationName">
+    <view class="picker">
+      分配司机：{{selectdriveralldata[driverindex].operationName}}
+    </view>
+  </picker>
+</view>
+<view class="driverpopup_box">
+  <picker bindchange="oncarChange" value="{{carindex}}" range="{{selectcaralldata}}" range-key="carName">
+    <view class="picker">
+      分配车辆：{{selectcaralldata[carindex].carName}}
+    </view>
+  </picker>
+</view>
+<view class="botton">
+<view class="botton_box" bind:tap="submit">确定</view>
+
+</view>
+</view>
+</t-popup>

package-user/pages/userlist/index.wxss

@@ -48,7 +48,7 @@ page{
 }
 
 .cancel-btn {
-  width: 160rpx;
+  width: 180rpx;
   height: 64rpx;
   line-height: 64rpx;
   font-size: 28rpx;
@@ -56,4 +56,39 @@ page{
   border: 1rpx solid #FF5252;
   background-color: white;
   border-radius: 32rpx;
+}
+.driverpopup{
+  width: 100%;
+  height: 600rpx;
+  padding: 20rpx;
+  padding-top:100rpx;
+  box-sizing: border-box;
+}
+.driverpopup_box{
+  width: 100%;
+  height: 100rpx;
+  align-items: center;
+}
+.picker{
+  width: 100%;
+  height: 100rpx;
+  align-items: center;
+}
+.botton{
+width: 100%;
+display: flex;
+align-items: center;
+justify-content: center;
+}
+.botton_box{
+  width: 400rpx;
+  height: 70rpx;
+  margin-top: 100rpx;
+  font-size: 28rpx;
+  border-radius: 10rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #ffffff;
+  background-color: #2C85FF;
 }

pages/index/index.js

@@ -1,5 +1,5 @@
 const api = require('../../api/index.js');
-
+const app = getApp();
 Page({
   data: {
     // 地图初始中心坐标（北京市中心）
@@ -21,14 +21,76 @@ Page({
     estimatedArrival: 5,
     locationTimer: null,
     isTracking: false,
-    userdata:[]
+    userdata:[],
+    workorderdata:[]
   },  
 // 收益统计
   onLoad() {
     // 初始化地图
 this.getuser()
 this.initMap()
+wx.$on('wsMessage', this.handleWsMessage);
+  },
+  onHide(){
+    // 页面卸载时，取消订阅，这是至关重要的一步！
+    wx.$off('wsMessage', this.handleWsMessage);
+  },
+   /**
+   * 处理接收到的 WebSocket 消息
+   * @param {Object} message 从 app.js 广播过来的消息对象
+   */
+  handleWsMessage(message) {
+    console.log('Other Page 收到 WebSocket 消息:', message);
+ 
+    // 根据消息类型进行不同的处理
+    switch (message.api) {
+      case '/sysworkorder/selectworkorderlist':
+    
+        // 在这里可以更新地图、刷新UI等
+        if (message.type==1) {
+           this.getworkordertype()
+        }
+
+        break;
+      
+      case 'trajectoryInit':
+        // 处理初始轨迹数据
+        break;
 
+      case 'heartbeatReply':
+        // 心跳回复，通常不需要UI处理
+        break;
+    
+      default:
+        // 处理其他类型的消息
+        break;
+    }
+  },
+  // 获取待执行工单
+  getworkordertype(){
+    let data ={
+      workorderId:'',
+      workorderName:'',
+      addressId:'',
+      driverId:'',
+      carId:'',
+      customerId:'',
+      workorderType:4,
+      chargedischargeType:'',
+    }
+    api.request(`/sysworkorder/selectworkorderlist`, 'post',data ,{ isPublic: false })
+    .then((data) => {
+      console.log(data.data);
+      if (data.code==200) {
+       this.setData({
+        workorderdata:data.data
+       })
+     
+      }
+    })
+    .catch((err) => {
+      console.error('请求失败：', err);
+    });
   },
 getuser(){
  
@@ -36,6 +98,9 @@ getuser(){
   .then((data) => {
     console.log(data.data);
     if (data.code==200) {
+      this.setData({
+        userdata:data.data
+      })
                // 设置数据到本地存储
 wx.setStorage({
   key: 'user',  // 存储的key值
@@ -79,9 +144,6 @@ wx.setStorage({
             anchor: {x: 0.5, y: 1}
           }]
         });
-        
-        // 逆地址解析，获取位置名称
-        that.reverseGeocoder(longitude, latitude, 'start');
          // 加载附近车辆数据
          that.getloadNearbyCars();
 
@@ -95,149 +157,15 @@ wx.setStorage({
     });
   },
 
-  // 逆地址解析，将经纬度转换为地址名称
-  reverseGeocoder(longitude, latitude, type) {
-   let _this = this 
-    wx.request({
-      url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${latitude},${longitude}&key=VRGBZ-ZFRHB-SKIUP-NHHJ3-TXGJT-ZIFG3`,
-      success(res) {
-        if (res.data.status === 0) {
-          const address = res.data.result.address;
-          if (type === 'start') {
-            _this.setData({
-              'startLocation.name': address
-            });
-          } else if (type === 'end') {
-            _this.setData({
-              'endLocation.name': address
-            });
-          }
-        }
-      },
-      fail() {
-        wx.showToast({
-          title: '地址解析失败',
-          icon: 'none'
-        });
-      }
-    });
-  },
+
   // 预约叫车
   onelectricity(){
+
 wx.navigateTo({
-  url: '/package-order/pages/createorder/index',
+  url: `/package-order/pages/createorder/index?order=`,
 })
   },
-  // 更新地图标记和路线
-  updateMarkersAndRoute() {
-    const { startLocation, endLocation } = this.data;
-    
-    // 如果起点和终点都存在
-    if (startLocation.longitude && endLocation.longitude) {
-      // 更新标记
-      const markers = [
-        {
-          id: 0,
-          longitude: startLocation.longitude,
-          latitude: startLocation.latitude,
-          iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/a0d245bf00c6493d949c3be82a6d2b98.png',
-          width: 40,
-          height: 40,
-          anchor: {x: 0.5, y: 1}
-        },
-        {
-          id: 1,
-          longitude: endLocation.longitude,
-          latitude: endLocation.latitude,
-          iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png',
-          width: 40,
-          height: 40,
-          anchor: {x: 0.5, y: 1}
-        }
-      ];
-      
-      // 绘制路线AI云盘
-      const polyline = [{
-        points: [
-          {
-            longitude: startLocation.longitude,
-            latitude: startLocation.latitude
-          },
-          {
-            longitude: endLocation.longitude,
-            latitude: endLocation.latitude
-          }
-        ],
-        color: "#2C85FF",
-        width: 6,
-        dottedLine: false
-      }];
-      
-      // 计算距离和费用
-      const distance = this.calculateDistance(
-        startLocation.latitude, startLocation.longitude,
-        endLocation.latitude, endLocation.longitude
-      );
-      
-      // 简单的费用计算模型：起步价13元，超过3公里后每公里2.3元
-      let price = 13;
-      if (distance > 3) {
-        price += (distance - 3) * 2.3;
-      }
-      
-      this.setData({
-        markers,
-        polyline,
-        distance: distance.toFixed(1),
-        estimatedPrice: Math.round(price),
-        showTripInfo: true,
-        showCallButton: true
-      });
-    } else if (startLocation.longitude) {
-      // 只有起点
-      this.setData({
-        markers: [{
-          id: 0,
-          longitude: startLocation.longitude,
-          latitude: startLocation.latitude,
-          iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/a0d245bf00c6493d949c3be82a6d2b98.png',
-          width: 40,
-          height: 40,
-          anchor: {x: 0.5, y: 1}
-        }],
-        polyline: [],
-        showTripInfo: false,
-        showCallButton: false
-      });
-    }
-  },
 
-  // 计算两点之间的距离（公里）
-  calculateDistance(lat1, lon1, lat2, lon2) {
-    const R = 6371; // 地球半径（公里）
-    const dLat = this.deg2rad(lat2 - lat1);
-    const dLon = this.deg2rad(lon2 - lon1);
-    const a = 
-      Math.sin(dLat/2) * Math.sin(dLat/2) +
-      Math.cos(this.deg2rad(lat1)) * Math.cos(this.deg2rad(lat2)) * 
-      Math.sin(dLon/2) * Math.sin(dLon/2); 
-    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a)); 
-    const distance = R * c;
-    return distance;
-  },
-
-  // 角度转弧度
-  deg2rad(deg) {
-    return deg * (Math.PI/180);
-  },
-
-  // 地图区域变化时触发
-  onRegionChange(e) {
-    // 可以在这里处理地图移动后的逻辑，如重新加载附近车辆
-    if (e.type === 'end' && e.causedBy === 'drag') {
-      // this.loadNearbyCars();
-    }
-  },
   onHide() {
     // 页面卸载时停止追踪
     this.stopTracking();
@@ -361,17 +289,19 @@ wx.navigateTo({
     this.initMap()
 
   },
-  cancelOrder() {
-    // 移除司机标记
-    // const updatedMarkers = this.data.markers.filter(marker => marker.id !== 999);
-    
-    // this.setData({
-    //   showDriverInfo: false,
-    //   showCallButton: true,
-    //   markers: updatedMarkers
-    // });
+  
+  details(e){
+
+    wx.navigateTo({
+    url: `/package-map/pages/map/index?id=${e.currentTarget.dataset.id}`,
+  })
   },
+  
+ 
   onShow() {
-     this.loadNearbyCars()
+    //  this.loadNearbyCars()
+this.getworkordertype()
+
   },
-});
+}); 
+//

pages/index/index.wxml

@@ -1,8 +1,9 @@
 <view class="container">
-  <!-- 地图组件 -->
+  <!-- 地图组件 wx:if="{{workorderdata.length<1}}" -->
   <map 
     id="map"
     class="map"
+    style="{{workorderdata.length < 1 ? 'height: 100%':'height: 70%'}}"
     longitude="{{longitude}}"
     latitude="{{latitude}}"
     scale="{{scale}}"
@@ -11,74 +12,81 @@
     show-location
     bindregionchange="onRegionChange"
   ></map>
-  
-  <!-- 底部操作面板 -->
-  <view class="bottom-panel">
-    <!-- 行程信息卡片 -->
-    <!-- <view class="trip-card">
-      <view class="location-item">
-        <view class="location-icon start-icon">
-          <view class="icon-circle"></view>
-        </view>
-        <view class="location-input">
-          <input placeholder="您的位置" value="{{startLocation.name}}" bindtap="chooseStartLocation" />
-        </view>
-      </view>
-      
-      <view class="location-item">
-        <view class="location-icon end-icon">
-          <view class="icon-marker"></view>
-        </view>
-        <view class="location-input">
-          <input placeholder="输入目的地" value="{{endLocation.name}}" bindtap="chooseEndLocation" />
-        </view>
-      </view>
-      
-      <view class="trip-info" wx:if="{{showTripInfo}}">
-        <view class="distance">距离: {{distance}} 公里</view>
-        <view class="estimated-price">预估费用: ¥{{estimatedPrice}}</view>
-      </view>
-    </view> -->
-    
- 
+   
+  <!-- 底部操--作面板 -->
+  <view class="bottom-panel" wx:if="{{workorderdata.length > 0 }}">
     
-    <!-- 司机信息 (叫车后显示) -->
-    <view class="driver-info" wx:if="{{showDriverInfo}}">
+  <!-- 客户信息--(叫车后显示) -->
+    <view  wx:if="{{userdata.operationRole==5}}">
+    <view class="driver-info" wx:for="{{workorderdata}}" wx:key="index" data-id="{{item.workorderId}}" bindtap="details">
       <image src="{{driverAvatar}}" class="driver-avatar"></image>
+   <view style="width: 100%;">
+      <view style="width: 100%;display: flex;justify-content: space-between;">
       <view class="driver-details">
-        <view class="driver-name">司机 {{driverName}}</view>
-        <view class="driver-car">车牌号: {{carNumber}}</view>
-        <view class="driver-arrive">预计{{estimatedArrival}}分钟后到达</view>
+        <!-- <view class="driver-name"><text style="color: #222;">司机：</text>  {{item.driverName||'匹配中'}}</view> -->
+        <view class="driver-name">车牌号：{{item.carName||'匹配中'}}</view>
+        <view class="driver-car" wx:if="{{item.chargedischargeType==1}}">订单类型：充电</view>
+        <view class="driver-car" wx:if="{{item.chargedischargeType==2}}">订单类型：放电</view>
+        <view class="driver-car">目的地：{{item.poiName}}</view>
       </view>
-      <button class="cancel-btn" bindtap="cancelOrder">去查看</button>
+      <view class="cancel-btn">
+        <view wx:if="{{item.workorderType==0}}">待处理</view>
+<view wx:if="{{item.workorderType==1}}">待出发</view>
+<view wx:if="{{item.workorderType==2}}">行驶中</view>
+<view wx:if="{{item.workorderType==3}}">到达地点</view>
+<view wx:if="{{item.workorderType==4}}">工作中</view>
+<!-- <view wx:if="{{item.workorderType==5}}">完成工作</view> -->
+<view wx:if="{{item.workorderType==5&&item.workorderExaminetye==0}}">待审核</view>
+<view wx:if="{{item.workorderType==5&&item.workorderExaminetye==1}}">审核成功</view>
+<view wx:if="{{item.workorderType==5&&item.workorderExaminetye==2}}">审核失败</view>
+      
+      </view>
+      </view>
+      <view class="driver-arrive1">预约时间：{{item.workorderStarttime}}</view>
     </view>
-    <!-- <view class="driver-info" wx:if="{{showDriverInfo}}">
-      <image src="{{driverAvatar}}" class="driver-avatar"></image>
+    </view>
+    </view>
+    <!-- 司机信息--(叫车后显示) --> 
+    <view  wx:if="{{userdata.operationRole==4}}">
+    <view class="driver-info" wx:for="{{workorderdata}}" wx:key="index" data-id="{{item.workorderId}}" bind:tap="details">
+      <image src="{{driverAvatar}}" class="driver-avatar" mode="widthFix"></image>
+   <view style="width: 100%;">
+      <view style="width: 100%;display: flex;justify-content: space-between;">
       <view class="driver-details">
-        <view class="driver-name">车牌号: {{carNumber}}</view>
-        <view class="driver-car">工作方向: 放电</view>
-        <view class="driver-arrive">预计{{estimatedArrival}}分钟后完成工作</view>
+        <view class="driver-name">{{item.poiName}}</view>
+        <view class="driver-car">客户: {{item.receiver}}</view>
+        <view class="driver-car" wx:if="{{item.chargedischargeType==1}}">订单类型：充电</view>
+        <view class="driver-car" wx:if="{{item.chargedischargeType==2}}">订单类型：放电</view>
       </view>
-      <button class="cancel-btn" bindtap="cancelOrder">去查看</button>
-    </view> -->
-    <!-- <view class="driver-info" wx:if="{{showDriverInfo}}">
-      <image src="{{driverAvatar}}" class="driver-avatar"></image>
-      <view class="driver-details">
-        <view class="driver-name">车牌号: {{carNumber}}</view>
-        <view class="driver-car">工作方向: 放电</view>
-        <view class="driver-arrive">预计{{estimatedArrival}}分钟后完成工作</view>
+      <!-- <button class="cancel-btn" data-id="{{item.workorderId}}" bind:tap="details">去查看</button> -->
+      <view class="cancel-btn">
+        <view wx:if="{{item.workorderType==0}}">待处理</view>
+<view wx:if="{{item.workorderType==1}}">待出发</view>
+<view wx:if="{{item.workorderType==2}}">行驶中</view>
+<view wx:if="{{item.workorderType==3}}">到达地点</view>
+<view wx:if="{{item.workorderType==4}}">工作中</view>
+<view wx:if="{{item.workorderType==5}}">完成工作</view>
+<view wx:if="{{item.workorderType==6}}">待审核</view>
+<view wx:if="{{item.workorderType==7}}">审核失败</view>
+      
       </view>
-      <button class="cancel-btn" bindtap="cancelOrder">去查看</button>
-    </view> --> 
-    <!-- <view class="available" wx:if="{{true}}">
+      </view>
+      <view class="driver-arrive1">约定到达时间：{{item.workorderCreatetime}}</view>
+    </view>
+
+    </view>
+    
+    </view>
+    <!-- <view class="available" wx:if="{{workorderdata.length<1}}">
 <image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
-</view> -->
-       <!--  -->
-       <button class="call-btn" bindtap="onelectricity" wx:if="{{showCallButton}}">
+</view>  -->
+   
+    <view style="height: 140rpx;" wx:if="{{userdata.operationRole==5}}"></view>
+     <!-- <button class="call-btn" bindtap="onelectricity">
       <text class="call-btn_left_electricity">预约</text>
-    </button>
+    </button> -->
   </view>
-  
+   
   <!-- 附近车辆--数量提示 -->
   <view class="cars-nearby" wx:if="{{carsNearby > 0}}">
     <view class="cars-icon">
@@ -87,7 +95,10 @@
     <view class="cars-count">附近有 {{carsNearby}} 辆车</view>
   </view>
 </view>
-<view class="positioning" bind:tap="positioning">
+<button class="call-btn" bindtap="onelectricity" wx:if="{{userdata.operationRole==5}}">
+      <text class="call-btn_left_electricity">预约</text>
+    </button>
+<view class="positioning" bind:tap="positioning" style="{{workorderdata.length < 1 ? 'top: 85%':'top: 55%'}}">
   <t-icon name="focus" size="40rpx" data-name="focus" bind:tap="onIconTap" />
 
 </view>

pages/index/index.wxss

@@ -10,7 +10,7 @@
 
 .map {
   width: 100%;
-  height: 1100rpx;
+  
 }
 
 .bottom-panel {
@@ -19,8 +19,12 @@
   left: 0;
   right: 0; */
   width: 100%;
+  height: 660rpx;
+  overflow: hidden;
+  overflow: auto;
   padding: 16rpx;
   box-sizing: border-box;
+  
 }
 
 .trip-card {
@@ -116,6 +120,12 @@ width: 50%;
 .driver-details {
   margin-left: 24rpx;
   flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  /* justify-content:space-around; */
+  /* justify-content: space-between; */
+  /* align-items: center; */
 }
 
 .driver-name {
@@ -134,16 +144,20 @@ width: 50%;
   color: #2C85FF;
   margin-top: 8rpx;
 }
-
+.driver-arrive1 {
+  font-size: 28rpx;
+  margin-top: 8rpx;
+  margin-left: 20rpx;
+}
 .cancel-btn {
-  width: 160rpx;
-  height: 64rpx;
-  line-height: 64rpx;
+  padding: 0rpx 20rpx;
+  height: 48rpx;
+  line-height: 48rpx;
   font-size: 28rpx;
-  color: #FF5252;
-  border: 1rpx solid #FF5252;
-  background-color: white;
+  color: #2c85ff;
   border-radius: 32rpx;
+  /* background-color: #2C85FF; */
+  border: 1rpx solid #2c85ff;
 }
 
 .cars-nearby {
@@ -180,6 +194,13 @@ width: 50%;
 }
 .positioning{
   position: fixed;
+  /* top: 740rpx; */
   right: 40rpx;
-  bottom: 400rpx;
-}
+  
+}
+.available{
+  display: flex;
+   justify-content: center;
+   align-items: center;
+   margin-top: 100rpx;
+  }

pages/setup/index.js

@@ -60,16 +60,18 @@ inputValue: '' // 初始值
   toconfigure(e){
     console.log(e.currentTarget.dataset.name);
     if (e.currentTarget.dataset.name=="userlist") {
+      // 历史订单
       wx.navigateTo({
-        url: '/pages/userlist/index',
+        url: '/package-user/pages/userlist/index',
       });
     }else if (e.currentTarget.dataset.name=="driver"){
+      // 订单发票
       wx.navigateTo({
-        url: '/pages/driver/index',
+        url: '/package-user/pages/driver/index',
       });
     }else if (e.currentTarget.dataset.name=="address"){
       wx.navigateTo({
-        url: '/pages/address/index',
+        url: '/package-order/pages/address/index',
       });
     }else{
       wx.showToast({
@@ -92,22 +94,10 @@ inputValue: '' // 初始值
   } catch (e) {
     console.error("获取小程序版本号失败:", e);
   }
-    // this.getuser()
+     
   },
 
-  getuser(){
-    api.request(`/partner/selectinformation`, 'POST',{})
-    .then((res) => {
-      console.log(res);
-      this.setData({
-        user:res.data
-      })
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况 
-    });
-  },
+ 
    onuser(){
     wx.showToast({
       title: '暂未开放',
@@ -132,7 +122,8 @@ inputValue: '' // 初始值
 //  this.getuser()
 
     this.setData({
-      station:wx.getStorageSync('station')
+      station:wx.getStorageSync('station'),
+      user:wx.getStorageSync('user')
     })
   },
 

pages/setup/index.json

@@ -1,5 +1,5 @@
 { 
-  "navigationBarTitleText": "晟运能源",
+  "navigationBarTitleText": "电速宝",
   "usingComponents": {
     "t-icon": "tdesign-miniprogram/icon/icon",
     "t-button": "tdesign-miniprogram/button/button",

pages/setup/index.wxml

@@ -2,35 +2,36 @@
  
 <view style="width: 100%;height:60rpx"></view>
 <view class="user">
-<image bind:tap="onuser" class="user_to" src="{{user.partnerAvite||'https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132'}}" mode=""/>
+<image bind:tap="onuser" class="user_to" src="{{user.operationPicture||'https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132'}}" mode=""/>
 <view class="user_name">
-<view class="user_name1">{{user.partnerName||'微信用户'}}
-<view class="user_role" wx:if="{{user.partnerPosition==4}}">董事长</view>
-<view class="user_role" wx:if="{{user.partnerPosition==3}}">站长</view>
-<view class="user_role" wx:if="{{user.partnerPosition==2}}">值长</view>
-<view class="user_role" wx:if="{{user.partnerPosition==1}}">值班员</view>
+<view class="user_name1">{{user.operationName||'微信用户'}}
+<view class="user_role" wx:if="{{user.operationRole==4}}">司机</view>
+<view class="user_role" wx:if="{{user.operationRole==5}}">客户</view>
 </view>
-<view class="user_name2">{{user.partnerPhone}}</view>
+<view class="user_name2">{{user.operationPhone}}</view>
 </view>
 </view>
 <view style="width: 100%;height:40rpx"></view>
-<!-- -->
+<!--  
+  
+ -->
 <view class="allocation_box">
+
 <view class="allocation" data-name="userlist" bind:tap="toconfigure">
-<view class="allocation_3">用户</view>
+<view class="allocation_3">分配订单</view>
 <view class="allocation_1">
 <view class="allocation_2"></view>
 <t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s"/>
 </view>
 </view>
 <view class="allocation" data-name="driver" bind:tap="toconfigure">
-<view class="allocation_3">司机</view>
+<view class="allocation_3">订单发票</view>
 <view class="allocation_1">
 <view class="allocation_2"></view>
 <t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s"/>
 </view>
 </view>
-<view class="allocation" data-name="address" bind:tap="toconfigure">
+<view wx:if="{{user.operationRole==5}}" class="allocation" data-name="address" bind:tap="toconfigure">
 <view class="allocation_3">地址</view>
 <view class="allocation_1">
 <view class="allocation_2"></view>
@@ -53,7 +54,7 @@
 </view>
 <view class="allocation">
 <view class="allocation_31">
-<button class="contact-button" open-type="contact" plain >
+<button class="contact-button" open-type="contact" plain>
 <view>联系客服</view>
 </button>
 </view>

pages/tool/index.js

@@ -2,7 +2,7 @@ const api = require('../../api/index.js');
 Page({
 
   data: {
-    tabsindex:"1",
+    tabsindex:"",
     driverlist:[],
     selected:1,
     userdata:[]
@@ -12,6 +12,43 @@ Page({
     this.setData({
       userdata:wx.getStorageSync('user')
     })
+wx.$on('wsMessage', this.toolWsMessage);
+
+  },
+  onUnload() {
+    // 页面卸载时，取消订阅！
+    wx.$off('wsMessage', this.toolWsMessage);
+  },
+   /**
+   * 处理接收到的 WebSocket 消息
+   * @param {Object} message 从 app.js 广播过来的消息对象
+   */
+  
+  toolWsMessage(message) {
+    console.log('Other Page 收到 WebSocket 消息:', message);
+ 
+    // 根据消息类型进行不同的处
+    switch (message.api) {
+      case '/sysworkorder/selectworkorderlist':
+        // 在这里可以更新地图、刷新UI等
+        if (message.type==1) {
+           this.getdriver()
+        }
+
+        break;
+      
+      case 'trajectoryInit':
+        // 处理初始轨迹数据
+        break;
+
+      case 'heartbeatReply':
+        // 心跳回复，通常不需要UI处理
+        break;
+    
+      default:
+        // 处理其他类型的消息
+        break;
+    }
   },
   onselected(e){
     console.log(e.currentTarget.dataset.index);
@@ -28,7 +65,7 @@ this.getdriver()
       driverId:'',
       carId:'',
       customerId:'',
-      workorderType:'',
+      workorderType:this.data.tabsindex,
       chargedischargeType:this.data.selected,
     }
 
@@ -53,8 +90,10 @@ this.getdriver()
   onTabsChange(e){
   console.log(e.detail.value);
   this.setData({
-    tabsindex:e.detail.value
+    tabsindex:e.detail.value,
   })
+  this.getdriver()
+
   // this.gitreview()
   },
   details(e){
@@ -66,13 +105,10 @@ this.getdriver()
 
   onShow() {
     this.getdriver()
-
   },
    /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
    onPullDownRefresh() {
-
-
   }
 });

pages/tool/index.wxml

@@ -10,17 +10,20 @@
 </view>
 <view class="discharge_tabs" wx:if="{{userdata.operationRole==4}}">
   <t-tabs value="{{tabsindex}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" split="{{false}}">
-    <t-tab-panel label="全部" value="1" />
-    <t-tab-panel label="待接单" value="2" />
-  <t-tab-panel label="服务中" value="3" />
-  <t-tab-panel label="已完成" value="4" />
+    <t-tab-panel label="全部" value="" />
+  <t-tab-panel label="服务中" value="2" />
+  <t-tab-panel label="已完成" value="3" />
+  <t-tab-panel label="取消" value="4" />
+    <!-- <t-tab-panel label="审核" value="1" /> -->
 </t-tabs>
 </view>
 <view class="discharge_tabs" wx:if="{{userdata.operationRole==5}}">
   <t-tabs value="{{tabsindex}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" split="{{false}}">
-    <t-tab-panel label="全部" value="1" />
+    <t-tab-panel label="全部" value="" />
     <t-tab-panel label="工作中" value="2" />
-  <t-tab-panel label="已完成" value="4" />
+  <t-tab-panel label="已完成" value="3" />
+  <t-tab-panel label="取消" value="4" />
+<!--  -->
 </t-tabs>
 </view>
 <!-- <view bind:tap="onfilter">
@@ -33,9 +36,9 @@
 <view class="order_title">
 <view class="order_title1"> <image class="order_image" src="https://esos-iot.bjdexn.cn/myminio/project/458bb7eea14f42cc958eebf0a8b89da3.png" mode="aspectFit"/>
 <!-- <text>{{item.carName}}</text> -->
-<text>光伏</text>
-<!-- <text>风电</text> -->
-<!-- <text>网电</text> -->
+<text wx:if="{{item.chargedischargeType==1}}">光伏</text>
+<text wx:if="{{item.chargedischargeType==2}}">风电</text>
+<text wx:if="{{item.chargedischargeType==3}}">网电</text>
 </view> 
 <!-- <view class="order_title1"> <image class="order_image" src="https://esos-iot.bjdexn.cn/myminio/proje  ct/94f976d5afce444a8861b59681069218.png" mode="aspectFit"/> 浙C.78Z71</view> -->
 <view wx:if="{{item.workorderType==0}}">待处理</view>
@@ -43,19 +46,20 @@
 <view wx:if="{{item.workorderType==2}}">行驶中</view>
 <view wx:if="{{item.workorderType==3}}">到达地点</view>
 <view wx:if="{{item.workorderType==4}}">工作中</view>
-<view wx:if="{{item.workorderType==5}}">完成工作</view>
-<view wx:if="{{item.workorderType==6}}">待审核</view>
-<view wx:if="{{item.workorderType==7}}">审核失败</view>
+<!-- <view wx:if="{{item.workorderType==5}}">完成工作</view> -->
+<view wx:if="{{item.workorderType==5&&item.workorderExaminetye==0}}">待审核</view>
+<view wx:if="{{item.workorderType==5&&item.workorderExaminetye==1}}">审核成功</view>
+<view wx:if="{{item.workorderType==5&&item.workorderExaminetye==2}}">审核失败</view>
 </view>
 <view class="order_direction"><text class="order_text">方向：</text>
 <text style="color: #FDBA67;" wx:if="{{item.chargedischargeType==2}}">放电</text>
 <text style="color: #00C775;" wx:if="{{item.chargedischargeType==1}}">充电</text>
 </view>
 <view class="order_time"><text class="order_text">需求电量：</text> {{item.workorderElectricity}}</view>
-<view class="order_address"><text class="order_text"> 地址：</text>{{item.addressName}}</view>
+<view class="order_address"><text class="order_text">地址：</text>{{item.poiName}}</view>
 
 <view class="order_bottom">
-  <view class="order_time"><text class="order_text">时间：</text> {{item.workorderCreatetime}}</view>
+  <view class="order_time"><text class="order_text">预约时间：</text> {{item.workorderCreatetime}}</view>
 <!-- <view class="order_view" data-id="{{item.workorderId}}" bind:tap="details">查看详情</view> -->
 </view>
 </view>
@@ -64,4 +68,6 @@
 <image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
 </view> 
 <view style="height: 30rpx;"></view>
-<!---->
+<!--
+    
+--> 

pages/tool/index.wxss

@@ -157,6 +157,7 @@ background-color: #00C775;
 display: flex;
  justify-content: center;
  align-items: center;
+ margin-top: 200rpx;
 }
 .discharge{
   width: 100%;

project.config.json

@@ -40,6 +40,6 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wx4278accb70dc3fcd",
+  "appid": "wx70e63bda5b2a7285",
   "simulatorPluginLibVersion": {}
 }

project.private.config.json

@@ -23,6 +23,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "package-map/pages/map/index",
+          "pathName": "package-map/pages/map/index",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
           "query": "",
@@ -32,5 +39,5 @@
       ]
     }
   },
-  "libVersion": "3.8.9"
+  "libVersion": "3.11.2"
 }

utils/latitude.json

@@ -0,0 +1,425 @@
+ [
+  {latitude: 40.130047, longitude: 116.65477},
+  {latitude: 40.130041, longitude: 116.653246},
+  {latitude: 40.130047, longitude: 116.651625},
+  {latitude: 40.130067, longitude: 116.65003},
+  {latitude: 40.130064999999995, longitude: 116.649604},
+  {latitude: 40.13005199999999, longitude: 116.649002},
+  {latitude: 40.13005199999999, longitude: 116.649002},
+  {latitude: 40.13004699999999, longitude: 116.64461299999999},
+  {latitude: 40.13002999999999, longitude: 116.643941},
+  {latitude: 40.12998199999999, longitude: 116.642753},
+  {latitude: 40.12996199999999, longitude: 116.642395},
+  {latitude: 40.12987799999999, longitude: 116.641505},
+  {latitude: 40.12982499999999, longitude: 116.640976},
+  {latitude: 40.12951899999999, longitude: 116.63756199999999},
+  {latitude: 40.12930499999999, longitude: 116.63527799999999},
+  {latitude: 40.12923099999999, longitude: 116.63437899999998},
+  {latitude: 40.12917299999999, longitude: 116.63358099999998},
+  {latitude: 40.12911899999999, longitude: 116.63255799999997},
+  {latitude: 40.12910199999999, longitude: 116.63211599999997},
+  {latitude: 40.129029999999986, longitude: 116.62858699999997},
+  {latitude: 40.12902899999999, longitude: 116.62826499999997},
+  {latitude: 40.12902899999999, longitude: 116.62826499999997},
+  {latitude: 40.128891999999986, longitude: 116.62806799999997},
+  {latitude: 40.12858999999999, longitude: 116.62811999999997},
+  {latitude: 40.128041999999986, longitude: 116.62824099999996},
+  {latitude: 40.127856999999985, longitude: 116.62828499999996},
+  {latitude: 40.127253999999986, longitude: 116.62845999999996},
+  {latitude: 40.12706999999999, longitude: 116.62850599999996},
+  {latitude: 40.12492799999999, longitude: 116.62899199999995},
+  {latitude: 40.12421499999999, longitude: 116.62913999999995},
+  {latitude: 40.12421499999999, longitude: 116.62913999999995},
+  {latitude: 40.12403599999999, longitude: 116.62887999999995},
+  {latitude: 40.123783999999986, longitude: 116.62848599999995},
+  {latitude: 40.123542999999984, longitude: 116.62808699999995},
+  {latitude: 40.12313599999998, longitude: 116.62732899999995},
+  {latitude: 40.121527999999984, longitude: 116.62413099999995},
+  {latitude: 40.121163999999986, longitude: 116.62337799999995},
+  {latitude: 40.12099199999999, longitude: 116.62306999999994},
+  {latitude: 40.120708999999984, longitude: 116.62263499999995},
+  {latitude: 40.11791499999998, longitude: 116.61863199999995},
+  {latitude: 40.11762799999998, longitude: 116.61823399999994},
+  {latitude: 40.11762799999998, longitude: 116.61823399999994},
+  {latitude: 40.117643999999984, longitude: 116.61759199999995},
+  {latitude: 40.117645999999986, longitude: 116.61616099999995},
+  {latitude: 40.117682999999985, longitude: 116.61469899999994},
+  {latitude: 40.11771599999999, longitude: 116.61284899999994},
+  {latitude: 40.11772099999999, longitude: 116.61204699999995},
+  {latitude: 40.11779099999999, longitude: 116.60943299999995},
+  {latitude: 40.11782199999999, longitude: 116.60768599999996},
+  {latitude: 40.117828999999986, longitude: 116.60670499999996},
+  {latitude: 40.117820999999985, longitude: 116.60587499999997},
+  {latitude: 40.117848999999985, longitude: 116.60463599999997},
+  {latitude: 40.11788799999999, longitude: 116.60239499999997},
+  {latitude: 40.11788699999999, longitude: 116.60165699999997},
+  {latitude: 40.11794299999999, longitude: 116.60068399999997},
+  {latitude: 40.11793699999999, longitude: 116.59982299999997},
+  {latitude: 40.117946999999994, longitude: 116.59868999999998},
+  {latitude: 40.11795099999999, longitude: 116.59810799999998},
+  {latitude: 40.11796999999999, longitude: 116.59748199999999},
+  {latitude: 40.118007999999996, longitude: 116.59686299999998},
+  {latitude: 40.118027999999995, longitude: 116.59637199999999},
+  {latitude: 40.118033, longitude: 116.59591199999998},
+  {latitude: 40.118018, longitude: 116.59533599999999},
+  {latitude: 40.118066, longitude: 116.59272099999998},
+  {latitude: 40.118089, longitude: 116.59053499999999},
+  {latitude: 40.118123999999995, longitude: 116.58934699999999},
+  {latitude: 40.118112999999994, longitude: 116.58845},
+  {latitude: 40.118106999999995, longitude: 116.58823299999999},
+  {latitude: 40.118086, longitude: 116.58785799999998},
+  {latitude: 40.118086, longitude: 116.58785799999998},
+  {latitude: 40.118078, longitude: 116.58773899999998},
+  {latitude: 40.118122, longitude: 116.58753499999999},
+  {latitude: 40.118214, longitude: 116.58681099999998},
+  {latitude: 40.118263, longitude: 116.58654499999999},
+  {latitude: 40.118344, longitude: 116.58624299999998},
+  {latitude: 40.118458000000004, longitude: 116.58590399999999},
+  {latitude: 40.118641000000004, longitude: 116.58547899999998},
+  {latitude: 40.11874100000001, longitude: 116.58527499999998},
+  {latitude: 40.11883900000001, longitude: 116.58509999999998},
+  {latitude: 40.119124000000006, longitude: 116.58464799999999},
+  {latitude: 40.11997100000001, longitude: 116.58351499999999},
+  {latitude: 40.120059000000005, longitude: 116.58336399999999},
+  {latitude: 40.12016500000001, longitude: 116.58313499999998},
+  {latitude: 40.120717000000006, longitude: 116.58234499999999},
+  {latitude: 40.12120000000001, longitude: 116.58158499999999},
+  {latitude: 40.12154000000001, longitude: 116.58099299999999},
+  {latitude: 40.12182000000001, longitude: 116.58048},
+  {latitude: 40.12193700000001, longitude: 116.580248},
+  {latitude: 40.12222100000001, longitude: 116.579641},
+  {latitude: 40.12249500000001, longitude: 116.578999},
+  {latitude: 40.122586000000005, longitude: 116.578767},
+  {latitude: 40.122817000000005, longitude: 116.578149},
+  {latitude: 40.122874, longitude: 116.577984},
+  {latitude: 40.123139, longitude: 116.577169},
+  {latitude: 40.123254, longitude: 116.576754},
+  {latitude: 40.123425000000005, longitude: 116.576039},
+  {latitude: 40.123464000000006, longitude: 116.575853},
+  {latitude: 40.123566000000004, longitude: 116.57529699999999},
+  {latitude: 40.123653000000004, longitude: 116.57470099999999},
+  {latitude: 40.123706000000006, longitude: 116.574199},
+  {latitude: 40.08226499999997, longitude: 116.63058799999999},
+  {latitude: 40.081866999999974, longitude: 116.63102099999999},
+  {latitude: 40.081080999999976, longitude: 116.63185499999999},
+  {latitude: 40.081080999999976, longitude: 116.63185499999999},
+  {latitude: 40.080335999999974, longitude: 116.63260499999998},
+  {latitude: 40.07926799999998, longitude: 116.63372299999999},
+  {latitude: 40.078742999999974, longitude: 116.634289},
+  {latitude: 40.07798199999998, longitude: 116.635087},
+  {latitude: 40.077076999999974, longitude: 116.636011},
+  {latitude: 40.07551599999997, longitude: 116.637649},
+  {latitude: 40.074276999999974, longitude: 116.63891799999999},
+  {latitude: 40.07357399999997, longitude: 116.639608},
+  {latitude: 40.07298899999997, longitude: 116.640165},
+  {latitude: 40.072576999999974, longitude: 116.640551},
+  {latitude: 40.071447999999975, longitude: 116.64156200000001},
+  {latitude: 40.070783999999975, longitude: 116.642132},
+  {latitude: 40.07005599999997, longitude: 116.642736},
+  {latitude: 40.06917499999997, longitude: 116.643439},
+  {latitude: 40.06849399999997, longitude: 116.643962},
+  {latitude: 40.06766499999997, longitude: 116.644576},
+  {latitude: 40.06685799999997, longitude: 116.645149},
+  {latitude: 40.05724599999997, longitude: 116.65173},
+  {latitude: 40.05684599999997, longitude: 116.652022},
+  {latitude: 40.05608099999997, longitude: 116.652551},
+  {latitude: 40.05494399999997, longitude: 116.65330300000001},
+  {latitude: 40.05406599999997, longitude: 116.65390400000001},
+  {latitude: 40.05348099999997, longitude: 116.65431800000002},
+  {latitude: 40.05250999999997, longitude: 116.65497500000002},
+  {latitude: 40.05179799999997, longitude: 116.65543800000002},
+  {latitude: 40.05024199999997, longitude: 116.65639100000001},
+  {latitude: 40.049187999999965, longitude: 116.65701400000002},
+  {latitude: 40.048002999999966, longitude: 116.65768400000002},
+  {latitude: 40.046939999999964, longitude: 116.65825500000001},
+  {latitude: 40.046043999999966, longitude: 116.658719},
+  {latitude: 40.04462999999997, longitude: 116.659411},
+  {latitude: 40.04156899999997, longitude: 116.66083900000001},
+  {latitude: 40.040446999999965, longitude: 116.661381},
+  {latitude: 40.040446999999965, longitude: 116.661381},
+  {latitude: 40.040347999999966, longitude: 116.66133900000001},
+  {latitude: 40.040178999999966, longitude: 116.66139100000001},
+  {latitude: 40.03865499999996, longitude: 116.661979},
+  {latitude: 40.03829299999996, longitude: 116.66211},
+  {latitude: 40.03816399999996, longitude: 116.662142},
+  {latitude: 40.03788499999996, longitude: 116.66218500000001},
+  {latitude: 40.03788499999996, longitude: 116.66218500000001},
+  {latitude: 40.03751899999996, longitude: 116.662006},
+  {latitude: 40.03732699999996, longitude: 116.661895},
+  {latitude: 40.03721399999996, longitude: 116.661816},
+  {latitude: 40.03641299999996, longitude: 116.661132},
+  {latitude: 40.03610599999996, longitude: 116.660844},
+  {latitude: 40.03587199999996, longitude: 116.6606},
+  {latitude: 40.03568999999996, longitude: 116.660377},
+  {latitude: 40.03529299999996, longitude: 116.65982},
+  {latitude: 40.03466999999996, longitude: 116.658394},
+  {latitude: 40.03454599999996, longitude: 116.658055},
+  {latitude: 40.034513999999966, longitude: 116.658021},
+  {latitude: 40.034356999999964, longitude: 116.657937},
+  {latitude: 40.034133999999966, longitude: 116.657405},
+  {latitude: 40.03395499999996, longitude: 116.657003},
+  {latitude: 40.03348599999996, longitude: 116.65602700000001},
+  {latitude: 40.033402999999964, longitude: 116.65586400000001},
+  {latitude: 40.03297999999997, longitude: 116.65509800000001},
+  {latitude: 40.032856999999964, longitude: 116.65487900000001},
+  {latitude: 40.032634999999964, longitude: 116.65451},
+  {latitude: 40.032276999999965, longitude: 116.65394},
+  {latitude: 40.031769999999966, longitude: 116.653194},
+  {latitude: 40.03160299999997, longitude: 116.652957},
+  {latitude: 40.03114099999997, longitude: 116.652327},
+  {latitude: 40.02894799999997, longitude: 116.649438},
+  {latitude: 40.02793599999997, longitude: 116.64806300000001},
+  {latitude: 40.02720199999997, longitude: 116.64701900000001},
+  {latitude: 40.026819999999965, longitude: 116.64645500000002},
+  {latitude: 40.02625599999997, longitude: 116.64558300000002},
+  {latitude: 40.02591599999997, longitude: 116.64503700000002},
+  {latitude: 40.02556099999997, longitude: 116.64444200000001},
+  {latitude: 40.02527399999997, longitude: 116.64394000000001},
+  {latitude: 40.02495799999997, longitude: 116.64336100000001},
+  {latitude: 40.024691999999966, longitude: 116.64285000000001},
+  {latitude: 40.024450999999964, longitude: 116.642363},
+  {latitude: 40.023920999999966, longitude: 116.64123000000001},
+  {latitude: 40.02353799999997, longitude: 116.640281},
+  {latitude: 40.02328599999996, longitude: 116.639611},
+  {latitude: 40.02303699999997, longitude: 116.63885400000001},
+  {latitude: 40.022735999999966, longitude: 116.637832},
+  {latitude: 40.02243899999996, longitude: 116.636692},
+  {latitude: 40.02225599999996, longitude: 116.635869},
+  {latitude: 40.02210199999996, longitude: 116.635067},
+  {latitude: 40.02199699999996, longitude: 116.634432},
+  {latitude: 40.021933999999966, longitude: 116.634007},
+  {latitude: 40.02181499999997, longitude: 116.633046},
+  {latitude: 40.021750999999966, longitude: 116.63238899999999},
+  {latitude: 40.021697999999965, longitude: 116.63166199999999},
+  {latitude: 40.02167099999996, longitude: 116.63114999999999},
+  {latitude: 40.02163999999996, longitude: 116.630033},
+  {latitude: 40.02164099999996, longitude: 116.62939399999999},
+  {latitude: 40.02165299999996, longitude: 116.628834},
+  {latitude: 40.021681999999956, longitude: 116.62816099999999},
+  {latitude: 40.02174499999995, longitude: 116.627253},
+  {latitude: 40.02179599999995, longitude: 116.626699},
+  {latitude: 40.021887999999954, longitude: 116.625884},
+ ,  {latitude: 40.021907999999954, longitude: 116.625747},
+ {latitude: 40.02204099999995, longitude: 116.625136},
+ {latitude: 40.02251599999995, longitude: 116.623211},
+ {latitude: 40.02251599999995, longitude: 116.623211},
+ {latitude: 40.02273399999995, longitude: 116.622064},
+ {latitude: 40.02282799999995, longitude: 116.62163799999999},
+ {latitude: 40.02311799999995, longitude: 116.62051699999999},
+ {latitude: 40.023174999999945, longitude: 116.620346},
+ {latitude: 40.023354999999945, longitude: 116.619822},
+ {latitude: 40.023655999999946, longitude: 116.61901},
+ {latitude: 40.02403199999995, longitude: 116.618072},
+ {latitude: 40.02444799999995, longitude: 116.617111},
+ {latitude: 40.02481299999995, longitude: 116.616316},
+ {latitude: 40.02558999999995, longitude: 116.614705},
+ {latitude: 40.026089999999954, longitude: 116.613745},
+ {latitude: 40.028599999999955, longitude: 116.60922799999999},
+ {latitude: 40.02896399999995, longitude: 116.60856299999999},
+ {latitude: 40.02974199999995, longitude: 116.60719699999999},
+ {latitude: 40.03077199999995, longitude: 116.60536199999999},
+ {latitude: 40.03146199999995, longitude: 116.60410199999998},
+ {latitude: 40.03180699999995, longitude: 116.60352199999998},
+ {latitude: 40.03241299999995, longitude: 116.60243199999998},
+ {latitude: 40.03294999999995, longitude: 116.60151099999997},
+ {latitude: 40.03391099999995, longitude: 116.59977399999997},
+ {latitude: 40.034099999999945, longitude: 116.59941799999997},
+ {latitude: 40.03446499999995, longitude: 116.59867799999998},
+ {latitude: 40.034856999999946, longitude: 116.59778499999997},
+ {latitude: 40.03499299999994, longitude: 116.59743499999998},
+ {latitude: 40.03522799999995, longitude: 116.59675699999998},
+ {latitude: 40.035385999999946, longitude: 116.59620799999998},
+ {latitude: 40.03548299999994, longitude: 116.59582999999998},
+ {latitude: 40.035588999999945, longitude: 116.59535399999997},
+ {latitude: 40.03569799999995, longitude: 116.59477999999997},
+ {latitude: 40.03577099999995, longitude: 116.59429399999998},
+ {latitude: 40.03582699999995, longitude: 116.59378499999998},
+ {latitude: 40.035847999999945, longitude: 116.59356699999998},
+ {latitude: 40.035897999999946, longitude: 116.59271099999998},
+ {latitude: 40.03590199999994, longitude: 116.59215299999998},
+ {latitude: 40.035886999999946, longitude: 116.59157799999998},
+ {latitude: 40.03584299999994, longitude: 116.59088499999999},
+ {latitude: 40.035791999999944, longitude: 116.59033599999998},
+ {latitude: 40.03568899999994, longitude: 116.58949799999998},
+ {latitude: 40.03561699999994, longitude: 116.58898399999998},
+ {latitude: 40.03478899999994, longitude: 116.58380399999999},
+ {latitude: 40.03462099999994, longitude: 116.58264199999999},
+ {latitude: 40.034477999999936, longitude: 116.58139399999999},
+ {latitude: 40.03438199999994, longitude: 116.58007099999999},
+ {latitude: 40.034373999999936, longitude: 116.57990999999998},
+ {latitude: 40.03436499999994, longitude: 116.57950899999999},
+ {latitude: 40.03436499999994, longitude: 116.57950899999999},
+ {latitude: 40.034359999999936, longitude: 116.57881199999999},
+ {latitude: 40.034393999999935, longitude: 116.57799899999999},
+ {latitude: 40.034460999999936, longitude: 116.57713},
+ {latitude: 40.034534999999934, longitude: 116.576466},
+ {latitude: 40.03463499999994, longitude: 116.575767},
+ {latitude: 40.034762999999934, longitude: 116.575051},
+ {latitude: 40.03482099999994, longitude: 116.574755},
+ {latitude: 40.03501799999994, longitude: 116.573893},
+ {latitude: 40.035246999999934, longitude: 116.573014},
+ {latitude: 40.03549599999993, longitude: 116.572139},
+ {latitude: 40.03899499999993, longitude: 116.56052000000001},
+ {latitude: 40.03923699999993, longitude: 116.55965100000002},
+ {latitude: 40.03944399999993, longitude: 116.55881800000002},
+ {latitude: 40.03956899999993, longitude: 116.55823800000002},
+ {latitude: 40.039724999999926, longitude: 116.55742000000002},
+ {latitude: 40.03982499999993, longitude: 116.55677400000002},
+ {latitude: 40.03987099999993, longitude: 116.55640800000002},
+ {latitude: 40.03995999999993, longitude: 116.55550300000002},
+ {latitude: 40.03999799999993, longitude: 116.55492500000001},
+ {latitude: 40.04002999999993, longitude: 116.55397200000002},
+ {latitude: 40.04003499999993, longitude: 116.55289900000001},
+ {latitude: 40.03996499999993, longitude: 116.54465},
+ {latitude: 40.03996499999993, longitude: 116.54465},
+ {latitude: 40.04000499999993, longitude: 116.544556},
+ {latitude: 40.040025999999926, longitude: 116.544433},
+ {latitude: 40.04009799999993, longitude: 116.542512},
+ {latitude: 40.04016099999993, longitude: 116.541757},
+ {latitude: 40.040254999999924, longitude: 116.540913},
+ {latitude: 40.04034599999992, longitude: 116.540214},
+ {latitude: 40.04043999999992, longitude: 116.53963800000001},
+ {latitude: 40.040612999999915, longitude: 116.538802},
+ {latitude: 40.040688999999915, longitude: 116.53849000000001},
+ {latitude: 40.040688999999915, longitude: 116.53849000000001},
+ {latitude: 40.04079999999991, longitude: 116.538148},
+ {latitude: 40.04090499999991, longitude: 116.537896},
+ {latitude: 40.04105399999991, longitude: 116.537605},
+ {latitude: 40.04124999999991, longitude: 116.537244},
+ {latitude: 40.04134099999991, longitude: 116.537115},
+ {latitude: 40.04162499999991, longitude: 116.536767},
+ {latitude: 40.04173399999991, longitude: 116.536645},
+ {latitude: 40.04191799999991, longitude: 116.536458},
+ {latitude: 40.04220299999991, longitude: 116.53621},
+ {latitude: 40.04275999999991, longitude: 116.535752},
+ {latitude: 40.04288699999991, longitude: 116.53563},
+ {latitude: 40.042994999999905, longitude: 116.535491},
+ {latitude: 40.0430829999999, longitude: 116.53533599999999},
+ {latitude: 40.043118999999905, longitude: 116.53525499999999},
+ {latitude: 40.04314899999991, longitude: 116.53517099999999},
+ {latitude: 40.04319099999991, longitude: 116.53499599999999},
+ {latitude: 40.04320799999991, longitude: 116.53481599999999},
+ {latitude: 40.043205999999905, longitude: 116.53472099999999},
+{latitude: 40.04319699999991, longitude: 116.53463199999999},
+{latitude: 40.043180999999905, longitude: 116.53453999999999},
+{latitude: 40.043157999999906, longitude: 116.534448},
+{latitude: 40.043126999999906, longitude: 116.534357},
+{latitude: 40.043087999999905, longitude: 116.534267},
+{latitude: 40.0430409999999, longitude: 116.534179},
+{latitude: 40.0429859999999, longitude: 116.534092},
+{latitude: 40.0429219999999, longitude: 116.534007},
+{latitude: 40.042849999999895, longitude: 116.533925},
+{latitude: 40.04273599999989, longitude: 116.533821},
+{latitude: 40.04261999999989, longitude: 116.533731},
+{latitude: 40.04244299999989, longitude: 116.533621},
+{latitude: 40.041467999999895, longitude: 116.53313},
+{latitude: 40.040935999999896, longitude: 116.532853},
+{latitude: 40.040659999999896, longitude: 116.53272700000001},
+{latitude: 40.039956999999895, longitude: 116.53237100000001},
+{latitude: 40.038965999999895, longitude: 116.53198300000001},
+{latitude: 40.038383999999894, longitude: 116.531766},
+{latitude: 40.03811199999989, longitude: 116.531615},
+{latitude: 40.03773599999989, longitude: 116.531394},
+{latitude: 40.037545999999885, longitude: 116.53127},
+{latitude: 40.037444999999884, longitude: 116.53130100000001},
+{latitude: 40.03645799999988, longitude: 116.53063100000001},
+{latitude: 40.03533899999988, longitude: 116.52989000000001},
+{latitude: 40.03422499999988, longitude: 116.52913400000001},
+{latitude: 40.03199399999988, longitude: 116.52764600000002},
+{latitude: 40.030958999999875, longitude: 116.52692600000002},
+{latitude: 40.03063899999987, longitude: 116.52668300000002},
+{latitude: 40.03011399999987, longitude: 116.52635500000002},
+{latitude: 40.02433899999987, longitude: 116.52245300000003},
+{latitude: 40.02418799999987, longitude: 116.52234300000002},
+{latitude: 40.02399599999987, longitude: 116.52218400000002},
+{latitude: 40.02379799999987, longitude: 116.52204200000003},
+{latitude: 40.02237499999987, longitude: 116.52113000000003},
+{latitude: 40.02040799999987, longitude: 116.51984900000002},
+{latitude: 40.01837199999987, longitude: 116.51845900000002},
+{latitude: 40.01647899999987, longitude: 116.51719100000003},
+{latitude: 40.01606999999987, longitude: 116.51690900000003},
+{latitude: 40.01564599999987, longitude: 116.51659500000002},
+{latitude: 40.01517599999987, longitude: 116.51621900000002},
+{latitude: 40.01478099999987, longitude: 116.51586900000002},
+{latitude: 40.01426899999987, longitude: 116.51535400000003},
+{latitude: 40.01340999999987, longitude: 116.51440600000004},
+{latitude: 40.01154399999987, longitude: 116.51230400000004},
+{latitude: 40.01034299999987, longitude: 116.51096700000004},
+{latitude: 40.01034299999987, longitude: 116.51096700000004},
+{latitude: 40.00995499999987, longitude: 116.51022100000003},
+{latitude: 40.00905499999987, longitude: 116.50924700000003},
+{latitude: 40.00905499999987, longitude: 116.50924700000003},
+{latitude: 40.00794499999987, longitude: 116.50797900000003},
+{latitude: 40.00766999999987, longitude: 116.50765500000003},
+{latitude: 40.00690199999987, longitude: 116.50668700000003},
+{latitude: 40.00555999999987, longitude: 116.50504000000002},
+{latitude: 40.00446999999987, longitude: 116.50365100000002},
+{latitude: 40.00331599999987, longitude: 116.50222500000002},
+{latitude: 40.00331599999987, longitude: 116.50222500000002},
+{latitude: 40.00265999999987, longitude: 116.50156400000003},
+{latitude: 40.00177199999987, longitude: 116.50073000000003},
+{latitude: 40.00152399999987, longitude: 116.50048500000003},
+{latitude: 40.00048899999987, longitude: 116.49933000000003},
+{latitude: 40.000128999999866, longitude: 116.49894400000002},
+{latitude: 39.99952899999987, longitude: 116.49839300000002},
+{latitude: 39.99842599999987, longitude: 116.49736500000002},
+{latitude: 39.99822799999987, longitude: 116.49716300000001},
+{latitude: 39.99746999999987, longitude: 116.49634000000002},
+{latitude: 39.997068999999875, longitude: 116.49596600000002},
+{latitude: 39.996646999999875, longitude: 116.49558800000003},
+{latitude: 39.99526999999988, longitude: 116.49428100000003},
+{latitude: 39.994735999999875, longitude: 116.49376000000002},
+{latitude: 39.99401099999987, longitude: 116.49311100000003},
+{latitude: 39.99401099999987, longitude: 116.49311100000003},
+{latitude: 39.99441699999987, longitude: 116.49270900000003},
+{latitude: 39.99450399999987, longitude: 116.49260200000003},
+{latitude: 39.994603999999875, longitude: 116.49246300000003},
+{latitude: 39.994896999999874, longitude: 116.49204300000002},
+{latitude: 39.994896999999874, longitude: 116.49204300000002},
+{latitude: 39.99499599999987, longitude: 116.49215300000003},
+{latitude: 39.99541599999987, longitude: 116.49258900000002},
+{latitude: 39.99560099999987, longitude: 116.49275400000002},
+{latitude: 39.99594699999987, longitude: 116.49302700000003},
+{latitude: 39.996198999999876, longitude: 116.49319000000003},
+{latitude: 39.996502999999876, longitude: 116.49335500000002},
+{latitude: 39.99674199999988, longitude: 116.49346200000002},
+{latitude: 39.996871999999875, longitude: 116.49351100000003},
+{latitude: 39.99726199999988, longitude: 116.49363600000002},
+{latitude: 39.99737399999988, longitude: 116.49366200000003},
+{latitude: 39.99774699999988, longitude: 116.49372100000002},
+{latitude: 39.997962999999885, longitude: 116.49373700000002},
+{latitude: 39.99817199999988, longitude: 116.49374100000003},
+{latitude: 39.99850799999988, longitude: 116.49372000000002},
+{latitude: 39.99871199999988, longitude: 116.49368900000002},
+{latitude: 39.99899199999987, longitude: 116.49362800000002},
+{latitude: 39.999291999999876, longitude: 116.49353500000001},
+{latitude: 39.99954999999988, longitude: 116.493441},
+{latitude: 39.99988499999988, longitude: 116.493296},
+{latitude: 40.00007899999988, longitude: 116.493198},
+{latitude: 40.00021999999988, longitude: 116.49310700000001},
+{latitude: 40.00064699999988, longitude: 116.49278400000001},
+{latitude: 40.00156599999988, longitude: 116.49188900000001}
+{latitude: 40.00156599999988, longitude: 116.49188900000001},
+{latitude: 40.001409999999886, longitude: 116.49162500000001},
+{latitude: 40.00064999999989, longitude: 116.49034800000001},
+{latitude: 40.00064999999989, longitude: 116.49034800000001},
+{latitude: 40.00096999999989, longitude: 116.49002300000001},
+{latitude: 40.001060999999886, longitude: 116.489917},
+{latitude: 40.001345999999884, longitude: 116.48955600000001},
+{latitude: 40.00197999999988, longitude: 116.48841},
+{latitude: 40.00197999999988, longitude: 116.48841},
+{latitude: 40.00204199999988, longitude: 116.488478},
+{latitude: 40.00212699999988, longitude: 116.488569},
+{latitude: 40.00222399999988, longitude: 116.488658},
+{latitude: 40.00222399999988, longitude: 116.488658},
+{latitude: 40.00232999999988, longitude: 116.488587},
+{latitude: 40.00243299999988, longitude: 116.48830699999999},
+{latitude: 40.00243299999988, longitude: 116.48830699999999},
+{latitude: 40.002656999999886, longitude: 116.48824099999999},
+{latitude: 40.002656999999886, longitude: 116.48824099999999},
+{latitude: 40.00278199999988, longitude: 116.48834199999999},
+{latitude: 40.00282799999988, longitude: 116.48838899999998},
+{latitude: 40.00291299999988, longitude: 116.48863999999999},
+{latitude: 40.00293499999988, longitude: 116.488677},
+{latitude: 40.00296499999988, longitude: 116.488703}
+]