电速宝

api/index.js

@@ -1,7 +1,7 @@
 // api.jshttp://zlink.bjdexn.cn
-// const baseUrl = 'http://192.168.8.187:9999';  // 替换为您的接口基础 URL
+const baseUrl = 'http://192.168.8.187:8080';  // 替换为您的接口基础 URL
 const esosUrl = 'https://esos-iot.bjdexn.cn';  // 线上
-const baseUrl = 'https://esos-iot.bjdexn.cn:8443';  // 线上
+// const baseUrl = 'https://esos-iot.bjdexn.cn:8443';  // 线上
 
 // const baseUrl = 'http://192.168.8.105:8888';  // 替换为您的接口基础 URL
 //  
@@ -67,9 +67,9 @@ function redirectToLogin(message = '') {
   const currentRoute = pages[pages.length - 1]?.route || '';
 
   // 避免重复跳转
-  if (!currentRoute.includes('pages/login/index')) {
+  if (!currentRoute.includes('/package-user/pages/login/index')) {
     wx.showToast({ title: message, icon: 'none' });
-    wx.reLaunch({ url: '/pages/login/index' });
+    wx.reLaunch({ url: '/package-user/pages/login/index' });
   }
 }
 

app.js

@@ -1,20 +1,35 @@
 // app.js
+const QQMapWX = require('./libs/qqmap-wx-jssdk.min.js');
+
 App({
   onLaunch() {
-    // 展示本地存储能力
-    const logs = wx.getStorageSync('logs') || []
-    logs.unshift(Date.now())
-    wx.setStorageSync('logs', logs)
+    // 初始化腾讯地图SDK
+    this.qqmapsdk = new QQMapWX({
+      key: 'VRGBZ-ZFRHB-SKIUP-NHHJ3-TXGJT-ZIFG3' // 请替换为你自己的腾讯地图KEY
+    });
 
-    // 登录
-    wx.login({
+    // 检查是否授权获取位置信息
+    wx.getSetting({
       success: res => {
-        // 发送 res.code 到后台换取 openId, sessionKey, unionId
+        if (!res.authSetting['scope.userLocation']) {
+          wx.authorize({
+            scope: 'scope.userLocation',
+            success: () => {
+              console.log('位置授权成功');
+            },
+            fail: () => {
+              console.log('位置授权失败');
+              wx.showToast({
+                title: '请开启位置权限',
+                icon: 'none'
+              });
+            }
+          });
+        }
       }
-    })
- 
+    });
   },
   globalData: {
     userInfo: null
   }
-})
+});

app.json

@@ -3,24 +3,16 @@
     "pages/index/index",
     "pages/setup/index",
     "pages/tool/index",
-    "pages/login/index",
-    "pages/malfunction/index",
-    "pages/workorder/index",
-    "pages/workorderdetails/index",
-    "pages/workorderstep/index",
-    "pages/statistics/index",
-    "pages/device/index",
-    "pages/personalInfo/index",
-    "pages/setuplevel/index",
-    "pages/scheduling/index",
-    "pages/privacy/index"
+    "pages/equipment/index"
   ],
   "requiredPrivateInfos": [
-    "getLocation"
+    "getLocation",
+    "startLocationUpdate",
+    "startLocationUpdateBackground"
   ],
   "permission": {
     "scope.userLocation": {
-      "desc": "请允许获取位置信息，以便计算距离"
+      "desc": "你的位置信息将用于展示轨迹和计算距离"
     },
     "scope.setClipboardData": {
       "desc": "用于复制内容到剪贴板，方便用户分享或使用"
@@ -34,31 +26,79 @@
     "navigationBarTitleText": "晟运能源",
     "navigationBarBackgroundColor": "#ffffff"
   },
+  "plugins": {
+    "route-plan": {
+      "version": "2.0.1",
+      "provider": "wx50b5593e81dd937a"
+    }
+  },
   "componentFramework": "glass-easel",
   "sitemapLocation": "sitemap.json",
   "lazyCodeLoading": "requiredComponents",
   "__usePrivacyCheck__": true,
   "tabBar": {
-    "selectedColor": "#0F80DC",
+    "selectedColor": "#00C775",
     "list": [
       {
         "pagePath": "pages/index/index",
         "text": "首页",
-        "iconPath": "static/sz3.png",
-        "selectedIconPath": "static/sz4.png"
+        "iconPath": "static/111.png",
+        "selectedIconPath": "static/222.png"
       },
       {
         "pagePath": "pages/tool/index",
-        "text": "工单",
-        "iconPath": "static/tool.png",
-        "selectedIconPath": "static/tool1.png"
+        "text": "订单",
+        "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": "我的",
-        "iconPath": "static/user1.png",
-        "selectedIconPath": "static/user2.png"
+        "iconPath": "static/7.png",
+        "selectedIconPath": "static/8.png"
       }
     ]
-  }
+  },
+  "subpackages": [
+    {
+      "root": "package-user",
+      "name": "user",
+      "pages": [
+        "pages/login/index",
+        "pages/privacy/index",
+        "pages/userlist/index",
+        "pages/captcha/index",
+        "pages/slide-confirm/index"
+      ]
+    },
+    {
+      "root": "package-order",
+      "name": "order",
+      "pages": [
+        "pages/createorder/index",
+        "pages/driver/index",
+        "pages/address/index"
+      ]
+    },
+    {
+      "root": "package-setup",
+      "name": "setup",
+      "pages": [
+        "pages/setuplevel/index"
+      ]
+    },
+    {
+      "root": "package-map",
+      "name": "map",
+      "pages": [
+        "pages/map/index"
+      ]
+    }
+  ]
 }

package-map/pages/map/index.js

@@ -0,0 +1,597 @@
+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:[]
+  },
+  
+  onLoad(options) {
+    this.setData({
+      userdata:wx.getStorageSync('user')
+    })
+   
+    console.log(options);
+    this.setData({
+      optionsid:options.id
+    })
+    // 初始化地图，获取当前位置
+    this.getworkorder()
+    // 引入SDK核心类
+    this.qqmapsdk = require('../../../libs/qqmap-wx-jssdk.min.js');
+    // 初始化SDK
+    this.mapSdk = new this.qqmapsdk({
+      key: this.data.qqMapKey
+    });
+  },
+  
+  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
+        })
+        this.initMap();
+      }
+    })
+    .catch((err) => {
+      console.error('请求失败：', err);
+    });
+  },
+  
+  onUnload() {
+    // 页面卸载时停止追踪
+    this.stopTracking();
+  },
+  
+  // 初始化地图
+  initMap() {
+    const that = this;
+    
+    // 获取用户当前位置
+    wx.getLocation({
+      type: 'gcj02', // 腾讯地图坐标体系
+      success(res) {
+        const longitude = res.longitude;
+        const latitude = res.latitude;
+        
+        // 设置地图中心为当前位置
+        that.setData({
+          longitude,
+          latitude,
+          // 初始化起点标记
+          markers: [{
+            id: 0,
+            longitude,
+            latitude,
+            iconPath: "https://esos-iot.bjdexn.cn/myminio/project/0b0593293af54ea097b168cea479c25c.png",
+            width: 30,
+            height: 30,
+            title: "起点"
+          }],
+          // 初始化轨迹线起点（颜色已在data中设置为红色）
+          polyline: [{
+            points: [{longitude, latitude}],
+            color: "#ff0000", // 与data中保持一致，确保初始颜色正确
+            width: 6,
+            dottedLine: false
+          }]
+        });
+        
+        that.showInfo("已获取当前位置");
+        that.setDestination();
+      },
+      fail(err) {
+        console.error("获取位置失败：", err);
+        that.showInfo("请授权位置权限以使用地图功能");
+        
+        // 引导用户开启权限
+        wx.openSetting({
+          success(res) {
+            if (res.authSetting['scope.userLocation']) {
+              that.initMap();
+            }
+          }
+        });
+      }
+    });
+  },
+  
+  // 规划路线 - 通用方法，可被初始规划和重新规划调用
+  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: latitude,
+        longitude: longitude
+      },
+      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] })
+          }
+          
+          // 更新路线数据（规划路线颜色已设为灰色）
+          that.setData({
+            plannedRoute: [{
+              name: that.data.orderdata.addressName,
+              points: pl,
+              color: '#2f693c', // 与data中保持一致，确保规划路线颜色正确
+              width: 6,
+              borderColor: '#2f693c',
+              borderWidth: 1
+            }],
+            routePlanned: true,
+            isReplanning: false,
+            deviationCount: 0  // 重置偏离计数
+          });
+          
+          // 显示规划结果
+          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("路线规划失败，请检查网络");
+      }
+    });
+  },
+  
+  // 设置终点位置
+  setDestination() {
+    // 更新终点标记
+    const newMarkers = [...this.data.markers.filter(marker => marker.id !== 1)];
+    newMarkers.push({
+      name: this.data.orderdata.addressName,
+      id: 1,
+      latitude: this.data.orderdata.latitude,  // 终点纬度
+      longitude: this.data.orderdata.longitude,  // 终点经度
+      iconPath: "https://esos-iot.bjdexn.cn/myminio/project/6dc37b15321b462f9ab59c47263dd224.png",
+      width: 30,
+      height: 30,
+      title: "终点"
+    });
+    
+    this.setData({
+      markers: newMarkers,
+      destination: { longitude: this.data.orderdata.longitude, latitude: this.data.orderdata.latitude }
+    });
+    
+    this.showInfo("已设置终点位置");
+    this.planRoute();  // 初始规划路线
+    // this.startTracking();  // 实时监控位置
+  },
+ 
+  // 显示信息提示
+  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.addressName || '目的地',
+      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}`,
+    });
+  },
+  
+  // 开始追踪位置
+  startTracking() {
+    if (this.data.isTracking) return;
+    
+    const that = this;
+    this.setData({ isTracking: true });
+    
+    // 定期获取位置并检查是否偏离路线
+    this.setData({
+      locationTimer: setInterval(() => {
+        wx.getLocation({
+          type: 'gcj02',
+          success(res) {
+            const newPoint = {
+              longitude: res.longitude,
+              latitude: res.latitude
+            };
+            
+            // 更新当前位置和轨迹（颜色保持红色）
+            const updatedPolyline = [...that.data.polyline];
+            updatedPolyline[0].points.push(newPoint);
+            
+            // 更新起点标记位置
+            const updatedMarkers = [...that.data.markers];
+            updatedMarkers[0] = {
+              ...updatedMarkers[0],
+              longitude: res.longitude,
+              latitude: res.latitude
+            };
+            
+            that.setData({
+              longitude: res.longitude,
+              latitude: res.latitude,
+              polyline: updatedPolyline,
+              markers: updatedMarkers
+            });
+            
+            // 检查是否偏离规划路线
+            if (that.data.routePlanned && !that.data.isReplanning) {
+              that.checkDeviation(newPoint);
+            }
+          },
+          fail(err) {
+            console.error("获取位置失败：", err);
+            that.showInfo("位置获取失败，请检查权限");
+          }
+        });
+      }, 3000)  // 每3秒更新一次位置
+    });
+    
+    this.showInfo("开始追踪位置");
+  },
+  
+  // 停止追踪
+  stopTracking() {
+    if (this.data.locationTimer) {
+      clearInterval(this.data.locationTimer);
+      this.setData({ 
+        locationTimer: null,
+        isTracking: false 
+      });
+      this.showInfo("已停止追踪");
+    }
+  },
+  
+  // 检查是否偏离路线
+  checkDeviation(currentPoint) {
+    const { plannedRoute, deviationThreshold, deviationCount, replanThreshold } = this.data;
+    const routePoints = plannedRoute[0].points;
+    
+    if (!routePoints || routePoints.length < 2) return;
+    
+    // 计算当前位置到路线的最短距离
+    let minDistance = Infinity;
+    
+    // 检查当前点到路线上每一段线段的距离
+    for (let i = 0; i < routePoints.length - 1; i++) {
+      const distance = this.calculateDistanceToLine(
+        currentPoint,
+        routePoints[i],
+        routePoints[i + 1]
+      );
+      
+      if (distance < minDistance) {
+        minDistance = distance;
+      }
+    }
+    
+    // 判断是否偏离
+    const isDeviated = minDistance > deviationThreshold;
+    
+    if (isDeviated) {
+      // 增加连续偏离计数
+      const newDeviationCount = deviationCount + 1;
+      this.setData({ 
+        isDeviated,
+        deviationCount: newDeviationCount
+      });
+      
+      // 显示偏离信息
+      this.showInfo(`已偏离路线 ${minDistance.toFixed(1)} 米，连续偏离 ${newDeviationCount}/${replanThreshold} 次`);
+      
+      // 播放提示音
+      wx.playBackgroundAudio({
+        dataUrl: 'http://ws.stream.qqmusic.qq.com/M500001VfvsJ21xFqb.mp3?guid=ffffffff82def4af4b12b3cd9337d38&uin=346897220&vkey=6292F51C65348166B851686B2C059D76205E4241C44E5823713D649EF6471BA681DC27D5269A1E&fromtag=46',
+        title: '偏离提醒',
+        coverImgUrl: ''
+      });
+      
+      // 达到重新规划阈值，且不在重新规划中
+      if (newDeviationCount >= replanThreshold && !this.data.isReplanning) {
+        this.planRoute(true);  // 重新规划路线，传入true标识
+      }
+    } else {
+      // 回到路线上，重置偏离计数
+      this.setData({ 
+        isDeviated,
+        deviationCount: 0
+      });
+      
+      if (this.data.isDeviated) {
+        this.showInfo("已回到规划路线");
+      }
+    }
+  },
+  
+  // 计算点到线段的距离(米)
+  calculateDistanceToLine(point, lineStart, lineEnd) {
+    // 经纬度转弧度
+    const toRadians = (degree) => degree * Math.PI / 180;
+    
+    // 地球半径(米)
+    const R = 6371000;
+    
+    // 转换为弧度
+    const lat1 = toRadians(point.latitude);
+    const lon1 = toRadians(point.longitude);
+    const lat2 = toRadians(lineStart.latitude);
+    const lon2 = toRadians(lineStart.longitude);
+    const lat3 = toRadians(lineEnd.latitude);
+    const lon3 = toRadians(lineEnd.longitude);
+    
+    // 计算线段长度
+    const a = this.haversineDistance(lat1, lon1, lat2, lon2);
+    const b = this.haversineDistance(lat1, lon1, lat3, lon3);
+    const c = this.haversineDistance(lat2, lon2, lat3, lon3);
+    
+    // 如果点在线段延长线上，返回最近端点的距离
+    if (b * b >= a * a + c * c) {
+      return a;
+    }
+    if (a * a >= b * b + c * c) {
+      return b;
+    }
+    
+    // 计算点到线段的垂直距离
+    const s = (a + b + c) / 2;
+    const area = Math.sqrt(Math.abs(s * (s - a) * (s - b) * (s - c)));
+    return (2 * area) / c;
+  },
+  
+  // 使用haversine公式计算两点间距离(米)
+  haversineDistance(lat1, lon1, lat2, lon2) {
+    const R = 6371000; // 地球半径(米)
+    const dLat = lat2 - lat1;
+    const dLon = lon2 - lon1;
+    
+    const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+              Math.cos(lat1) * Math.cos(lat2) *
+              Math.sin(dLon / 2) * Math.sin(dLon / 2);
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    
+    return R * c;
+  },
+  
+    // 显示验证码弹窗
+    showVerificationPopup() {
+      this.setData({ showVerification: true });
+    },
+    
+    // 关闭弹窗
+    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) {
+          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);
+      });
+    },
+    onSlideSuccess(e){
+      console.log(e.currentTarget.dataset.type);
+     
+      // 3. 更新页面状态，隐藏按钮和提示
+      let data = {
+        carId:this.data.optionsid,
+        verifyCode:'MNBJ4H',
+        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==2) {
+        let objdata ={
+          workorderId:this.data.orderdata.workorderId
+        }
+         api.request(`/sysworkorder/createverify`, 'post',objdata,{ isPublic: false })
+      .then((data) => {
+        console.log(data.data);
+        if (data.code==200) {
+        
+        }
+      })
+      .catch((err) => {
+      
+        console.error('请求失败：', err);
+      });
+      }
+          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
+              });
+            }
+          }
+        });
+    }
+});

package-map/pages/map/index.json

@@ -0,0 +1,17 @@
+{
+  "navigationBarTitleText": "晟能能源",
+  "permission": {
+    "scope.userLocation": {
+      "desc": "你的位置信息将用于展示行驶轨迹"
+    }
+  },
+  "usingComponents": {
+    "t-icon": "tdesign-miniprogram/icon/icon",
+    "verification-popup": "/package-user/components/captcha",
+    "slide-confirm": "/package-user/components/slide-confirm"
+  },
+  "componentPlaceholder": {
+    "verification-popup": "view",  
+    "slide-confirm": "view"  
+  }
+}

package-map/pages/map/index.wxml

@@ -0,0 +1,127 @@
+<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}}"
+    bindcontroltap="controltap"
+    show-location
+    scale="16"
+  ></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="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>
+<verification-popup 
+  isShow="{{showVerification}}"
+  phoneNumber="{{phoneNumber}}"
+  countdownSeconds="60"
+  bind:close="onPopupClose"
+  bind:confirm="onCodeConfirm"
+  bind:resend="onResendCode"
+  bind:complete="onCodeComplete"
+/>

package-map/pages/map/index.wxss

@@ -0,0 +1,205 @@
+.container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+  background-color: #f9f9f9;
+}
+
+.map {
+  
+  width: 100%;
+  height: 70%;
+}
+
+.control-panel {
+  position: fixed;
+  bottom: 60rpx;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  padding: 0 20rpx;
+}
+
+.btn {
+  width: 80%;
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  color: white;
+  border-radius: 40rpx;
+  font-size: 30rpx;
+}
+
+.info {
+  position: fixed;
+  top: 30rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  background-color: rgba(0, 0, 0, 0.7);
+  color: white;
+  padding: 15rpx 30rpx;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+  z-index: 100;
+}
+
+/* 加载提示 */
+.loading-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.3);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 100;
+}
+
+.loading-view {
+  background-color: white;
+  padding: 30rpx 60rpx;
+  border-radius: 10rpx;
+}
+
+/* 错误提示 */
+.error-message {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  background-color: rgba(0, 0, 0, 0.7);
+  color: white;
+  padding: 20rpx 40rpx;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  z-index: 99;
+}
+
+/* 路线列表容器 */
+.routes-container {
+  /* background-color: white; */
+  padding: 20rpx;
+  /* border-top: 1px solid #eee; */
+  max-height: 50vh;
+  overflow-y: auto;
+}
+
+/* 目的地标题 */
+.destination-title {
+  font-size: 32rpx;
+  color: #333;
+  padding-bottom: 10rpx;
+  /* border-bottom: 1px solid #f0f0f0; */
+}
+.destination-font {
+  font-size: 28rpx;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  color: #333;
+  margin-top: 20rpx;
+  /* border-bottom: 1px solid #f0f0f0; */
+}
+.route{
+  width: 100%;
+  display: flex;
+}
+/* 路线列表 */
+.routes-list {
+  display: flex;
+  flex-direction: column;
+  gap: 15rpx;
+}
+
+/* 路线项 */
+.route-item {
+  padding: 15rpx;
+  border-radius: 8rpx;
+  background-color: #f9f9f9;
+  border: 1px solid #eee;
+}
+
+.route-item.active {
+  background-color: #e8f4ff;
+  border-color: #007aff;
+}
+
+/* 路线头部 */
+.route-header {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 10rpx;
+}
+
+.route-number {
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #333;
+}
+
+.route-policy {
+  font-size: 24rpx;
+  color: #666;
+  background-color: #f0f0f0;
+  padding: 2rpx 10rpx;
+  border-radius: 12rpx;
+}
+
+.route-item.active .route-policy {
+  background-color: #007aff;
+  color: white;
+}
+
+/* 路线详情 */
+.route-details {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.detail-item {
+  display: flex;
+  align-items: center;
+  margin-right: 20rpx;
+}
+
+.detail-text {
+  font-size: 26rpx;
+  color: #333;
+  margin-left: 8rpx;
+}
+
+/* 路况信息 */
+.traffic-info {
+  margin-top: 10rpx;
+}
+
+.traffic-text {
+  font-size: 24rpx;
+  color: #ff6b00;
+}
+.storagecartext{
+  width:100%;
+display: flex;
+justify-content: space-between;
+/* justify-content:space-around; */
+align-items: center;
+padding-left:20rpx;
+box-sizing: border-box;
+margin-top: 20rpx;
+    }
+.storagecar{
+  width: 260rpx;
+  height: 180rpx;
+}
+.viewmore{
+  margin-top: 20rpx;
+}

pages/workorderstep/index.js → package-order/pages/address/index.js

@@ -1,29 +1,41 @@
-// pages/workorderstep/index.js
+// pages/address/index.js
+const api = require('../../../api/index.js');
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    first: 1,
-    second: 1,
-    third: 1,
+    address:[]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-   
-  },
-  onFirstChange(e) {
-    this.setData({ first: e.detail.current });
+ this.getaddress()
   },
-  onSecondChange(e) {
-    this.setData({ second: e.detail.current });
-  },
-  onThirdChange(e) {
-    this.setData({ third: e.detail.current });
+  getaddress(){
+    let data ={
+      operationId:''
+    }
+    api.request(`/sysaddress/selectaddress`, 'post',data,{ isPublic: false })
+    .then((data) => {
+  console.log(data.data);
+  if (data.code==200) {
+    this.setData({
+      address:data.data
+    })
+  }
+  //  wx.navigateTo({
+  //   url: '/pages/map/index',
+  // })
+    })
+    .catch((err) => {
+   
+      console.error('请求失败：', err);
+    });
   },
   /**
    * 生命周期函数--监听页面初次渲染完成

package-order/pages/address/index.wxml

@@ -0,0 +1,12 @@
+<!--pages/userlist/index.wxml-->
+<view class="setup">
+  <view class="driver-info" wx:for="{{address}}" wx:key="addressId">
+      <view class="driver-details">
+        <view class="driver-car">{{item.addressName}}</view>
+        <view class="driver-name">晟运能源</view>
+        <view class="driver-arrive">经纬度 {{item.addressLatitudelongitude}}</view>
+      </view>
+      <!-- <button class="cancel-btn" bindtap="cancelOrder">去查看</button> -->
+      <t-icon name="edit-2" size="40rpx" data-name="edit-2" bind:tap="onIconTap" />
+    </view>
+</view>

package-order/pages/address/index.wxss

@@ -0,0 +1,61 @@
+/* pages/userlist/index.wxss */
+page{
+  width: 100%;
+  height: 100vh;
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
+  padding: 0rpx 22rpx;
+  box-sizing: border-box;
+
+}
+.driver-info {
+  background-color: white;
+  border-radius: 16rpx;
+  padding:20rpx 30rpx 20rpx 0rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  margin-top: 26rpx;
+  box-sizing: border-box;
+}
+
+.driver-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+}
+
+.driver-details {
+  margin-left: 24rpx;
+  flex: 1;
+}
+
+.driver-name {
+  font-size: 32rpx;
+  font-weight: bold;
+  padding: 20rpx 0rpx;
+}
+.driver-car {
+  font-size: 28rpx;
+  color: #999999;
+  margin-top: 8rpx;
+}
+
+.driver-arrive {
+  font-size: 28rpx;
+  /* color: #2C85FF; */
+  /* color: #666; */
+  color: #999999;
+
+  margin-top: 8rpx;
+}
+
+.cancel-btn {
+  width: 160rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  font-size: 28rpx;
+  color: #FF5252;
+  border: 1rpx solid #FF5252;
+  background-color: white;
+  border-radius: 32rpx;
+}

package-order/pages/createorder/index.js

@@ -0,0 +1,262 @@
+// pages/createorder/index.js
+const api = require('../../../api/index.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    cartype:0,
+    index:0,
+    objectArray: [],
+    objdriver: [],
+    driverindex:0,
+    date: '2016-09-01',
+    userdata:[],
+    userindex:0,
+    addressindex:0,
+    address: [],
+    items: [
+      {value: 1, name: '光伏'},
+      {value: 2, name: '风电'},
+      {value: 3, name: '网电'},
+    ]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+ this.getdriver()
+this.getvehicle()
+ this.getselectcompany()
+  },
+  // 司机
+  getdriver(){
+    let data ={
+
+    }
+    api.request(`/sysdriver/selectdriverall`, 'post',data,{ isPublic: false })
+    .then((data) => {
+     console.log(data.data);
+     let obj = []
+
+     for (let index = 0; index < data.data.length; index++) {
+      let carType = ''
+      if (data.data[index].operationType==1) {
+        carType = '空闲'
+      }else if(data.data[index].operationType==2){
+        carType = '工作中'
+      }else if(data.data[index].operationType==3){
+        carType = '维护中'
+      }
+      obj.push({
+        id:data.data[index].operationId,
+        name:data.data[index].operationName,
+        subtitle:data.data[index].operationName + ' / ' + carType
+      })    
+     }
+     this.setData({
+      objdriver:obj
+     })
+    })
+    .catch((err) => {
+   
+      console.error('请求失败：', err);
+    });
+  },
+  // 车型
+  getvehicle(){
+    let data ={}
+    api.request(`/syscar/selectcarall`, 'post',data,{ isPublic: false })
+    .then((data) => {
+      let obj = []
+      for (let index = 0; index < data.data.length; index++) {
+        let carType = ''
+          if (data.data[index].carType==1) {
+            carType = '空闲'
+          }else if(data.data[index].carType==2){
+            carType = '工作中'
+          }else if(data.data[index].carType==3){
+            carType = '维护中'
+          }
+          obj.push({
+            id:data.data[index].carId,
+            name:data.data[index].carId + ' / ' + data.data[index].carMondel,
+            subtitle:data.data[index].carId + ' / ' + data.data[index].carMondel + ' / ' + carType
+
+          })
+      }
+      this.setData({
+        objectArray:obj
+       })
+ console.log(this.data.objectArray);
+    })
+    .catch((err) => {
+   
+      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
+    }
+    api.request(`/sysaddress/selectaddress`, 'post',data,{ isPublic: false })
+    .then((data) => {
+     console.log(data.data);
+     this.setData({
+      address:data.data
+     })
+    })
+    .catch((err) => {
+   
+      console.error('请求失败：', err);
+    });
+  },
+  oncar(e){
+   console.log(e.currentTarget.dataset.index);
+this.setData({
+  cartype:e.currentTarget.dataset.index
+})
+  },
+  bindDateChange: function(e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      date: e.detail.value
+    })
+  },
+  details(){
+ 
+    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
+    }
+    api.request(`/sysworkorder/addworkorder`, '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);
+    this.setData({
+      index:e.detail.value
+    })
+    },
+    // 车型
+  binddriverChange(e){
+  console.log(e.detail.value);
+  this.setData({
+    driverindex:e.detail.value
+  })
+  },  
+    // 用户
+    binduserChange(e){
+ console.log(e);
+ this.setData({
+  userindex:e.detail.value
+})
+    },
+      // 地址
+      binduserChange(e){
+        console.log(e);
+        this.setData({
+          addressindex:e.detail.value
+       })
+           },
+           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
+            }
+        
+            this.setData({
+              items
+            })
+          },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**                  
+   * 用户点击右上角分享  
+   */                  
+  onShareAppMessage() {
+                       
+  }                    
+})                     
+// 

pages/statistics/index.json → package-order/pages/createorder/index.json

@@ -1,6 +1,6 @@
 {
-  "navigationStyle": "custom",
   "usingComponents": {
     "t-icon": "tdesign-miniprogram/icon/icon"
-    }
+    
+  }
 }

package-order/pages/createorder/index.wxml

@@ -0,0 +1,127 @@
+<!--pages/createorder/index.wxml-->
+<view class="body">
+<view class="car">
+<view>
+<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>
+</view>
+<view class="car">
+<view>
+<text style="color: red;">*</text> <text wx:if="{{cartype==1}}"> 出售电量</text> <text wx:if="{{cartype==0}}"> 需求电量</text> 
+</view>
+<view class="model_right">
+<input class="powerlevel" type="text" placeholder="请输入电量"/>
+</view>
+</view>
+<view class="car" wx:if="{{cartype==1}}">
+<view>
+<text style="color: red;">*</text> 意向电价
+</view>
+<view class="model_right">
+<input class="powerlevel" type="text" placeholder="请输入需求用电"/>
+</view>
+</view>
+<view class="car">
+<view style="margin-left: 18rpx;">
+ 绿电
+</view>
+<view class="model_right">
+  <radio-group bindchange="radioChange">
+        <label class="weui-cell weui-check__label" wx:for="{{items}}" wx:key="value">
+
+          <view class="weui-cell__hd">
+            <radio value="{{item.value}}" checked="true"/>
+          </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> 司机
+</view>
+<view class="model_right">
+  <picker bindchange="binddriverChange" value="{{driverindex}}" range="{{objdriver}}" range-key="subtitle">
+    <view class="picker">
+    {{objdriver[driverindex].name}}
+<t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
+    </view>
+  </picker>
+</view>
+</view> -->
+<view class="car">
+<view style="margin-left: 18rpx;">
+车长车型
+</view>
+<view class="model_right">
+  <picker bindchange="bindectArrayChange" value="{{index}}" range="{{objectArray}}" range-key="subtitle">
+    <view class="picker">
+    {{objectArray[index].name}}
+<t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
+    </view>
+  </picker>
+</view>
+</view>
+<!-- <view class="car">
+<view>
+<text style="color: red;">*</text> 用户
+</view>
+<view class="model_right">
+  <picker bindchange="binduserChange" value="{{userindex}}" range="{{userdata}}" range-key="companyName">
+    <view class="picker">
+    {{userdata[userindex].companyName}}
+<t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
+    </view>
+  </picker>
+</view>
+</view> -->
+ 
+<view class="car">
+<view>
+<text style="color: red;">*</text> 地址
+</view>
+<view class="model_right">
+  <picker bindchange="bindPickerChange" value="{{addressindex}}" range="{{address}}" range-key="addressDetails">
+    <view class="picker">
+    {{address[addressindex].addressDetails}}
+<t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
+    </view>
+  </picker>
+</view>
+</view>
+<view class="car">
+<view>
+<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">
+    <view class="picker">
+     {{date}}
+<t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
+    </view>
+  </picker>
+</view>
+</view>
+
+</view>
+<!-- 
+
+--->
+<button class="call-btn" bindtap="details">
+      <text class="call-btn_left_electricity">预约</text>
+</button> 
+        

package-order/pages/createorder/index.wxss

@@ -0,0 +1,86 @@
+page {
+  background-color: var(--td-bg-color-container);
+  /* background-color: #f9f9f9; */
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
+  padding: 10rpx 20rpx 20rpx 20rpx;
+box-sizing: border-box;
+}
+.body{
+background-color: #ffffff;
+border-radius: 10rpx;
+padding: 0rpx 0rpx;
+box-sizing: border-box;
+}
+.car{
+  margin-top: 20rpx;
+  padding: 20rpx 30rpx;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+}
+.car_right{
+  width: 240rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.cartbuy{
+  padding: 8rpx 26rpx;
+  border-radius: 10rpx;
+  border: 1rpx solid #cccccc;
+}
+.carsell{
+  padding: 8rpx 26rpx;
+  border-radius: 10rpx;
+  border: 1rpx solid red;
+}
+.model_right{
+  display: flex;
+  justify-content: space-between;
+}
+.picker{
+  display: flex;
+}
+.call-btn {
+  position: absolute;
+bottom: 0;
+left: 0;
+right: 0;
+margin-bottom: 64rpx;
+background-color: #00C775;
+color: white;
+width: 90%;
+height: 96rpx;
+line-height: 96rpx;
+font-size: 34rpx;
+border-radius: 48rpx;
+box-sizing: border-box;
+display: flex;
+justify-content:space-around;
+}
+.call-btn_left_electricity{
+width: 50%;
+height: 100%;
+}
+.call-btn_right_electricity{
+width: 50%;
+height: 100%;
+border-left: 4rpx solid #ffffff; 
+}
+.powerlevel{
+ border-radius: 6rpx;
+ text-align: right;
+padding-right: 40rpx;
+}
+/*  */
+radio-group{
+  display: flex;
+  align-items: center;
+}
+.weui-cell{
+  display: flex;
+  align-items: center;
+
+}
+.weui-cell__hd{
+  margin-left: 20rpx;
+}

package-order/pages/driver/index.js

@@ -0,0 +1,90 @@
+// pages/driver/index.js
+const api = require('../../../api/index.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    driver:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+ this.getdriver()
+  },
+  getdriver(){
+    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({
+      driver:data.data
+    })
+  }
+  //  wx.navigateTo({
+  //   url: '/pages/map/index',
+  // })
+    })
+    .catch((err) => {
+   
+      console.error('请求失败：', err);
+    });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

package-order/pages/driver/index.wxml

@@ -0,0 +1,12 @@
+<!--pages/userlist/index.wxml-->
+<view class="setup">
+  <view class="driver-info" wx:for="{{driver}}" 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">司机:{{item.operationName}}</view>
+        <view class="driver-arrive">状态：{{item.operationType}}</view>
+        <view class="driver-car">电话：{{item.operationPhone}}</view>
+      </view>
+      <!-- <button class="cancel-btn" bindtap="cancelOrder">去查看</button> -->
+    </view>
+</view>

package-order/pages/driver/index.wxss

@@ -0,0 +1,59 @@
+/* pages/userlist/index.wxss */
+page{
+  width: 100%;
+  height: 100vh;
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
+  padding: 0rpx 22rpx;
+  box-sizing: border-box;
+
+}
+.driver-info {
+  background-color: white;
+  border-radius: 16rpx;
+  padding: 20rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  margin-top: 26rpx;
+}
+
+.driver-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+}
+
+.driver-details {
+  margin-left: 24rpx;
+  flex: 1;
+}
+
+.driver-name {
+  font-size: 32rpx;
+  font-weight: bold;
+}
+.driver-car {
+  font-size: 28rpx;
+  color: #999999;
+  margin-top: 8rpx;
+}
+
+.driver-arrive {
+  font-size: 28rpx;
+  /* color: #2C85FF; */
+  /* color: #666; */
+  color: #999999;
+
+  margin-top: 8rpx;
+}
+
+.cancel-btn {
+  width: 160rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  font-size: 28rpx;
+  color: #FF5252;
+  border: 1rpx solid #FF5252;
+  background-color: white;
+  border-radius: 32rpx;
+}

pages/setuplevel/index.js → package-setup/pages/setuplevel/index.js

@@ -1,5 +1,5 @@
 // pages/setuplevel/index.js
-const api = require('../../api/index.js');
+const api = require('../../../api/index.js');
 
 Page({
 
@@ -24,7 +24,7 @@ Page({
             }
           });
           wx.navigateTo({
-            url: '/pages/login/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
+            url: '/package-user/pages/login/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
           });
         } else if (res.cancel) {
           console.log('用户点击取消')
@@ -46,7 +46,7 @@ Page({
                 icon: 'success'
               });
               wx.navigateTo({
-                url: '/pages/login/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
+                url: '/package-user/pages/login/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
               });
             }
           });

pages/setuplevel/index.wxss → package-setup/pages/setuplevel/index.wxss

@@ -1,6 +1,6 @@
 /* pages/setuplevel/index.wxss */
 page{
- background: linear-gradient(to bottom, #0F80DC -40%, #F0F5F5 40%,#F0F5F5 100%);
+ background: linear-gradient(to bottom, #00C775 -40%, #F0F5F5 40%,#F0F5F5 100%);
 }
 .buttom_{
   width: 100%;
@@ -13,8 +13,8 @@ page{
 .buttom{
   width: 80%;
   height: 80rpx;
-  color: #0F80DC;
- border: 1rpx solid #0F80DC;
+  color: #00C775;
+ border: 1rpx solid #00C775;
  display: flex;
  align-items: center;
  justify-content: center;
@@ -45,7 +45,8 @@ box-sizing: border-box;
   padding: 10rpx 0rpx;
   box-sizing: border-box;
   margin-top: 30rpx;
-box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+
 }
 .allocation_2{
   color: #999999;

package-user/components/captcha/index.js

@@ -0,0 +1,178 @@
+Component({
+  properties: {
+    // 是否显示弹窗
+    isShow: {
+      type: Boolean,
+      value: false
+    },
+    // 手机号（用于显示）
+    phoneNumber: {
+      type: String,
+      value: ''
+    },
+    // 倒计时秒数
+    countdownSeconds: {
+      type: Number,
+      value: 120
+    }
+  },
+
+  data: {
+    // 验证码数组（6位）
+    codes: ['', '', '', ''],
+    // 实际输入的验证码值
+    codeValue: '',
+    // 当前激活的输入框索引
+    currentIndex: 0,
+    // 是否聚焦
+    isFocus: false,
+    // 倒计时
+    countdown: 120,
+    // 是否可以重新发送
+    canResend: false,
+    // 验证码是否输入完成
+    isComplete: false,
+    // 倒计时计时器
+    timer: null
+  },
+
+  observers: {
+    // 监听isShow变化，控制弹窗显示隐藏
+    isShow: function (isShow) {
+      if (isShow) {
+        this.startCountdown();
+        this.focusInput();
+      } else {
+        this.clearCountdown();
+        this.resetCodeInput();
+      }
+    },
+    
+    // 监听countdownSeconds变化
+    countdownSeconds: function (seconds) {
+      this.setData({
+        countdown: seconds
+      });
+    },
+    
+    // 监听验证码变化，更新输入状态
+    codeValue: function (value) {
+      const codes = [];
+      for (let i = 0; i < 4; i++) {
+        codes[i] = value[i] || '';
+      }
+      
+      // 更新当前激活的输入框索引
+      let currentIndex = value.length < 4 ? value.length : 3;
+      
+      // 判断是否输入完成
+      const isComplete = value.length === 4;
+      
+      this.setData({
+        codes,
+        currentIndex,
+        isComplete
+      });
+      
+      // 如果输入完成，自动触发确认事件
+      if (isComplete) {
+        this.triggerEvent('complete', { code: value });
+      }
+    }
+  },
+
+  methods: {
+    // 聚焦输入框
+    focusInput() {
+      this.setData({
+        isFocus: true
+      });
+    },
+    
+    // 输入框失焦
+    onInputBlur() {
+      this.setData({
+        isFocus: false
+      });
+    },
+    
+    // 验证码输入
+    onCodeInput(e) {
+      const value = e.detail.value.replace(/\D/g, ''); // 只保留数字
+      this.setData({
+        codeValue: value
+      });
+    },
+    
+    // 关闭弹窗
+    onClose() {
+      this.triggerEvent('close');
+    },
+    
+    // 确认
+    onConfirm() {
+      if (this.data.isComplete) {
+        this.triggerEvent('confirm', { code: this.data.codeValue });
+      }
+    },
+    
+    // 重新发送验证码
+    onResend() {
+      this.triggerEvent('resend');
+      this.startCountdown();
+    },
+    
+    // 开始倒计时
+    startCountdown() {
+      // 清除之前的计时器
+      this.clearCountdown();
+      
+      const countdownSeconds = this.data.countdownSeconds;
+      this.setData({
+        countdown: countdownSeconds,
+        canResend: false
+      });
+      
+      // 设置新的计时器
+      const timer = setInterval(() => {
+        let countdown = this.data.countdown - 1;
+        if (countdown <= 0) {
+          this.setData({
+            countdown: 0,
+            canResend: true
+          });
+          this.clearCountdown();
+        } else {
+          this.setData({
+            countdown
+          });
+        }
+      }, 1000);
+      
+      this.setData({ timer });
+    },
+    
+    // 清除倒计时
+    clearCountdown() {
+      if (this.data.timer) {
+        clearInterval(this.data.timer);
+        this.setData({ timer: null });
+      }
+    },
+    
+    // 重置验证码输入
+    resetCodeInput() {
+      this.setData({
+        codes: ['', '', '', '', '', ''],
+        codeValue: '',
+        currentIndex: 0,
+        isComplete: false
+      });
+    }
+  },
+  
+  // 组件销毁时清除计时器
+  detached() {
+    this.clearCountdown();
+  }
+});

package-user/components/captcha/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

package-user/components/captcha/index.wxml

@@ -0,0 +1,63 @@
+<view class="verification-popup {{isShow ? 'show' : ''}}">
+  <!-- 遮罩层 -->
+  <view class="overlay" bindtap="onClose"></view>
+  
+  <!-- 弹窗内容 -->
+  <view class="popup-content">
+    <!-- 标题区域 -->
+    <view class="popup-header">
+      <text class="title">输入验证码</text>
+      <view class="close-btn" bindtap="onClose">
+        <icon type="clear" size="20" color="#999" />
+      </view>
+    </view>
+    
+    <!-- 提示信息 -->
+    <!-- <view class="message">
+      验证码已发送至手机 {{phoneNumber}}
+    </view> -->
+    
+    <!-- 验证码输入框 -->
+    <view class="code-input-container">
+      <view 
+        wx:for="{{4}}" 
+        wx:key="index" 
+        class="code-input {{currentIndex === index ? 'active' : ''}} {{codes[index] ? 'filled' : ''}}"
+        bindtap="focusInput"
+      >
+        <text>{{codes[index] || ''}}</text>
+      </view>
+      <!-- 实际输入框（隐藏） -->
+      <input 
+        class="real-input" 
+        type="number" 
+        maxlength="4" 
+        focus="{{isFocus}}" 
+        value="{{codeValue}}"
+        bindinput="onCodeInput"
+        bindblur="onInputBlur"
+      />
+    </view>
+    
+    <!-- 操作区域 -->
+    <view class="operation-area">
+      <!-- <button 
+        class="confirm-btn" 
+        bindtap="onConfirm"
+        disabled="{{!isComplete}}"
+      >
+        确认
+      </button> -->
+      
+      <view class="resend-container">
+        <!-- <text>未收到验证码？</text> -->
+        <text 
+          class="resend-btn {{canResend ? 'active' : ''}}" 
+          bindtap="{{canResend ? 'onResend' : ''}}"
+        >
+          {{canResend ? '重新发送' : '重新发送(' + countdown + ')'}}
+        </text>
+      </view>
+    </view>
+  </view>
+</view>

package-user/components/captcha/index.wxss

@@ -0,0 +1,185 @@
+.verification-popup {
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+}
+
+/* 显示弹窗 */
+.verification-popup.show {
+  display: block;
+}
+
+/* 遮罩层 */
+.overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  backdrop-filter: blur(2px);
+  animation: fadeIn 0.3s ease;
+}
+
+/* 弹窗内容 */
+.popup-content {
+  position: absolute;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 90%;
+  max-width: 400px;
+  background-color: #fff;
+  border-radius: 16px;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.15);
+  overflow: hidden;
+  animation: scaleIn 0.3s ease;
+}
+
+/* 标题区域 */
+.popup-header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 20px 24px 16px;
+  position: relative;
+}
+
+.title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #1a1a1a;
+}
+
+.close-btn {
+  position: absolute;
+  right: 24px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  background-color: #f5f5f5;
+}
+
+/* 提示信息 */
+.message {
+  text-align: center;
+  font-size: 14px;
+  color: #666;
+  padding: 0 24px 20px;
+}
+
+/* 验证码输入框容器 */
+.code-input-container {
+  display: flex;
+  justify-content: center;
+  gap: 10px;
+  padding: 0 24px 24px;
+  position: relative;
+}
+
+/* 单个验证码输入框 */
+.code-input {
+  width: 50px;
+  height: 50px;
+  border-radius: 8px;
+  border: 1px solid #ddd;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 24px;
+  font-weight: 600;
+  color: #1a1a1a;
+  transition: all 0.2s ease;
+}
+
+/* 激活状态 */
+.code-input.active {
+  border-color: #07c160;
+  box-shadow: 0 0 0 2px rgba(7, 193, 96, 0.2);
+}
+
+/* 已填充状态 */
+.code-input.filled {
+  border-color: #eee;
+  background-color: #fafafa;
+}
+
+/* 实际输入框（隐藏） */
+.real-input {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  opacity: 0;
+  pointer-events: none;
+}
+
+/* 操作区域 */
+.operation-area {
+  padding: 0 24px 24px;
+}
+
+/* 确认按钮 */
+.confirm-btn {
+  width: 100%;
+  height: 48px;
+  line-height: 48px;
+  background-color: #07c160;
+  color: #fff;
+  font-size: 16px;
+  font-weight: 500;
+  border-radius: 24px;
+  margin-bottom: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.confirm-btn::after {
+  border: none;
+}
+
+.confirm-btn:disabled {
+  background-color: #e5e5e5;
+  color: #999;
+}
+
+/* 重新发送区域 */
+.resend-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 6px;
+  font-size: 14px;
+  color: #666;
+}
+
+/* 重新发送按钮 */
+.resend-btn {
+  color: #07c160;
+  font-weight: 500;
+}
+
+.resend-btn:not(.active) {
+  color: #999;
+  pointer-events: none;
+}
+
+/* 动画效果 */
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+@keyframes scaleIn {
+  from { transform: translate(-50%, -50%) scale(0.9); opacity: 0; }
+  to { transform: translate(-50%, -50%) scale(1); opacity: 1; }
+}

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

@@ -0,0 +1,101 @@
+Component({
+  properties: {
+    width: {
+      type: Number,
+      value: 300
+    },
+    height: {
+      type: Number,
+      value: 50
+    },
+    blockSize: {
+      type: Number,
+      value: 48
+    },
+    defaultText: {
+      type: String,
+      value: "向右滑动完成验证"
+    },
+    successText: {
+      type: String,
+      value: "验证通过"
+    },
+    iconSize: {
+      type: Number,
+      value: 24
+    }
+  },
+
+  data: {
+    position: 0,          // 滑块位置
+    progressWidth: 0,     // 已滑动宽度
+    startX: 0,            // 触摸起始X坐标
+    isMoving: false,      // 是否正在滑动
+    isSuccess: false      // 是否验证成功
+  },
+
+  methods: {
+    // 触摸开始
+    onTouchStart(e) {
+      if (this.data.isSuccess) return;
+      
+      this.setData({
+        startX: e.touches[0].clientX,
+        isMoving: true
+      });
+    },
+
+    // 触摸移动
+    onTouchMove(e) {
+      if (!this.data.isMoving || this.data.isSuccess) return;
+      
+      const moveX = e.touches[0].clientX;
+      let position = moveX - this.data.startX;
+      
+      // 限制滑块范围
+      if (position < 0) position = 0;
+      const maxPosition = this.data.width - this.data.blockSize;
+      if (position > maxPosition) position = maxPosition;
+      
+      this.setData({
+        position,
+        progressWidth: position + this.data.blockSize  // 进度宽度 = 滑块位置 + 滑块宽度
+      });
+    },
+
+    // 触摸结束
+    onTouchEnd() {
+      if (!this.data.isMoving || this.data.isSuccess) return;
+      
+      this.setData({ isMoving: false });
+      
+      // 判断是否滑动到终点
+      const maxPosition = this.data.width - this.data.blockSize;
+      if (this.data.position >= maxPosition * 0.95) {
+        // 验证成功
+        this.setData({
+          position: maxPosition,
+          progressWidth: this.data.width,
+          isSuccess: true
+        });
+        // 触发成功事件
+        this.triggerEvent('success');
+      } else {
+        // 滑动不足，重置
+        this.setData({
+          position: 0,
+          progressWidth: 0
+        });
+      }
+    },
+
+    // 重置滑块
+    reset() {
+      this.setData({
+        position: 0,
+        progressWidth: 0,
+        isSuccess: false
+      });
+    }
+  }
+});

pages/malfunction/index.json → package-user/components/slide-confirm/index.json

@@ -1,6 +1,7 @@
 {
-  "navigationBarTitleText": "工单报障",
+  "component": true,
   "usingComponents": {
     "t-icon": "tdesign-miniprogram/icon/icon"
+
   }
 }

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

@@ -0,0 +1,26 @@
+<view class="slide-container {{isSuccess ? 'success' : ''}}" style="width: {{width}}px; height: {{height}}px;">
+  <!-- 背景轨道 -->
+    <view 
+    class="slide-progress" 
+    style="width: {{progressWidth}}px; height: {{height}}px;"
+  ></view>
+  <view class="slide-track">
+    <text class="track-text">{{isSuccess ? successText : defaultText}}</text>
+  </view>
+  
+  <!-- 滑块 -->
+  <view 
+    class="slide-block"
+    style="left: {{position}}px; width: {{blockSize}}px; height: {{blockSize}}px;"
+    bindtouchstart="onTouchStart"
+    bindtouchmove="onTouchMove"
+    bindtouchend="onTouchEnd"
+  >
+    <t-icon 
+      class="block-icon" 
+      name="arrow-right"
+      type="{{isSuccess ? 'success' : 'arrowright'}}" 
+      size="{{iconSize}}"
+    ></t-icon>
+  </view>
+</view>

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

@@ -0,0 +1,64 @@
+.slide-container {
+  position: relative;
+  overflow: hidden;
+  border-radius: 40px;
+  background-color: #f5f5f5;
+   box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1) inset;
+
+  transition: background-color 0.3s; 
+  
+}
+
+/* 已滑动区域样式 */
+.slide-progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: #eaffea; /* 滑动过的区域颜色 */
+  z-index: 1;
+  border-top-right-radius:100rpx;
+  border-bottom-right-radius:100rpx;
+  transition: background-color 0.3s ease;
+}
+
+
+/* 成功状态下的滑动区域颜色 */
+.slide-container.success .slide-progress {
+  background-color: #00c775; /* 验证成功后的颜色 */
+}
+
+.slide-track {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 2;
+}
+
+.track-text {
+  font-size: 14px;
+  color: #666;
+}
+
+.slide-container.success .track-text {
+  color: #fff;
+}
+
+.slide-block {
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  border-radius: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
+  z-index: 3;
+  touch-action: none;
+}
+
+.block-icon {
+  color: #00c775;
+}

package-user/pages/captcha/index.js

@@ -0,0 +1,178 @@
+Component({
+  properties: {
+    // 是否显示弹窗
+    isShow: {
+      type: Boolean,
+      value: false
+    },
+    // 手机号（用于显示）
+    phoneNumber: {
+      type: String,
+      value: ''
+    },
+    // 倒计时秒数
+    countdownSeconds: {
+      type: Number,
+      value: 60
+    }
+  },
+
+  data: {
+    // 验证码数组（6位）
+    codes: ['', '', '', '', '', ''],
+    // 实际输入的验证码值
+    codeValue: '',
+    // 当前激活的输入框索引
+    currentIndex: 0,
+    // 是否聚焦
+    isFocus: false,
+    // 倒计时
+    countdown: 60,
+    // 是否可以重新发送
+    canResend: false,
+    // 验证码是否输入完成
+    isComplete: false,
+    // 倒计时计时器
+    timer: null
+  },
+
+  observers: {
+    // 监听isShow变化，控制弹窗显示隐藏
+    isShow: function (isShow) {
+      if (isShow) {
+        this.startCountdown();
+        this.focusInput();
+      } else {
+        this.clearCountdown();
+        this.resetCodeInput();
+      }
+    },
+    
+    // 监听countdownSeconds变化
+    countdownSeconds: function (seconds) {
+      this.setData({
+        countdown: seconds
+      });
+    },
+    
+    // 监听验证码变化，更新输入状态
+    codeValue: function (value) {
+      const codes = [];
+      for (let i = 0; i < 6; i++) {
+        codes[i] = value[i] || '';
+      }
+      
+      // 更新当前激活的输入框索引
+      let currentIndex = value.length < 6 ? value.length : 5;
+      
+      // 判断是否输入完成
+      const isComplete = value.length === 6;
+      
+      this.setData({
+        codes,
+        currentIndex,
+        isComplete
+      });
+      
+      // 如果输入完成，自动触发确认事件
+      if (isComplete) {
+        this.triggerEvent('complete', { code: value });
+      }
+    }
+  },
+
+  methods: {
+    // 聚焦输入框
+    focusInput() {
+      this.setData({
+        isFocus: true
+      });
+    },
+    
+    // 输入框失焦
+    onInputBlur() {
+      this.setData({
+        isFocus: false
+      });
+    },
+    
+    // 验证码输入
+    onCodeInput(e) {
+      const value = e.detail.value.replace(/\D/g, ''); // 只保留数字
+      this.setData({
+        codeValue: value
+      });
+    },
+    
+    // 关闭弹窗
+    onClose() {
+      this.triggerEvent('close');
+    },
+    
+    // 确认
+    onConfirm() {
+      if (this.data.isComplete) {
+        this.triggerEvent('confirm', { code: this.data.codeValue });
+      }
+    },
+    
+    // 重新发送验证码
+    onResend() {
+      this.triggerEvent('resend');
+      this.startCountdown();
+    },
+    
+    // 开始倒计时
+    startCountdown() {
+      // 清除之前的计时器
+      this.clearCountdown();
+      
+      const countdownSeconds = this.data.countdownSeconds;
+      this.setData({
+        countdown: countdownSeconds,
+        canResend: false
+      });
+      
+      // 设置新的计时器
+      const timer = setInterval(() => {
+        let countdown = this.data.countdown - 1;
+        if (countdown <= 0) {
+          this.setData({
+            countdown: 0,
+            canResend: true
+          });
+          this.clearCountdown();
+        } else {
+          this.setData({
+            countdown
+          });
+        }
+      }, 1000);
+      
+      this.setData({ timer });
+    },
+    
+    // 清除倒计时
+    clearCountdown() {
+      if (this.data.timer) {
+        clearInterval(this.data.timer);
+        this.setData({ timer: null });
+      }
+    },
+    
+    // 重置验证码输入
+    resetCodeInput() {
+      this.setData({
+        codes: ['', '', '', '', '', ''],
+        codeValue: '',
+        currentIndex: 0,
+        isComplete: false
+      });
+    }
+  },
+  
+  // 组件销毁时清除计时器
+  detached() {
+    this.clearCountdown();
+  }
+});

package-user/pages/captcha/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

package-user/pages/captcha/index.wxml

@@ -0,0 +1,63 @@
+<view class="verification-popup {{isShow ? 'show' : ''}}">
+  <!-- 遮罩层 -->
+  <view class="overlay" bindtap="onClose"></view>
+  
+  <!-- 弹窗内容 -->
+  <view class="popup-content">
+    <!-- 标题区域 -->
+    <view class="popup-header">
+      <text class="title">输入验证码</text>
+      <view class="close-btn" bindtap="onClose">
+        <icon type="clear" size="20" color="#999" />
+      </view>
+    </view>
+    
+    <!-- 提示信息 -->
+    <!-- <view class="message">
+      验证码已发送至手机 {{phoneNumber}}
+    </view> -->
+    
+    <!-- 验证码输入框 -->
+    <view class="code-input-container">
+      <view 
+        wx:for="{{6}}" 
+        wx:key="index" 
+        class="code-input {{currentIndex === index ? 'active' : ''}} {{codes[index] ? 'filled' : ''}}"
+        bindtap="focusInput"
+      >
+        <text>{{codes[index] || ''}}</text>
+      </view>
+      <!-- 实际输入框（隐藏） -->
+      <input 
+        class="real-input" 
+        type="number" 
+        maxlength="6" 
+        focus="{{isFocus}}" 
+        value="{{codeValue}}"
+        bindinput="onCodeInput"
+        bindblur="onInputBlur"
+      />
+    </view>
+    
+    <!-- 操作区域 -->
+    <view class="operation-area">
+      <!-- <button 
+        class="confirm-btn" 
+        bindtap="onConfirm"
+        disabled="{{!isComplete}}"
+      >
+        确认
+      </button> -->
+      
+      <!-- <view class="resend-container">
+        <text>未收到验证码？</text>
+        <text 
+          class="resend-btn {{canResend ? 'active' : ''}}" 
+          bindtap="{{canResend ? 'onResend' : ''}}"
+        >
+          {{canResend ? '重新发送' : '重新发送(' + countdown + ')'}}
+        </text>
+      </view> -->
+    </view>
+  </view>
+</view>

package-user/pages/captcha/index.wxss

@@ -0,0 +1,185 @@
+.verification-popup {
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+}
+
+/* 显示弹窗 */
+.verification-popup.show {
+  display: block;
+}
+
+/* 遮罩层 */
+.overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  backdrop-filter: blur(2px);
+  animation: fadeIn 0.3s ease;
+}
+
+/* 弹窗内容 */
+.popup-content {
+  position: absolute;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 90%;
+  max-width: 400px;
+  background-color: #fff;
+  border-radius: 16px;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.15);
+  overflow: hidden;
+  animation: scaleIn 0.3s ease;
+}
+
+/* 标题区域 */
+.popup-header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 20px 24px 16px;
+  position: relative;
+}
+
+.title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #1a1a1a;
+}
+
+.close-btn {
+  position: absolute;
+  right: 24px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  background-color: #f5f5f5;
+}
+
+/* 提示信息 */
+.message {
+  text-align: center;
+  font-size: 14px;
+  color: #666;
+  padding: 0 24px 20px;
+}
+
+/* 验证码输入框容器 */
+.code-input-container {
+  display: flex;
+  justify-content: center;
+  gap: 10px;
+  padding: 0 24px 24px;
+  position: relative;
+}
+
+/* 单个验证码输入框 */
+.code-input {
+  width: 50px;
+  height: 50px;
+  border-radius: 8px;
+  border: 1px solid #ddd;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 24px;
+  font-weight: 600;
+  color: #1a1a1a;
+  transition: all 0.2s ease;
+}
+
+/* 激活状态 */
+.code-input.active {
+  border-color: #07c160;
+  box-shadow: 0 0 0 2px rgba(7, 193, 96, 0.2);
+}
+
+/* 已填充状态 */
+.code-input.filled {
+  border-color: #eee;
+  background-color: #fafafa;
+}
+
+/* 实际输入框（隐藏） */
+.real-input {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  opacity: 0;
+  pointer-events: none;
+}
+
+/* 操作区域 */
+.operation-area {
+  padding: 0 24px 24px;
+}
+
+/* 确认按钮 */
+.confirm-btn {
+  width: 100%;
+  height: 48px;
+  line-height: 48px;
+  background-color: #07c160;
+  color: #fff;
+  font-size: 16px;
+  font-weight: 500;
+  border-radius: 24px;
+  margin-bottom: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.confirm-btn::after {
+  border: none;
+}
+
+.confirm-btn:disabled {
+  background-color: #e5e5e5;
+  color: #999;
+}
+
+/* 重新发送区域 */
+.resend-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 6px;
+  font-size: 14px;
+  color: #666;
+}
+
+/* 重新发送按钮 */
+.resend-btn {
+  color: #07c160;
+  font-weight: 500;
+}
+
+.resend-btn:not(.active) {
+  color: #999;
+  pointer-events: none;
+}
+
+/* 动画效果 */
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+@keyframes scaleIn {
+  from { transform: translate(-50%, -50%) scale(0.9); opacity: 0; }
+  to { transform: translate(-50%, -50%) scale(1); opacity: 1; }
+}

pages/login/index.js → package-user/pages/login/index.js

@@ -1,5 +1,5 @@
 // pages/login/index.js 
-const api = require('../../api/index.js');
+const api = require('../../../api/index.js');
 
 Page({
 
@@ -122,15 +122,6 @@ handleAgreePrivacy() {
   })
   // 用户同意后，再执行登录流程
 },
-onstatus(){
-  if (!this.data.checked) {
-    return wx.showToast({
-      title: '请勾选同意',
-    icon: 'none',
-  
-    });
-  }
-},
 // 获取手机号回调
 onGetPhoneNumber(e) {
   console.log(e);
@@ -161,7 +152,7 @@ onGetPhoneNumber(e) {
         phonecode:e.detail.code,
         code:code
       }
-      api.request(`/SysPartnerLogController/login`, 'post',obj,{ isPublic: true })
+      api.request(`/sysoperation/login`, 'post',obj,{ isPublic: true })
       .then((data) => {
    console.log(data);
    if (data.code == 200) {
@@ -217,7 +208,14 @@ wx.setStorage({
 
 
 },
- 
+promptcheck(){
+  return wx.showToast({
+    title: '请勾选同意',
+  icon: 'none',
+
+  });
+  
+},
     // 处理登录按钮点击
     onLogin() {
            // 获取本地存储的数据

package-user/pages/login/index.wxml

@@ -0,0 +1,24 @@
+<!-- pages/user/index.wxml -->
+<view class="setup">
+  <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>
+</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="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>
+ <view class="agreement">
+  <t-radio t-class="t_box" value="{{checked}}" icon="dot" data-value="{{checked}}" bind:tap="checkboxChange"/>
+ 我已阅读并同意晟运<text class="agreement_color" data-name="服务协议" bind:tap="onprivacy">《服务协议》</text>和<text class="agreement_color" data-name="隐私政策" bind:tap="onprivacy">《隐私政策》</text> 
+ </view>
+ </view>
+
+</view>

pages/login/index.wxss → package-user/pages/login/index.wxss

@@ -1,10 +1,12 @@
 .setup{
   width: 100%;
   height: 100vh;
-  background: linear-gradient(to bottom, #0F80DC -40%, #F0F5F5 40%,#F0F5F5 100%);
+  /* background: linear-gradient(to bottom, #00C775 -40%, #F0F5F5 40%,#F0F5F5 100%); */
+/* background: linear-gradient(to bottom, #EAFFFA -40%, #EAFFFA 100%,#F0F5F5 100%); */
+background-color: #f9f9f9;
   box-sizing: border-box;
 overflow: hidden;
-padding: 0rpx 20rpx;
+/* padding: 0rpx 20rpx; */
 }
  .title{
    font-size: 36rpx;
@@ -27,8 +29,8 @@ box-sizing: border-box;
     margin-top: 40rpx;
   }
   .log_image{
-    width: 194rpx;
-    height: 262rpx;
+    width: 100%;
+    height: 462rpx;
   }
  .log_bottom{
 width: 100%;
@@ -108,44 +110,47 @@ margin-left: 20rpx;
  }
  .loginbotton{
    width: 100%;
-   position: fixed;
+   /* position: fixed;
    bottom: 200rpx;
-   left: 0rpx;
+   left: 0rpx; */
    display: flex;
    flex-direction: column;
    justify-content: center;
    align-items: center;
    box-sizing: border-box;
+   margin-top: 40rpx;
  }
  button{
   width: 90%;
   color: #fff;
-background-color: #0F80DC;
+background-color: #00C775;
  }
  .button_button{
    width: 90%;
    color: #fff;
- background-color: #0F80DC;
+ background-color: #00C775;
  /* background-color: rgba(15,128,220, 0.3);  */
   }
 .agreement{
   margin-top: 20rpx;
   display: flex;
-  align-items: center;
+  flex-wrap: wrap;
   font-size: 28rpx;
+  box-sizing: border-box;
 }
 .agreement_color{
-  color:#0F80DC;
+  color:#00C775;
   margin:0rpx 6rpx;
 }
+ 
 .t-radio__icon-dot::after{
-  background: var(--td-radio-icon-checked-color, var(--td-brand-color, var(--td-primary-color-7, #0F80DC))) !important;
+  background: var(--td-radio-icon-checked-color, var(--td-brand-color, var(--td-primary-color-7, #00C775))) !important;
 }
 .t-radio__icon--checked {
-  color: var(--td-radio-icon-checked-color, var(--td-brand-color, var(--td-primary-color-7, #0F80DC))) !important;
+  color: var(--td-radio-icon-checked-color, var(--td-brand-color, var(--td-primary-color-7, #00C775))) !important;
 }
 .t-radio__icon-dot{
-  border: 3px solid var(--td-radio-icon-checked-color, var(--td-brand-color, var(--td-primary-color-7, #0F80DC))) !important;
+  border: 3px solid var(--td-radio-icon-checked-color, var(--td-brand-color, var(--td-primary-color-7, #00C775))) !important;
 }
 .t-radio--block{
   padding: var(--td-radio-vertical-padding, 0rpx) !important;

package-user/pages/slide-confirm/index.js

@@ -0,0 +1,105 @@
+Component({
+  properties: {
+    width: {
+      type: Number,
+      value: 300
+    },
+    height: {
+      type: Number,
+      value: 80
+    },
+    blockSize: {
+      type: Number,
+      value: 76
+    },
+    defaultText: {
+      type: String,
+      value: "向右滑动完成验证"
+    },
+    successText: {
+      type: String,
+      value: "验证通过"
+    },
+    iconSize: {
+      type: Number,
+      value: 24
+    }
+  },
+
+  data: {
+    position: 0,          // 滑块位置
+    progressWidth: 0,     // 已滑动宽度
+    startX: 0,            // 触摸起始X坐标
+    isMoving: false,      // 是否正在滑动
+    isSuccess: false      // 是否验证成功
+  },
+
+  methods: {
+    // 触摸开始
+    onTouchStart(e) {
+      if (this.data.isSuccess) return;
+      
+      this.setData({
+        startX: e.touches[0].clientX,
+        isMoving: true
+      });
+    },
+
+    // 触摸移动
+    onTouchMove(e) {
+      if (!this.data.isMoving || this.data.isSuccess) return;
+      
+      const moveX = e.touches[0].clientX;
+      let position = moveX - this.data.startX;
+      
+      // 限制滑块范围
+      if (position < 0) position = 0;
+      const maxPosition = this.data.width - this.data.blockSize;
+      if (position > maxPosition) position = maxPosition;
+      
+      this.setData({
+        position,
+        progressWidth: position + this.data.blockSize  // 进度宽度 = 滑块位置 + 滑块宽度
+      });
+    },
+
+    // 触摸结束
+    onTouchEnd() {
+      if (!this.data.isMoving || this.data.isSuccess) return;
+      
+      this.setData({ isMoving: false });
+      
+      // 判断是否滑动到终点
+      const maxPosition = this.data.width - this.data.blockSize;
+      if (this.data.position >= maxPosition * 0.95) {
+        // 验证成功
+        this.setData({
+          position: maxPosition,
+          progressWidth: this.data.width,
+          isSuccess: true
+        });
+        // 触发成功事件
+        this.triggerEvent('success');
+      } else {
+        // 滑动不足，重置
+        this.setData({
+          position: 0,
+          progressWidth: 0
+        });
+      }
+    },
+
+    // 重置滑块
+    reset() {
+      this.setData({
+        position: 0,
+        progressWidth: 0,
+        isSuccess: false
+      });
+    }
+  }
+});
+
+// box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1) inset;
+
+// transition: background-color 0.3s;

package-user/pages/slide-confirm/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

package-user/pages/slide-confirm/index.wxml

@@ -0,0 +1,27 @@
+<view class="slide-container {{isSuccess ? 'success' : ''}}" style="width: {{width}}px; height: {{height}}px;">
+  <!-- 已滑动区域（用于显示颜色变化） -->
+  <view 
+    class="slide-progress" 
+    style="width: {{progressWidth}}px; height: {{height}}px;"
+  ></view>
+  
+  <!-- 背景轨道 -->
+  <view class="slide-track">
+    <text class="track-text">{{isSuccess ? successText : defaultText}}</text>
+  </view>
+  
+  <!-- 滑块 -->
+  <view 
+    class="slide-block"
+    style="left: {{position}}px; width: {{blockSize}}px; height: {{blockSize}}px;"
+    bindtouchstart="onTouchStart"
+    bindtouchmove="onTouchMove"
+    bindtouchend="onTouchEnd"
+  >
+    <icon 
+      class="block-icon" 
+      type="{{isSuccess ? 'success' : 'arrowright'}}" 
+      size="{{iconSize}}"
+    ></icon>
+  </view>
+</view>

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

@@ -0,0 +1,64 @@
+.slide-container {
+  position: relative;
+  overflow: hidden;
+  border-radius: 40px;
+  background-color: #f5f5f5;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+/* 已滑动区域样式 */
+.slide-progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: #29e77c; /* 滑动过的区域颜色 */
+  z-index: 1;
+  transition: background-color 0.3s ease;
+}
+
+/* 成功状态下的滑动区域颜色 */
+.slide-container.success .slide-progress {
+  background-color: #00c775; /* 验证成功后的颜色 */
+}
+
+.slide-track {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 2;
+}
+
+.track-text {
+  font-size: 14px;
+  color: #666;
+}
+
+.slide-container.success .track-text {
+  color: #fff;
+}
+
+.slide-block {
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  border-radius: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
+  z-index: 3;
+  touch-action: none;
+}
+
+.block-icon {
+  color: #00c775;
+}
+
+
+
+/* eaffea */
+
+/* 52c41a */

pages/malfunction/index.js → package-user/pages/userlist/index.js

@@ -1,26 +1,45 @@
-// pages/malfunction/index.js
+// pages/userlist/index.js
+const api = require('../../../api/index.js');
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+  userdata:[]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
-  },
-  toconfigure(e){
-    console.log(e.currentTarget.dataset.name);
- wx.navigateTo({
-   url: `/pages/workorder/index?name=${e.currentTarget.dataset.name}`,
- })
-  },
-  
+ this.getuser()
+  },  
+getuser(){
+  let data ={
+    operationId:'',
+    operationname:'',
+    operationphone:'',
+    addressId:''
+  }
+  api.request(`/syscustomer/selectcustomer`, 'post',data,{ isPublic: false })
+  .then((data) => {
+console.log(data.data);
+if (data.code==200) {
+  this.setData({
+    userdata:data.data
+  })
+}
+//  wx.navigateTo({
+//   url: '/pages/map/index',
+// })
+  })
+  .catch((err) => {
+ 
+    console.error('请求失败：', err);
+  });
+},
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

package-user/pages/userlist/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "用户列表",
+  "usingComponents": {}
+}

package-user/pages/userlist/index.wxml

@@ -0,0 +1,12 @@
+<!--pages/userlist/index.wxml-->
+<view class="setup">
+  <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>
+      <!-- <button class="cancel-btn" bindtap="cancelOrder">去查看</button> -->
+    </view>
+</view>

package-user/pages/userlist/index.wxss

@@ -0,0 +1,59 @@
+/* pages/userlist/index.wxss */
+page{
+  width: 100%;
+  height: 100vh;
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
+  padding: 0rpx 22rpx;
+  box-sizing: border-box;
+
+}
+.driver-info {
+  background-color: white;
+  border-radius: 16rpx;
+  padding: 20rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  margin-top: 26rpx;
+}
+
+.driver-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+}
+
+.driver-details {
+  margin-left: 24rpx;
+  flex: 1;
+}
+
+.driver-name {
+  font-size: 32rpx;
+  font-weight: bold;
+}
+.driver-car {
+  font-size: 28rpx;
+  color: #999999;
+  margin-top: 8rpx;
+}
+
+.driver-arrive {
+  font-size: 28rpx;
+  /* color: #2C85FF; */
+  /* color: #666; */
+  color: #999999;
+
+  margin-top: 8rpx;
+}
+
+.cancel-btn {
+  width: 160rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  font-size: 28rpx;
+  color: #FF5252;
+  border: 1rpx solid #FF5252;
+  background-color: white;
+  border-radius: 32rpx;
+}

pages/device/index.js

@@ -1,147 +0,0 @@
-// pages/device/index.js
-const api = require('../../api/index.js');
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    devicedata:[],
-    latitude:'',
-    longitude:'',
-    accuracy:'',
-    array:['南山','临平','其他'],
-    index:0
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-this.getdevice()
-  },
-  getdevice(){
-    let data = {
-    }
-    api.request(`/device/selectdevice`, 'POST',data)
-    .then((res) => {
-      console.log(res);
-      if (res.code==200) {
-       
-                      for (let index = 0; index < res.data.length; index++) {
-                        if (res.data[index].devicesLatitudelongitude) {
-          
-                          res.data[index].devicesLatitudelongitude=res.data[index].devicesLatitudelongitude.split(",")
-                        }
-                      }
-        this.setData({
-          devicedata : res.data
-        })
-      }
-  
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况
-    });
-  },
-  // 设置当前经纬度
-    // 提取获取位置的具体逻辑
-    getLocation(e) {
-      console.log(e.target.dataset.id);
-      const that = this;
-      wx.getLocation({
-        type: 'wgs84',
-        isHighAccuracy:true,
-        success: (res) => {
-          console.log('位置获取成功:', res);
-          that.setData({
-            latitude: res.latitude,
-            longitude: res.longitude,
-            accuracy:res.accuracy
-          });
-          console.log(this.data.latitude);
-          console.log(this.data.longitude);
-          that.getpositioning(res.longitude,res.latitude,e.target.dataset.id);
-        },
-        fail: (err) => {
-          console.error('获取位置失败:', err);
-          wx.showToast({
-            title: '获取位置失败，请重试',
-            icon: 'none'
-          });
-        }
-      })},
-      getpositioning(latitude,longitude,id){
-        let data = {
-          deviceId:id,
-          latitudelongitude:latitude+','+longitude
-        }
-        api.request(`/device/updatelatit`, 'POST',data)
-        .then((res) => {
-          console.log(res);
-          if (res.code==200) {
-            wx.showToast({
-              title: '位置获取成功',
-              icon: 'none'
-            });
-this.getdevice()
-          
-          }
-      
-        })
-        .catch((err) => {
-          console.error('请求失败：', err);
-          // 在这里处理请求失败的情况
-        });
-      },
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/device/index.wxml

@@ -1,39 +0,0 @@
-<!--pages/device/index.wxml-->
-<view class="device">
-<!-- <view class="equipment">
-  <picker bindcolumnchange="bindcolumn" bindchange="bindeventChange" value="{{index}}" range="{{array}}">
-					<view class="calculation_top">
-						<view class="calculation_left">
-             选择电站：
-						</view>
-            <view class="event">
-						<view class="uni-input">{{array[index]}}</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-</view> -->
-<view class="device_box" wx:for="{{devicedata}}" wx:key="index">
-<view class="device_and">
-<view>
-<text class="device_color">资产编码：</text> {{item.deviceId}}
-</view>
-
-<!-- <view class="device_latitude" data-id="{{item.deviceId}}" bind:tap="getLocation" wx:if="{{item.devicesLatitudelongitude.length==0||item.devicesLatitudelongitude==null}}">获取当前经纬度</view> -->
-<!-- <view>{{accuracy}}</view>
-<view class="device_latitude" data-id="{{item.deviceId}}" bind:tap="getLocation">获取当前经纬度</view> -->
-</view>
-<view class="device_content">
-<text class="device_color">资产名称：</text> {{item.devicesName}}</view>
-<view class="device_content">
-<text class="device_color">设备所属：</text> {{item.powerstationName}} > {{item.regionName}}
-</view>
-<view class="device_content"><text class="device_color">经度：</text> {{item.devicesLatitudelongitude[0]||'--'}}</view>
-<view class="device_content"><text class="device_color">纬度：</text> {{item.devicesLatitudelongitude[1]||'--'}}</view>
-<view class="device_content">
-<text class="device_color">设备地址：</text> {{item.devicesAddress}}
-</view>
-</view>
-
-
-</view>

pages/device/index.wxss

@@ -1,48 +0,0 @@
-/* pages/device/index.wxss */
-page{
-  background-color: #f7f7f7;
-  box-sizing: border-box;
-}
-.device{
-  width: 100%;
-  height: 100%;
-padding: 10rpx 20rpx 20rpx 20rpx;
-box-sizing: border-box;
-}
-.device_box{
-  width: 100%;
-  background-color: #ffffff;
-  border-radius: 10rpx;
-  padding: 20rpx;
-  box-sizing: border-box;
-  margin-top: 20rpx;
-}
-.device_content{
-margin-top: 20rpx;
-}
-.device_color{
-  color: #cccccc;
-}
-.device_and{
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.device_latitude{
- padding: 10rpx 20rpx;
-display: flex;
-align-items: center;
-justify-content: center;
-box-sizing: border-box;
-color: #ffffff;
-background-color: #0F80DC;
-border-radius: 10rpx;
-}
-.equipment{
-  padding: 20rpx;
-background-color: #ffffff;
-border-radius: 10rpx;
-}
-.calculation_top{
-  display: flex;
-}

pages/equipment/index.js

@@ -0,0 +1,52 @@
+const api = require('../../api/index.js');
+Page({
+
+  data: {
+    tabsindex:"1",
+  },
+  onLoad() {
+  },
+  // 选项卡
+  onTabsChange(e){
+  console.log(e.detail.value);
+  this.setData({
+    tabsindex:e.detail.value
+  })
+  this.getvehicle()
+  },
+  getvehicle(){
+    let data ={
+      carId:'',
+      carType:'',
+      carMondel:'',
+    }
+    api.request(`/syscar/selectcarall`, 'post',data,{ isPublic: false })
+    .then((data) => {
+  console.log(data.data);
+  if (data.code==200) {
+    this.setData({
+      driver:data.data
+    })
+  }
+  //  wx.navigateTo({
+  //   url: '/pages/map/index',
+  // })
+    })
+    .catch((err) => {
+   
+      console.error('请求失败：', err);
+    });
+  },
+   
+  onShow() {
+    this.getvehicle()
+ 
+  },
+   /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+   onPullDownRefresh() {
+
+
+  }
+});

pages/equipment/index.json

@@ -0,0 +1,16 @@
+{
+  "navigationBarTitleText": "设备监控",
+  "usingComponents": {
+      "t-side-bar": "tdesign-miniprogram/side-bar/side-bar",
+      "t-side-bar-item": "tdesign-miniprogram/side-bar-item/side-bar-item",
+      "t-cell-group": "tdesign-miniprogram/cell-group/cell-group",
+      "t-cell": "tdesign-miniprogram/cell/cell",
+      "t-image": "tdesign-miniprogram/image/image",
+      "t-tabs": "tdesign-miniprogram/tabs/tabs",
+      "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+      "t-icon": "tdesign-miniprogram/icon/icon",
+      "t-popup": "tdesign-miniprogram/popup/popup",
+      "t-radio-group": "tdesign-miniprogram/radio-group/radio-group",
+      "t-radio": "tdesign-miniprogram/radio/radio"
+  }
+}

pages/equipment/index.wxml

@@ -0,0 +1,66 @@
+  <view class="workorder">
+  <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-tabs>
+<!-- <view bind:tap="onfilter">
+  <t-icon name="filter" size="50rpx" color="#585CE5" data-name="filter" />
+</view> -->
+</view>
+<view style="height: 100rpx;"></view>
+
+<view class="order">
+<view class="order_box">
+<view class="order_title">
+<view class="order_title1"> <image class="order_image" src="https://esos-iot.bjdexn.cn/myminio/project/cf5ff29715de46b88803cf802e81e1a9.png" mode="aspectFit"/> 浙C.78Z71</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>在线</view>
+</view>
+<!-- <view class="order_direction"><text class="order_text">方向：</text>
+<text style="color: #FDBA67;">放电</text>
+<text style="color: #00C775;">充电</text>
+</view> -->
+<view class="order_time">
+<view>
+<text class="order_text"> 方向：</text>
+<text style="color: #FDBA67;">放电</text>
+<text style="color: #00C775;">充电</text>
+</view>
+<view>
+  <view>
+<text class="order_text"> SOC：</text><text>--</text>
+</view>
+</view>
+
+</view>
+<view class="order_time">
+<view>
+<text class="order_text"> 电压：</text><text>--</text>
+</view>
+<view>
+  <view>
+<text class="order_text"> 液冷：</text><text>--</text>
+</view>
+</view>
+
+</view>
+<view class="order_time">
+<view>
+<text class="order_text">充电：</text> <text>--</text>
+</view>
+<view>
+<text class="order_text">放电：</text> <text>--</text>
+</view>
+</view>
+<view class="order_bottom">
+<view></view>
+<!-- <view class="order_view">查看详情</view> -->
+</view>
+</view>
+<view class="available" wx:if="{{true}}">
+<image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
+</view> 
+</view>
+<view style="height: 30rpx;"></view>
+<!---->

pages/equipment/index.wxss

@@ -0,0 +1,157 @@
+page {
+  background-color: var(--td-bg-color-container);
+  /* background-color: #f9f9f9; */
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
+
+}
+
+page .round-image {
+  border-radius: 12rpx;
+}
+
+.side-bar-wrapper {
+  display: flex;
+  height: 100vh;
+  overflow: hidden;
+
+  --td-grid-item-text-font-size: 24rpx;
+}
+
+.side-bar-wrapper .content {
+  flex: 1;
+  transition: transform 0.3s ease;
+}
+
+.side-bar-wrapper .section {
+  padding: 32rpx 0;
+  box-sizing: border-box;
+  height: 100%;
+}
+
+.side-bar-wrapper .title {
+  padding-left: 40rpx;
+  margin-bottom: 8rpx;
+  font-size: 28rpx;
+  line-height: 44rpx;
+  color: var(--td-text-color-primary);
+}
+
+.side-bar-wrapper .image {
+  width: 96rpx;
+  height: 96rpx;
+
+  position: relative;
+}
+
+.side-bar-wrapper .cell {
+  margin-right: 32rpx !important;
+}
+
+.side-bar-wrapper .image::before {
+  content: ' ';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 200%;
+  height: 200%;
+  border-radius: 24rpx;
+  border: 2rpx solid var(--td-gray-color-4);
+  transform-origin: 0 0;
+  transform: scale(0.5);
+}
+.t-cell__title-text{
+  font-size: 22rpx;
+}
+.t-class-title{
+  font-size: 22rpx;
+}
+.t-cell__description-text{
+  font-size: 24rpx;
+}
+.t-image{
+  padding: 20rpx;
+  background-color: #f5f5f5;
+box-sizing: border-box;
+}
+.calculation{
+  width: 100%;
+  height: 100rpx;
+}
+/*  */
+.workorder{
+  width: 100%;
+  padding: 0rpx 40rpx 0rpx 20rpx;
+  position: fixed;
+  top: 0rpx;
+  left: 0rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: #ffffff;
+  box-sizing: border-box;
+}
+.order{
+
+padding: 0rpx 20rpx;
+
+}
+.order_box{
+  width: 100%;
+  background-color: #ffffff;
+padding: 20rpx 20rpx;
+box-sizing: border-box;
+  margin-top: 20rpx;
+  border-radius: 10rpx;
+  /* box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1); */
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+
+}
+.order_title{
+  padding-bottom:12rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1rpx solid #cccccc;
+}
+.order_title1{
+display: flex;
+align-items: center;
+}
+.order_image {
+  width: 60rpx;
+  height: 60rpx;
+  margin-right: 20rpx;
+}
+.order_direction{
+  margin-top: 40rpx;
+
+}
+.order_text{
+  color: #cccccc;
+}
+.order_address{
+margin-top: 20rpx;
+}
+.order_time{
+margin-top: 20rpx;
+padding: 0rpx 20rpx;
+display: flex;
+justify-content: space-between;
+}
+.order_bottom{
+  display: flex;
+  align-items: center;
+  justify-content:space-between;
+}
+.order_view{
+margin-top: 20rpx;
+padding: 10rpx 20rpx;
+color: #ffffff;
+font-weight: 500;
+display: flex;
+align-items: center;
+justify-content: center;
+text-align: right;
+border-radius:50rpx;
+background-color: #00C775;
+}

pages/index/index.js

@@ -1,241 +1,377 @@
-// pages/privacy/index.js
 const api = require('../../api/index.js');
 
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
-    // 状态栏高度
- statusBarHeight:'',
- // 导航栏高度
- navBarHeight:'',
- // 导航栏和状态栏高度
- navStatusBarHeight: '',
- // 胶囊
- menu:'',
- workorder:[],
- reviewdata:[]
-  },
+    // 地图初始中心坐标（北京市中心）
+    longitude: 116.404,
+    latitude: 39.915,
+    scale:10,
+    markers: [],
+    polyline: [],
+    startLocation: {},
+    endLocation: {},
+    showTripInfo: true,
+    showCallButton: true,
+    showDriverInfo: true,
+    carsNearby: 0,
+    // 司机信息
+    driverAvatar: 'https://esos-iot.bjdexn.cn/myminio/project/2a1b32553c3d4ef992bc797d26cf1614.png',
+    driverName: '王师傅',
+    carNumber: '京A88888',
+    estimatedArrival: 5,
+    locationTimer: null,
+    isTracking: false,
+    userdata:[]
+  },  
+// 收益统计
+  onLoad() {
+    // 初始化地图
+this.getuser()
+this.initMap()
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
- this.getuser()
- this.getShowScreenHeight()
-this.setData({
-  statusBarHeight:wx.getStorageSync('statusBarHeight'),
-  navBarHeight: wx.getStorageSync('navBarHeight'),
-  navStatusBarHeight:wx.getStorageSync('navStatusBarHeight'),
-  menu:wx.getStorageSync('menu')
-})
   },
-  getShowScreenHeight(){
-    //系统信息
-    const systemInfo = wx.getWindowInfo()
-    //胶囊位置
-    const capsuleInfo = wx.getMenuButtonBoundingClientRect()
-    //计算导航栏高度
-    let navHeight = systemInfo.statusBarHeight + capsuleInfo.height + (capsuleInfo.top - systemInfo.statusBarHeight) * 2
-    //计算tabbar高度    
-    let tabHeight = systemInfo.safeArea.bottom - systemInfo.safeArea.height
-    //计算可现实内容高度（中间区域）
-    // let screenHeight = systemInfo.screenHeight-navHeight-tabHeight-30
-
-
-  const menu =  wx.getMenuButtonBoundingClientRect()
-  wx.setStorageSync('menu', menu)
-    // 手机系统状态栏高度
-    wx.setStorageSync('statusBarHeight', tabHeight)
-   // 导航栏高度
-   wx.setStorageSync('navBarHeight', menu.height+(menu.top-systemInfo.statusBarHeight) *2 )
-  
-   // 状态栏加导航栏
-
-   wx.setStorageSync('navStatusBarHeight',navHeight)
+getuser(){
  
-  },
-  getuser(){
-    api.request(`/partner/selectinformation`, 'POST',{})
-    .then((res) => {
-                 // 设置数据到本地存储
-                 wx.setStorage({
-                  key: 'partnerPosition',  // 存储的key值
-                  data:res.data,
-                  success: function(ress) {
-                
-                    // wx.getStorageSync('token');
-                  }
-                });
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况
-    });
-  },
-  getworkoder(){
-    let data = {
-      workorderType:''
+  api.request(`/sysoperation/selectoperationid`, 'post',{ isPublic: false })
+  .then((data) => {
+    console.log(data.data);
+    if (data.code==200) {
+               // 设置数据到本地存储
+wx.setStorage({
+  key: 'user',  // 存储的key值
+  data:data.data
+});
+   
     }
-    api.request(`/workoder/statistics`, 'POST',data)
-    .then((res) => {
-      console.log(res);
-      this.setData({
-        workorder:res.data
-      })
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况
+  })
+  .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,
+          startLocation: {
+            longitude,
+            latitude,
+            name: '我的位置'
+          },
+          // 添加起点标记
+          markers: [{
+            id: 0,
+            longitude,
+            latitude,
+            iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/a0d245bf00c6493d949c3be82a6d2b98.png',
+            width: 40,
+            height: 40,
+            anchor: {x: 0.5, y: 1}
+          }]
+        });
+        
+        // 逆地址解析，获取位置名称
+        that.reverseGeocoder(longitude, latitude, 'start');
+         // 加载附近车辆数据
+         that.getloadNearbyCars();
+
+      },
+      fail() {
+        wx.showToast({
+          title: '无法获取位置，请检查权限',
+          icon: 'none'
+        });
+      }
     });
   },
-  getreview(){
-    let data = {
-      workorderName:'',
-      workorderType:'',
-      workorderAddress:'',
-      starttime:'',
-      type:'',
-      examineType:5
-    }
-    api.request(`/workoder/selectworkoder`, 'POST',data)
-    .then((res) => {
-      console.log(res);
-      this.setData({
-        reviewdata:res.data
-      })
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况
+
+  // 逆地址解析，将经纬度转换为地址名称
+  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'
+        });
+      }
     });
   },
-  rolelocate(e){
-    console.log(e.currentTarget.dataset.index);
-    if (e.currentTarget.dataset.index==1) {
- if (wx.getStorageSync('partnerPosition').partnerPosition==1) {
-  wx.showToast({
-    title: '暂无权限',
-    icon: 'none'
-  });
-    return
- }
-      wx.navigateTo({
-        url: '/pages/malfunction/index',
-      })   
-    }else if(e.currentTarget.dataset.index==2){
-      wx.navigateTo({
-        url: '/pages/statistics/index',
-      })   
-    }else if(e.currentTarget.dataset.index==3){
-      wx.navigateTo({
-        url: '/pages/device/index',
-      })   
-    }else if(e.currentTarget.dataset.index==4){
-      wx.navigateTo({
-        url: '/pages/scheduling/index',
-      })  
-    }
-  
-  },
-  ondetails(e){
-    console.log(e.currentTarget.dataset.id);
+  // 预约叫车
+  onelectricity(){
 wx.navigateTo({
-  url: `/pages/workorderdetails/index?id=${e.currentTarget.dataset.id}&workorderId=${e.currentTarget.dataset.workorderid}`,
+  url: '/package-order/pages/createorder/index',
 })
   },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
+  // 更新地图标记和路线
+  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;
   },
 
-  /**
-   * 生命周期函数--监听页面显示 
-   */
-  onShow() {
-    let _this = this
-          _this.authorizationbtn()
-          _this.getworkoder()
-          _this.getreview()
-    // wx.getSetting({
-    //   withSubscriptions: true,
-    //   success (res) {
-    //     console.log(res.authSetting)
-    //     if (res.authSetting['scope.subscribeMessage']) {
-    //     }else{
-    //       wx.showModal({
-    //         title: '',
-    //         content: '检测到您没有开启工单服务通知的权限，是否开启',
-    //         success (res) {
-    //           if (res.confirm) {
-    //             console.log('用户点击确定')
-    //       _this.authorizationbtn()
+  // 角度转弧度
+  deg2rad(deg) {
+    return deg * (Math.PI/180);
+  },
 
-    //           } else if (res.cancel) {
-    //             console.log('用户点击取消')
-    //           }
-    //         }
-    //       })
-    //     }
-    //   }
-    // })
-// 
+  // 地图区域变化时触发
+  onRegionChange(e) {
+    // 可以在这里处理地图移动后的逻辑，如重新加载附近车辆
+    if (e.type === 'end' && e.causedBy === 'drag') {
+      // this.loadNearbyCars();
+    }
+  },
+  onHide() {
+    // 页面卸载时停止追踪
+    this.stopTracking();
+  },
+  
+ // 停止追踪
+ stopTracking() {
+  if (this.data.locationTimer) {
+    clearInterval(this.data.locationTimer);
+    this.setData({ 
+      locationTimer: null,
+      isTracking: false 
+    });
+  }
 
+},
+  // 加载附近车辆
+  getloadNearbyCars() {
+    const that = this;
    
-  },
-  authorizationbtn(){
-   wx.requestSubscribeMessage({
-      tmplIds: ['G_37RkJ_mwZeTdPv5A0fjBlYW6_lRQIW9_SywmUAX7Q','AhToqLaCeOvSvSSQ7RvZYd2WgGA11Da13j1PMvqcGqQ'],
-      success(res) {
-        console.log(res);
-      if(res['AhToqLaCeOvSvSSQ7RvZYd2WgGA11Da13j1PMvqcGqQ'] === 'accept' && res['G_37RkJ_mwZeTdPv5A0fjBlYW6_lRQIW9_SywmUAX7Q'] === 'accept') {
-      // 用户同意订阅
-      }
+        let data ={
+          carId:'',
+          carType:'',
+          carMondel:'',
+        }
+        api.request(`/syscar/selectcarall`, 'post',data,{ isPublic: false })
+        .then((data) => {
+      if (data.code==200) {
+        const cars = [];
+         for (let index = 0; index < data.data.length; index++) {
+         let carPosition = data.data[index].carPosition.split(",");
+                   cars.push({
+            id: 100+index,
+            longitude: carPosition[1],
+            latitude: carPosition[0],
+            iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/f6fba6c83b2d4864a73f5f1d83cda416.png',
+            width: 30,
+            height: 40,
+            anchor: {x: 0.5, y: 0.5}
+          });   
+         }
+         // 将车辆标记添加到现有标记中
+         const updatedMarkers = [...that.data.markers];
+         // 先移除之前的车辆标记
+         const filteredMarkers = updatedMarkers.filter(marker => marker.id);
+         // 添加新的车辆标记
+         filteredMarkers.push(...cars);
+         
+         that.setData({
+           markers: filteredMarkers,
+           carsNearby: data.data.length
+         });
+        //  this.loadNearbyCars()
       }
-      })
+      
+        })
+        .catch((err) => {
+       
+          console.error('请求失败：', err);
+        });
+    
+ 
   },
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
+  // 加载附近车辆
+  loadNearbyCars() {
+    const { longitude, latitude } = this.data;
+ 
+    if (this.data.isTracking) return;
+    
+    const that = this;
+    this.setData({ isTracking: true });
+    this.setData({
+      locationTimer:setInterval(() => {
+        let data ={
+          carId:'',
+          carType:'',
+          carMondel:'',
+        }
+        api.request(`/syscar/selectcarall`, 'post',data,{ isPublic: false })
+        .then((data) => {
+      if (data.code==200) {
+        const cars = [];
+         for (let index = 0; index < data.data.length; index++) {
+         let carPosition = data.data[index].carPosition.split(",");
+                   cars.push({
+            id: 100+index,
+            longitude: carPosition[1],
+            latitude: carPosition[0],
+            iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/f6fba6c83b2d4864a73f5f1d83cda416.png',
+            width: 30,
+            height: 40,
+            anchor: {x: 0.5, y: 0.5}
+          });   
+         }
+         // 将车辆标记添加到现有标记中
+         const updatedMarkers = [...that.data.markers];
+         // 先移除之前的车辆标记
+         const filteredMarkers = updatedMarkers.filter(marker => marker.id);
+         // 添加新的车辆标记
+         filteredMarkers.push(...cars);
+         
+         that.setData({
+           markers: filteredMarkers,
+           carsNearby: data.data.length
+         });
+      }
+      
+        })
+        .catch((err) => {
+       
+          console.error('请求失败：', err);
+        });
+      }, 10000)  // 每10秒更新一次位置
+    })
+    
+ 
   },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
+  // 取消订单
+  positioning(){
+    this.initMap()
 
   },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  async onPullDownRefresh() {
-    console.log(11111111);
-    let _this = this
-    // _this.authorizationbtn()
-    await _this.getworkoder()
-    await _this.getreview()
-    wx.stopPullDownRefresh();
+  cancelOrder() {
+    // 移除司机标记
+    // const updatedMarkers = this.data.markers.filter(marker => marker.id !== 999);
+    
+    // this.setData({
+    //   showDriverInfo: false,
+    //   showCallButton: true,
+    //   markers: updatedMarkers
+    // });
   },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-    console.log(11111111);
-
+  onShow() {
+     this.loadNearbyCars()
   },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})
+});

pages/index/index.json

@@ -1,11 +1,9 @@
 {
-  "navigationBarTitleText": "首页",
+  "navigationBarTitleText": "晟能能源",
+  "navigationBarBackgroundColor": "#2C85FF",
+  "enablePullDownRefresh": false,
   "navigationStyle": "custom",
-  "enablePullDownRefresh": true,
-  "backgroundColor": "#B7D7CB",
-
   "usingComponents": {
-    "t-icon": "tdesign-miniprogram/icon/icon",
-    "t-popup": "tdesign-miniprogram/popup/popup"
-  } 
-}
+    "t-icon": "tdesign-miniprogram/icon/icon"
+    }
+}

pages/index/index.wxml

@@ -1,107 +1,93 @@
-<!-- echarts -->
 <view class="container">
-  <view class="navigation-container" style="{{'height: ' + navStatusBarHeight +'px'}}">
-  <!--空白来占位状态栏-->
-  <view style="{{'height: ' + statusBarHeight +'px'}}"></view>
-  <!--自定义导航栏 -->
-  <view class="navigation-bar" style="{{'height:' + navBarHeight +'px'}}">
-    晟运储能
-  </view>
-</view>
-<view class="home">
-<view style="height: 20rpx;"></view>
-<view style="{{'height: ' + navStatusBarHeight +'px'}}"></view>
-<view class="statistics" data-index="2" bind:tap="rolelocate">
-<view class="statistics_top">
-<view class="statistics_1">
-<view class="statistics_digit">{{workorder.allcount}}</view>
-<view class="statistics_title">全部工单</view>
-</view>
-<view class="statistics_1">
-<view class="statistics_digit">{{workorder.incompletecount}}</view>
-<view class="statistics_title">全部待办</view>
-</view>
-<view class="statistics_1">
-  <view class="statistics_digit">{{workorder.completecount}}</view>
-<view class="statistics_title">全部办结</view>
-</view>
-</view>
-<view style="height: 20rpx;"></view>
-<view class="statistics_top">
-<view class="statistics_1">
-<view class="statistics_digit">{{workorder.myworkodercount}}</view>
-<view class="statistics_title">我的工单</view>
-</view>
-<view class="statistics_1">
-<view class="statistics_digit">{{workorder.myworkodertodo}}</view>
-<view class="statistics_title">我的待办</view>
-</view>
-<view class="statistics_1">
-  <view class="statistics_digit">{{workorder.myworkoderend}}</view>
-<view class="statistics_title">我的已办</view>
-</view>
-</view>
-</view>
-<view class="vajra">
-<view class="vajra_role" data-index="1" bind:tap="rolelocate">
-<image class="role" src="https://esos-iot.bjdexn.cn/myminio/project/e83bca83352e4da68afff3238258a49a.png" mode=""/>
-<view>
-创建工单
-</view> 
-</view>
-
-<view class="vajra_apply" data-index="2" bind:tap="rolelocate">
-  <image class="role" src="https://esos-iot.bjdexn.cn/myminio/project/f0de02ce78b14463b1824b35882d3ecf.png" mode=""/>
-<view>
-  工单统计 
-</view>
-</view>
-<view class="vajra_apply" data-index="3" bind:tap="rolelocate">
-  <image class="role" src="https://esos-iot.bjdexn.cn/myminio/project/31fc6a71019744e0bdcd3523afa8dc35.png" mode=""/>
-<view>
-  资产台账 
-</view>
-</view>
-<view class="vajra_rights" data-index="4" bind:tap="rolelocate">
-  <image class="role" src="https://esos-iot.bjdexn.cn/myminio/project/a76948bfa5094d4c90e2a4c5514481e1.png" mode=""/>
- <view>
-值工排班
- </view>
-</view>
-</view>
-<view class="examine">
-待审核
-</view>
-<view class="examine_box" wx:for="{{reviewdata}}" wx:key="index" data-id="{{item.id}}" data-workorderId="{{item.workorderId}}" bind:tap="ondetails">
-<view class="examine_title">
-<view class="examine_title0" wx:if="{{item.type==1}}">日常<text wx:if="{{item.workorderGrade==1}}"> 低</text><text wx:if="{{item.workorderGrade==2}}"> 中</text><text wx:if="{{item.workorderGrade==3}}"> 高</text></view>
-<view class="examine_title01" wx:if="{{item.type==2}}">故障 / <text wx:if="{{item.workorderGrade==1}}"> 低</text><text wx:if="{{item.workorderGrade==2}}"> 中</text><text wx:if="{{item.workorderGrade==3}}"> 高</text>
-</view>
-<view class="examine_title02" wx:if="{{item.type==3}}">其他<text wx:if="{{item.workorderGrade==1}}"> 低</text><text wx:if="{{item.workorderGrade==2}}"> 中</text><text wx:if="{{item.workorderGrade==3}}"> 高</text></view>
-<view class="examine_title1">{{item.workorderName}}</view>
-<!-- <view class="examine_title2" wx:if="{{item.examineType==4}}">待审核</view> -->
-<view class="examine_title2" wx:if="{{item.examineType==5}}">待审核</view>
-<view class="examine_title2" wx:if="{{item.examineType==6}}">审核完成</view>
-<view class="examine_title2" wx:if="{{item.examineType==7}}">审核失败</view>
-</view>
-<view class="examine_content">
-<view>描述：{{item.workorderContent}}</view>
-<view class="feedback examine_name" wx:if="{{item.examineType==7}}">退回原因：{{item.workoderReason}}</view>
-<view class="feedback examine_name" wx:if="{{item.examineCount!=0&&item.examineType!=7}}">退回原因：{{item.lastfail||'无'}}</view>
-</view>
-<view class="examine_bottom">
- <view> <text>发起人:</text>{{item.workorderPromoter}}</view>
- <view>发起时间：{{item.workorderStarttime}}</view>
-</view>
-<!-- <view class="examine_button">
-<view class="examine_buttonleft">通过</view>
-<view class="examine_buttonright">不通过</view>
-</view> -->
-</view>
-<view class="available" wx:if="{{reviewdata.length==0}}">
+  <!-- 地图组件 -->
+  <map 
+    id="map"
+    class="map"
+    longitude="{{longitude}}"
+    latitude="{{latitude}}"
+    scale="{{scale}}"
+    markers="{{markers}}"
+    polyline="{{polyline}}"
+    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="driver-info" wx:if="{{showDriverInfo}}">
+      <image src="{{driverAvatar}}" class="driver-avatar"></image>
+      <view class="driver-details">
+        <view class="driver-name">司机 {{driverName}}</view>
+        <view class="driver-car">车牌号: {{carNumber}}</view>
+        <view class="driver-arrive">预计{{estimatedArrival}}分钟后到达</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>
+      </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>
+      </view>
+      <button class="cancel-btn" bindtap="cancelOrder">去查看</button>
+    </view> --> 
+    <!-- <view class="available" wx:if="{{true}}">
 <image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
+</view> -->
+       <!--  -->
+       <button class="call-btn" bindtap="onelectricity" wx:if="{{showCallButton}}">
+      <text class="call-btn_left_electricity">预约</text>
+    </button>
+  </view>
+  
+  <!-- 附近车辆--数量提示 -->
+  <view class="cars-nearby" wx:if="{{carsNearby > 0}}">
+    <view class="cars-icon">
+      <text class="iconfont icon-car"></text>
+    </view>
+    <view class="cars-count">附近有 {{carsNearby}} 辆车</view>
+  </view>
 </view>
-<view style="height: 20rpx;"> </view>
-</view>
+<view class="positioning" bind:tap="positioning">
+  <t-icon name="focus" size="40rpx" data-name="focus" bind:tap="onIconTap" />
 
-</view> 
+</view>

pages/index/index.wxss

@@ -1,346 +1,185 @@
-/*  */
-.navigation-container {
-  position: fixed;
+.container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.map {
   width: 100%;
-  z-index: 99;
-  background-color: #89bfea;
+  height: 1100rpx;
 }
-.navigation-bar {
-  position: relative;
+
+.bottom-panel {
+  /* position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0; */
   width: 100%;
-  display: flex;
-  align-items: center;
-  /* justify-content: center; */
-  font-size: 36rpx;
-  padding-left: 40rpx;
-  flex-direction: row;
-  color: #fff;
+  padding: 16rpx;
+  box-sizing: border-box;
 }
-.title_1{
-  font-weight: 500;
-  font-size: 28rpx;
+
+.trip-card {
+  background-color: white;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+}
+
+.location-item {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
+  margin-bottom: 24rpx;
 }
-.title_image{
+
+.location-icon {
+  margin-right: 16rpx;
+  margin-top: 8rpx;
+}
+
+.start-icon .icon-circle {
   width: 24rpx;
   height: 24rpx;
-  margin-left: 10rpx;
-  transition: transform 3s ease; /* 添加过渡效果 */
+  border-radius: 50%;
+  background-color: #666;
 }
 
-.title_2{
-  font-size: 28rpx;
-  margin-top: 30rpx;
+.end-icon .icon-marker {
+  width: 24rpx;
+  height: 24rpx;
+  background-color: #2C85FF;
+  clip-path: polygon(50% 0%, 100% 50%, 50% 100%, 0% 50%);
 }
-.nav-title {
-  height: 100%;
+
+.location-input input {
+  font-size: 32rpx;
+  color: #333;
+  width: 560rpx;
+}
+
+.trip-info {
+  margin-top: 16rpx;
+  padding-top: 16rpx;
+  border-top: 1rpx solid #eee;
   display: flex;
- align-items: center;
-  margin-left: 20rpx;
-  box-sizing: border-box;
+  justify-content: space-between;
+  font-size: 28rpx;
+  color: #666;
 }
- 
-.nav-search {
-  position: absolute;
+/*  */
+.call-btn {
+    position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin-bottom: 24rpx;
+  background-color: #00C775;
+  color: white;
+  width: 90%;
+  height: 96rpx;
+  line-height: 96rpx;
+  font-size: 34rpx;
+  border-radius: 48rpx;
+  box-sizing: border-box;
   display: flex;
-  justify-content: flex-end;
-  align-items: center;
+  justify-content:space-around;
 }
-/* // */
-.container {
-  width: 100%;
-  min-height: 100%;
+.call-btn_left_electricity{
+width: 50%;
+ height: 100%;
+}
+.call-btn_right_electricity{
+  width: 50%;
+  height: 100%;
+  border-left: 4rpx solid #ffffff; 
+}
+.driver-info {
+  background-color: white;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
   display: flex;
   align-items: center;
-  /* 007544 */
- background: linear-gradient(to bottom, #0F80DC -40%, #F0F5F5 40%, #F0F5F5 100%);
- /* background: linear-gradient(to bottom, #007544 -40%, #F0F5F5 40%,#F0F5F5 100%); */
+  margin-top: 26rpx;
 }
-.home{
-  width: 100%;
-  padding: 20rpx 20rpx;
-  box-sizing: border-box;
+
+.driver-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
 }
-.statistics{
-  width: 100%;
-  padding: 0rpx 40rpx;
-  box-sizing: border-box;
+
+.driver-details {
+  margin-left: 24rpx;
+  flex: 1;
 }
-.statistics_top{
-  display: flex;
-  justify-content: space-between;
+
+.driver-name {
+  font-size: 32rpx;
+  font-weight: bold;
 }
-.statistics_1{
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
+
+.driver-car {
+  font-size: 28rpx;
+  color: #666;
+  margin-top: 8rpx;
 }
-.statistics_digit{
-  font-size: 48rpx;
+
+.driver-arrive {
+  font-size: 28rpx;
+  color: #2C85FF;
+  margin-top: 8rpx;
 }
-.statistics_title{
-  margin-top: 10rpx;
+
+.cancel-btn {
+  width: 160rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  font-size: 28rpx;
+  color: #FF5252;
+  border: 1rpx solid #FF5252;
+  background-color: white;
+  border-radius: 32rpx;
 }
-.vajra{
-  width: 100%;
-  padding: 16rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background-color: #fff;
-  box-sizing: border-box;
-  border-radius: 20rpx;
-  margin-top: 60rpx;
-  }
-  .vajra_role{
-    width: 22%;
-    padding: 20rpx 0rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    border-radius: 10rpx;
-    /* background-color: #ffffff; */
-  }
-  .vajra_rights{
-    width: 22%;
-    padding: 20rpx 0rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    border-radius: 10rpx;
-    /* background-color: #ffffff; */
-  }
-  .vajra_apply{
-    width: 22%;
-    padding: 20rpx 0rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    border-radius: 10rpx;
-    /* background-color: #ffffff; */
-  }
-  .role{
-    width: 120rpx;
-    height: 120rpx;
-    margin-bottom: 20rpx;
-    border-radius: 16rpx;
-    box-sizing: border-box;
-  }
-  .role_botton{
-    width: 60rpx;
-    height: 60rpx;
-    box-sizing: border-box;
-  }
-  .vajra_share{
-    width: 22%;
-    /* padding: 20rpx 0rpx; */
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    border-radius: 10rpx;
-    background-color: #ffffff;
-  }
-  .role_botton{
-    width: 60rpx;
-    height: 60rpx;
-    box-sizing: border-box;
-  }
-  button{
-    padding: 0rpx;
-    margin: 0rpx;
-    width: 100%;
-    height: 148rpx;
-  padding-top: 20rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-    font-size: 28rpx;
-    /* line-height: 130rpx; */
-    border:0rpx #f5f5f5  solid;
-  background-color: rgba(0, 0, 0, 0);
-  
-  }
-  wx-button:after {
-    display: flex;
-  flex-direction: column;
-    width: 100%;
-    height: 148rpx;
-  padding: 20rpx 0rpx;
-    font-size: 28rpx;
-    /* line-height: 130rpx; */
-    border:0rpx #f5f5f5  solid;
-  background-color: rgba(0, 0, 0, 0);
-  }  
- .examine{
-margin-top: 40rpx;
-font-size: 32rpx;
- }
- .examine_box{
-   width: 100%;
-   background-color: #fff;
-   padding: 30rpx 0rpx;
-margin-top: 20rpx;
-border-radius: 10rpx;
-box-sizing: border-box;
- }
- .examine_title{
-   width: 100%;
-   display: flex;
-   align-items: center;
-   padding: 0rpx 0rpx 0rpx 20rpx;
-   box-sizing: border-box;
- }
- .examine_title0{
-  width: 120rpx;
-  height: 40rpx;
-  font-size: 22rpx; 
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 30rpx;
-  /* background-color: #0F80DC; */
-  background-color: rgba(15, 128, 220, 0.2);
-  color: #0F80DC;
-  border: 1rpx solid #0F80DC;
-box-sizing: border-box;
 
- }
- .examine_title01{
-  width: 120rpx;
-  height: 40rpx;
-  font-size: 22rpx; 
+.cars-nearby {
+  position: absolute;
+  top: 104rpx;
+  left: 24rpx;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 32rpx;
+  padding: 12rpx 20rpx;
   display: flex;
   align-items: center;
-  justify-content: center;
-  border-radius: 30rpx;
-  /* background-color: #0F80DC; */
-  color:#ee8d60;
-  background-color: rgba(241, 120, 20, 0.2);
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
 
-  border: 1rpx solid #f39b72;
- box-sizing: border-box;
- }
- .examine_title02{
-  width: 120rpx;
-  height: 40rpx;
-  font-size: 22rpx; 
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 30rpx;
-  /* background-color: #0F80DC; */
-  color:#0F80DC;
-  background-color: rgba(15, 128, 220, 0.2);
-  /* color: #007544; */
-  border: 1rpx solid #0F80DC;
- box-sizing: border-box;
- }
- .examine_title1{
-   flex: 1;
-   font-weight: 600;
-   font-size: 32rpx;
-   display: flex;
-   align-items: center;
-   padding: 0rpx 10rpx;
-   overflow: hidden;
-  display: -webkit-box;
-  text-overflow: ellipsis;
-  box-orient: vertical;
-  -webkit-box-orient: vertical;
-  -moz-box-orient: vertical;
-  -o-box-orient: vertical;
-  -ms-box-orient: vertical;
-  line-clamp: 1; /* 超出2行显示省略号 */
-  -webkit-line-clamp: 1; /* 超出2行显示省略号 */
-   box-sizing: border-box;
- }
- .examine_title2{
-   width: 100rpx;
-   height: 40rpx;
-  font-size: 22rpx; 
-   display: flex;
-   align-items: center;
-   justify-content: center;
-border-top-left-radius:100rpx;
-border-bottom-left-radius:100rpx;
-   background-color: rgb(255, 0, 0,0.2);
-   color: red;
-   border: 1rpx solid red;
-   border-right: 0rpx solid red;
-box-sizing: border-box;
- }
- .examine_content{
-   flex: 1;
-   font-size: 24rpx;
-   padding: 20rpx 20rpx;
-   margin: 20rpx 20rpx;
-   color: #cccccc;
-   background-color: #f9f9f9;
-   border-radius: 8rpx;
-   box-sizing: border-box;
- }
- .feedback{
-  margin-top: 8rpx;
- }
- .examine_bottom{
-   display: flex;
- }
- .examine_bottom{
-   display: flex;
-   align-items: center;
-   justify-content: space-between;
-   padding: 0rpx 20rpx;
-box-sizing: border-box;
+.cars-icon {
+  color: #2C85FF;
+  margin-right: 12rpx;
+}
 
- }
- .examine_button{
-   width: 100%;
-   padding: 0rpx 20rpx;
-   margin-top: 30rpx;
-   display: flex;
-   align-items: center;
-   justify-content: space-between;
-   box-sizing: border-box;
+.cars-count {
+  font-size: 28rpx;
+  color: #333;
+}
 
- }
- .examine_buttonleft{
-   width: 160rpx;
-   height:60rpx;
-  border-radius: 12rpx;
+.icon-car {
+  font-size: 32rpx;
+}
+.available{
+  width: 100%;
+  height: 380rpx;
   display: flex;
   align-items: center;
   justify-content: center;
-   background-color: #0F80DC;
-color: #fff;
-box-sizing: border-box;
-
- }
- .examine_buttonright{
-   width:160rpx;
-   height:60rpx;
-   display: flex;
-   align-items: center;
-   justify-content: center;
-   margin-left: 10rpx;
-   border-radius: 12rpx;
-   background-color: #0F80DC;
-   color: #fff;
-box-sizing: border-box;
-
- }
- .examine_name{
-   color: #cccccc;
- }
- .available{
-   width: 100%;
-   display: flex;
-   align-items: center;
-   justify-content: center;
-   margin-top: 60rpx;
- }
+}
+.positioning{
+  position: fixed;
+  right: 40rpx;
+  bottom: 400rpx;
+}

pages/login/index.wxml

@@ -1,66 +0,0 @@
-<!-- pages/user/index.wxml -->
-<view class="setup">
-  <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>
-</view>
-<!-- <view style="width: 100%; {{'height: ' + navStatusBarHeight +'px'}}"></view> -->
-<!--<view></view>-->
- <view class="log">
- <view class="log_title">
- <view>你好，</view>
- <view>欢迎使用晟运智慧运维</view>
- </view>
- <view><image class="log_image" src="https://esos-iot.bjdexn.cn/myminio/project/72505c1e81bf445dbeb773a18e47da7b.png" mode="aspectFill"/></view>
- </view>
- <view class="login_box">
- <view class="{{Loginswitch?'login_left':'login_right1'}}" data-value="{{true}}" bind:tap="onswitch">一键登录</view>
- <!-- <view class="{{!Loginswitch?'login_left':'login_right'}}" data-value="{{false}}">手机号登录</view> -->
- <view class="{{!Loginswitch?'login_left':'login_right'}}" data-value="{{false}}" bind:tap="onswitch">手机号登录</view>
-
- </view>
- <!-- <view class="login_box">
-  <view class="login_right1">快捷登录</view>
- <view class="login_left">账户登录</view>
- </view> -->
- <view class="log_bottom">
-
- <view class="account_number" wx:if="{{!Loginswitch}}">
- <view wx:if="{{!Loginswitch}}">
-  <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="number" wx:if="{{!Loginswitch}}">
-  <!-- <view class="account">邀请码</view>
-  <view class="password"> 
-    <image class="login_imgae1" src="https://esos-iot.bjdexn.cn/myminio/project/b38d8000822b44108beff300cb0c9f69.png" mode="aspectFit"/>
-  <input class="weui-input"	value="{{password}}" placeholder="请输入邀请码" bindinput="bindKeyInput2"/>
-  </view> -->
-  <!-- <view class="password"> 
-    <image class="login_imgae1" src="https://esos-iot.bjdexn.cn/myminio/project/b38d8000822b44108beff300cb0c9f69.png" mode="aspectFit"/>
-  <input class="weui-input"	value="{{password}}" password="{{passwordtype}}" placeholder="请输入密码" bindinput="bindKeyInput2"/>
-    <image class="login_imgae" src="https://esos-iot.bjdexn.cn/wx_images/password_1.png" wx:if="{{passwordtype}}" bind:tap="onpassword" mode=""/>
-    <image class="login_imgae" src="https://esos-iot.bjdexn.cn/wx_images/password_2.png" wx:else bind:tap="onpassword" mode=""/>
-  </view> -->
- </view>
- <view class="loginbotton">
-  <!-- <button wx:if="{{!Loginswitch}}" class="button_button" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber">手机号一键登录</button> -->
- <button wx:if="{{Loginswitch&&checked}}" class="button_button" color="#0F80DC" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber">手机号一键登录</button>
- <button wx:if="{{!checked}}" class="button_button" color="#0F80DC" bind:tap="onstatus">手机号一键登录</button>
- <button wx:if="{{!Loginswitch}}" class="button_button" color="#0F80DC" bind:tap="onLogin">登录</button>
- <!-- <button wx:if="{{!Loginswitch}}" bindphoneoneclicklogin="onHandleLogin" open-type="phoneOneClickLogin">一键登录按钮</button> -->
- <view class="agreement">
-  <t-radio t-class="t_box" value="{{checked}}" icon="dot" data-value="{{checked}}" bind:tap="checkboxChange"/>
- 我已阅读并同意<text class="agreement_color" data-name="服务协议" bind:tap="onprivacy">《服务协议》</text>和<text class="agreement_color" data-name="隐私政策" bind:tap="onprivacy">《隐私政策》</text> </view>
- </view>
- 
- </view>
-</view>

pages/malfunction/index.wxml

@@ -1,30 +0,0 @@
-<!--pages/malfunction/index.wxml-->
-<view class="setup">
-<view class="setup_list">
-  <view class="allocation" data-name="0" bind:tap="toconfigure">
-<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="1" bind:tap="toconfigure">
-<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="2" bind:tap="toconfigure">
-<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>
-
-
-
-
-</view>

pages/malfunction/index.wxss

@@ -1,53 +0,0 @@
-/* pages/malfunction/index.wxss */
-.setup{
-  width: 100%;
-  height: 100vh;
-  background: linear-gradient(to bottom, #0F80DC -40%, #F0F5F5 40%,#F0F5F5 100%);
-  padding: 20rpx 20rpx;
-  box-sizing: border-box;
-
-}
-.setup_list{
-  width: 100%;
-  background-color: #ffffff;
-  border-radius: 10rpx;
-}
-.allocation{
-  width: 100%;
-  height: 80rpx;
-display: flex;
-align-items: center;
-justify-content:space-between;
-padding: 0rpx 20rpx;
-overflow: hidden;
-box-sizing: border-box;
-
-}
-.allocation_1{
-  display: flex;
-  font-size:13px;
-  align-items: center;
-}
-.allocation_box{
- border-radius: 16rpx;
- background-color: #ffffff;
-  padding: 10rpx 0rpx;
-  box-sizing: border-box;
-  margin-top: 30rpx;
-box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1);
-
-}
-.allocation_2{
-  color: #999999;
-  
-}
-.allocation_3{
-  font-size: 14px;
-}
-.content-container{
-margin-top: 40rpx;
-display: flex;
-flex-direction: column;
-justify-content: center;
-align-items: center;
-}

pages/personalInfo/index.js

@@ -1,180 +0,0 @@
-// pages/personalInfo/index.js
-const api = require('../../api/index.js');
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    user:'',
-    identitycard:"",
-    fileurl:'',
-    back:"",
-    Peakprice:""
-  },
-
-  /**
-   * 生命周期函数--监听页面加载 
-   */
-  onLoad(options) {
-//  this.gituser()
-  },
-gituser(){
-  api.request(`/toolprogram/selectuser`, 'POST',{})
-  .then((res) => {
-    console.log(res);
-    this.setData({
-      user:res.data,
-      fileurl:res.data.userfrontofidcard,
-      back:res.data.userreverseofidcard
-    })
-  })
-  .catch((err) => {
-    console.error('请求失败：', err);
-    // 在这里处理请求失败的情况
-  });
-},
-// 上传头像
-bindtoImage(){
-  let _this = this
-  // 先检查隐私授权状态
-  wx.getPrivacySetting({
-    success: (res) => {
-      if (res.needAuthorization) {
-        // 弹出隐私协议弹窗
-        wx.requirePrivacyAuthorize({
-          success: () => {
-            console.log('用户已同意隐私协议');
-            _this.choosetoImage(); // 继续执行上传
-          },
-          fail: () => {
-            console.log('用户拒绝了隐私协议');
-            wx.showToast({
-              title: '需同意隐私协议才能使用',
-              icon: 'none'
-            });
-          }
-        });
-      } else {
-          _this.choosetoImage(); // 已授权，直接上传
-      }
-    }
-  });
-},
-// 上传头像图片
-choosetoImage() {
-  let _this = this
-  wx.chooseMedia({    
-    count: 1,
-    mediaType: ['image','video'],
-    sourceType: ['album', 'camera'],
-    success(res) {
-      console.log(res);
-      const tempFiles = res.tempFiles;
-      _this.setData({
-        imageList: tempFiles.map(file => file.tempFilePath),
-      });
-      _this.uploadtoImages(tempFiles);
-    },
-    fail(err) {
-      console.error("选择失败:", err);
-    }
-  })
-  },
-  // 上传到服务器
-  uploadtoImages(files) {
-  let _this =this
-  const token = wx.getStorageSync('token');
-  files.forEach((file) => {
-  wx.uploadFile({
-  url: 'https://esos-iot.bjdexn.cn:8443/toolprogram/upload/webPost',
-  filePath: file.tempFilePath,
-  name: 'file',
-  formData: {
-    file:file.tempFilePath
-  },
-  header: {
-    'Authorization': 'Bearer ' + token // Also add to header if needed
-  },
-  success: (res) => {
-  console.log(res);
-  const obj = JSON.parse(res.data);
- 
-  let data ={
-    userprofile:obj.data.userprofile,
-  }
-api.request(`/toolprogram/insertpartner`, 'POST',data)
-.then((res) => {
-  console.log(res);
-  this.setData({
-    user:res.data,
-    fileurl:res.data.userfrontofidcard,
-    back:res.data.userreverseofidcard
-  })
-  wx.showToast({
-    title: res.msg,
-    icon: 'none'
-  });
-})
-.catch((err) => {
-  console.error('请求失败：', err);
-  // 在这里处理请求失败的情况
-});
-  },
-  fail: (err) => {
-    console.error('上传失败', err);
-  },
-  });
-  });
-  },
- 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/personalInfo/index.wxml

@@ -1,45 +0,0 @@
-<view class="container">
-		<view class="account_number">
-	     	<image bind:tap="bindtoImage" class="account_to1" src="{{user.userprofile||''}}" mode=""></image>
-		</view>
-		<view class="toptabbar">
-			<view class="toptabbar_">
-				<view class="toptabbar_box">
-								<view class="toptabbar_left">
-									名称
-								</view>
-									<view class="toptabbar_right">
-                    <input class="uni-mt-5" trim="all" value="{{Peakprice}}" clearSize="0"
-										placeholder="请输入报修地点" 	bindinput="onPeakprice"></input>
-									</view>
-							</view>
-				<view class="toptabbar_box">
-					<view class="toptabbar_left">
-						电话
-					</view>
-						<view class="toptabbar_right">
-							{{user.userphone||'--'}}
-						</view>
-				</view>
-				<view class="toptabbar_box">
-					<view class="toptabbar_left">
-						投资类型
-					</view>
-						<view class="toptabbar_right">
-							{{user.copartnertype||'--'}}
-						</view>
-				</view>
-        <view class="toptabbar_box">
-					<view class="toptabbar_left">
-						所属电站
-					</view>
-						<view class="toptabbar_right">
-							{{user.copartnertype||'--'}}
-						</view>
-				</view>
-			</view>
-	</view>
-  </view>
-  <!--
-    
-  -->

pages/personalInfo/index.wxss

@@ -1,64 +0,0 @@
-/* pages/personalInfo/index.wxss */  .uni-page{
-	  		width: 100%;
-	  		height: 100%;
-	  	}
-	  .container {
-	  	height: 100%;
-	    background: linear-gradient(to bottom, #0F80DC -40%, #f0f5f5 40%, #f0f5f5 100%);
-	    box-sizing: border-box;
-	  }     
-	  .account_number{
-	    width: 100%;
-		padding: 20rpx;
-		display: flex;
-		justify-content: center;
-		box-sizing: border-box;
-	  }
-	 .account_to1{
-		 width: 200rpx;
-		 height: 200rpx;
-     border-radius: 100rpx;
-     border: 1rpx solid #ffffff;
-	 }
- 
-	   .toptabbar {
-	     width: 100%;
-	     padding: 10rpx 20rpx;
-	     box-sizing: border-box;
-	   }
-	   .toptabbar_{
-		   border-radius: 10rpx;
-		   overflow: hidden;
-		   padding:0rpx 20rpx 20rpx 20rpx;
-		   background-color: #ffffff;
-	   }
-		.toptabbar_box{
-			width: 100%;
-			height: 120rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			border-bottom: 1rpx #f5f5f5 solid;
-		}
-        .toptabbar_left{
-		 font-size: 28rpx;
-		}
-    .account_to{
-      width: 100%;
-      height: 300rpx;
-      border-radius: 10rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 10rpx;
-      border: #f5f5f5 1rpx solid;
-      box-sizing: border-box;
-      }
-      .user_to{
-        width: 100%;
-      height: 360rpx;
-      border-radius: 10rpx;
-      }
-      .uni-mt-5{
-        text-align: right;
-      }

pages/scheduling/index.js

@@ -1,288 +0,0 @@
-// pages/scheduling/index.js
-const api = require('../../api/index.js');
-const timestamp = require("../../utils/util.js")
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    visible:false,
-    current: [],
-    options: [],
-    userdata:[],
-    value:'',
-    minDate: new Date(2022, 0, 10).getTime(),
-    maxDate: new Date(2027, 10, 27).getTime(),
-    format(day) {
-      const { date } = day;
-      const year = date.getFullYear();
-      const month = date.getMonth() + 1;
-      const curDate = date.getDate();
-      
-      // 农历月份名称
-      const lunarMonths = ['正月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '冬月', '腊月'];
-      
-      // 农历日期名称
-      const lunarDays = [
-        '初一', '初二', '初三', '初四', '初五', '初六', '初七', '初八', '初九', '初十',
-        '十一', '十二', '十三', '十四', '十五', '十六', '十七', '十八', '十九', '二十',
-        '廿一', '廿二', '廿三', '廿四', '廿五', '廿六', '廿七', '廿八', '廿九', '三十'
-      ];
-    
-      // 阳历节日映射
-      const solarFestivals = {
-        '1-1': '元旦',
-        '2-14': '情人节',
-        '3-8': '妇女节',
-        '4-1': '愚人节',
-        '5-1': '劳动节',
-        '6-1': '儿童节',
-        '9-10': '教师节',
-        '10-1': '国庆节',
-        '12-24': '平安夜',
-        '12-25': '圣诞节'
-      };
-    
-      // 农历节日映射（需要根据具体年份计算，这里简化处理）
-      const lunarFestivals = {
-        '正月-初一': '春节',
-        '正月-十五': '元宵',
-        '五月-初五': '端午',
-        '七月-初七': '七夕',
-        '八月-十五': '中秋',
-        '九月-初九': '重阳',
-        '腊月-三十': '除夕'
-      };
-    
-      // 节气映射（简化版）
-      const solarTerms = {
-        '2-4': '立春', '2-19': '雨水',
-        '3-5': '惊蛰', '3-20': '春分',
-        '4-5': '清明', '4-20': '谷雨',
-        '5-5': '立夏', '5-21': '小满',
-        '6-6': '芒种', '6-21': '夏至',
-        '7-7': '小暑', '7-23': '大暑',
-        '8-8': '立秋', '8-23': '处暑',
-        '9-8': '白露', '9-23': '秋分',
-        '10-8': '寒露', '10-23': '霜降',
-        '11-7': '立冬', '11-22': '小雪',
-        '12-7': '大雪', '12-22': '冬至'
-      };
-    
-      // 计算农历日期（简化算法）
-      const lunarMonthIndex = (month - 1 + Math.floor(curDate / 15)) % 12;
-      const lunarDayIndex = (curDate - 1) % 30;
-      
-      let lunarDate = lunarDays[lunarDayIndex];
-      const lunarMonth = lunarMonths[lunarMonthIndex];
-      
-      // 如果是初一，显示月份
-      if (lunarDayIndex === 0) {
-        lunarDate = lunarMonth;
-      }
-    
-      // 设置农历显示
-      day.prefix = lunarDate;
-    
-      // 检查阳历节日
-      const solarFestivalKey = `${month}-${curDate}`;
-      if (solarFestivalKey in solarFestivals) {
-        day.suffix = solarFestivals[solarFestivalKey];
-        day.className = 'is-solar-festival';
-      }
-    
-      // 检查农历节日
-      const lunarFestivalKey = `${lunarMonth}-${lunarDays[lunarDayIndex]}`;
-      if (lunarFestivalKey in lunarFestivals) {
-        day.suffix = lunarFestivals[lunarFestivalKey];
-        day.className = 'is-lunar-festival';
-      }
-    
-      // 检查节气
-      if (solarFestivalKey in solarTerms) {
-        day.suffix = solarTerms[solarFestivalKey];
-        day.className = 'is-solar-term';
-      }
-    
-      // 周末样式
-      if (date.getDay() === 0 || date.getDay() === 6) {
-        day.className = (day.className || '') + ' is-weekend';
-      }
-    
-      // 今天日期样式
-      const today = new Date();
-      if (year === today.getFullYear() && 
-          month === today.getMonth() + 1 && 
-          curDate === today.getDate()) {
-        day.className = (day.className || '') + ' is-today';
-      }
-    
-      return day;
-    },
-    selectschedudata:[],
-    partnerPosition:wx.getStorageSync('partnerPosition').partnerPosition
-  },
-
-            // day.suffix = '¥100';
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-  this.getuser()
-  const currentTimestamp = Date.now();
-  this.setData({
-    value:currentTimestamp,
-    valuename:timestamp.timestamp(currentTimestamp)
-  })
-  this.getdatetime()
-
-  },
-  // 查询人员
-  getuser(){
-    let data = {
-      partnerName:'',
-      partnerPhone:'',
-      partnerType:''
-    }
-    api.request(`/partner/selectinformationall`, 'POST',data)
-    .then((res) => {
-      console.log(res);
-      const positionMap = { 1: '值班员', 2: '值长', 3: '站长', 4: '董事长' };
-      const transformedData = res.data.map(item => ({
-        label: item.partnerName,
-        value: item.partnerId,
-        content: positionMap[item.partnerPosition] || item.partnerPosition,
-        ...item
-      }));
-      console.log(transformedData);
-      this.setData({
-        options:transformedData
-      })
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况
-    });
-  },
-  
-  handleSelect(e) {
-    const { value } = e.detail;
-    
-this.setData({
-  value:value,
-  valuename:timestamp.timestamp(value)
-})
-    console.log(value);
-    this.getdatetime()
-  },
-  handleConfirm(e) {
-    this.setData({ value: e.detail.value });
-    console.log(e.detail.value);
-  },
-
-  handlePanelChange(e) {
-    const { year, month } = e.detail;
-    console.log('year: ', year, 'month: ', month);
-  },
-  ondutyadd(){
-    this.setData({
-      visible:true
-    })
-  },
-  onVisibleChange(){
-    this.setData({
-      visible:false
-    })
-  },
-  handleGroupChange(event) {
-    console.log('group', event.detail.value);
-    this.setData({
-      current: event.detail.value,
-    });
-  },
-    // 查询日期
-    getdatetime(){
-      let data = {
-        startdate:this.data.valuename,
-        enddate:this.data.valuename,
-      }
-      api.request(`/scheduling/selectscheduling`, 'POST',data)
-      .then((res) => {
-        console.log(res);
-        this.setData({
-          selectschedudata:res.data
-        })
-      })
-      .catch((err) => {
-        console.error('请求失败：', err);
-        // 在这里处理请求失败的情况
-      });
-    },
-    onworkorder(){
-      let data ={
-        schedulingId:this.data.selectschedudata[0].id,
-        partnerId:this.data.current.toString()
-      }
-      api.request(`/scheduling`, 'POST',data)
-      .then((res) => {
-        console.log(res);
-       this.setData({
-        visible:false
-       })
-       this.getdatetime()
-      })
-      .catch((err) => {
-        console.error('请求失败：', err);
-        // 在这里处理请求失败的情况
-      });
-    },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/scheduling/index.json

@@ -1,9 +0,0 @@
-{
-  "usingComponents": {
-    "t-calendar": "tdesign-miniprogram/calendar/calendar",
-    "t-icon": "tdesign-miniprogram/icon/icon",
-    "t-popup": "tdesign-miniprogram/popup/popup",
-    "t-checkbox-group": "tdesign-miniprogram/checkbox-group/checkbox-group",
-    "t-checkbox": "tdesign-miniprogram/checkbox/checkbox"
-  }
-}

pages/scheduling/index.wxml

@@ -1,50 +0,0 @@
-<!--pages/scheduling/index.wxml-->
-<view class="scheduling">
-  <t-calendar 
-    value="{{value}}" 
-    switch-mode="year-month" 
-    use-popup="{{false}}" 
-    type="single" 
-    title="日历标题"
-    minDate="{{minDate}}" 
-    maxDate="{{maxDate}}" 
-    show-lunar="{{true}}" 
-    format="{{format}}"
-    bind:select="handleSelect"  
-    bind:confirm="handleConfirm"
-    bind:panel-change="handlePanelChange"
-  />
-
-<view class="content">
-<view class="content_fonst">
-<view>{{valuename}} 值班</view>
-
-<view class="Scancode_lefticon" wx:if="{{partnerPosition!=1}}">
-  <t-icon bind:tap="ondutyadd" name="add" size="60rpx" data-name="add"/>
- </view>
- </view>
-<view class="Scancode_content" wx:for="{{selectschedudata[0].partner}}">{{item.partnerName}} 
-  <!-- 1: '值班员', 2: '值长', 3: '站长', 4: '董事长'  -->
-<text class="Scancode_content11" wx:if="{{item.partnerPosition==1}}">值班员</text>
-<text class="Scancode_content11" wx:if="{{item.partnerPosition==2}}">值长</text>
-<text class="Scancode_content11" wx:if="{{item.partnerPosition==3}}">站长</text>
-<text class="Scancode_content11" wx:if="{{item.partnerPosition==4}}">董事长</text>
-</view>
-
-</view>
-</view>
-
-<t-popup
-  visible="{{visible}}"
-  usingCustomNavbar
-  bind:visible-change="onVisibleChange"
-  placement="bottom"
->
-   <view class="popupbox">
-   <view class="popupboxname">选择值班员</view>
-   <t-checkbox-group value="{{current}}" bind:change="handleGroupChange" options="{{options}}" />
-   <view class="workorder_box">
-<view class="workorder" bind:tap="onworkorder">提交</view>
-</view>
-   </view>
-</t-popup>

pages/scheduling/index.wxss

@@ -1,187 +0,0 @@
-/* pages/scheduling/index.wxss */
-
-page{
-  width: 100%;
-  height: 100%;
-  background-color: #f5f5f5;
-box-sizing: border-box;
-
-}
-.scheduling{
-  padding:20rpx 20rpx;
-box-sizing: border-box;
-
-}
-.content{
-  width: 100%;
-  margin-top: 20rpx;
-  padding: 20rpx;
-background-color: #ffffff;
-border-radius: 10rpx;
-display: flex;
-flex-direction: column;
-box-sizing: border-box;
-
-}
-.Scancode_content{
-  width: 600rpx;
-  display: flex;
-  margin-top: 20rpx;
-  box-sizing: border-box;
-}
-.Scancode_lefticon{
-  width: 100rpx;
-  margin-top: 20rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border: 1rpx solid #cccccc;
-  border-radius: 10rpx;
-  box-sizing: border-box;
-
-
-}
-.popupbox{
-  width: 100%;
-  min-height: 600rpx;
-}
-.content_fonst{
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  /* justify-content:space-around; */
-  font-size: 36rpx;
-  margin-bottom: 20rpx;
-  box-sizing: border-box;
-}
-.popupboxname{
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 36rpx;
-  padding: 20rpx 0rpx;
-}
-.box {
-  padding: 32rpx;
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  background-color: var(--td-bg-color-container, #fff);
-}
-/* 日历容器 */
-.scheduling {
-  width: 100%;
-  padding: 20rpx;
-  background: #f8f9fa;
-  min-height: 100vh;
-}
-
-/* 节日样式 */
-.is-festival .t-calendar__cell--solar {
-  color: #e74c3c !important;
-  font-weight: bold !important;
-}
-
-.is-festival .t-calendar__cell--lunar {
-  color: #e74c3c !important;
-  font-weight: bold !important;
-}
-
-/* 节气样式 */
-.is-term .t-calendar__cell--solar {
-  color: #27ae60 !important;
-}
-
-.is-term .t-calendar__cell--lunar {
-  color: #27ae60 !important;
-  font-weight: bold !important;
-}
-
-/* 周末样式 */
-.is-weekend .t-calendar__cell--solar {
-  color: #7f8c8d !important;
-}
-
-/* 有节日的单元格 */
-.has-festival .t-calendar__cell--suffix {
-  position: absolute;
-  top: 4rpx;
-  right: 4rpx;
-  font-size: 18rpx;
-  color: #e74c3c;
-  background: rgba(231, 76, 60, 0.1);
-  padding: 2rpx 6rpx;
-  border-radius: 8rpx;
-  transform: scale(0.8);
-}
-
-/* 调整农历显示样式 */
-.t-calendar__cell--lunar {
-  font-size: 20rpx !important;
-  color: #666 !important;
-  margin-top: 2rpx !important;
-}
-
-/* 选中状态样式 */
-.t-calendar__cell--selected .t-calendar__cell--solar,
-.t-calendar__cell--selected .t-calendar__cell--lunar {
-  color: #ffffff !important;
-}
-
-/* 今天日期样式 */
-.t-calendar__cell--now .t-calendar__cell--solar {
-  color: #007aff !important;
-  font-weight: bold !important;
-}
-
-.t-calendar__cell--now .t-calendar__cell--lunar {
-  color: #007aff !important;
-}
-
-/* 调整单元格高度 */
-.t-calendar__cell {
-  min-height: 110rpx !important;
-  padding: 8rpx 4rpx !important;
-}
-
-/* 月份切换面板样式 */
-.t-calendar__panel {
-  background: #fff;
-  border-radius: 16rpx;
-  margin-bottom: 20rpx;
-}
-.workorder_box{
-  width: 100%;
-
-  padding-top:30rpx;
-  display: flex;
-/* align-items: center; */
-justify-content: center;
-box-sizing: border-box;
-background-color: #ffffff;
-}
-.workorder{
-  width: 480rpx;
-  height: 80rpx;
-  font-size: 32rpx;
-  background-color: rgba(15, 128, 220, 0.2);
-  color: #0F80DC;
-  border:1rpx solid #0F80DC;
-display: flex;
-align-items: center;
-justify-content: center;
-border-radius: 10rpx;
-}
-.Scancode_content11{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 4rpx 10rpx;
-  background-color: #0F80DC;
-  border: 1rpx solid #0F80DC;
-  border-radius: 100rpx;
-margin-left: 20rpx;
-  color: #fff;
-  box-sizing: border-box;
-}

pages/setup/index.js

@@ -29,7 +29,7 @@ inputValue: '' // 初始值
   },
   onsetup(){
     wx.navigateTo({
-      url: '/pages/setuplevel/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
+      url: '/package-setup/pages/setuplevel/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
     });
   },
   // 电站详情
@@ -59,13 +59,17 @@ inputValue: '' // 初始值
   },
   toconfigure(e){
     console.log(e.currentTarget.dataset.name);
-    if (e.currentTarget.dataset.name=="project") {
+    if (e.currentTarget.dataset.name=="userlist") {
       wx.navigateTo({
-        url: '/pages/project/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
+        url: '/pages/userlist/index',
       });
-    }else if (e.currentTarget.dataset.name=="customer"){
+    }else if (e.currentTarget.dataset.name=="driver"){
       wx.navigateTo({
-        url: '/pages/customer/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
+        url: '/pages/driver/index',
+      });
+    }else if (e.currentTarget.dataset.name=="address"){
+      wx.navigateTo({
+        url: '/pages/address/index',
       });
     }else{
       wx.showToast({
@@ -125,7 +129,7 @@ inputValue: '' // 初始值
    * 生命周期函数--监听页面显示
    */
   onShow() {
- this.getuser()
+//  this.getuser()
 
     this.setData({
       station:wx.getStorageSync('station')

pages/setup/index.json

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

pages/setup/index.wxml

@@ -1,12 +1,5 @@
 <view class="setup">
-  <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>
-</view>
+ 
 <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=""/>
@@ -21,16 +14,31 @@
 </view>
 </view>
 <view style="width: 100%;height:40rpx"></view>
-<!---->
-<!-- <view class="allocation_box">
-<view class="allocation" data-name="project" bind:tap="toconfigure">
-<view class="allocation_3">排班</view>
+<!-- -->
+<view class="allocation_box">
+<view class="allocation" data-name="userlist" bind:tap="toconfigure">
+<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_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 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> -->
+</view>
+
 <view class="allocation_box">
  
 <view class="allocation">

pages/setup/index.wxss

@@ -1,7 +1,7 @@
 .setup{
   width: 100%;
   height: 100vh;
-  background: linear-gradient(to bottom, #0F80DC -40%, #F0F5F5 40%,#F0F5F5 100%);
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
   padding: 0rpx 30rpx;
   box-sizing: border-box;
 
@@ -78,8 +78,7 @@ width: 100%;
   width: 48%;
   background-color: #ffffff;
   border-radius: 10rpx;
-  box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1);
-
+    box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
 }
 .equipment_rightdiv{
   width: 78rpx;
@@ -155,7 +154,8 @@ box-sizing: border-box;
    padding: 10rpx 0rpx;
    box-sizing: border-box;
    margin-top: 30rpx;
-box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+
 
  }
  .allocation_2{

pages/statistics/index.js

@@ -1,164 +0,0 @@
-// pages/statistics/index.js
-
-const api = require('../../api/index.js');
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    // 状态栏高度
-    statusBarHeight: wx.getStorageSync('statusBarHeight'),
-    // 导航栏高度
-    navBarHeight: wx.getStorageSync('navBarHeight'),
-    // 导航栏和状态栏高度
-    navStatusBarHeight: wx.getStorageSync('navStatusBarHeight'),
-    // 胶囊
-    menu:wx.getStorageSync('menu'),
-    sunec: {
-      lazyLoad: true
-    }
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    this.sunline = this.selectComponent('#sunlinechart')
-    this.onworkorder()
-  //  this.getsunlinechart()
-  },
-  onlevel(){
-    console.log(1111111);
-wx.navigateBack({
-  data:1
-})
-  },
-  onworkorder(){
-    let data = {
-      workorderType:''
-    }
-    api.request(`/workoder/statistics`, 'POST',data)
-    .then((res) => {
-      console.log(res);
-      this.setData({
-        workorder:res.data
-      })
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况
-    });
-  },
-  // 日用电价走势
-  getsunlinechart() {
-    this.sunline.init((canvas, width, height, dpr) => {
-      const chart = echarts.init(canvas, null, {
-        width: width,
-        height: height,
-        devicePixelRatio: dpr
-      });
-      canvas.setChart(chart);
-      var option = {
-        xAxis: {
-          type: 'category',
-          data: [1,2,3,4,5,6,7,8,9,10]
-        },
-        yAxis: {
-          type: 'value',
-          axisLine: {
-            show: true,
-            lineStyle: {
-              color: '#999',
-              width: 1
-            }
-          },
-          axisTick: {
-            show: false
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              type: 'dotted',
-              color: '#ccc',
-              width: 1,
-              opacity: 0.6
-            }
-          }
-        },
-        grid: {
-          top: '10%',
-          left: '0%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-        },
-        series: [
-          {
-            data: [10,20,30,40,50,60,70,70,70,70,70],
-            showSymbol: false,
-            type: 'line',
-            step: 'start',
-            color: '#B2D5CB',
-          }
-        ]
-      };
-
-      chart.setOption(option);
-      return chart;
-    });
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-  onstatistics(){
-    wx.switchTab({
-      url: '/pages/tool/index',
-    })
-  },
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/statistics/index.wxml

@@ -1,109 +0,0 @@
-<!--pages/statistics/index.wxml-->
-<view class="statistics_bj">
-  <view class="navigation-container" style="{{'height: ' + navStatusBarHeight +'px'}}">
-    <!--空白来占位状态栏-->
-    <view style="{{'height: ' + statusBarHeight +'px'}}"></view>
-    <!--自定义导航栏 -->
-    <view class="navigation-bar" style="{{'height:' + navBarHeight +'px'}}">
-      <t-icon name="chevron-left" size="70rpx" data-name="chevron-left" bind:tap="onlevel" />
-    </view>
-
- 
-  </view>
-  <view class="statistics">
-      <view class="piece" bind:tap="onstatistics">
-        <view class="statistics_top">
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.allcount}}</view>
-            <view class="statistics_title">全部工单</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.incompletecount}}</view>
-            <view class="statistics_title">全部待办</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.completecount}}</view>
-            <view class="statistics_title">全部办结</view>
-          </view>
-        </view>
-        <view style="height: 20rpx;"></view>
-        <view class="statistics_top">
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.myworkodercount}}</view>
-            <view class="statistics_title">我的工单</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.myworkodertodo}}</view>
-            <view class="statistics_title">我的待办</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.myworkoderend}}</view>
-            <view class="statistics_title">我的已办</view>
-          </view>
-        </view>
-      </view>
-<!--  -->
-      <view style="height: 40rpx;"></view>
-      <view class="piece">
-
-        <view class="statistics_top">
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.dayworkoderAssemble}}</view>
-            <view class="statistics_title">今天工单</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.dayworkoderTodo}}</view>
-            <view class="statistics_title">今天待办</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.dayworkoderEnd}}</view>
-            <view class="statistics_title">今天已办</view>
-          </view>
-        </view>
-        <view style="height: 20rpx;"></view>
-
-        <view class="statistics_top">
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.weeksworkoderAssemble}}</view>
-            <view class="statistics_title">周工单</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.monthworkoderAssemble}}</view>
-            <view class="statistics_title">月工单</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.yearworkoderAssemble}}</view>
-            <view class="statistics_title">年工单</view>
-          </view>
-        </view>
-        <view class="statistics_top">
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.failcount}}</view>
-            <view class="statistics_title">审核失败</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit">{{workorder.successcount}}</view>
-            <view class="statistics_title">审核完成</view>
-          </view>
-          <view class="statistics_1">
-            <view class="statistics_digit1"></view>
-            <view class="statistics_title1"></view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="qiun_data">
-        <!-- <qiun-data-charts type="line" :opts="daylineopts" :chartData="daylinechart" /> -->
-        <!-- <view class="qiun_box">
-          每日工单
-    <view class="eccanvas">
-
-        <ec-canvas force-use-old-canvas="true" id="sunlinechart" canvas-id="sunlinechart" ec="{{ sunec }}"></ec-canvas>
-      </view>
-        </view> -->
-      
-      </view>
-
-
-</view>

pages/statistics/index.wxss

@@ -1,93 +0,0 @@
-/* pages/statistics/index.wxss */
-page{
-  width: 100%;
-  height: 100%;
-}
-.statistics_bj{
-  width: 100%;
-  height: 100%;
-  background-image: url('https://esos-iot.bjdexn.cn/myminio/project/40d665be18f5406daefdd1716164466e.png');
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-}
-.navigation-container {
-  position: fixed;
-  width: 100%;
-  z-index: 99;
-}
-.navigation-bar {
-  position: relative;
-  width: 100%;
-  display: flex;
-  align-items: center;
-  /* justify-content: center; */
-  padding-left: 20rpx;
-  flex-direction: row;
-  color: #333333;
-}
-.statistics{
-  width: 100%;
-  padding: 0rpx 20rpx;
-  padding-top: 400rpx;
-  box-sizing: border-box;
-}
-.statistics_top{
-  display: flex;
-  justify-content: space-between;
-}
-.piece{
-  border-radius: 10rpx;
-  background-color: #ffffff;
-  padding: 10rpx 20rpx;
-
-}
-.statistics_1{
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-.statistics_digit{
-  font-size: 48rpx;
-}
-.statistics_digit1{
-  width: 116rpx;
-  font-size: 48rpx;
-}
-.statistics_title1{
-  margin-top: 10rpx;
-}
-.statistics_title{
-  margin-top: 10rpx;
-}
-
-.qiun_data {
-  width: 100%;
-  margin-top: 20rpx;
-  padding: 20rpx;
-  display: flex;
-  flex-direction: column;
-  /* overflow: auto; */
-  box-sizing: border-box;
-  border-radius: 8rpx;
-overflow: hidden;
-  
-}
-.qiun_box{
-  width: 100%;
-  height: 100%;
-  background-color: #ffffff;
-  padding: 20rpx;
-  box-sizing: border-box;
-
-}
-.eccanvas{
-  width: 100%;
-  height: 500rpx;
-  box-sizing: border-box;
-  }
-#mychart_line{
-  width: 100%;
-    height: 500rpx;
-  box-sizing: border-box;
-  }

pages/tool/index.js

@@ -2,152 +2,77 @@ const api = require('../../api/index.js');
 Page({
 
   data: {
-    visible:false,
-    tabsindex:"1,2",
-    workorderName:'',
-    datestart:'',
-    dateend:'',
-    array:['日常','故障','其他'],
-    priority:'',
-    index:'',
-    reviewdata:[],
-    examineType:0
+    tabsindex:"1",
+    driverlist:[],
+    selected:1,
+    userdata:[]
   },
   onLoad() {
-  },
-  // 选项卡
-  onTabsChange(e){
-  console.log(e.detail.value);
-  this.setData({
-    tabsindex:e.detail.value
-  })
-  this.gitreview()
-  },
-  // 输入工单名称
-  onPeakprice(e){
-console.log(e.detail.value);
-this.setData({
-  workorderName:e.detail.value
-})
-  },
-    // 事件
-    bindeventChange(e){
-      console.log(e.detail.value);
-      this.setData({
-        index:e.detail.value
-      })
-        },
-  // 开始事件
-  bindstartChange: function(e) {
-    console.log('picker发送选择改变，携带值为', e.detail.value)
+    // this.getdriver()
     this.setData({
-      datestart: e.detail.value
+      userdata:wx.getStorageSync('user')
     })
   },
-  // 结束时间
-  bindendChange: function(e) {
-    console.log('picker发送选择改变，携带值为', e.detail.value)
-    this.setData({
-      dateend: e.detail.value
-    })
+  onselected(e){
+    console.log(e.currentTarget.dataset.index);
+this.setData({
+  selected:e.currentTarget.dataset.index
+})
+this.getdriver()
   },
-    // 工单优先级
-    onradio(e){
-      console.log(e.detail.value); 
-      this.setData({
-        priority:e.detail.value
-      })
-        },
-          // 工单审核状态
-          onexamineType(e){
-      console.log(e.detail.value); 
-      this.setData({
-        examineType:e.detail.value
-      })
-        },
-        
-        onworkorder(){
-         this.setData({
-          visible:false
-         })
-        this.gitreview()
-        },
-        onreset(){
-          this.setData({
-            workorderName:'',
-            tabsindex:"1,2",
-            datestart:'',
-            dateend:'',
-            index:'',
-            priority:'',
-            examineType:0
-          })
-          this.gitreview()
-
-        },
-  gitreview(){
-    
-    let data = {
-      workorderName:this.data.workorderName,
-      workorderType:this.data.tabsindex==0?'':this.data.tabsindex,
-      workorderAddress:'',
-      starttime:this.data.datestart,
-      endtime:this.data.dateend,
-      type:this.data.index==''?'':this.data.index*1+1,
-      examineType:this.data.examineType==0?'':this.data.examineType
+  getdriver(){
+    let data ={
+      workorderId:'',
+      workorderName:'',
+      addressId:'',
+      driverId:'',
+      carId:'',
+      customerId:'',
+      workorderType:'',
+      chargedischargeType:this.data.selected,
     }
-  
-    api.request(`/workoder/selectworkoder`, 'POST',data)
-    .then((res) => {
-  if (res.data) {
-    this.setData({
-      reviewdata:res.data
-    })
-  }else{
+
+    api.request(`/sysworkorder/selectworkorderlist`, 'post',data,{ isPublic: false })
+    .then((data) => {
+  console.log(data.data);
+  if (data.code==200) {
     this.setData({
-      reviewdata:[]
+      driverlist:data.data
     })
   }
+  //  wx.navigateTo({
+  //   url: '/pages/map/index',
+  // })
     })
     .catch((err) => {
+
       console.error('请求失败：', err);
-    
-      // 在这里处理请求失败的情况
     });
   },
-  onfilter(){
-    this.setData({
-      visible:true
-    })
-  },
-  onVisibleChange(){
-    this.setData({
-      visible:false
-    })
+  // 选项卡
+  onTabsChange(e){
+  console.log(e.detail.value);
+  this.setData({
+    tabsindex:e.detail.value
+  })
+  // this.gitreview()
   },
-  ondetails(e){
-    console.log(e.currentTarget.dataset);
-wx.navigateTo({
-  url: `/pages/workorderdetails/index?id=${e.currentTarget.dataset.id}&workorderId=${e.currentTarget.dataset.workorderid}`,
-})
+  details(e){
+    console.log(e.currentTarget.dataset.id);
+    wx.navigateTo({
+    url: `/package-map/pages/map/index?id=${e.currentTarget.dataset.id}`,
+  })
   },
+
   onShow() {
-    // this.setData({
-    //   workorderName:'',
-    //   tabsindex:"1,2",
-    //   datestart:'',
-    //   dateend:'',
-    //   index:''
-    // })
-    this.gitreview()
+    this.getdriver()
 
   },
    /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  async onPullDownRefresh() {
-   await this.gitreview()
-   await wx.stopPullDownRefresh();
+   onPullDownRefresh() {
+
 
   }
 });

pages/tool/index.json

@@ -1,6 +1,8 @@
 {
   "navigationBarBackgroundColor": "#fff",
   "enablePullDownRefresh": true,
+  "navigationBarTitleText": "订单",
+  "navigationStyle": "custom",
   "usingComponents": {
     "t-side-bar": "tdesign-miniprogram/side-bar/side-bar",
     "t-side-bar-item": "tdesign-miniprogram/side-bar-item/side-bar-item",

pages/tool/index.wxml

@@ -4,144 +4,64 @@
 </view> -->
 
 <view class="workorder">
+  <view class="discharge">
+<view class="discharge_cheng {{selected==1?'selected':''}}" data-index="1" bind:tap="onselected">充电</view>
+<view class="discharge_fang {{selected==2?'selected':''}}" data-index="2" bind:tap="onselected">放电</view>
+</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,2" />
-    <t-tab-panel label="办结" value="3" />
-  <t-tab-panel label="全部" value="0" />
+    <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-tabs>
-<view bind:tap="onfilter">
-  <t-icon name="filter" size="50rpx" color="#585CE5" data-name="filter" />
 </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="2" />
+  <t-tab-panel label="已完成" value="4" />
+</t-tabs>
 </view>
-<view style="height: 100rpx;"></view>
-<view class="examine_list">
-  <view class="examine_box" wx:for="{{reviewdata}}" wx:key="index" data-id="{{item.id}}" data-workorderId="{{item.workorderId}}" bind:tap="ondetails">
-<view class="examine_title">
-<view class="examine_title0" wx:if="{{item.type==1}}">日常<text style="padding: 0rpx 10rpx;">/</text><text wx:if="{{item.workorderGrade==1}}"> 低</text><text wx:if="{{item.workorderGrade==2}}"> 中</text><text wx:if="{{item.workorderGrade==3}}"> 高</text></view>
-<view class="examine_title01" wx:if="{{item.type==2}}">故障 <text style="padding: 0rpx 10rpx;">/</text> <text wx:if="{{item.workorderGrade==1}}"> 低</text><text wx:if="{{item.workorderGrade==2}}"> 中</text><text wx:if="{{item.workorderGrade==3}}"> 高</text></view>
-<view class="examine_title02" wx:if="{{item.type==3}}">其他<text style="padding: 0rpx 10rpx;">/</text> <text wx:if="{{item.workorderGrade==1}}"> 低</text><text wx:if="{{item.workorderGrade==2}}"> 中</text><text wx:if="{{item.workorderGrade==3}}"> 高</text></view>
-<view class="examine_title1">{{item.workorderName}}</view>
-<view class="process_bj2" wx:if="{{item.workorderType==1}}">待处理</view>
-<view class="process_bj3" wx:if="{{item.workorderType==2}}">处理中</view>
-<view class="examine_title2" wx:if="{{item.workorderType==3}}">处理完成</view>
-<!-- <view class="examine_title2" wx:if="{{item.workorderType==3&&item.examineType==5}}">待审核</view>
-<view class="examine_title2" wx:if="{{item.workorderType==3&&item.examineType==6}}">审核完成</view>
-<view class="examine_title2" wx:if="{{item.workorderType==3&&item.examineType==7}}">审核失败</view> -->
+<!-- <view bind:tap="onfilter">
+  <t-icon name="filter" size="50rpx" color="#585CE5" data-name="filter" />
+</view> -->
 </view>
-<view class="examine_content">
-<view class="examine_name">描述：{{item.workorderContent}}</view>
-<view class="feedback examine_name" wx:if="{{item.examineType==7}}">退回原因：{{item.workoderReason}}</view>
-<view class="feedback examine_name" wx:if="{{item.examineCount!=0&&item.examineType!=7}}">退回原因：{{item.lastfail||'无'}}</view>
+<view style="height: 260rpx;"></view>
+<view class="order">
+<view class="order_box" wx:for="{{driverlist}}" wx:key="workorderId" data-id="{{item.workorderId}}" bind:tap="details">
+<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> -->
+</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>
+<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>
-<view class="examine_bottom">
-<view class="examine_bottompro">
-  <view class="promoter"> 
- <view class="promoter_people">发起人</view>
- <view class="promoter_name">{{item.workorderPromoter}}</view> 
- </view>
- <view class="promoter_right">
-  <view class="promoter_people">发起时间</view>
-  <view class="promoter_name">{{item.workorderStarttime}}</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="promoter_review">
-  <text class="promoter_review_color" wx:if="{{item.workorderType==3&&item.examineType==5}}">待审核</text>
-  <text class="promoter_review_color" wx:if="{{item.workorderType==3&&item.examineType==6}}">审核完成</text>
-  <text class="promoter_review_colors" wx:if="{{item.workorderType==3&&item.examineType==7}}">审核失败</text>
- </view>
+<view class="order_bottom">
+  <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 class="examine_button">
-<view class="examine_buttonleft">通过</view>
-<view class="examine_buttonright">不通过</view>
-</view> -->
-</view>
-<view class="available" wx:if="{{reviewdata.length==0}}">
-<image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
 </view>
 </view>
+<view class="available" wx:if="{{driverlist.length<1}}">
+<image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
+</view> 
 <view style="height: 30rpx;"></view>
-
-<t-popup
-  visible="{{visible}}"
-  bind:visible-change="onVisibleChange"
-  placement="right"
->
-  <view class="filter">
-    <view class="mtinput">
-<input class="uni-mt-5" trim="all" value="{{workorderName}}" clearSize="0"
-										placeholder="请输入工单标题" 	bindinput="onPeakprice"></input>
-</view>
-<view class="owner_type1">
-          <picker mode="date" value="{{datestart}}" start="2000-01-01" end="2060-09-01" bindchange="bindstartChange">
-					<view class="calculation_top">
-						<view class="calculation_left">
-              开始时间
-						</view>
-            <view class="event">
-						<view class="uni-input">{{datestart}}</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-        </view>
-        <view class="owner_type1">
-          <picker mode="date" value="{{dateend}}" start="2000-01-01" end="2060-09-01" bindchange="bindendChange">   
-					<view class="calculation_top">                                                                            
-						<view class="calculation_left">
-              结束时间
-						</view>
-            <view class="event">
-						<view class="uni-input">{{dateend}}</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-        </view>
-        <view class="owner_type1">
-					<picker bindcolumnchange="bindcolumn" bindchange="bindeventChange" value="{{index}}" range="{{array}}">
-          <view class="calculation_top">                                                                            
-						<view class="calculation_left">
-              事件
-						</view>
-            <view class="event">
-						<view class="uni-input">{{array[index]}}</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-        </picker>
-        </view>
- 
-       
-
-        <view class="owner_type11">
-        	<view class="calculation_strategy">
-					工单优先级
-					</view>
-				  <view class="calculation_capsule">
-            <t-radio-group default-value="{{priority}}" value="{{priority}}" borderless t-class="box" bindchange="onradio">
-  <t-radio block="{{false}}" label="低" value="0" />
-  <t-radio block="{{false}}" label="中" value="1" />
-  <t-radio block="{{false}}" label="高" value="2" />
-</t-radio-group>
-					</view>
-        </view>
-        <view class="owner_type11">
-        	<view class="calculation_strategy">
-            审核状态
-					</view>
-				  <view class="calculation_capsule">
-            <t-radio-group default-value="{{examineType}}" value="{{examineType}}" borderless t-class="box" bindchange="onexamineType">
-  <t-radio block="{{false}}" label="成功" value="6" />
-  <t-radio block="{{false}}" label="失败" value="7" />
-</t-radio-group>
-					</view>
-        </view>
-        <view class="workorder_box">
-
-<view class="workorder1" bind:tap="onworkorder">提交</view>
-<view class="workorder1" bind:tap="onreset">重置</view>
-</view>
-  </view>
-</t-popup>
-<!--   -->
+<!---->

pages/tool/index.wxss

@@ -1,6 +1,7 @@
 page {
   background-color: var(--td-bg-color-container);
-  background-color: #f9f9f9;
+  /* background-color: #f9f9f9; */
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
 }
 
 page .round-image {
@@ -11,7 +12,6 @@ page .round-image {
   display: flex;
   height: 100vh;
   overflow: hidden;
-
   --td-grid-item-text-font-size: 24rpx;
 }
 
@@ -83,327 +83,114 @@ box-sizing: border-box;
   top: 0rpx;
   left: 0rpx;
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: space-between;
   background-color: #ffffff;
   box-sizing: border-box;
 }
-.examine_list{
-  padding: 0rpx 20rpx;
-  box-sizing: border-box;
+.order{
+
+padding: 0rpx 20rpx;
+
 }
-.examine_box{
+.order_box{
   width: 100%;
   background-color: #ffffff;
-  padding: 30rpx 0rpx;
-margin-top: 20rpx;
-border-radius: 10rpx;
+padding: 20rpx 20rpx;
 box-sizing: border-box;
-}
-.examine_title{
-  width: 100%;
-  display: flex;
-  align-items: center;
-  padding: 0rpx 0rpx 0rpx 20rpx;
-  box-sizing: border-box;
-}
-.examine_title0{
- width: 120rpx;
- height: 40rpx;
- font-size: 22rpx; 
- display: flex;
- align-items: center;
- justify-content: center;
- border-radius: 30rpx;
- /* background-color: #0F80DC; */
- background-color: rgba(0, 117, 68, 0.2);
- color: #007544;
- 
- border: 1rpx solid #007544;
-box-sizing: border-box;
-}
-.examine_title01{
-  width: 120rpx;
-  height: 40rpx;
-  font-size: 22rpx; 
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 30rpx;
-  /* background-color: #0F80DC; */
-  color:#ee8d60;
-  background-color: rgba(241, 120, 20, 0.2);
+  margin-top: 20rpx;
+  border-radius: 10rpx;
+/*   box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+ */
+box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
 
-  border: 1rpx solid #f39b72;
- box-sizing: border-box;
- }
- .examine_title02{
-  width: 120rpx;
-  height: 40rpx;
-  font-size: 22rpx; 
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 30rpx;
-  /* background-color: #0F80DC; */
-  color:#0F80DC;
-  background-color: rgba(15, 128, 220, 0.2);
-  /* color: #007544; */
-  border: 1rpx solid #0F80DC;
- box-sizing: border-box;
- }
-.examine_title1{
-  flex: 1;
-  font-weight: 600;
-  font-size: 32rpx;
-  display: flex;
-  align-items: center;
-  padding: 0rpx 10rpx;
-  overflow: hidden;
-  display: -webkit-box;
-  text-overflow: ellipsis;
-  box-orient: vertical;
-  -webkit-box-orient: vertical;
-  -moz-box-orient: vertical;
-  -o-box-orient: vertical;
-  -ms-box-orient: vertical;
-  line-clamp: 1; /* 超出2行显示省略号 */
-  -webkit-line-clamp: 1; /* 超出2行显示省略号 */
-  box-sizing: border-box;
-}
-.examine_title2{
-  width: 100rpx;
-  height: 40rpx;
- font-size: 22rpx; 
-  display: flex;
-  align-items: center;
-  justify-content: center;
-border-top-left-radius:100rpx;
-border-bottom-left-radius:100rpx;
-color:#2BB991;
-background: linear-gradient(to bottom, #EAFFFA -40%, #EAFFFA 100%,#F0F5F5 100%);
-  border: 1rpx solid #2BB991;
-  border-right: 0rpx solid #2BB991;
-box-sizing: border-box;
 }
-.process_bj2{
-  width: 100rpx;
-  height: 40rpx;
- font-size: 22rpx; 
-  display: flex;
-  align-items: center;
-  justify-content: center;
-border-top-left-radius:100rpx;
-border-bottom-left-radius:100rpx;
-color:#0F80DC;
-background: linear-gradient(to bottom, #cbe4f8 -40%, #cbe4f8 100%,#F0F5F5 100%);
-  border: 1rpx solid #0F80DC;
-  border-right: 0rpx solid #0F80DC;
-box-sizing: border-box;
-}.process_bj3{
-  width: 100rpx;
-  height: 40rpx;
- font-size: 22rpx; 
-  display: flex;
-  align-items: center;
-  justify-content: center;
-border-top-left-radius:100rpx;
-border-bottom-left-radius:100rpx;
-color:#D1815C;
-
-  background: linear-gradient(to bottom, #FFF6F5 -40%, #FFF6F5 100%,#F0F5F5 100%);
- border: 1rpx solid red;
-  border-right: 0rpx solid red;
-box-sizing: border-box;
-}
-
-.examine_content{
-  flex: 1;
-  font-size: 24rpx;
-  padding: 20rpx 20rpx;
-  margin: 20rpx 20rpx;
-  background-color: #f9f9f9;
-  border-radius: 8rpx;
-  box-sizing: border-box;
-}
-.feedback{
- margin-top: 8rpx;
-}
-
-.examine_bottom{
+.order_title{
+  padding-bottom:12rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  /* padding: 0rpx 20rpx; */
-box-sizing: border-box;
-}
-.examine_bottompro{
-  display: flex;
-  align-items: center;
-  /* padding: 0rpx 20rpx; */
-box-sizing: border-box;
+  border-bottom: 1rpx solid #cccccc;
 }
-.promoter_review{
-  color: #2BB991;
- /* border: 1rpx solid #2BB991; */
- /* border-right: 0rpx solid #2BB991; */
- border-top-left-radius:100rpx;
-border-bottom-left-radius:100rpx;
- padding: 4rpx 10rpx;
- box-sizing: border-box;
-}
-.promoter_review_color{
-  margin-right: 8rpx;
+.order_title1{
+display: flex;
+align-items: center;
 }
-.promoter_review_colors{
-  color: red;
+.order_image {
+  width: 60rpx;
+  height: 60rpx;
+  margin-right: 20rpx;
 }
-.examine_button{
-  width: 100%;
-  padding: 0rpx 20rpx;
-  margin-top: 30rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
+.order_direction{
+  margin-top: 40rpx;
 
 }
-.examine_name{
+.order_text{
   color: #cccccc;
 }
-.t-tabs{
-  background-color: rgba(255, 255, 255, 0);
-}
-.promoter{
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  padding: 0rpx 40rpx;
-  border-right:1rpx solid #cccccc;
-}
-.promoter_name{
+.order_address{
 margin-top: 20rpx;
 }
-.promoter_right{
-  display: flex;
-  flex-direction: column;
-  padding: 0rpx 40rpx;
-}
-.filter{
-  width: 500rpx;
-  padding: 30rpx;
-  box-sizing: border-box;
-
-}
-.mtinput{
-  width: 100%;
-  /* padding: 20rpx; */
-  box-sizing: border-box;
-/* background-color: #ffffff; */
+.order_time{
+margin-top: 20rpx;
 
 }
-.uni-mt-5{
-  width: 100%;
-  height: 80rpx;
-  border-radius: 100rpx;
-  border: 1rpx solid #cccccc;
-  padding: 0rpx 20rpx;
-  box-sizing: border-box;
-}
-.owner_type1 {
-  width: 100%;
-  height: 120rpx;
+.order_bottom{
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  border-bottom: #f0f5f5 1rpx solid;
+  justify-content:space-between;
 }
-.owner_type11 {
-  width: 100%;
-  /* height: 120rpx; */
-  display: flex;
-  flex-direction: column;
-  /* align-items: center; */
-  justify-content: space-between;
-  border-bottom: #f0f5f5 1rpx solid;
-}
-.calculation_strategy {
-  font-size: 26rpx;
-  color: #222;
-  padding: 20rpx 0rpx;
-}
-.calculation_capsule {
-   width: 100%;
-  font-size: 26rpx;
-  color: #222;
-  padding: 10rpx 20rpx;
-}
-.owner_easyinput1 {
-  width: 100%;
-  display: flex;
+.order_view{
+margin-top: 20rpx;
+padding: 10rpx 20rpx;
+color: #ffffff;
+font-weight: 500;
+display: flex;
+align-items: center;
+justify-content: center;
+text-align: right;
+border-radius:50rpx;
+background-color: #00C775;
 }
-.event{
-  /* width: 70%; */
-  display: flex;
-  justify-content: space-between;
-  padding-left: 20rpx;
-  align-items: center;
+.available{
+display: flex;
+ justify-content: center;
+ align-items: center;
 }
-.calculation_top {
+.discharge{
   width: 100%;
-  height: 100%;
-  font-size: 26rpx;
+  margin-top: 100rpx;
   display: flex;
   align-items: center;
-  justify-content: space-between;
-}
-.calculation_left {
-  display: flex;
-  font-size: 28rpx;
-}
-picker{
-  width: 100%;
-}
-.switch-container{
-  width: 100%;
-}
-.t-radio-group{
-  width: 100%;
-}
-.t-radio{
-  margin-right: 40rpx;
-}
-.workorder_box{
-  padding-top:300rpx;
-  display: flex;
-align-items: center;
- flex-direction: column;
-justify-content: center;
-box-sizing: border-box;
-background-color: #ffffff;
+ justify-content: center;
 }
-.workorder1{
-  width: 480rpx;
-  height: 68rpx;
-  font-size: 32rpx;
-  margin-top: 40rpx;
-  background-color: rgba(15, 128, 220, 0.2);
-  color: #0F80DC;
-  border:1rpx solid #0F80DC;
-display: flex;
-align-items: center;
-justify-content: center;
-border-radius: 10rpx;
+.discharge_cheng{
+ padding: 10rpx 40rpx;
+ background-color: #ffffff;
+ color: #EA6E38;
+
+ border-top-left-radius: 10rpx;
+ border-bottom-left-radius: 10rpx;
+ border: 1rpx solid #EA6E38;
+ border-right: 0rpx solid #EA6E38;
 }
-.t-overlay{
-  width: 100%; 
-  height: 100%;
+
+.discharge_fang{
+  padding: 10rpx 40rpx;
+ background-color: #ffffff;
+color: #EA6E38;
+
+ border-top-right-radius: 10rpx;
+ border-bottom-right-radius: 10rpx;
+ border: 1rpx solid #EA6E38;
+ border-left: 0rpx solid #EA6E38;
+
 }
-.available{
+.selected{
+  background-color: #EA6E38;
+ color: #ffffff;
+ }
+.discharge_tabs{
   width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 260rpx;
 }

pages/workorder/index.js

@@ -1,336 +0,0 @@
-// pages/workorder/index.js
-const api = require('../../api/index.js');
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    array:['日常','故障','其他'],
-    namelist:[],
-    typelist:['日常','故障','其他'],
-    devicedata:[],
-    index:1,
-    nameindex:'',
-    typeindex:0,
-    deviceindex:'',
-    date:'',
-    partnerAvite:[],
-    priority:'1',
-    workorderContent:'',
-    switchtype:true,
-    datestart:'',
-    dateend:''
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    console.log(options.name);
-    this.setData({
-      index:options.name
-    })
-this.getselectinformationall()
-this.getselectdevicelist()
-  },
-  onworkorder(){
-
-    if (this.data.workorderName==''||this.data.workorderAddress==''||this.data.dateend==''||this.data.datestart==''||this.data.nameindex==''||this.data.deviceindex=='') {
-      wx.showToast({
-        title: '请填写完整工单',
-        icon: 'none'
-      });
-      return
-    }
-       
-    if (!this.data.switchtype) {
-      return
-    }
-    this.setData({
-      switchtype:false
-    })
-    let data = {
-      workorderName:this.data.workorderName,
-      workorderAddress:this.data.workorderAddress,
-      workorderImg:this.data.partnerAvite.length>0?this.data.partnerAvite.toString():'',
-      workorderContent:this.data.workorderContent,
-      workoderPartner:this.data.namelist[this.data.nameindex].partnerId,
-      workorderEndtime:this.data.dateend,   // 开始时间
-      workorderStarttime:this.data.datestart,  // 结束时间
-      workorderGrade:this.data.priority,
-      type:(this.data.index*1)+1,
-      deviceId:this.data.devicedata[this.data.deviceindex].deviceId
-    }
-    api.request(`/workoder/createworkorder`, 'POST',data)
-    .then((res) => {
-      console.log(res);
-   if (res.code==200) {
-    // this.requestSubscribeMessage();
-    // this.loadMessages();
-    this.setData({
-      switchtype:true
-    })
-     wx.switchTab({
-       url: '/pages/index/index',
-     })
-   }
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况
-      this.setData({
-        switchtype:true
-      })
-    });
-  },
-
-  // 用户信息
-  getselectinformationall(){
-    let data = {
-   
-    }
-    api.request(`/partner/selectinformationall`, 'POST',data)
-    .then((res) => {
-      console.log(res);
-      this.setData({
-        namelist:res.data
-      })
-    })
-    .catch((err) => {
-      console.error('请求失败：', err);
-      // 在这里处理请求失败的情况
-    });
-  },
-    // 设备列表
-    getselectdevicelist(){
-      let data = {
-      }
-      api.request(`/device/selectdevicelist`, 'POST',data)
-      .then((res) => {
-        console.log(res);
-        this.setData({
-          devicedata:res.data
-        })
-      })
-      .catch((err) => {
-        console.error('请求失败：', err);
-        // 在这里处理请求失败的情况
-      });
-    },
-  onPeakprice(e){
-    console.log(e.detail.value);
-    this.setData({
-      workorderName:e.detail.value
-    })
-  },
-  onaddress(e){
-    console.log(e.detail.value);
-    this.setData({
-      workorderAddress:e.detail.value
-    })
-  },
-  ontextarea(e){
-    console.log(e);
-    this.setData({
-      workorderContent:e.detail.value
-    })
-  },
-  bindPickerChange(e){
-    console.log('picker发送选择改变，携带值为', e.detail.value)
-    this.setData({
-      nameindex: e.detail.value
-    })
-  },
-  binddeviceChange(e){
-    console.log('picker发送选择改变，携带值为', e.detail.value)
-    this.setData({
-      deviceindex: e.detail.value,
-      workorderAddress:this.data.devicedata[e.detail.value].devicesName
-    })
-  },
-  bindeventChange(e){
-    this.setData({
-      index: e.detail.value
-    })
-  },
-  // 开始时间
-  bindstartChange: function(e) {
-    console.log('picker发送选择改变，携带值为', e.detail.value)
-    this.setData({
-      datestart: e.detail.value
-    })
-  },
-  // 结束时间
-  bindendChange: function(e) {
-    const selectedEnd = e.detail.value;
-    console.log('picker发送选择改变，携带值为', e.detail.value)
-    const { datestart } = this.data;
-  
-    // 检查结束时间是否早于开始时间
-    if (datestart && selectedEnd < datestart) {
-      wx.showToast({
-        title: '结束时间不能早于开始时间',
-        icon: 'none',
-        duration: 2000
-      });
-      return;  // 不更新结束时间
-    }
-    
-    // 验证通过，更新结束时间
-    this.setData({
-      dateend: selectedEnd
-    });
-  
-  },
-  // 工单优先级 
-  onradio(e){
-console.log(e.detail.value); 
-this.setData({
-  priority:e.detail.value
-})
-  },
-   // 预览图片
-   previewImage(e) {
-    const src = e.currentTarget.dataset.src;
-    wx.previewImage({
-      current: src, // 当前显示图片的http链接
-      urls: [src]   // 需要预览的图片http链接列表
-    });
-  },
-  bindCancel(e){
-    console.log(e.currentTarget.dataset.index);
-    let index = e.currentTarget.dataset.index
-      // 使用 filter 方法创建新数组（推荐）
-  const newPartnerAvite = this.data.partnerAvite.filter((item, i) => i !== index);
-  
-  this.setData({
-    partnerAvite: newPartnerAvite
-  });
-  },
-  // 上传头像--项目--文件1
-bindtoImage(){
-  let _this = this
-  // 先检查隐私授权状态 
-  wx.getPrivacySetting({
-    success: (res) => {
-      if (res.needAuthorization) {
-        // 弹出隐私协议弹窗
-        wx.requirePrivacyAuthorize({
-          success: () => {
-            console.log('用户已同意隐私协议');
-            _this.choosetoImage(); // 继续执行上传
-          },
-          fail: () => {
-            console.log('用户拒绝了隐私协议');
-            wx.showToast({
-              title: '需同意隐私协议才能使用',
-              icon: 'none'
-            });
-          }
-        });
-      } else {
-          _this.choosetoImage(); // 已授权，直接上传
-      }
-    }
-  });
-},
-// 上传头像图片
-choosetoImage() {
-  let _this = this
-  wx.chooseMedia({    
-    count: 1,
-    mediaType: ['image','video'],
-    sourceType: ['album', 'camera'],
-    success(res) {
-      console.log(res);
-      const tempFiles = res.tempFiles;
-      _this.setData({
-        imageList: tempFiles.map(file => file.tempFilePath),
-      });
-      _this.uploadtoImages(tempFiles);
-    },
-    fail(err) {
-      console.error("选择失败:", err);
-    }
-  })
-  },
-  // 上传到服务器
-  uploadtoImages(files) {
-  let _this =this
-  const token = wx.getStorageSync('token');
-  files.forEach((file) => {
-  wx.uploadFile({
-  url: 'https://esos-iot.bjdexn.cn:8443/config/upload/webPost',
-  filePath: file.tempFilePath,
-  name: 'file',
-  formData: {
-    file:file.tempFilePath
-  },
-  header: {
-    'Authorization': 'Bearer ' + token // Also add to header if needed
-  },
-  success: (res) => {
-  console.log(res);
-  const obj = JSON.parse(res.data);
-  this.data.partnerAvite.push(obj.data.partnerAvite)
-  this.setData({
-    partnerAvite:this.data.partnerAvite
-   })
-  },
-  fail: (err) => {
-    console.error('上传失败', err);
-  },
-  });
-  });
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/workorder/index.json

@@ -1,9 +0,0 @@
-{
-  "navigationBarTitleText": "创建工单",
-  "usingComponents": {
-    "t-icon": "tdesign-miniprogram/icon/icon",
-    "t-radio-group": "tdesign-miniprogram/radio-group/radio-group",
-    "t-radio": "tdesign-miniprogram/radio/radio",
-    "t-textarea": "tdesign-miniprogram/textarea/textarea"
-  }
-}

pages/workorder/index.wxml

@@ -1,182 +0,0 @@
-<!--pages/workorder/index.wxml-->
-<view class="setup">
-
-<view class="workorder_list">
-  <view class="owner_type1">
-					<view class="calculation_strategy">
-						<text style="color: red;margin-right: 8rpx;">*</text>工单标题
-					</view>
-					<view class="event">
-						<view class="switch-container">
-							<view class="owner_easyinput1">
-								<view class="calculation_use">
-									<input class="uni-mt-5" trim="all" value="{{workorderName}}" clearSize="0"
-										placeholder="请输入工单标题" 	bindinput="onPeakprice"></input>
-								</view>
-							</view>
- 
-						</view>
-					</view>
-				</view>
-        <view class="owner_type1">
-    <picker bindcolumnchange="bindcolumn" bindchange="bindeventChange" value="{{index}}" range="{{array}}">
-					<view class="calculation_top">
-						<view class="calculation_left">
-              <text style="color: red;margin-right: 8rpx;">*</text>事件
-						</view>
-            <view class="event">
-						<view class="uni-input">{{array[index]}}</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-				
-				</view>
-        <view class="owner_type1">
-          <picker mode="date" value="{{datestart}}" start="2000-01-01" end="2060-09-01" bindchange="bindstartChange">
-					<view class="calculation_top">
-						<view class="calculation_left">
-              <text style="color: red;margin-right: 8rpx;">*</text>
-              开始时间
-						</view>
-            <view class="event">
-						<view class="uni-inputcolor" wx:if="{{datestart==''}}">请选择开始时间</view>
-						<view class="uni-input" wx:else>{{datestart}}</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-        </view>
-        <view class="owner_type1">
-          <picker mode="date" value="{{dateend}}" start="2000-01-01" end="2060-09-01" bindchange="bindendChange">
-					<view class="calculation_top">
-						<view class="calculation_left">
-              <text style="color: red;margin-right: 8rpx;">*</text>
-              结束时间
-						</view>
-            <view class="event">
-						<view class="uni-inputcolor" wx:if="{{dateend==''}}">请选择结束时间</view>
-						<view class="uni-input" wx:else>{{dateend}}</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-        </view>
-
-        <view class="owner_type1">
-          <picker bindcolumnchange="bindcolumn" value="{{nameindex}}" range="{{namelist}}" range-key="partnerName" bindchange="bindPickerChange">
-					<view class="calculation_top">
-						<view class="calculation_left">
-              <text style="color: red;margin-right: 8rpx;">*</text>处理人
-						</view>
-            <view class="event">
-						<view class="uni-input" wx:if="{{namelist[nameindex].partnerName}}">{{namelist[nameindex].partnerName}}</view>
-						<view class="uni-inputcolor" wx:else>请选择处理人</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-        </view>
-        <!-- <view class="owner_type1">
-          <picker bindcolumnchange="bindcolumn" bindchange="bindPickerChange" value="{{typeindex}}" range="{{typelist}}">
-					<view class="calculation_top">
-						<view class="calculation_left">
-              <text style="color: red;margin-right: 8rpx;">*</text>类型
-						</view>
-            <view class="event">
-						<view class="uni-input">{{typelist[typeindex]}}</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-        </view> -->
-        <view class="owner_type1">
-          <picker bindcolumnchange="bindcolumn" bindchange="binddeviceChange" value="{{deviceindex}}" range="{{devicedata}}" range-key="devicesName">
-					<view class="calculation_top">
-						<view class="calculation_left">
-              <text style="color: red;margin-right: 8rpx;">*</text>设备/巡检
-						</view>
-            <view class="event">
-						<view class="uni-input" wx:if="{{devicedata[deviceindex].devicesName}}">{{devicedata[deviceindex].devicesName}}</view>
-						<view class="uni-inputcolor" wx:else>请选择设备/巡检</view>
-							<t-icon name="chevron-right" size="40rpx" data-name="chevron-right"/>
-            </view>
-					</view>
-				</picker>
-        </view>
-       
-        <view class="owner_type1">
-        	<view class="calculation_strategy">
-					<text style="color: red;margin-right: 8rpx;">*</text>工单优先级
-					</view>
-					<view class="calculation_capsule">
-            <t-radio-group default-value="{{priority}}" borderless t-class="box" bindchange="onradio">
-  <t-radio block="{{false}}" label="低" value="1" />
-  <t-radio block="{{false}}" label="中" value="2" />
-  <t-radio block="{{false}}" label="高" value="3" />
-</t-radio-group>
-					</view>
-        </view>
-        <view class="owner_type1">
-					<view class="calculation_strategy">
-						<text style="color: red;margin-right: 8rpx;">*</text>报修地点
-					</view>
-					<view class="event">
-						<view class="switch-container">
-							<view class="owner_easyinput1">
-								<view class="calculation_usebox">
-									<input class="uni-mt-5" trim="all" value="{{workorderAddress}}" clearSize="0"
-										placeholder="请输入报修地点"	bindinput="onaddress"></input>
-               
-								</view>
-							</view>
-
-						</view>
-					</view>
-				</view>
-     
-        <view class="owner_type1x">
-					<view class="calculation_strategy">
-						附件上传
-					</view>
-					<view class="event">
-						<view class="switch-container">
-							<view class="owner_easyinput1">
-              <view class="calculation_imagebox" wx:if="{{partnerAvite}}" wx:for="{{partnerAvite}}" wx:key="index">
-							 <image class="calculation_image" src="{{item}}" mode="aspectFit"  data-src="{{item}}" bindtap="previewImage"/>
-              <t-icon class="calculation_imagex" data-index="{{index}}" bind:tap="bindCancel" name="close-circle" size="30rpx" data-name="close-circle"/>
-              </view>
-								<view class="calculation_usebox1" bind:tap="bindtoImage">
-                    <t-icon name="add" size="100rpx" data-name="add"/>
-								</view>
-							</view>
-              
-						</view>
-					</view>
-				</view>
-        <view class="owner_type2">
-        	<view class="calculation_strategy">
-            <text style="color: red;margin-right: 20rpx;"></text>描述
-					</view>
-					<view class="calculation_capsule1">
-            <t-textarea
-  t-class="external-class"
-  placeholder="请输入描述"
-  maxlength="200"
-  value="{{workorderContent}}"
-  disableDefaultPadding="{{true}}"
-  indicator
-  bindchange="ontextarea"
-/>
-					</view>
-        </view>
-</view>
-
-<view style="height: 200rpx;"></view>
-</view>
-
-<view class="workorder_box">
-
-<view class="workorder" bind:tap="onworkorder">提交</view>
-</view>
-

pages/workorder/index.wxss

@@ -1,160 +0,0 @@
-/* pages/workorder/index.wxss */
-page{
-  width: 100%;
-  height: 100%;
-}
-.setup{
-  width: 100%;
-  /* height: 100%; */
-  background: linear-gradient(to bottom, #0F80DC -40%, #F0F5F5 40%,#F0F5F5 100%);
-  padding: 20rpx 20rpx;
-  box-sizing: border-box;
-}
-.workorder_list{
-background-color: #ffffff;
-border-radius: 10rpx;
-padding: 0rpx 20rpx;
-}
-picker{
-  width: 100%;
-}
-.owner_type1 {
-  width: 100%;
-  height: 120rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-bottom: #f0f5f5 1rpx solid;
-}
-.owner_type1x{
-  width: 100%;
-  padding: 20rpx 0rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-bottom: #f0f5f5 1rpx solid;
-}
-.calculation_strategy {
-  font-size: 26rpx;
-  color: #222;
-  padding: 20rpx 0rpx;
-}
-.calculation_capsule {
-   width: 70%;
-  font-size: 26rpx;
-  color: #222;
-  padding: 10rpx 20rpx;
-}
-.owner_easyinput1 {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap; 
-}
-.uni-mt-5{
-  width: 100%;
-  text-align: left;
-}
-.calculation_use {
-  width: 100%;
-  font-size: 26rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.calculation_top {
-  width: 100%;
-  height: 100%;
-  font-size: 26rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.calculation_left {
-  display: flex;
-  font-size: 28rpx;
-}
-.uni-input{
-  font-size: 28rpx;
-  }
-  .uni-inputcolor{
-    color: #cccccc;
-  }
- .event{
-   width: 70%;
-   display: flex;
-   justify-content: space-between;
-   padding-left: 20rpx;
-   align-items: center;
- }
- .switch-container{
-   width: 100%;
- }
- .t-radio{
-   margin-right: 40rpx;
- }
- .owner_type2 {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  border-bottom: #f0f5f5 1rpx solid;
-}
- .calculation_capsule1 {
-  width: 72%;
- font-size: 26rpx;
- color: #222;
- padding: 20rpx 0rpx;
-}
-.external-class{
-  font-size: 28rpx;
-  height: 200rpx;
-}
-.workorder_box{
-  width: 100%;
-  height: 180rpx;
-  position: fixed;
-  bottom: 0rpx;
-  left: 0rpx;
-  padding-top:30rpx;
-  display: flex;
-/* align-items: center; */
-justify-content: center;
-box-sizing: border-box;
-background-color: #ffffff;
-}
-.workorder{
-  width: 480rpx;
-  height: 80rpx;
-  font-size: 32rpx;
-  background-color: rgba(15, 128, 220, 0.2);
-  color: #0F80DC;
-  border:1rpx solid #0F80DC;
-display: flex;
-align-items: center;
-justify-content: center;
-border-radius: 10rpx;
-}
-.calculation_usebox1 {
-  font-size: 26rpx;
-  display: flex;
-  align-items: center;
-  margin-top: 20rpx;
-  border: 1rpx solid #cccccc;
-  border-radius: 10rpx;
-  /* justify-content: space-between; */
-}
-.calculation_imagebox{
-  width: 120rpx;
- height: 120rpx;
- margin-right: 40rpx;
- position:relative;
-}
-.calculation_imagex{
-position: absolute;
-
-  top: 0rpx;
-  right: 0rpx;
-}
-.calculation_image{
-  width: 120rpx;
-  height: 120rpx;
-}

pages/workorderdetails/index.js

@@ -1,503 +0,0 @@
-// pages/Workorderdetails/index.js
-const api = require('../../api/index.js');
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    first: 1,
-    second: 1,
-    third: 1,
-    visible: false,
-    workorder: [],
-    optionsid: '',
-    workorderId: '',
-    partnerAvite: [],
-    bindreviewtype: '',
-    latitude: null,
-    longitude: null,
-    locationName: '获取中...',
-    checkinStatus: 'waiting', // waiting, success, fail
-    checkinRecords: [],
-    distance: null, // 距离目标点的距离
-    canCheckin: false,
-    showPermissionGuide: null,
-    workorderContent: '',
-    switchtype: false,
-    partnerPosition: wx.getStorageSync('partnerPosition'),
-    scanCode:{},
-    result:''
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-    console.log(options);
-    this.setData({
-      optionsid: options.id,
-      workorderId: options.workorderId
-    })
-    this.onworkorder()
-
-  },
-  // 获取当前位置
-  getCurrentLocation() {
-    const that = this;
-    // 先检查位置权限
-    wx.getSetting({
-      success: (res) => {
-        if (!res.authSetting['scope.userLocation']) {
-          // 如果没有授权，请求授权
-          wx.authorize({
-            scope: 'scope.userLocation',
-            success: () => {
-              that._getLocation();
-            },
-            fail: () => {
-              wx.showModal({
-                title: '位置权限提示',
-                content: '需要位置权限才能使用此功能，是否去设置开启？',
-                success: (res) => {
-                  if (res.confirm) {
-                    wx.openSetting();
-                  }
-                }
-              });
-            }
-          });
-        } else {
-          // 已经授权，直接获取位置
-          that._getLocation();
-        }
-      }
-    });
-  },
-  // 提取获取位置的具体逻辑
-  _getLocation() {
-    const that = this;
-    wx.getLocation({
-      type: 'wgs84',
-      success: (res) => {
-        console.log('位置获取成功:', res);
-        that.setData({
-          latitude: res.latitude,
-          longitude: res.longitude
-        });
-        // that.reverseGeocode(res.latitude, res.longitude);
-        that.checkDistance();
-      },
-      fail: (err) => {
-        console.error('获取位置失败:', err);
-        wx.showToast({
-          title: '获取位置失败，请重试',
-          icon: 'none'
-        });
-      }
-    })
-  },
-  checkDistance() {
-    // this.data.workorder.devicesLatitudelongitude.split(",")
-
-    let position = this.data.workorder.devicesLatitudelongitude;
-    console.log(position);
-    const targetLng = position[0]; // 目标经度
-    const targetLat = position[1]; // 目标纬度
-    const allowedDistance = 100; // 允许打卡距离（米）
-    // longitude: 116.66504838681816      2号楼位置
-    // latitude: 40.088160079721874    2号楼位置
-    // longitude: 116.66504838932426   工位位置
-    // latitude: 40.08816007901852   工位位置
-
-    const distance = this.calculateDistance(
-      this.data.latitude,
-      this.data.longitude,
-      targetLat,
-      targetLng
-    );
-
-    this.setData({
-      distance: distance.toFixed(2),
-      canCheckin: distance <= allowedDistance
-    });
-    console.log(this.data.distance);
-    console.log(this.data.canCheckin);
-  },
-  // 计算两点间距离（Haversine公式）
-  calculateDistance(lat1, lng1, lat2, lng2) {
-    const R = 6371000; // 地球半径（米）
-    const dLat = (lat2 - lat1) * Math.PI / 180;
-    const dLng = (lng2 - lng1) * Math.PI / 180;
-    const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-      Math.cos(lat1 * Math.PI / 180) * Math.cos(lat2 * Math.PI / 180) *
-      Math.sin(dLng / 2) * Math.sin(dLng / 2);
-    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-    return R * c;
-  },
-  onposition() {
-    this.checkLocationPermission();
-
-  },
-  onworkorder() {
-    let _this = this
-    let data = {
-      workorderId: this.data.workorderId,
-      id: this.data.optionsid
-    }
-    api.request(`/workoder/selectsysworkoderid`, 'POST', data)
-      .then((res) => {
-        console.log(res);
-        if (res.code == 200) {
-          if (res.data.workorderImg) {
-            res.data.workorderImg = res.data.workorderImg.split(",")
-          }
-          // console.log(res.data.workoderstationimg==undefined);
-          if (res.data.workoderstationimg) {
-            res.data.workoderstationimg = res.data.workoderstationimg.split(",")
-          }
-          if (res.data.workoderendimg) {
-            res.data.workoderendimg = res.data.workoderendimg.split(",")
-          }
-          if (res.data.devicesLatitudelongitude) {
-            res.data.devicesLatitudelongitude.split(",")
-          } else {
-            res.data.devicesLatitudelongitude = ['116.66504838681816', '40.088160079721874']
-          }
-          this.setData({
-            workorder: res.data
-          })
-          if (res.data.workorderType == 1) {
-            console.log('定位开始');
-            // _this.goToSetting();
-            // this.checkLocationPermission();
-            this.getCurrentLocation();
-
-          }
-
-        }
-
-        // .split(" ")
-      })
-      .catch((err) => {
-        console.error('请求失败：', err);
-        // 在这里处理请求失败的情况
-      });
-  },
-  onFirstChange(e) {
-    this.setData({ first: e.detail.current });
-  },
-  onSecondChange(e) {
-    this.setData({ second: e.detail.current });
-  },
-  onThirdChange(e) {
-    this.setData({ third: e.detail.current });
-  },
-  onstep() {
-    this.setData({
-      visible: true
-    })
-
-
-    // wx.navigateTo({
-    //   url: '/pages/workorderstep/index',
-    // })
-  },
-  // 删除图片
-  bindCancel(e) {
-    console.log(e.currentTarget.dataset.index);
-    let index = e.currentTarget.dataset.index
-    // 使用 filter 方法创建新数组（推荐）
-    const newPartnerAvite = this.data.partnerAvite.filter((item, i) => i !== index);
-
-    this.setData({
-      partnerAvite: newPartnerAvite
-    });
-  },
-  onVisibleChange() {
-    this.setData({
-      visible: false
-    })
-  },
-  ontextarea(e) {
-    this.setData({
-      workorderContent: e.detail.value
-    })
-  },
-  submit() {
-
-    if (!this.data.switchtype) {
-      return
-    }
-    this.setData({
-      switchtype: false
-    })
-    let data = {
-      id: this.data.workorder.id,
-      workoderImg: this.data.partnerAvite.length > 0 ? this.data.partnerAvite.toString() : '',
-      workoderDetails: this.data.workorderContent,
-      devicesRange: this.data.canCheckin ? '到达设备范围' : '不在设备范围'
-    }
-    api.request(`/workoder/addwork`, 'POST', data)
-      .then((res) => {
-        console.log(res);
-        if (res.code == 200) {
-
-          wx.showToast({
-            title: '提交成功',
-            icon: 'success',
-          });
-          this.setData({
-            visible: false,
-            partnerAvite: [],
-            switchtype: true,
-            workorderContent: ''
-          })
-          if (this.data.workorder.workorderType == 2) {
-            wx.reLaunch({
-              url: '/pages/index/index',
-            })
-          }
-          this.onworkorder()
-        }
-
-      })
-      .catch((err) => {
-        console.error('请求失败：', err);
-        this.setData({
-          switchtype: true
-        })
-        // 在这里处理请求失败的情况
-      });
-  },
-  // 审核
-  bindreview(e) {
-    this.setData({
-      bindreviewtype: e.currentTarget.dataset.type
-    })
-    if (e.currentTarget.dataset.type == '不通过') {
-      this.setData({
-        visible: true,
-      })
-      return
-    }
-    let data = {
-      id: this.data.workorder.id,
-      examineType: e.currentTarget.dataset.type,
-      workoderReason: this.data.workorderContent
-    }
-    api.request(`/workoder/examine`, 'POST', data)
-      .then((res) => {
-        console.log(res);
-        if (res.code == 200) {
-          wx.showToast({
-            title: '提交成功',
-            icon: 'success',
-          });
-          this.setData({
-            visible: false
-          })
-          wx.reLaunch({
-            url: '/pages/index/index',
-          })
-          // this.onworkorder()
-        }
-
-      })
-      .catch((err) => {
-        console.error('请求失败：', err);
-        // 在这里处理请求失败的情况
-      });
-  },
-  // 预览图片
-  previewImage(e) {
-    console.log(e);
-    const src = e.currentTarget.dataset.src;
-    wx.previewImage({
-      current: src, // 当前显示图片的http链接
-      urls: [src]   // 需要预览的图片http链接列表
-    });
-  },
-  // 上传头像
-  bindtoImage() {
-    let _this = this
-    // 先检查隐私授权状态
-    wx.getPrivacySetting({
-      success: (res) => {
-        if (res.needAuthorization) {
-          // 弹出隐私协议弹窗
-          wx.requirePrivacyAuthorize({
-            success: () => {
-              console.log('用户已同意隐私协议');
-              _this.choosetoImage(); // 继续执行上传
-            },
-            fail: () => {
-              console.log('用户拒绝了隐私协议');
-              wx.showToast({
-                title: '需同意隐私协议才能使用',
-                icon: 'none'
-              });
-            }
-          });
-        } else {
-          _this.choosetoImage(); // 已授权，直接上传
-        }
-      }
-    });
-  },
-  // 上传头像图片
-  choosetoImage() {
-    let _this = this
-    wx.chooseMedia({
-      count: 1,
-      mediaType: ['image', 'video'],
-      sourceType: ['album', 'camera'],
-      success(res) {
-        console.log(res);
-        const tempFiles = res.tempFiles;
-        _this.setData({
-          imageList: tempFiles.map(file => file.tempFilePath),
-        });
-        _this.uploadtoImages(tempFiles);
-      },
-      fail(err) {
-        console.error("选择失败:", err);
-      }
-    })
-  },
-  // 上传到服务器
-  uploadtoImages(files) {
-    let _this = this
-    const token = wx.getStorageSync('token');
-    files.forEach((file) => {
-      wx.uploadFile({
-        url: 'https://esos-iot.bjdexn.cn:8443/config/upload/webPost',
-        filePath: file.tempFilePath,
-        name: 'file',
-        formData: {
-          file: file.tempFilePath
-        },
-        header: {
-          'Authorization': 'Bearer ' + token // Also add to header if needed
-        },
-        success: (res) => {
-          console.log(res);
-          const obj = JSON.parse(res.data);
-          this.data.partnerAvite.push(obj.data.partnerAvite)
-          this.setData({
-            partnerAvite: this.data.partnerAvite
-          })
-        },
-        fail: (err) => {
-          console.error('上传失败', err);
-        },
-      });
-    });
-  },
-  scancode() {
-    wx.scanCode({
-      onlyFromCamera:true,
-      success: (res) => {
-        console.log(res);
-       let rawData = this.data.workorder.devicesQrcode.split(",")
-        console.log(rawData);
-        for (let index = 0; index < rawData.length; index++) {
-            if (rawData[index] ==res.rawData) {
-              this.setData({
-                switchtype:true,
-                result:res.result
-              })
-              return
-            }
-        }
-        wx.showToast({
-          title: '没有匹配到设备码',
-          icon: 'none'
-        });
-     
-        console.log(this.data.scanCode);
-      },
-      fail: (err) => {
-        console.log(err);
-        wx.showToast({
-          title: '扫码失败',
-          icon: 'none'
-        });
-      }
-    })
-  },
-  onqrcode(e){
-    console.log(e.target.dataset.name);
-    // console.log(this.data.scanCode.result);
-  // 优化后的复制代码，增加错误处理
-wx.setClipboardData({
-  data: e.target.dataset.name,
-  success (res) {
-    console.log('设置剪贴板成功', res)
-    wx.showToast({
-      title: '复制成功',
-      icon: 'none'
-    });
- 
-  },
-  fail (err) {
-    console.error('设置剪贴板失败:', err)
-    wx.showToast({
-      title: '复制失败，请重试',
-      icon: 'none'
-    });
-  }
-})
- 
- 
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/workorderdetails/index.json

@@ -1,13 +0,0 @@
-{
-  "navigationBarTitleText": "工单详情",
-  "component": true,
-  "styleIsolation": "apply-shared",
-  "usingComponents": {
-    "t-steps": "tdesign-miniprogram/steps/steps",
-    "t-step-item": "tdesign-miniprogram/step-item/step-item",
-    "t-popup": "tdesign-miniprogram/popup/popup",
-    "t-button": "tdesign-miniprogram/button/button",
-    "t-icon": "tdesign-miniprogram/icon/icon",
-    "t-textarea": "tdesign-miniprogram/textarea/textarea"
-  }
-}

pages/workorderdetails/index.wxml

@@ -1,174 +0,0 @@
-<!--pages/Workorderdetails/index.wxml-->
-<view class="process_bj1" wx:if="{{workorder.workorderType==1&&workorder.examineType==4}}">
-<view class="process_name">待处理...</view>
-
-<image class="process_tp" src="https://esos-iot.bjdexn.cn/myminio/project/b5f745598db6435aac98a4a2b31284d3.png" mode="aspectFit"/>
-</view>
-<view class="process_bj2" wx:if="{{workorder.workorderType==2&&workorder.examineType==4}}">
-<view class="process_name">处理中...</view>
-<image class="process_tp" src="https://esos-iot.bjdexn.cn/myminio/project/40dbc668f38a4208940e76a120477467.png" mode="aspectFit"/>
-</view>
-<view class="process_bj3" wx:if="{{workorder.workorderType==3&&workorder.examineType==5}}">
-<view class="process_name">待审核...</view>
-<image class="process_tp" src="https://esos-iot.bjdexn.cn/myminio/project/746fd45617b0466cbbe138d8e6dc0567.png" mode="aspectFit"/>
-</view>
-<view class="process_bj4" wx:if="{{workorder.examineType==6}}">
-<view class="process_name">审核成功...</view>
-<image class="process_tp" src="https://esos-iot.bjdexn.cn/myminio/project/a76948bfa5094d4c90e2a4c5514481e1.png" mode="aspectFit"/>
-</view>
-<view class="process_bj5" wx:if="{{workorder.examineType==7}}">
-<view class="process_name">审核失败...</view>
-<image class="process_tp" src="https://esos-iot.bjdexn.cn/myminio/project/8de18dd8fd204b2d95477a2f2f890ba8.png" mode="aspectFit"/>
-</view>
-<!-- <view class="flow_box">
-  <view class="block">
-  <view class="flowflow_name">工单流程</view>
-  <t-steps layout="vertical" current="{{first}}" bind:change="onFirstChange">
-    <t-step-item title="张三创建维修工单" content="2025-11-12 12:11:22"/>
-    <t-step-item title="李四开始处理工单" content="2025-11-12 12:11:22"/>
-    <t-step-item title="工单处理中" content="2025-11-12 12:11:22"/>
-    <t-step-item title="工单处理完成" content="2025-11-12 12:11:22"/>
-    <t-step-item title="工单待审核" content="2025-11-12 12:11:22"/>
-    <t-step-item title="工单审核成功" content="2025-11-12 12:11:22"/>
-    <t-step-item title="工单审核失败" content="2025-11-12 12:11:22"/>
-  </t-steps>
-</view>
-</view> -->
-<view class="flow_box">
-  <view class="flowflow">
-<!-- <view class="flowflow_name">工单信息</view> -->
-<view class="flow_content"> 
-<!--  -->
-<view class="order" wx:if="{{workorder.workoderReason!=''&&workorder.workoderReason!=null}}"><view class="workorder">审核失败原因：</view><view>{{workorder.workoderReason||'--'}}</view> </view>
-
-
-<view class="order"  wx:if="{{workorder.examineCount!=0&&workorder.examineCount!=null&&workorder.workoderReason==''&&workorder.workoderReason==null}}"><view class="workorder">退回工单原因：</view><view>{{workorder.lastfail||'--'}}</view> </view>
-<view class="order" data-name="{{workorder.workorderName}}" bind:tap="onqrcode"><view class="workorder">工单名称：</view> {{workorder.workorderName}}</view>
-
-<view class="order"><view class="workorder">工单所属：</view> {{workorder.powerstationname}} > {{workorder.devicesname}}</view>
-<view class="order"><view class="workorder">创建人：</view> {{workorder.promotername}}</view>
-<view class="order"><view class="workorder">工单类型：</view> <text wx:if="{{workorder.type==1}}">日常</text><text wx:if="{{workorder.type==2}}">故障</text> <text wx:if="{{workorder.type==3}}">其他</text>  </view>
-<view class="order"><view class="workorder">工单开始时间：</view> {{workorder.workorderStarttime}}</view>
-<view class="order"><view class="workorder">工单结束时间：</view> {{workorder.workorderEndtime}}</view>
-<view class="order"><view class="workorder">工单编号：</view> {{workorder.workorderId}}</view>
-<view class="order"><view class="workorder">创建时间：</view>{{workorder.workorderTime}}</view>
-<view class="order"><view class="workorder">位置：</view>{{workorder.workorderAddress}}</view>
-<view class="order"><view class="workorder">问题描述：</view>{{workorder.workorderContent}}</view>
-<view class="order"><view class="workorder">故障照片：</view><image wx:for="{{workorder.workorderImg}}" wx:key="index" class="workorderimg" src="{{item}}" mode="aspectFit" data-src="{{item}}" bindtap="previewImage"/></view>
-</view>
-</view>
-<view class="block">
-  <view class="order"><view class="workorder">处理人：</view>{{workorder.partnername}}</view>
-<view class="order"><view class="workorder">当前状态：</view>
- <text wx:if="{{workorder.workorderType==1}}">待处理</text> 
- <text wx:if="{{workorder.workorderType==2}}">处理中</text> 
- <text wx:if="{{workorder.workorderType==3}}">工单完成</text> 
- 
- </view>
- <view class="order"><view class="workorder">地点签到：</view>{{workorder.devicesRange||'--'}}</view>
-
- <view class="order" wx:if="{{workorder.workorderType==3}}"><view class="workorder">审核状态：</view>
- <text wx:if="{{workorder.examineType==5}}">待审核</text> 
- <text wx:if="{{workorder.examineType==6}}">审核完成</text> 
- <text wx:if="{{workorder.examineType==7}}">审核失败</text> 
- </view>
-<view class="order"><view class="workorder">处理前照片：</view>
-<view wx:if="{{workorder.workoderstationimg}}">
-  <image wx:for="{{workorder.workoderstationimg}}" wx:key="index" class="workorderimg" src="{{item}}" mode="" data-src="{{item}}" bindtap="previewImage"/>
-</view>
-<text wx:else>--</text>
-</view>
-<view class="order"><view class="workorder">处理后照片：</view>
-<view wx:if="{{workorder.workoderendimg}}">
-<image wx:for="{{workorder.workoderendimg}}" wx:key="index" class="workorderimg" src="{{item}}" mode="" data-src="{{item}}" bindtap="previewImage"/>
-</view>
-<text wx:else>--</text>
-</view>
-
-<view class="order"><view class="workorder">处理开始时间：</view>{{workorder.workodersubmittime||'--'}}</view>
-<view class="order"><view class="workorder">处理结束时间：</view>{{workorder.workoderResulttime||'--'}}</view>
-<view class="order"><view class="workorder">反馈：</view>{{workorder.workoderendContent||'--'}}</view>
-
-  </view>
-</view>
-<view style="height: 130rpx;" wx:if="{{workorder.examineType!=6&&workorder.examineType!=7}}"></view>
-<view style="height: 60rpx;"></view>
-<view class="step" wx:if="{{workorder.examineType!=6&&workorder.examineType!=7}}">
-<view class="step_button" bind:tap="onstep" wx:if="{{workorder.workorderType==1&&partnerPosition.partnerId == workorder.workoderPartnerId&&partnerPosition.partnerId == workorder.workoderPartnerId}}">开始工单</view>
-<view class="step_button" bind:tap="onstep" wx:if="{{workorder.workorderType==2&&partnerPosition.partnerId == workorder.workoderPartnerId}}">提交工单</view>
-<!-- <view class="step_button" bind:tap="onstep" wx:if="{{workorder.workorderType==3}}">待审核</view> -->
-<view class="onreview" wx:if="{{workorder.workorderType==3&&workorder.examineType==5&&workorder.permission==1&&partnerPosition.partnerId == workorder.workorderPromoterId}}">
-  <view class="step_buttonfailure" data-type="不通过" bind:tap="bindreview">不通过</view>
-  <view class="step_button" data-type="6" bind:tap="bindreview">通过</view>
-</view>
-</view>
-<t-popup
-  visible="{{visible}}"
-  bind:visible-change="onVisibleChange"
-  placement="bottom"
->
-  <view class="popup_box">
-    <view class="Scan_problem">
-<view class="Scan_feedback1" wx:if="{{workorder.workorderType==1}}">
- <view class="Scan_width"><t-icon name="qrcode" size="40rpx" data-name="qrcode"/><view class="Scancode_left"><text style="color: red;">*</text>设备码</view> </view>
-  <view class="Scancode_right1" wx:if="{{!switchtype}}" bind:tap="scancode"><view><t-icon name="scan" size="100rpx" data-name="scan"/></view> <view class="Scancode_lefticon1">
-   点击扫码</view> </view>
-   <view wx:else>{{result}}</view>
-</view>
-<!-- <view bind:tap="onqrcode">
-{{scanCode.result}}|{{scanCode.rawData}}
-</view> -->
-<view class="Scan_feedback1" wx:if="{{workorder.workorderType==1}}">
- <view class="Scan_width"><t-icon name="map-information-2" size="40rpx" data-name="map-information-2"/><view class="Scancode_left"><text style="color: red;">*</text>设备范围</view> </view>
-  <view class="Scancode_right1">
-   <view class="Scancode_lefticon1" wx:if="{{canCheckin}}">
-   <!-- {{distance}}米 -->
-   <text class="position_left">到达范围</text></view>
-   <view class="Scancode_lefticon1" wx:else>
-   <!-- {{distance}}米 -->
-   <text class="position_left">不在范围</text></view>
-    </view> <view class="position" bind:tap="onposition"><t-icon name="refresh" size="40rpx" data-name="refresh"/> <text class="position_left">刷新</text> </view>
-</view>
-<view class="Scan_feedback" wx:if="{{workorder.examineType==4}}">
-<view class="Scan_width"><t-icon name="image" size="40rpx" data-name="image"/>
-<view class="Scancode_left" wx:if="{{workorder.workorderType==1}}">处理前图片</view> 
-<view class="Scancode_left" wx:if="{{workorder.workorderType==2}}">处理后图片</view> 
-</view>
-<view class="calculation_imagebox" wx:if="{{partnerAvite}}" wx:for="{{partnerAvite}}" wx:key="index">
-  <image class="Scan_image" wx:if="{{partnerAvite}}" src="{{item}}" mode="aspectFit" data-src="{{item}}" bindtap="previewImage"/>
-              <t-icon class="calculation_imagex" data-index="{{index}}" bind:tap="bindCancel" name="close-circle" size="30rpx" data-name="close-circle"/>
-              </view>
-
- <!-- <image class="Scan_image" src="https://esos-iot.bjdexn.cn/myminio/project/8c06ea7e8bfe4b49ab1e3a60132dda3a.jpg" mode=""/>
- <image class="Scan_image" src="https://esos-iot.bjdexn.cn/myminio/project/8c06ea7e8bfe4b49ab1e3a60132dda3a.jpg" mode=""/> -->
-<view class="Scancode_lefticon" bind:tap="bindtoImage">
-  <t-icon name="add" size="60rpx" data-name="add"/>
- </view>
-</view>
-<view class="Scan_feedback" wx:if="{{workorder.workorderType==2||bindreviewtype=='不通过'}}">
-<view class="Scan_width"><t-icon name="chat-message" size="40rpx" data-name="chat-message"/>
-<view class="Scancode_left">问题反馈</view>
- </view>
-  <view class="Scancode_textarea"><t-textarea
-  t-class="external-class"
-  placeholder="请输入描述"
-  maxlength="200"
-  value="{{workorderContent}}"
-
-  disableDefaultPadding="{{true}}"
-  indicator
-  bindchange="ontextarea"
-/></view>
-</view>
-</view>
-<view class="onstep">
-<view class="onstepbutton" bind:tap="submit" wx:if="{{workorder.workorderType==1&&switchtype}}">开始处理</view>
-<view class="onstepbuttonccc" wx:if="{{workorder.workorderType==1&&!switchtype}}">开始处理</view>
-<view class="onstepbutton" bind:tap="submit" wx:if="{{workorder.workorderType==2}}">完成处理</view>
-<view class="step_buttonfailure" wx:if="{{bindreviewtype=='不通过'}}" data-type="7" bind:tap="bindreview">不通过</view>
-</view>
-  </view>
-</t-popup>
-<!-- 
-  
- -->

pages/workorderdetails/index.wxss

@@ -1,285 +0,0 @@
-/* pages/Workorderdetails/index.wxss */
-page{
-  width: 100%;
-  height: 100%;
-background: linear-gradient(to bottom, #f9f9f9 -40%, #f9f9f9 100%,#F0F5F5 100%);
-/* background-color: #0F80DC; */
-}
-.process_bj1{
-width: 100%;
-height: 180rpx;
-display: flex;
-align-items: center;
-justify-content: space-around;
-/* background-color: #cccccc; */
-color:#2BB991;
-background: linear-gradient(to bottom, #EAFFFA -40%, #EAFFFA 100%,#F0F5F5 100%);
-}
-.process_bj2{
-  width: 100%;
-  height: 180rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  /* background-color: #cccccc; */
-  color:#0F80DC;
-  background: linear-gradient(to bottom, #cbe4f8 -40%, #cbe4f8 100%,#F0F5F5 100%);
-}
-.process_bj3{
-  width: 100%;
-  height: 180rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  /* background-color: #cccccc; */
-color:#D1815C;
-
-  background: linear-gradient(to bottom, #FFF6F5 -40%, #FFF6F5 100%,#F0F5F5 100%);
-}
-.process_bj4{
-  width: 100%;
-  height: 180rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  /* background-color: #cccccc; */
-color:#0F80DC;
-
-  background: linear-gradient(to bottom, #cbe4f8 -40%, #cbe4f8 100%,#F0F5F5 100%);
-}
-.process_bj5{
-  width: 100%;
-  height: 180rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  /* background-color: #cccccc; */
-color:#D1815C;
-
-  background: linear-gradient(to bottom, #FFF6F5 -40%, #FFF6F5 100%,#F0F5F5 100%);
-}
-.process_tp{
-  width: 88rpx;
-  height: 88rpx;
-}
-.process_name{
-  font-size: 42rpx;
-}
-.flow_box{
-  padding: 20rpx 20rpx 0rpx 20rpx;
-box-sizing: border-box;
-}
-.block {
-  background-color: var(--bg-color-demo);
-  padding: 32rpx;
-  margin: 2rpx 0 0rpx;
-background-color: #ffffff;
-border-radius: 10rpx;
-
-}
-.flowflow{
-width: 100%;
-padding: 16rpx;
-margin-bottom: 20rpx;
-border-radius: 10rpx;
-background-color: #ffffff;
-box-sizing: border-box;
-}
-.flowflow_name{
-  font-size: 32rpx;
-  margin-bottom: 30rpx;
-}
-.flow_content{
-  padding: 0rpx 20rpx;
-}
-.order{
-  display: flex;
-  margin-top: 20rpx;
-}
-.workorder{
-  width: 200rpx;
-  min-width: 200rpx;
-  font-size: 28rpx;
-  color: #cccccc;
-}
-.workorderimg{
-  width: 100rpx;
-  height: 100rpx;
-  margin-right: 20rpx;
-}
-.step{
-  width: 100%;
-  height: 160rpx;
-  display: flex;
-  /* align-items: center; */
-  justify-content: center;
-  padding-top: 20rpx;
-  position: fixed;
-  bottom: 0rpx;
-  left: 0rpx;
-  background-color: #ffffff;
-box-sizing: border-box;
-}
-.step_button{
-  width: 260rpx;
-  height: 88rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #ffffff;
-  background-color: #0F80DC;
-  border-radius: 100rpx;
-}
-.step_buttonfailure{
-  width: 260rpx;
-  height: 88rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #ffffff;
-  background-color: #e67373;
-  border-radius: 100rpx;
-}
-.popup_box{
-  width: 100%;
-  height: 600rpx;
-  padding: 20rpx;
-  box-sizing: border-box;
-}
-
-.Scan_problem{
-  padding:0rpx 30rpx 20rpx 30rpx;
-  margin-top: 40rpx;
-  background-color: #ffffff;
-}
-.Scan_problemname{
-  font-size: 32rpx;
-  color: #999999;
-}
-.Scan_handle{
-  display: flex;
-  font-size: 28rpx;
-  margin-top: 30rpx;
-  color: #999999;
-}
-.Scancode_right{
-  display: flex;
-}
-.Scancode_right1{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.Scancode_left{
-  margin-left: 6rpx;
-}
-.Scancode_lefticon1{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-left: 20rpx;
-}
-.Scan_image{
-  width: 100rpx;
-  height: 100rpx;
-  margin-right: 20rpx;
-  border-radius: 10rpx;
-
-}
-.Scancode_lefticon{
-  width: 100rpx;
-  height: 100rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border: 1rpx solid #cccccc;
-  border-radius: 10rpx;
-}
-.Scan_feedback{
-  display: flex;
-  font-size: 28rpx;
-  margin-top: 40rpx;
-  color: #222222;
-  box-sizing: border-box;
-}
-.Scan_feedback1{
-  display: flex;
-  font-size: 28rpx;
-  margin-top: 40rpx;
-  color: #222222;
-}
-.Scan_width{
- width: 200rpx; 
- min-width: 200rpx;
- display: flex;
- align-items: center;
-}
-.Scancode_textarea{
-  width: 100%;
- height: 160rpx; 
-border: 1rpx solid #cccccc;
-padding: 0rpx;
-border-radius: 10rpx;
-font-size: 26rpx;
-}
-
-.external-class{
-  width: 100%;
- height: 160rpx; 
-
-}
-.onstep{
-  position: fixed;
-  left: 0rpx;
-  bottom: 60rpx;
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.onstepbutton{
-width: 400rpx;
-height: 80rpx;
-display: flex;
-align-items: center;
-justify-content: center;
-border-radius: 100rpx;
-color: #ffffff;
-background-color: #0F80DC;
-}
-.onstepbuttonccc{
-  width: 400rpx;
-  height: 80rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 100rpx;
-  color: #222222;
-  background-color: #cccccc;
-  }
-.onreview{
-  width: 100%;
-  display: flex;
-  padding: 0rpx 40rpx;
- justify-content: space-around;
-    /* justify-content: space-between; */
-}
-.calculation_imagebox{
-  width: 120rpx;
- height: 120rpx;
- margin-right: 40rpx;
- position:relative;
-}
-.calculation_imagex{
-position: absolute;
-
-  top: 0rpx;
-  right: 0rpx;
-}
-.position{
-margin-left: 60rpx;
-display: flex;
-}
-.position_left{
-  margin-left: 10rpx;
-}

pages/workorderstep/index.json

@@ -1,8 +0,0 @@
-{
-  "usingComponents": {
-    "t-icon": "tdesign-miniprogram/icon/icon",
-    "t-steps": "tdesign-miniprogram/steps/steps",
-    "t-step-item": "tdesign-miniprogram/step-item/step-item",
-    "t-textarea": "tdesign-miniprogram/textarea/textarea"
-  }
-}

pages/workorderstep/index.wxml

@@ -1,51 +0,0 @@
-<view class="Scanbox">
-  <view class="block">
-  <t-steps current="{{first}}" bind:change="onFirstChange">
-    <!-- <t-step-item wx:for="{{4}}" wx:key="index" title="{{_.getText(first, index)}}" content="辅助信息" /> -->
-    <t-step-item title="待处理" />
-    <t-step-item title="处理中" />
-    <t-step-item title="处理完成" />
-  </t-steps>
-</view>
-<view class="Scan_problem">
- <!-- <view class="Scan_problemname">工单信息</view> -->
- <view class="Scan_feedback1" style="color: #999999;">工单编号：123456789</view>
- <view class="Scan_handle">工单标题：光伏板损坏</view>
- <view class="Scan_handle">报修设备：光伏板</view>
- <view class="Scan_handle">工单优先级：高</view>
- <view class="Scan_handle">工单类型：故障</view>
- <view class="Scan_handle">工单地点：光伏矩阵1号</view>
- <view class="Scan_handle">工单描述：更换新的光伏板损坏</view>
- <view class="Scan_handle">报修图片：<image class="Scan_image" src="https://esos-iot.bjdexn.cn/myminio/project/8c06ea7e8bfe4b49ab1e3a60132dda3a.jpg" mode=""/></view>
-</view>
-<view class="Scan_problem">
-<view class="Scan_feedback1">
- <view class="Scan_width"><t-icon name="qrcode" size="40rpx" data-name="qrcode"/><view class="Scancode_left">设备码</view> </view>
-  <view class="Scancode_right"><t-icon name="scan" size="40rpx" data-name="scan"/> <view class="Scancode_left">点击扫码</view> </view>
-</view>
-<view class="Scan_feedback">
-<view class="Scan_width"><t-icon name="image" size="40rpx" data-name="image"/><view class="Scancode_left">处理前图片</view> </view>
- <image class="Scan_image" src="https://esos-iot.bjdexn.cn/myminio/project/8c06ea7e8bfe4b49ab1e3a60132dda3a.jpg" mode=""/>
- <image class="Scan_image" src="https://esos-iot.bjdexn.cn/myminio/project/8c06ea7e8bfe4b49ab1e3a60132dda3a.jpg" mode=""/>
- <image class="Scan_image" src="https://esos-iot.bjdexn.cn/myminio/project/8c06ea7e8bfe4b49ab1e3a60132dda3a.jpg" mode=""/>
-<view class="Scancode_lefticon">
-  <t-icon name="add" size="60rpx" data-name="add"/>
- </view>
-</view>
-<view class="Scan_feedback">
-<view class="Scan_width"><t-icon name="chat-message" size="40rpx" data-name="chat-message"/><view class="Scancode_left">问题反馈</view> </view>
-  <view class="Scancode_textarea"><t-textarea
-  t-class="external-class"
-  placeholder="请输入描述"
-  maxlength="200"
-  disableDefaultPadding="{{true}}"
-  indicator
-/></view>
-</view>
-</view>
-<view class="onstep">
-<view class="onstepbutton">开始处理</view>
-
-</view>
-
-</view>

pages/workorderstep/index.wxss

@@ -1,95 +0,0 @@
-/* pages/workorderstep/index.wxss */
-page{
-  width: 100%;
-  /* height: 100%; */
-  background-color: #f9f9f9;
-}
-.block{
-  margin-top: 30rpx;
-}
-.Scancode{
-  display: flex;
-  padding: 30rpx;
-  margin-top: 40rpx;
-}
-.Scancode_left{
-  margin-left: 10rpx;
-
-}
-.Scancode_lefticon{
-  width: 100rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border: 1rpx solid #cccccc;
-}
-.Scancode_right{
-  display: flex;
-  align-items: center;
-}
-.Scan_problem{
-  padding:20rpx 30rpx 20rpx 30rpx;
-  margin-top: 40rpx;
-  background-color: #ffffff;
-}
-.Scan_problemname{
-  font-size: 32rpx;
-  color: #999999;
-}
-.Scan_handle{
-  display: flex;
-  font-size: 28rpx;
-  margin-top: 30rpx;
-  color: #999999;
-}
-.Scan_image{
-  width: 100rpx;
-  height: 100rpx;
-  margin-right: 20rpx;
-}
-.Scan_feedback{
-  display: flex;
-  font-size: 28rpx;
-  margin-top: 40rpx;
-  color: #222222;
-}
-.Scan_feedback1{
-  display: flex;
-  font-size: 28rpx;
-  margin-top: 20rpx;
-  color: #222222;
-}
-.Scan_width{
- width: 200rpx; 
- min-width: 200rpx;
- display: flex;
-}
-.Scancode_textarea{
-  width: 100%;
- height: 100rpx; 
-
-}
-.external-class{
-  width: 100%;
- height: 100rpx; 
-
-}
-.onstep{
-  position: fixed;
-  left: 0rpx;
-  bottom: 60rpx;
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.onstepbutton{
-width: 400rpx;
-height: 80rpx;
-display: flex;
-align-items: center;
-justify-content: center;
-border-radius: 100rpx;
-color: #ffffff;
-background-color: #0F80DC;
-}

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "partner_wx",
+  "projectname": "movecar_wx",
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
@@ -23,13 +23,6 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/login/index",
-          "pathName": "pages/login/index",
-          "query": "",
-          "scene": null,
-          "launchMode": "default"
-        },
-        {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
           "query": "",