From b9f702e309f61f5678630c92a8f53344ded0aa91 Mon Sep 17 00:00:00 2001 From: Sliverber <2622874537@qq.com> Date: Wed, 15 May 2024 18:02:17 +0800 Subject: [PATCH] 11 --- common/http.interceptor.js | 4 +- page_user/yj.vue | 71 ++++++++++--- pages/index/index.vue | 54 +++++++++- pages/my.vue | 45 +++++++-- pages_admin/admin_worke.vue | 10 +- pages_admin/order/order_detail.vue | 128 ++++++++++++++++++++---- pages_admin/worke/worke_user_detail.vue | 2 +- 7 files changed, 263 insertions(+), 51 deletions(-) diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 0a196af..939d93b 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -20,9 +20,9 @@ const install = (Vue, vm) => { // }, // }); Vue.prototype.$u.http.setConfig({ - baseUrl: 'http://61.174.243.28:15861', + // baseUrl: 'http://61.174.243.28:15861', // baseUrl: 'http://192.168.2.6:8080', - // baseUrl: 'https://dianche.chuantewulian.cn/prod-api', + baseUrl: 'https://dianche.chuantewulian.cn/prod-api', loadingText: '努力加载中~', loadingTime: 800, // 设置自定义头部content-type diff --git a/page_user/yj.vue b/page_user/yj.vue index bdda2af..676660a 100644 --- a/page_user/yj.vue +++ b/page_user/yj.vue @@ -39,7 +39,7 @@ 充值 - + 提现 @@ -54,25 +54,46 @@ - - - - 押金提现 + + + + + 押金充值 + + + {{item.payTime}} + - - 2024-04-02 10:14:41 + + + +{{item.totalFee}} + + + 充值成功 + - - - -99 + + + + 押金提现 + + + {{item.etRefund.createTime}} + - - 提现成功 + + + -{{item.etRefund.amount}} + + + 提现成功 + + @@ -90,7 +111,7 @@ 取消 - + 继续提现 @@ -105,7 +126,7 @@ bgc: { backgroundColor: "#7bb2ec", }, - show: true, + show: false, bindDeviceNum: null, userinfo: {}, orderList:[], @@ -156,6 +177,22 @@ }, }, methods: { + tixian(){ + this.$u.post("/appVerify/order/withdraw").then((res) => { + + if (res.code == 200) { + this.getinfo() + this.getlist() + this.show=false + } else { + uni.showToast({ + title:res.msg, + icon: 'none', + duration: 2000 + }); + } + }); + }, getlist() { this.$u.get("/appVerify/order/list?type=2&userId="+this.userId).then((res) => { @@ -163,7 +200,11 @@ this.orderList=res.rows this.total=res.total } else { - + uni.showToast({ + title:res.msg, + icon: 'none', + duration: 2000 + }); } }); }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 98a3075..55b425f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -458,7 +458,7 @@ }, fail: function(error) { - + that.getmarks() // 在这里处理获取位置信息失败的情况 } @@ -553,6 +553,58 @@ const timePassed = currentTime - createTimeTimestamp; const secondsPassed = Math.floor(timePassed / 1000); + // 转换为时分秒格式 + const hours = Math.floor(secondsPassed / 3600); + const minutes = Math.floor((secondsPassed % 3600) / 60); + const seconds = secondsPassed % 60; + const timeString = `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`; + const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10)+1 ; // 加1是因为不满十分钟也算一个十分钟 + + this.timeString=timeString + // console.log("已经过去了：" + timeString); + + this.showdevice = true + this.deviceIndex=3 + }else if(this.orderinfo.status==2&&this.orderinfo.ruleId==null){ + // this.topay() + this.showdevice = true + this.deviceIndex=2 + const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime(); + + // 定义定时器 + this.timer = setInterval(() => { + const currentTime = Date.now(); + const timePassed = currentTime - createTimeTimestamp; + const secondsPassed = Math.floor(timePassed / 1000); + + // 转换为时分秒格式 + const hours = Math.floor(secondsPassed / 3600); + const minutes = Math.floor((secondsPassed % 3600) / 60); + const seconds = secondsPassed % 60; + const timeString = `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`; + const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10)+1 ; // 加1是因为不满十分钟也算一个十分钟 + let money =0 + // 增加费用逻辑，假设每次增加10元 + this.money = this.appointmentServiceFee* tenMinuteIntervals; + // console.log("已经过去了：" + timeString); + // console.log("增加了" +money+ "元费用"); + // 每隔十分钟增加费用 + if (minutes % 10 === 0 && seconds === 0) { + + } + this.timeString=timeString + // console.log("已经过去了：" + timeString); + }, 1000); + }else if(this.orderinfo.status==3&&this.orderinfo.ruleId==null){ + // this.topay() + const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime(); + + // 定义定时器 + + const currentTime = Date.now(); + const timePassed = currentTime - createTimeTimestamp; + const secondsPassed = Math.floor(timePassed / 1000); + // 转换为时分秒格式 const hours = Math.floor(secondsPassed / 3600); const minutes = Math.floor((secondsPassed % 3600) / 60); diff --git a/pages/my.vue b/pages/my.vue index 9e6e954..b8f0007 100644 --- a/pages/my.vue +++ b/pages/my.vue @@ -78,6 +78,30 @@ + + + + + + + 维护入口 + + + + + + + + + + + + 管理入口 + + + + + @@ -107,7 +131,7 @@ - + @@ -119,6 +143,7 @@ + @@ -169,16 +194,16 @@ uni.navigateTo({ url:'/page_user/jfgz' }) + }else if(num==8){ + uni.navigateTo({ + url:'/page_fix/fix_index' + }) + }else if(num=9){ + uni.navigateTo({ + url:'/pages_admin/admin_index' + }) } - // else if(num==6){ - // uni.navigateTo({ - // url:'/pages/my' - // }) - // }else if(num==7){ - // uni.navigateTo({ - // url:'/page_user/gzsb?mac='+this.mac - // }) - // } + }, getuserInfo(){ this.$u.get("/getAppInfo").then((res) => { diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue index bd4a5e0..cab7448 100644 --- a/pages_admin/admin_worke.vue +++ b/pages_admin/admin_worke.vue @@ -33,12 +33,12 @@ 用户管理 - + @@ -86,6 +86,10 @@ uni.navigateTo({ url:'/pages_admin/worke/worke_user' }) + }else if(num==4){ + uni.navigateTo({ + url:'/pages/index/index' + }) } } } diff --git a/pages_admin/order/order_detail.vue b/pages_admin/order/order_detail.vue index 0c315c8..0a01767 100644 --- a/pages_admin/order/order_detail.vue +++ b/pages_admin/order/order_detail.vue @@ -3,7 +3,7 @@ + :show-location='true' :markers="markers" :polygons="polygons" :polyline="polyline"> 基本信息 @@ -61,13 +61,31 @@ - - - 开锁时间：{{orderInfo.unlock_time}} - - - 开锁地点：{{orderInfo.unlock_time}} + + + 开锁时间：{{item.createTime}} + + + 开锁地点： {{item.address}} + + + 临时锁车时间：{{item.createTime}} + + + 临时锁车地点：{{item.address}} + + + 解除时间：{{item.createTime}} + + + + 关锁时间：{{item.createTime}} + + + 关锁地点：{{item.address}} + + - - 关锁时间：{{}} - - - 关锁地点：120.56189，27.12379 - + @@ -175,7 +188,15 @@ isMap: false, zoomSize: 15, markers: [], - polyline: [], + polyline: [{ + points: [], + width:8, + arrowLine:true, + color:'#00AF99' + // strokeWidth: 2, + // strokeColor: '#00AF99', + // fillColor: '#00AF99' + }, ], polygons: [], cardId: '001区域', @@ -214,6 +235,23 @@ return polyline; }, + convertBoundaryToPolyliness(boundary) { + if (!boundary) return null; + + const points = JSON.parse(boundary).map(coord => ({ + latitude: coord[1], + longitude: coord[0] + })); + + const polyline = { + points: points, + width:8, + arrowLine:true, + color:'#00AF99' + }; + + return polyline; + }, convertBoundaryToPolylines(boundaries) { return boundaries.map(boundary => { if (!boundary) return null; @@ -233,7 +271,7 @@ longitude: coord[0] })); return { - points: points, + points: points, fillColor: "#55888840", //填充颜色 strokeColor: "#558888", //描边颜色 strokeWidth: 2, //描边宽度 @@ -249,9 +287,10 @@ const validBoundaries = res.rows.map(row => row.boundaryStr).filter(boundary => typeof boundary === 'string' && boundary.trim() !== ''); const polylines = this.convertBoundaryToPolylines(validBoundaries); - + // 将处理后的数据添加到 this.polyline 中 - this.polyline = this.polyline.concat(polylines); + this.polygons = this.polygons.concat(polylines); + // console.log(this.polyline); res.rows.forEach(item => { this.markers.push({ @@ -287,7 +326,7 @@ .filter(area => area.boundaryStr) // 过滤掉boundary为空的数据 .map(area => this.convertBoundaryToPolyline(area.boundaryStr)); // 更新折线数据 - this.polyline = polylines; + this.polygons = polylines; // console.log(this.polyline); } }).catch(error => { @@ -318,7 +357,14 @@ this.loading=true this.latitude= parseFloat(this.orderInfo.device.latitude) this.longitude= parseFloat(this.orderInfo.device.longitude ) + this.polyline[0].points = JSON.parse(res.data.tripRouteStr).map(coord => ({ + latitude: coord[1], + longitude: coord[0] + })); } + + // console.log(points,''); + // this.polyline[0].points=points }).catch(error => { console.error("Error fetching area data:", error); }); @@ -329,6 +375,7 @@