From 81559044f447bec38198b0619ecb35d775faa42b Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Thu, 19 Jun 2025 17:42:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E9=B9=BF=E9=AA=91=E8=A1=8C=20?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E5=B1=95=E7=A4=BA=E5=B0=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E5=BE=AE?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- page_fenbao/storedlist/trueorder.vue | 2 +- page_shanghu/guanli/device_detail.vue | 62 +++++----- page_shanghu/guanli/order_detail.vue | 162 ++++++++++++++++---------- page_user/yongche/orderxq.vue | 21 +--- pages/index/index.vue | 48 +------- pages/myorder/returned/index.vue | 40 ++----- pages/nearbystores/index.vue | 7 +- 7 files changed, 154 insertions(+), 188 deletions(-) diff --git a/page_fenbao/storedlist/trueorder.vue b/page_fenbao/storedlist/trueorder.vue index 7e9f6c0..7b4751e 100644 --- a/page_fenbao/storedlist/trueorder.vue +++ b/page_fenbao/storedlist/trueorder.vue @@ -461,7 +461,7 @@ bqlist: ['含电池', '含头盔', '含充电器', '含瓶装水', '含竹篮'], fanganindex: 0, zutime: 1, - checked: false, + checked: true, mxflag: true, modelId: '', taocanlist: [], diff --git a/page_shanghu/guanli/device_detail.vue b/page_shanghu/guanli/device_detail.vue index aa2e76a..d91ccb2 100644 --- a/page_shanghu/guanli/device_detail.vue +++ b/page_shanghu/guanli/device_detail.vue @@ -1627,33 +1627,41 @@ import { showLoading } from "../../components/blufi/util" } this.$u.get(`/bst/areaSub/listByAreaId`, data).then((res) => { if (res.code === 200) { - // 处理接口返回的数据 - const type1Data = [] - const type2Data = [] - const type3Data = [] - res.data.forEach(row => { - if (row.type == 1) { - type1Data.push(row) - } else if (row.type == 2) { - type2Data.push(row) - } else if (row.type == 3) { - type3Data.push(row) - } - }) - const validBoundaries = type1Data.map(row => row.boundaryStr).filter(boundary => - typeof boundary === 'string' && boundary.trim() !== '') - const polylines = this.convertBoundaryToPolylines(validBoundaries, 1) - const validBoundaries1 = type2Data.map(row => row.boundaryStr).filter(boundary => - typeof boundary === 'string' && boundary.trim() !== '') - const polylines1 = this.convertBoundaryToPolylines(validBoundaries1, 2) - const validBoundaries2 = type3Data.map(row => row.boundaryStr).filter(boundary => - typeof boundary === 'string' && boundary.trim() !== '') - const polylines2 = this.convertBoundaryToPolylines(validBoundaries2, 3) - // 将处理后的数据添加到 this.polyline 中 - this.polyline = this.polyline.concat(polylines2) - this.polyline = this.polyline.concat(polylines1) - this.polyline = this.polyline.concat(polylines) - this.parkingList = res.data + // 先过滤掉status为1的数据 + const filteredData = res.data.filter(item => item.status != 1); + console.log(filteredData,'000000'); + // 处理接口返回的数据 + const type1Data = [] + const type2Data = [] + const type3Data = [] + filteredData.forEach(row => { // 这里使用filteredData而不是res.data + if (row.type == 1) { + type1Data.push(row) + } else if (row.type == 2) { + type2Data.push(row) + } else if (row.type == 3) { + type3Data.push(row) + } + }) + const validBoundaries = type1Data.map(row => row.boundaryStr).filter(boundary => + typeof boundary === 'string' && boundary.trim() !== '') + const polylines = this.convertBoundaryToPolylines(validBoundaries, 1) + + const validBoundaries1 = type2Data.map(row => row.boundaryStr).filter(boundary => + typeof boundary === 'string' && boundary.trim() !== '') + const polylines1 = this.convertBoundaryToPolylines(validBoundaries1, 2) + + const validBoundaries2 = type3Data.map(row => row.boundaryStr).filter(boundary => + typeof boundary === 'string' && boundary.trim() !== '') + const polylines2 = this.convertBoundaryToPolylines(validBoundaries2, 3) + + // 将处理后的数据添加到 this.polyline 中 + this.polyline = this.polyline.concat(polylines2) + this.polyline = this.polyline.concat(polylines1) + this.polyline = this.polyline.concat(polylines) + + // 这里也使用过滤后的数据 + this.parkingList = filteredData } }).catch(error => { console.error("Error fetching parking data:", error) diff --git a/page_shanghu/guanli/order_detail.vue b/page_shanghu/guanli/order_detail.vue index 96176cb..a1e2b43 100644 --- a/page_shanghu/guanli/order_detail.vue +++ b/page_shanghu/guanli/order_detail.vue @@ -16,49 +16,93 @@ - - 订单信息 - 订单进行中 - 订单已完成 - 订单已取消 - - - 订单编号：{{orderxqobj.no}} - - - - 套餐名称：{{orderxqobj.suitName}} - -- + + + 订单编号：{{orderxqobj.no}} + 订单进行中 + 订单已完成 + 订单已取消 + + + 开始骑行时间{{orderxqobj.startTime == null ? '--' : orderxqobj.startTime}} + + + + 骑行用户{{orderxqobj.userName}}({{orderxqobj.userPhone}}) + + + + + 套餐名称{{orderxqobj.suitName}} + + + + + 实收金额￥{{orderxqobj.actualReceivedAmount == undefined ? '0.00' : orderxqobj.actualReceivedAmount}} + + + + + 骑行时长{{formattedDuration}} {{kmDistance}}km + + + + + 支付方式押金抵扣用户支付 + - - - 计费方式：起步价计费 - 区间计费 + + + + + + 费用明细 + + + + 骑行费￥{{orderxqobj.ridingFee}} + + + + 调度费￥{{orderxqobj.dispatchFee}} + + + 管理费￥{{orderxqobj.manageFee}} + + + 车损费￥{{orderxqobj.deductionFee}} + + + + + 结算金额：￥{{orderxqobj.totalFee}} + + + + + + 优惠：￥{{orderxqobj.totalDiscountAmount}} + + + + + + 退款：￥{{orderxqobj.adminRefundAmount}} + + + + + + 实付：￥{{orderxqobj.actualReceivedAmount}} + - - - 预存费用：{{orderxqobj.depositFee == undefined ? '￥0.00' : '￥' + orderxqobj.depositFee}} - - - 免费时长：{{orderxqobj.suitFreeRideTime}}分钟 - - - - - 租赁用户：{{orderxqobj.userName}} - -- - - - 手机号码：{{orderxqobj.userPhone}} - -- - - - + + + + @@ -163,7 +204,7 @@ 结束时间：{{orderxqobj.ridePayTime}} -- - + --> @@ -534,7 +575,7 @@ 改价原因 - + @@ -1205,8 +1246,7 @@ if (res.code == 200) { this.orderxqobj = res.data this.updateTrackData() - this.suitSeconds = res.data.suitSeconds == null ? '--' : Math.ceil(res.data.suitSeconds / - 3600) + this.suitSeconds = res.data.suitSeconds == null ? '--' : Math.ceil(res.data.suitSeconds / 3600) this.orderDeviceList = res.data.orderDeviceList console.log(this.orderDeviceList, '12212121211124121') } @@ -1245,7 +1285,6 @@ }) } }, - toTrack() { let endTime = this.orderxqobj.endTime || this.formatCurrentTime() console.log(endTime, '020202002'); @@ -2333,10 +2372,11 @@ }; this.$u.get('/bst/areaSub/listByAreaId', data).then((res) => { if (res.code === 200) { + const filteredData = res.data.filter(item => item.status != 1); const type1Data = []; const type2Data = []; const type3Data = []; - res.data.forEach(row => { + filteredData.forEach(row => { if (row.type == 1) type1Data.push(row); else if (row.type == 2) type2Data.push(row); else if (row.type == 3) type3Data.push(row); @@ -2366,7 +2406,7 @@ this.polygon = this.polygon.concat(polygons2); } - this.parkingList = res.data; + this.parkingList = filteredData; this.$forceUpdate(); } }).catch(error => { @@ -2523,7 +2563,7 @@ max-height: 1092rpx; background: #fff; border-radius: 20rpx 20rpx 20rpx 20rpx; - z-index: 2; + z-index: 99; padding: 0 30rpx; box-sizing: border-box; @@ -2683,16 +2723,16 @@ } .dingdanul { - font-size: 28rpx; + font-size: 32rpx; color: #808080; padding: 0 28rpx; box-sizing: border-box; - margin-top: 26rpx; + margin-top: 40rpx; display: flex; justify-content: space-between; view { - width: 50%; + width: 100%; } span { @@ -2705,7 +2745,7 @@ font-size: 32rpx; color: #3D3D3D; width: 100%; - border-bottom: 1rpx solid #F3F3F3; + border-bottom: 1rpx dashed #F3F3F3; padding-top: 22rpx; padding-left: 28rpx; padding-bottom: 22rpx; @@ -2718,9 +2758,9 @@ max-height: 2858rpx; background: #FFFFFF; border-radius: 0rpx 0rpx 0rpx 0rpx; - padding-bottom: 20rpx; - box-sizing: border-box; - + // padding-bottom: 20rpx; + // box-sizing: border-box; + .yingshouprice { border-top: 1px solid #F3F3F3; margin-top: 26rpx; @@ -2736,7 +2776,7 @@ } .dingdanul { - font-size: 28rpx; + font-size: 32rpx; color: #808080; padding: 0 28rpx; box-sizing: border-box; @@ -2745,7 +2785,7 @@ justify-content: space-between; view { - width: 50%; + width: 100%; } span { @@ -2754,7 +2794,7 @@ } .dingdanbh { - font-size: 28rpx; + font-size: 32rpx; color: #808080; padding: 0 28rpx; box-sizing: border-box; @@ -2770,7 +2810,7 @@ font-size: 32rpx; color: #3D3D3D; width: 100%; - border-bottom: 1rpx solid #F3F3F3; + border-bottom: 1rpx dashed #F3F3F3; padding-top: 22rpx; padding-left: 28rpx; padding-bottom: 22rpx; diff --git a/page_user/yongche/orderxq.vue b/page_user/yongche/orderxq.vue index 7c27636..a1d9ba3 100644 --- a/page_user/yongche/orderxq.vue +++ b/page_user/yongche/orderxq.vue @@ -113,22 +113,6 @@ {{info.payRefunded == null ? '0.00' : info.payRefunded.toFixed(2)}}元 - - @@ -357,10 +341,11 @@ }; this.$u.get('/bst/areaSub/listByAreaId', data).then((res) => { if (res.code === 200) { + const filteredData = res.data.filter(item => item.status != 1); const type1Data = []; const type2Data = []; const type3Data = []; - res.data.forEach(row => { + filteredData.forEach(row => { if (row.type == 1) type1Data.push(row); else if (row.type == 2) type2Data.push(row); else if (row.type == 3) type3Data.push(row); @@ -390,7 +375,7 @@ this.polygon = this.polygon.concat(polygons2); } - this.parkingList = res.data + this.parkingList = filteredData this.$forceUpdate() this.toggleIconAndCallout() } diff --git a/pages/index/index.vue b/pages/index/index.vue index fff38b2..f9d8d33 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -22,7 +22,6 @@ {{gonggaoxq.noticeTitle}} - 我知道了 @@ -33,12 +32,6 @@ - @@ -47,11 +40,8 @@ - - - @@ -148,17 +138,12 @@ - - 客服电话高峰期可能遇忙，请耐心等待 - @@ -204,7 +189,6 @@ - @@ -212,11 +196,9 @@ {{fajinobj.manageFee > 0 ? '不在运营区' : fajinobj.dispatchFee > 0 ? '不在停车点' : ''}} - 需支付{{fajinobj.manageFee > 0 ? fajinobj.manageFee : fajinobj.dispatchFee > 0 ? fajinobj.dispatchFee : ''}}元，你可查看最近停车点 + 需支付{{fajinobj.manageFee > 0 ? fajinobj.manageFee : fajinobj.dispatchFee > 0 ? fajinobj.dispatchFee : ''}}元，你可查看最近停车点 - - + 缴纳罚金还车 @@ -227,7 +209,6 @@ - @@ -254,7 +235,6 @@ tiaozhuanlist:[], jinweidu:'', kefuarr:[], - fjflag: false, orderflag: false, iconobj:this.$store.state.iconobj, @@ -549,7 +529,6 @@ url: '/pages/myorder/returned/tingche?areaId=' + this.orderobj.orderAreaId }) }, - // 获取本人正在使用的订单设备 getorderdevice() { this.$u.get("/app/orderDevice/mineUsing").then((res) => { @@ -564,7 +543,6 @@ } }) }, - // 点击跳转轮播图跳转 btnshangjia(e){ console.log(e,'1212121',this.tiaozhuanlist[e].urlType); @@ -626,7 +604,6 @@ } }) }, - // 获取个人用户信息 getinfo(){ this.$u.get("/getInfo").then(res => { @@ -694,7 +671,6 @@ } }) }, - // 点击拨打平台客服电话 btnptkf(tel){ uni.makePhoneCall({ @@ -828,12 +804,10 @@ z-index: 99; padding: 28rpx 36rpx; box-sizing: border-box; - .btnan { display: flex; justify-content: space-between; margin-top: 40rpx; - .fj { width: 252rpx; height: 72rpx; @@ -845,7 +819,6 @@ text-align: center; line-height: 72rpx; } - .qx { width: 252rpx; height: 72rpx; @@ -859,30 +832,25 @@ color: #FFFFFF; } } - .tcimg { width: 552rpx; height: 300rpx; margin-top: 28rpx; } - .shuom { font-size: 26rpx; color: #3D3D3D; margin-top: 18rpx; - text { color: #4C97E7; } } - .topname { font-weight: 600; font-size: 36rpx; color: #3D3D3D; display: flex; align-items: center; - image { width: 48rpx; height: 48rpx; @@ -907,7 +875,6 @@ left: 50%; transform: translateX(-50%); bottom: 220rpx; - .orderzt { display: flex; justify-content: space-between; @@ -916,7 +883,6 @@ box-sizing: border-box; width: 100%; } - .txtss { margin-top: 18rpx; padding-left: 20rpx; @@ -925,7 +891,6 @@ font-size: 28rpx; color: #808080; } - .dh { width: 160rpx; height: 60rpx; @@ -936,11 +901,9 @@ padding-top: 10rpx; box-sizing: border-box; } - .suocheanniu { display: flex; align-items: center; - .lssc { width: 160rpx; height: 60rpx; @@ -956,7 +919,6 @@ justify-content: center; } } - .cont_li { width: 100%; display: flex; @@ -965,34 +927,29 @@ justify-content: space-between; padding: 0 20rpx; box-sizing: border-box; - .left { display: flex; flex-wrap: wrap; font-weight: 600; font-size: 36rpx; color: #3D3D3D; - .km { font-weight: 400; font-size: 28rpx; color: #3D3D3D; } - .speed { margin-top: 18rpx; width: 226rpx; height: 22rpx; background: #ccc; border-radius: 16rpx 16rpx 16rpx 16rpx; - .speeds { height: 100%; background: #4297F3; border-radius: 16rpx 16rpx 16rpx 16rpx; } } - .NO { width: 100%; font-weight: 400; @@ -1001,7 +958,6 @@ margin-top: 18rpx; } } - .right { width: 70%; padding-right: 20rpx; diff --git a/pages/myorder/returned/index.vue b/pages/myorder/returned/index.vue index aa8bd25..6658185 100644 --- a/pages/myorder/returned/index.vue +++ b/pages/myorder/returned/index.vue @@ -793,17 +793,7 @@ showCancel: true, success: function(res) { if (res.confirm) { - // if(that.ver_dataflag != 3){ - // if(that.ljflag == true){ - // uni.showLoading({ - // title: '连接中...', - // mask: true - // }) - // that.ljflag = false - // that.findDevice() - // that.getchaoshi() - // } - // } + } else if (res.cancel) { } @@ -938,17 +928,7 @@ showCancel: true, success: function(res) { if (res.confirm) { - // if(that.ver_dataflag != 3){ - // if(that.ljflag == true){ - // uni.showLoading({ - // title: '连接中...', - // mask: true - // }) - // that.ljflag = false - // that.findDevice() - // that.getchaoshi() - // } - // } + } else if (res.cancel) { } @@ -1038,15 +1018,7 @@ success: function(res) { if (res.confirm) { if(that.ver_dataflag != 3){ - // if(that.ljflag == true){ - // uni.showLoading({ - // title: '连接中...', - // mask: true - // }) - // that.ljflag = false - // that.findDevice() - // that.getchaoshi() - // } + } } else if (res.cancel) { @@ -1635,7 +1607,11 @@ .anniuhc { display: flex; justify-content: space-between; - + position: fixed; + left: 0; + bottom: 210rpx; + width: 100%; + z-index: 99; .huanche { width: 48%; height: 86rpx; diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue index e7edf93..320f287 100644 --- a/pages/nearbystores/index.vue +++ b/pages/nearbystores/index.vue @@ -1227,13 +1227,14 @@ this.$u.get(`/app/areaSub/listByArea?areaId=${this.yyid}`).then((res) => { if (res.code === 200 && Array.isArray(res.data)) { // 缓存数据 - this.cachedParkingData[this.yyid] = res.data + const filteredData = res.data.filter(item => item.status != 1); + this.cachedParkingData[this.yyid] = filteredData const type1Data = [] const type2Data = [] const type3Data = [] - res.data.forEach(row => { + filteredData.forEach(row => { if(row.type == 1) type1Data.push(row) else if(row.type == 2) type2Data.push(row) else if(row.type == 3) type3Data.push(row) @@ -1274,7 +1275,7 @@ // 更新显示 this.polyline = allPolylines - this.parkingList = res.data + this.parkingList = filteredData this.isFirstLoad = false } })