Merge branch 'gyq_test' of http://git.bms16.com/liuwei/zx_flk_app into gyq_test

common/bluetooth/ZXCar.js

@@ -33,7 +33,7 @@ function haveBms() {
 }
 
 function isDevice(device, data) {
-	// console.log(device,data,'device111');
+	console.log(device,data,'device111');
 	const advertisData = new Uint8Array(data.advertisData);
 	// console.log(advertisData,'判断返回第几个字段是正常模式还是升级模式');
 	//打印返回广播 判断返回字段是正常模式还是升级模式
@@ -47,7 +47,8 @@ function isDevice(device, data) {
 	//     return true;
 	// }
 	//判断是否是智寻的蓝牙
-	const result = data.name.startsWith("ZX");
+	// const result = data.name.startsWith("ZX");
+	const result = (data.name==device.mac_id);
 	// const result = data.name.startsWith("ZN");
 	// if (data.name === "865416038002201") {
 	// if (data.name === "ZX2503150000000") {

common/http.js

@@ -124,7 +124,8 @@ function postRequest(url, data, successCallBack, failCallBack) {
 			} else if(res.data.code === 503){
 				return
 			} else {
-				uni.showToast({ title: res.data.msg, icon: 'none' })
+				successCallBack(res);
+				// uni.showToast({ title: res.data.msg, icon: 'none' })
 				return
 			}
 			if (_checkTokenValid(res)) {
@@ -141,7 +142,6 @@ function postRequest(url, data, successCallBack, failCallBack) {
 					showCancel: false
 				});
 			}
-
 			failCallBack(res);
 		}
 	});

component/carPlan/carPlan.vue

@@ -3,7 +3,7 @@
 		<view class="more-info">
 			<view class="flex-row model-title">
 				<view style="margin-right: 24rpx;">
-					<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="image" mode="aspectFill"></image>
+					<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="image" mode="aspectFit"</image>
 					</view>
 				<view class="car-model-detail flex-row">
 					<!-- <priceTool :price="58" :font_size="40"/> -->

component/customSwitch.vue

@@ -0,0 +1,194 @@
+<template>
+	<view class="switch-container" :style="{ width: width, height: height }" @touchstart="onTouchStart"
+		@touchmove="onTouchMove" @touchend="onTouchEnd" @click="handleClick">
+		<view class="switch" :class="{ active: isValue }">
+			<!-- 额外包裹一层 -->
+			<view class="indicator-wrapper" :class="{ shaking: isShaking }">
+				<image class="indicator" :src="imageSrc" />
+			</view>
+			<view v-if="isShowSwitchText&&isValue" class="switch_text_off">滑动关机</view>
+			<view v-if="isShowSwitchText&&!isValue" class="switch_text_on">滑动开机</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			modelValue: String,
+			imageSrc: {
+				type: String,
+				default: "https://qiniu.bms16.com/Fkovrpq1bexe-Unal_VJREbLUhdu" // 默认滑块图片
+			},
+			width: {
+				type: String,
+				default: "400rpx" // 默认宽度
+			},
+			height: {
+				type: String,
+				default: "96rpx" // 默认高度
+			},
+			defaultPosition: {
+				type: String,
+				default: "right" // 默认在左边
+			},
+			fetchData: Function // 后台请求函数
+		},
+		data() {
+			return {
+				isValue:false,
+				isShowSwitchText: true,
+				isSwiping: false, // 是否滑动
+				isShaking: false, // 是否抖动
+				startX: 0, // 触摸起始位置
+				position: 2, // 滑块初始位置 (左侧)
+				containerWidth: 400, // 容器宽度(px)
+				indicatorSize: 36 // 滑块大小(px)
+			};
+		},
+		computed: {
+			maxPosition() {
+				return this.containerWidth - this.indicatorSize - 4; // 计算滑块最右边的位移
+			}
+		},
+		watch: {
+			modelValue(newValue) {
+				// console.log(newValue,"值变动")
+				this.isValue = JSON.parse(newValue).state
+				this.position = this.isValue ? this.maxPosition : 2;
+			}
+		},
+		mounted() {
+		},
+		methods: {
+			async triggerRequest() {
+				if (this.isShaking) return; // 避免重复触发
+				this.isShaking = true; // 开始抖动
+				try {
+					await this.fetchData(); // 触发后台请求
+				} catch (error) {
+					console.error("请求失败:", error);
+				} finally {
+					this.isShowSwitchText = true;
+					this.isShaking = false; // 停止抖动
+					this.isValue = !this.isValue
+				}
+			},
+			handleClick() {
+				if (this.isSwiping) return;
+				this.isShowSwitchText = false;
+				this.triggerRequest();
+			},
+			onTouchStart(e) {
+				this.isShowSwitchText = false;
+				this.isSwiping = false;
+				this.startX = e.touches[0].clientX;
+			},
+			onTouchMove(e) {
+				let moveX = e.touches[0].clientX - this.startX;
+				if (Math.abs(moveX) > 10) {
+					this.isSwiping = true;
+				}
+			},
+			onTouchEnd() {
+				if (!this.isSwiping) return;
+				this.triggerRequest();
+				this.isSwiping = false;
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.switch-container {
+		/* 	width: 400rpx;
+		height: 96rpx; */
+		background: #FFFFFF;
+		border-radius: 48rpx;
+		border: 4rpx solid #F1F3F4;
+		display: flex;
+		align-items: center;
+		padding: 2px;
+		position: relative;
+	}
+
+	.switch {
+		width: 100%;
+		height: 100%;
+		border-radius: 15px;
+		position: relative;
+		transition: background 0.3s;
+	}
+
+	.switch.active {
+		background: #ffffff;
+	}
+
+	/* 外层比滑块大 5px */
+	.indicator-wrapper {
+		width: 144rpx;
+		height: 80rpx;
+		background: rgba(0, 0, 0, 1);
+		border-radius: 42rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		/* top: 6rpx; */
+		left: 6rpx;
+	}
+
+	.indicator {
+		width: 26px;
+		height: 26px;
+		border-radius: 50%;
+		position: relative;
+		transition: transform 0.3s;
+	}
+
+	.switch.active .indicator-wrapper {
+		transform: translateX(244rpx);
+	}
+
+	.indicator-wrapper.shaking {
+		animation: shake 0.2s infinite alternate;
+	}
+
+	.switch_text_on {
+		position: relative;
+		width: 158rpx;
+		height: 80rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #060809;
+		line-height: 80rpx;
+		text-align: left;
+		font-style: normal;
+		margin-left: 200rpx;
+	}
+
+	.switch_text_off {
+		position: relative;
+		width: 158rpx;
+		height: 80rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #060809;
+		line-height: 80rpx;
+		text-align: left;
+		font-style: normal;
+		margin-left: 50rpx;
+	}
+
+	@keyframes shake {
+		0% {
+			transform: translateX(110rpx);
+		}
+
+		100% {
+			transform: translateX(120rpx);
+		}
+	}
+</style>

component/googleMap/googleMap.vue

@@ -48,6 +48,9 @@
 				script.defer = true; // 延迟执行
 				document.head.appendChild(script)
 				window.initMap = function() {
+					 // 延迟执行以确保元素已加载
+					  // const elements = document.querySelectorAll(".gm-style-cc, .gmnoprint[role='menubar']");
+					  // elements.forEach(el => el.style.display = "none");
 					_this.loadAmap(lngLat)
 				};
 
@@ -74,6 +77,7 @@
 					fullscreenControl: false,
 					draggable: true, // 显式启用拖拽
 					zoom: _this.zoom,
+					 keyboardShortcuts: false, // 禁用键盘快捷键
 					panControl: false,
 					zoomControl: false,
 					scaleControl: false,
@@ -93,8 +97,6 @@
 				
 				//如果有polylines则添加
 				if (_this.polylines?.points?.length > 0) {
-					console.log('添加轨迹')
-					console.log(_this.polylines.points)
 					let path = _this.polylines.points.map(item => {
 						return {
 							lng: item.lng,
@@ -127,6 +129,7 @@
 			//添加标记
 			addMarkers() {
 				if (this.markersArray.length > 0) this.clearMarkers() //添加前先删除所有标记
+				console.log(this.Markers)
 				this.Markers.map((item, index) => {
 					this.AddMarker(item)
 				})

component/uploaders/uploaders.vue

@@ -4,7 +4,7 @@
 			<view class="list-item" @longpress="bindDelImage" :data-idx="index"
 				v-for="(item, index) in imgList" :key="item.unique">
 				<!-- <image  class="img-item-demo" :src="item.url"></image> -->
-				<image  class="img-item" :src="item.url" mode="aspectFill"></image>
+				<image  class="img-item" :src="item.url" mode="aspectFit"></image>
 				<!-- <view class="img_text">{{ item.title? item.title : '车辆照片'}}</view> -->
 			</view>
 			<view v-if="imgList.length < max" class="list-item" @tap="bindUpImg">

components/navBar/navigation.vue

@@ -6,11 +6,11 @@
 					<view class="pos">
 						<view   class="car-detail-style">
 							<image  class="return-view"
-								src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" mode="aspectFill"></image>
+								src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" mode="aspectFit"></image>
 						</view>
 						<view :style="{opacity:1 - opacity,background:`rgba(0,0,0,0.4)`}" class="car-detail-style">
 							<image  class="return-view"
-								src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG" mode="aspectFill"></image>
+								src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG" mode="aspectFit"></image>
 						</view>
 					</view>
 				</view>

mixin/index.js

@@ -15,7 +15,7 @@ export default {
 	  popText:'',
 	  cmdType:'',
 	  myLocation:{},
-	  popupControlShow:false,
+	  popupControlShow:false
     };
   },
   onLoad(){
@@ -34,7 +34,7 @@ export default {
 		   }
 	  },
 		tapOpenControl(e){
-			const _carOnline=uni.getStorageSync('car_info').online!=0 //在线
+			const _carOnline= uni.getStorageSync('car_info').online != 0 //在线
 			console.log(this.popupControlShow);
 			const {name,type}=e
 			this.setData({
@@ -202,108 +202,7 @@ export default {
 		// 					// this.trunOn(resolve)
 		// 				});
 		// 			},
-		trunOn(type){
-			
-			if (this.carOnline) {
-				//开机1 关机0
-				const car_sn= uni.getStorageSync('car_info').car_sn;
-				const pData = {
-					car_sn,
-					switch: switchType
-				}
-				const me=this
-				common.loading();
-				http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
-					uni.hideLoading();
-					if (resp.data.code === 200) {
-						common.simpleToast(me.popText + '成功');
-						const activeTag = me.contrilList.map(item => {
-							if('isLock' in item){
-								item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
-								item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
-							}
-							return item
-						})
-						const tag = getFunctionTag().tag
-						setFunctionTag({
-							activeTag,
-							tag
-						})
-						me.$emit('loadCarDetail',pData,car_sn)
-					} else {
-						common.simpleToast(resp.data.msg);
-					}
-				});
-			}else{
-				//车辆离线
-				const car_sn= uni.getStorageSync('car_info').car_sn;
-				common.loading();
-				if (type==1) {
-					bluetooth.turnOnCar(car_sn, () => {
-						uni.hideLoading();
-					});
-				}else{
-					bluetooth.turnOffCar(car_sn, () => {
-						uni.hideLoading();
-					});
-				}
-			}
-		},
-		async navToInputPages() {
-			const me = this
-			const exchange_need_package=uni.getStorageSync('car_info').exchange_need_package;
-			if(exchange_need_package==0){
-				uni.scanCode({
-					scanType:['qrCode'],
-					success(res) {
-						me.loadGeneralQRData(res.result)
-					},
-					fail() {
-						me.$msg('扫码失败，请重新扫码')
-					}
-				})
-			}else if(exchange_need_package==1){
-				uni.showModal({
-					title: '温馨提示',
-					content: '您还未购买换电套餐，是否前往进行换电套餐？',
-					showCancel: true,
-					cancelText: '取消',
-					confirmText: '前往购买',
-					success: function(res) {
-						if (res.confirm) {
-							if(isCarLocation){
-								uni.navigateTo({
-									url: `/pages/batteryPackage/batteryPackage`
-								})
-							}else{
-							}
-							
-						}
-					},
-					fail: function(res) {},
-					complete: function(res) {},
-				})
-			}else if(exchange_need_package==-1){
-				this.$msg('当前车辆暂未绑定电池')
-			}
-			
-		},
-		loadGeneralQRData(options) {
-			console.log(options)
-			let objOpt = this.$paramsObj(options)
-			
-			if (objOpt.d) {
-				console.log('扫码的是机柜')
-				uni.navigateTo({
-					url: `/pages/cabinetDetail/cabinetDetail?dev_id=${objOpt.d}`,
-				})
-				return
-			} else {
-				console.log('扫码的是车辆')
-				this.$msg('请扫描机柜二维码')
-				return
-			}
-		},
+
 	},
 
  

pages/aboutMy/aboutMy.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<navBar name="关于我们"></navBar>
 		<view class="header_view flex-row flex-column">
-			<image class="header_img" :src="app_logo" mode="aspectFill"></image>
+			<image class="header_img" :src="app_logo" mode="aspectFit"></image>
 			<view class="header_title">{{appName}}</view>
 			<view class="version">{{"V " + app_version}}</view>
 		</view>

pages/activation/activation.vue

@@ -38,7 +38,7 @@
 					<view>照片：</view>
 					<view style="display: flex;align-items: center;" class="">
 						<image style="margin-right: 10rpx;" v-for="(item,index) of carInfoData.model_images"
-							:key="index" class="img" :src="item" mode="aspectFill"></image>
+							:key="index" class="img" :src="item" mode="aspectFit"></image>
 					</view>
 				</view>
 			</view>
@@ -60,7 +60,7 @@
 					<view class="list-item" @click="bindUpImg(index)" @longpress="bindDelImage(index)" :data-idx="index" v-for="(item, index) in shopList.flk_hire_return_car_img"
 						:key="item.unique">
 						<image v-if="!item.imgUrl"  class="img-item-demo" :src="item.url"></image>
-						<image v-else class="img-item" :src="item.imgUrl" mode="aspectFill"></image>
+						<image v-else class="img-item" :src="item.imgUrl" mode="aspectFit"></image>
 						<view class="img_text">{{ item.title? item.title : '车辆照片'}}</view>
 						<view v-if="!item.imgUrl" class="empity-item">＋</view>
 					</view>

pages/batteryRecord/batteryRecord.vue

@@ -65,7 +65,7 @@
 		},
 		methods: {
 			dayjsFn(time){
-				return dayjs(time).format('YYYY-MM-DD hh:mm:ss')
+				return dayjs(time).format('YYYY-MM-DD HH:mm:ss')
 			},
 			srcFn(url){
 				uni.navigateTo({

pages/cabinetDetail/cabinetDetail.vue

@@ -5,7 +5,7 @@
 			<swiper v-if="shop_image.length!=0" class="swiper" :indicator-dots="true" :autoplay="true" :interval="2000"
 				indicator-color="rgba(0, 0, 0, 0.3)" indicator-active-color="#000000" :duration="1000" circular>
 				<swiper-item class="swiper-item" v-for="(item,index) in shop_image" :key="index">
-					<image class="swiper-item-img" :src="item" mode="aspectFill"></image>
+					<image class="swiper-item-img" :src="item" mode="aspectFit"></image>
 				</swiper-item>
 			</swiper>
 			<img v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" alt="">

pages/carDetail/carDetail.vue

@@ -6,10 +6,10 @@
 			<swiper v-if="car_detail.model_images && car_detail.model_images.length!=0" class="swiper" :indicator-dots="true" :autoplay="true" :interval="2000"
 				indicator-color="rgba(0, 0, 0, 0.3)" indicator-active-color="#000000" :duration="1000" circular>
 				<swiper-item class="swiper-item" v-for="(item,index) in car_detail.model_images" :key="index">
-					<image class="swiper-item-img" :src="item" mode="aspectFill"></image>
+					<image style="width: 100%;height: 100%;" class="swiper-item-img" :src="item" mode="aspectFit"></image>
 				</swiper-item>
 			</swiper>
-			<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" mode="aspectFill">
+			<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" mode="aspectFit">
 			</image>
 		</view>
 		

pages/carLocation/carLocation.vue

@@ -7,7 +7,10 @@
 		</map>
 		<!-- #endif -->
 		<!-- #ifdef APP -->
-		<googleMap keyId="1" width='100%' height='calc(100vh - 506rpx)' v-if="myLocation.latitude"  :mapData="{type:3,markers,zoom:13}" :myLocations='myLocation'></googleMap>
+		<googleMap keyId="1" width='100%' height='calc(100vh - 506rpx)' v-if="car_info.latitude"  :mapData="{type:3,markers,zoom:13}" :myLocations='{
+			latitude:car_info.latitude,
+			longitude:car_info.longitude,
+		}'></googleMap>
 		<!-- #endif -->
 		<!-- 由于cover-view一些样式及点击事件不支持 -->
 		<!-- 气泡内容 -->
@@ -58,7 +61,10 @@ import googleMap from "@/component/googleMap/googleMap";
 		 */
 		onLoad: function(options) {
 			
-			this.car_info = uni.getStorageSync('car_info') || {}
+			let car_info = uni.getStorageSync('car_info') || {}
+			car_info.latitude = `${car_info.latitude}`
+			car_info.longitude = `${car_info.longitude}`
+			this.car_info = car_info
 			this.car_info.heart_time = this.car_info.heart_time ?  dayjs(this.car_info.heart_time*1000).format('YYYY-MM-DD hh:mm:ss') : '未知时间'
 			this.init()
 			// this.longitude = {
@@ -91,36 +97,30 @@ import googleMap from "@/component/googleMap/googleMap";
 		},
 		methods: {
 			init(){
-				this.latitude = this.car_info.latitude || 39.909
-				this.longitude = this.car_info.longitude || 116.39742
+				this.latitude = this.car_info.latitude 
+				this.longitude = this.car_info.longitude
 				this.getAddressName(this.latitude,this.longitude)
 				let _this = this
-				uni.getLocation({
-					success(res) {
-						_this.myLocation.latitude = res.latitude
-						_this.myLocation.longitude = res.longitude
-						_this.markers = [
-							{
-								width: 80 / 2,
-								height: 108 / 2,
-								id: _this.car_info.car_sn,
-								longitude: _this.longitude,
-								latitude: _this.latitude,
-								iconPath: 'https://qiniu.bms16.com/Fim2CWvIaWVoqPwQsJbNn-fcS-Ku',
-								iconPathActive: 'https://qiniu.bms16.com/Fim2CWvIaWVoqPwQsJbNn-fcS-Ku',
-								content:''
-							},
-							{
-								width: 22,
-								height: 40,
-								id: 50000,
-								iconPath: "https://zxappfile.bms16.com/zx_client/location_n.png",
-								longitude: res.longitude,
-								latitude: res.latitude,
-							}
-						]
+				_this.markers = [
+					{
+						width: 80 / 2,
+						height: 108 / 2,
+						id: _this.car_info.car_sn,
+						longitude: `${_this.longitude}`,
+						latitude: `${_this.latitude}`,
+						iconPath: 'https://qiniu.bms16.com/Fim2CWvIaWVoqPwQsJbNn-fcS-Ku',
+						iconPathActive: 'https://qiniu.bms16.com/Fim2CWvIaWVoqPwQsJbNn-fcS-Ku',
+						content:''
+					},
+					{
+						width: 22,
+						height: 40,
+						id: 50000,
+						iconPath: "https://zxappfile.bms16.com/zx_client/location_n.png",
+						longitude: _this.myLocation.longitude,
+						latitude: _this.myLocation.latitude,
 					}
-				})
+				]
 			},
 			navAddress() {
 				const that = this;

pages/dashboard/dashboard.vue

@@ -2,7 +2,7 @@
 	<view class="dashboard-page zx-page-linear">
 		<navBar bgColor="transparent"></navBar>
 		<view class="dashboard">
-			<view class="shadow" :style="{ '--progress': progress || 0 + '%' }"></view>
+			<view class="shadow" :style="{ '--progress': `${progress || 0}%` }"></view>
 			<view class="spe-wrap">
 				<view class="spe-num">
 					{{ infoList.speed || 0 }}
@@ -11,27 +11,24 @@
 			</view>
 			<view class="power-wrap">
 				<u-count-to :startVal="0" bold :endVal="progress || 0" fontSize="48rpx" />
+				<view class="em">W</view>
 			</view>
 		</view>
-
 		<view class="battery_life_progress">
 			<view>
-				<view :style="{width:((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%'}"
+				<view :style="{width:(((infoList.remain_mail || 0) / (infoList.endurance /1000) || 0) * 100) + '%'}"
 					class="is_progress"></view>
 				<view class="text">
 					<text style="margin-left: 20rpx;">续航</text>
 					<!-- <text style="margin-left: 16rpx;"> {{(infoList.remain_mail || 0/1000).toFixed(0) || 0}}km </text> -->
-					
 					<text style="margin-left: 16rpx;"> {{ infoList.remain_mail > 0 ? infoList.remain_mail : 0 }}km </text>
 					
 				</view>
 			</view>
-			<view style="font-weight: 600;font-size: 36rpx;">
-				{{ ((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%' }}
+			<view style="font-weight: 600;font-size: 36rpx;position: relative;z-index: 99;">
+				{{ (((infoList.remain_mail || 0) / (infoList.endurance /1000) || 0) * 100).toFixed(0) + '%' }}
 			</view>
-
 		</view>
-
 		<view class="info-container">
 			<view class="info-wrap" v-for="(item, index) in infoList.list" :key="index">
 				<view class="label">{{ item.label }}</view>
@@ -50,6 +47,7 @@
 		data() {
 			return {
 				speed: 50,
+				time:null,
 				infoList: {}
 			}
 		},
@@ -59,14 +57,24 @@
 				return this.infoList.speed / MAX_SPEED * 100
 			}
 		},
-		created() {
+		onLoad() {
 			let car_sn = uni.getStorageSync('car_info').car_sn
 			if (car_sn) {
 				this._initInfoList()
+				this.time = setInterval(()=>{
+					this._initInfoList()
+				},3000)
 			}
-
+		},
+		onUnload() {
+			this.clearIntervalTimer()
 		},
 		methods: {
+			clearIntervalTimer() {
+				if (this.time == null) return
+				clearInterval(this.time)
+				this.time = null
+			},
 			async _initInfoList() {
 				let car_sn = uni.getStorageSync('car_info').car_sn
 				let {
@@ -83,7 +91,7 @@
 						},
 						{
 							label: '骑行时长',
-							prop: this.infoList.current_time || 0,
+							prop: (this.infoList.current_time / 60 /60).toFixed(2) || 0,
 							unit: 'h'
 						},
 						{
@@ -173,7 +181,7 @@
 				background: #D6E7FF;
 				border-radius: 64rpx;
 				position: absolute;
-				bottom: 22rpx;
+				bottom: 72rpx;
 				left: 50%;
 				transform: translateX(-50%);
 				display: flex;
@@ -183,6 +191,22 @@
 				font-weight: bold;
 				font-size: 48rpx;
 				color: #060809;
+				position: relative;
+				.em{
+					position: absolute;
+					right: -10rpx;
+					top: 0;
+					width: 54rpx;
+					height: 32rpx;
+					background: #0A59F7;
+					border-radius: 16rpx;
+					font-size: 22rpx;
+					line-height: 1;
+					color: #fff;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
 			}
 		}
 

pages/deviceInfo/deviceInfo.vue

@@ -13,7 +13,7 @@
 			</view>
 			<view class="info-view">
 				<view class="info-title">车辆总里程</view>
-				<view class="info-value">{{(list.total_mil / 1000).toFixed(0)}}km</view>
+				<view class="info-value">{{(Number(list.total_mil) / 1000).toFixed(2)}}km</view>
 			</view>
 		</view>
 		<view class="flex-row">

pages/index/components/control/control.css

@@ -191,9 +191,10 @@
 	background: #FFFFFF;
 	border-radius: 48rpx;
 	font-family: PingFangSC, PingFang SC;
-	font-weight: 600;
+	font-weight: 500;
 	font-size: 32rpx;
 	color: #060809;
+	margin-left: 20rpx;
 	padding-left: 20rpx;
 }
 .car-change-text{

pages/index/components/control/control.vue

@@ -11,10 +11,12 @@
 			</view>
 		</scroll-view>
 		<view class="flex-row power-view">
-			<view class="power-on-off flex-row" >
+			<!-- <view class="power-on-off flex-row" >
 				<view :style="sliderStyle" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" class="power-on-btn"><image style="width: 52rpx;height: 52rpx;" src="https://qiniu.bms16.com/Fkovrpq1bexe-Unal_VJREbLUhdu" mode=""></image></view>
 				<view class="power-on-text" >滑动启动</view>
-			</view>
+			</view> -->
+			<custom-switch  :width="'400rpx'"
+				:height="'96rpx'"  :modelValue="switchValue" :fetchData="loadData"></custom-switch>
 			<!-- <custom-switch :defaultPosition="'right'" :width="'400rpx'" 
 			    :height="'96rpx'"  v-model="switchValue" :fetchData="loadData"></custom-switch> -->
 			<view @tap="navToInputPages" class="car-change-battery flex-row">
@@ -77,7 +79,8 @@
 	var config = require('@/common/config.js');
 	var common = require('@/common/common.js');
 	var http = require('@/common/http.js');
-	// import CustomSwitch from '@/component/customSwitch.vue'; // 引入组件
+	import CustomSwitch from '@/component/customSwitch.vue'; // 引入组件
+	
 	import controlMixin from '@/mixin/index';
 	import i18n from '@/locale/index.js'
 	import {
@@ -86,6 +89,7 @@
 		} from '@/common/storage.js';
 export default {
 	mixins: [controlMixin],
+	components:{CustomSwitch},
 	props:{
 		contrilList: {
 			type: Array,
@@ -102,12 +106,13 @@ export default {
 			// popText:'',
 			// popupControlShow:false,
 			// controlType:null,//选择的车辆控制
-			switchValue: false,
+			switchValue: {state:false,time:0},
 			isShowMore:false,
 			car_line:false,
-			startX: 0, // 滑块开始滑动的初始位置
-			moveX: 0, // 滑块滑动的距离
-			unlocked: false, // 是否解锁成功的标志
+			// startX: 0, // 滑块开始滑动的初始位置
+			// moveX: 0, // 滑块滑动的距离
+			// unlocked: false, // 是否解锁成功的标志
+			
 		};
     },
 	computed: {
@@ -120,6 +125,9 @@ export default {
 	},
 	mounted() {
 		// this.contrilList = getFunctionTag().activeTag
+		// setTimeout(()=>{
+			this.switchValue.state=uni.getStorageSync('car_info').acc_state==1
+		// },50)
 	},
  
     /**
@@ -135,26 +143,183 @@ export default {
 				url: '/pages/carFunctionSet/more?online='+this.online
 			})
 		},
-		    touchStart(event) {
-				console.log(event,'test');
-		      this.startX = this.unlocked?this.moveX:event.touches[0].clientX;
-		    },
-		    touchMove(event) {
-		      this.moveX = event.touches[0].clientX - this.startX;
-			  console.log( event.touches[0].clientX,this.startX,'this.moveX');
-		      if (this.moveX < 0) this.moveX = 0;
-		      if (this.moveX > 70 &&!this.unlocked) this.moveX = 135; // 假设滑块最大滑动距离为135px
-			  
-		    },
-		    touchEnd() {
-				 console.log(this.moveX,'this.moveX1111');
-		      if (this.moveX >= 135) {
-		        this.unlocked = true;
-		        console.log('解锁成功');
-		      } else {
-		        // this.moveX = 0;
-		      }
-		    }
+		trunOn(type){
+			
+			if (this.carOnline) {
+				//开机1 关机0
+				const car_sn= uni.getStorageSync('car_info').car_sn;
+				const pData = {
+					car_sn,
+					switch: switchType
+				}
+				const me=this
+				common.loading();
+				http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
+					uni.hideLoading();
+					if (resp.data.code === 200) {
+						common.simpleToast(me.popText + '成功');
+						const activeTag = me.contrilList.map(item => {
+							if('isLock' in item){
+								item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
+								item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
+							}
+							return item
+						})
+						const tag = getFunctionTag().tag
+						setFunctionTag({
+							activeTag,
+							tag
+						})
+						me.$emit('loadCarDetail',pData,car_sn)
+					} else {
+						common.simpleToast(resp.data.msg);
+					}
+				});
+			}else{
+				//车辆离线
+				const car_sn= uni.getStorageSync('car_info').car_sn;
+				common.loading();
+				if (type==1) {
+					bluetooth.turnOnCar(car_sn, () => {
+						uni.hideLoading();
+					});
+				}else{
+					bluetooth.turnOffCar(car_sn, () => {
+						uni.hideLoading();
+					});
+				}
+			}
+		},
+		async navToInputPages() {
+			const me = this
+			const exchange_need_package=uni.getStorageSync('car_info').exchange_need_package;
+			if(exchange_need_package==0){
+				uni.scanCode({
+					scanType:['qrCode'],
+					success(res) {
+						me.loadGeneralQRData(res.result)
+					},
+					fail() {
+						me.$msg('扫码失败，请重新扫码')
+					}
+				})
+			}else if(exchange_need_package==1){
+				uni.showModal({
+					title: '温馨提示',
+					content: '您还未购买换电套餐，是否前往购买换电套餐？',
+					showCancel: true,
+					cancelText: '取消',
+					confirmText: '前往购买',
+					success: function(res) {
+						if (res.confirm) {
+							if(isCarLocation){
+								uni.navigateTo({
+									url: `/pages/batteryPackage/batteryPackage`
+								})
+							}else{
+							}
+							
+						}
+					},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
+			}else if(exchange_need_package==-1){
+				this.$msg('当前车辆暂未绑定电池')
+			}
+			
+		},
+		loadGeneralQRData(options) {
+			console.log(options)
+			let objOpt = this.$paramsObj(options)
+			
+			if (objOpt.d) {
+				console.log('扫码的是机柜')
+				uni.navigateTo({
+					url: `/pages/cabinetDetail/cabinetDetail?dev_id=${objOpt.d}`,
+				})
+				return
+			} else {
+				console.log('扫码的是车辆')
+				this.$msg('请扫描机柜二维码')
+				return
+			}
+		},
+		
+		async loadData() {
+			return new Promise((resolve,reject) => {
+				if (uni.getStorageSync('car_info').online==1) {
+								//开机1 关机0
+								const car_sn= uni.getStorageSync('car_info').car_sn;
+								const switchType= uni.getStorageSync('car_info').acc_state==1?0:1;
+								const pData = {
+									car_sn,
+									switch: switchType
+								}
+								const me=this
+								common.loading();
+								http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
+									uni.hideLoading();
+									console.log(resp.data)
+									
+									if (resp.data.code === 200) {
+										//const textStr = (this.switchValue==0)?'开机':'关机'
+	
+										// const activeTag = me.contrilList.map(item => {
+										// 	if('isLock' in item){
+										// 		item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
+										// 		item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
+										// 	}
+										// 	return item
+										// })
+										// const tag = getFunctionTag().tag
+										// setFunctionTag({
+										// 	activeTag,
+										// 	tag
+										// })
+										
+										setTimeout(() => {
+											resolve()
+											//this.switchValue=!this.switchValue
+											this.switchValue = JSON.stringify({
+												state:!this.switchValue.state,
+												time: Math.floor(Date.now() / 1000)
+											})
+										}, 1000)
+										me.$emit('loadCarDetail',pData.car_sn)
+									} else {
+										 setTimeout(() => {
+										 	resolve()
+										 	//this.switchValue=!this.switchValue
+										 	this.switchValue = JSON.stringify({
+										 		state:this.switchValue.state,
+										 		time:Math.floor(Date.now() / 1000)
+										 	})
+											// common.simpleToast(resp.data.msg);
+										 }, 1000)
+										//setTimeout(resolve, 1000);
+										
+									}
+								});
+							}else{
+								//车辆离线
+								const car_sn= uni.getStorageSync('car_info').car_sn;
+								common.loading();
+								if (type==1) {
+									bluetooth.turnOnCar(car_sn, () => {
+										uni.hideLoading();
+									});
+								}else{
+									bluetooth.turnOffCar(car_sn, () => {
+										uni.hideLoading();
+									});
+								}
+							}
+				// console.log(me.switchValue,'this.switchValue');
+				// // this.trunOn()
+				// setTimeout(resolve, 1000); // 模拟 5 秒请求时间
+			});
+		}
 		// tapOpen(e){
 		// 	this.carOnline=this.online
 		// 	console.log( getFunctionTag().activeTag, getFunctionTag());

pages/index/index.vue

@@ -44,7 +44,7 @@
 						<view @click="routerLink('/pages/order/order')" class="renew-btn">去续费</view>
 					</view>
 					<view class="car-img-view" >
-						<view class="flex-row flex-between" style="align-items: center;">
+						<view v-if="!car_info.sold_time" class="flex-row flex-between" style="align-items: center;">
 							<text class="quantity flex-row">{{car_info.soc}} <text
 									style="font-size: 28rpx;font-weight: 500;">%</text></text>
 							<view @tap.stop="tapReturnCar" class="return-car-btn flex-row">
@@ -79,7 +79,7 @@
 						</view>
 					</view>
 					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail"/>
-			
+					
 			
 					<view :class="['flex-row', 'flex-between', 'map-card-view',car_info.exchange_package_info && car_info.exchange_package_info.activity_time?'height_362':'height_260']">
 						<MapCard :car_info="car_info" :height="!!(car_info.exchange_package_info && car_info.exchange_package_info.activity_time)"/>
@@ -189,7 +189,7 @@
 	import AndroidUnlockAuth from './components/AndroidUnlockAuth.vue'
 	import IosUnlockAuth from './components/IosUnlockAuth.vue'
 	import ReturnCar from '@/component/returnCar/returnCar';
-	// import CustomSwitch from "@/component/customSwitch.vue"
+	
 	import {
 		getFunctionTag,
 	} from '@/common/storage.js';
@@ -296,14 +296,7 @@
 			}
 		},
 		methods: {
-			// async loadData() {
-			// 				return new Promise((resolve) => {
-			// 					setTimeout(resolve, 1000); // 模拟 5 秒请求时间
-			// 				});
-			// 			},
-			// 			changeValue(test){
-			// 				this.switchValue=test
-			// 			},
+			
 			init() {
 				
 				this.loadModelList()
@@ -360,7 +353,6 @@
 				})
 			},
 			toMoreInfoPage() {
-				console.log(1111);
 				uni.navigateTo({
 					url: '/pages/moreInfo/moreInfo',
 				});
@@ -474,6 +466,7 @@
 					car_sn
 				}, (resp) => {
 					uni.hideLoading();
+					console.log(resp.data)
 					if (resp.data.code === 200) {
 						resp.data.data.car_sn = car_sn
 						const _car_image=resp.data.data.model_images?resp.data.data.model_images.split(','):[]
@@ -494,7 +487,7 @@
 						}
 
 					} else {
-						common.simpleToast(resp.data.msg);
+						// common.simpleToast(resp.data.msg);
 					}
 				})
 			},

pages/message/detail.vue

@@ -3,7 +3,7 @@
 		<navBar name="信息详情"></navBar>
 		<view class="title">{{info.title}}</view>
 		<view>{{info.overview}}</view>
-		<image v-if="info.cover" :src="info.cover" class="img" mode="aspectFill" />
+		<image v-if="info.cover" :src="info.cover" class="img" mode="aspectFit" />
 		<rich-text :nodes="info.content"></rich-text>
 		<location v-if="latlng.latitude && latlng.longitude" :latlng="latlng" />
 	</view>

pages/my/my.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef APP -->
 		<view :style="{height: `${statusBarHeight}px`}"></view>
 		<!-- #endif -->
-		<view  class="user-switch-row">
+		<view style="position: relative;z-index: 999999;"  class="user-switch-row">
 			<view  @click="routerLink({ url: '/pages/message/index?isSys=1',isLogin:1 })" class="news">
 				<view v-if="newsList.plate_count> 0" class="num">{{newsList.plate_count}}</view>
 				<image :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"

pages/openCabinet/openCabinet.vue

@@ -36,7 +36,7 @@
 				<view class="over-btn-view">
 					<view v-if="list.status==3" @tap="tapToIndex" class="over-btn flex-row">回到首页</view>
 					<view v-if="list.status==4" @tap="connectStore" class="over-btn flex-row">联系门店</view>
-					<view v-if="list.status==4" @click="srcFn(`/pages/carList/carList`)" class="over-btn flex-row">确认</view>
+					<view v-if="list.status==4" @click="srcFn(`/pages/index/index`)" class="over-btn flex-row">确认</view>
 				</view>
 			</view>
 		</view>
@@ -79,8 +79,8 @@
 		},
 		methods: {
 			srcFn(url){
-				uni.redirectTo({
-					url
+				uni.reLaunch({
+					url: '/pages/index/index',
 				})
 			},
 			tapToIndex() {

pages/order/order.vue

@@ -225,6 +225,7 @@
 		onShow: function() {
 			this.car_info = uni.getStorageSync('car_info') || {};
 			this.page = 1
+			this.start_id = 0
 			this.hireOrderList = []
 			setTimeout(()=> {
 				if(this.selectOrderType == 1){
@@ -334,6 +335,7 @@
 				})
 			},
 			checkOrderType(e) {
+				this.start_id = 0
 				const type = e.currentTarget.dataset.type;
 				this.setData({
 					selectOrderType: type

pages/orderStatus/orderStatus.css

@@ -918,6 +918,9 @@
 	font-size: 28rpx;
 	color: #9FA7B7;
 	margin: 16rpx 0;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 }
 .store-name{
 	font-weight: 600;

pages/orderStatus/orderStatus.vue

@@ -49,14 +49,14 @@
 					</view>
 					<view v-if="orderInfo.order_status != 4" class="money-item">
 						<view>
-							{{tools.toFix(orderInfo.hire_money / 100)}}
+							{{(orderInfo.hire_money + orderInfo.deposit / 100).toFixed(2)}}
 						</view>
 						<view>订单金额<text style="opacity: 0.4;">·$</text></view>
 					</view>
 
 					<view v-if="orderInfo.order_status == 4" class="money-item">
 						<view style="color:#F95151" class="red-status">
-							{{tools.toFix(overdueData.money / 100)}}
+							{{(orderInfo.money / 100).toFixed(2)}}
 						</view>
 						<view style="color:#F95151">逾期金额·$</view>
 					</view>
@@ -111,12 +111,12 @@
 					</view>
 					<view v-if="orderInfo.order_type != 3" class="sn-content flex-row flex-between">
 						<view class="sn-title">租车金额</view>
-						<view class="sn-text">$ {{tools.toFix(orderInfo.hire_money/1000)}}</view>
+						<view class="sn-text">$ {{tools.toFix(orderInfo.hire_money/100)}}</view>
 					</view>
 					<view v-if="orderInfo.order_type != 3" class="sn-content flex-row flex-between">
 						<view class="sn-title">租车押金</view>
 						<view class="sn-text"><text class="grey-text"></text> $
-							{{tools.toFix(orderInfo.deposit/1000)}}
+							{{tools.toFix(orderInfo.deposit/100)}}
 						</view>
 					</view>
 				</view>
@@ -163,7 +163,7 @@
 						</view>
 					</view>
 				</view>
-				<image mode="aspectFill" v-if="orderInfo.model_images" :src="orderInfo.model_images"></image>
+				<image mode="aspectFit" v-if="orderInfo.model_images" :src="orderInfo.model_images"></image>
 				<image v-else src="https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj" mode=""></image>
 			</view>
 			<!-- <view class="exchange-info">
@@ -193,7 +193,7 @@
 						v-if="orderInfo.hire_return_time.day>0">日</text>{{orderInfo.hire_return_time.hour > 0 ? orderInfo.hire_return_time.hour :'' }}<text
 						v-if="orderInfo.hire_return_time.hour>0">小时</text>{{orderInfo.hire_return_time.minute > 0 ? orderInfo.hire_return_time.minute :'' }}<text
 						v-if="orderInfo.hire_return_time.minute>0">分</text> -->
-					共{{hireDurationUnitsFn(orderInfo.total_hire_time,orderInfo.hire_duration_unit)}}
+					共{{hireDurationUnitsFn(orderInfo.total_hire_time,orderInfo.hire_duration_unit)}}{{leaseUnits(orderInfo.hire_duration_unit)}}
 				</view>
 			</view>
 			<view class="return-bottom flex-row">
@@ -395,6 +395,21 @@
 		computed: {},
 
 		methods: {
+			getAddressName(latitude, longitude) {
+				const pData = {
+					lng: longitude,
+					lat: latitude,
+					pi: "wx_index"
+				}
+				const that = this
+				http.postApi(config.API_MAP_REGEO, pData, (resp) => {
+					if (resp.data.code === 200) {
+						that.orderInfo.address = resp.data.data.data.address
+					} else {
+						common.simpleToast(resp.data.msg)
+					}
+				})
+			},
 			leaseUnits(type){
 				const result = LEASE_TYPE_ARR.find(v => v.value == type);
 				return result ? result.unit : '';
@@ -437,6 +452,7 @@
 								price: (resp.data.data.rental_setting[0].hire_price / 100).toFixed(2)
 							}
 						})
+						
 					} else {
 						common.simpleToast(resp.data.msg);
 					}
@@ -574,6 +590,7 @@
 					if (resp.data.code === 200) {
 						me.orderInfo = resp.data.data.order_info
 						me.orderInfo.model_images = me.orderInfo.model_images.split(',')[0]
+						me.getAddressName(this.orderInfo.latitude,this.orderInfo.longitude)
 						// 
 						if (resp.data.data.order_info.model_id) {
 							me.loadCarInfo(resp.data.data.order_info.model_id)

pages/powerSetting/powerSetting.vue

@@ -2,7 +2,7 @@
 		<view class="power-setting-main">
 			<navBar name="权限设置" bgColor="transparent"></navBar>
 			<view class="flex-row power-setting-head">
-				<image class="head-img" :src="headimg" mode="aspectFill"></image>
+				<image class="head-img" :src="headimg" mode="aspectFit"></image>
 				<view class="head-name">{{nickname}}</view>
 				<text class="head-email">{{form.email}}</text>
 			</view>

pages/purchaseOrder/purchaseOrder.vue

@@ -11,7 +11,7 @@
 		</view>
 		<view class="car-info-view">
 			<view class="flex-row align-center">
-				<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="modelInfo.model_images" mode="aspectFill"></image>
+				<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="modelInfo.model_images" mode="aspectFit"></image>
 				<view class="flex-row car-info-grow">
 					<view class="flex-row align-center">
 						<view class="car-name">{{modelInfo.car_model_name}}</view>

pages/service/components/carRentalList/carRentalList.vue

@@ -26,7 +26,7 @@
 							<view>
 								<image
 									:src="item.model_list[0]!=''?item.model_list[0].model_images:'https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj'"
-									mode="aspectFill"></image>
+									mode="aspectFit"></image>
 							</view>
 							<view class="bottom-item">
 								<view>{{item.model_list[0].model_name}}</view>
@@ -53,7 +53,7 @@
 							<view>
 								<image
 									:src="items.model_images || 'https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj'"
-									mode="aspectFill"></image>
+									mode="aspectFit"></image>
 							</view>
 							<view class="bottom-item">
 								<view>{{ items.model_name }}</view>

pages/storeDetails/storeDetails.vue

@@ -7,10 +7,10 @@
 				:interval="2000" indicator-color="rgba(0, 0, 0, 0.3)" indicator-active-color="#000000" :duration="1000"
 				circular>
 				<swiper-item class="swiper-item" v-for="(item,index) in shop_image" :key="index">
-					<image class="swiper-item-img" :src="item" mode="aspectFill"></image>
+					<image class="swiper-item-img" :src="item" mode="aspectFit"></image>
 				</swiper-item>
 			</swiper>
-			<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" mode="aspectFill">
+			<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" mode="aspectFit">
 			</image>
 
 		</view>
@@ -121,10 +121,10 @@
 			</view>
 			<view class="car-info-list-view">
 				<view v-for="(item,index) of modelListsFn()"
-					@click="srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}`)" :key="index"
+					@click="srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}&shop_type=${tagId}&hire_price=${item.money * 100}`)" :key="index"
 					class="car-info-view align-center flex-row">
 					<!-- <img class="car-img" src="https://qiniu.bms16.com/FsxOysJT2V3KNYev2YWadvjyKn2j" alt=""> -->
-					<image class="car-img" :src="item.model_images[0]" mode="aspectFill"></image>
+					<image class="car-img" :src="item.model_images[0]" mode="aspectFit"></image>
 					<view class="car-info">
 						<view class="car-name flex-row">{{item.model_name}}</view>
 						<view class="car-model-info">续航{{item.endurance}}km｜重量{{item.weight}}kg</view>

pages/travelingTrack/travelingTrack.vue

@@ -12,6 +12,7 @@
 		<!-- #ifdef APP -->
 		<googleMap keyId="1" width="100%" height='calc(50vh - 0rpx)' v-if="myLocation.latitude  && mapShow" :mapData='{
 			markers,
+			zoom:17,
 			type:3,
 			polylines
 		}' :myLocations='myLocation'></googleMap>
@@ -26,7 +27,7 @@
 				<view>
 					<image class="img"
 						:src="carInfo.model_images || 'https://qiniu.bms16.com/FguJzvAGtd4AdhDKXVLUo7XiMxWQ'"
-						mode="aspectFill"></image>
+						mode="aspectFit"></image>
 				</view>
 			</view>
 			<view class="ctime">{{time}}</view>
@@ -43,11 +44,11 @@
 			</view>
 			<view class="info-bottom flex-row flex-between">
 				<view class="bottom-item">
-					<view>{{(trackInfo.total_mil / 1000).toFixed(2)}}<text>km</text></view>
+					<view>{{trackInfo.total_mil}}<text>km</text></view>
 					<view>行驶里程</view>
 				</view>
 				<view class="bottom-item">
-					<view>{{tools.toFix((trackInfo.total_time || 0) / 3600)}}<text>h</text></view>
+					<view>{{tools.toFix((trackInfo.total_time || 0) / 60 / 60)}}<text>h</text></view>
 					<view>骑行时长</view>
 				</view>
 				<view class="bottom-item">
@@ -141,6 +142,7 @@
 				} = await request.postApi(config_gyq.API_CAR_TRACK_INFO, {
 					car_sn: this.carInfo.car_sn,
 				})
+				
 				if (data.code == 200) {
 					this.trackInfo = data.data
 					this.pointsList = data.data.points.map(item => {
@@ -150,6 +152,7 @@
 							lat: item.latitude,
 						}
 					})
+					
 					if(this.pointsList.length < 1){
 						common.simpleToast('暂无骑行数据！')
 						setTimeout(function() {
@@ -159,25 +162,17 @@
 						}, 800);
 						return 
 					}
+					
 					//接口返回描绘线段
-					// #ifdef APP
+					
 					this.polylines = {
 						points: this.pointsList,
 						color: "#0BD28E",
 						width: 6
 					}
-					// #endif
-
-					// #ifdef MP-WEIXIN
-					this.polylines = [{
-						points: this.pointsList,
-						color: "#0BD28E",
-						width: 6
-					}]
 					if(this.pointsList.length > 0){
 						this.time = this.pointsList[0].time
 					}
-					// #endif
 					if (this.pointsList.length >= 2) {
 						const len = this.pointsList.length - 1
 						//点收尾标记
@@ -215,7 +210,6 @@
 
 					this.mapShow = true
 				}
-				console.log(data)
 			},
 			getAddressName(latitude, longitude, type) {
 				const pData = {