v1版本

api/index.js

@@ -37,7 +37,7 @@ function request(url, method, data, options = {}) {
       success: (res) => {
         console.log(res);
         // Token 失效或未授权
-        if ([320, 400, 401, 403].includes(res.statusCode)) {
+        if ([320, 400, 401, 403].includes(res.data.code)) {
           handleTokenInvalid(res.data.msg || '登录已过期');
           reject(res.data);
           return;
@@ -58,7 +58,6 @@ function request(url, method, data, options = {}) {
     });
   });
 }
-
 // 跳转到登录页
 function redirectToLogin(message = '') {
   wx.clearStorageSync();

app.js

@@ -1,5 +1,5 @@
 // app.js
-const api = require('./api/index.js'); // 注意路径
+const api = require('./api/index.js');
 App({
   globalData: {
     socketTask: null,
@@ -11,15 +11,21 @@ App({
   },
 
   onLaunch() {
-    // wx.setStorageSync('user', { userId: 'driver_1001', operationRole: 4 }); 
     this.initWebSocketService();
     wx.onAppShow(() => this.handleAppShow());
     wx.onAppHide(() => this.handleAppHide());
+
     this.locationService = {
       isTracking: false,
-      currentWorkorderId: '', // 存储当前跟踪的工单ID
-      isLocationUpdateStarted: false // 标记是否已启动定位服务
+      currentWorkorderId: '',
+      isLocationUpdateStarted: false
     };
+
+    // 司机自动启动【普通实时定位上传】
+    const { operationRole } = this.globalData.userInfo;
+    if (operationRole === 4) {
+      this.startDriverRealTimeLocation();
+    }
   },
 
   initWebSocketService() {
@@ -31,15 +37,12 @@ App({
             that.wsService.close();
           }
 
-          console.log('正在连接WebSocket:', url);
           const socketTask = wx.connectSocket({ url, header: { 'content-type': 'application/json' } });
 
           socketTask.onOpen(() => {
-            console.log('WebSocket 连接成功');
             that.globalData.isConnected = true;
             that.globalData.socketTask = socketTask;
             that.clearReconnectTimer();
-            // that.startHeartbeat();
             if (that.globalData.currentWorkorderId) {
               that.wsService.send({ type: 'subscribe', workorderId: that.globalData.currentWorkorderId });
             }
@@ -48,53 +51,38 @@ App({
 
           socketTask.onMessage((res) => {
             try {
-              console.log(res);
               const message = JSON.parse(res.data);
-              console.log('收到消息:', message);
               wx.$emit('wsMessage', message);
-            } catch (err) { console.error('消息解析失败', err); }
+            } catch (err) { }
           });
 
           socketTask.onClose((res) => {
-            console.log('WebSocket 连接关闭, 状态码:', res.code);
             that.globalData.isConnected = false;
             that.globalData.socketTask = null;
             that.stopHeartbeat();
-            wx.$emit('socketClose');
-            if (res.code !== 1000) { that.startReconnect(); }
+            if (res.code !== 1000) that.startReconnect();
           });
 
           socketTask.onError((err) => {
-            console.error('WebSocket 连接错误:', err);
             that.globalData.isConnected = false;
             that.globalData.socketTask = null;
             that.stopHeartbeat();
-            wx.$emit('socketError', err);
           });
         },
 
         send: (data) => {
           const that = this;
           if (that.globalData.isConnected && that.globalData.socketTask) {
-            try {
-              that.globalData.socketTask.send({
-                data: JSON.stringify(data),
-                fail: (err) => {
-                  console.error('消息发送失败:', err);
-                  wx.showToast({ title: '消息发送失败', icon: 'none' });
-                }
-              });
-            } catch (e) { console.error('消息序列化失败:', e); }
-          } else {
-            console.warn('WebSocket 未连接');
-            wx.showToast({ title: '网络连接中...', icon: 'none' });
+            that.globalData.socketTask.send({
+              data: JSON.stringify(data),
+              fail: (err) => console.error('发送失败', err)
+            });
           }
         },
 
         close: (code = 1000, reason = 'normal close') => {
           const that = this;
           if (that.globalData.socketTask) {
-            console.log(`关闭WebSocket连接: ${code} - ${reason}`);
             that.globalData.socketTask.close({ code, reason });
           }
         }
@@ -104,25 +92,15 @@ App({
 
   handleAppShow() {
     const that = this;
-    console.log(!that.globalData.isConnected);
-    console.log(!that.globalData.reconnectTimer);
     if (!that.globalData.isConnected && !that.globalData.reconnectTimer) {
-      const { operationId, operationRole } = that.globalData.userInfo;
-      console.log(operationRole);
-      // 修复：startReconnect 中用了 operationId，这里统一字段
-      if (!operationId) {
-        console.error('用户operationId不存在，无法连接WebSocket');
-        return;
-      }
+      const { operationId } = that.globalData.userInfo;
+      if (!operationId) return;
       const wsUrl = `wss://esos-iot.com:9443/communication/update/${operationId}`;
       that.wsService.connect(wsUrl);
     }
   },
 
-  handleAppHide() {
-    // 可以选择在后台关闭连接
-    // this.wsService.close(1001, 'app enter background');
-  },
+  handleAppHide() { },
 
   startHeartbeat() {
     const that = this;
@@ -147,8 +125,7 @@ App({
     let delay = 1000;
     that.globalData.reconnectTimer = setInterval(() => {
       if (!that.globalData.isConnected) {
-        console.log(`尝试重连 in ${delay}ms...`);
-        const { operationId, operationRole } = that.globalData.userInfo; // 修复：用 operationId 而非 userId
+        const { operationId } = that.globalData.userInfo;
         if (operationId) {
           const wsUrl = `wss://esos-iot.com:9443/communication/update/${operationId}`;
           that.wsService.connect(wsUrl);
@@ -167,208 +144,91 @@ App({
     }
   },
 
-  /**
-   * 司机端开始后台定位并上传（单工单）
-   * @param {string} workorderId - 当前工单ID
-   */
-  startDriverLocationUpload(workorderId) {
-    const service = this.locationService;
+  /****************************************************************************
+   * 1. 司机【普通实时定位】（一直上传，不绑定工单）
+   ***************************************************************************/
+  startDriverRealTimeLocation() {
+    const { operationRole } = this.globalData.userInfo;
+    if (operationRole !== 4) return;
 
-    // 入参校验
-    if (!workorderId) {
-      console.error('工单ID不能为空');
-      wx.showToast({ title: '工单ID异常', icon: 'none' });
-      return;
-    }
-
-    // 如果已经在为当前工单上传，则忽略
-    if (service.isTracking && service.currentWorkorderId === workorderId) {
-      console.log(`已经在为工单 ${workorderId} 上传位置`);
-      return;
-    }
-
-    // 如果已经在为其他工单上传，先停止
-    if (service.isTracking && service.currentWorkorderId !== workorderId) {
-      console.log(`当前正在为工单 ${service.currentWorkorderId} 上传，切换到 ${workorderId}，先停止旧定位`);
-      this.stopDriverLocationUpload();
-    }
-
-    // 权限校验
-    wx.getSetting({
-      success: (res) => {
-        if (!res.authSetting['scope.userLocationBackground']) {
-          wx.authorize({
-            scope: 'scope.userLocationBackground',
-            success: () => {
-              this._doStartLocationUpload(workorderId, service);
-            },
-            fail: () => {
-              wx.showModal({
-                title: '权限不足',
-                content: '需要开启后台定位权限才能实时上传位置，请前往设置页开启',
-                confirmText: '去设置',
-                success: (modalRes) => {
-                  if (modalRes.confirm) {
-                    wx.openSetting({
-                      success: (settingRes) => {
-                        if (settingRes.authSetting['scope.userLocationBackground']) {
-                          this._doStartLocationUpload(workorderId, service);
-                        }
-                      }
-                    });
-                  }
-                }
-              });
-            } 
-          });
-        } else {
-          this._doStartLocationUpload(workorderId, service);
-        }
-      }
-    });
-  },
-
-  /**
-   * 私有方法：执行真正的定位启动逻辑（核心修复：兼容低版本，改用 wx.onLocationChange）
-   */
- 
-  _doStartLocationUpload(workorderId, service) {
-    console.log(`开始为工单 ${workorderId} 启动后台定位上传...`);
-    service.currentWorkorderId = workorderId;
-
-    // 修复1：先移除旧的定位监听（防止重复监听）
+    const service = this.locationService;
     this._removeLocationListener();
 
-    // 修复2：启动后台定位（兼容低版本，用 startLocationUpdate 兜底）
     const startLocationApi = wx.startLocationUpdateBackground || wx.startLocationUpdate;
     startLocationApi({
       type: 'gcj02',
-      success: (res) => {
-        console.log('定位服务已启动', res);
+      success: () => {
         service.isLocationUpdateStarted = true;
-// 存储上一次的定位信息
-let lastLocation = null;
-// 距离阈值（单位：米，根据需求调整，5米）
-const DISTANCE_THRESHOLD = 5;
-        // 修复3：改用低版本支持的 wx.onLocationChange（替代 wx.watchPosition）
+        let lastLocation = null;
+        const DISTANCE_THRESHOLD = 5;
+
         wx.onLocationChange((location) => {
-          if (!lastLocation) {
-            lastLocation = location;
-            console.log('位置变化，准备上传:', location);
-            this._uploadLocation(location, workorderId);
-            return;
+          // 距离过滤
+          if (lastLocation) {
+            const distance = this.calculateDistance(
+              lastLocation.latitude, lastLocation.longitude,
+              location.latitude, location.longitude
+            );
+            if (distance < DISTANCE_THRESHOLD) return;
+          }
+          lastLocation = location;
+
+          // 统一上传：实时位置 + 有工单就工单一起传
+          this._uploadRealTimeLocation(location);
+          if (service.currentWorkorderId) {
+            this._uploadWorkorderLocation(location, service.currentWorkorderId);
           }
-        // 计算当前定位与上一次的直线距离（Haversine公式）
-  const distance = this.calculateDistance(
-    lastLocation.latitude,
-    lastLocation.longitude,
-    location.latitude,
-    location.longitude
-  );
-console.log(distance);
-  // 只有距离超过阈值，才认为是“有效变化”
-  if (distance >= DISTANCE_THRESHOLD) {
-    lastLocation = location; // 更新上一次定位
-    this._uploadLocation(location, workorderId);
-  }  
-      
         });
-        // 标记定位中状态
-        service.isTracking = true;
-        console.log('位置监听已注册，开始实时上传');
-      },
-      fail: (err) => {
-        let errMsg = '启动定位失败';
-        if (err.errMsg.includes('auth deny')) errMsg = '定位权限被拒绝';
-        else if (err.errMsg.includes('system')) errMsg = '系统不支持定位';
-        
-        console.error(errMsg, err);
-        wx.showToast({ title: errMsg, icon: 'none', duration: 2000 });
       }
     });
   },
 
-// Haversine公式：计算两点经纬度之间的直线距离（单位：米）
- calculateDistance(lat1, lng1, lat2, lng2) {
-  const R = 6371000; // 地球半径（米）
-  const radLat1 = (lat1 * Math.PI) / 180;
-  const radLat2 = (lat2 * Math.PI) / 180;
-  const deltaLat = radLat2 - radLat1;
-  const deltaLng = (lng2 - lng1) * Math.PI / 180;
-
-  const a = 
-    Math.sin(deltaLat / 2) * Math.sin(deltaLat / 2) +
-    Math.cos(radLat1) * Math.cos(radLat2) *
-    Math.sin(deltaLng / 2) * Math.sin(deltaLng / 2);
-  
-  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-  return R * c; // 距离（米）
-},
-  /**
-   * 司机端停止定位上传（核心修复：对应移除 wx.onLocationChange 监听）
-   */
-  stopDriverLocationUpload() {
+  /****************************************************************************
+   * 2. 司机【开始执行工单】（绑定工单，额外上传工单位置）
+   ***************************************************************************/
+  startDriverWorkorderLocation(workorderId) {
+    if (!workorderId) return;
     const service = this.locationService;
+    service.currentWorkorderId = workorderId;
+  },
 
-    if (!service.isTracking) {
-      return;
-    }
-
-    console.log(`停止为工单 ${service.currentWorkorderId} 上传位置`);
-
-    // 1. 移除位置监听（wx.onLocationChange 对应 wx.offLocationChange）
-    this._removeLocationListener();
-
-    // 2. 停止定位服务（兼容低版本，用 stopLocationUpdate 兜底）
-    this._stopLocationService();
-
-    // 3. 重置状态
-    service.isTracking = false;
+  /****************************************************************************
+   * 3. 停止工单定位（只停止工单，不影响实时定位上传）
+   ***************************************************************************/
+  stopDriverWorkorderLocation() {
+    const service = this.locationService;
     service.currentWorkorderId = '';
-    service.isLocationUpdateStarted = false;
   },
 
-  /**
-   * 私有方法：移除位置监听（兼容低版本）
-   */
-  _removeLocationListener() {
-    if (wx.offLocationChange) {
-      wx.offLocationChange();
-      console.log('位置监听已移除');
-    } else {
-      console.warn('当前基础库不支持 wx.offLocationChange，可能存在重复监听风险');
-    }
-  },
+  /****************************************************************************
+   * 上传：司机实时位置（一直传）
+   ***************************************************************************/
+  _uploadRealTimeLocation(location) {
+    const { operationRole } = this.globalData.userInfo;
+    if (operationRole !== 4) return;
 
-  /**
-   * 私有方法：统一停止定位服务（兼容低版本）
-   */
-  _stopLocationService() {
-    const stopLocationApi = wx.stopLocationUpdateBackground || wx.stopLocationUpdate;
-    if (stopLocationApi && this.locationService.isLocationUpdateStarted) {
-      stopLocationApi({
-        success: (res) => {
-          console.log('定位服务已停止', res);
-        },
-        fail: (err) => {
-          console.error('停止定位服务失败:', err);
-        }
-      });
-    }
+    const latOk = location.latitude >= 3.86 && location.latitude <= 53.55;
+    const lngOk = location.longitude >= 73.66 && location.longitude <= 135.05;
+    if (!latOk || !lngOk) return;
+
+    const data = {
+      userType: operationRole,
+      latitude: location.latitude,
+      longitude: location.longitude,
+      accuracy: location.accuracy,
+      createTime: Date.now()
+    };
+    api.request('/sysoperation/inseroperationlocation', 'post', data, { isPublic: false })
+      .catch(err => console.error('实时位置上传失败', err));
   },
 
-  /**
-   * 私有方法：上传位置到服务器（无改动）
-   */
-  _uploadLocation(location, workorderId, retryCount = 0) {
-    const maxRetry = 2;
-    const isLatValid = location.latitude >= 3.86 && location.latitude <= 53.55;
-    const isLngValid = location.longitude >= 73.66 && location.longitude <= 135.05;
-
-    if (!isLatValid || !isLngValid) {
-      console.warn(`无效位置信息（工单: ${workorderId}），跳过上传`, location);
-      return;
-    }
+  /****************************************************************************
+   * 上传：工单位置（执行工单时才传）
+   ***************************************************************************/
+  _uploadWorkorderLocation(location, workorderId) {
+    const latOk = location.latitude >= 3.86 && location.latitude <= 53.55;
+    const lngOk = location.longitude >= 73.66 && location.longitude <= 135.05;
+    if (!latOk || !lngOk) return;
 
     const data = {
       workorderId: workorderId,
@@ -377,25 +237,23 @@ console.log(distance);
       createTime: Date.now(),
       accuracy: location.accuracy
     };
+    api.request('/sysworkorder/insercoordinateredis', 'post', data, { isPublic: false })
+      .catch(err => console.error('工单位置上传失败', err));
+  },
 
-    api.request(`/sysworkorder/insercoordinateredis`, 'post', data, { isPublic: false })
-      .then((response) => {
-        if (response.code !== 200) {
-          throw new Error(`响应码异常: ${response.code}`);
-        }
-        console.log(`位置上传成功 (工单: ${workorderId})`, data);
-      })
-      .catch((err) => {
-        console.error(`位置上传失败（第${retryCount+1}次）(工单: ${workorderId})`, err);
-        if (retryCount < maxRetry) {
-          setTimeout(() => {
-            this._uploadLocation(location, workorderId, retryCount + 1);
-          }, 10000 * (retryCount + 1));
-        } else {
-          wx.showToast({ title: '位置上传失败，请检查网络', icon: 'none' });
-        }
-      });
+  calculateDistance(lat1, lng1, lat2, lng2) {
+    const R = 6371000;
+    const radLat1 = lat1 * Math.PI / 180;
+    const radLat2 = lat2 * Math.PI / 180;
+    const dLat = radLat2 - radLat1;
+    const dLng = (lng2 - lng1) * Math.PI / 180;
+    const a = Math.sin(dLat / 2) ** 2 + Math.cos(radLat1) * Math.cos(radLat2) * Math.sin(dLng / 2) ** 2;
+    return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
   },
+
+  _removeLocationListener() {
+    if (wx.offLocationChange) wx.offLocationChange();
+  }
 });
 
 // 全局事件总线
@@ -404,18 +262,12 @@ wx.$on = function (eventName, callback) {
   if (!this.$events[eventName]) this.$events[eventName] = [];
   this.$events[eventName].push(callback);
 };
-
 wx.$emit = function (eventName, data) {
   if (!this.$events || !this.$events[eventName]) return;
-  this.$events[eventName].forEach(callback => callback(data));
+  this.$events[eventName].forEach(cb => cb(data));
 };
-
 wx.$off = function (eventName, callback) {
   if (!this.$events || !this.$events[eventName]) return;
-  if (callback) {
-    this.$events[eventName] = this.$events[eventName].filter(cb => cb !== callback);
-  } else {
-    this.$events[eventName] = [];
-  }
-};
-
+  if (callback) this.$events[eventName] = this.$events[eventName].filter(cb => cb !== callback);
+  else this.$events[eventName] = [];
+};

app.json

@@ -5,7 +5,9 @@
     "pages/tool/index",
     "pages/equipment/index",
     "pages/balance/index",
-    "pages/details/index"
+    "pages/details/index",
+    "pages/projectlist/index",
+    "pages/projectdetails/index"
   ],
   "requiredBackgroundModes": ["location"],
  

package-map/pages/map/index.js

@@ -85,7 +85,7 @@ Page({
     // 创建地图上下文
     this.mapCtx = wx.createMapContext('map');
   },
-  
+// 
   onLoad(options) {
     // 监听WebSocket消息
     wx.$on('wsMessage', this.detailsWsMessage);
@@ -207,7 +207,7 @@ Page({
             if (this.data.isDriver) {
               // 如果工单状态变为进行中 (1-4)，且之前未在上传，则启动上传
               if (data.data.workorderType >= 1 && data.data.workorderType <= 2) {
-                app.startDriverLocationUpload(this.data.optionsid);
+                app.startDriverWorkorderLocation(this.data.optionsid);
                 this.showInfo('已开启实时位置上传');
               } 
             }
@@ -1040,18 +1040,7 @@ success(res) {
     api.request(`/sysworkorder/submitworkorder`, 'post', data, { isPublic: false })
       .then((data) => {
         if (data.code == 200) {
-          // if (this.data.isDriver && type == 4) {
-          //   wx.stopLocationUpdateBackground({
-          //     success: (res) => {
-          //       console.log('后台定位已停止', res);
-          //       this.showInfo(this.data.isDriver ? '已停止定位追踪' : '已停止位置追踪');
-          //     },
-          //     fail: (err) => {
-          //       console.error('停止后台定位失败', err);
-          //     },
-          //   });
-          //   wx.offLocationChange();
-          // }
+          app.stopDriverWorkorderLocation();
           setTimeout(() => {
             const slideComponent = this.selectComponent("#mySlideConfirm");
             if (slideComponent) {

package-user/pages/login/index.js

@@ -20,7 +20,7 @@ password:'',
 passwordtype:true,
 checked:false,
 shakeClass: '', // 控制晃动动画的类名
-Loginswitch:true
+Loginswitch:true,
   },
 
   /**
@@ -48,7 +48,9 @@ Loginswitch:true
   checkboxChange(e) {
     let _this = this
     console.log('checkbox发生change事件，携带value值为：', e.currentTarget.dataset.value)
- 
+   if (e.currentTarget.dataset.value) {
+     return
+   }
    wx.requestSubscribeMessage({
     tmplIds: ['t46217wOQ7HBvw0MfP78Zo8FuwYTKBESaGYIpaXccFw','lLN0xmyLgBSnvveLAOhHiEHvHUi286idSuv-kO61TMI'],
     success(res) {
@@ -130,7 +132,8 @@ onGetPhoneNumber(e) {
       let obj = {
         // phonecode:e.detail.code,
         phonecode:this.data.account,
-        code:code
+        code:code,
+        password:this.data.password
       }
       api.request(`/sysoperation/login`, 'post',obj,{ isPublic: true })
       .then((data) => {

package-user/pages/login/index.wxml

@@ -19,15 +19,20 @@
  </view>
 
  </view>
-
+ <view style="padding:0rpx 20rpx;">
+  <view class="account">登录密码</view>
+  <view class="password">
+  <image class="login_imgae1" src="https://esos-iot.com/wx_images/password.png" mode=""/>
+  <input class="weui-input"	value="{{password}}" placeholder="请输入登录密码"  bindinput="bindKeyInput2"/></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}}" disabled="{{!checked}}" class="button_button" color="#cccccc" bind:tap="promptcheck">登录</button>
  <view class="register">
-<view class="register_box" bind:tap="onregister">注册</view> 
+<!-- <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"/>

package-user/pages/privacy/index.js

@@ -17,7 +17,7 @@ URL:''
    this.setData({
     URL:'https://esos-iot.com/wx_images/service.png'
    })
- }else if(options.name=='隐私协议'){
+ }else if(options.name=='隐私政策'){
   this.setData({
     URL:'https://esos-iot.com/wx_images/privacy.png'
    })

pages/index/index.js

@@ -37,6 +37,7 @@ Page({
 this.getuser()
 this.initMap()
 wx.$on('wsMessage', this.handleWsMessage);
+
   },
   onHide(){
     // 页面卸载时，取消订阅，这是至关重要的一步！

pages/index/index.wxml

@@ -34,20 +34,19 @@
   <t-icon name="focus" size="40rpx" data-name="focus" bind:tap="onIconTap" />
 
 </view>
-   <view class="carousel">
+   <!-- <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> -->
    <!-- 底部面板 -->
-  <view class="bottom-panel" wx:if="{{workorderdata.length > 0 }}">
-    <!--  -->
+  <view class="bottom-panel">
+  <!--  -->
   <!-- 客户信息--(叫车后显示) -->
     <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">
@@ -71,12 +70,14 @@
 <view wx:if="{{item.workorderType==5&&item.workorderExaminetye==0}}">待审核</view>
 <view wx:if="{{item.workorderType==5&&item.workorderExaminetye==1}}">审核成功</view>
 <view wx:if="{{item.workorderType==5&&item.workorderExaminetye==2}}">审核失败</view>
-      
       </view>
       </view>
       <view class="driver-arrive1">预约时间：{{item.workorderStarttime}}</view>
     </view>
     </view>
+    <view class="available" wx:if="{{workorderdata.length<1}}">
+<image src="https://esos-iot.com/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
+</view> 
     </view>
     <!-- 司机信息--(叫车后显示) --> 
     <view  wx:if="{{userdata.operationRole==4}}">
@@ -98,7 +99,6 @@
 <view wx:if="{{item.workorderType==3}}">到达地点</view>
 <view wx:if="{{item.workorderType==4}}">工作中</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>
@@ -106,29 +106,23 @@
       </view>
       <view class="driver-arrive1">约定到达时间：{{item.workorderCreatetime}}</view>
     </view>
-    
-    </view>
-    
     </view>
-    <!-- <view class="available" wx:if="{{workorderdata.length<1}}">
+    <view class="available" wx:if="{{workorderdata.length<1}}">
 <image src="https://esos-iot.com/myminio/project/9efa1691f71a48b6ae20648c0a2dae56.png" mode="aspectFit"/>
-</view>  -->
-   
+</view> 
+    </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>
 
 <button class="call-btn" bindtap="onelectricity" wx:if="{{userdata.operationRole==5||userdata.operationRole==6}}">
       <text class="call-btn_left_electricity">预约</text>
       
     </button>
-
-<!--   
-       
- -->   
+<!-- 
+  https://esos-iot.com:9443/syscar/selectoperationcar
+Request Method: POST
+ -->

pages/projectdetails/index.js

@@ -0,0 +1,94 @@
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    projectList:[
+      {title:'测算完成'},
+      {title:'勘测完成'},
+      {title:'方案生成'},
+      {title:'采购完成'},
+      {title:'项目进行中'},
+  ],
+    // 储能车项目详情数据（模拟真实场景）
+    projectInfo: {
+      id: 1,
+      name: "上海市浦东新区储能车运营及充电服务项目",
+      status: "进行中",
+      statusType: "ongoing",
+      address: "上海市浦东新区张江高科技园区科苑路88号",
+      time: "2026-01-01 至 2028-12-31",
+      // 项目分成
+      splitList: [
+        { id: 1, role: "主导方", rate: "40%" },
+        { id: 4, role: "合伙人", rate: "10%" },
+        { id: 2, role: "供电方A", rate: "25%" },
+        { id: 3, role: "供电方B", rate: "20%" },
+        { id: 5, role: "用电方", rate: "5%" }
+      ],
+      // 项目主导方
+      leader: {
+        name: "上海电速新能源科技有限公司",
+        contact: "张经理",
+        phone: "13800138000",
+        scope: "项目整体运营、储能车调度、客户对接"
+      },
+      // 供电方信息
+
+      partners: [
+        {
+          id: 1,
+          name: "国家电网上海电力公司",
+          type: "工商业用电（峰谷平电价）",
+          capacity: "500kW/h（储能容量）",
+          term: "2026-01-01 至 2028-12-31"
+        },
+        {
+          id: 2,
+          name: "国家电网北京电力公司",
+          type: "工商业用电（峰谷平电价）",
+          capacity: "500kW/h（储能容量）",
+          term: "2026-01-01 至 2028-12-31"
+        }
+      ],
+      // 合伙人信息
+
+      powerSupplier: {
+        name: "合伙人（上海能联科技）",
+        phone: "13700137000",
+        investRate: "25%",
+        responsibility: "储能车运输、场地租赁、后勤保障"
+      },
+      // 用电方信息
+      powerConsumer: {
+        name: "上海张江园区多家科技企业",
+        scale: "日均用电约8000度",
+        timePeriod: "高峰时段（9:00-18:00）为主",
+        settlement: "月结，按峰谷电价结算"
+      }
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    // 实际项目中，从列表页传递projectId，这里根据ID请求接口获取详情
+    // const projectId = options.id;
+    // this.getProjectDetail(projectId);
+  },
+
+  /**
+   * 模拟请求项目详情接口
+   */
+  getProjectDetail(projectId) {
+    // 实际开发中替换为wx.request请求后端接口
+    // wx.request({
+    //   url: 'https://你的接口地址/project/detail',
+    //   data: { id: projectId },
+    //   success: (res) => {
+    //     this.setData({ projectInfo: res.data });
+    //   }
+    // });
+  }
+});

pages/projectdetails/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "项目详情",
+  "enablePullDownRefresh": false,
+  "backgroundColor": "#f5f7fa",
+  "usingComponents": {
+    "t-steps": "tdesign-miniprogram/steps/steps",
+    "t-step-item": "tdesign-miniprogram/step-item/step-item"
+  }
+}

pages/projectdetails/index.wxml

@@ -0,0 +1,129 @@
+<!-- 页面容器 -->
+<scroll-view class="page-container" scroll-y>
+  <!-- 顶部项目基础信息区 -->
+  <view class="project-header">
+    <!-- 项目名称 -->
+    <view class="project-name">{{projectInfo.name}}</view>
+    <!-- 项目核心信息行 -->
+    <view class="base-info-row">
+      <view class="base-info-item">
+        <text class="info-label">项目地址：</text>
+        <text class="info-value">{{projectInfo.address}}</text>
+      </view>
+      <view class="base-info-item">
+        <text class="info-label">项目周期：</text>
+        <text class="info-value">{{projectInfo.time}}</text>
+      </view>
+      <view class="base-info-item">
+        <text class="info-label">签约电量：</text>
+        <text class="info-value">600kWh</text>
+      </view>
+    </view>
+  </view>
+
+  <!-- 项目分成模块 -->
+  <view class="module-card">
+    <view class="module-title">项目成员</view>
+    <view class="split-container">
+      <view class="split-item" wx:for="{{projectInfo.splitList}}" wx:key="id">
+        <view class="split-name">{{item.role}}</view>
+        <view class="split-value">{{item.rate}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 项目主导方 -->
+  <view class="module-card">
+    <view class="module-title">项目负责方</view>
+    <view class="party-info">
+      <view class="party-item">
+        <text class="info-label">企业名称：</text>
+        <text class="info-value">{{projectInfo.leader.name}}</text>
+      </view>
+      <view class="party-item">
+        <text class="info-label">联系人：</text>
+        <text class="info-value">{{projectInfo.leader.contact}}</text>
+      </view>
+      <view class="party-item">
+        <text class="info-label">联系方式：</text>
+        <text class="info-value">{{projectInfo.leader.phone}}</text>
+      </view>
+      <view class="party-item">
+        <text class="info-label">负责范围：</text>
+        <text class="info-value">{{projectInfo.leader.scope}}</text>
+      </view>
+    </view>
+  </view>
+<!-- 合伙人信息 -->
+<view class="module-card">
+    <view class="module-title">合伙人信息</view>
+    <view class="party-info">
+      <view class="party-item">
+        <text class="info-label">企业名称：</text>
+        <text class="info-value">{{projectInfo.powerSupplier.name}}</text>
+      </view>
+      <view class="party-item">
+            <text class="info-label">联系方式：</text>
+            <text class="info-value">{{projectInfo.powerSupplier.phone}}</text>
+          </view>
+          <view class="party-item">
+            <text class="info-label">出资比例：</text>
+            <text class="info-value">{{projectInfo.powerSupplier.investRate}}</text>
+          </view>
+          <view class="party-item">
+            <text class="info-label">负责内容：</text>
+            <text class="info-value">{{projectInfo.powerSupplier.responsibility}}</text>
+          </view>
+    </view>
+    
+  </view>
+  <!-- 供电方信息 -->
+  <view class="module-card">
+    <view class="module-title">供电方信息</view>
+    <view class="partner-list">
+      <view class="partner-item" wx:for="{{projectInfo.partners}}" wx:key="id">
+        <view class="partner-name">{{item.name}}</view>
+        <view class="partner-detail">
+        
+          <view class="party-item">
+        <text class="info-label">供电类型：</text>
+        <text class="info-value">{{item.type}}</text>
+      </view>
+      <view class="party-item">
+        <text class="info-label">供电容量：</text>
+        <text class="info-value">{{item.capacity}}</text>
+      </view>
+      <view class="party-item">
+        <text class="info-label">合作期限：</text>
+        <text class="info-value">{{item.term}}</text>
+      </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  
+
+  <!-- 用电方信息 -->
+  <view class="module-card">
+    <view class="module-title">用电方信息</view>
+    <view class="party-info">
+      <view class="party-item">
+        <text class="info-label">企业名称：</text>
+        <text class="info-value">{{projectInfo.powerConsumer.name}}</text>
+      </view>
+      <view class="party-item">
+        <text class="info-label">用电规模：</text>
+        <text class="info-value">{{projectInfo.powerConsumer.scale}}</text>
+      </view>
+      <view class="party-item">
+        <text class="info-label">用电时段：</text>
+        <text class="info-value">{{projectInfo.powerConsumer.timePeriod}}</text>
+      </view>
+      <view class="party-item">
+        <text class="info-label">结算方式：</text>
+        <text class="info-value">{{projectInfo.powerConsumer.settlement}}</text>
+      </view>
+    </view>
+  </view>
+</scroll-view>

pages/projectdetails/index.wxss

@@ -0,0 +1,139 @@
+/* 页面容器 */
+.page-container {
+  min-height: 100vh;
+  background-color: #f5f7fa;
+  padding-bottom: 40rpx;
+  box-sizing: border-box;
+
+}
+
+/* 顶部项目基础信息区 */
+.project-header {
+  width: 100%;
+  background: #fff;
+  padding: 30rpx 24rpx;
+  margin-bottom: 20rpx;
+  box-sizing: border-box;
+}
+
+/* 状态标签 */
+.status-tag {
+  display: inline-block;
+  font-size: 24rpx;
+  padding: 6rpx 16rpx;
+  border-radius: 20rpx;
+  color: #fff;
+  margin-bottom: 20rpx;
+}
+/* 状态类型样式 */
+.status-tag.pending { background: #909399; }
+.status-tag.ongoing { background: #409eff; }
+.status-tag.done { background: #67c23a; }
+.status-tag.suspended { background: #f56c6c; }
+
+/* 项目名称 */
+.project-name {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 24rpx;
+  line-height: 1.4;
+  margin-top: 20rpx;
+  box-sizing: border-box;
+}
+
+/* 基础信息行 */
+.base-info-row {
+  font-size: 28rpx;
+  color: #666;
+  line-height: 1.8;
+}
+.base-info-item {
+  margin-bottom: 12rpx;
+}
+
+/* 通用模块卡片 */
+.module-card {
+  background: #fff;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  margin: 0 20rpx 20rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+/* 模块标题 */
+.module-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+  padding-bottom: 16rpx;
+  margin-bottom: 16rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+/* 项目分成容器 */
+.split-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  padding: 8rpx 0;
+}
+.split-item {
+  background: #f5f7fa;
+  border-radius: 8rpx;
+  padding: 12rpx 20rpx;
+  flex: 1;
+  min-width: 180rpx;
+  text-align: center;
+}
+.split-name {
+  font-size: 26rpx;
+  color: #666;
+  margin-bottom: 8rpx;
+}
+.split-value {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #409eff;
+}
+
+/* 通用方信息样式 */
+.party-info {
+  font-size: 28rpx;
+  color: #666;
+  line-height: 2;
+}
+.party-item {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 8rpx;
+}
+.info-label {
+  color: #999;
+  min-width: 120rpx;
+}
+.info-value {
+  flex: 1;
+  color: #333;
+}
+
+/* 合伙人列表 */
+.partner-list {
+  padding: 8rpx 0;
+}
+.partner-item {
+  padding: 16rpx 0;
+  border-bottom: 1rpx dashed #eee;
+}
+.partner-item:last-child {
+  border-bottom: none;
+}
+.partner-name {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 12rpx;
+}
+.partner-detail {
+  padding-left: 12rpx;
+}

pages/projectlist/index.js

@@ -0,0 +1,97 @@
+const api = require('../../api/index.js');
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    projectList: [], // 项目列表数据
+    pageNum: 1, // 当前页码
+    pageSize: 10, // 每页条数
+    hasMore: true, // 是否有更多数据
+    loading: false, // 是否正在加载
+    refreshing: false, // 是否正在下拉刷新
+  statedata:[{title:'未审核'},{title:'未勘探'},{title:'未签约'},{title:'已启用'}]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    // 页面加载时获取第一页数据
+    this.getProjectList();
+  },
+
+  /**
+   * 获取项目列表数据
+   * @param {boolean} isRefresh 是否是下拉刷新
+   */
+  getProjectList(isRefresh = false) {
+    // 如果正在加载或没有更多数据，直接返回
+    if (this.data.loading && !isRefresh) return;
+
+    this.setData({
+      loading: true,
+      ...(isRefresh && { refreshing: true }), // 刷新时设置refreshing为true
+    });
+
+    let data = {
+     
+    }
+    api.request(`/sysproject/selectproject`, 'post', data, { isPublic: false })
+    .then((data) => {
+      console.log('实时数据：', data.data);
+      if (data.code === 200) {
+      // 处理数据：分割图片URL字符串为数组
+const processedList = data.data.map(item => {
+  // 处理逻辑：
+  // 1. 先判断 picture 字段是否存在且不为空
+  // 2. 按逗号分割成数组
+  // 3. 过滤掉分割后可能出现的空字符串（避免数据异常）
+  const pictureArray = item.picture 
+    ? item.picture.split(',').filter(url => url.trim() !== '') 
+    : [];
+  
+  return {
+    ...item, // 保留原有的所有字段
+    picture: pictureArray // 替换 picture 为数组格式
+  };
+});
+console.log(processedList);
+// 更新数据到页面
+this.setData({
+  projectList: processedList
+});
+      }
+    })
+    .catch((err) => {
+      console.error('实时数据请求失败：', err);
+    });
+  },
+
+  /**
+   * 下拉刷新
+   */
+  onPullDownRefresh() {
+    this.getProjectList(true);
+  },
+
+  /**
+   * 上拉加载更多
+   */
+  onReachBottom() {
+    if (this.data.hasMore && !this.data.loading) {
+      this.getProjectList();
+    }
+  },
+
+  /**
+   * 点击列表项进入详情页
+   */
+  goToDetail(e) {
+    const { id } = e.currentTarget.dataset;
+    wx.navigateTo({
+      url: `/pages/detail/detail?id=${id}`,
+    });
+  },
+});

pages/projectlist/index.json

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

pages/projectlist/index.wxml

@@ -0,0 +1,44 @@
+<view class="list-container">
+  <!-- 下拉刷新提示 -->
+  <scroll-view 
+    scroll-y 
+    class="list-scroll"
+    refresher-enabled="{{true}}"
+    refresher-triggered="{{refreshing}}"
+    bindrefresherrefresh="onPullDownRefresh"
+    bindscrolltolower="onReachBottom"
+    lower-threshold="50"
+  >
+    <!-- 列表内容 -->
+    <view class="list-items">
+      <block>
+      <view class="project" wx:for="{{projectList}}" wx:key="id">
+        <t-steps theme="dot" current="{{item.projectType}}" bind:change="onThirdChange">
+    <t-step-item wx:for="{{statedata}}" wx:for-item="items" wx:key="indexs" content="{{items.title}}" />
+  </t-steps>
+        <view class="list-item" bindtap="goToDetail" data-id="{{item.id}}">
+        
+          <view class="item-left">
+            <image class="item-img" src="{{item.picture[0] || ''}}" mode="aspectFill"></image>
+            <!-- <view class="item-title">{{item.projectId}}</view> -->
+
+          </view>
+          <view class="item-right">
+            <view class="item-title">项目名称：{{item.projectName}}</view>
+            <view class="item-desc">{{item.electricName}}</view>
+            <view class="item-meta">
+              <text class="item-time">{{item.partnershipName}}</text>
+              <text class="item-tag">{{item.createTime}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      </block>
+      
+    </view>
+
+    
+  </scroll-view>
+</view>         
+  <!--  -->

pages/projectlist/index.wxss

@@ -0,0 +1,130 @@
+.list-container {
+  height: 100vh;
+  background-color: #f5f5f5;
+}
+
+.list-scroll {
+  height: 100%;
+}
+
+.list-items {
+  padding: 20rpx;
+}
+.project{
+  background-color: #fff;
+  border-radius: 10rpx;
+  padding: 20rpx;
+  margin-top: 20rpx;
+}
+.list-item {
+  display: flex;
+  margin-top: 20rpx;
+}
+
+.item-left {
+  width: 120rpx;
+  height: 120rpx;
+  margin-right: 20rpx;
+}
+
+.item-img {
+  width: 100%;
+  height: 100%;
+  border-radius: 8rpx;
+}
+
+.item-right {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.item-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+  line-height: 1.4;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
+.item-desc {
+  font-size: 26rpx;
+  color: #666;
+  line-height: 1.4;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  margin: 10rpx 0;
+}
+
+.item-meta {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 24rpx;
+  color: #999;
+}
+
+.item-tag {
+  padding: 4rpx 12rpx;
+  background-color: #f0f8ff;
+  color: #007545;
+  border-radius: 12rpx;
+}
+
+/* 状态提示样式 */
+.list-status {
+  padding: 30rpx 0;
+  text-align: center;
+}
+
+.loading {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #999;
+  font-size: 26rpx;
+}
+
+.loading text {
+  margin-left: 10rpx;
+}
+
+.no-more {
+  color: #999;
+  font-size: 26rpx;
+}
+
+.empty {
+  padding: 100rpx 0;
+}
+
+.empty-img {
+  width: 200rpx;
+  height: 200rpx;
+  margin-bottom: 20rpx;
+}
+
+.empty-text {
+  display: block;
+  color: #999;
+  font-size: 28rpx;
+  margin-bottom: 30rpx;
+}
+
+.empty-btn {
+  padding: 12rpx 30rpx;
+  background-color: #007545;
+  color: #fff;
+  border: none;
+  border-radius: 24rpx;
+  font-size: 26rpx;
+}
+/*  */

pages/setup/index.js

@@ -22,7 +22,18 @@ station:wx.getStorageSync('station'),
 showMultiTextAndTitle:false,
 inputValue: '', // 初始值
 passwordtype:true,
-accountdata:''
+accountdata:'',
+projectList: [{cooperationTime: "2025-01-01——2026-01-01",
+createTime: "2026-03-05 16:31:00",
+electric: "2",
+electricName: "晟运能源江西",
+partnership: "8",
+partnershipName: "超级大型运营公司",
+picture: "https://esos-iot.com:9442/myminio/partner/6f107f0fb7bc4bf79175181a96f1b7f9.webp,https://esos-iot.com:9442/myminio/partner/19fb2a62785247a1975e73d864bba5bc.png,https://esos-iot.com:9442/myminio/partner/8a66ec2cf1c54c62810fe2a6f8242a82.jpg",
+projectId: "2",
+projectName: "北京油田项目",
+projectType: "3"}],
+statedata:[{title:'未签约'},{title:'已签约'},{title:'服务中'}]
   },
   onstation(){
     wx.navigateTo({
@@ -46,6 +57,12 @@ accountdata:''
  })
     
   },
+  // 跳转到项目详情页
+  onCardClick() {
+    wx.navigateTo({
+      url: `/pages/projectdetails/index`
+    });
+  },
   closeDialog(){
  this.setData({
   showMultiTextAndTitle:false
@@ -113,6 +130,8 @@ accountdata:''
     console.error("获取小程序版本号失败:", e);
   }
      this.account()
+    this.getProjectList()
+
   },
   account(){
     let data ={
@@ -131,6 +150,48 @@ accountdata:''
       console.error('请求失败：', err);
     });
   },
+  getProjectList(isRefresh = false) {
+    // 如果正在加载或没有更多数据，直接返回
+    if (this.data.loading && !isRefresh) return;
+  
+    this.setData({
+      loading: true,
+      ...(isRefresh && { refreshing: true }), // 刷新时设置refreshing为true
+    });
+  
+    let data = {
+     
+    }
+    api.request(`/sysprojectcontroller/selectproject`, 'post', data, { isPublic: false })
+    .then((data) => {
+      console.log('实时数据：', data.data);
+      if (data.code === 200) {
+      // 处理数据：分割图片URL字符串为数组
+  const processedList = data.data.map(item => {
+  // 处理逻辑：
+  // 1. 先判断 picture 字段是否存在且不为空
+  // 2. 按逗号分割成数组
+  // 3. 过滤掉分割后可能出现的空字符串（避免数据异常）
+  const pictureArray = item.picture 
+    ? item.picture.split(',').filter(url => url.trim() !== '') 
+    : [];
+  
+  return {
+    ...item, // 保留原有的所有字段
+    picture: pictureArray // 替换 picture 为数组格式
+  };
+  });
+  console.log(processedList);
+  // 更新数据到页面
+  this.setData({
+  projectList: processedList
+  });
+      }
+    })
+    .catch((err) => {
+      console.error('实时数据请求失败：', err);
+    });
+  },
   onpassword(){
      this.setData({
       passwordtype:!this.data.passwordtype
@@ -147,6 +208,9 @@ accountdata:''
       url: '/pages/personalInfo/index', // 登录页面的路径，注意路径前面加上 '/' 表示从根目录开始
     });
   },
+  formatBalance(num) {
+    return num ? parseInt(num) : 0;
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -186,18 +250,19 @@ accountdata:''
   onPullDownRefresh() {
 
   },
-
+  
   /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom() {
-
+  
   },
-
+  
   /**
-   * 用户点击右上角分享   
+   * 用户点击右上角分享
    */                  
   onShareAppMessage() {
-
+  
   }
 })
+// 

pages/setup/index.json

@@ -4,6 +4,8 @@
     "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-input": "tdesign-miniprogram/input/input",
+    "t-steps": "tdesign-miniprogram/steps/steps",
+    "t-step-item": "tdesign-miniprogram/step-item/step-item"
   }
 }

pages/setup/index.wxml

@@ -1,5 +1,5 @@
 <view class="setup">
- 
+
 <view style="width: 100%;height:60rpx"></view>
 <view class="user">
 <image bind:tap="onuser" class="user_to" src="{{user.operationPicture||'https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132'}}" mode=""/>
@@ -13,9 +13,6 @@
 </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=""/>
@@ -29,7 +26,8 @@
 <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>
+<text style="font-size: 26px;" wx:else>{{ js.toFixed2(accountdata.balance) }}</text>
+<!-- <text style="font-size: 26px;" wx:else>{{accountdata.balance}}</text> -->
 </view>
 </view>
 <view class="allocation_money">
@@ -56,6 +54,23 @@
 </view>
 </view>
 </view>
+<view class="project" bind:tap="onCardClick" wx:if="{{user.operationRole!=4}}">
+<!-- <view></view> -->
+<view class="project_box" wx:for="{{projectList}}" wx:if="{{index<1}}" wx:key="index" bind:tap="onCardClick">
+<view class="project_top1">
+  <t-steps theme="dot" current="{{item.projectType}}" bind:change="onThirdChange">
+    <t-step-item wx:for="{{statedata}}" wx:for-item="items" wx:key="indexs" content="{{items.title}}" />
+  </t-steps>
+<t-icon name="chevron-right-s" size="40rpx" data-name="chevron-right-s"/>
+</view>
+<view class="project_top">
+<view class="project_title">北方油田项目</view>
+</view>
+<view class="project_name">项目地址：{{item.electricName}}</view>
+<view class="project_name">项目时间：{{item.createTime}}</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">
@@ -229,6 +244,22 @@
 </view>
 </view> -->
 </view>
- 
+<wxs module="js">
+// 金额省略小数点后两位（直接取整数，丢掉小数）
+function formatIntMoney(num) {
+  if (!num || isNaN(num)) return "0";
+  return parseInt(num); // 直接截取整数部分
+}
+
+// 可选：保留两位小数（标准金额）
+function toFixed2(num) {
+  if (!num || isNaN(num)) return "0.00";
+  return parseFloat(num).toFixed(2);
+}
 
- 
+module.exports = {
+  formatIntMoney: formatIntMoney,
+  toFixed2: toFixed2
+};
+</wxs>
+<!--  -->

pages/setup/index.wxss

@@ -316,4 +316,43 @@ justify-content: center;
    display: flex;
    align-items: center;
    justify-content: center;
-}
+}
+
+.project{
+  width: 100%;
+  /* padding: 20rpx; */
+  margin-top: 20rpx;
+  /* background-color: #222222; */
+  box-sizing: border-box;
+  }
+  .project_top1{
+    display: flex;
+    font-size:13px;
+  } 
+
+  .project_box{
+    width: 100%;
+    height: 300rpx;
+    padding: 20rpx;
+    margin-top: 20rpx;
+    background-color: #ffffff;
+    border-radius: 10rpx;
+  box-sizing: border-box;
+  }
+  .project_title{
+    font-size: 32rpx;
+  }
+  .project_top{
+    margin-top: 20rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .project_right{
+    font-size: 28rpx;
+    color: #007545;
+  }
+  .project_name{
+    margin-top: 20rpx;
+  }
+  /* index.js  */

pages/tool/index.wxml

@@ -6,11 +6,11 @@
 <view class="workorder">
   <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 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 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>

pages/tool/index.wxss

@@ -171,8 +171,9 @@ display: flex;
  background-color: #ffffff;
  color: #EA6E38;
 
- border-top-left-radius: 10rpx;
- border-bottom-left-radius: 10rpx;
+ /* border-top-left-radius: 10rpx; */
+ /* border-bottom-left-radius: 10rpx; */
+ border-radius: 10rpx;
  border: 1rpx solid #EA6E38;
  border-right: 0rpx solid #EA6E38;
 }