链接添加

common/config_gyq.js

@@ -67,5 +67,9 @@ var config = {
 	API_FLK_CABINET_EXCHANGE_ORDER: api_web_url +'?r=flk/cabinet/exchange-order',
 	//续租: 
 	API_FLK_ORDER_RENEW: api_web_url +'?r=flk/order/renew',
+	
+	//车辆仪表盘
+	API_FLK_CAR_DASHBOARD: api_web_url +'?r=flk/car/dashboard',
+	
 };
 module.exports = config;

pages/dashboard/dashboard.vue

@@ -1,192 +1,224 @@
 <template>
-    <view class="dashboard-page zx-page-linear">
-       <view class="dashboard">
-            <view class="shadow" :style="{ '--progress': progress + '%' }"></view>
-            <view class="spe-wrap">
-                <view class="spe-num">
-                    {{ speed }}
-                </view>
-                <view class="unit">km/h</view>
-            </view>
-            <view class="power-wrap">
-                <u-count-to :startVal="0" bold :endVal="progress" fontSize="48rpx" />
-            </view>
-        </view>
-
-        <view class="battery_life_progress">
-            <view class="is_progress">
-                <text>续航</text>
-                <text>46.5km</text>
-            </view>
-        </view>
-
-        <view class="info-container">
-            <view class="info-wrap" v-for="(item, index) in infoList" :key="index">
-                <view class="label">{{ item.label }}</view>
-                <view class="value">{{ 10 + index }} <text class="unit">{{ item.unit }}</text></view>
-            </view>
-        </view>
-    </view>
+	<view class="dashboard-page zx-page-linear">
+		<view class="dashboard">
+			<view class="shadow" :style="{ '--progress': progress + '%' }"></view>
+			<view class="spe-wrap">
+				<view class="spe-num">
+					{{ infoList.speed }}
+				</view>
+				<view class="unit">km/h</view>
+			</view>
+			<view class="power-wrap">
+				<u-count-to :startVal="0" bold :endVal="progress" fontSize="48rpx" />
+			</view>
+		</view>
+
+		<view class="battery_life_progress">
+			<view class="is_progress">
+				<text>续航</text>
+				<text>{{infoList.remain_mail}}km</text>
+			</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>
+				<view class="value">{{ item.prop }} <text class="unit">{{ item.unit }}</text></view>
+			</view>
+		</view>
+	</view>
 </template>
 
 
 <script>
-export default {
-    data() {
-        return {
-            speed: 50,
-            infoList: []
-        }
-    },
-    computed: {
-        progress() {
-            const MAX_SPEED = 120;
-            return this.speed / MAX_SPEED * 100
-        }
-    },
-    created() {
-        this._initInfoList()
-    },
-    methods: {
-        _initInfoList() {
-            this.infoList = [
-                { label: '骑行里程', prop: 'km', unit: 'km' },
-                { label: '骑行时长', prop: 'km', unit: 'h' },
-                { label: '最大速度', prop: 'km', unit: 'km/h' },
-                { label: '平均速度', prop: 'km', unit: 'km/h' },
-            ]
-        }
-    }
-}
+	var config_gyq = require('../../common/config_gyq.js');
+	var common = require('../../common/common.js');
+	var request = require('../../common/request');
+	export default {
+		data() {
+			return {
+				speed: 50,
+				infoList: {}
+			}
+		},
+		computed: {
+			progress() {
+				const MAX_SPEED = 120;
+				return this.infoList.speed / MAX_SPEED * 100
+			}
+		},
+		created() {
+			this._initInfoList()
+		},
+		methods: {
+			async _initInfoList() {
+				let car_sn = uni.getStorageSync('car_info').car_sn
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_CAR_DASHBOARD, {
+					car_sn
+				})
+				if (data.code == 200) {
+					this.infoList = data.data.data
+					this.infoList.list = [{
+							label: '骑行里程',
+							prop: this.infoList.current_mail || 0,
+							unit: 'km'
+						},
+						{
+							label: '骑行时长',
+							prop: this.infoList.current_time || 0,
+							unit: 'h'
+						},
+						{
+							label: '最大速度',
+							prop: this.infoList.max_speed || 0,
+							unit: 'km/h'
+						},
+						{
+							label: '平均速度',
+							prop: this.infoList.avg_speed || 0,
+							unit: 'km/h'
+						},
+					]
+				} else {
+					common.simpleToast(data.msg)
+				}
+
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-@import "@/libs/css/layout.scss";
-
-.dashboard-page {
-    padding: 24rpx 32rpx 0;
-    min-height: calc(100vh - 100rpx);
-
-    .dashboard {
-        width: 554rpx;
-        height: 554rpx;
-        margin: 0 auto 58rpx;
-        background: url('https://qiniu.bms16.com/Ftwa7u9tJYw3XSLaXYvrDyGNRuD5');
-        background-size: 100%;
-        position: relative;
-        .shadow {
-            box-shadow: inset 0rpx 2rpx 6rpx 0rpx #fff;
-            width: 490rpx;
-            height: 502rpx;
-            position: relative;
-            top: 20rpx;
-            left: 50%;
-            transform: translateX(-50%);
-            border-radius: 50%;
-            background: conic-gradient(from -122deg, #0A59F7 0%, #20FFCA var(--progress), #F3F8FF 0% 245deg, transparent 245deg 360deg);
-            mask: radial-gradient(transparent 200rpx, #000 200rpx);
-            -webkit-mask: radial-gradient(transparent 210rpx, #000 213rpx);
-        }
-
-        .spe-wrap {
-            width: 218rpx;
-            height: 218rpx;
-            background: #0A59F7;
-            border-radius: 50%;
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            transform: translate(-50%, -50%);
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            flex-direction: column;
-            color: #fff;
-            .spe-num {
-                font-family: Futura, Futura;
-                font-weight: bold;
-                font-size: 80rpx;
-                color: #FFFFFF;
-                line-height: 64rpx;
-                text-align: center;
-                font-style: normal;
-                margin-bottom: 16rpx;
-            }
-            .unit {
-                line-height: 28rpx;
-                font-style: italic;
-            }
-        }
-
-        .power-wrap {
-            width: 230rpx;
-            height: 104rpx;
-            background: #D6E7FF;
-            border-radius: 64rpx;
-            position: absolute;
-            bottom: 22rpx;
-            left: 50%;
-            transform: translateX(-50%);
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-family: Futura, Futura;
-            font-weight: bold;
-            font-size: 48rpx;
-            color: #060809;
-        }
-    }
-
-    .battery_life_progress {
-        width: 100%;
-        margin-bottom: 40rpx;
-        background: #FFFFFF;
-        border-radius: 40rpx;
-        padding: 6rpx;
-        overflow: hidden;
-
-        .is_progress {
-            width: 50%;
-            height: 100%;
-            padding: 16rpx 32rpx;
-            background: #0A59F7;
-            border-radius: 36rpx;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            color: #fff;
-            font-size: 36rpx;
-        }
-    }
-
-    .info-container {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-
-        .info-wrap {
-            width: 336rpx;
-            margin-bottom: 14rpx;
-            background: #FFFFFF;
-            border-radius: 40rpx;
-            padding: 32rpx 24rpx;
-
-            .label {
-                font-size: 28rpx;
-                color: #060809;
-                margin-bottom: 24rpx;
-            }
-
-            .value {
-                font-size: 48rpx;
-
-                .unit {
-                    margin-left: 8rpx;
-                    font-size: 28rpx;
-                }
-            }
-        }
-    }
-}
-
+	@import "@/libs/css/layout.scss";
+
+	.dashboard-page {
+		padding: 24rpx 32rpx 0;
+		min-height: calc(100vh - 100rpx);
+
+		.dashboard {
+			width: 554rpx;
+			height: 554rpx;
+			margin: 0 auto 58rpx;
+			background: url('https://qiniu.bms16.com/Ftwa7u9tJYw3XSLaXYvrDyGNRuD5');
+			background-size: 100%;
+			position: relative;
+
+			.shadow {
+				box-shadow: inset 0rpx 2rpx 6rpx 0rpx #fff;
+				width: 490rpx;
+				height: 502rpx;
+				position: relative;
+				top: 20rpx;
+				left: 50%;
+				transform: translateX(-50%);
+				border-radius: 50%;
+				background: conic-gradient(from -122deg, #0A59F7 0%, #20FFCA var(--progress), #F3F8FF 0% 245deg, transparent 245deg 360deg);
+				mask: radial-gradient(transparent 200rpx, #000 200rpx);
+				-webkit-mask: radial-gradient(transparent 210rpx, #000 213rpx);
+			}
+
+			.spe-wrap {
+				width: 218rpx;
+				height: 218rpx;
+				background: #0A59F7;
+				border-radius: 50%;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+				color: #fff;
+
+				.spe-num {
+					font-family: Futura, Futura;
+					font-weight: bold;
+					font-size: 80rpx;
+					color: #FFFFFF;
+					line-height: 64rpx;
+					text-align: center;
+					font-style: normal;
+					margin-bottom: 16rpx;
+				}
+
+				.unit {
+					line-height: 28rpx;
+					font-style: italic;
+				}
+			}
+
+			.power-wrap {
+				width: 230rpx;
+				height: 104rpx;
+				background: #D6E7FF;
+				border-radius: 64rpx;
+				position: absolute;
+				bottom: 22rpx;
+				left: 50%;
+				transform: translateX(-50%);
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-family: Futura, Futura;
+				font-weight: bold;
+				font-size: 48rpx;
+				color: #060809;
+			}
+		}
+
+		.battery_life_progress {
+			width: 100%;
+			margin-bottom: 40rpx;
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			padding: 6rpx;
+			overflow: hidden;
+
+			.is_progress {
+				width: 50%;
+				height: 100%;
+				padding: 16rpx 32rpx;
+				background: #0A59F7;
+				border-radius: 36rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				color: #fff;
+				font-size: 36rpx;
+			}
+		}
+
+		.info-container {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.info-wrap {
+				width: 336rpx;
+				margin-bottom: 14rpx;
+				background: #FFFFFF;
+				border-radius: 40rpx;
+				padding: 32rpx 24rpx;
+
+				.label {
+					font-size: 28rpx;
+					color: #060809;
+					margin-bottom: 24rpx;
+				}
+
+				.value {
+					font-size: 48rpx;
+
+					.unit {
+						margin-left: 8rpx;
+						font-size: 28rpx;
+					}
+				}
+			}
+		}
+	}
 </style>

pages/index/index.vue

@@ -72,10 +72,10 @@
 					</view>
 					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 				</view>
-				<view @tap="navToPage" class="flex-row config-car-view">
+				<view @click="srcFn(`/pages/deviceInfo/deviceInfo`)" class="flex-row config-car-view">
 					<view class="margin_r_20"><img class="icon_style_64" src="https://qiniu.bms16.com/FsAg6mHEBJfbtpgIHBrDdNiPo1iH" alt=""></view>
 					<view class="flex-row config-text-view">
-						<view class="flex-row font_w_600">{{$t("设备信息")}}</view>
+						<view  class="flex-row font_w_600">{{$t("设备信息")}}</view>
 						<view class="flex-row tip-text-config">{{$t("软件版本")}}</view>
 					</view>
 					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
@@ -109,6 +109,7 @@ import {
 	} from '@/common/storage.js';
 
 	export default {
+		
 		data() {
 			return {
 				contrilList:[],
@@ -224,6 +225,11 @@ import {
 					}
 				})
 			},
+			srcFn(url){
+				uni.navigateTo({
+					url: url
+				});
+			},
 			navToPage(e) {
 				const me = this
 				const url = e.currentTarget.dataset.url;

pages/my/my.vue

@@ -80,7 +80,7 @@
     computed: {
       commonTabs() {
         return [
-          { name: `${this.$t('我的车辆')}`, url: '/pages/mileageStatistics/index', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+          { name: `${this.$t('我的车辆')}`, url: '/pages/dashboard/dashboard', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
           { name: `${this.$t('用车人')}`, url: '/pages/userManagement/userManagement', icon: 'FnxGW52BCkTkK9HxsTdVrghU7B4D' },
           { name: `${this.$t('换电套餐')}`, jumpCheck: 'combo', url: '', icon: 'FsOsd1SxYDHDm00aiwrTib_k0Mbr' }
         ]