节前备份

api/index.js

@@ -1,8 +1,7 @@
 // api.jshttp://zlink.bjdexn.cn
 // const baseUrl = 'http://192.168.8.102:8088';  // 替换为您的接口基础 URL
-const esosUrl = 'https://esos-iot.bjdexn.cn';  // 线上
-const baseUrl = 'https://esos-iot.bjdexn.cn:9443';  // 线上
-
+const esosUrl = 'https://esos-iot.com';  // 线上
+const baseUrl = 'https://esos-iot.com:9443';  // 线上
 // const baseUrl = 'http://192.168.8.105:8888';  // 替换为您的接口基础 URL
 //  
 // 封装网络请求方法 
@@ -17,7 +16,7 @@ function request(url, method, data, options = {}) {
     const header = {
       'Content-Type': 'application/x-www-form-urlencoded'
     };
-
+// -- // 
     // 非公共接口需携带 Token
     if (!isPublic) {
       const token = wx.getStorageSync('token');

app.js

@@ -114,7 +114,7 @@ App({
         console.error('用户operationId不存在，无法连接WebSocket');
         return;
       }
-      const wsUrl = `wss://esos-iot.bjdexn.cn:9443/communication/update/${operationId}`;
+      const wsUrl = `wss://esos-iot.com:9443/communication/update/${operationId}`;
       that.wsService.connect(wsUrl);
     }
   },
@@ -150,7 +150,7 @@ App({
         console.log(`尝试重连 in ${delay}ms...`);
         const { operationId, operationRole } = that.globalData.userInfo; // 修复：用 operationId 而非 userId
         if (operationId) {
-          const wsUrl = `wss://esos-iot.bjdexn.cn:9443/communication/update/${operationId}`;
+          const wsUrl = `wss://esos-iot.com:9443/communication/update/${operationId}`;
           that.wsService.connect(wsUrl);
         }
         delay = Math.min(delay * 2, 8000);
@@ -181,15 +181,15 @@ App({
       return;
     }
 
-    // 如果已经在为当前订单上传，则忽略
+    // 如果已经在为当前工单上传，则忽略
     if (service.isTracking && service.currentWorkorderId === workorderId) {
-      console.log(`已经在为订单 ${workorderId} 上传位置`);
+      console.log(`已经在为工单 ${workorderId} 上传位置`);
       return;
     }
 
-    // 如果已经在为其他订单上传，先停止
+    // 如果已经在为其他工单上传，先停止
     if (service.isTracking && service.currentWorkorderId !== workorderId) {
-      console.log(`当前正在为订单 ${service.currentWorkorderId} 上传，切换到 ${workorderId}，先停止旧定位`);
+      console.log(`当前正在为工单 ${service.currentWorkorderId} 上传，切换到 ${workorderId}，先停止旧定位`);
       this.stopDriverLocationUpload();
     }
 
@@ -231,9 +231,9 @@ App({
   /**
    * 私有方法：执行真正的定位启动逻辑（核心修复：兼容低版本，改用 wx.onLocationChange）
    */
-  // 
+ 
   _doStartLocationUpload(workorderId, service) {
-    console.log(`开始为订单 ${workorderId} 启动后台定位上传...`);
+    console.log(`开始为工单 ${workorderId} 启动后台定位上传...`);
     service.currentWorkorderId = workorderId;
 
     // 修复1：先移除旧的定位监听（防止重复监听）
@@ -314,7 +314,7 @@ console.log(distance);
       return;
     }
 
-    console.log(`停止为订单 ${service.currentWorkorderId} 上传位置`);
+    console.log(`停止为工单 ${service.currentWorkorderId} 上传位置`);
 
     // 1. 移除位置监听（wx.onLocationChange 对应 wx.offLocationChange）
     this._removeLocationListener();
@@ -366,7 +366,7 @@ console.log(distance);
     const isLngValid = location.longitude >= 73.66 && location.longitude <= 135.05;
 
     if (!isLatValid || !isLngValid) {
-      console.warn(`无效位置信息（订单: ${workorderId}），跳过上传`, location);
+      console.warn(`无效位置信息（工单: ${workorderId}），跳过上传`, location);
       return;
     }
 
@@ -383,10 +383,10 @@ console.log(distance);
         if (response.code !== 200) {
           throw new Error(`响应码异常: ${response.code}`);
         }
-        console.log(`位置上传成功 (订单: ${workorderId})`, data);
+        console.log(`位置上传成功 (工单: ${workorderId})`, data);
       })
       .catch((err) => {
-        console.error(`位置上传失败（第${retryCount+1}次）(订单: ${workorderId})`, err);
+        console.error(`位置上传失败（第${retryCount+1}次）(工单: ${workorderId})`, err);
         if (retryCount < maxRetry) {
           setTimeout(() => {
             this._uploadLocation(location, workorderId, retryCount + 1);
@@ -418,5 +418,4 @@ wx.$off = function (eventName, callback) {
     this.$events[eventName] = [];
   }
 };
-// 司机端增加人脸识别与指纹识别，
-// 云平台12月份电价整理
+

app.json

@@ -3,7 +3,9 @@
     "pages/index/index",
     "pages/setup/index",
     "pages/tool/index",
-    "pages/equipment/index"
+    "pages/equipment/index",
+    "pages/balance/index",
+    "pages/details/index"
   ],
   "requiredBackgroundModes": ["location"],
  
@@ -43,7 +45,7 @@
   "componentFramework": "glass-easel",
   "sitemapLocation": "sitemap.json",
   "lazyCodeLoading": "requiredComponents",
-  "__usePrivacyCheck__": true,
+  "functionalPages": true,
   "tabBar": {
     "selectedColor": "#00C775",
     "list": [
@@ -55,7 +57,7 @@
       },
       {
         "pagePath": "pages/tool/index",
-        "text": "订单",
+        "text": "工单",
         "iconPath": "static/55.png",
         "selectedIconPath": "static/66.png"
       },
@@ -74,10 +76,12 @@
       "name": "user",
       "pages": [
         "pages/login/index",
+        "pages/register/index",
         "pages/privacy/index",
         "pages/userlist/index",
         "pages/captcha/index",
         "pages/slide-confirm/index"
+        
       ]
     },
     {
@@ -88,15 +92,17 @@
         "pages/driver/index",
         "pages/address/index",
         "pages/newaddress/index",
-        "pages/mapSelect/index"
-        
+        "pages/mapSelect/index",
+        "pages/order/index",
+        "pages/payment/index"
       ]
     },
     {
       "root": "package-setup",
       "name": "setup",
       "pages": [
-        "pages/setuplevel/index"
+        "pages/setuplevel/index",
+        "pages/electricity/index"
       ]
     },
     {

miniprogram_npm/call-bind/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038316, function(require, module, exports) {
+__DEFINE__(1765242269449, function(require, module, exports) {
 
 
 var bind = require('function-bind');
@@ -42,7 +42,7 @@ if ($defineProperty) {
 }
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038316);
+return __REQUIRE__(1765242269449);
 })()
 //miniprogram-npm-outsideDeps=["function-bind","get-intrinsic","set-function-length","es-errors/type","es-define-property"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/define-data-property/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038317, function(require, module, exports) {
+__DEFINE__(1765242269450, function(require, module, exports) {
 
 
 var $defineProperty = require('es-define-property');
@@ -63,7 +63,7 @@ module.exports = function defineDataProperty(
 };
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038317);
+return __REQUIRE__(1765242269450);
 })()
 //miniprogram-npm-outsideDeps=["es-define-property","es-errors/syntax","es-errors/type","gopd"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/es-define-property/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038318, function(require, module, exports) {
+__DEFINE__(1765242269451, function(require, module, exports) {
 
 
 var GetIntrinsic = require('get-intrinsic');
@@ -23,7 +23,7 @@ if ($defineProperty) {
 module.exports = $defineProperty;
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038318);
+return __REQUIRE__(1765242269451);
 })()
 //miniprogram-npm-outsideDeps=["get-intrinsic"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/es-errors/index.js

@@ -4,14 +4,14 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038319, function(require, module, exports) {
+__DEFINE__(1765242269452, function(require, module, exports) {
 
 
 /** @type {import('.')} */
 module.exports = Error;
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038319);
+return __REQUIRE__(1765242269452);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

miniprogram_npm/function-bind/index.js

@@ -4,15 +4,15 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038320, function(require, module, exports) {
+__DEFINE__(1765242269453, function(require, module, exports) {
 
 
 var implementation = require('./implementation');
 
 module.exports = Function.prototype.bind || implementation;
 
-}, function(modId) {var map = {"./implementation":1755660038321}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1755660038321, function(require, module, exports) {
+}, function(modId) {var map = {"./implementation":1765242269454}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1765242269454, function(require, module, exports) {
 
 
 /* eslint no-invalid-this: 1 */
@@ -99,7 +99,7 @@ module.exports = function bind(that) {
 };
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038320);
+return __REQUIRE__(1765242269453);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

miniprogram_npm/get-intrinsic/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038322, function(require, module, exports) {
+__DEFINE__(1765242269455, function(require, module, exports) {
 
 
 var undefined;
@@ -366,7 +366,7 @@ module.exports = function GetIntrinsic(name, allowMissing) {
 };
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038322);
+return __REQUIRE__(1765242269455);
 })()
 //miniprogram-npm-outsideDeps=["es-errors","es-errors/eval","es-errors/range","es-errors/ref","es-errors/syntax","es-errors/type","es-errors/uri","has-symbols","has-proto","function-bind","hasown"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/gopd/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038323, function(require, module, exports) {
+__DEFINE__(1765242269456, function(require, module, exports) {
 
 
 var GetIntrinsic = require('get-intrinsic');
@@ -23,7 +23,7 @@ if ($gOPD) {
 module.exports = $gOPD;
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038323);
+return __REQUIRE__(1765242269456);
 })()
 //miniprogram-npm-outsideDeps=["get-intrinsic"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/has-property-descriptors/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038324, function(require, module, exports) {
+__DEFINE__(1765242269457, function(require, module, exports) {
 
 
 var $defineProperty = require('es-define-property');
@@ -29,7 +29,7 @@ hasPropertyDescriptors.hasArrayLengthDefineBug = function hasArrayLengthDefineBu
 module.exports = hasPropertyDescriptors;
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038324);
+return __REQUIRE__(1765242269457);
 })()
 //miniprogram-npm-outsideDeps=["es-define-property"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/has-proto/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038325, function(require, module, exports) {
+__DEFINE__(1765242269458, function(require, module, exports) {
 
 
 var test = {
@@ -22,7 +22,7 @@ module.exports = function hasProto() {
 };
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038325);
+return __REQUIRE__(1765242269458);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

miniprogram_npm/has-symbols/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038326, function(require, module, exports) {
+__DEFINE__(1765242269459, function(require, module, exports) {
 
 
 var origSymbol = typeof Symbol !== 'undefined' && Symbol;
@@ -19,8 +19,8 @@ module.exports = function hasNativeSymbols() {
 	return hasSymbolSham();
 };
 
-}, function(modId) {var map = {"./shams":1755660038327}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1755660038327, function(require, module, exports) {
+}, function(modId) {var map = {"./shams":1765242269460}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1765242269460, function(require, module, exports) {
 
 
 /* eslint complexity: [2, 18], max-statements: [2, 33] */
@@ -65,7 +65,7 @@ module.exports = function hasSymbols() {
 };
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038326);
+return __REQUIRE__(1765242269459);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

miniprogram_npm/hasown/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038328, function(require, module, exports) {
+__DEFINE__(1765242269461, function(require, module, exports) {
 
 
 var call = Function.prototype.call;
@@ -15,7 +15,7 @@ var bind = require('function-bind');
 module.exports = bind.call(call, $hasOwn);
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038328);
+return __REQUIRE__(1765242269461);
 })()
 //miniprogram-npm-outsideDeps=["function-bind"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/moment/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038329, function(require, module, exports) {
+__DEFINE__(1765242269462, function(require, module, exports) {
 //! moment.js
 //! version : 2.30.1
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -5695,7 +5695,7 @@ __DEFINE__(1755660038329, function(require, module, exports) {
 })));
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038329);
+return __REQUIRE__(1765242269462);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

miniprogram_npm/object-inspect/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038330, function(require, module, exports) {
+__DEFINE__(1765242269463, function(require, module, exports) {
 var hasMap = typeof Map === 'function' && Map.prototype;
 var mapSizeDescriptor = Object.getOwnPropertyDescriptor && hasMap ? Object.getOwnPropertyDescriptor(Map.prototype, 'size') : null;
 var mapSize = hasMap && mapSizeDescriptor && typeof mapSizeDescriptor.get === 'function' ? mapSizeDescriptor.get : null;
@@ -533,12 +533,12 @@ function arrObjKeys(obj, inspect) {
     return xs;
 }
 
-}, function(modId) {var map = {"./util.inspect":1755660038331}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1755660038331, function(require, module, exports) {
+}, function(modId) {var map = {"./util.inspect":1765242269464}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1765242269464, function(require, module, exports) {
 module.exports = require('util').inspect;
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038330);
+return __REQUIRE__(1765242269463);
 })()
 //miniprogram-npm-outsideDeps=["util"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/qs/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038332, function(require, module, exports) {
+__DEFINE__(1765242269465, function(require, module, exports) {
 
 
 var stringify = require('./stringify');
@@ -17,8 +17,8 @@ module.exports = {
     stringify: stringify
 };
 
-}, function(modId) {var map = {"./stringify":1755660038333,"./parse":1755660038336,"./formats":1755660038335}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1755660038333, function(require, module, exports) {
+}, function(modId) {var map = {"./stringify":1765242269466,"./parse":1765242269469,"./formats":1765242269468}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1765242269466, function(require, module, exports) {
 
 
 var getSideChannel = require('side-channel');
@@ -371,8 +371,8 @@ module.exports = function (object, opts) {
     return joined.length > 0 ? prefix + joined : '';
 };
 
-}, function(modId) { var map = {"./utils":1755660038334,"./formats":1755660038335}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1755660038334, function(require, module, exports) {
+}, function(modId) { var map = {"./utils":1765242269467,"./formats":1765242269468}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1765242269467, function(require, module, exports) {
 
 
 var formats = require('./formats');
@@ -639,8 +639,8 @@ module.exports = {
     merge: merge
 };
 
-}, function(modId) { var map = {"./formats":1755660038335}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1755660038335, function(require, module, exports) {
+}, function(modId) { var map = {"./formats":1765242269468}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1765242269468, function(require, module, exports) {
 
 
 var replace = String.prototype.replace;
@@ -666,7 +666,7 @@ module.exports = {
 };
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1755660038336, function(require, module, exports) {
+__DEFINE__(1765242269469, function(require, module, exports) {
 
 
 var utils = require('./utils');
@@ -957,8 +957,8 @@ module.exports = function (str, opts) {
     return utils.compact(obj);
 };
 
-}, function(modId) { var map = {"./utils":1755660038334}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038332);
+}, function(modId) { var map = {"./utils":1765242269467}; return __REQUIRE__(map[modId], modId); })
+return __REQUIRE__(1765242269465);
 })()
 //miniprogram-npm-outsideDeps=["side-channel"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/set-function-length/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038337, function(require, module, exports) {
+__DEFINE__(1765242269470, function(require, module, exports) {
 
 
 var GetIntrinsic = require('get-intrinsic');
@@ -49,7 +49,7 @@ module.exports = function setFunctionLength(fn, length) {
 };
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038337);
+return __REQUIRE__(1765242269470);
 })()
 //miniprogram-npm-outsideDeps=["get-intrinsic","define-data-property","has-property-descriptors","gopd","es-errors/type"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/side-channel/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1755660038338, function(require, module, exports) {
+__DEFINE__(1765242269471, function(require, module, exports) {
 
 
 var GetIntrinsic = require('get-intrinsic');
@@ -136,7 +136,7 @@ module.exports = function getSideChannel() {
 };
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1755660038338);
+return __REQUIRE__(1765242269471);
 })()
 //miniprogram-npm-outsideDeps=["get-intrinsic","call-bind/callBound","object-inspect","es-errors/type"]
 //# sourceMappingURL=index.js.map

miniprogram_npm/tdesign-miniprogram/calendar/calendar.wxss

@@ -1,6 +1,6 @@
 @import '../common/style/index.wxss';.t-calendar{width:inherit;position:relative;z-index:9999;background:var(--td-calendar-bg-color,var(--td-bg-color-container,var(--td-font-white-1,#fff)));overflow-x:hidden;}
 .t-calendar--popup{border-top-left-radius:var(--td-calendar-radius,24rpx);border-top-right-radius:var(--td-calendar-radius,24rpx);}
-.t-calendar__title{display:flex;align-items:center;justify-content:center;font-size:var(--td-calendar-title-font-size,18px);display: none !important;font-weight:600;color:var(--td-calendar-title-color,var(--td-text-color-primary,var(--td-font-gray-1,rgba(0,0,0,.9))));height:52rpx;padding:32rpx;}
+.t-calendar__title{display:flex;align-items:center;justify-content:center;font-size:var(--td-calendar-title-font-size,18px);font-weight:600;color:var(--td-calendar-title-color,var(--td-text-color-primary,var(--td-font-gray-1,rgba(0,0,0,.9))));height:52rpx;padding:32rpx;}
 .t-calendar__title:focus{outline:0;}
 .t-calendar__close-btn{position:absolute;top:32rpx;right:32rpx;margin:-24rpx;padding:24rpx;color:var(--td-calendar-title-color,var(--td-text-color-primary,var(--td-font-gray-1,rgba(0,0,0,.9))));}
 .t-calendar__days{display:grid;grid-template-columns:repeat(7,1fr);grid-column-gap:8rpx;padding:0 32rpx;text-align:center;line-height:92rpx;}

miniprogram_npm/tdesign-miniprogram/swipe-cell/swipe-cell.js

@@ -1 +1,207 @@
-import{__decorate}from"tslib";import{SuperComponent,wxComponent}from"../common/src/index";import config from"../common/config";import props from"./props";import{getRect}from"../common/utils";import{getObserver}from"../common/wechat";let ARRAY=[];const{prefix:prefix}=config,name=`${prefix}-swipe-cell`,ContainerClass=`.${name}`;let SwiperCell=class extends SuperComponent{constructor(){super(...arguments),this.externalClasses=[`${prefix}-class`],this.options={multipleSlots:!0},this.properties=props,this.data={prefix:prefix,wrapperStyle:"",closed:!0,classPrefix:name,skipMove:!1},this.observers={"left, right"(){this.setSwipeWidth()}},this.lifetimes={attached(){ARRAY.push(this)},ready(){this.setSwipeWidth()},detached(){ARRAY=ARRAY.filter(e=>e!==this)}}}setSwipeWidth(){Promise.all([getRect(this,`${ContainerClass}__left`),getRect(this,`${ContainerClass}__right`)]).then(([e,t])=>{0!==e.width||0!==t.width||this._hasObserved||(this._hasObserved=!0,getObserver(this,`.${name}`).then(()=>{this.setSwipeWidth()})),this.setData({leftWidth:e.width,rightWidth:t.width})})}skipMove(){this.data.skipMove||this.setData({skipMove:!0})}catchMove(){this.data.skipMove&&this.setData({skipMove:!1})}open(){this.setData({opened:!0})}close(){this.setData({opened:!1})}closeOther(){ARRAY.filter(e=>e!==this).forEach(e=>e.close())}onTap(){this.close()}onActionTap(e){const{currentTarget:{dataset:{action:t}}}=e;this.triggerEvent("click",t)}};SwiperCell=__decorate([wxComponent()],SwiperCell);export default SwiperCell;
+import { __decorate } from "tslib";
+import { SuperComponent, wxComponent } from "../common/src/index";
+import config from "../common/config";
+import props from "./props";
+import { getRect } from "../common/utils";
+import { getObserver } from "../common/wechat";
+
+let ARRAY = [];
+const { prefix } = config;
+const name = `${prefix}-swipe-cell`;
+const ContainerClass = `.${name}`;
+// 补充滑动阈值常量
+const THRESHOLD = 0.5;
+
+let SwiperCell = class extends SuperComponent {
+  constructor() {
+    super(...arguments);
+    this.externalClasses = [`${prefix}-class`];
+    this.options = { multipleSlots: true };
+    this.properties = props;
+    this.data = {
+      prefix: prefix,
+      wrapperStyle: "",
+      closed: true,
+      classPrefix: name,
+      skipMove: false,
+      leftWidth: 0,
+      rightWidth: 0,
+      // 补充滑动状态管理
+      nv_state: {
+        nv_direction: "", // vertical/horizontal
+        nv_dragging: false,
+        nv_startOffset: 0,
+        nv_deltaX: 0,
+        nv_offset: 0,
+        nv_leftWidth: 0,
+        nv_rightWidth: 0,
+        nv_THRESHOLD: THRESHOLD,
+      },
+    };
+    this.observers = {
+      "left, right"() {
+        this.setSwipeWidth();
+      },
+    };
+    this.lifetimes = {
+      attached() {
+        ARRAY.push(this);
+      },
+      ready() {
+        this.setSwipeWidth();
+      },
+      detached() {
+        ARRAY = ARRAY.filter((e) => e !== this);
+      },
+    };
+    // 声明事件处理方法（关键：暴露给模板调用）
+    this.methods = {
+      // 触摸开始：初始化滑动状态
+      nv_touchStart(nv_event) {
+        const touch = nv_event.touches[0];
+        const { leftWidth, rightWidth } = this.data;
+        const nv_state = {
+          ...this.data.nv_state,
+          nv_direction: "",
+          nv_dragging: false,
+          nv_startOffset: this.data.nv_state.nv_offset || 0,
+          nv_deltaX: 0,
+          nv_offset: this.data.nv_state.nv_offset || 0,
+          nv_leftWidth: leftWidth,
+          nv_rightWidth: rightWidth,
+          nv_THRESHOLD: THRESHOLD,
+        };
+        this.setData({ nv_state });
+        this.nv_state = nv_state; // 同步到实例属性
+      },
+      // 触摸移动：核心滑动逻辑（解决 touchmove 报错）
+      nv_touchMove(nv_event) {
+        const nv_ownerInstance = this;
+        const nv_state = this.nv_state || this.data.nv_state;
+        
+        // 获取滑动偏移量
+        const touch = nv_event.touches[0];
+        nv_state.nv_deltaX = touch.clientX - (this.startX || touch.clientX);
+        this.startX = touch.clientX;
+
+        // 判断滑动方向
+        if (Math.abs(nv_state.nv_deltaX) > Math.abs(touch.clientY - (this.startY || touch.clientY))) {
+          nv_state.nv_direction = "horizontal";
+        } else {
+          nv_state.nv_direction = "vertical";
+          nv_ownerInstance.skipMove(); // 垂直滑动跳过
+          return;
+        }
+
+        // 水平滑动逻辑
+        if (nv_state.nv_direction !== "horizontal") return;
+        if (!nv_state.nv_dragging) {
+          nv_ownerInstance.triggerEvent("dragstart"); // 触发开始拖拽事件
+        }
+        nv_state.nv_dragging = true;
+        // 计算滑动偏移
+        const newOffset = nv_state.nv_startOffset + nv_state.nv_deltaX;
+        nv_state.nv_offset = newOffset;
+        // 限制滑动范围
+        this.nv_swipeMove(newOffset);
+        this.setData({ nv_state });
+        return false;
+      },
+      // 触摸结束：处理滑动收尾（解决 touchend 报错）
+      nv_touchEnd() {
+        const nv_ownerInstance = this;
+        const nv_state = this.nv_state || this.data.nv_state;
+        nv_state.nv_dragging = false;
+
+        // 判断是否打开/关闭
+        if (nv_state.nv_rightWidth > 0 && -nv_state.nv_startOffset < nv_state.nv_rightWidth && -nv_state.nv_offset > nv_state.nv_rightWidth * nv_state.nv_THRESHOLD) {
+          this.nv_open("right");
+        } else if (nv_state.nv_leftWidth > 0 && nv_state.nv_startOffset < nv_state.nv_leftWidth && nv_state.nv_offset > nv_state.nv_leftWidth * nv_state.nv_THRESHOLD) {
+          this.nv_open("left");
+        } else {
+          if (nv_state.nv_startOffset !== nv_state.nv_offset) {
+            this.nv_close();
+          }
+        }
+        nv_ownerInstance.triggerEvent("dragend"); // 触发结束拖拽事件
+        this.setData({ nv_state });
+      },
+      // 滑动偏移处理
+      nv_swipeMove(offset) {
+        const { leftWidth, rightWidth } = this.data;
+        // 限制偏移范围：-rightWidth ≤ offset ≤ leftWidth
+        const clampedOffset = Math.max(-rightWidth, Math.min(offset, leftWidth));
+        this.setData({
+          wrapperStyle: `transform: translateX(${clampedOffset}px); transition: none;`,
+        });
+      },
+      // 打开侧滑
+      nv_open(direction) {
+        const offset = direction === "left" ? this.data.leftWidth : -this.data.rightWidth;
+        this.setData({
+          wrapperStyle: `transform: translateX(${offset}px); transition: transform 0.3s ease;`,
+          nv_state: { ...this.data.nv_state, nv_offset: offset },
+          closed: false,
+        });
+        this.triggerEvent("open", { direction });
+      },
+      // 关闭侧滑
+      nv_close() {
+        this.setData({
+          wrapperStyle: `transform: translateX(0px); transition: transform 0.3s ease;`,
+          nv_state: { ...this.data.nv_state, nv_offset: 0 },
+          closed: true,
+        });
+        this.triggerEvent("close");
+      },
+      // 原有方法保留
+      setSwipeWidth() {
+        Promise.all([
+          getRect(this, `${ContainerClass}__left`),
+          getRect(this, `${ContainerClass}__right`),
+        ]).then(([e, t]) => {
+          if (e.width === 0 && t.width === 0 && !this._hasObserved) {
+            this._hasObserved = true;
+            getObserver(this, `.${name}`).then(() => {
+              this.setSwipeWidth();
+            });
+          }
+          this.setData({ leftWidth: e.width, rightWidth: t.width });
+        });
+      },
+      skipMove() {
+        if (!this.data.skipMove) {
+          this.setData({ skipMove: true });
+        }
+      },
+      catchMove() {
+        if (this.data.skipMove) {
+          this.setData({ skipMove: false });
+        }
+      },
+      open() {
+        this.setData({ opened: true });
+      },
+      close() {
+        this.setData({ opened: false });
+      },
+      closeOther() {
+        ARRAY.filter((e) => e !== this).forEach((e) => e.close());
+      },
+      onTap() {
+        this.close();
+      },
+      onActionTap(e) {
+        const {
+          currentTarget: {
+            dataset: { action: t },
+          },
+        } = e;
+        this.triggerEvent("click", t);
+      },
+    };
+  }
+};
+
+SwiperCell = __decorate([wxComponent()], SwiperCell);
+export default SwiperCell;

miniprogram_npm/tdesign-miniprogram/textarea/textarea.wxss

@@ -1,7 +1,7 @@
-@import '../common/style/index.wxss';.t-textarea{display:flex;flex-direction:column;box-sizing:border-box;padding:16rpx 16rpx;background-color:var(--td-textarea-background-color,var(--td-bg-color-container,var(--td-font-white-1,#fff)));}
+@import '../common/style/index.wxss';.t-textarea{display:flex;flex-direction:column;box-sizing:border-box;padding:32rpx 32rpx;background-color:var(--td-textarea-background-color,var(--td-bg-color-container,var(--td-font-white-1,#fff)));}
 .t-textarea__label:not(:empty){font-size:var(--td-font-size-base,28rpx);color:var(--td-textarea-label-color,var(--td-text-color-primary,var(--td-font-gray-1,rgba(0,0,0,.9))));flex-shrink:0;line-height:44rpx;padding-bottom:var(--td-spacer,16rpx);overflow:hidden;white-space:nowrap;text-overflow:ellipsis;}
 .t-textarea__wrapper{display:flex;flex-direction:column;width:100%;flex:1 1 auto;overflow:hidden;}
-.t-textarea__wrapper-inner{flex:1 1 auto;box-sizing:border-box;width:inherit;min-width:0;min-height:20px;margin:0;padding:0;text-align:left;background-color:transparent;border:0;resize:none;font-size:var(--td-font-size-m,26rpx);color:var(--td-textarea-text-color,var(--td-text-color-primary,var(--td-font-gray-1,rgba(0,0,0,.9))));line-height:48rpx;}
+.t-textarea__wrapper-inner{flex:1 1 auto;box-sizing:border-box;width:inherit;min-width:0;min-height:20px;margin:0;padding:0;text-align:left;background-color:transparent;border:0;resize:none;font-size:var(--td-font-size-m,32rpx);color:var(--td-textarea-text-color,var(--td-text-color-primary,var(--td-font-gray-1,rgba(0,0,0,.9))));line-height:48rpx;}
 .t-textarea__placeholder{color:var(--td-textarea-placeholder-color,var(--td-text-color-placeholder,var(--td-font-gray-3,rgba(0,0,0,.4))));font-size:var(--td-font-size-m,32rpx);}
 .t-textarea__indicator:not(:empty){flex-shrink:0;color:var(--td-textarea-indicator-text-color,var(--td-text-color-placeholder,var(--td-font-gray-3,rgba(0,0,0,.4))));font-size:var(--td-spacer-1,24rpx);text-align:right;line-height:40rpx;padding-top:var(--td-spacer,16rpx);}
 .t-textarea--border{border-radius:var(--td-textarea-border-radius,var(--td-radius-default,12rpx));border:2rpx solid var(--td-textarea-border-color,var(--td-component-border,var(--td-gray-color-4,#dcdcdc)));}

package-map/pages/map/index.js

@@ -54,8 +54,10 @@ Page({
     replanThreshold: 3,      // 连续偏离多少次后重新规划
     orderdata: [],
     optionsid: '',
-    showVerification: false,
-    phoneNumber: "138****6789",
+    showpayment: false, // 结算弹窗显示状态
+    showCodePopup: false, // 验证码弹窗显示状态
+    countdown: 60, // 验证码倒计时
+    canResend: false, // 是否可重新发送
     userdata: [],
     moretype: false,
     // 拖动
@@ -66,7 +68,7 @@ Page({
     windowHeight: 0, // 屏幕可用高度（px）
     // 三个固定高度（max改为屏幕高度）
     heightConfig: {
-      min: 320,    // 最低高度（仅显示价格和路线简要）
+      min: 400,    // 最低高度（仅显示价格和路线简要）
       mid: 520,    // 中间高度（显示行程详情）
       max: 0       // 占位，将在onLoad中设置为屏幕高度
     },
@@ -119,7 +121,7 @@ Page({
     
     // 初始化地图，获取当前位置和工单信息
     this.getoneworkorderdetailss();
-    this.getoneworkorderdetails();
+    // this.getoneworkorderdetails();
 
   },
   
@@ -144,6 +146,7 @@ Page({
    * 处理接收到的 WebSocket 消息
    * @param {Object} message 从 app.js 广播过来的消息对象
    */
+  //  可用，位置，容量-
   detailsWsMessage(message) {
     console.log('收到 WebSocket 消息:', message);
 
@@ -195,6 +198,9 @@ Page({
       .then((data) => {
         console.log('工单数据:', data.data);
         if (data.code == 200) {
+          this.setData({
+            orderdata: data.data
+          });
           // 保存旧的工单类型，用于比较状态变化
           const oldWorkorderType = this.data.orderdata.workorderType;
             // **核心修改点：调用 app.js 的方法来控制定位上传**
@@ -204,8 +210,8 @@ Page({
                 app.startDriverLocationUpload(this.data.optionsid);
                 this.showInfo('已开启实时位置上传');
               } 
-              this.initMap(); 
             }
+            this.initMap(); 
           }
       })
       .catch((err) => {
@@ -284,12 +290,12 @@ Page({
     });
   },
   
-  // 设置终点位置（核心修改：未分配工单时隐藏司机标记和轨迹）
+  // 设置终点位置（核心修改：未分配工单时隐藏司机标记和轨迹）- 
   setDestination() {
     const ICON_PATH = {
-      start: "https://esos-iot.bjdexn.cn/myminio/project/0b0593293af54ea097b168cea479c25c.png",
-      end: "https://esos-iot.bjdexn.cn/myminio/project/6dc37b15321b462f9ab59c47263dd224.png",
-      driver: "https://esos-iot.bjdexn.cn/myminio/project/f6fba6c83b2d4864a73f5f1d83cda416.png"
+      start: "https://esos-iot.com/myminio/project/0b0593293af54ea097b168cea479c25c.png",
+      end: "https://esos-iot.com/myminio/project/6dc37b15321b462f9ab59c47263dd224.png",
+      driver: "https://esos-iot.com/myminio/project/f6fba6c83b2d4864a73f5f1d83cda416.png"
     };
     const MARKER_SIZE = { width: 30, height: 30 };
     const MAP_PADDING = [100, 100, 100, 100];
@@ -302,21 +308,22 @@ Page({
 
     api.request(`/sysworkorder/selectworkorderredis`, 'post', requestData, { isPublic: false })
       .then((response) => {
-        console.log('Redis轨迹数据:', response.data);
+
         
-        if (response.code !== 200) {
-          this.showInfo("获取轨迹数据失败，请重试");
+        if (response.code !== 200 || response.code==[]) {
+          this.showInfo("暂无轨迹数据");
           return;
         }
         
         if (!this.data.orderdata) {
-          this.showInfo("订单信息加载中...");
+          this.showInfo("工单信息加载中...");
           return;
         }
+        response.data = [...response.data].reverse();
+        console.log('Redis轨迹数据:', response.data);
      
       // 关键判断：工单是否处于进行中状态（1-4）
-const isWorkorderAssigned = this.data.orderdata.workorderType >= 1 && this.data.orderdata.workorderType <= 4;
-
+const isWorkorderAssigned = this.data.orderdata.workorderType >= 1 && this.data.orderdata.workorderType <= 2;
 // 初始化司机位置为 null
 let driverPoint = null;
 
@@ -325,7 +332,7 @@ if (isWorkorderAssigned) {
   // 优先从最新的响应数据中获取司机位置
   // 只有当 response.data 是一个非空数组时，才取第一个元素
   if (response.data && Array.isArray(response.data) && response.data.length > 0) {
-    driverPoint = response.data[0];
+    driverPoint = response.data[response.data.length-1];
   } else {
     // 如果响应数据为空或格式不正确，则使用页面上已缓存的司机位置
     driverPoint = null;
@@ -333,16 +340,18 @@ if (isWorkorderAssigned) {
 }else{
   const markers = [];
         const endPoint = this.data.orderdata;
-
-  // 已分配工单时才显示起点
+if (response.data.length>0) {
+    // 已分配工单时才显示起点
     markers.push({
       id: 0,
-      longitude: response.data[response.data.length - 1].longitude,
-      latitude: response.data[response.data.length - 1].latitude,
+      longitude: response.data[0].longitude,
+      latitude: response.data[0].latitude,
       iconPath: ICON_PATH.start,
       ...MARKER_SIZE,
       title: "起点"
     });
+}
+
   
   // 始终添加终点标记
   markers.push({
@@ -368,12 +377,11 @@ if (isWorkorderAssigned) {
     points: response.data,
     padding: MAP_PADDING
   });
-  
   return
 }
 
 // 对于工单状态为 5 (已完成) 或其他状态，driverPoint 保持为 null
-        const startPoint = isWorkorderAssigned ? (response.data && response.data.length > 0 ? response.data[response.data.length - 1] : null) : null;
+        const startPoint = isWorkorderAssigned ? (response.data && response.data.length > 0 ? response.data[0] : null) : null;
         const endPoint = this.data.orderdata;
         console.log(driverPoint);
         // 构建标记点（未分配时不添加司机标记）
@@ -496,62 +504,7 @@ if (isWorkorderAssigned) {
       })
       .catch((err) => {
         console.error('请求轨迹数据失败：', err);
-        if (this.data.orderdata) {
-          const endPoint = this.data.orderdata;
-          const isWorkorderAssigned = this.data.orderdata.workorderType >= 1;
-          const markers = [
-            {
-              id: 1,
-              longitude: endPoint.longitude,
-              latitude: endPoint.latitude,
-              iconPath: ICON_PATH.end,
-              ...MARKER_SIZE,
-              title: "终点",
-              name: endPoint.poiName
-            }
-          ];
-          
-          // 已分配工单时才显示司机位置
-          if (isWorkorderAssigned && this.data.driverLocation.longitude) {
-            markers.push({
-              id: 2,
-              longitude: this.data.driverLocation.longitude,
-              latitude: this.data.driverLocation.latitude,
-              iconPath: ICON_PATH.driver,
-              width: 35, 
-              height: 35,
-              title: "我的位置"
-            });
-          }
-          
-          this.setData({
-            markers,
-            startPoint: isWorkorderAssigned ? null : null,
-            destination: { longitude: endPoint.longitude, latitude: endPoint.latitude },
-            polyline: [] // 异常时不显示轨迹线
-          });
-          
-          if (this.mapCtx && !this.data.mapInitialized) {
-            const includePoints = [{ longitude: endPoint.longitude, latitude: endPoint.latitude }];
-            if (isWorkorderAssigned && this.data.driverLocation.longitude) {
-              includePoints.push({ 
-                longitude: this.data.driverLocation.longitude, 
-                latitude: this.data.driverLocation.latitude 
-              });
-            }
-            this.mapCtx.includePoints({ points: includePoints, padding: MAP_PADDING });
-            this.setData({ mapInitialized: true });
-          }
-          
-          // 异常提示区分工单状态
-          if (isWorkorderAssigned) {
-            this.showInfo(this.data.isDriver ? "已加载终点和我的位置（轨迹数据加载失败）" : "已加载终点位置（等待起点更新）");
-          } else {
-            this.showInfo("工单未分配，暂未显示司机信息");
-          }
-        } else {
-          this.showInfo("网络请求失败，请检查网络");
-        }
+        this.showInfo("网络请求失败，请检查网络");
       });
   },
   
@@ -660,8 +613,7 @@ historytrajectory() {
 
   api.request(`/sysworkorder/selectworkorderredis`, 'post', data, { isPublic: false })
     .then((response) => {
-      console.log('历史轨迹:', response.data);
-
+     
       // 兼容处理：检查返回数据是否有效
       if (!response.data || response.data.length === 0) {
         console.log('未获取到轨迹数据或轨迹数据为空');
@@ -670,11 +622,13 @@ historytrajectory() {
       }
 
       if (response.code == 200 && response.data.length > 0) {
+        response.data = [...response.data].reverse();
+        console.log('历史轨迹:', response.data);
         // 司机端和用户端统一从[0]获取最新位置
-        this.updateDriverLocation(response.data[0]);
+        this.updateDriverLocation(response.data[response.data.length-1]);
 
         // 如果有多个轨迹点，更新轨迹线
-        if (response.data.length > 1) {
+        if (response.data.length > 0) {
           const trackPoints = response.data.map(point => ({
             longitude: point.longitude*1,
             latitude: point.latitude*1
@@ -689,15 +643,15 @@ historytrajectory() {
             }]
           });
           console.log(trackPoints);
-          if (trackPoints.length<3) {
+          if (trackPoints.length<2) {
              this.mapCtx.includePoints({
             points:[this.data.destination,...trackPoints],
             padding: [100, 100, 100, 100] // 适配屏幕边距
           });
           }
-         
+        
         } else {
-          // 如果只有一个轨迹点（通常是司机的当前位置），则只更新司机位置，不绘制轨迹线
+          // 如果只有一个轨迹点（通常是司机的当前位置），则只更新司机位置，不绘制轨迹线-
           console.log('只有一个轨迹点，不绘制轨迹线');
           this.setData({
             polyline: [{ points: [] }] // 清空轨迹线
@@ -719,7 +673,7 @@ historytrajectory() {
 },
 
 /**
- * 处理空轨迹数据的情况
+ * 处理空轨迹数据的情况 
  */
 handleEmptyTrajectory() {
   // 清空轨迹线，避免显示旧的轨迹
@@ -774,7 +728,7 @@ updateDriverLocation(newDriverLocation) {
     }
   }
 },
- 
+
   // 显示信息提示（区分司机/用户端）
   showInfo(text) {
     this.setData({ infoText: text });
@@ -797,7 +751,7 @@ updateDriverLocation(newDriverLocation) {
       this.showInfo("目的地尚未设置");
       return;
     }
-    
+  
     // 使用在腾讯位置服务申请的key
     const key = this.data.qqMapKey;
     const referer = '电速宝';
@@ -809,16 +763,94 @@ updateDriverLocation(newDriverLocation) {
       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}`,
       fail: (err) => {
         console.error('导航启动失败', err);
-        this.showInfo(this.data.isDriver ? "导航启动失败，请手动开启" : "导航启动失败");
+        // 1. 判断失败原因：插件未安装/不存在（核心逻辑）
+        const isPluginNotExist = err.errMsg.includes('plugin not found') || err.errMsg.includes('找不到插件') || err.errMsg.includes('navigateTo:fail');
+        
+        if (isPluginNotExist) {
+          // 2. 提示用户下载腾讯地图
+          wx.showModal({
+            title: '提示',
+            content: '未检测到腾讯地图应用，是否前往应用商店下载？',
+            confirmText: '去下载',
+            cancelText: '取消',
+            success: (res) => {
+              if (res.confirm) {
+                // 3. 跳转到腾讯地图下载页（区分iOS/Android）
+                // iOS下载链接（App Store）
+                const iosUrl = 'https://apps.apple.com/cn/app/%E8%85%BE%E8%AE%AF%E5%9C%B0%E5%9B%BE/id414478124';
+                // Android下载链接（腾讯应用宝，也可换应用宝/华为应用市场等）
+                const androidUrl = 'https://a.app.qq.com/o/simple.jsp?pkgname=com.tencent.map';
+                
+                wx.navigateToMiniProgram({
+                  // 备选方案：直接打开外部下载链接（需小程序配置业务域名）
+                  // 优先用openURL，兼容更多场景
+                  url: '',
+                  fail: () => {
+                    wx.openURL({
+                      url: wx.getSystemInfoSync().system.includes('iOS') ? iosUrl : androidUrl,
+                      fail: () => {
+                        this.showInfo('下载链接打开失败，请手动前往应用商店搜索“腾讯地图”下载');
+                      }
+                    });
+                  }
+                });
+              } else {
+                // 用户取消下载，提示手动导航
+                this.showInfo(this.data.isDriver ? "导航启动失败，请手动开启腾讯地图导航" : "导航启动失败");
+              }
+            }
+          });
+        } else {
+          // 非插件未安装的其他失败原因（如参数错误、网络问题）
+          this.showInfo(this.data.isDriver ? "导航启动失败，请手动开启" : "导航启动失败");
+        }
       }
     });
   },
   
+  // 封装的提示方法（保持原有逻辑）
+  showInfo(msg) {
+    wx.showToast({
+      title: msg,
+      icon: 'none',
+      duration: 2000
+    });
+  },
+
+
+  // 重新发送验证码
+  onResendCode() {
+    // 调用发送验证码接口
+    this.showVerificationPopup();
+    this.startCountdown(); // 重启倒计时
+    wx.showToast({ title: '验证码已发送', icon: 'none' });
+    // wx.request({
+    //   url: 'https://your-api.com/sendCode',
+    //   success: () => {
+    //     this.startCountdown(); // 重启倒计时
+    //     wx.showToast({ title: '验证码已发送', icon: 'none' });
+    //   }
+    // });
+  },
+
+  // 验证码倒计时
+  startCountdown() {
+    let countdown = 60;
+    this.setData({ canResend: false, countdown });
+    const timer = setInterval(() => {
+      countdown--;
+      this.setData({ countdown });
+      if (countdown <= 0) {
+        clearInterval(timer);
+        this.setData({ canResend: true, countdown: 60 });
+      }
+    }, 1000);
+  },
   // 显示验证码弹窗（司机端无需验证码，直接执行操作）
   showVerificationPopup() {
       // 用户端正常显示验证码
@@ -828,7 +860,12 @@ updateDriverLocation(newDriverLocation) {
         .then((data) => {
           if (data.code == 200) {
             wx.showToast({ title: data.msg || '验证码已发送', icon: 'none' });
-            this.setData({ showVerification: true });
+            this.setData({ 
+              showCodePopup: true,
+              canResend: false
+            });
+               // 启动倒计时
+    this.startCountdown();
           } else {
             this.showInfo(data.msg || '获取验证码失败');
           }
@@ -840,9 +877,8 @@ updateDriverLocation(newDriverLocation) {
   },
   
   // 关闭弹窗
-  onPopupClose() {
-    this.setData({ showVerification: false });
-    
+  onCodePopupClose() {
+    this.setData({ showCodePopup: false });
     setTimeout(() => {
       const slideComponent = this.selectComponent("#mySlideConfirm");
       if (slideComponent) {
@@ -860,21 +896,20 @@ updateDriverLocation(newDriverLocation) {
   },
   
   // 重新发送验证码（仅用户端有效）
-  onResendCode() {
-    if (!this.data.isDriver) {
-      console.log("重新发送验证码");
-      this.showVerificationPopup();
-    }
-  },
+  // onResendCode() {
+  //   if (!this.data.isDriver) {
+  //     console.log("重新发送验证码");
+  //     this.showVerificationPopup();
+  //   }
+  // },
   
   // 验证码输入完成
-  onCodeComplete(e) {
+  onCodeInputComplete(e) {
     
-    const code = e.detail.code;
-    if (!code || code.length < 4) {
-      this.showInfo('请输入有效的验证码');
-      return;
-    }
+    console.log(e);
+    const code = e.detail.value;
+    console.log(code);
+ 
     
     const data = {
       carId: this.data.carId,
@@ -885,10 +920,12 @@ updateDriverLocation(newDriverLocation) {
     api.request(`/sysworkorder/submitworkorder`, 'post', data, { isPublic: false })
       .then((data) => {
         if (data.code == 200) {
-          wx.showToast({ title: data.msg || '验证成功', icon: 'none' });
-          this.setData({ showVerification: false });
+          wx.showToast({ title: '验证码正确', icon: 'success' });
+          this.setData({ showCodePopup: false });
         } else {
-          this.showInfo(data.msg || '验证失败');
+          const codePopup = this.selectComponent('.code-popup');
+          codePopup.triggerErrorShake();
+          wx.showToast({ title: res.data.msg || '验证码错误', icon: 'none' });
         }
       })
       .catch((err) => {
@@ -965,13 +1002,14 @@ success(res) {
     api.request(`/sysworkorder/submitworkorder`, 'post', data, { isPublic: false })
       .then((data) => {
         if (data.code == 200) {
-          app.stopDriverLocationUpload(this.data.optionsid);
           setTimeout(() => {
             const slideComponent = this.selectComponent("#mySlideConfirm");
             if (slideComponent) {
               slideComponent.reset();
             }
           }, 5000);
+          app.stopDriverLocationUpload(this.data.optionsid);
+
         } else {
           this.showInfo(data.msg || '操作失败');
         }
@@ -1148,7 +1186,7 @@ success(res) {
     });
   },
  
-  // 编辑订单
+  // 编辑工单
   editorder(){
 wx.navigateTo({
   url: `/package-order/pages/createorder/index?order=${this.data.optionsid}`,
@@ -1159,14 +1197,14 @@ wx.navigateTo({
   // 在页面的 js 文件中
 wx.showModal({
   title: '提示',
-  content: '确定要取消订单吗？',
+  content: '确定要取消工单吗？',
   success (res) {
     if (res.confirm) {
       console.log('用户点击了确定')
-      // 在这里执行确认后的操作
+      // 在这里执行确认后的操作selectcarall   selectcarall
         let data ={
           workorderId:_this.data.optionsid,
-          workorderDeletetype:1
+          workorderType:6
         }
       api.request(`/sysworkorder/updateworkorder`, 'post', data, { isPublic: false })       
         .then((data) => {
@@ -1185,6 +1223,111 @@ wx.showModal({
     }
   }
 })
-  }
+  },
+   /**
+   * 复制目的地地址
+   */
+  copyDestination() {
+    // 1. 获取目的地名称，做空值校验
+    const poiName = this.data.orderdata?.poiName || '';
+    if (!poiName.trim()) {
+      wx.showToast({
+        title: '暂无目的地地址可复制',
+        icon: 'none',
+        duration: 2000
+      });
+      return;
+    }
+
+    // 2. 调用微信API复制到剪贴板
+    wx.setClipboardData({
+      data: poiName, // 要复制的地址内容
+      success: () => {
+        // 复制成功提示
+        wx.showToast({
+          title: '地址已复制',
+          icon: 'success',
+          duration: 2000
+        });
+      },
+      fail: (err) => {
+        // 复制失败兜底提示
+        console.error('复制地址失败', err);
+        wx.showToast({
+          title: '复制失败，请手动复制',
+          icon: 'none',
+          duration: 2000
+        });
+      }
+    });
+  },
+  // 微信结算
+  onpay(){
+    this.setData({
+      showpayment:true
+    })
+  
+  
+ 
+  },
+  // 关闭结算弹窗
+  onpaymentPopupClose() {
+    this.setData({ showpayment: false });
+  },
+
+  // 接收结算弹窗输入完成的密码
+  onpaymentInputComplete(e) {
+    const paymentPwd = e.detail.value; // 获取弹窗输入的6位结算密码
+    // 执行父组件的检验逻辑（替换为你的真实接口/校验）
+    this.checkPaymentPwd(paymentPwd);
+  },
+
+  // 检验结算密码（父组件核心检验逻辑）
+  checkPaymentPwd(pwd) {
+    console.log(pwd);
+    let password = {
+      password:pwd
+    }
+    api.request(`/SysBalance/verifypassword`, 'post', password, { isPublic: false })       
+    .then((data) => {
+      if (data.data) {
+      
+      }else{
+          // 检验失败：触发弹窗晃动+清空
+      const paymentPopup = this.selectComponent('.payment-popup');
+      paymentPopup.triggerErrorShake(); // 调用弹窗的失败动效方法
+      // 提示错误信息
+      wx.showToast({ title:'' || '结算密码错误', icon: 'none' });
+        return
+
+      }
+    })
+    .catch((err) => {
+      this.showInfo('操作失败');
+    });
+   
+      let data ={
+        workorderId:this.data.optionsid,
+        price:this.data.orderdata.price
+      }
+      api.request(`/sysworkorder/updatesettlementtype`, 'post', data, { isPublic: false })       
+      .then((data) => {
+        if (data.code == 200) {
+          wx.showToast({ title: '结算密码正确', icon: 'success' });
+          this.setData({ showpayment: false }); // 关闭弹窗
+          this.getoneworkorderdetails();
+          // wx.navigateTo({
+          //   url: `/package-user/pages/privacy/index?name=微信结算`,
+          // })
+          
+         
+        } 
+      })
+      .catch((err) => {
+        this.showInfo('操作失败');
+      });
+  
+  },
+
+  
 });
-// 

package-map/pages/map/index.json

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

package-map/pages/map/index.wxml

@@ -21,14 +21,14 @@
     {{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 toast">
     {{error}}
   </view>
@@ -37,7 +37,7 @@
 </view>
 
 <!-- 验证码弹窗组件 -->
-<verification-popup 
+<!-- <verification-popup 
   isShow="{{showVerification}}"
   phoneNumber="{{phoneNumber}}"
   countdownSeconds="60"
@@ -45,8 +45,16 @@
   bind:confirm="onCodeConfirm"
   bind:resend="onResendCode"
   bind:complete="onCodeComplete"
+/> -->
+<!-- 验证码弹窗（如果有） -->
+<verification-popup 
+  class="code-popup"
+  isShow="{{showCodePopup}}"
+  type="code"
+  bind:close="onCodePopupClose"
+  bind:inputComplete="onCodeInputComplete"
+  bind:resend="onResendCode"
 />
-
 <!-- 底部可拖动卡片 -->
 <view class="taxi-card-container">
   <!-- 背景遮罩 -->
@@ -69,18 +77,22 @@
     
     <!-- 卡片内容 -->
     <view class="card-content" style="padding-top: {{cardHeight === 'max' ? '40rpx' : '20rpx'}};">
-      <!-- 订单状态和基本信息 -->
+      <!-- 工单状态和基本信息 -->
       <view class="storagecartext_box">
       <view class="storagecartext">
 
         <view class="destination-title1" style="margin-top: 10rpx;">
-          目的地：{{orderdata.poiName}}
+          目的地：{{orderdata.poiName}}  <t-icon 
+            name="file-copy" 
+            size="28rpx" 
+            class="icon-call"
+            bindtap="copyDestination"
+          />
           <!-- 显示预计到达时间 -->
-        
         </view>
         
         <!-- 客户/司机信息 -->
-        <view class="contact-info" wx:if="{{userdata.operationRole==5}}">
+        <view class="contact-info" wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}">
           <view class="driver-info" wx:if="{{orderdata.driverphone==''}}">
             司机：<text class="text-warning">分配中</text>
           </view>
@@ -110,24 +122,29 @@
           <text wx:if="{{orderdata.workorderType==2}}" class="section-title">行驶中</text>
           <text wx:if="{{orderdata.workorderType==3}}" class="section-title">到达地点</text>
           <text wx:if="{{orderdata.workorderType==4}}" class="section-title">工作中</text>
-          <text wx:if="{{orderdata.workorderType==5}}" class="section-title">订单完成</text>
+          <!-- <text wx:if="{{orderdata.workorderType==5}}" class="section-title">工单完成</text> -->
+          <text wx:if="{{orderdata.workorderType==6}}" class="section-title">取消工单</text>
           <text wx:if="{{estimatedArrivalTime && orderdata.workorderType==2}}" class="estimated-time">预计{{estimatedArrivalTime}}到达</text>
+          <text wx:if="{{orderdata.workorderType==5&&orderdata.settlementType==0}}" class="section-title">待结算</text>
+          <text wx:if="{{orderdata.workorderType==5&&orderdata.settlementType==1}}" class="section-title">结算完成</text>
+          <text wx:if="{{orderdata.workorderType==5&&orderdata.settlementType==2}}" class="section-title">结算失败</text>
         </view>
         
       </view>
       
       <!-- 操作图片 -->
+      <!--  -->
       <view class="action-images">
         <image 
-          wx:if="{{userdata.operationRole==5}}" 
+          wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}" 
           class="storagecar" 
-          src="https://esos-iot.bjdexn.cn/myminio/project/c152026b9bc2485f83b39a6132df3ce7.png" 
+          src="https://esos-iot.com/myminio/project/c152026b9bc2485f83b39a6132df3ce7.png" 
           mode="heightFix"
         />
         <image 
           wx:if="{{userdata.operationRole==4}}" 
           class="storagecar1" 
-          src="https://esos-iot.bjdexn.cn/myminio/project/d98e4fde125f40819f8bd8fe872e409c.png" 
+          src="https://esos-iot.com/myminio/project/d98e4fde125f40819f8bd8fe872e409c.png" 
           bind:tap="navigation" 
           mode="heightFix"
         />
@@ -135,21 +152,24 @@
     </view>
       
       <!-- 更多操作按钮 -->
-      <view class="card_more" wx:if="{{userdata.operationRole==5&&orderdata.workorderType!=0}}">
-        <view class="card_morebox">联系客服</view>
-        <view class="card_morebox" data-phone="{{orderdata.driverphone}}" bind:tap="ontelephone">联系司机</view>
-        <view class="card_morebox" bind:tap="cancel">取消订单</view>
-        <view wx:if="{{orderdata.workorderType==5}}" class="card_morebox">开发票</view>
-        <view wx:if="{{orderdata.workorderType!=5}}" class="card_morebox" bind:tap="editorder">编辑订单</view>
-
+      <view class="card_more" wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}">
+        <!-- <view class="card_morebox">联系客服</view> -->
+        <button class="card_morebox" open-type="contact" plain>
+          联系客服
+</button>
+        <view class="card_morebox card_moreboxleft" data-phone="{{orderdata.driverphone}}" bind:tap="ontelephone" wx:if="{{orderdata.workorderType!=0&&orderdata.workorderType!=5}}">联系司机</view>
+        <view class="card_morebox card_moreboxleft" bind:tap="cancel" wx:if="{{orderdata.workorderType<3}}">取消工单</view>
+        <!-- <view wx:if="{{orderdata.workorderType==5}}" class="card_morebox card_moreboxleft">开发票</view> -->
+        <!-- <view wx:if="{{orderdata.workorderType!=5}}" class="card_morebox card_moreboxleft" bind:tap="editorder">编辑工单</view> -->
+           
       </view>
       
       <!-- 客户视角内容 -->
-      <view class="card_box" wx:if="{{userdata.operationRole==5}}">
-        <!-- 订单详情 -->
+      <view class="card_box" wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}">
+        <!-- 工单详情 -->
         <view class="detail-section" style="border-bottom: 1rpx solid #f5f5f5;">
           <view class="section-header" bind:tap="onmore">
-            <view class="section-title">订单详情</view>
+            <view class="section-title">工单详情</view>
             <view class="section-action">
               <text>{{moretype ? '收起' : '展开详情'}}</text>
               <t-icon name="{{moretype ? 'chevron-up' : 'chevron-down'}}" size="22px"/>
@@ -158,7 +178,7 @@
           
           <view class="detail-list" wx:if="{{moretype}}">
             <view class="detail-item">
-              <view class="item-label">订单号</view>
+              <view class="item-label">工单号</view>
               <view class="item-value">{{orderdata.workorderId}}</view>
             </view>
             <view class="detail-item">
@@ -166,8 +186,8 @@
               <view class="item-value">{{orderdata.workorderCreatetime}}</view>
             </view>
             <view class="detail-item">
-              <view class="item-label">订单类型</view>
-              <view class="item-value">{{orderdata.chargedischargeType==1 ? '充电' : '放电'}}</view>
+              <view class="item-label">工单类型</view>
+              <view class="item-value" style="color:#40a9ff;">{{orderdata.chargedischargeType==1 ? '充电' : '放电'}}</view>
             </view>
             <view class="detail-item">
               <view class="item-label">需求电量</view>
@@ -177,6 +197,8 @@
               <view class="item-label">SOC</view>
               <view class="item-value">{{orderdata.soc}}</view>
             </view>
+          
+          
             <view class="detail-item">
               <view class="item-label">车型</view>
               <view class="item-value">{{orderdata.carMondel}}</view>
@@ -213,26 +235,32 @@
           
           <view style="height: 20rpx;" wx:if="{{moretype}}"></view>
         </view>
-        
+        <!---->
         <!-- 费用明细 -->
         <view class="detail-section">
           <view class="section-header" bind:tap="oncostdetails">
-            <view class="section-title">预估金额</view>
+            <view class="section-title" wx:if="{{orderdata.workorderType>4&&orderdata.settlementType==0}}">实付金额</view>
+            <view class="section-title" wx:if="{{orderdata.workorderType>4&&orderdata.settlementType==1}}">实付金额</view>
+            <view class="section-title" wx:if="{{orderdata.workorderType<4&&orderdata.settlementType==0}}">预估金额</view>
             <view class="section-action">
-              <view class="section-title1">100.1 <text class="section_yuan">元</text>
+              <view class="section-title1">{{orderdata.price}} <text class="section_yuan">元</text>
               </view>
               <t-icon name="{{costdetails ? 'chevron-up' : 'chevron-down'}}" size="22px"/>
             </view>
           </view>
-          
+          <!---->
           <view class="fee-list" wx:if="{{costdetails}}">
             <view class="fee-item">
               <view class="fee-label">电费</view>
               <view class="fee-value">¥5.00</view>
             </view>
-            <view class="fee-item">
-              <view class="fee-label">服务费</view>
-              <view class="fee-value">¥5.00</view>
+            <view class="detail-item" wx:if="{{orderdata.chargedischargeType==1}}">
+              <view class="item-label">充电量</view>
+              <view class="item-value">{{orderdata.chargingcapacity}}</view>
+            </view>
+            <view class="detail-item" wx:if="{{orderdata.chargedischargeType==2}}">
+              <view class="item-label">放电量</view>
+              <view class="item-value">{{orderdata.dischargecapacity}}</view>
             </view>
             <!-- <view class="fee-item">
               <view class="fee-label">起步价</view>
@@ -256,10 +284,10 @@
       <!---->
       <!-- 司机视角内容 -->
       <view class="card_box" wx:if="{{userdata.operationRole==4}}">
-        <!-- 订单详情 -->
+        <!-- 工单详情 -->
         <view class="detail-section" style="border-bottom: 1rpx solid #f5f5f5;">
           <view class="section-header" bind:tap="onmore">
-            <view class="section-title">订单详情</view>
+            <view class="section-title">工单详情</view>
             <view class="section-action">
               <text>{{moretype ? '收起' : '展开详情'}}</text>
               <t-icon name="{{moretype ? 'chevron-up' : 'chevron-down'}}" size="22px"/>
@@ -268,7 +296,7 @@
           
           <view class="detail-list" wx:if="{{moretype}}">
             <view class="detail-item">
-              <view class="item-label">订单号</view>
+              <view class="item-label">工单号</view>
               <view class="item-value">{{orderdata.workorderId}}</view>
             </view>
             <view class="detail-item">
@@ -276,7 +304,7 @@
               <view class="item-value">{{orderdata.workorderCreatetime}}</view>
             </view>
             <view class="detail-item">
-              <view class="item-label">订单类型</view>
+              <view class="item-label">工单类型</view>
               <view class="item-value">{{orderdata.chargedischargeType==1 ? '充电' : '放电'}}</view>
             </view>
             <view class="detail-item">
@@ -325,9 +353,9 @@
         </view>
       </view>
       
-      <view style="height: 140rpx;" wx:if="{{moretype}}"></view>
+      <view style="height: 140rpx;"></view>
       
-      <!-- 控制按钮区域 -->
+      <!-- 开始时间 -->
       <view class="control-panel" wx:if="{{userdata.operationRole==4}}">
         <slide-confirm 
           wx:if="{{orderdata.workorderType==1}}"
@@ -339,7 +367,7 @@
           defaultText="开始出发"
           successText="验证中"
         />
-        
+        <!--  -->
         <slide-confirm 
           wx:if="{{orderdata.workorderType==2}}"
           id="mySlideConfirm"
@@ -372,8 +400,32 @@
           defaultText="完成工作"
           successText="验证中"
         />
-        
+        <view class="payment" wx:if="{{orderdata.workorderType==5&&orderdata.settlementType==0}}">
+    <view class="payccc">
+    用户待结算
+    </view>
+    </view>
       </view>
     </view>
+    <view class="payment" wx:if="{{(userdata.operationRole==5||userdata.operationRole==6)&&orderdata.workorderType==5&&orderdata.settlementType==0}}">
+    <view class="pay" bind:tap="onpay">
+    工单结算
+    </view>
+    </view>
+    <view class="payment" wx:if="{{(userdata.operationRole==5||userdata.operationRole==6)&&orderdata.workorderType<5&&orderdata.settlementType==0}}">
+      <view class="payccc">
+        工单服务中...
+    </view>
+    </view>
+    <!-- 结算弹窗组件 -->
+<!-- 结算弹窗 -->
+<verification-popup 
+  class="payment-popup" 
+  isShow="{{showpayment}}"
+  type="结算"
+  bind:close="onpaymentPopupClose"
+  bind:inputComplete="onpaymentInputComplete"
+/>
   </view>
-</view>
+</view>  
+<!---->

package-map/pages/map/index.wxss

@@ -8,7 +8,7 @@
   flex-direction: column;
   background-color: #f9f9f9;
 }
-
+/*  */
 .map {
   width: 100%;
   height: 60%;
@@ -99,6 +99,8 @@
 }
 /* 目的地标题 */
 .destination-title1 {
+  display: flex;
+  align-items: center;
   color: #333;
 }
 .destination-font {
@@ -272,7 +274,7 @@ height: 100rpx;
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 999;
+  z-index: 99;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -465,27 +467,35 @@ height: 100rpx;
 .confirm-btn::after {
   border: none;
 }
-/* 详情区块通用样式 */
-.detail-section {
-  /* margin-bottom: 30rpx; */
-}
+/* 详情区块--通用样式 */
+/* .detail-section {
+  margin-bottom: 30rpx;
+} */
 .card_more{
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   border-top: 1rpx solid #f5f5f5;
   padding-top: 20rpx;
 }
 .card_morebox{
   width: 140rpx;
   height: 60rpx;
+  margin: 0rpx;
+  padding: 0rpx;
+  font-size: 28rpx;
   display: flex;
   align-items: center;
   justify-content: center;
   border-radius: 50rpx;
+  border: 1rpx solid #f9f9f9 !important; 
   background-color: #fff;
   box-shadow: 0 -2rpx 12px rgba(0, 0, 0, 0.1);
 
 }
+
+.card_moreboxleft{
+  margin-left: 20rpx;
+}
 .card_box{
   width: 100%;
 border-radius: 10rpx;
@@ -561,7 +571,7 @@ padding: 0rpx 20rpx;
 }
 
 .contact-btn {
-  background-color: #40a9ff;
+  background-color: #00C775;
   color: #fff;
   font-size: 22rpx;
   padding: 5rpx 15rpx;
@@ -652,4 +662,37 @@ margin-left: 20rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
+}
+.payment{
+width: 100%;
+position: fixed;
+right: 0rpx;
+bottom: 60rpx;
+display: flex;
+align-items: center;
+justify-content: center;
+}
+.pay{
+  width: 500rpx;
+height: 88rpx;
+display: flex;
+align-items: center;
+justify-content: center;
+background-color: #00C775;
+color: #fff;
+border-radius: 10rpx;
+}
+.payccc{
+  width: 500rpx;
+  height: 88rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: #00C775 1rpx solid;
+  color: #fff;
+  background-color: #00C775;
+  border-radius: 10rpx;
+}
+.code-popup{
+  z-index: 99;
 }

package-map/pages/map/indexcopy.js

@@ -136,6 +136,7 @@ Page({
       console.error('请求失败：', err);
     });
   },
+  // 
   getworkorder(){
     let data = {
       workorderId:this.data.optionsid
@@ -155,9 +156,9 @@ Page({
   },
  
   
-  // 初始化地图
-  initMap() {
-    const that = this;
+  // 初始化地图  
+   initMap() { 
+    const that = this; 
     
     // 获取用户当前位置
     wx.getLocation({
@@ -200,9 +201,9 @@ Page({
   setDestination() {
     // 1. 定义常量，提高可维护性
     const ICON_PATH = {
-      start: "https://esos-iot.bjdexn.cn/myminio/project/0b0593293af54ea097b168cea479c25c.png",
-      end: "https://esos-iot.bjdexn.cn/myminio/project/6dc37b15321b462f9ab59c47263dd224.png",
-      driver: "https://esos-iot.bjdexn.cn/myminio/project/driver_marker.png" // 司机图标路径
+      start: "https://esos-iot.com/myminio/project/0b0593293af54ea097b168cea479c25c.png",
+      end: "https://esos-iot.com/myminio/project/6dc37b15321b462f9ab59c47263dd224.png",
+      driver: "https://esos-iot.com/myminio/project/driver_marker.png" // 司机图标路径
     };
     const MARKER_SIZE = { width: 30, height: 30 };
     const MAP_PADDING = [100, 100, 100, 100];
@@ -520,8 +521,7 @@ Page({
     onResendCode() {
       console.log("重新发送验证码");
       // 重新发送逻辑...
-    },
-    
+    }, 
     // 验证码输入完成
     onCodeComplete(e) {
       console.log("验证码输入完成:", e.detail.code);
@@ -626,7 +626,7 @@ this.startBackgroundLocation();
       })
     },
 // 拖动功能
-     // 触摸开始
+       // 触摸开始
   handleTouchStart(e) {
     this.setData({
       startY: e.changedTouches[0].clientY
@@ -664,7 +664,7 @@ this.startBackgroundLocation();
       startY: currentY
     });
   },
-
+// 
   // 触摸结束：优化全屏吸附逻辑
   handleTouchEnd() {
     const { currentHeight } = this.data;
@@ -803,7 +803,7 @@ this.startBackgroundLocation();
   onUnload() {
  
   },
-  // 检查并申请后台定位权限
+  // 检查并申请后台定位权限-=-=-=-=-=-=-=-=-=
 checkBackgroundLocationPermission() {
   return new Promise((resolve, reject) => {
     // 1. 检查后台定位权限
@@ -851,6 +851,7 @@ checkBackgroundLocationPermission() {
               scope: 'scope.userLocation',
               success: () => {
                 // 前台定位授权成功后，再申请后台定位权限
+                // 
                 wx.authorize({
                   scope: 'scope.userLocationBackground',
                   success: () => {
@@ -915,3 +916,4 @@ checkBackgroundLocationPermission() {
   });
 }
 });
+// 

package-map/pages/map/indexcopy.wxml

@@ -90,7 +90,7 @@
   <view class="destination-title1" style="margin-top: 20rpx;">
       目的地：{{orderdata.poiName}}
     </view>
-    <view class="destination-font" wx:if="{{userdata.operationRole==5}}">
+    <view class="destination-font" wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}">
     <view class="driver" wx:if="{{orderdata.driverphone==''}}">司机：<text style="color: #ff6b00;">待接单</text> </view>
     <view class="driver" wx:else>司机：{{orderdata.driverName}}·{{orderdata.carName}} 
     
@@ -99,22 +99,22 @@
     <view class="destination-font" wx:if="{{userdata.operationRole==4}}">客户：{{orderdata.receiver}} <t-icon name="call-1-filled" size="28rpx" data-name="call-1-filled" data-phone="{{orderdata.phone}}" bind:tap="ontelephone" style="margin-left:20rpx"/> </view>
 
 </view>
-  <image wx:if="{{userdata.operationRole==5}}" class="storagecar" src="https://esos-iot.bjdexn.cn/myminio/project/c152026b9bc2485f83b39a6132df3ce7.png" mode="heightFix"/>
+  <image wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}" class="storagecar" src="https://esos-iot.com/myminio/project/c152026b9bc2485f83b39a6132df3ce7.png" mode="heightFix"/>
  
-<image wx:if="{{userdata.operationRole==4}}" class="storagecar1" src="https://esos-iot.bjdexn.cn/myminio/project/d98e4fde125f40819f8bd8fe872e409c.png" bind:tap="navigation" mode="heightFix"/>
+<image wx:if="{{userdata.operationRole==4}}" class="storagecar1" src="https://esos-iot.com/myminio/project/d98e4fde125f40819f8bd8fe872e409c.png" bind:tap="navigation" mode="heightFix"/>
 </view> 
-<view class="card_more" wx:if="{{userdata.operationRole==5&&orderdata.workorderType!=0}}">
+<view class="card_more" wx:if="{{(userdata.operationRole==5||userdata.operationRole==6)&&orderdata.workorderType!=0}}">
 <view class="card_morebox">开发票</view>
 <view class="card_morebox">联系客服</view>
 <view class="card_morebox" data-phone="{{orderdata.driverphone}}" bind:tap="ontelephone">打电话</view>
 <view class="card_morebox">再来一单</view>
 </view>
-<view class="card_box" wx:if="{{userdata.operationRole==5}}">
+<view class="card_box" wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}">
  
    <!-- 行程详情 -->
    <view class="detail-section" style="border-bottom: 1rpx solid #f5f5f5;">
     <view class="viewmore_box" bind:tap="onmore">
-  <view class="section-title">订单详情</view>
+  <view class="section-title">工单详情</view>
 <view class="viewmore_right">
  <text wx:if="{{!moretype}}">展开详情</text> 
  <text wx:if="{{moretype}}">收起</text> 
@@ -124,7 +124,7 @@
 </view>
       <view class="detail-list" wx:if="{{moretype}}">
         <view class="detail-item">
-          <view class="item-label">订单号</view>
+          <view class="item-label">工单号</view>
           <view class="item-value">{{orderdata.workorderId}}</view>
         </view>
         <view class="detail-item">
@@ -132,7 +132,7 @@
           <view class="item-value">{{orderdata.workorderCreatetime}}</view>
         </view>
         <view class="detail-item">
-          <view class="item-label">订单类型</view>
+          <view class="item-label">工单类型</view>
           <view class="item-value" wx:if="{{orderdata.chargedischargeType==1}}">充电</view>
           <view class="item-value" wx:if="{{orderdata.chargedischargeType==2}}">放电</view>
         </view>
@@ -207,7 +207,7 @@
  <!-- 行程详情 -->
  <view class="detail-section" style="border-bottom: 1rpx solid #f5f5f5;">
   <view class="viewmore_box" bind:tap="onmore">
-<view class="section-title">订单详情</view>
+<view class="section-title">工单详情</view>
 <view class="viewmore_right">
 <text wx:if="{{!moretype}}">展开详情</text> 
 <text wx:if="{{moretype}}">收起</text> 
@@ -217,7 +217,7 @@
 </view>
     <view class="detail-list" wx:if="{{moretype}}">
       <view class="detail-item">
-        <view class="item-label">订单号</view>
+        <view class="item-label">工单号</view>
         <view class="item-value">{{orderdata.workorderId}}</view>
       </view>
       <view class="detail-item">
@@ -225,7 +225,7 @@
         <view class="item-value">{{orderdata.workorderCreatetime}}</view>
       </view>
       <view class="detail-item">
-        <view class="item-label">订单类型</view>
+        <view class="item-label">工单类型</view>
         <view class="item-value" wx:if="{{orderdata.chargedischargeType==1}}">充电</view>
         <view class="item-value" wx:if="{{orderdata.chargedischargeType==2}}">放电</view>
       </view>

package-order/pages/address/index.js

@@ -2,7 +2,6 @@
 const api = require('../../../api/index.js');
 
 Page({
-
   /**
    * 页面的初始数据
    */
@@ -28,10 +27,8 @@ Page({
       address:data.data
     })
   }
- 
     })
     .catch((err) => {
-   
       console.error('请求失败：', err);
     });
   },
@@ -53,27 +50,55 @@ Page({
   
   },
   onDelete(id){
-    console.log(id.currentTarget.dataset.id);
-    let data ={
-      addressId:id.currentTarget.dataset.id
+    let _this = this
+    // 在页面的 js 文件中
+  wx.showModal({
+    title: '提示',
+    content: '确定要取消工单吗？',
+    success (res) {
+      if (res.confirm) {
+        console.log(id.currentTarget.dataset.id);
+        let data ={
+          addressId:id.currentTarget.dataset.id
+        }
+        api.request(`/sysaddress/deleteaddress`, 'post',data,{ isPublic: false })
+        .then((data) => {
+      console.log(data.data);
+      if (data.code==200) {
+        wx.showToast({ title: '取消成功', icon: 'none' });
+        _this.getaddress()
+      }
+        })
+        .catch((err) => {
+          console.error('请求失败：', err);
+        });
+      } else if (res.cancel) {
+        // _this.showInfo('取消操作');
+        wx.showToast({ title: '取消操作', icon: 'none' });
+      }
     }
-    api.request(`/sysaddress/deleteaddress`, 'post',data,{ isPublic: false })
-    .then((data) => {
-  console.log(data.data);
-  if (data.code==200) {
- this.getaddress()
-  }
- 
-    })
-    .catch((err) => {
-   
-      console.error('请求失败：', err);
-    });
+  })
   },
   radioChange(e){
    console.log(e.detail.value);
-
+   let data ={
+    addressId:e.detail.value,
+    isDefault:true
+   }
+   api.request(`/sysaddress/updateaddress`, 'post',data,{ isPublic: false })
+   .then((data) => {
+ console.log(data.data);
+ if (data.code==200) {
+this.getaddress()
+ }
+
+   })
+   .catch((err) => {
+  
+     console.error('请求失败：', err);
+   });
   },
+ 
     /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -85,6 +110,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
+    this.getaddress()
 
   },
 

package-order/pages/address/index.json

@@ -1,4 +1,6 @@
 {
+  "navigationBarTitleText": "我的地址",
+
   "usingComponents": {
     "t-icon": "tdesign-miniprogram/icon/icon",
     "t-swipe-cell": "tdesign-miniprogram/swipe-cell/swipe-cell"

package-order/pages/address/index.wxml

@@ -1,18 +1,23 @@
 <!--pages/userlist/index.wxml-->
 <view class="setup">
   <radio-group bindchange="radioChange">
-    <t-swipe-cell wx:for="{{address}}" wx:key="addressId">
-  <view class="driver-info">
+    <!-- <t-swipe-cell wx:for="{{address}}" wx:key="addressId" bind:dragstart="handleDragStart" bind:dragend="handleDragEnd"> -->
+  <view class="driver-info" wx:for="{{address}}" wx:key="addressId">
       <view class="driver-details">
-        <view class="driver-car">{{item.addressDetails}}</view>
+      <view class="driver-name">项目地址:中原油田</view>
         <view class="driver-name">{{item.poiName||item.addressDetails}}</view>
-        <view class="driver-arrive"><radio value="{{item.addressId}}" checked="true"/>{{item.receiver}} {{item.phone}}</view>
+        <view class="driver-car">{{item.addressDetails}}</view>
+        <view class="driver-arrive"><radio value="{{item.addressId}}" checked="{{item.isDefault}}"/>{{item.receiver}} {{item.phone}}</view>
+        <view class="driver-operation">
+          <button class="cancel-btn1" data-item="{{item}}" bind:tap="onIconTap">编辑</button>
+          <button class="cancel-btn1"  data-id="{{item.addressId}}" bind:tap="onDelete">删除</button>
+        </view>
+      
       </view>
-      <!-- <button class="cancel-btn" bindtap="cancelOrder">去查看</button> -->
-      <t-icon name="edit-2" size="40rpx" data-name="edit-2" data-item="{{item}}" bind:tap="onIconTap" />
+      <!-- <t-icon name="edit-2" size="40rpx" data-name="edit-2" data-item="{{item}}" bind:tap="onIconTap" /> -->
     </view>
-      <view slot="right" class="btn delete-btn" data-id="{{item.addressId}}" bind:tap="onDelete">删除</view>
-    </t-swipe-cell>
+      <!-- <view slot="right" class="btn delete-btn" data-id="{{item.addressId}}" bind:tap="onDelete">删除</view> -->
+    <!-- </t-swipe-cell> -->
   </radio-group>
 </view>
 <view class="address">

package-order/pages/address/index.wxss

@@ -13,6 +13,7 @@ page{
   box-sizing: border-box;
 }
 .driver-info {
+  width: 100%;
   background-color: white;
   border-radius: 16rpx;
   padding:20rpx 30rpx 20rpx 0rpx;
@@ -51,7 +52,7 @@ page{
   /* color: #666; */
   color: #999999;
 
-  margin-top: 8rpx;
+  margin-top: 28rpx;
 }
 
 .cancel-btn {
@@ -64,6 +65,7 @@ page{
   background-color: white;
   border-radius: 32rpx;
 }
+
 .address{
   width: 100%;
   height: 140rpx;
@@ -112,4 +114,20 @@ color: #ffffff;
 
 .favor-btn {
   background-color: var(--td-brand-color, #0052d9);
+}
+.driver-operation{
+  display: flex;
+  /* justify-content: space-between; */
+  justify-content: space-around;
+  margin-top: 30rpx;
+}
+.cancel-btn1 {
+  width: 160rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  font-size: 28rpx;
+  color: #0F80DC;
+  border: 1rpx solid #0F80DC;
+  background-color: white;
+  border-radius: 32rpx;
 }

package-order/pages/createorder/index.js

@@ -27,6 +27,7 @@ Page({
     workorderpower:'',
     orderdata:[],
     orderid:'',
+    createtype:false
   },
 
   /**
@@ -34,6 +35,9 @@ Page({
    */
   onLoad(options) {
     console.log(options);
+    this.setData({
+      userdata: wx.getStorageSync('user') || {},
+    });
 this.getaddress()
 
     if (options.order!='') {
@@ -46,7 +50,7 @@ this.getaddress()
 //  this.getdriver()
 // this.getvehicle()
   },
-  // 订单详情
+  // 工单详情
   getoneworkorder() {
     const data = {
       workorderId: this.data.orderid
@@ -57,7 +61,6 @@ this.getaddress()
         if (data.code == 200) {
        
           this.setData({
-            cartype:data.data.chargedischargeType,
             workorderElectricity:data.data.workorderElectricity,
             workorderpower:data.data.workorderPower,
             greenelectricity:data.data.greenelectricity,
@@ -154,12 +157,18 @@ this.getaddress()
     api.request(`/sysaddress/selectaddress`, 'post',data,{ isPublic: false })
     .then((data) => {
      console.log(data.data);
+     for (let index = 0; index < data.data.length; index++) {
+          if (data.data[index].isDefault) {
+              this.setData({
+                addressindex:index
+              }) 
+          }       
+     }
      this.setData({
       address:data.data
      })
     })
     .catch((err) => {
-   
       console.error('请求失败：', err);
     });
   },
@@ -191,6 +200,13 @@ this.setData({
     })
   },
   details(){
+  
+    if (this.data.createtype) {
+      return
+    }
+    this.setData({
+      createtype:true
+    })
    if (this.data.workorderElectricity==''||this.data.date==''||this.data.time==''||this.data.workorderpower=='') {
     wx.showToast({
       title: '请填写完整消息',
@@ -201,7 +217,6 @@ this.setData({
     let data ={
       addressId:this.data.address[this.data.addressindex].addressId,
       workorderElectricity:this.data.workorderElectricity,
-      chargedischargeType:this.data.cartype,
       greenelectricity:this.data.greenelectricity,
       workorderStarttime:this.data.date+' '+this.data.time,
       workorderpower:this.data.workorderpower
@@ -209,13 +224,18 @@ this.setData({
     api.request(`/sysworkorder/addworkorder`, 'post',data,{ isPublic: false })
     .then((data) => {
  console.log(data);
+
  wx.switchTab({
   url: '/pages/tool/index',
 })
-
+this.setData({
+  createtype:false
+})
     })
     .catch((err) => {
-   
+      this.setData({
+        createtype:false
+      })
       console.error('请求失败：', err);
     });
  
@@ -233,7 +253,6 @@ this.setData({
       workorderId:this.data.orderid,
        addressId:this.data.address[this.data.addressindex].addressId,
        workorderElectricity:this.data.workorderElectricity,
-       chargedischargeType:this.data.cartype,
        greenelectricity:this.data.greenelectricity,
        workorderStarttime:this.data.date+' '+this.data.time,
        workorderpower:this.data.workorderpower

package-order/pages/createorder/index.wxml

@@ -5,8 +5,8 @@
 <text style="color: red;">*</text> 用车类型
 </view>
 <view class="car_right">
-  <view class="{{cartype== 2 ?'cartbuy':'carsell'}}" data-index="1" bind:tap="oncar">买电</view>
-  <view class="{{cartype== 1 ?'cartbuy':'carsell'}}" data-index="2" bind:tap="oncar">卖电</view>
+  <view wx:if="{{userdata.operationRole==5}}" class="carsell">买电</view>
+  <view wx:if="{{userdata.operationRole==6}}" class="carsell">卖电</view>
 </view>
 </view>
 <view class="car">
@@ -14,7 +14,7 @@
 <text style="color: red;">*</text> <text wx:if="{{cartype==2}}"> 出售电量</text> <text wx:if="{{cartype==1}}"> 需求电量</text> 
 </view>
 <view class="model_right">
-<input class="powerlevel" type="text" value="{{workorderElectricity}}" bindinput="bindKeyInput" placeholder="请输入电量"/>kWh
+<input class="powerlevel" type="text" value="{{workorderElectricity}}" bindinput="bindKeyInput" placeholder="请输入需求用电"/>kWh
 </view>
 </view>
 <!-- <view class="car" wx:if="{{cartype==1}}">
@@ -32,7 +32,7 @@
  变压器容量
 </view>
 <view class="model_right">
-<input class="powerlevel" value="{{workorderpower}}" bindinput="bindintentionInput" type="text" placeholder="请输入需求用电"/>kVA
+<input class="powerlevel" value="{{workorderpower}}" bindinput="bindintentionInput" type="text" placeholder="请输入变压器容量"/>kVA
 </view>
 </view>
 <view class="car">
@@ -110,6 +110,7 @@
     </view>
   </picker>
   <view class="picker" wx:else bind:tap="toconfigure">
+  <view style="width: 200rpx;"></view>
     新增地址
 <t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s" color="#cccccc" bind:tap="onIconTap" />
     </view>
@@ -151,9 +152,10 @@
 </view>
 </view>
 </view>
-<!-- 
+<!--
+  
+ -->
 
---->
 <button class="call-btn" bindtap="details" wx:if="{{orderid==''}}"> 
       <text class="call-btn_left_electricity">预约</text>
 </button> 

package-order/pages/createorder/index.wxss

@@ -28,7 +28,7 @@ box-sizing: border-box;
 }
  
 .car_right{
-  width: 240rpx;
+  /* width: 240rpx; */
   display: flex;
   justify-content: space-between;
 }

package-order/pages/driver/index.wxml

@@ -1,7 +1,7 @@
 <!--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>
+      <image src="https://esos-iot.com/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>

package-order/pages/mapSelect/index.js

@@ -51,7 +51,7 @@ onLoad(options) {
             id: 0,
             latitude,
             longitude,
-            iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/0b0593293af54ea097b168cea479c25c.png', // 可自行添加定位图标
+            iconPath: 'https://esos-iot.com/myminio/project/0b0593293af54ea097b168cea479c25c.png', // 可自行添加定位图标
             width: 30,
             height: 30,
             anchor: { x: 0.5, y: 0.5 }
@@ -90,7 +90,7 @@ onLoad(options) {
               id: 0,
               latitude: lat,
               longitude: lng,
-              iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/0b0593293af54ea097b168cea479c25c.png',
+              iconPath: 'https://esos-iot.com/myminio/project/0b0593293af54ea097b168cea479c25c.png',
               width: 30,
               height: 30,
               anchor: { x: 0.5, y: 0.5 }

package-order/pages/newaddress/index.js

@@ -1,9 +1,9 @@
 const app = getApp();
 const api = require('../../../api/index.js');
  
-// 全局常量定义
-const PHONE_REG = /^1[3-9]\d{9}$/; // 手机号正则
-const EMPTY_REGION_TIP = '请选择省/市/区'; // 地区空提示
+// 全局常量定义 -()-()-()-
+const PHONE_REG = /^1[3-9]\d{9}$/; // 手机号正则        
+const EMPTY_REGION_TIP = '请选择省/市/区'; // 地区空提示 
 
 Page({
   data: {
@@ -230,8 +230,11 @@ Page({
       .then((data) => {
     console.log(data.data);
     if (data.code==200) {
-    wx.navigateTo({
-      url: '/package-order/pages/address/index',
+    // wx.navigateTo({
+    //   url: '/package-order/pages/address/index',
+    // })
+    wx.navigateBack({
+      delta: 1,
     })
     this.setData({ isSubmitting: false });
   
@@ -247,8 +250,11 @@ Page({
       .then((data) => {
     console.log(data.data);
     if (data.code==200) {
-    wx.navigateTo({
-      url: '/package-order/pages/address/index',
+    // wx.navigateTo({
+    //   url: '/package-order/pages/address/index',
+    // })
+    wx.navigateBack({
+      delta: 1,
     })
     this.setData({ isSubmitting: false });
   

package-order/pages/order/index.js

@@ -0,0 +1,100 @@
+// pages/userlist/index.js
+const api = require('../../../api/index.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  userdata:[],
+  tabsindex:0
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+ this.getuser()
+  },  
+getuser(){
+  let data ={
+    workorderType:3,
+    settlementType:this.data.tabsindex,
+    pageNum:1,
+    pageSize:99
+  }
+  api.request(`/sysworkorder/selectworkorderlist`, 'post',data,{ isPublic: false })
+  .then((data) => {
+console.log(data.data);
+if (data.code==200) {
+  this.setData({
+    userdata:data.data.list
+  })
+}
+  })
+  .catch((err) => {
+    console.error('请求失败：', err);
+  });
+},
+onTabsChange(e){
+ console.log(e.detail.value);
+ this.setData({
+  tabsindex:e.detail.value
+ })
+ this.getuser()
+},
+details(e){
+  wx.navigateTo({
+  url: `/package-map/pages/map/index?id=${e.currentTarget.dataset.id}`,
+})
+},
+  /**
+   *
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  }, 
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

package-order/pages/order/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "我的工单",
+  "usingComponents": {
+    "t-tabs": "tdesign-miniprogram/tabs/tabs",
+    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel"
+  }
+}

package-order/pages/order/index.wxml

@@ -0,0 +1,33 @@
+<!--pages/userlist/index.wxml-->
+<t-tabs value="{{tabsindex}}" sticky="true" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" split="{{false}}">
+    <t-tab-panel label="待结算" value="0" />
+  <t-tab-panel label="结算完成" value="1" />
+  <t-tab-panel label="结算失败" value="2" />
+</t-tabs>
+<view class="setup">
+  <view class="driver-info" wx:for="{{userdata}}" wx:key="customerId" data-id="{{item.workorderId}}" bind:tap="details">
+      <view class="driver-details">
+        <view class="driver-name">目的地: {{item.poiName}}</view>
+        <view class="driver-arrive" style="margin-top:20rpx;">工单类型：
+          <text wx:if="{{item.chargedischargeType==1}}">充电</text>
+        <text wx:if="{{item.chargedischargeType==2}}">放电</text>
+        </view>
+        <view class="driver-arrive">电量：{{item.workorderActual}}</view>
+        <view class="driver-arrive">工单状态：
+        <text wx:if="{{item.workorderType==5&&item.settlementType==0}}">工作完成</text>
+        <text  wx:if="{{item.workorderType==5&&item.settlementType==1}}">工单完成</text>
+        <text  wx:if="{{item.workorderType==5&&item.settlementType==2}}">工单完成</text>
+        </view>
+        <view class="driver-car">完成时间： {{item.endworktime}}</view>
+      </view>
+      <view wx:if="{{item.settlementType==0}}" class="cancel-btn">待结算</view>
+      <view wx:if="{{item.settlementType==1}}" class="cancel-btn">结算完成</view>
+      <view wx:if="{{item.settlementType==2}}" class="cancel-btn">结算失败</view>
+    </view>
+     <view class="available" wx:if="{{userdata.length<1}}">
+<image src="https://esos-iot.com/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
+</view> 
+</view>
+<!--
+  
+ -->

package-order/pages/order/index.wxss

@@ -0,0 +1,106 @@
+/* pages/userlist/index.wxss */
+page{
+  width: 100%;
+  height: 100vh;
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
+  box-sizing: border-box;
+
+}
+.setup{
+  padding: 0rpx 22rpx;
+  padding-bottom:60rpx;
+}
+.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: 120rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  font-size: 28rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* color: #FF5252; */
+  /* border: 1rpx solid #FF5252; */
+  background-color: white;
+  border-radius: 32rpx;
+}
+.driverpopup{
+  width: 100%;
+  height: 600rpx;
+  padding: 20rpx;
+  padding-top:100rpx;
+  box-sizing: border-box;
+}
+.driverpopup_box{
+  width: 100%;
+  height: 100rpx;
+  align-items: center;
+}
+.picker{
+  width: 100%;
+  height: 100rpx;
+  align-items: center;
+}
+.botton{
+width: 100%;
+display: flex;
+align-items: center;
+justify-content: center;
+}
+.botton_box{
+  width: 400rpx;
+  height: 70rpx;
+  margin-top: 100rpx;
+  font-size: 28rpx;
+  border-radius: 10rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #ffffff;
+  background-color: #2C85FF;
+}
+.available{
+  display: flex;
+   justify-content: center;
+   align-items: center;
+   margin-top: 100rpx;
+  }

package-order/pages/payment/index.js

@@ -0,0 +1,70 @@
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 工单信息（实际开发中从结算回调/缓存/接口获取）
+    orderInfo: {
+      orderNo: '20260120123456789', // 工单编号
+      amount: '99.00', // 结算金额
+      payTime: '2026-01-20 15:30:25' // 结算时间
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    // 实际开发中：从结算回调的参数/缓存中获取工单信息
+    // 示例：如果结算页跳转时传了工单号，这里接收并请求接口
+    // if (options.orderNo) {
+    //   this.getOrderDetail(options.orderNo);
+    // }
+  },
+
+  /**
+   * 模拟获取工单详情（实际开发替换为真实接口）
+   */
+  getOrderDetail(orderNo) {
+    // 调用接口获取工单信息，示例：
+    // wx.request({
+    //   url: '你的接口地址',
+    //   data: { orderNo },
+    //   success: (res) => {
+    //     this.setData({ orderInfo: res.data.data });
+    //   }
+    // });
+  },
+
+  /**
+   * 跳转到工单详情页
+   */
+  gotoOrderDetail() {
+    // 跳转到工单详情页，传工单编号
+    wx.navigateTo({
+      url: `/package-map/pages/map/index`
+    });
+  },
+
+  /**
+   * 返回首页
+   */
+  backToHome() {
+    // 返回到首页（如果首页在tabBar，用switchTab；否则用navigateBack/redirectTo）
+    wx.switchTab({
+      url: '/pages/index/index'
+    });
+    // 如果首页不在tabBar，用这个：
+    // wx.redirectTo({
+    //   url: '/pages/index/index'
+    // });
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    // 隐藏小程序返回按钮（可选，结算成功页建议隐藏）
+    wx.hideHomeButton();
+  }
+});

package-order/pages/payment/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "结算成功",
+  "navigationBarBackgroundColor": "#f8f8f8",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#f8f8f8"
+}

package-order/pages/payment/index.wxml

@@ -0,0 +1,55 @@
+<view class="pay-success-container">
+  <!-- 成功状态区 -->
+  <view class="success-top">
+    <view class="success-icon">
+      <text class="iconfont">✓</text>
+    </view>
+    <view class="success-title">交易成功</view>
+    <view class="success-desc">您的工单已交易完成，感谢您的支持!</view>
+  </view>
+
+  <!-- 工单信息区 -->
+  <view class="order-info" wx:if="{{orderInfo}}">
+    <view class="info-title">工单信息</view>
+    
+    <view class="info-item">
+      <text class="label">工单编号：</text>
+      <text class="value">{{orderInfo.orderNo}}</text>
+    </view>
+   
+    <view class="info-item">
+      <text class="label">司机：</text>
+      <text class="value">{{orderInfo.orderNo}}</text>
+    </view>
+    <view class="info-item">
+      <text class="label">本次行程：</text>
+      <text class="value">{{orderInfo.orderNo}}</text>
+    </view>
+    <view class="info-item">
+      <text class="label">本次充电：</text>
+      <text class="value">{{orderInfo.orderNo}}</text>
+    </view>
+    <view class="info-item">
+      <text class="label">本次放电：</text>
+      <text class="value">{{orderInfo.orderNo}}</text>
+    </view>
+    <view class="info-item">
+      <text class="label">结算金额：</text>
+      <text class="value amount">¥{{orderInfo.amount}}</text>
+    </view>
+    <view class="info-item">
+      <text class="label">结算时间：</text>
+      <text class="value">{{orderInfo.payTime}}</text>
+    </view>
+    <view class="info-item">
+      <text class="label">目的地：</text>
+      <text class="value">{{orderInfo.orderNo}}</text>
+    </view>
+  </view>
+
+  <!-- 操作按钮区 -->
+  <view class="btn-group">
+    <button class="btn btn-primary" bindtap="gotoOrderDetail">查看工单详情</button>
+    <button class="btn btn-default" bindtap="backToHome">返回首页</button>
+  </view>
+</view>

package-order/pages/payment/index.wxss

@@ -0,0 +1,127 @@
+/* 页面容器 */
+.pay-success-container {
+  padding: 40rpx 30rpx;
+  min-height: 100vh;
+  background-color: #f8f8f8;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 成功状态区 */
+.success-top {
+  text-align: center;
+  margin-bottom: 60rpx;
+  margin-top: 80rpx;
+}
+
+.success-icon {
+  width: 120rpx;
+  height: 120rpx;
+  line-height: 120rpx;
+  background-color: #07c160;
+  border-radius: 50%;
+  margin: 0 auto 30rpx;
+}
+
+.success-icon text {
+  font-size: 60rpx;
+  color: #ffffff;
+}
+
+.success-title {
+  font-size: 36rpx;
+  color: #333;
+  font-weight: 600;
+  margin-bottom: 16rpx;
+}
+
+.success-desc {
+  font-size: 28rpx;
+  color: #666;
+}
+
+/* 工单信息区 */
+.order-info {
+  width: 100%;
+  background-color: #ffffff;
+  border-radius: 16rpx;
+  padding: 30rpx;
+  box-sizing: border-box;
+  margin-bottom: 80rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0,0,0,0.05);
+}
+
+.info-title {
+  font-size: 32rpx;
+  color: #333;
+  font-weight: 600;
+  margin-bottom: 24rpx;
+  padding-bottom: 16rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.info-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 28rpx;
+  margin-bottom: 20rpx;
+}
+
+.info-item:last-child {
+  margin-bottom: 0;
+}
+
+.label {
+  color: #666;
+}
+
+.value {
+  color: #333;
+  text-align: right;
+  flex: 1;
+  margin-left: 20rpx;
+}
+
+.amount {
+  color: #ff4757;
+  font-weight: 600;
+  font-size: 30rpx;
+}
+
+/* 按钮区 */
+.btn-group {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+}
+
+.btn {
+  height: 88rpx;
+  line-height: 88rpx;
+  border-radius: 16rpx;
+  font-size: 32rpx;
+  border: none;
+}
+
+.btn-primary {
+  width: 400rpx;
+  background-color: #07c160;
+  color: #ffffff;
+}
+
+.btn-default {
+  width: 400rpx;
+margin-top: 10rpx;
+  background-color: #ffffff;
+  color: #333;
+  border: 1rpx solid #e0e0e0;
+}
+
+/* 去除小程序默认按钮样式 */
+button::after {
+  border: none;
+}

package-setup/pages/electricity/index.js

@@ -0,0 +1,353 @@
+// 引入 wx-charts（根据实际路径调整）
+const wxCharts = require('../../utils/wxcharts.js');
+const api = require('../../../api/index.js');
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    currentType: 'day', // 默认按日筛选
+    selectedDate: '',   // 选中的日期
+    showDate: '',       // 展示的日期文本
+    showPicker: false,  // 是否显示日期选择器
+    today: '',          // 今日日期
+    statData: {         // 统计数据
+      chargeTotal: 0,
+      dischargeTotal: 0,
+      netTotal: 0
+    },
+    dataList: [],       // 明细数据列表
+    listHeader: '时段', // 列表头部文本
+    chart: null,         // 图表实例，用于更新图表
+    operationRole:wx.getStorageSync('user').operationRole
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    // 获取今日日期
+    const now = new Date();
+    const today = `${now.getFullYear()}-${this.formatNum(now.getMonth() + 1)}-${this.formatNum(now.getDate())}`;
+    this.setData({
+      today,
+      selectedDate: today,
+      showDate: this.formatShowDate(today, 'day')
+    });
+    // 加载初始数据
+    this.loadData();
+  },
+
+  /**
+   * 修复：适配屏幕旋转/尺寸变化，重新渲染图表即可
+   */
+  onResize() {
+    // 直接重新渲染，wxCharts无updateCanvasSize方法
+    if (this.data.dataList.length > 0) {
+      this.renderChart();
+    }
+  },
+
+  /**
+   * 切换筛选类型（日/月/年）
+   */
+  changeType(e) {
+    const type = e.currentTarget.dataset.type;
+    if (type === this.data.currentType) return;
+    
+    this.setData({
+      currentType: type,
+      showDate: this.formatShowDate(this.data.selectedDate, type),
+      listHeader: type === 'day' ? '时段' : (type === 'month' ? '日期' : '月份')
+    });
+    this.loadData();
+  },
+
+  /**
+   * 打开日期选择器
+   */
+  openDatePicker() {
+    this.setData({ showPicker: true });
+    setTimeout(() => {
+      this.setData({ showPicker: false });
+    }, 100);
+  },
+
+  /**
+   * 日期选择器值改变
+   */
+  onDateChange(e) {
+    const selectedDate = e.detail.value;
+    this.setData({
+      selectedDate,
+      showDate: this.formatShowDate(selectedDate, this.data.currentType)
+    });
+    this.loadData();
+  },
+
+  /**
+   * 格式化数字（补零）
+   */
+  formatNum(num) {
+    return num < 10 ? `0${num}` : num;
+  },
+
+  /**
+   * 格式化展示的日期文本
+   */
+  formatShowDate(date, type) {
+    const [year, month, day] = date.split('-');
+    switch (type) {
+      case 'day':
+        return `${year}-${month}-${day}`;
+      case 'month':
+        return `${year}-${month}`;
+      case 'year':
+        return `${year}`;
+      default:
+        return date;
+    }
+  },
+
+  /**
+   * 加载充放电数据
+   */
+  loadData() {
+    let data = {
+      date:this.data.showDate
+    }
+    api.request(`/sysworkorder/workorderstatistics`, 'post', data, { isPublic: false })       
+    .then((data) => {
+      if (data.code == 200) {
+     console.log(data);
+     const { currentType, selectedDate } = this.data;
+     const [year, month, day] = selectedDate.split('-');
+     
+     // 模拟接口请求数据（实际开发中替换为真实接口调用）
+    //  let statData = { chargeTotal: 0, dischargeTotal: 0, netTotal: 0 };
+     let dataList = [];
+ 
+     // 模拟不同维度的测试数据
+     if (currentType === 'day') {
+      // 日维度：按小时统计
+      // 基础校验：避免数据源不存在或非数组导致报错
+      if (this.data.operationRole==5) {
+        if (data.data.chargeList && Array.isArray(data.data.chargeList)) {
+          for (let index = 0; index < data.data.chargeList.length; index++) {
+            // 获取当前行数据
+            const item = data.data.chargeList[index];
+            
+            // 关键修复：先初始化数组元素，再赋值（解决空数组直接赋值报错）
+            dataList[index] = { ...item }; // 保留原始数据字段
+            console.log(dataList);
+            // 保留你的核心逻辑：仅截取小时位相减
+            // 增加防错处理：避免时间字段为空/格式错误导致NaN
+            const startHour = data.data.chargeList[index].startworkordertime?.slice(11, 16) || 0;
+            const endHour = data.data.chargeList[index].endworkordertime?.slice(11, 16) || 0;
+            dataList[index].time = `${endHour +'-'+ startHour}`;
+          }
+        }
+      }else{
+        if (data?.data?.dischargeList && Array.isArray(data.data.dischargeList)) {
+          for (let index = 0; index < data.data.dischargeList.length; index++) {
+            // 获取当前行数据
+            const item = data.data.dischargeList[index];
+            
+            // 关键修复：先初始化数组元素，再赋值（解决空数组直接赋值报错）
+            dataList[index] = { ...item }; // 保留原始数据字段
+            console.log(dataList);
+            // 保留你的核心逻辑：仅截取小时位相减
+            // 增加防错处理：避免时间字段为空/格式错误导致NaN
+            const startHour = data.data.dischargeList[index].startworkordertime?.slice(11, 16) || 0;
+            const endHour = data.data.dischargeList[index].endworkordertime?.slice(11, 16) || 0;
+            dataList[index].time = `${endHour +'-'+ startHour}`;
+          }
+        }
+      }
+    
+     } else if (currentType === 'month') {
+       // 月维度：按日期统计
+      if (this.data.operationRole==5) {
+
+       if (data?.data?.chargeList && Array.isArray(data.data.chargeList)) {
+        for (let index = 0; index < data.data.chargeList.length; index++) {
+          // 获取当前行数据
+          const item = data.data.chargeList[index];
+          
+          // 关键修复：先初始化数组元素，再赋值（解决空数组直接赋值报错）
+          dataList[index] = { ...item }; // 保留原始数据字段
+          console.log(dataList);
+          // 保留你的核心逻辑：仅截取小时位相减
+          // 增加防错处理：避免时间字段为空/格式错误导致NaN
+          const startHour = data.data.chargeList[index].startworkordertime?.slice(8, 10) || 0;
+          dataList[index].time = startHour;
+        }
+      }
+    }else{
+      if (data?.data?.dischargeList && Array.isArray(data.data.dischargeList)) {
+        for (let index = 0; index < data.data.dischargeList.length; index++) {
+          // 获取当前行数据
+          const item = data.data.dischargeList[index];
+          
+          // 关键修复：先初始化数组元素，再赋值（解决空数组直接赋值报错）
+          dataList[index] = { ...item }; // 保留原始数据字段
+          console.log(dataList);
+          // 保留你的核心逻辑：仅截取小时位相减
+          // 增加防错处理：避免时间字段为空/格式错误导致NaN
+          const startHour = data.data.dischargeList[index].startworkordertime?.slice(8, 10) || 0;
+          dataList[index].time = startHour;
+        }
+      }
+    }
+     } else if (currentType === 'year') {
+       // 年维度：按月份统计
+      if (this.data.operationRole==5) {
+
+        if (data?.data?.chargeList && Array.isArray(data.data.chargeList)) {
+         for (let index = 0; index < data.data.chargeList.length; index++) {
+           // 获取当前行数据
+           const item = data.data.chargeList[index];
+           
+           // 关键修复：先初始化数组元素，再赋值（解决空数组直接赋值报错）
+           dataList[index] = { ...item }; // 保留原始数据字段
+           console.log(dataList);
+           // 保留你的核心逻辑：仅截取小时位相减
+           // 增加防错处理：避免时间字段为空/格式错误导致NaN
+           const startHour = data.data.chargeList[index].startworkordertime?.slice(5, 7) || 0;
+           dataList[index].time = startHour;
+         }
+       }
+     }else{
+       if (data?.data?.dischargeList && Array.isArray(data.data.dischargeList)) {
+         for (let index = 0; index < data.data.dischargeList.length; index++) {
+           // 获取当前行数据
+           const item = data.data.dischargeList[index];
+           
+           // 关键修复：先初始化数组元素，再赋值（解决空数组直接赋值报错）
+           dataList[index] = { ...item }; // 保留原始数据字段
+           console.log(dataList);
+           // 保留你的核心逻辑：仅截取小时位相减
+           // 增加防错处理：避免时间字段为空/格式错误导致NaN
+           const startHour = data.data.dischargeList[index].startworkordertime?.slice(5, 7) || 0;
+           dataList[index].time = startHour;
+         }
+       }
+     }
+     }
+ 
+     // 计算总计数据
+    //  dataList.forEach(item => {
+    //    statData.chargeTotal += item.charge;
+    //    statData.dischargeTotal += item.discharge;
+    //  });
+    //  statData.netTotal = (statData.chargeTotal - statData.dischargeTotal).toFixed(1);
+    //  statData.chargeTotal = statData.chargeTotal.toFixed(1);
+    //  statData.dischargeTotal = statData.dischargeTotal.toFixed(1);
+ 
+     this.setData({
+       statData:data.data,
+       dataList
+     });
+ 
+     // 渲染折线图
+     this.renderChart();
+     this.setData({
+      statData: data.data
+
+     })
+      }
+    })
+    .catch((err) => {
+      console.error('获取工单信息失败：', err);
+      this.showInfo('获取工单信息失败');
+    });
+    
+   
+  },
+
+  /**
+   * ✅ 修复完成：渲染充放电折线图 (所有错误已修正)
+   */
+  renderChart() {
+    const { dataList } = this.data;
+    if (dataList.length === 0) return;
+
+    // 提取X轴标签和Y轴数据
+    const categories = dataList.map(item => item.time);
+    let chargeData = ''
+    if(this.data.operationRole==5){
+       chargeData = dataList.map(item => parseFloat(item.chargeActual));
+
+    }else{
+       chargeData = dataList.map(item => parseFloat(item.dischargeActual));
+
+    }
+    // const dischargeData = dataList.map(item => parseFloat(item.dischargeActual));
+
+    // ✅ 修复：获取屏幕宽度 - 正确的PX适配，不乘以pixelRatio
+    const systemInfo = wx.getSystemInfoSync();
+    const windowWidth = systemInfo.windowWidth;
+    // 图表宽度：屏幕宽度 - 左右各16px边距，完美适配所有机型
+    const chartWidth = windowWidth - 32;
+    // 图表高度：固定280px，适配性最佳
+    const chartHeight = 200;
+
+    // ✅ 修复：wxCharts 标准正确配置项（删除所有无效配置，修正错误配置）
+    const chartConfig = {
+      canvasId: 'chargeDischargeChart', // 必须和wxml的canvas-id一致 ✔️
+      type: 'line', // 折线图类型 ✔️
+      categories: categories, // X轴分类 ✔️
+      // ['1','2','3','4','5','6']
+      // ========== 新增：图表顶部标题配置【核心代码】 ==========
+      series: [
+        {
+          name: '充电量(kWh)',
+          data: chargeData,
+          color: '#07c160' // 绿色充电
+        }
+        // {
+        //   name: '放电量(kWh)',
+        //   data: dischargeData,
+        //   color: '#ff4757' // 红色放电
+        // }
+      ],
+      // ✅ 正确的Y轴配置项
+      yAxis: {
+         
+        min: 0, // Y轴最小值为0 ✔️
+        format: (val) => val.toFixed(1), // Y轴数值保留1位小数 ✔️
+        titleFontSize: 12, // Y轴标题字号
+        labelFontSize: 10, // Y轴刻度字号 ✔️
+        fontColor: '#666', // Y轴文字颜色
+        gridColor: '#eee' // Y轴网格线颜色
+      },
+      // ✅ 正确的X轴配置项
+      xAxis: {
+        disableGrid: false, // 显示X轴网格线 ✔️
+        labelFontSize: 10, // X轴刻度字号 ✔️
+        fontColor: '#666',
+        gridColor: '#eee'
+      },
+      legend: false, // 是否显示图例 (wxCharts中是布尔值，不是对象) ✔️
+      width: chartWidth, // ✅ 核心修复：正确的宽度PX值
+      height: 240, // ✅ 微调高度：从280改为300，给顶部标题留出空间，不挤压图表内容
+      dataLabel: false, // 是否在折线上显示数值 ✔️
+      dataPointShape: true, // 是否显示数据点 ✔️
+      fontColor: '#666',
+      // ✅ 修复：wxCharts 正确的折线样式配置
+      extra: {
+        line: {
+          type: 'curve', // curve=曲线，straight=直线 ✔️
+          width: 1 // 折线粗细
+        },
+        legendTextColor: '#666' // 图例文字颜色
+      }
+    };
+
+    // ✅ 修复：wxCharts无updateData，更新图表的正确方式 = 重新实例化
+    // ✅ 修复：用setData赋值图表实例，不是直接修改this.data
+    const chart = new wxCharts(chartConfig);
+    this.setData({ chart });
+  }
+});

package-setup/pages/electricity/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "充放电统计",
+  "usingComponents": {},
+  "window": {
+    "devicePixelRatio": "auto"
+  },
+  "lazyCodeLoading": "requiredComponents"
+
+}

package-setup/pages/electricity/index.wxml

@@ -0,0 +1,56 @@
+<view class="container">
+  <!-- 筛选栏 -->
+  <view class="filter-bar">
+    <view class="filter_left">
+      <view class="filter-item {{currentType === 'day' ? 'active' : ''}}" bindtap="changeType" data-type="day">日</view>
+      <view class="filter-item {{currentType === 'month' ? 'active' : ''}}" bindtap="changeType" data-type="month">月</view>
+      <view class="filter-item {{currentType === 'year' ? 'active' : ''}}" bindtap="changeType" data-type="year">年</view>
+    </view>
+
+    <!-- 日期选择器触发按钮 -->
+    <view>
+      <picker mode="date" fields="{{currentType}}" value="{{selectedDate}}" start="2020-01-01" end="{{today}}" bindchange="onDateChange">
+        <button class="date-btn" bindtap="openDatePicker">{{showDate}}</button>
+      </picker>
+    </view>
+  </view>
+
+  <!-- 统计卡片 -->
+  <view class="stat-card">
+    <view class="stat-item" wx:if="{{operationRole==5}}">
+      <text class="stat-label">总充电量</text>
+      <text class="stat-value">{{statData.chargeActual}} <text style="font-size: 24rpx;">kWh</text> </text>
+    </view>
+    <view class="stat-item" wx:if="{{operationRole==6}}">
+      <text class="stat-label">总放电量</text>
+      <text class="stat-value">{{statData.dischargeActual}} <text style="font-size: 24rpx;">kWh</text> </text>
+    </view>
+  </view>
+
+  <!-- 新增：折线图容器 -->
+  <view class="chart-container">
+    <view class="chart-title">{{currentType === 'day' ? '今日' : (currentType === 'month' ? '本月' : '本年')}}充电趋势图</view>
+    <canvas canvas-id="chargeDischargeChart" disable-scroll="true" class="chart"></canvas>
+  </view>
+  <view class="empty-tip" wx:if="{{dataList.length === 0}}">
+    暂无{{currentType === 'day' ? '今日' : (currentType === 'month' ? '本月' : '本年')}}{{operationRole === 5?'充':'放'}}电数据
+  </view>
+
+  <!-- 数据列表 -->
+  <view class="data-list">
+    <view class="list-content">
+      <view class="list-header">
+        <view class="list_title1">{{listHeader}}</view>
+        <view class="list_title1" wx:if="{{operationRole==5}}">充电量<text style="font-size: 18rpx;margin-top: 10rpx;">/kWh</text></view>
+        <view class="list_title2" wx:if="{{operationRole==6}}">放电量<text style="font-size: 18rpx;margin-top: 10rpx;">/kWh</text></view>
+      </view>
+      <block wx:for="{{dataList}}" wx:key="index">
+        <view class="list-item">
+          <view class="list_title3">{{item.time}}</view>
+          <view class="list_title3" wx:if="{{operationRole==5}}">{{item.chargeActual}}</view>
+          <view class="list_title4" wx:if="{{operationRole==6}}">{{item.dischargeActual}}</view>
+        </view>
+      </block>
+    </view>
+  </view>
+</view>

package-setup/pages/electricity/index.wxss

@@ -0,0 +1,216 @@
+.container {
+  width: 100%;
+  height: 100%;
+  padding: 16rpx;
+  background-color: #f5f5f5;
+  box-sizing: border-box;
+}
+
+/* 筛选栏样式 */
+.filter-bar {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: white;
+  border-radius: 8rpx;
+  padding: 0 16rpx;
+  margin-bottom: 16rpx;
+  box-sizing: border-box;
+}
+.filter_left{
+  display: flex;
+}
+.filter-item {
+  padding: 20rpx 32rpx;
+  font-size: 32rpx;
+  color: #333;
+  position: relative;
+}
+
+.filter-item.active {
+  color: #07c160;
+  font-weight: bold;
+}
+
+.filter-item.active::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 40rpx;
+  height: 6rpx;
+  background-color: #07c160;
+  border-radius: 3rpx;
+}
+
+.date-btn {
+  margin-left: auto;
+  background: #f5f5f5;
+  color: #666;
+  font-size: 28rpx;
+  padding: 8rpx 16rpx;
+  border-radius: 4rpx;
+  line-height: 1;
+}
+
+/* 统计卡片样式 */
+.stat-card {
+  width: 100%;
+  display: flex;
+  justify-content: space-around;
+  background: white;
+  border-radius: 8rpx;
+  padding: 24rpx 0;
+  margin-bottom: 16rpx;
+}
+
+.stat-item {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  /* justify-content: space-between; */
+  justify-content: space-around;
+  text-align: center;
+}
+
+.stat-label {
+  display: block;
+  font-size: 28rpx;
+  color: #222222;
+  font-weight: bold;
+}
+
+.stat-value {
+  font-size: 38rpx;
+  color: #333;
+  font-weight: bold;
+}
+
+.positive {
+  color: #07c160;
+}
+
+.negative {
+  color: #ff4757;
+}
+
+/* 新增：折线图样式（适配现有设计风格） */
+.chart-container {
+  width: 100%;
+  background: white;
+  border-radius: 8rpx;
+  padding: 16rpx;
+  margin-bottom: 16rpx;
+  box-sizing: border-box;
+}
+
+.chart {
+  width: 100%;
+  height: 420rpx; 
+}
+.chart-title {
+  font-size: 14px;
+  color: #333;
+  /* text-align: center; 居中/left靠左/right靠右 */
+  margin-bottom: 10px;
+  font-weight: 500;
+}
+/* 数据列表样式 */
+.data-list {
+  width: 100%;
+  background: white;
+  border-radius: 18rpx;
+  padding: 20rpx;
+  box-sizing: border-box;
+}
+
+.list-header {
+  display: flex;
+  justify-content: space-between;
+  font-size: 26rpx;
+  color: #666;
+  font-weight: bold;
+  border-right: 1rpx solid #f0f0f0;
+}
+.list-content{
+  margin: 1rpx;
+  border: 1rpx solid #f0f0f0;
+  border-right: 0rpx solid #f0f0f0;
+  box-sizing: border-box;
+}
+.list_title1{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 26rpx;
+  flex: 1;
+
+  height: 100rpx;
+  border-right: 1rpx solid #f0f0f0;
+}
+.list_title2{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 26rpx;
+  flex: 1;
+  height: 100rpx;
+  /* border-bottom: 1rpx solid #f0f0f0; */
+
+}
+.list_title3{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 26rpx;
+  flex: 1;
+  height: 100rpx;
+  border-right: 1rpx solid #f0f0f0;
+  border-top: 1rpx solid #f0f0f0;
+}
+.list_title4{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 26rpx;
+  flex: 1;
+
+  height: 100rpx;
+  border-top: 1rpx solid #f0f0f0;
+
+  border-right: 1rpx solid #f0f0f0;
+}
+.list-item {
+  display: flex;
+  justify-content: space-between;
+  font-size: 28rpx;
+}
+
+.list-item:last-child {
+  border-bottom: none;
+}
+
+.empty-tip {
+  width: 100%;
+  text-align: center;
+  padding: 60rpx 0;
+  font-size: 28rpx;
+  color: #999;
+  background: white;
+  border-radius: 8rpx;
+  margin-bottom: 16rpx;
+  box-sizing: border-box;
+}
+
+/* 日期选择器遮罩 */
+.picker-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: transparent;
+  z-index: 999;
+}

package-setup/pages/setuplevel/index.js

@@ -73,7 +73,7 @@ Page({
   onprivacy(e){
     console.log(e);
       wx.navigateTo({
-      url: `/pages/privacy/index?name=${e.currentTarget.dataset.name}`,
+      url: `/package-user/pages/privacy/index?name=${e.currentTarget.dataset.name}`,
     })
     
   },

package-user/components/captcha/index.js

@@ -1,186 +1,136 @@
 Component({
   properties: {
-    // 是否显示弹窗
     isShow: {
       type: Boolean,
       value: false
     },
-    // 手机号（用于显示）
-    phoneNumber: {
+    type: {
       type: String,
-      value: ''
+      value: 'code' // 'code' 验证码 / '结算' 结算密码
     },
-    // 倒计时秒数
-    countdownSeconds: {
+    // 新增：外部可配置倒计时总时长（默认60秒）
+    countdownTotal: {
       type: Number,
-      value: 120
+      value: 60
     }
   },
-
   data: {
-    // 验证码数组（6位）
-    codes: ['', '', '', ''],
-    // 实际输入的验证码值
-    codeValue: '',
-    // 当前激活的输入框索引
-    currentIndex: 0,
-    // 是否聚焦
-    isFocus: false,
-    // 倒计时
-    countdown: 120,
-    // 是否可以重新发送
-    canResend: false,
-    // 验证码是否输入完成
-    isComplete: false,
-    // 倒计时计时器
-    timer: null
+    codes: [], // 输入框显示的数组
+    currentIndex: 0, // 当前激活索引
+    isFocus: false, // 输入框聚焦状态
+    codeValue: '', // 4位验证码真实值
+    oncodeValue: '', // 6位结算密码真实值
+    isShakeError: false, // 晃动动画开关
+    // 新增：倒计时相关数据
+    countdown: 0, // 当前剩余倒计时秒数
+    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 });
-      }
-    }
+  // 新增：组件卸载时清除定时器，防止内存泄漏
+  detached() {
+    clearInterval(this.data.timer);
   },
-
   methods: {
+    // 关闭弹窗
+    onClose() {
+      this.triggerEvent('close');
+      this.resetInput(); // 关闭时重置输入
+      this.resetCountdown(); // 关闭时重置倒计时
+    },
+
     // 聚焦输入框
     focusInput() {
+      this.setData({ isFocus: true });
+    },
+
+    // 输入内容处理
+    onCodeInput(e) {
+      console.log(e);
+      const value = e.detail.value;
+      const len = this.data.type === '结算' ? 6 : 4;
+      const codes = value.split('').slice(0, len);
+
       this.setData({
-        isFocus: true
+        codes: codes,
+        currentIndex: codes.length,
+        codeValue: this.data.type !== '结算' ? value : this.data.codeValue,
+        oncodeValue: this.data.type === '结算' ? value : this.data.oncodeValue
       });
+
+      // 输入完成：仅传递值给父组件，不做检验
+      if (codes.length === len) {
+        const finalValue = this.data.type === '结算' ? this.data.oncodeValue : this.data.codeValue;
+        // 向父组件发送输入完成的事件，携带输入值
+        this.triggerEvent('inputComplete', { value: finalValue });
+        this.setData({ isFocus: false });
+      }
     },
-    
+
     // 输入框失焦
     onInputBlur() {
-      this.setData({
-        isFocus: false
-      });
+      this.setData({ isFocus: false });
     },
-    
-    // 验证码输入
-    onCodeInput(e) {
-      const value = e.detail.value.replace(/\D/g, ''); // 只保留数字
+
+    // 重新发送验证码（仅传递事件给父组件，并启动倒计时）
+    onResend() {
+      // 启动倒计时（防止重复点击重复启动定时器）
+      this.startCountdown();
+      // 向父组件发送重新发送事件
+      this.triggerEvent('resend');
+    },
+
+    // 重置输入内容（供父组件/自身调用）
+    resetInput() {
       this.setData({
-        codeValue: value
+        codes: [],
+        currentIndex: 0,
+        codeValue: '',
+        oncodeValue: ''
       });
     },
-    
-    // 关闭弹窗
-    onClose() {
-         // 1. 强制让输入框失焦，关闭手机键盘
-         this.setData({ isFocus: false });
-         // 2. 触发关闭事件（可加微延时确保失焦生效，可选）
-         setTimeout(() => {
-           this.triggerEvent('close');
-         }, 100);
-      // this.triggerEvent('close');
-    },
-    
-    // 确认
-    onConfirm() {
-      if (this.data.isComplete) {
-        this.triggerEvent('confirm', { code: this.data.codeValue });
-      }
-    },
-    
-    // 重新发送验证码
-    onResend() {
-      this.triggerEvent('resend');
-      this.startCountdown();
+
+    // 触发失败动效（供父组件调用）
+    triggerErrorShake() {
+      this.setData({ isShakeError: true });
+      // 动画结束后重置状态
+      setTimeout(() => {
+        this.setData({ isShakeError: false });
+      }, 500);
+      // 同时清空输入
+      this.resetInput();
     },
-    
-    // 开始倒计时
+
+    // 新增：启动倒计时
     startCountdown() {
-      // 清除之前的计时器
-      this.clearCountdown();
-      
-      const countdownSeconds = this.data.countdownSeconds;
+      // 1. 先清除已有定时器，防止重复创建
+      clearInterval(this.data.timer);
+      // 2. 初始化倒计时为总时长
+      const total = this.data.countdownTotal;
       this.setData({
-        countdown: countdownSeconds,
-        canResend: false
+        countdown: total
       });
-      
-      // 设置新的计时器
+      // 3. 创建定时器，每秒更新倒计时
       const timer = setInterval(() => {
-        let countdown = this.data.countdown - 1;
-        if (countdown <= 0) {
-          this.setData({
-            countdown: 0,
-            canResend: true
-          });
-          this.clearCountdown();
-        } else {
-          this.setData({
-            countdown
-          });
-        }
+        this.setData({
+          countdown: this.data.countdown - 1
+        }, () => {
+          // 4. 倒计时结束后清除定时器，重置倒计时状态
+          if (this.data.countdown <= 0) {
+            clearInterval(this.data.timer);
+            this.resetCountdown();
+          }
+        });
       }, 1000);
-      
+      // 5. 保存定时器实例，用于后续清除
       this.setData({ timer });
     },
-    
-    // 清除倒计时
-    clearCountdown() {
-      this.setData({ isFocus: false });
 
-      if (this.data.timer) {
-        clearInterval(this.data.timer);
-        this.setData({ timer: null });
-      }
-    },
-    
-    // 重置验证码输入
-    resetCodeInput() {
+    // 新增：重置倒计时（恢复初始状态）
+    resetCountdown() {
+      clearInterval(this.data.timer);
       this.setData({
-        codes: ['', '', '', '', '', ''],
-        codeValue: '',
-        currentIndex: 0,
-        isComplete: false
+        countdown: 0,
+        timer: null
       });
     }
-  },
-  
-  // 组件销毁时清除计时器
-  detached() {
-    this.clearCountdown();
   }
-});
+});

package-user/components/captcha/index.json

@@ -1,4 +1,6 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "t-input": "tdesign-miniprogram/input/input"
+  }
 }

package-user/components/captcha/index.wxml

@@ -1,63 +1,40 @@
 <view class="verification-popup {{isShow ? 'show' : ''}}">
-  <!-- 遮罩层 -->
   <view class="overlay" bindtap="onClose"></view>
-  
-  <!-- 弹窗内容 -->
-  <view class="popup-content">
-    <!-- 标题区域 -->
+  <!-- 绑定晃动动画类 -->
+  <view class="popup-content {{isShakeError ? 'shake-error' : ''}}">
     <view class="popup-header">
-      <text class="title">输入验证码</text>
+      <text class="title" wx:if="{{type=='结算'}}">请输入账户密码</text>
+      <text class="title" wx:else>输入验证码</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"
-      >
+    <!-- 结算密码输入框：展示●，真实值保留数字 -->
+    <view class="code-input-container" wx:if="{{type=='结算'}}">
+      <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="{{oncodeValue}}" bindinput="onCodeInput" bindblur="onInputBlur" />
+    </view>
+    <!-- 验证码输入框：仍显示明文，不变 -->
+    <view class="code-input-container" wx:else>
+      <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"
-      />
+      <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 class="resend-container" wx:if="{{type!='结算'}}">
+        <view 
+  class="resend-btn {{countdown > 0 ? 'disabled' : ''}}"
+  bindtap="onResend"
+  wx:if="{{type === 'code'}}"
+>
+  {{countdown > 0 ? countdown + 's后重新发送' : '重新发送验证码'}}
+</view>
       </view>
     </view>
   </view>
-</view>
+</view>

package-user/components/captcha/index.wxss

@@ -1,185 +1,106 @@
+/* 弹窗基础样式（如果已有可忽略，重点加动画相关） */
 .verification-popup {
-  display: none;
   position: fixed;
   top: 0;
   left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 9999;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+  display: none;
 }
-
-/* 显示弹窗 */
 .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;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
 }
-
-/* 弹窗内容 */
 .popup-content {
   position: absolute;
-  top: 40%;
+  top: 50%;
   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;
+  width: 80%;
+  max-width: 320px;
+  background: #fff;
+  border-radius: 12px;
+  padding: 20px;
+  /* 初始边框样式 */
+  border: 2px solid #e5e5e5;
+  /* 动画结束后恢复默认状态，避免位移 */
+  transform-origin: center center;
 }
 
-/* 标题区域 */
-.popup-header {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 20px 24px 16px;
-  position: relative;
+/* 1. 定义晃动关键帧动画（小程序兼容写法） */
+@keyframes shake {
+  0%, 100% { transform: translate(-50%, -50%); }
+  20% { transform: translate(-50%, -50%) translateX(-5px); }
+  40% { transform: translate(-50%, -50%) translateX(5px); }
+  60% { transform: translate(-50%, -50%) translateX(-5px); }
+  80% { transform: translate(-50%, -50%) translateX(5px); }
 }
 
-.title {
-  font-size: 18px;
-  font-weight: 600;
-  color: #1a1a1a;
+/* 2. 检验失败的动画类（边框变红+晃动） */
+.popup-content.shake-error {
+  border-color: #ff4444 !important; /* 红色边框 */
+  animation: shake 0.5s ease-in-out; /* 绑定晃动动画 */
 }
 
-.close-btn {
-  position: absolute;
-  right: 24px;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 32px;
-  height: 32px;
+/* 其他原有样式（如输入框、按钮）保持不变 */
+.popup-header {
   display: flex;
+  justify-content: space-between;
   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;
+  margin-bottom: 20px;
 }
-
-/* 验证码输入框容器 */
 .code-input-container {
   display: flex;
-  justify-content: center;
-  gap: 10px;
-  padding: 0 24px 24px;
-  position: relative;
+  justify-content: space-between;
+  margin: 20px 0;
 }
-
-/* 单个验证码输入框 */
 .code-input {
-  width: 50px;
-  height: 50px;
+  width: 40px;
+  height: 40px;
+  border: 1px solid #ccc;
   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;
+  font-size: 18px;
 }
-
-/* 激活状态 */
 .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;
+  border-color: #007aff;
 }
-
-/* 实际输入框（隐藏） */
 .real-input {
-  position: absolute;
-  width: 1px;
-  height: 1px;
+  position: fixed;
+  top: -100px;
+  left: -100px;
   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;
+  text-align: right;
+  margin-top: 10px;
+}
+.resend-btn.active {
+  color: #007aff;
 }
-
-/* 重新发送按钮 */
 .resend-btn {
   color: #07c160;
-  font-weight: 500;
+  font-size: 24rpx;
 }
-
-.resend-btn:not(.active) {
+.resend-btn.disabled {
   color: #999;
-  pointer-events: none;
+  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; }
+/* 结算密码加密符号样式优化 */
+.code-input text {
+  font-size: 20px; /* 放大●的字号，更醒目 */
+  color: #333;
+  letter-spacing: 2px; /* 增加间距，避免●挤在一起 */
 }
+/* 验证码仍用原有字号，不影响 */
+.code-input-container:not([wx-if]) .code-input text {
+  font-size: 18px;
+  letter-spacing: 0;
+}

package-user/pages/login/index.js

@@ -271,7 +271,7 @@ promptcheck(){
     onprivacy(e){
       console.log(e.target.dataset.name);
         wx.navigateTo({
-        url: `/pages/privacy/index?name=${e.target.dataset.name}`,
+        url: `/package-user/pages/privacy/index?name=${e.target.dataset.name}`,
       })
       
     },
@@ -289,6 +289,11 @@ promptcheck(){
     Loginswitch:e.target.dataset.value
   })
     },
+    onregister(){
+      wx.navigateTo({
+        url: `/package-user/pages/register/index`,
+      })
+    },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

package-user/pages/login/index.wxml

@@ -8,22 +8,27 @@
 </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><image class="log_image" src="https://esos-iot.com/myminio/project/fd2b0ab2aadb44bbafd940156bf0cdd7.png" mode="widthFix"/></view>
+
  <view class="account_number">
  <view>
-  <view class="account">手机号</view>
+  <view class="account">登录账户</view>
   <view class="password">
-  <image class="login_imgae1" src="https://esos-iot.bjdexn.cn/myminio/project/0458af22ef764cc386d77a76ee665917.png" mode=""/>
-  <input class="weui-input"	value="{{account}}" placeholder="请输入手机号"  bindinput="bindKeyInput1"/></view>
+  <image class="login_imgae1" src="https://esos-iot.com/myminio/project/0458af22ef764cc386d77a76ee665917.png" mode=""/>
+  <input class="weui-input"	value="{{account}}" placeholder="请输入登录账户"  bindinput="bindKeyInput1"/></view>
  </view>
 
  </view>
+
  <view class="loginbotton">
   <!-- <button wx:if="{{!Loginswitch}}" class="button_button" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber">手机号一键登录</button> -->
  
  <!-- <button wx:if="{{!Loginswitch}}" bindphoneoneclicklogin="onHandleLogin" open-type="phoneOneClickLogin">一键登录按钮</button> -->
- <button wx:if="{{checked}}" class="button_button" color="#00BA6E" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber">手机号一键登录</button>
- <button wx:if="{{!checked}}" class="button_button" color="#00BA6E" bind:tap="promptcheck">手机号一键登录</button>
+ <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="register">
+<view class="register_box" bind:tap="onregister">注册</view> 
+</view>
  <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> 

package-user/pages/login/index.wxss

@@ -227,4 +227,25 @@ font-size: 28rpx;
 margin-top: 10rpx;
 padding-bottom: 0rpx;
 border-bottom:1rpx #cccccc solid;
-}
+}
+.register{
+  width: 100%;
+  margin-top: 40rpx;
+   padding:0rpx 40rpx;
+   display: flex;
+   align-items: center;
+   justify-content: center;
+   box-sizing: border-box;
+  }
+  .register_box{
+    width: 100%;
+    height: 80rpx;
+    font-size: 32rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    border-radius:10rpx;
+    color: #fff;
+    background-color:#00C775;
+  }

package-user/pages/order/index.js

@@ -0,0 +1,180 @@
+// pages/userlist/index.js
+const api = require('../../../../api/index.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  userdata:[],
+  visible:false,
+  selectdriveralldata:[],
+  selectcaralldata:[],
+  workorderId:'',
+  driverindex:0,
+  carindex:0
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+ this.getuser()
+ this.onselectdriverall()
+ this.onselectcarall()
+  },  
+getuser(){
+  let data ={
+    workorderType:1,
+    pageNum:1,
+    pageSize:99
+  }
+  api.request(`/sysworkorder/selectworkorderlist`, 'post',data,{ isPublic: false })
+  .then((data) => {
+console.log(data.data);
+if (data.code==200) {
+  this.setData({
+    userdata:data.data.list
+  })
+}
+  })
+  .catch((err) => {
+    console.error('请求失败：', err);
+  });
+},
+cancelOrder(e){
+  console.log(e.currentTarget.dataset.id);
+ this.setData({
+  workorderId:e.currentTarget.dataset.id,
+  visible:true
+ })
+},
+// 查询全部司机
+onselectdriverall(){
+  let data = {
+    operationId:'',
+    driverType:'',
+    driverName:''
+  }
+  api.request(`/sysdriver/selectdriverall`, 'post',data,{ isPublic: false })
+  .then((data) => {
+console.log(data.data);
+if (data.code==200) {
+  this.setData({
+    selectdriveralldata:data.data
+  })
+}
+  })
+  .catch((err) => {
+    console.error('请求失败：', err);
+  });
+},
+// 查询全部车辆
+onselectcarall(){
+  let data = {
+    
+  }
+  api.request(`/syscar/selectcarall`, 'post',data,{ isPublic: false })
+  .then((data) => {
+if (data.code==200) {
+  this.setData({
+    selectcaralldata:data.data
+  })
+}
+  })
+  .catch((err) => {
+    console.error('请求失败：', err);
+  });
+},
+ondriverChange(){
+ this.setData({
+  visible:false
+ })
+},
+onVisibleChange1() {
+  this.setData({
+    visible:false
+  })
+},
+onVisibleChange(e) {
+  this.setData({
+    driverindex: e.detail.value,
+  });
+},
+oncarChange(e) {
+  console.log(e);
+  this.setData({
+    carindex: e.detail.value,
+  });
+},
+submit(){
+  let data = {
+    driverId:this.data.selectdriveralldata[this.data.driverindex].operationId,
+    carId:this.data.selectcaralldata[this.data.carindex].carId,
+    workorderId:this.data.workorderId
+  }
+  api.request(`/sysoperationsstaff/allocatedriver`, 'post',data,{ isPublic: false })
+  .then((data) => {
+if (data.code==200) {
+ console.log(data);
+ this.setData({
+  visible:false
+ })
+ this.getuser()
+
+}
+  })
+  .catch((err) => {
+    console.error('请求失败：', err);
+  });
+},
+  /**
+   *
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  }, 
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

package-user/pages/privacy/index.js

@@ -15,11 +15,15 @@ URL:''
  console.log(options.name);
  if (options.name=='服务协议') {
    this.setData({
-    URL:'https://esos-iot.bjdexn.cn/wx_images/service.png'
+    URL:'https://esos-iot.com/wx_images/service.png'
    })
- }else{
+ }else if(options.name=='隐私协议'){
   this.setData({
-    URL:'https://esos-iot.bjdexn.cn/wx_images/privacy.png'
+    URL:'https://esos-iot.com/wx_images/privacy.png'
+   })
+ }else if(options.name=='微信结算'){
+  this.setData({
+    URL:'https://esos-iot.com/myminio/project/3a0322d7133e4cbaae16f9169e32335e.jpg'
    })
  }
   },

package-user/pages/register/index.js

@@ -0,0 +1,272 @@
+// package-user/pages/register/index.js
+const api = require('../../../api/index.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    items: [
+      {value: 5, name: '买电'},
+      {value: 6, name: '卖电'},
+    ],
+    fileurl:'',
+    back:'',
+    identitycard:'',
+    greenelectricity:'',
+    nickname:'',
+    telephone:'',
+    powerstationname:''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+// 上传
+onchooseImage(e) {
+  this.setData({
+    identitycard:e.target.dataset.name
+  })
+  let _this = this
+  // 先检查隐私授权状态
+  wx.getPrivacySetting({
+    success: (res) => {
+      if (res.needAuthorization) {
+        // 弹出隐私协议弹窗
+        wx.requirePrivacyAuthorize({
+          success: () => {
+            console.log('用户已同意隐私协议');
+            _this.doUploadImage(); // 继续执行上传
+          },
+          fail: () => {
+            console.log('用户拒绝了隐私协议');
+            wx.showToast({
+              title: '需同意隐私协议才能使用',
+              icon: 'none'
+            });
+          }
+        });
+      } else {
+          _this.chooseImage(); // 已授权，直接上传
+      }
+    }
+  });
+},
+// 上传图片
+chooseImage() {
+  let _this = this
+  wx.chooseMedia({    
+    count: 1,
+    mediaType: ['image'],
+    sourceType: ['album', 'camera'],
+    success(res) {
+      console.log(res);
+      const tempFiles = res.tempFiles;
+      _this.setData({
+        imageList: tempFiles.map(file => file.tempFilePath),
+      });
+      _this.uploadImages(tempFiles);
+    },
+    fail(err) {
+      console.error("选择失败:", err);
+    }
+  })
+  },
+  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({
+      greenelectricity:e.detail.value
+    })
+    console.log(this.data.greenelectricity);
+  },
+  bindKeyInput(e){
+  console.log(e.detail.value);
+  this.setData({
+    nickname:e.detail.value
+  })
+  },
+  bindtelephone(e){
+   
+    console.log(e.detail.value);
+
+    this.setData({
+      telephone:e.detail.value
+    })
+  },
+  bindpowerstationname(e){
+    console.log(e.detail.value);
+    this.setData({
+      powerstationname:e.detail.value
+    })
+  },
+  // 上传到服务器
+uploadImages(files) {
+  let _this =this
+  const token = wx.getStorageSync('token');
+  files.forEach((file) => {
+  wx.uploadFile({
+  url: 'https://esos-iot.com:9443/system/config/upload/webPost',
+  filePath: file.tempFilePath,
+  name: 'file',
+  formData: {
+    type:_this.data.identitycard,
+    front:file.tempFilePath
+  },
+  header: {
+    // 'Authorization': 'Bearer ' + token // Also add to header if needed
+  },
+  success: (res) => {
+    const obj = JSON.parse(res.data);
+  console.log(obj.data.companyLicense);
+  _this.setData({
+    fileurl:obj.data.companyLicense
+  })
+  console.log(this.data.fileurl);
+  
+  },
+  fail: (err) => {
+    console.error('上传失败', err);
+  },
+  });
+  });
+  },
+
+  register(){
+    const phone = this.data.telephone.trim();
+    const phoneReg = /^1[3-9]\d{9}$/;
+console.log(phone);
+    // 1. 校验是否为空
+    if (!phone) {
+    
+      wx.showToast({
+        title:'请输入手机号',
+        icon: 'none',
+      });
+      return false;
+    }
+
+    // 2. 校验格式是否正确
+    if (!phoneReg.test(phone)) {
+    
+      wx.showToast({
+        title:'请输入正确的手机号',
+        icon: 'none',
+      });
+      return false;
+    }
+    if (this.data.nickname==''||this.data.greenelectricity==''||this.data.powerstationname=='') {
+      wx.showToast({
+        title:'请填写完整信息',
+        icon: 'success',
+      });
+      return
+    }
+    let obj = {
+      phonecode:this.data.telephone,
+      operationName:this.data.nickname,
+      operationRole:this.data.greenelectricity,
+      companyName:this.data.powerstationname,
+      companyLicense:this.data.fileurl,
+    }
+    api.request(`/sysoperation/registeredusers`, 'post',obj,{ isPublic: true })
+    .then((data) => {
+ console.log(data);
+ if (data.code == 200) {
+   if (data.msg=='当前用户已注册') {
+    wx.showToast({
+      title:data.msg,
+      icon: 'success',
+    });
+    return
+   }
+   wx.showToast({
+    title:data.msg,
+    icon: 'success',
+  });
+  wx.navigateTo({
+    url: '/package-user/pages/login/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
+  });
+ }else{
+  wx.showToast({
+    title: data.msg,
+    icon: 'success',
+  });
+ }
+
+    })
+    .catch((err) => {
+      wx.showToast({
+        title:'注册失败',
+        icon: 'none',
+      });
+      console.error('请求失败：', err);
+    });
+  },
+  previewSingleImage(e) {
+    // 获取大图路径
+    const largePicUrl = e.currentTarget.dataset.url;
+    // 调用API预览大图
+    wx.previewImage({
+      current: largePicUrl, // 当前展示的大图路径
+      urls: [largePicUrl] // 需预览的图片数组，单图时数组中仅存该图路径
+    });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

package-user/pages/register/index.json

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

package-user/pages/register/index.wxml

@@ -0,0 +1,68 @@
+<view class="body">
+  <view class="car">
+<view>
+ <text style="color: red;">*</text> 手机登录账户
+ <view style="font-size: 20rpx;margin-top: 10rpx;margin-left: 20rpx;">
+ 请输入与本机微信绑定的手机号
+</view>
+</view>
+<view class="model_right">
+  <input class="powerlevel" type="text" value="{{telephone}}" bindinput="bindtelephone" placeholder="请输入联系方式"/>
+</view>
+</view>
+  <view class="car">
+<view>
+  <text style="color: red;">*</text> 用户角色
+</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="{{item.value == greenelectricity}}"/>
+          </view>
+          <view class="weui-cell__bd">{{item.name}}</view>
+        </label>
+      </radio-group>
+</view>
+</view>
+  <view class="car">
+<view>
+  <text style="color: red;">*</text> 联系人
+</view>
+<view class="model_right">
+  <input class="powerlevel" type="text" value="{{nickname}}" bindinput="bindKeyInput" placeholder="请输入昵称"/>
+</view>
+</view>
+
+
+<view class="car">
+<view>
+  <text style="color: red;">*</text> 公司名称
+</view>
+<view class="model_right">
+  <input class="powerlevel" type="text" value="{{powerstationname}}" bindinput="bindpowerstationname" placeholder="请输入公司名称"/>
+</view>
+</view>
+<view class="car">
+<view class="license">
+	<view class="toptabbar_box">
+					<view class="toptabbar_left">
+						公司营业执照
+					</view>
+					
+				</view>
+        <view class="account_to" data-name="营业执照" bind:tap="onchooseImage" wx:if="{{fileurl == ''}}">
+          <t-icon name="add" size="48rpx" data-name="add" bind:click="onIconTap" />
+        </view>
+        <image class="user_to" wx:else src="{{fileurl}}" mode="aspectFill"  data-url="{{fileurl}}" bindtap="previewSingleImage"/>
+</view>
+
+     
+</view>
+<view style="height: 80rpx;"></view>
+
+<button class="button_button" color="#0F80DC" bind:tap="register">注册</button>
+<view style="height: 40rpx;"></view>
+
+</view>

package-user/pages/register/index.wxss

@@ -0,0 +1,106 @@
+/* package-user/pages/register/index.wxss */
+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{
+  height: 100%;
+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;
+}
+.car1{
+  margin-top: 20rpx;
+  padding: 0rpx 30rpx;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+ 
+.car_right{
+  width: 240rpx;
+  display: flex;
+  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;
+}
+radio-group{
+  display: flex;
+  align-items: center;
+}
+.weui-cell{
+  display: flex;
+  align-items: center;
+
+}
+.weui-cell__hd{
+  margin-left: 20rpx;
+}
+.powerlevel{
+  border-radius: 6rpx;
+  text-align: right;
+ }
+ .license{
+   width: 100%;
+  display: flex;
+  flex-direction: column;
+}
+ .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;
+  }
+  .button_button{
+    width: 70%;
+    color: #fff;
+  background-color: #0F80DC;
+  /* background-color: rgba(0,117,68, 0.3); 红色，50%透明度 */
+   }
+   
+
+   

package-user/pages/userlist/index.js

@@ -26,14 +26,16 @@ Page({
   },  
 getuser(){
   let data ={
-    workorderType:0
+    workorderType:1,
+    pageNum:1,
+    pageSize:99
   }
   api.request(`/sysworkorder/selectworkorderlist`, 'post',data,{ isPublic: false })
   .then((data) => {
 console.log(data.data);
 if (data.code==200) {
   this.setData({
-    userdata:data.data
+    userdata:data.data.list
   })
 }
   })

package-user/pages/userlist/index.wxml

@@ -1,13 +1,14 @@
-<!--pages/userlist/index.wxml-->
+<!-- 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>
+      <image src="https://esos-iot.com/myminio/project/2a1b32553c3d4ef992bc797d26cf1614.png" class="driver-avatar"></image>
       <view class="driver-details">
         <view class="driver-name">目的地: {{item.poiName}}</view>
         <view class="driver-arrive">电话：{{item.phone}}</view>
         <view class="driver-car">预约时间: {{item.workorderStarttime}}</view>
       </view>
-      <button class="cancel-btn" data-id="{{item.workorderId}}" bindtap="cancelOrder">分配订单</button>
+      <button class="cancel-btn" data-id="{{item.workorderId}}" bindtap="cancelOrder">分配工单</button>
     </view>
 </view>
 <t-popup
@@ -36,4 +37,6 @@
 
 </view>
 </view>
-</t-popup>
+</t-popup>
+ <!--  -->
+ <view></view>

pages/balance/index.js

@@ -0,0 +1,149 @@
+// pages/balance/index.js
+const api = require('../../api/index.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    visible:false,
+    selectedtype:1,
+    accountdata:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+this.account()
+  },
+  account(){
+    let data ={
+
+    }
+    api.request(`/SysBalance/selectbalance`, 'post',data,{ isPublic: false })
+    .then((data) => {
+      
+      this.setData({
+        accountdata:data.data
+      })
+ console.log(data);
+    })
+    .catch((err) => {
+   
+      console.error('请求失败：', err);
+    });
+  },
+  onVisibleChange1(){
+  this.setData({
+    visible:false
+
+  })
+
+  },
+  ondetails(e){
+    console.log(e.currentTarget.dataset.name);
+    if (e.currentTarget.dataset.name=='bill') {
+      wx.navigateTo({
+        url: `/pages/details/index?name=账单明细`,
+      })
+    }else if(e.currentTarget.dataset.name=='withdraw'){
+      wx.navigateTo({
+        url: `/pages/details/index?name=提现明细`,
+      })
+    }else if(e.currentTarget.dataset.name=='topup'){
+      wx.navigateTo({
+        url: `/pages/details/index?name=充值明细`,
+      })
+    }else if(e.currentTarget.dataset.name=='invoice'){
+      wx.navigateTo({
+        url: `/pages/details/index?name=发票管理`,
+      })
+    }else if(e.currentTarget.dataset.name=='bankcard'){
+      wx.navigateTo({
+        url: `/pages/details/index?name=银行卡管理`,
+      })
+    }else if(e.currentTarget.dataset.name=='balance'){
+      wx.navigateTo({
+        url: `/pages/details/index?name=温馨提示`,
+      })
+    }
+   
+  },
+  onwithdraw(){
+    this.setData({
+      visible:true
+  
+    })
+  },
+  selected_wx(e){
+    console.log(e.currentTarget.dataset.index);
+    this.setData({
+      selectedtype:e.currentTarget.dataset.index
+  
+    })
+  },
+    ontopup(){
+      wx.showModal({
+        title: '充值',
+        content: '拨打客服电话，联系客服充值！',
+        confirmText:'拨打',
+        success (res) {
+          if (res.confirm) {
+           
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/balance/index.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "我的账户",
+  "usingComponents": {
+    "t-icon": "tdesign-miniprogram/icon/icon",
+    "t-button": "tdesign-miniprogram/button/button",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog",
+    "t-input": "tdesign-miniprogram/input/input",
+    "t-popup": "tdesign-miniprogram/popup/popup"
+
+  }
+}

pages/balance/index.wxml

@@ -0,0 +1,91 @@
+<!--pages/balance/index.wxml-->
+<view class="setup">
+<view class="balance">
+ <view>总余额</view>
+ <view class="money"><text class="money1">￥</text> <text class="moneys">{{accountdata.balance}}</text></view>
+ <view class="top_up" bind:tap="ontopup">充值</view>
+ <view class="withdraw" bind:tap="onwithdraw">提现</view>
+</view>
+<view class="balance_list">
+  
+  <view class="allocation" data-name="bill" bind:tap="ondetails">
+<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="withdraw" bind:tap="ondetails">
+<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="topup" bind:tap="ondetails">
+<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="bankcard" bind:tap="ondetails">
+<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="invoice" bind:tap="ondetails">
+<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 class="balance_list">
+  <view class="allocation" data-name="balance" bind:tap="ondetails">
+<view class="allocation_3">温馨提示</view>
+ 
+</view>
+</view>
+</view>
+
+<t-popup
+  visible="{{visible}}"
+  bind:visible-change="onVisibleChange1"
+  placement="bottom"
+>
+<view class="driverpopup">
+   <view class="driverpopup_title">提现到银行卡</view>
+
+<!-- <view class="driverpopup_box" data-index="1" bind:tap="selected_wx">
+    <view class="picker">
+    <view>提现到微信</view>  
+      <view class="selected" wx:if="{{selectedtype==1}}">✔</view>
+    </view>
+</view> -->
+<view class="driverpopup_box" data-index="1" bind:tap="selected_wx">
+    <view class="picker">
+      <view>***9908 工商银行</view>  
+      <view class="selected" wx:if="{{selectedtype==1}}">✔</view>
+    </view>
+</view>
+<view class="driverpopup_box" data-index="2" bind:tap="selected_wx">
+    <view class="picker">
+      <view>***2207 农业银行</view>  
+      <view class="selected" wx:if="{{selectedtype==2}}">✔</view>
+    </view>
+</view>
+<view style="height: 80rpx;"></view>
+<view class="botton">
+<view class="botton_box" bind:tap="submit">添加银行卡</view>
+</view>
+</view>
+</t-popup>
+<!--
+  
+ --> 
+ 

pages/balance/index.wxss

@@ -0,0 +1,147 @@
+/* pages/balance/index.wxss */
+page{
+  width: 100%;
+  height: 100vh;
+  background: linear-gradient(to bottom, #F0F5F5 -40%, #F0F5F5 40%,#F0F5F5 100%);
+  box-sizing: border-box;
+}
+.balance{
+  width: 100%;
+  background-color: #ffffff;
+  margin-top: 40rpx;
+  padding: 60rpx 0rpx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.money{
+  margin-top: 40rpx;
+}
+.money1{
+  font-size: 32rpx;
+}
+.moneys{
+  font-size: 42rpx;
+}
+.top_up{
+  margin-top: 140rpx;
+  width: 300rpx;
+  height: 80rpx;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 10rpx;
+  background-color: #07C160;
+}
+.withdraw{
+  margin-top: 30rpx;
+  width: 300rpx;
+  height: 80rpx;
+  color: #222222;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 10rpx;
+  /* background-color: #07C160;  */
+ border: #222222 1rpx solid;
+}
+.balance_list{
+  width: 100%;
+  background-color: #ffffff;
+  margin-top: 30rpx;
+  padding: 20rpx 30rpx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.allocation{
+  width: 100%;
+  height: 80rpx;
+display: flex;
+align-items: center;
+justify-content:space-between;
+padding: 0rpx 0rpx;
+overflow: hidden;
+box-sizing: border-box;
+border-bottom: #f8f8f8 1rpx solid;
+}
+.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: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+}
+.allocation_2{
+  color: #999999;
+}
+.allocation_3{
+  font-size: 14px;
+}
+.driverpopup{
+  padding: 40rpx;
+  /* display: flex; */
+  /* align-items: center; */
+  /* justify-content: center; */
+}
+.driverpopup_box{
+  width: 100%;
+  height: 100rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+border-bottom: #cccccc 1rpx solid;
+
+}
+.picker{
+  width: 100%;
+  height: 100rpx;
+  display: flex;
+  justify-content:space-between;
+  align-items: center;
+}
+.botton{
+width: 100%;
+display: flex;
+align-items: center;
+justify-content: center;
+}
+.botton_box{
+  width: 400rpx;
+  height: 70rpx;
+  margin-top: 100rpx;
+  font-size: 28rpx;
+  border-radius: 10rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #2C85FF;
+  /* background-color: #2C85FF; */
+  border: 1rpx solid #2C85FF;
+}
+/* */
+.selected{
+  width: 40rpx;
+  height: 40rpx;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #07C160;
+  border-radius: 100%;
+}
+.driverpopup_title{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

pages/details/index.js

@@ -0,0 +1,96 @@
+// pages/details/index.js
+const api = require('../../api/index.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    optionsname:'',
+    selectbalance:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+console.log(options);
+this.setData({
+  optionsname:options.name
+})
+wx.setNavigationBarTitle({
+  title: options.name,
+  // 失败回调，避免设置失败无提示
+  fail: (err) => {
+    console.error("设置导航标题失败：", err);
+  }
+});
+this.getSysBalance()
+  },
+getSysBalance(){
+  let data = {
+  }
+  api.request(`/SysBalance/selecthistorybalance`, 'post', data, { isPublic: false })       
+  .then((data) => {
+    console.log(data);
+    if (data.code == 200) {
+      this.setData({
+        selectbalance:data.data
+      })
+      
+    }
+  })
+  .catch((err) => {
+    this.showInfo('操作失败');
+  });
+},
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/details/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/details/index.wxml

@@ -0,0 +1,17 @@
+<!-- pages/userlist/index.wxml -->
+<!--  -->
+<view class="setup">
+  <view class="driver-info" wx:for="{{selectbalance}}" wx:key="operationId">
+      <view class="driver-details">
+        <view class="driver-name">金额: {{item.balance}}</view>
+        <view class="driver-arrive">工单号：{{item.workorderId}}</view>
+        <view class="driver-car">结算人: {{item.operationPhone}}</view>
+        <view class="driver-car">结算时间: {{item.balanceTime}}</view>
+        <view class="driver-car">剩余总余额: {{item.originalbalance}}</view>
+        
+      </view>
+    </view>
+</view>
+
+ <!--  -->
+ <view></view>

pages/details/index.wxss

@@ -0,0 +1,94 @@
+/* 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: 180rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  font-size: 28rpx;
+  color: #FF5252;
+  border: 1rpx solid #FF5252;
+  background-color: white;
+  border-radius: 32rpx;
+}
+.driverpopup{
+  width: 100%;
+  height: 600rpx;
+  padding: 20rpx;
+  padding-top:100rpx;
+  box-sizing: border-box;
+}
+.driverpopup_box{
+  width: 100%;
+  height: 100rpx;
+  align-items: center;
+}
+.picker{
+  width: 100%;
+  height: 100rpx;
+  align-items: center;
+}
+.botton{
+width: 100%;
+display: flex;
+align-items: center;
+justify-content: center;
+}
+.botton_box{
+  width: 400rpx;
+  height: 70rpx;
+  margin-top: 100rpx;
+  font-size: 28rpx;
+  border-radius: 10rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #ffffff;
+  background-color: #2C85FF;
+}

pages/equipment/index.wxml

@@ -13,8 +13,8 @@
 <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 class="order_title1"> <image class="order_image" src="https://esos-iot.com/myminio/project/cf5ff29715de46b88803cf802e81e1a9.png" mode="aspectFit"/> 浙C.78Z71</view>
+<!-- <view class="order_title1"> <image class="order_image" src="https://esos-iot.com/myminio/proje  ct/94f976d5afce444a8861b59681069218.png" mode="aspectFit"/> 浙C.78Z71</view> -->
 <view>在线</view>
 </view>
 <!-- <view class="order_direction"><text class="order_text">方向：</text>
@@ -59,7 +59,7 @@
 </view>
 </view>
 <view class="available" wx:if="{{true}}">
-<image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
+<image src="https://esos-iot.com/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
 </view> 
 </view>
 <view style="height: 30rpx;"></view>

pages/index/index.js

@@ -15,16 +15,23 @@ Page({
     showDriverInfo: true,
     carsNearby: 0,
     // 司机信息
-    driverAvatar: 'https://esos-iot.bjdexn.cn/myminio/project/2a1b32553c3d4ef992bc797d26cf1614.png',
+    driverAvatar: 'https://esos-iot.com/myminio/project/2a1b32553c3d4ef992bc797d26cf1614.png',
     driverName: '王师傅',
-    carNumber: '京A88888',
+    carNumber: '京·A88888',
     estimatedArrival: 5,
     locationTimer: null,
     isTracking: false,
     userdata:[],
-    workorderdata:[]
+    workorderdata:[],
+    background: ['https://esos-iot.com/myminio/project/8e68e25a4e6042b09e233d496c0aad3b.png', 'https://esos-iot.com/myminio/project/8e68e25a4e6042b09e233d496c0aad3b.png', 'https://esos-iot.com/myminio/project/8e68e25a4e6042b09e233d496c0aad3b.png'],
+    indicatorDots: true,
+    vertical: false,
+    autoplay: true,
+    interval: 3000,
+    duration: 500
   },  
 // 收益统计
+
   onLoad() {
     // 初始化地图
 this.getuser()
@@ -77,13 +84,15 @@ wx.$on('wsMessage', this.handleWsMessage);
       customerId:'',
       workorderType:4,
       chargedischargeType:'',
-    }
+      pageNum:1,
+      pageSize:99
+    } 
     api.request(`/sysworkorder/selectworkorderlist`, 'post',data ,{ isPublic: false })
     .then((data) => {
       console.log(data.data);
       if (data.code==200) {
        this.setData({
-        workorderdata:data.data
+        workorderdata:data.data.list
        })
      
       }
@@ -93,7 +102,7 @@ wx.$on('wsMessage', this.handleWsMessage);
     });
   },
 getuser(){
- 
+
   api.request(`/sysoperation/selectoperationid`, 'post',{ isPublic: false })
   .then((data) => {
     console.log(data.data);
@@ -106,7 +115,6 @@ wx.setStorage({
   key: 'user',  // 存储的key值
   data:data.data
 });
-   
     }
   })
   .catch((err) => {
@@ -138,15 +146,19 @@ wx.setStorage({
             id: 0,
             longitude,
             latitude,
-            iconPath: 'https://esos-iot.bjdexn.cn/myminio/project/a0d245bf00c6493d949c3be82a6d2b98.png',
+            iconPath: 'https://esos-iot.com/myminio/project/a0d245bf00c6493d949c3be82a6d2b98.png',
             width: 40,
             height: 40,
             anchor: {x: 0.5, y: 1}
-          }]
+          }],
+          carsNearby: 0, // 附近车辆数
+          stationsNearby: 0, // 附近电站数
+          powerUseNearby: 0, // 附近用电位置数
         });
          // 加载附近车辆数据
-         that.getloadNearbyCars();
-
+         //  
+        //  that.getloadNearbyCars();
+        that.refreshAllNearbyData()
       },
       fail() {
         wx.showToast({
@@ -156,16 +168,14 @@ wx.setStorage({
       }
     });
   },
-
-
-  // 预约叫车
+  
   onelectricity(){
-
+  
 wx.navigateTo({
   url: `/package-order/pages/createorder/index?order=`,
 })
   },
-
+  
   onHide() {
     // 页面卸载时停止追踪
     this.stopTracking();
@@ -185,123 +195,171 @@ wx.navigateTo({
   // 加载附近车辆
   getloadNearbyCars() {
     const that = this;
-   
-        let data ={
-          carId:'',
-          carType:'',
-          carMondel:'',
+    let data = {};
+    api.request(`/syscar/selectoperationcar`, 'post', data, { isPublic: false })
+      .then((data) => {
+        if (data.code == 200) {
+          const cars = [];
+          for (let index = 0; index < data.data.syscarList.length; index++) {
+            let carPosition = data.data.syscarList[index].carPosition.split(",");
+            cars.push({
+              id: 100 + index, // 车辆标记 ID 段：100+
+              longitude: carPosition[1],
+              latitude: carPosition[0],
+              iconPath: 'https://esos-iot.com/myminio/project/e9c0fba9b61448e59458054d335b162b.png',
+              width: 26,
+              height: 32,
+              anchor: { x: 0.5, y: 0.5 },
+              type: 'car' // 标记类型，用于过滤
+            });
+          }
+          // 更新车辆标记：先移除旧车辆标记，再添加新的
+          const updatedMarkers = that.updateMarkers('car', cars);
+          that.setData({
+            markers: updatedMarkers,
+            carsNearby: data.data.carcount
+          });
         }
-        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);
-        });
-    
- 
+      })
+      .catch((err) => {
+        console.error('加载附近车辆失败：', err);
+      });
   },
-  // 加载附近车辆
-  loadNearbyCars() {
-    const { longitude, latitude } = this.data;
- 
-    if (this.data.isTracking) return;
-    
+
+  // ========== 新增：加载附近电站 ==========
+  getloadNearbyStations() {
     const that = this;
-    this.setData({ isTracking: true });
-    this.setData({
-      locationTimer:setInterval(() => {
-        let data ={
-          carId:'',
-          carType:'',
-          carMondel:'',
+    let data = {}; // 根据接口要求传参，如当前定位、范围等
+    // 替换为你的电站列表接口
+    api.request(`/sysaddress/selectpower`, 'post', data, { isPublic: false })
+      .then((data) => {
+        if (data.code == 200) {
+          console.log(data);
+          const stations = [];
+       
+          // 假设接口返回的电站列表字段为 syscarList，坐标字段为 carPosition（格式：纬度,经度）
+          // data.data.syscarList = [{carPosition: "40.155721,116.652896"},{carPosition: "40.105315,116.763173"},{carPosition: "40.108386,116.595002"}]
+          for (let index = 0; index < data.data.length; index++) {
+            // let carPosition = data.data[index].carPosition.split(",");
+            if (data.data[index].addressType==2) {
+              // console.log('');
+              // 网点 绿电
+              stations.push({
+                id: 200 + index, // 电站标记 ID 段：200+（避免和车辆冲突）
+                longitude: data.data[index].longitude,
+                latitude: data.data[index].latitude,
+                // 替换为你的电站图标地址
+                iconPath: 'https://esos-iot.com/myminio/project/62a7a9c509f948558436bc56ee9bfe2e.png',
+                width: 28, // 电站图标尺寸，和车辆区分
+                height: 32,
+                anchor: { x: 0.5, y: 0.5 },
+                type: 'station' // 标记类型
+              });
+            }
+         
+          }
+          // 更新电站标记
+          const updatedMarkers = that.updateMarkers('station', stations);
+          that.setData({
+            markers: updatedMarkers,
+            stationsNearby: data.data.length // 电站数量
+          });
         }
-        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);
+      })
+      .catch((err) => {
+        console.error('加载附近电站失败：', err);
+      });
+  },
+
+  // ========== 新增：加载附近用电位置 ==========
+  getloadNearbyPowerUse() {
+    const that = this;
+    let data = {}; // 根据接口要求传参
+    // 替换为你的用电位置列表接口
+    api.request(`/sysaddress/selectpower`, 'post', data, { isPublic: false })
+      .then((data) => {
+        if (data.code == 200) {
+          const powerUses = [];
+          // 假设接口返回的用电位置列表字段为 syscarList，坐标字段为 carPosition（格式：纬度,经度）
+          // data.data.syscarList = [{carPosition: "40.086206,116.850604"},{carPosition: "40.017232,116.61686"},{carPosition: "40.230298,116.739424"}]
+          for (let index = 0; index < data.data.length; index++) {
+            // let carPosition = data.data.syscarList[index].carPosition.split(",");
+            if (data.data[index].addressType==0||data.data[index].addressType==1) {
+              powerUses.push({
+                id: 300 + index, // 用电位置 ID 段：300+
+                longitude: data.data[index].longitude,
+                latitude: data.data[index].latitude,
+                // 替换为你的用电位置图标地址
+                iconPath: 'https://esos-iot.com/myminio/project/42dd004817dd4f268d97dcd1145ca113.png',
+                width: 26, // 用电位置图标尺寸
+                height: 30,
+                anchor: { x: 0.5, y: 0.5 },
+                type: 'powerUse' // 标记类型
+              }); 
+            }
          
-         that.setData({
-           markers: filteredMarkers,
-           carsNearby: data.data.length
-         });
-      }
-      
-        })
-        .catch((err) => {
-       
-          console.error('请求失败：', err);
-        });
-      }, 10000)  // 每10秒更新一次位置
-    })
-    
- 
+          }
+          // 更新用电位置标记
+          const updatedMarkers = that.updateMarkers('powerUse', powerUses);
+          that.setData({
+            markers: updatedMarkers,
+            powerUseNearby: data.data.length // 用电位置数量
+          });
+        }
+      })
+      .catch((err) => {
+        console.error('加载附近用电位置失败：', err);
+      });
   },
 
-  // 取消订单
+  // ========== 通用方法：更新地图标记（核心复用逻辑） ==========
+  /**
+   * 更新地图标记
+   * @param {String} type 标记类型（car/station/powerUse）
+   * @param {Array} newMarkers 新的标记列表
+   * @returns {Array} 更新后的所有标记
+   */
+  updateMarkers(type, newMarkers) {
+    // 1. 过滤掉原有同类型的标记
+    const filteredMarkers = this.data.markers.filter(marker => marker.type !== type);
+    // 2. 添加新的同类型标记
+    filteredMarkers.push(...newMarkers);
+    // 3. 返回更新后的标记列表
+    return filteredMarkers;
+  },
+
+  // 可选：刷新所有附近数据
+  refreshAllNearbyData() {
+    this.getloadNearbyCars();
+     if (this.data.userdata.operationRole==6) {
+       this.getloadNearbyPowerUse();  // 用电
+
+      }else if (this.data.userdata.operationRole==5) {
+       this.getloadNearbyStations();  // 绿电
+
+     }else if (this.data.userdata.operationRole==4){
+    this.getloadNearbyStations();
+      this.getloadNearbyPowerUse();
+     }
+  },
+ 
+  // 取消工单
   positioning(){
     this.initMap()
-
+  
   },
   
   details(e){
-
+  
     wx.navigateTo({
     url: `/package-map/pages/map/index?id=${e.currentTarget.dataset.id}`,
   })
   },
   
- 
   onShow() {
     //  this.loadNearbyCars()
 this.getworkordertype()
-
+   
   },
 }); 
-//
+// 

pages/index/index.wxml

@@ -3,21 +3,53 @@
   <map 
     id="map"
     class="map"
-    style="{{workorderdata.length < 1 ? 'height: 100%':'height: 70%'}}"
     longitude="{{longitude}}"
     latitude="{{latitude}}"
     scale="{{scale}}"
     markers="{{markers}}"
     polyline="{{polyline}}"
     show-location
-    bindregionchange="onRegionChange"
   ></map>
-   
-  <!-- 底部操--作面板 -->
+   <!-- 附近车辆--数量提示 -->
+   <view class="cars-nearby" wx:if="{{carsNearby > 0}}">
+  <view style="display: flex;align-items: center;">
+    <!-- <view class="cars-icon">
+      <text class="iconfont icon-car"></text>
+    </view> -->
+      <image class="nearby_icon" src="https://esos-iot.com/myminio/project/e9c0fba9b61448e59458054d335b162b.png" mode="heightFix"/>
+    <view class="cars-count"> 车辆{{carsNearby}} </view>
+  </view>
+ 
+  <view style="display: flex;align-items: center;margin-left: 20rpx;" wx:if="{{userdata.operationRole==5}}">
+  
+    <image class="nearby_icon" src="https://esos-iot.com/myminio/project/62a7a9c509f948558436bc56ee9bfe2e.png" mode="heightFix"/>
+    <view class="cars-count">电站 {{stationsNearby}} </view>
+  </view>
+  <view style="display: flex;align-items: center;margin-left: 20rpx;" wx:if="{{userdata.operationRole==6}}">
+    <image class="nearby_icon" src="https://esos-iot.com/myminio/project/42dd004817dd4f268d97dcd1145ca113.png" mode="heightFix"/>
+    <view class="cars-count">用电 {{powerUseNearby}} </view>
+  </view>
+  </view>
+  <view class="positioning" bind:tap="positioning">
+  <t-icon name="focus" size="40rpx" data-name="focus" bind:tap="onIconTap" />
+
+</view>
+   <view class="carousel">
+    <swiper indicator-dots="{{indicatorDots}}"
+        autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="{{true}}">
+        <block wx:for="{{background}}" wx:key="*this">
+          <swiper-item>
+            <!-- <view class="swiper-item">{{item}}</view> -->
+            <image class="swiper_img" src="{{item}}" mode="widthFix"/>
+          </swiper-item>
+        </block>
+      </swiper>
+   </view>
+   <!-- 底部面板 -->
   <view class="bottom-panel" wx:if="{{workorderdata.length > 0 }}">
-    
+    <!--  -->
   <!-- 客户信息--(叫车后显示) -->
-    <view  wx:if="{{userdata.operationRole==5}}">
+    <view  wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}">
     <view class="driver-info" wx:for="{{workorderdata}}" wx:key="index" data-id="{{item.workorderId}}" bindtap="details">
       <image src="{{driverAvatar}}" class="driver-avatar"></image>
    <view style="width: 100%;">
@@ -25,8 +57,8 @@
       <view class="driver-details">
         <!-- <view class="driver-name"><text style="color: #222;">司机：</text>  {{item.driverName||'匹配中'}}</view> -->
         <view class="driver-name">车牌号：{{item.carName||'匹配中'}}</view>
-        <view class="driver-car" wx:if="{{item.chargedischargeType==1}}">订单类型：充电</view>
-        <view class="driver-car" wx:if="{{item.chargedischargeType==2}}">订单类型：放电</view>
+        <view class="driver-car1" wx:if="{{item.chargedischargeType==1}}">工单类型：充电</view>
+        <view class="driver-car2" wx:if="{{item.chargedischargeType==2}}">工单类型：放电</view>
         <view class="driver-car">目的地：{{item.poiName}}</view>
       </view>
       <view class="cancel-btn">
@@ -55,50 +87,48 @@
       <view class="driver-details">
         <view class="driver-name">{{item.poiName}}</view>
         <view class="driver-car">客户: {{item.receiver}}</view>
-        <view class="driver-car" wx:if="{{item.chargedischargeType==1}}">订单类型：充电</view>
-        <view class="driver-car" wx:if="{{item.chargedischargeType==2}}">订单类型：放电</view>
+        <view class="driver-car1" wx:if="{{item.chargedischargeType==1}}">工单类型：充电</view>
+        <view class="driver-car2" wx:if="{{item.chargedischargeType==2}}">工单类型：放电</view>
       </view>
       <!-- <button class="cancel-btn" data-id="{{item.workorderId}}" bind:tap="details">去查看</button> -->
       <view class="cancel-btn">
-        <view wx:if="{{item.workorderType==0}}">待处理</view>
+<view wx:if="{{item.workorderType==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 wx:if="{{item.workorderType==6}}">取消工单</view>
+
+<view wx:if="{{item.workorderType==5&&item.settlementType==0}}">待结算</view>
+<view wx:if="{{item.workorderType==5&&item.settlementType==1}}">结算成功</view>
+<view wx:if="{{item.workorderType==5&&item.settlementType==2}}">结算失败</view>
       </view>
       </view>
       <view class="driver-arrive1">约定到达时间：{{item.workorderCreatetime}}</view>
     </view>
-
+    
     </view>
     
     </view>
     <!-- <view class="available" wx:if="{{workorderdata.length<1}}">
-<image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
+<image src="https://esos-iot.com/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
 </view>  -->
    
-    <view style="height: 140rpx;" wx:if="{{userdata.operationRole==5}}"></view>
+    <view style="height: 140rpx;" wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}"></view>
      <!-- <button class="call-btn" bindtap="onelectricity">
       <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>
-<button class="call-btn" bindtap="onelectricity" wx:if="{{userdata.operationRole==5}}">
+
+<button class="call-btn" bindtap="onelectricity" wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}">
       <text class="call-btn_left_electricity">预约</text>
+      
     </button>
-<view class="positioning" bind:tap="positioning" style="{{workorderdata.length < 1 ? 'top: 85%':'top: 55%'}}">
-  <t-icon name="focus" size="40rpx" data-name="focus" bind:tap="onIconTap" />
 
-</view>
+<!--   
+       
+ -->   

pages/index/index.wxss

@@ -1,17 +1,17 @@
 .container {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
   display: flex;
+  height: 100%;
   flex-direction: column;
+  overflow: hidden;
+box-sizing: border-box;
 }
 
 .map {
   width: 100%;
+  min-height: 700rpx;
+  box-sizing: border-box;
   
-}
+} 
 
 .bottom-panel {
   /* position: absolute;
@@ -19,10 +19,11 @@
   left: 0;
   right: 0; */
   width: 100%;
-  height: 660rpx;
+  /* height: 660rpx; */
   overflow: hidden;
   overflow: auto;
   padding: 16rpx;
+  padding-top: 0rpx;
   box-sizing: border-box;
   
 }
@@ -132,13 +133,22 @@ width: 50%;
   font-size: 32rpx;
   font-weight: bold;
 }
-
 .driver-car {
   font-size: 28rpx;
-  color: #666;
+  color: #ccc;
+  margin-top: 8rpx;
+}
+.driver-car1 {
+  font-size: 28rpx;
+  color: #00C775;
   margin-top: 8rpx;
 }
+.driver-car2 {
+  font-size: 28rpx;
+  color: #EA6E38;
 
+  margin-top: 8rpx;
+}
 .driver-arrive {
   font-size: 28rpx;
   color: #2C85FF;
@@ -161,17 +171,25 @@ width: 50%;
 }
 
 .cars-nearby {
-  position: absolute;
-  top: 104rpx;
-  left: 24rpx;
-  background-color: rgba(255, 255, 255, 0.9);
-  border-radius: 32rpx;
+  position: fixed;
+  top: 620rpx;
+  left: 10rpx;
+  background-color: rgba(255, 255, 255, 1);
+  border-radius: 16rpx;
   padding: 12rpx 20rpx;
   display: flex;
+  /* flex-direction: column; */
   align-items: center;
   box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-}
+  box-sizing: border-box;
 
+}
+.positioning{
+  position: fixed;
+  top: 630rpx;
+  right: 40rpx;
+  
+}
 .cars-icon {
   color: #2C85FF;
   margin-right: 12rpx;
@@ -192,15 +210,41 @@ width: 50%;
   align-items: center;
   justify-content: center;
 }
-.positioning{
-  position: fixed;
-  /* top: 740rpx; */
-  right: 40rpx;
-  
-}
+
 .available{
   display: flex;
    justify-content: center;
    align-items: center;
    margin-top: 100rpx;
-  }
+  }
+  .carousel{
+    width: 100%;
+    height: 300rpx;
+    /* background-color: #222222; */
+padding: 20rpx;
+padding-bottom: 0rpx;
+border-radius:16rpx;
+box-sizing: border-box;
+  }
+  .swiper_img{
+    width: 100%;
+    height: 380rpx;
+    border-radius:16rpx;
+    overflow: hidden;
+  }
+  .swiper-item{
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #222222;
+border-radius:16rpx;
+
+    background-color: #00C775;
+  } 
+/*   */
+.nearby_icon{
+width: 44rpx;
+height: 44rpx;
+}

pages/setup/index.js

@@ -20,7 +20,9 @@ accountInfo:'',
 user:'',
 station:wx.getStorageSync('station'),
 showMultiTextAndTitle:false,
-inputValue: '' // 初始值
+inputValue: '', // 初始值
+passwordtype:true,
+accountdata:''
   },
   onstation(){
     wx.navigateTo({
@@ -60,12 +62,17 @@ inputValue: '' // 初始值
   toconfigure(e){
     console.log(e.currentTarget.dataset.name);
     if (e.currentTarget.dataset.name=="userlist") {
-      // 历史订单
+      // 分配工单
       wx.navigateTo({
         url: '/package-user/pages/userlist/index',
       });
+    }else if (e.currentTarget.dataset.name=="balance"){
+      // 我的钱包
+      wx.navigateTo({
+        url: '/pages/balance/index',
+      });
     }else if (e.currentTarget.dataset.name=="driver"){
-      // 订单发票
+      // 工单发票
       wx.navigateTo({
         url: '/package-user/pages/driver/index',
       });
@@ -73,6 +80,11 @@ inputValue: '' // 初始值
       wx.navigateTo({
         url: '/package-order/pages/address/index',
       });
+    }else if (e.currentTarget.dataset.name=="order"){
+      // 我的工单
+      wx.navigateTo({
+        url: '/package-order/pages/order/index',
+      });
     }else{
       wx.showToast({
         title: '暂未开放',
@@ -81,6 +93,12 @@ inputValue: '' // 初始值
     }
   
   },
+  // 充放电统计
+  onelectricity(){
+    wx.navigateTo({
+      url: '/package-setup/pages/electricity/index',
+    });
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -94,9 +112,30 @@ inputValue: '' // 初始值
   } catch (e) {
     console.error("获取小程序版本号失败:", e);
   }
-     
+     this.account()
   },
+  account(){
+    let data ={
 
+    }
+    api.request(`/SysBalance/selectbalance`, 'post',data,{ isPublic: false })
+    .then((data) => {
+      
+      this.setData({
+        accountdata:data.data
+      })
+ console.log(data);
+    })
+    .catch((err) => {
+   
+      console.error('请求失败：', err);
+    });
+  },
+  onpassword(){
+     this.setData({
+      passwordtype:!this.data.passwordtype
+     })
+  },
  
    onuser(){
     wx.showToast({

pages/setup/index.wxml

@@ -6,50 +6,207 @@
 <view class="user_name">
 <view class="user_name1">{{user.operationName||'微信用户'}}
 <view class="user_role" wx:if="{{user.operationRole==4}}">司机</view>
-<view class="user_role" wx:if="{{user.operationRole==5}}">客户</view>
+<view class="user_role" wx:if="{{user.operationRole==5}}">绿电业主</view>
+<view class="user_role" wx:if="{{user.operationRole==6}}">用电业主</view>
 </view>
 <view class="user_name2">{{user.operationPhone}}</view>
 </view>
 </view>
 <view style="width: 100%;height:40rpx"></view>
-<!--  
-  
+<!--
+    
  -->
 <view class="allocation_box">
+  <view class="allocation">
+<view class="allocation_3_password">我的账户<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 class="allocation_1" data-name="balance" bind:tap="toconfigure">
+<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="balance" bind:tap="toconfigure">
+<view>
+<text wx:if="{{!passwordtype}}">￥</text>
+<text style="font-size: 26px;" wx:if="{{passwordtype}}">∗∗∗∗</text>
+<text style="font-size: 26px;" wx:else>{{accountdata.balance}}</text>
+</view>
+</view>
+<view class="allocation_money">
+<view class="allocation_3_money">日/<text wx:if="{{user.operationRole==5}}">收入</text><text wx:if="{{user.operationRole==6}}">支出</text></view>
+<view class="allocation_3_money">月/<text wx:if="{{user.operationRole==5}}">收入</text><text wx:if="{{user.operationRole==6}}">支出</text></view>
+ 
+<view class="allocation_3_money" style="color: #222;">年/<text wx:if="{{user.operationRole==5}}">收入</text><text wx:if="{{user.operationRole==6}}">支出</text></view>
+ 
+</view>
+<view class="allocation_money" style="margin-bottom: 10rpx;">
+<view class="allocation_3_money">
+ <text wx:if="{{passwordtype}}">∗∗∗∗</text> 
+ <text wx:else>￥{{accountdata.zhouspent}}</text> 
+</view>
+<view class="allocation_3_money">
+<text wx:if="{{passwordtype}}">∗∗∗∗</text> 
+ <text wx:else>￥{{accountdata.weeklyconsumption}}</text> 
+</view>
+<view class="allocation_1">
+<view class="allocation_3_money" style="color: #222;">
+<text wx:if="{{passwordtype}}">∗∗∗∗</text> 
+ <text wx:else>￥{{accountdata.annualconsumption}}</text> 
+</view>
+</view>
+</view>
+</view>
+<view class="allocation_box_more">
+<view class="allocation_box_allocate" wx:if="{{user.operationRole==5||user.operationRole==6}}">
+<view class="allocation_allocate" data-name="userlist" bind:tap="toconfigure">
+ <view class="allocation_allocateimg">
+<t-icon name="assignment" size="50rpx" data-name="assignment" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">分配工单</view>
+</view>
+<!-- <view class="allocation_allocate" data-name="order" bind:tap="toconfigure">
+ <view class="allocation_allocateimg">
+<t-icon name="file-code-1" size="50rpx" data-name="file-code-1" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">历史工单</view>
+</view> -->
+<view class="allocation_allocate" data-name="driver" bind:tap="toconfigure">
+ <view class="allocation_allocateimg">
+<t-icon name="bill" size="50rpx" data-name="bill" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">工单发票</view>
+</view>
+<view class="allocation_allocate" data-name="address" bind:tap="toconfigure">
+ <view class="allocation_allocateimg">
+<t-icon name="task-location" size="50rpx" data-name="task-location" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">地址</view>
+</view>
+<view class="allocation_allocate">
+ <view class="allocation_allocateimg">
+<t-icon name="file-setting" size="50rpx" data-name="file-setting" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">版本</view>
+</view>
+
+</view>
+<view class="allocation_box_allocate" wx:if="{{user.operationRole==5||user.operationRole==6}}">
+  <view class="allocation_allocate" bind:tap="onelectricity">
+ <view class="allocation_allocateimg">
+<t-icon name="file-setting" size="50rpx" data-name="file-setting" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name" wx:if="{{user.operationRole==5}}">充电统计</view>
+ <view class="allocation_name" wx:if="{{user.operationRole==6}}">放电统计</view>
+</view>
+<view class="allocation_allocate">
+ <view class="allocation_allocateimg">
+<t-icon name="service" size="50rpx" data-name="service" color="#07c160"/>
+  
+ </view>
+ <!-- <view class="allocation_name">联系客服</view> -->
+ <button class="contact-button" open-type="contact" plain>
+<view style="font-size: 26rpx;">联系客服</view>
+</button>
+</view>
+<view class="allocation_allocate" bind:tap="onsetup">
+ <view class="allocation_allocateimg">
+<t-icon name="setting-1" size="50rpx" data-name="setting-1" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">设置</view>
+</view>
+<!-- <view class="allocation_allocate"> -->
+ <!-- <view class="allocation_allocateimg">
+<t-icon name="task-location" size="50rpx" data-name="task-location" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name"></view> -->
+<!-- </view> -->
+<view class="allocation_allocate">
+
+</view>
+</view>
+<view class="allocation_box_allocate" wx:if="{{user.operationRole==4}}">
+<view class="allocation_allocate" data-name="address" bind:tap="toconfigure">
+ <view class="allocation_allocateimg">
+<t-icon name="task-location" size="50rpx" data-name="task-location" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">地址</view>
+</view>
+<view class="allocation_allocate">
+ <view class="allocation_allocateimg">
+<t-icon name="file-setting" size="50rpx" data-name="file-setting" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">版本</view>
+</view>
+<view class="allocation_allocate">
+ <view class="allocation_allocateimg">
+<t-icon name="service" size="50rpx" data-name="service" color="#07c160"/>
+  
+ </view>
+ <!-- <view class="allocation_name">联系客服</view> -->
+ <button class="contact-button" open-type="contact" plain>
+<view style="font-size: 26rpx;">联系客服</view>
+</button>
+</view>
+<view class="allocation_allocate" bind:tap="onsetup">
+ <view class="allocation_allocateimg">
+<t-icon name="setting-1" size="50rpx" data-name="setting-1" color="#07c160"/>
+  
+ </view>
+ <view class="allocation_name">设置</view>
+</view>
+</view>
+</view>
+
+<!-- <view class="allocation_box">
 
 <view class="allocation" data-name="userlist" bind:tap="toconfigure">
-<view class="allocation_3">分配订单</view>
+<view class="allocation_3">分配工单</view>
+<view class="allocation_1">
+<view class="allocation_2"></view>
+<t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s"/>
+</view>
+</view>
+<view class="allocation" data-name="order" 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_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 wx:if="{{user.operationRole==5}}" class="allocation" data-name="address" bind:tap="toconfigure">
+<view wx:if="{{user.operationRole==5||user.operationRole==6}}" 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_box">
  
 <view class="allocation">
 <view class="allocation_3">小程序版本</view>
 <view class="allocation_1">
 <view class="allocation_2" wx:if="{{accountInfo!=''}}">V {{accountInfo}}</view>
 <view class="allocation_2" wx:else>V 1.0.0</view>
-<!--
-  <t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s"/>
--->
+ 
 </view>
 </view>
 <view class="allocation">
@@ -70,8 +227,8 @@
 <t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s"/>
 </view>
 </view>
+</view> -->
 </view>
-</view>
-<!---->
+ 
 
  

pages/setup/index.wxss

@@ -42,7 +42,7 @@ align-items: center;
   align-items: center;
   justify-content: center;
   color: #ffffff;
-  background-color: #84b9e8;
+  background-color: #07c160;
   margin-left: 10rpx;
 }
 .user_name2{
@@ -132,6 +132,17 @@ width: 100%;
   padding: 0rpx 20rpx;
   box-sizing: border-box;
  }
+ .allocation_money{
+  width: 100%;
+display: flex;
+align-items: center;
+justify-content:space-between;
+padding: 0rpx 40rpx;
+margin-top: 20rpx;
+overflow: hidden;
+box-sizing: border-box;
+
+}
  .allocation{
    width: 100%;
    height: 80rpx;
@@ -149,11 +160,13 @@ box-sizing: border-box;
    align-items: center;
  }
  .allocation_box{
+   width: 100%;
+   height: 300rpx;
   border-radius: 16rpx;
   background-color: #ffffff;
    padding: 10rpx 0rpx;
    box-sizing: border-box;
-   margin-top: 30rpx;
+   margin-top: 20rpx;
   box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
 
 
@@ -162,9 +175,21 @@ box-sizing: border-box;
    color: #999999;
    
  }
+ .allocation_3_money{
+   width: 160rpx;
+   display: flex;
+   justify-content: center;
+ }
+ .allocation_2_money{
+  width: 100rpx;
+ }
  .allocation_3{
    font-size: 14px;
  }
+ .allocation_3_password{
+  display: flex;
+  align-items: center;
+ }
  .content-container{
 margin-top: 40rpx;
 display: flex;
@@ -235,4 +260,60 @@ button{
   width: 100%;
   border: none !important;
   display: flex;
+}
+.login_imgae{
+  width: 40rpx;
+  height: 30rpx;
+  margin-left: 20rpx;
+}
+
+.allocation_allocate{
+  width: 140rpx;
+  height: 180rpx;
+  padding: 12rpx;
+  color: #222222;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  border-radius: 10rpx;
+  /* background-color: #cccccc; */
+  box-sizing: border-box;
+
+}
+.allocation_allocateimg{
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 10rpx;
+  background-color: #07c160;
+  box-sizing: border-box;
+background: rgba(7, 193, 96, 0.1);
+display: flex;
+align-items: center;
+justify-content: center;
+}
+.allocation_box_more{
+  display: flex;
+  flex-direction: column;
+  padding:10rpx;
+  margin-top: 30rpx;
+  border-radius: 16rpx;
+  background-color: #ffffff;
+   box-sizing: border-box;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+}
+.allocation_box_allocate{
+  width: 100%;
+
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+ 
+}
+.allocation_name{
+   width: 100%;
+   height: 60rpx;
+   font-size: 26rpx;
+   display: flex;
+   align-items: center;
+   justify-content: center;
 }

pages/tool/index.js

@@ -5,7 +5,11 @@ Page({
     tabsindex:"",
     driverlist:[],
     selected:1,
-    userdata:[]
+    userdata:[],
+    pageNum: 1, // 当前页码
+    pageSize: 10, // 每页条数
+    loading: false, // 加载中状态（防止重复请求）
+    noMoreData: false, // 是否无更多数据
   },
   onLoad() {
     // this.getdriver()
@@ -28,7 +32,7 @@ wx.$on('wsMessage', this.toolWsMessage);
     console.log('Other Page 收到 WebSocket 消息:', message);
  
     // 根据消息类型进行不同的处
-    switch (message.api) {
+     switch (message.api) {
       case '/sysworkorder/selectworkorderlist':
         // 在这里可以更新地图、刷新UI等
         if (message.type==1) {
@@ -58,31 +62,109 @@ this.setData({
 this.getdriver()
   },
   getdriver(){
-    let data ={
+      // 设置加载中状态
+      this.setData({ loading: true });
+      let data ={
+     
+      }
+    if (this.data.userdata.operationRole==4) {
+      data ={
+        workorderId:'',
+        workorderName:'',
+        addressId:'',
+        driverId:'',
+        carId:'',
+        customerId:'',
+        settlementType:'',
+        workorderType:this.data.tabsindex,
+        chargedischargeType:this.data.selected,
+        pageNum: this.data.pageNum,
+        pageSize: this.data.pageSize,
+      }
+    }else if(this.data.userdata.operationRole==5){
+    data ={
       workorderId:'',
       workorderName:'',
       addressId:'',
       driverId:'',
       carId:'',
       customerId:'',
+      settlementType:'',
       workorderType:this.data.tabsindex,
-      chargedischargeType:this.data.selected,
+      chargedischargeType:1,
+      pageNum: this.data.pageNum,
+      pageSize: this.data.pageSize,
     }
+    }else if(this.data.userdata.operationRole==6){
+      data ={
+        workorderId:'',
+        workorderName:'',
+        addressId:'',
+        driverId:'',
+        carId:'',
+        customerId:'',
+        settlementType:'',
+        workorderType:this.data.tabsindex,
+        chargedischargeType:2,
+        pageNum: this.data.pageNum,
+        pageSize: this.data.pageSize,
+      }
+    }
+    if((this.data.userdata.operationRole==6||this.data.userdata.operationRole==5)&&this.data.selected==2){
+      data ={
+        workorderId:'',
+        workorderName:'',
+        addressId:'',
+        driverId:'',
+        carId:'',
+        customerId:'',
+        settlementType:this.data.tabsindex,
+        workorderType:3,
+        chargedischargeType:this.data.userdata.operationRole==5?1:2,
+        pageNum: this.data.pageNum,
+        pageSize: this.data.pageSize,
+      }
+    
+    }
+   
 
     api.request(`/sysworkorder/selectworkorderlist`, 'post',data,{ isPublic: false })
-    .then((data) => {
-  console.log(data.data);
-  if (data.code==200) {
+    .then((res) => {
+  console.log(res.data);
+  if (res.code==200) {
+    const data = res.data.list; //data（当前页数据）
+    const total = res.data.total; // total（总条数）
+        console.log(data);
+    // 拼接新数据
+    const newList = this.data.pageNum === 1 ? data : [...this.data.driverlist, ...data];
+    console.log(newList);
+    // 判断是否有更多数据
+    const noMoreData = newList.length >= total;
+    // const noMoreData = false;
+
     this.setData({
-      driverlist:data.data
-    })
+      driverlist: newList,
+      noMoreData:noMoreData,
+    });
+        // 无论成功失败，结束加载状态
+        this.setData({ loading: false });
+    // this.setData({
+    //   driverlist:data.data
+    // })
   }
   //  wx.navigateTo({
   //   url: '/pages/map/index',
   // })
     })
     .catch((err) => {
-
+      wx.showToast({
+        title: '加载失败',
+        icon: 'none',
+      });
+      // 失败时页码回退（避免下次触底页码错误）
+      this.setData({ pageNum: this.data.pageNum - 1 });
+          // 无论成功失败，结束加载状态
+          this.setData({ loading: false });
       console.error('请求失败：', err);
     });
   },
@@ -106,9 +188,29 @@ this.getdriver()
   onShow() {
     this.getdriver()
   },
+  
    /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
    onPullDownRefresh() {
+    this.getdriver()
+
+    console.log('监听用户下拉动作');
+  },
+    /**
+   * 监听页面触底事件
+   */
+  onReachBottom() {
+ 
+    console.log(this.data.loading);
+    console.log(this.data.noMoreData);
+    // 防止重复加载（加载中/无更多数据时不触发）
+    if (this.data.loading || this.data.noMoreData) return;
+    // 页码+1
+    this.setData({ pageNum: this.data.pageNum + 1 });
+    // 加载下一页数据
+this.getdriver()
+
   }
 });
+// 

pages/tool/index.json

@@ -1,8 +1,9 @@
 {
   "navigationBarBackgroundColor": "#fff",
   "enablePullDownRefresh": true,
-  "navigationBarTitleText": "订单",
+  "navigationBarTitleText": "工单",
   "navigationStyle": "custom",
+  "onReachBottomDistance": 50,
   "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

@@ -1,29 +1,46 @@
-<!-- <image class="calculation" src="https://esos-iot.bjdexn.cn/myminio/project/a6546181416e4ca5a266b3b5ce31c335.jpg" mode="widthFix"/> -->
+<!-- <image class="calculation" src="https://esos-iot.com/myminio/project/a6546181416e4ca5a266b3b5ce31c335.jpg" mode="widthFix"/> -->
 
 <!-- <view class="side-bar-wrapper" style="height: calc(100vh - {{navbarHeight}}px)">
 </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 class="discharge" wx:if="{{userdata.operationRole==5}}">
+    <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" wx:if="{{userdata.operationRole==6}}">
+    <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" wx:if="{{userdata.operationRole==4}}">
+<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="" />
   <t-tab-panel label="服务中" value="2" />
   <t-tab-panel label="已完成" value="3" />
-  <t-tab-panel label="取消" value="4" />
+  <t-tab-panel label="取消工单" value="5" />
     <!-- <t-tab-panel label="审核" value="1" /> -->
 </t-tabs>
 </view>
-<view class="discharge_tabs" wx:if="{{userdata.operationRole==5}}">
+<view class="discharge_tabs" wx:if="{{(userdata.operationRole==5||userdata.operationRole==6)&&selected==1}}">
   <t-tabs value="{{tabsindex}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" split="{{false}}">
     <t-tab-panel label="全部" value="" />
     <t-tab-panel label="工作中" value="2" />
   <t-tab-panel label="已完成" value="3" />
-  <t-tab-panel label="取消" value="4" />
-<!--  -->
+  <t-tab-panel label="取消工单" value="5" />
+ 
+</t-tabs>
+</view>
+<view class="discharge_tabs" wx:if="{{(userdata.operationRole==5||userdata.operationRole==6)&&selected==2}}">
+  <t-tabs value="{{tabsindex}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" split="{{false}}">
+    <t-tab-panel label="全部" value="" />
+    <t-tab-panel label="待结算" value="0" />
+  <t-tab-panel label="已结算" value="1" />
+  <t-tab-panel label="取消结算" value="2" />
+ 
 </t-tabs>
 </view>
 <!-- <view bind:tap="onfilter">
@@ -34,22 +51,24 @@
 <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"/>
+<view class="order_title1"> <image class="order_image" src="https://esos-iot.com/myminio/project/458bb7eea14f42cc958eebf0a8b89da3.png" mode="aspectFit"/>
 <!-- <text>{{item.carName}}</text> -->
 <text wx:if="{{item.chargedischargeType==1}}">光伏</text>
 <text wx:if="{{item.chargedischargeType==2}}">风电</text>
 <text wx:if="{{item.chargedischargeType==3}}">网电</text>
 </view> 
-<!-- <view class="order_title1"> <image class="order_image" src="https://esos-iot.bjdexn.cn/myminio/proje  ct/94f976d5afce444a8861b59681069218.png" mode="aspectFit"/> 浙C.78Z71</view> -->
+<!-- <view class="order_title1"> <image class="order_image" src="https://esos-iot.com/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==5&&item.workorderExaminetye==0}}">待审核</view>
-<view wx:if="{{item.workorderType==5&&item.workorderExaminetye==1}}">审核成功</view>
-<view wx:if="{{item.workorderType==5&&item.workorderExaminetye==2}}">审核失败</view>
+<view wx:if="{{item.workorderType==6}}">取消工单</view>
+
+<view wx:if="{{item.workorderType==5&&item.settlementType==0}}">待结算</view>
+<view wx:if="{{item.workorderType==5&&item.settlementType==1}}">结算成功</view>
+<view wx:if="{{item.workorderType==5&&item.settlementType==2}}">结算失败</view>
 </view>
 <view class="order_direction"><text class="order_text">方向：</text>
 <text style="color: #FDBA67;" wx:if="{{item.chargedischargeType==2}}">放电</text>
@@ -65,9 +84,9 @@
 </view>
 </view>
 <view class="available" wx:if="{{driverlist.length<1}}">
-<image src="https://esos-iot.bjdexn.cn/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
+<image src="https://esos-iot.com/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
 </view> 
 <view style="height: 30rpx;"></view>
 <!--
-    
---> 
+  
+ --> 

pages/tool/index.wxss

@@ -176,7 +176,17 @@ display: flex;
  border: 1rpx solid #EA6E38;
  border-right: 0rpx solid #EA6E38;
 }
-
+.discharge_chengselected{
+  padding: 10rpx 40rpx;
+  background-color: #ffffff;
+  color: #EA6E38;
+  background-color: #EA6E38;
+  color: #ffffff;
+  border-radius: 10rpx;
+  border: 1rpx solid #EA6E38;
+  border-right: 0rpx solid #EA6E38;
+ }
+ 
 .discharge_fang{
   padding: 10rpx 40rpx;
  background-color: #ffffff;
@@ -192,6 +202,7 @@ color: #EA6E38;
   background-color: #EA6E38;
  color: #ffffff;
  }
-.discharge_tabs{
-  width: 100%;
-}
+.discharge_tabs{ 
+  width: 100%;   
+}                
+/*  */

project.private.config.json

@@ -23,8 +23,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "package-map/pages/map/index",
-          "pathName": "package-map/pages/map/index",
+          "name": "package-order/pages/payment/index",
+          "pathName": "package-order/pages/payment/index",
           "query": "",
           "scene": null,
           "launchMode": "default"