From c14d41317b339a740c70f9af74f36efb88694601 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Wed, 23 Apr 2025 18:30:04 +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_shanghu/guanli/device_detail.vue | 107 ++++++++++++++++++--------
 page_user/yongche/orderxq.vue         |   2 +-
 2 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/page_shanghu/guanli/device_detail.vue b/page_shanghu/guanli/device_detail.vue
index bbc6628..4bbcbf8 100644
--- a/page_shanghu/guanli/device_detail.vue
+++ b/page_shanghu/guanli/device_detail.vue
@@ -17,18 +17,37 @@
 		<view class="new_infocard">
 			<view class="topsn">
 				<view class="lt">
-					车牌号：{{deviceInfos.vehicleNum == null ? '--' : deviceInfos.vehicleNum}}  
+					车牌：{{deviceInfos.vehicleNum == null ? '--' : deviceInfos.vehicleNum}}  
+				</view>
+				<view class="" style="display: flex;justify-content: space-between;">
+					<view class="cent">
+						<view class="lypic" v-if="ver_dataflag == 3 && deviceInfos.onlineStatus == 0" @click="btnly">
+							<image src="https://api.ccttiot.com/smartmeter/img/static/uLw46jus4X9fposAvVD7" mode=""></image> 
+						</view>
+						<view class="lypic" v-if="ver_dataflag == 1 && deviceInfos.onlineStatus == 0" @click="btnly">
+							<image src="https://api.ccttiot.com/smartmeter/img/static/uCdHjNaNfD9aikVg9Cuk" mode=""></image> 
+						</view>
+						
+						<view class="lypic" v-if="deviceInfos.music == 0" @click="btnsy">
+							<image src="https://api.ccttiot.com/smartmeter/img/static/uDORYeTuc2EQ1lSI2dbe" mode=""></image> 
+						</view>
+						<view class="lypic" v-if="deviceInfos.music == 1" @click="btnsy">
+							<image src="https://api.ccttiot.com/smartmeter/img/static/u8ii1aiUgREfYyMVIjpO" mode=""></image> 
+						</view>
+						<view class="lypic" v-if="deviceInfos.music == 2" @click="btnsy">
+							<image src="https://api.ccttiot.com/smartmeter/img/static/uP7BOVsjvWaGItgHtoKV" mode=""></image> 
+						</view>
+					</view>
 				</view>
-				
 				<view class="rt">
 					<view class="stutas">
-						<span style="background-color: #979797;" v-if="deviceInfos.status == 0">仓库中</span>
+						<span style="background-color: #979797;" v-if="deviceInfos.status == 0">仓库</span>
 						<span style="background-color: #4c97e7;" v-if="deviceInfos.status == 1">待租</span>
 						<span style="background-color: #28c445;" v-if="deviceInfos.status == 2">预约中</span>
 						<span style="background-color: #ffc757;" v-if="deviceInfos.status == 3">骑行中</span>
-						<span style="background-color: #ff7429;" v-if="deviceInfos.status == 4">临时锁车中</span>
+						<span style="background-color: #ff7429;" v-if="deviceInfos.status == 4">临时锁车</span>
 						<span style="background-color: #986cf0;" v-if="deviceInfos.status == 6">调度中</span>
-						<span style="background-color: #343a40;" v-if="deviceInfos.status == 8">下线</span>
+						<span style="background-color: #343a40;" v-if="deviceInfos.status == 8">禁用</span>
 						<span style="background-color: #ff7429;" v-if="deviceInfos.status == 9">强制锁车</span>
 					</view>
 					<view class="issuo" v-if="deviceInfos.lockStatus == 0">
@@ -39,26 +58,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="" style="display: flex;justify-content: space-between;">
-				<view class="cent">
-					<view class="lypic" v-if="ver_dataflag == 3 && deviceInfos.onlineStatus == 0">
-						<image src="https://api.ccttiot.com/smartmeter/img/static/uLw46jus4X9fposAvVD7" mode=""></image> 已连接
-					</view>
-					<view class="lypic" v-if="ver_dataflag == 1 && deviceInfos.onlineStatus == 0">
-						<image src="https://api.ccttiot.com/smartmeter/img/static/uCdHjNaNfD9aikVg9Cuk" mode=""></image> 未连接
-					</view>
-					
-					<view class="lypic" v-if="deviceInfos.music == 0">
-						<image src="https://api.ccttiot.com/smartmeter/img/static/uDORYeTuc2EQ1lSI2dbe" mode=""></image> 静音
-					</view>
-					<view class="lypic" v-if="deviceInfos.music == 1">
-						<image src="https://api.ccttiot.com/smartmeter/img/static/u8ii1aiUgREfYyMVIjpO" mode=""></image> 语音
-					</view>
-					<view class="lypic" v-if="deviceInfos.music == 2">
-						<image src="https://api.ccttiot.com/smartmeter/img/static/uP7BOVsjvWaGItgHtoKV" mode=""></image> 彩铃
-					</view>
-				</view>
-			</view>
+			
 			<view class="bikesn">
 				<view class="">
 					SN：{{deviceInfos.sn == null ? '--' : deviceInfos.sn}}
@@ -77,15 +77,15 @@
 					<image v-if="deviceInfos.remainingPower >= 50 && deviceInfos.remainingPower < 80 " src="https://api.ccttiot.com/smartmeter/img/static/umm5Ruc5vhNSjeacslwX" mode=""></image>
 					<image v-if="deviceInfos.remainingPower >= 80 && deviceInfos.remainingPower <= 100 " src="https://api.ccttiot.com/smartmeter/img/static/uo75cOfYZiQoxZQAI3FH" mode=""></image>
 					<view class="dl">
-						电量：<span>{{deviceInfos.remainingPower == null ? '--' : deviceInfos.remainingPower.toFixed(2)}}%</span>
+						电量：<span style="font-size: 30rpx;color: #333;font-weight: 600;">{{deviceInfos.remainingPower == null ? '--' : deviceInfos.remainingPower.toFixed(1)}}</span><span style="color: #ccc;font-size: 22rpx;">%</span>
 					</view>
 					<view class="dy">
-						电压：<span>{{deviceInfos.voltage == null ? '--' : deviceInfos.voltage.toFixed(2)}}V</span>
+						电压：<span style="font-size: 30rpx;color: #333;font-weight: 600;">{{deviceInfos.voltage == null ? '--' : deviceInfos.voltage.toFixed(1)}}</span><span style="color: #ccc;font-size: 22rpx;">V</span>
 					</view>
 				</view>
 				<view class="xuhang">
 					<view class="">
-						<image src="https://api.ccttiot.com/smartmeter/img/static/uBueutMzheLZWktEFWVR" mode=""></image> 续航  {{deviceInfos.remainEndurance == null ? '--' : deviceInfos.remainEndurance}}km
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uBueutMzheLZWktEFWVR" mode=""></image> 续航：  <span style="font-size: 30rpx;color: #333;font-weight: 600;">{{deviceInfos.remainEndurance == null ? '--' : deviceInfos.remainEndurance}}</span> km
 					</view>
 					<!-- <view class="" style="margin-top: 20rpx;">
 						<image src="https://api.ccttiot.com/smartmeter/img/static/ur7Q7YC9AOkkTpvaLEUU" mode=""></image> 车型  {{deviceInfos.modelName}}
@@ -413,6 +413,44 @@
 			}
 		},
 		methods: {
+			// 点击提示什么声音模式
+			btnsy(){
+				if(this.deviceInfos.music == 0){
+					uni.showToast({
+						title: '当前设备为静音模式',
+						icon: 'none',
+						duration: 2000
+					})
+				}else if(this.deviceInfos.music == 1){
+					uni.showToast({
+						title: '当前设备为语音模式',
+						icon: 'none',
+						duration: 2000
+					})
+				}else{
+					uni.showToast({
+						title: '当前设备为彩铃模式',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
+			// 点击提示蓝牙
+			btnly(){
+				if(this.ver_dataflag == 3){
+					uni.showToast({
+						title: '当前设备蓝牙已连接',
+						icon: 'none',
+						duration: 2000
+					})
+				}else{
+					uni.showToast({
+						title: '当前设备蓝牙未连接',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
 			// 请求自己所有运营区
 			getyunying(){
 				 this.$u.get(`/bst/area/list?pageNum=1&pageSize=999`).then(res =>{
@@ -1462,7 +1500,7 @@
 					display: flex;
 					align-items: center;
 					font-size: 30rpx;
-					color: #3D3D3D;
+					color: #847f7f;
 					padding-left: 18rpx;
 					box-sizing: border-box;
 					image{
@@ -1480,7 +1518,6 @@
 				justify-content: space-between;
 				border-bottom: 1rpx solid #D8D8D8;
 				padding-bottom: 26rpx;
-				margin-top: 20rpx;
 			}
 			.cent{
 				display: flex;
@@ -1513,11 +1550,15 @@
 						margin-top: 10rpx;
 						padding-left: 52rpx;
 						box-sizing: border-box;
+						color: #847f7f;
+						font-size: 24rpx;
 					}
 					.dy{
 						margin-top: 2rpx;
 						padding-left: 52rpx;
 						box-sizing: border-box;
+						color: #847f7f;
+						font-size: 24rpx;
 					}
 					view{
 						padding-left: 14rpx;
@@ -1525,7 +1566,7 @@
 						font-size: 24rpx;
 						color: #3D3D3D;
 						span{
-							font-size: 32rpx;
+							font-size: 28rpx;
 						}
 					}
 					image{
@@ -1541,7 +1582,7 @@
 			.topsn{
 				display: flex;
 				justify-content: space-between;
-				padding-bottom: 26rpx;
+				padding-bottom: 13rpx;
 				box-sizing: border-box;
 				
 				.lt{
@@ -1560,7 +1601,7 @@
 						border-radius: 6rpx 6rpx 6rpx 6rpx;
 						text-align: center;
 						line-height: 42rpx;
-						margin-left: 28rpx;
+						margin-left: 10rpx;
 						font-size: 24rpx;
 						color: #3D3D3D;
 					}
diff --git a/page_user/yongche/orderxq.vue b/page_user/yongche/orderxq.vue
index e148b00..2b949b5 100644
--- a/page_user/yongche/orderxq.vue
+++ b/page_user/yongche/orderxq.vue
@@ -114,7 +114,7 @@
 						实付金额
 					</view>
 					<view class="shen">
-						<span style="color: #E7612E;font-size: 40rpx;">{{info.payAmount == null ? '0.00' : info.payAmount}}</span>元
+						<span style="color: #E7612E;font-size: 40rpx;">{{info.payedAmount == null ? '0.00' : info.payedAmount}}</span>元
 					</view>
 				</view>
 			</view>