From 8cef1a3f14a441d13be42da0ca28cdf436c92c37 Mon Sep 17 00:00:00 2001 From: Sliverber <2622874537@qq.com> Date: Mon, 15 Jul 2024 18:01:10 +0800 Subject: [PATCH] 11 --- page_user/vadio_back.vue | 11 +- pages.json | 9 + pages/index/index.vue | 183 ++++++----- pages/my.vue | 2 +- pages_admin/admin_index.vue | 34 ++- pages_admin/admin_order.vue | 81 +++-- pages_admin/admin_worke.vue | 10 + pages_admin/order/device_detail.vue | 19 ++ pages_admin/order/order_detail.vue | 34 ++- pages_admin/worke/AccountDetails.vue | 442 +++++++++++++++++++++++++++ 10 files changed, 709 insertions(+), 116 deletions(-) create mode 100644 pages_admin/worke/AccountDetails.vue diff --git a/page_user/vadio_back.vue b/page_user/vadio_back.vue index b0edac6..3b1aa6f 100644 --- a/page_user/vadio_back.vue +++ b/page_user/vadio_back.vue @@ -13,13 +13,13 @@ - 保持车辆录像的完整清晰 + 保持车辆录像的完整清晰,不要随意拍摄，确保视频中车辆出境，并且出现车牌号 - + 提交 @@ -78,7 +78,7 @@ // uni.hideLoading() if (res.code === 200) { // this.freList=res.rows - this.orderinfo=res.data + this.orderinfo=res.data[0] } else { uni.showToast({ title: res.msg, @@ -218,13 +218,16 @@ justify-content: center; width: 680rpx; height: 90rpx; - background: #64B6A7; + background: rgba(100,182,167,0.5); border-radius: 54rpx 54rpx 54rpx 54rpx; font-weight: 500; font-size: 40rpx; color: #FFFFFF; } + .act1{ + background: #64B6A7; + } } } \ No newline at end of file diff --git a/pages.json b/pages.json index 76bb6e5..9bce2d7 100644 --- a/pages.json +++ b/pages.json @@ -148,6 +148,15 @@ "navigationStyle": "custom", "enablePullDownRefresh" : false } + }, + { + "path" : "worke/AccountDetails", + "style" : + { + "navigationBarTitleText" : "", + "navigationStyle": "custom", + "enablePullDownRefresh" : false + } } // { // "path" : "worke/bind_sn", diff --git a/pages/index/index.vue b/pages/index/index.vue index a3501c2..d8b1cea 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,15 +33,15 @@ - - - - 您有正在骑行中的订单..... - - - - - + + + + 您有正在骑行中的订单..... + + + + + @@ -158,7 +158,7 @@ - + - + 返回 - + 去拍照 @@ -980,7 +980,7 @@ toploadtxt: "开锁中0%", loadimg: 'https://lxnapi.ccttiot.com/bike/img/static/uRxPPoVoqmnmng6wKlij', tiptxt: '请定点停放，规范用车', - maskepage:0 , + maskepage: 0, backgps: {}, buletxt: '', @@ -1011,8 +1011,8 @@ duration: 0, showordertxt: true, orderwidth: 688, - - isCollapsed: false + + isCollapsed: false } }, watch: { @@ -1265,17 +1265,17 @@ }, }, methods: { - tovadio(){ + tovadio() { // this.seeDetail=true - this.maskepage=0 - this.maskloading=false + this.maskepage = 0 + this.maskloading = false uni.navigateTo({ - url:'/page_user/vadio_back' + url: '/page_user/vadio_back' }) }, - toggleOrderTips() { - this.isCollapsed = !this.isCollapsed; - }, + toggleOrderTips() { + this.isCollapsed = !this.isCollapsed; + }, toggleTips() { if (this.showordertxt) { // 当内容显示时，缩小动画 @@ -1912,10 +1912,10 @@ }, 2100); } else if (num == 4) { - if(this.areaInfo.returnVerify==0&&this.orderinfo.videoUrl!=''){ + if (this.areaInfo.returnVerify == 1 && !this.orderinfo.videoUrl) { this.maskloading = true - this.maskepage=8 - }else{ + this.maskepage = 8 + } else { //还车校验 this.maskloading = true; let percentage = 0; @@ -1931,9 +1931,9 @@ setTimeout(() => { this.cheackgps(); }, 2100); - + } - + } }, @@ -4619,7 +4619,8 @@ url: '/page_user/gzsb' }) } else if (num == 6) { - console.log('点击了'); + // console.log('点击了'); + this.sn = '' uni.navigateTo({ url: '/pages/my' }) @@ -4684,6 +4685,12 @@ icon: 'none', duration: 4000 }); + } else if (this.deviceInfos.status == 6) { + uni.showToast({ + title: '车辆调度中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); } else if (this.deviceInfos.status == 8) { uni.showToast({ title: '车辆下线中,请使用其他车辆', @@ -4792,6 +4799,13 @@ icon: 'none', duration: 4000 }); + } else if (this.deviceInfos.status == + 6) { + uni.showToast({ + title: '车辆调度中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); } else if (this.deviceInfos .status == 8) { @@ -5197,60 +5211,63 @@ // } // } .order_tips { - display: flex; - flex-wrap: nowrap; - align-items: center; - // margin-top: 20rpx; - margin-left: 34rpx; - padding: 28rpx 41rpx; - width: 688rpx; - height: 110rpx; - background: #3D3D3D; - box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3); - border-radius: 53rpx; - transition: width 0.5s, padding 0.5s; - - &.collapsed { - width: 192rpx; - padding: 28rpx 20rpx; - } - - image { - margin-right: 34rpx; - width: 44rpx; - height: 51rpx; - transition: margin-right 0.5s; - - .order_tips.collapsed & { - margin-right: 10rpx; - } - } - - .order_tips_txt { - font-weight: 400; - font-size: 36rpx; - color: #FFFFFF; - transition: opacity 0.5s, max-width 0.5s; - overflow: hidden; - white-space: nowrap; - - &.collapsed { - opacity: 0; - max-width: 0; - } - } - - .icon-xiangyou1 { - margin-left: auto; - font-size: 36rpx; - color: #FFFFFF; - } - .icon-xiangzuo{ - margin-left: auto; - font-size: 38rpx; - color: #FFFFFF; - } + display: flex; + flex-wrap: nowrap; + align-items: center; + // margin-top: 20rpx; + margin-left: 34rpx; + padding: 28rpx 41rpx; + width: 688rpx; + height: 110rpx; + // background: #3D3D3D; + background: rgba(61, 61, 61, 0.8); + box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3); + border-radius: 53rpx; + transition: width 0.5s, padding 0.5s; + + &.collapsed { + width: 192rpx; + padding: 28rpx 20rpx; + } + + image { + margin-right: 34rpx; + width: 44rpx; + height: 51rpx; + transition: margin-right 0.5s; + + .order_tips.collapsed & { + margin-right: 10rpx; + } + } + + .order_tips_txt { + font-weight: 400; + font-size: 36rpx; + color: #FFFFFF; + transition: opacity 0.5s, max-width 0.5s; + overflow: hidden; + white-space: nowrap; + + &.collapsed { + opacity: 0; + max-width: 0; + } + } + + .icon-xiangyou1 { + margin-left: auto; + font-size: 36rpx; + color: #FFFFFF; + } + + .icon-xiangzuo { + margin-left: auto; + font-size: 38rpx; + color: #FFFFFF; + } } + .swiper_tips { display: flex; flex-wrap: nowrap; @@ -5259,7 +5276,7 @@ margin: 0 auto; width: 688rpx; height: 72rpx; - background: #3D3D3D; + background: rgba(61, 61, 61, 0.8); box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3); border-radius: 53rpx 53rpx 53rpx 53rpx; @@ -6424,7 +6441,7 @@ justify-content: center; width: 470rpx; height: 90rpx; - background: #1E807A ; + background: #1E807A; border-radius: 54rpx 54rpx 54rpx 54rpx; font-weight: 500; font-size: 40rpx; diff --git a/pages/my.vue b/pages/my.vue index 9a41d21..7dd319f 100644 --- a/pages/my.vue +++ b/pages/my.vue @@ -229,7 +229,7 @@ - + 运维人员 diff --git a/pages_admin/admin_index.vue b/pages_admin/admin_index.vue index 13286fb..1897915 100644 --- a/pages_admin/admin_index.vue +++ b/pages_admin/admin_index.vue @@ -115,6 +115,14 @@ {{deviceNum.allNum}} + + + 调度中 + + + {{deviceNum.dispatchNum}} + + - + + 查看详情 @@ -242,11 +254,13 @@ 退款 - - + + - - + + 查看详情 + + 查看详情 @@ -334,11 +348,13 @@ 退款 - - + + - - + + 查看详情 + + 查看详情 @@ -424,10 +440,13 @@ 退款 - - + + - + + 查看详情 + + 查看详情 @@ -455,6 +474,18 @@ 已完成 + + + 待审核 + + + + 有损坏 + + + + 待官方审核 + @@ -519,15 +550,15 @@ 退款 - - - - - - 查看详情 - + + + + + 查看详情 + + + 查看详情 + @@ -1122,7 +1153,7 @@ data = { vehicleNum: this.searchKeyword, type: '1', - statusList: '5,6', + statusList: '5,6,7', startTime: this.firsTime, endTime: this.lasTime, areaId: this.areaId diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue index 030d0e8..7471541 100644 --- a/pages_admin/admin_worke.vue +++ b/pages_admin/admin_worke.vue @@ -48,6 +48,12 @@ 车辆绑定 + + + + 账户明细 + + @@ -190,6 +196,10 @@ // }); // } // }); + }else if(num==6){ + uni.navigateTo({ + url:'/pages_admin/worke/AccountDetails' + }) } } } diff --git a/pages_admin/order/device_detail.vue b/pages_admin/order/device_detail.vue index 3a421cc..c9ee803 100644 --- a/pages_admin/order/device_detail.vue +++ b/pages_admin/order/device_detail.vue @@ -1238,6 +1238,25 @@ display: 'ALWAYS', // 修改为气泡的显示策略 } }) + }else if (this.deviceInfos.status == 6) { + this.markers.push({ + id: parseFloat(this.deviceInfos.sn), + latitude: parseFloat(this.deviceInfos.latitude), + longitude: parseFloat(this.deviceInfos.longitude), + // title: item.deviceName, + width: 40, + height: 40, + iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u1UD93BU1vfshWFoDwgX', + callout: { + content: '调度中', // 修改为你想要显示的文字内容 + color: '#2679D1', // 修改为文字颜色 + fontSize: 14, // 修改为文字大小 + borderRadius: 10, // 修改为气泡圆角大小 + bgColor: '#D4ECFF', // 修改为气泡背景颜色 + padding: 6, // 修改为气泡内边距 + display: 'ALWAYS', // 修改为气泡的显示策略 + } + }) } else if (this.deviceInfos.status == 8) { this.markers.push({ id: parseFloat(this.deviceInfos.sn), diff --git a/pages_admin/order/order_detail.vue b/pages_admin/order/order_detail.vue index 4e36810..ad20b38 100644 --- a/pages_admin/order/order_detail.vue +++ b/pages_admin/order/order_detail.vue @@ -130,10 +130,13 @@ 审核通过 + + 待官方审核 + - @@ -155,6 +158,9 @@ 有损坏 + + 押金扣款 + 电话沟通 @@ -370,7 +376,7 @@ show: false, _mapContext: null, showpark: true, - showck:true, + showck:false, money:'', areaNum:1 @@ -426,6 +432,30 @@ }, methods: { ckmoney(){ + if(this.money!=''){ + let data ={ + orderNo:this.orderId, + status: "7" , + deductionAmount:this.money, + audioFiles:'' + } + this.$u.put("/appVerify/order/submitAudit" ,data ).then((res) => { + if (res.code === 200) { + // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构 + this.getOrderDetail() + this.showck=false + } + }).catch(error => { + this.showck=false + console.error("Error fetching area data:", error); + }); + }else{ + uni.showToast({ + title: '扣款金额不能为空', + icon: 'none', + duration: 2000 + }); + } }, unpass(){ diff --git a/pages_admin/worke/AccountDetails.vue b/pages_admin/worke/AccountDetails.vue new file mode 100644 index 0000000..8511ef7 --- /dev/null +++ b/pages_admin/worke/AccountDetails.vue @@ -0,0 +1,442 @@ + + + + \ No newline at end of file