bug修改

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/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,12 +11,12 @@
 			</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>
@@ -25,12 +25,10 @@
 					
 				</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>
@@ -49,6 +47,7 @@
 		data() {
 			return {
 				speed: 50,
+				time:null,
 				infoList: {}
 			}
 		},
@@ -58,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 {
@@ -82,7 +91,7 @@
 						},
 						{
 							label: '骑行时长',
-							prop: this.infoList.current_time || 0,
+							prop: (this.infoList.current_time / 60 /60).toFixed(2) || 0,
 							unit: 'h'
 						},
 						{
@@ -172,7 +181,7 @@
 				background: #D6E7FF;
 				border-radius: 64rpx;
 				position: absolute;
-				bottom: 22rpx;
+				bottom: 72rpx;
 				left: 50%;
 				transform: translateX(-50%);
 				display: flex;
@@ -182,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.vue

@@ -89,6 +89,7 @@
 		} from '@/common/storage.js';
 export default {
 	mixins: [controlMixin],
+	components:{CustomSwitch},
 	props:{
 		contrilList: {
 			type: Array,

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">

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/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/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>
@@ -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 = {