From 0eaacca95ac905a02ab899cfc1d8e888698e3295 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Wed, 23 Apr 2025 17:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E9=B9=BF=E9=AA=91=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- page_fenbao/storedlist/trueorder.vue | 38 +--- page_shanghu/gongzuotai/ChargingDetail.vue | 11 +- page_shanghu/gongzuotai/sysSet.vue | 22 ++ page_shanghu/guanli/device_detail.vue | 246 ++++++++++++++------- page_shanghu/guanli/yunying.vue | 11 +- page_user/hcshenhe.vue | 3 +- page_user/huanbike.vue | 3 +- page_user/yongche/orderxq.vue | 71 ++++-- pages/my.vue | 13 +- pages/myorder/index.vue | 27 ++- pages/myorder/returned/index.vue | 12 +- pages/nearbystores/index.vue | 31 ++- 12 files changed, 326 insertions(+), 162 deletions(-) diff --git a/page_fenbao/storedlist/trueorder.vue b/page_fenbao/storedlist/trueorder.vue index a5abc1e..c1691a1 100644 --- a/page_fenbao/storedlist/trueorder.vue +++ b/page_fenbao/storedlist/trueorder.vue @@ -115,11 +115,11 @@ 起步价格：{{'￥' + item.startRule.startingPrice}}（含{{item.startRule.startingTime}} 小时分钟 ） + v-if="item.rentalUnit == 'hours'">小时分钟天 ） 超出价格：{{'￥' + item.startRule.timeoutPrice}}（每{{item.startRule.timeoutTime}} 小时分钟） + v-if="item.rentalUnit == 'hours'">小时分钟天） @@ -693,42 +693,12 @@ this.bikeobj = res.data console.log(res.data,'020202'); this.$u.put(`/app/user/bindArea?areaId=${res.data.areaId}`).then(resp =>{}) - // if (res.data.onlineStatus == 0) { - // wx.openBluetoothAdapter({ - // success: function(res) { - // console.log('蓝牙适配器初始化成功') - // xBlufi.initXBlufi(1) - // xBlufi.notifyStartDiscoverBle({ - // 'isStart': true - // }) - // xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent) - // }, - // fail: function(err) { - // console.error('蓝牙适配器初始化失败，可能是因为没有权限', err) - // } - // }) - // } } }) } else { this.$u.get(`/app/device/availableDetail?sn=${this.chesn}`).then((res) => { if (res.code == 200) { this.bikeobj = res.data - // if (res.data.onlineStatus == 0) { - // wx.openBluetoothAdapter({ - // success: function(res) { - // console.log('蓝牙适配器初始化成功') - // xBlufi.initXBlufi(1) - // xBlufi.notifyStartDiscoverBle({ - // 'isStart': true - // }) - // xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent) - // }, - // fail: function(err) { - // console.error('蓝牙适配器初始化失败，可能是因为没有权限', err) - // } - // }) - // } } }) } @@ -918,7 +888,7 @@ .mingxitc { position: fixed; left: 0; - bottom: 180rpx; + bottom: 150rpx; width: 750rpx; max-height: 912rpx; overflow: scroll; @@ -975,7 +945,7 @@ .zhifu { width: 750rpx; - height: 238rpx; + height: 240rpx; background: #FFFFFF; box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 0, 0, 0.3); border-radius: 0rpx 0rpx 0rpx 0rpx; diff --git a/page_shanghu/gongzuotai/ChargingDetail.vue b/page_shanghu/gongzuotai/ChargingDetail.vue index c82afc5..ea15634 100644 --- a/page_shanghu/gongzuotai/ChargingDetail.vue +++ b/page_shanghu/gongzuotai/ChargingDetail.vue @@ -172,7 +172,10 @@ name: '按小时', disabled: false }, - + { + name: '按天', + disabled: false + }, ], startingPrice: "", startingTime: '', @@ -264,8 +267,10 @@ radioGroupChange(e) { if (e == '按分钟') { this.data.rentalUnit = 'minutes' - } else { + } else if(e == '按小时'){ this.data.rentalUnit = 'hours' + }else { + this.data.rentalUnit = 'day' } }, sub() { @@ -391,7 +396,7 @@ .u-radio-group { display: flex; - gap: 40rpx; + // gap: 40rpx; .u-radio { font-size: 28rpx; diff --git a/page_shanghu/gongzuotai/sysSet.vue b/page_shanghu/gongzuotai/sysSet.vue index c746ecd..531ed1c 100644 --- a/page_shanghu/gongzuotai/sysSet.vue +++ b/page_shanghu/gongzuotai/sysSet.vue @@ -62,6 +62,28 @@ 开启短信通知，短信费用0.1元/条，从余额中扣除 + + + + 寻车范围 + + + + + + + + 允许寻车范围 + + + 米 + + + + 开启后，用户需在车辆指定范围才允许响铃寻车(防止恶意响铃) + + diff --git a/page_shanghu/guanli/device_detail.vue b/page_shanghu/guanli/device_detail.vue index 9ff81f4..bbc6628 100644 --- a/page_shanghu/guanli/device_detail.vue +++ b/page_shanghu/guanli/device_detail.vue @@ -17,14 +17,9 @@ - SN：{{deviceInfos.sn}} - - - - - - + 车牌号：{{deviceInfos.vehicleNum == null ? '--' : deviceInfos.vehicleNum}} + 仓库中 @@ -44,11 +39,45 @@ + + + + 已连接 + + + 未连接 + + + + 静音 + + + 语音 + + + 彩铃 + + + + + + SN：{{deviceInfos.sn == null ? '--' : deviceInfos.sn}} + + + MAC：{{deviceInfos.mac == null ? '--' : deviceInfos.mac}} + + + 车型：{{deviceInfos.modelName == null ? '--' : deviceInfos.modelName}} + + - + + + + - 电量：{{deviceInfos.remainingPower == null ? '--' : deviceInfos.remainingPower}}% + 电量：{{deviceInfos.remainingPower == null ? '--' : deviceInfos.remainingPower.toFixed(2)}}% 电压：{{deviceInfos.voltage == null ? '--' : deviceInfos.voltage.toFixed(2)}}V @@ -58,15 +87,15 @@ 续航 {{deviceInfos.remainEndurance == null ? '--' : deviceInfos.remainEndurance}}km - + - + + 轨迹 @@ -141,11 +170,17 @@ 修改车型 + + + + + 划拨 + - {{jytxt}} + 声音 @@ -153,6 +188,12 @@ 定位更新 + + + + + 二维码 + @@ -179,41 +220,26 @@ 蓝牙响铃 - - - - MAC：{{deviceInfos.mac}} - - - 网络状态：离线在线 - - - - - 车牌号：{{deviceInfos.vehicleNum == null ? '--' : deviceInfos.vehicleNum}} - - - 续航里程：{{deviceInfos.remainEndurance == null ? '--' : deviceInfos.remainEndurance}}km - - - - - 运营区域：{{deviceInfos.areaName}} - - - 4G信号/GPS：{{deviceInfos.signalStrength == null ? '--' : deviceInfos.signalStrength}}/{{deviceInfos.satellites == null ? '--' : deviceInfos.satellites}} - - - - - 最近租车人： {{deviceInfos.lastUserPhone == null ? '--' : deviceInfos.lastUserPhone}} - - - 最后定位时间：{{deviceInfos.lastTime == null ? '--' : deviceInfos.lastTime}} + 运营区域：{{deviceInfos.areaName == null ? '--' : deviceInfos.areaName}} + + + 最后租车客户： {{deviceInfos.lastUserPhone == null ? '--' : deviceInfos.lastUserPhone}} + + + 最后定位时间： + + {{deviceInfos.satellites == null ? '--' : deviceInfos.satellites}} + + {{deviceInfos.lastLocationTime == null ? '--' : deviceInfos.lastLocationTime}} + + + 最后在线时间： + + {{deviceInfos.signalStrength == null ? '--' : deviceInfos.signalStrength}} + + {{deviceInfos.lastOnlineTime == null ? '--' : deviceInfos.lastOnlineTime}} @@ -275,7 +301,7 @@ - + @@ -289,6 +315,7 @@ return { shengyin:false, shengyinlist:[{label:'静音',value:0},{label:'语音',value:1},{label:'彩铃',value:2}], + devicesList: [], searching: false, texts: '正在扫描蓝牙设备...', @@ -350,6 +377,8 @@ deptId: null, showModelList: false, ModelList: [], + yunyingflag: false, + yunyingList: [], jytxt: '', ver_dataflag: 1, @@ -366,6 +395,7 @@ this.deptId = uni.getStorageSync('deptId'); }, onShow() { + this.getyunying() xBlufi.notifyStartDiscoverBle({ 'isStart': true }) @@ -383,6 +413,17 @@ } }, methods: { + // 请求自己所有运营区 + getyunying(){ + this.$u.get(`/bst/area/list?pageNum=1&pageSize=999`).then(res =>{ + if(res.code == 200){ + this.yunyingList = res.rows.map(item => ({ + value: item.id, + label: item.name + })) + } + }) + }, // 点击拨打最近租车人电话 btntel(){ uni.makePhoneCall({ @@ -397,9 +438,10 @@ }, // 选择彩铃 shengyinaniu(e){ - this.$u.put(`/bst/device/iot/music?sn=${this.sn}&music=${e[0].value}`).then(res => { + this.$u.put(`/bst/device/iot/music?id=${this.sn}&music=${e[0].value}`).then(res => { if (res.code == 200) { this.jytxt = e[0].label + this.deviceInfos.music = e[0].value uni.showToast({ title: '操作成功', icon: 'success', @@ -526,6 +568,32 @@ console.log('diaoyongle') this.showModelList = true }, + // 修改运营区 + yunyingconfirm(e){ + let areaId = e[0].value + let data = { + ids: [this.sn], + areaId: areaId + } + this.$u.put('/bst/device/transfer', data).then((res) => { + if (res.code == 200) { + this.showModelList = false + this.deviceInfo() + uni.showToast({ + title: '修改成功', + icon: 'none', + duration: 2000 + }) + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }) + } + }) + }, + // 修改车型 confirm(e) { let modelId = e[0].value let data = { @@ -1308,13 +1376,15 @@ } span{ font-size: 28rpx; - color: #4C97E7; + color: #3D3D3D; } } view{ font-size: 28rpx; color: #808080; margin-bottom: 26rpx; + display: flex; + justify-content: space-between; span{ color: #3D3D3D; } @@ -1355,9 +1425,9 @@ margin: auto; margin-bottom: 14rpx; image{ - width: 32rpx; - height: 32rpx; - margin-top: 28rpx; + width: 42rpx; + height: 42rpx; + margin-top: 24rpx; } } } @@ -1386,22 +1456,48 @@ .xuhang{ view{ width: 284rpx; - height: 70rpx; + height: 102rpx; background: #F1F1F1; border-radius: 8rpx 8rpx 8rpx 8rpx; display: flex; align-items: center; - font-size: 24rpx; + font-size: 30rpx; color: #3D3D3D; padding-left: 18rpx; box-sizing: border-box; image{ - width: 32rpx; - height: 32rpx; + width: 56rpx; + height: 56rpx; margin-right: 14rpx; } } } + .bikesn{ + font-size: 24rpx; + color: #7C7C7C; + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 1rpx solid #D8D8D8; + padding-bottom: 26rpx; + margin-top: 20rpx; + } + .cent{ + display: flex; + + .lypic{ + display: flex; + align-items: center; + font-size: 24rpx; + color: #3D3D3D; + margin-right: 22rpx; + image{ + width: 36rpx; + height: 36rpx; + margin-right: 8rpx; + } + } + } .bikexx{ margin-top: 26rpx; display: flex; @@ -1411,11 +1507,17 @@ box-sizing: border-box; .dianliang{ position: relative; + background: linear-gradient(to right, #c0dfff, #fff); + border-radius: 10rpx; .dl{ - margin-top: 66rpx; + margin-top: 10rpx; + padding-left: 52rpx; + box-sizing: border-box; } .dy{ margin-top: 2rpx; + padding-left: 52rpx; + box-sizing: border-box; } view{ padding-left: 14rpx; @@ -1428,38 +1530,26 @@ } image{ position: absolute; - width: 222rpx; - height: 160rpx; - z-index: -1; + width: 22rpx; + height: 48rpx; + left: 20rpx; + top: 30rpx; } } } + .topsn{ display: flex; justify-content: space-between; - border-bottom: 1rpx solid #D8D8D8; padding-bottom: 26rpx; box-sizing: border-box; + .lt{ font-weight: 600; - font-size: 32rpx; + font-size: 30rpx; color: #3D3D3D; display: flex; align-items: center; - .lypic{ - background-color: #ccc; - width: 50rpx; - height: 50rpx; - margin-left: 10rpx; - text-align: center; - padding-top: 8rpx; - border-radius: 6rpx; - box-sizing: border-box; - image{ - width: 32rpx; - height: 32rpx; - } - } } .rt{ display: flex; diff --git a/page_shanghu/guanli/yunying.vue b/page_shanghu/guanli/yunying.vue index 24beac7..99c0d8d 100644 --- a/page_shanghu/guanli/yunying.vue +++ b/page_shanghu/guanli/yunying.vue @@ -74,11 +74,11 @@ 时间范围 - + {{kstime}} -- - + {{jstime}} @@ -523,6 +523,13 @@ // 点击切换tab btntab(num){ this.index = num + }, + showTimePicker(type) { + if(type === 'start') { + this.oneshow = true + } else { + this.twoshow = true + } } } } diff --git a/page_user/hcshenhe.vue b/page_user/hcshenhe.vue index a4475b0..740d6ec 100644 --- a/page_user/hcshenhe.vue +++ b/page_user/hcshenhe.vue @@ -110,7 +110,8 @@ let data = { orderId:this.orderId, lon:this.lon, - lat:this.lat + lat:this.lat, + checkLocation:true } this.$u.post(`/app/order/calcFee`,data).then(res =>{ if(res.code == 200){ diff --git a/page_user/huanbike.vue b/page_user/huanbike.vue index dcf0903..f40a8e9 100644 --- a/page_user/huanbike.vue +++ b/page_user/huanbike.vue @@ -271,7 +271,8 @@ export default { // 计算订单费用 getfeiyong(){ let data = { - orderId:this.orderid + orderId:this.orderid, + checkLocation:true } this.$u.post(`/app/order/calcFee`,data).then(res =>{ if(res.code == 200){ diff --git a/page_user/yongche/orderxq.vue b/page_user/yongche/orderxq.vue index 83d4dd5..e148b00 100644 --- a/page_user/yongche/orderxq.vue +++ b/page_user/yongche/orderxq.vue @@ -1,7 +1,6 @@