兼容性修改

component/customTabbar/index.vue

@@ -1,21 +1,24 @@
 <template>
-	<view class="tabbar-wrap">
-		<view class="tabbar">
-			<view v-for="(item, index) in tabs" :key="index" class="tab-item" @tap="routerPush(item.url)">
-				<image :src="curtTab === item.name ? item.activeIcon : item.icon" class="tab-icon"></image>
-				<text :class="['base-text', curtTab === item.name && 'checked']">{{ item.label }}</text>
-			</view>
-			<view v-if="!isScanCondeRentalCar" class="center-entrance" @tap="navToInputPage">
-
-				<image src="https://qiniu.bms16.com/Fm_kDVr1TIeIbbBW6-5bz0r-cECO"
-					style="width: 122rpx; height: 122rpx;"></image>
-				<!-- <img src="https://qiniu.bms16.com/FhCHLz8rQJ5mpJ6nUA4RbKiVkUOo" style="width: 120rpx; height: 24rpx;"/> -->
-			</view>
-			<view v-else class="center-entrance" @tap="navToInputPage">
-				<!-- <img src="https://qiniu.bms16.com/FqcCjRjhzHFUkZj76SMHNXCZHwb3" style="width: 122rpx; height: 122rpx;margin-bottom: 14rpx;"/> -->
-				<image src="https://qiniu.bms16.com/FqcCjRjhzHFUkZj76SMHNXCZHwb3"
-					style="width: 122rpx; height: 122rpx;margin-bottom: 14rpx;"></image>
-				<view class="scan-text">扫一扫</view>
+	<view class="">
+		<!-- <view style="height: 1000rpx;"></view> -->
+		<view class="tabbar-wrap">
+			<view class="tabbar">
+				<view v-for="(item, index) in tabs" :key="index" class="tab-item" @tap="routerPush(item.url)">
+					<image :src="curtTab === item.name ? item.activeIcon : item.icon" class="tab-icon"></image>
+					<text :class="['base-text', curtTab === item.name && 'checked']">{{ item.label }}</text>
+				</view>
+				<view v-if="!isScanCondeRentalCar" class="center-entrance" @tap="navToInputPages">
+		
+					<image src="https://qiniu.bms16.com/Fm_kDVr1TIeIbbBW6-5bz0r-cECO"
+						style="width: 122rpx; height: 122rpx;"></image>
+					<!-- <img src="https://qiniu.bms16.com/FhCHLz8rQJ5mpJ6nUA4RbKiVkUOo" style="width: 120rpx; height: 24rpx;"/> -->
+				</view>
+				<view v-else class="center-entrance" @tap="navToInputPages">
+					<!-- <img src="https://qiniu.bms16.com/FqcCjRjhzHFUkZj76SMHNXCZHwb3" style="width: 122rpx; height: 122rpx;margin-bottom: 14rpx;"/> -->
+					<image src="https://qiniu.bms16.com/FqcCjRjhzHFUkZj76SMHNXCZHwb3"
+						style="width: 122rpx; height: 122rpx;margin-bottom: 14rpx;"></image>
+					<view class="scan-text">扫一扫</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -96,10 +99,14 @@
 				// uni.navigateTo({ url })
 			},
 
-			async navToInputPage() {
+			async navToInputPages() {
 				const me = this
-				if (!this.loadIsLogin()) false
-
+				if (!this.loadIsLogin()) return
+				uni.scanCode({
+					success(res) {
+						me.loadGeneralQRData(res.result)
+					}
+				})
 			},
 			loadGeneralQRData(options) {
 				if (('q' in options) || ('result' in options) && (options.result.indexOf(

component/googleMap/googleMap.vue

@@ -1,7 +1,9 @@
 <template>
 	<view class="content">
 		<view id="container">
-			<view :style="{width:width,height:height}" :keyId='keyId' :change:keyId='keyId' :id="`mapModule` + keyId"  :prop="mapData" :change:prop="mapModule.update" :lngLat="myLocation" :change:lngLat="mapModule.initAmap"></view>
+			<view :style="{width:width,height:height}" :keyId='keyId' :change:keyId='keyId' :id="`mapModule` + keyId"
+				:prop="mapData" :change:prop="mapModule.update" :lngLat="myLocation"
+				:change:lngLat="mapModule.initAmap"></view>
 
 		</view>
 	</view>
@@ -14,12 +16,12 @@
 	export default {
 		data() {
 			return {
-				trackPolyline:null,
-				polylines:{},
-				zoom:14,
-				keyId:'',
-				types:1,
-				Markers:[],
+				trackPolyline: null,
+				polylines: {},
+				zoom: 14,
+				keyId: '',
+				types: 1,
+				Markers: [],
 				markersArray: [],
 				infoWindow: {},
 				selectedMarker: null,
@@ -92,31 +94,31 @@
 				new google.maps.event.addListener(_this.map, "click", function(event) {
 					_this.$ownerInstance.callMethod('bindTapMap')
 				});
-				
 				//如果有polylines则添加
-				
-				if(_this.polylines.points.length > 0){
+				if (_this.polylines?.points?.length > 0) {
 					console.log('添加轨迹')
 					console.log(_this.polylines.points)
-					let path = _this.polylines.points.map(item=>{
+					let path = _this.polylines.points.map(item => {
 						return {
-							lng:item.lng,
-							lat:item.lat
+							lng: item.lng,
+							lat: item.lat
 						}
 					})
-				_this.trackPolyline = new google.maps.Polyline({
-				    path: path,
-				    // geodesic: true,          // 沿地球曲率连线
-				    strokeColor: _this.polylines.color,  // 轨迹线颜色
-				    strokeOpacity: 1.0,      // 透明度
-				    strokeWeight: 3          // 线宽
-				  });
-				  // 更新轨迹线的路径
-				    _this.trackPolyline.setMap(_this.map);
-					
-				    // 可选：自动移动地图中心到最新位置
-				    _this.map.panTo(path[path.length - 1]);
+
+					_this.trackPolyline = new google.maps.Polyline({
+						path: path,
+						// geodesic: true,          // 沿地球曲率连线
+						strokeColor: _this.polylines.color, // 轨迹线颜色
+						strokeOpacity: 1.0, // 透明度
+						strokeWeight: 3 // 线宽
+					});
+					// 更新轨迹线的路径
+					_this.trackPolyline.setMap(_this.map);
+
+					// 可选：自动移动地图中心到最新位置
+					_this.map.panTo(path[path.length - 1]);
 				}
+				
 				//如果有Markers则添加
 				if (_this.Markers.length > 0) {
 					_this.addMarkers(_this.$ownerInstance)
@@ -134,7 +136,7 @@
 			},
 			AddMarker(item) {
 				let label = null
-				if(this.types == 2 && item.id != 50000){
+				if (this.types == 2 && item.id != 50000) {
 					label = {
 						text: item.content,
 						className: "map-label-num",
@@ -172,8 +174,9 @@
 			},
 
 			update(newValue, _, ownerInstance) {
-				if(newValue.zoom) this.zoom = newValue.zoom || 14
-				if(newValue.polylines.points.length > 0) this.polylines = newValue.polylines
+				if (newValue.zoom) this.zoom = newValue.zoom || 14
+				if (newValue.polylines && newValue.polylines.points && newValue.polylines.points.length > 0) this
+					.polylines = newValue.polylines
 				if (newValue.markers && newValue.markers.length < 1) return
 				this.Markers = newValue.markers || []
 				this.types = newValue.type
@@ -249,11 +252,11 @@
 <script>
 	export default {
 		props: {
-			keyId:{
+			keyId: {
 				type: String,
 				default: '0'
 			},
-			id:{
+			id: {
 				type: String,
 				default: 'mapModule'
 			},
@@ -269,8 +272,8 @@
 			 * @param type  1 //1门店  2 换电柜  3其他 
 			 * @param Markers   //Markers数据 
 			 * @param * 后续数据随便添加
-			**/
-			mapData: { 
+			 **/
+			mapData: {
 				type: Object,
 				required: true //必填项
 			},
@@ -282,7 +285,7 @@
 		},
 		data() {
 			return {
-				
+
 			};
 		},
 		mounted() {},

manifest.json

@@ -2,7 +2,7 @@
     "name" : "弗兰克",
     "appid" : "__UNI__111A022",
     "description" : "",
-    "versionName" : "1.3.0",
+    "versionName" : "1.3.1",
     "versionCode" : 130,
     "transformPx" : false,
     "loadnativePlugins" : false,

pages/index/components/mapCard/mapCard.vue

@@ -1,29 +1,34 @@
 <template>
 	<view class="container-view-car" @tap="navCarLocation">
 		<!-- #ifdef APP -->
-		<view style="width:300rpx;height: 258rpx;" class="map">
-			<googleMap keyId="1" width='300rpx' height='258rpx' v-if="latitude"  :mapData="{type:3}" :myLocation='{
-				longitude,
-				latitude
+		<view style="width:100%;height: 258rpx;" class="map">
+			<cover-view  class="top-car-location">
+				<cover-image class='img' style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FrKY7Ex5za22plr39ddIsJcjFVpi" ></cover-image>
+				<cover-view class="text">车辆位置</cover-view>
+			</cover-view>
+			<googleMap keyId="1" width='100%' height='258rpx' v-if="car_info.latitude"  :mapData="{type:3}" :myLocation='{
+				longitude:car_info.longitude,
+				latitude:car_info.latitude
 			}'></googleMap>
 		</view>
 		
 		<!-- #endif -->
 		<!-- #ifndef APP -->
-		<map class="map"  :longitude="longitude"
-			:latitude="latitude" scale="16" show-location style="width:300rpx;height: 258rpx;" :markers="carLocation">
+		<map class="map"  :longitude="car_info.longitude"
+			:latitude="car_info.latitude" scale="16" show-location style="width:300rpx;height: 258rpx;" :markers="carLocation">
 			<view class="top-car-location flex-row">
 				<img style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FrKY7Ex5za22plr39ddIsJcjFVpi" alt="">
 				<text>车辆位置</text>
 			</view>
 		</map>
 		<!-- #endif -->
-		
-		<view class="car-address">{{carAddress}}</view>
+		<view style="width:100%;" class="car-address">{{carAddress}}</view>
 	</view>
 </template>
 
 <script>
+	const http = require('@/common/request.js');
+	const config = require('@/common/config.js');
 	import googleMap from "@/component/googleMap/googleMap";
 	// component/nomore/nomore.js
 	export default {
@@ -31,28 +36,34 @@
 			googleMap,
 		},
 		data() {
-			return {};
+			return {
+				carAddress:'未知',
+				carLocation:[]
+			};
 		},
 		/**
 		 * 组件的属性列表
 		 */
 		props: {
-			longitude: {
-				type: String,
-				default: ''
-			},
-			latitude: {
-				type: String,
-				default: ''
-			},
-			carAddress: {
-				type: String,
-				default: ''
+			car_info: {
+				type: Object,
+				default: {}
 			},
-			carLocation:{
-				type:Array,
-				default:[]
-			}
+		},
+		
+		mounted() {
+			this.carLocation = [
+				{
+					id: 1345,
+					latitude: this.car_info.latitude,
+					longitude: this.car_info.longitude,
+					iconPath: 'https://qiniu.bms16.com/FjzP68_NSPJbde_JraN5dJRnyqqJ',
+					width: 60,
+					height: 60,
+				}
+			],
+			this.getAddressName(this.car_info.latitude,this.car_info.longitude)
+			
 		},
 		/**
 		 * 组件的方法列表
@@ -61,12 +72,30 @@
 			navCarLocation(){
 				const me=this
 				uni.navigateTo({
-					url: '/pages/carLocation/carLocation?longitude=' + me.longitude +'&latitude=' + me.latitude,
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {}
+					url: '/pages/carLocation/carLocation?longitude=' + me.car_info.longitude +'&latitude=' + me.car_info.latitude,
 				});
-			}
+			},
+			async getAddressName(latitude, longitude) {
+				const that = this
+				//#ifdef MP-ALIPAY
+				var _pi = "ali_index"
+				//#endif
+				//#ifdef MP-WEIXIN
+				var _pi = "wx_index"
+				//#endif
+				//#ifdef APP
+				var _pi = "APP"
+				//#endif
+				const location = {
+					lat: that.latitude,
+					lng: that.longitude,
+					pi: _pi
+				}
+				let {data} = await http.postApi(config.API_MAP_REGEO, location)
+				if(data.code == 200){
+					this.carAddress = data.data.data.address
+				}
+			},
 		}
 	};
 </script>
@@ -81,13 +110,28 @@
 	border-top-left-radius: 40rpx;
 	border-top-right-radius: 40rpx;
 	overflow: hidden;
+	position: relative;
+	box-sizing: border-box;
 }
 .top-car-location{
+	box-sizing: border-box;
+	position: absolute;
+	left: 0;
+	top: 0;
 	margin: 15rpx 0 0 15rpx;
+	display: flex;
 	align-items: center;
-	font-weight: 600;
-	font-size: 28rpx;
+}
+.top-car-location .text{
+	line-height: 1;
 	color: #060809;
+	font-weight: 500;
+	font-size: 28rpx;
+	height: 36rpx;
+	margin-left: 10rpx;
+}
+.top-car-location .img{
+	display: block;
 }
 .car-address{
 	font-weight: 400;

pages/index/index.vue

@@ -1,105 +1,135 @@
 <template>
-	<view >
+	<view>
 		<block v-if="isLogin && car_info.car_sn">
 			<view class="container-view">
-			<view class="flex-row flex-between align-center padding_about_40">
-				<view class="car-name-view" @tap="navSwitchCar">
-					<text style="margin-right: 10rpx;">{{car_info.car_name}}</text>
-					<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI" style="width: 14rpx;height: 14rpx;" alt="">
-				</view>
-				<view @click="routerLink('/pages/message/index')" class="news">
-					<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num"></view>
-					<image  src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx" style="width: 48rpx;height: 48rpx;" mode=""></image>
-				</view>
-			</view>
-			<view v-if="isOverdueShow" class="overdue-view flex-row flex-between">
-				<view class="overdue-view-text flex-row">
-					<text class="overdue-text-left">您已逾期 <text class="overdue-num">38</text>天</text>
-					<text style="font-size: 24rpx;opacity: 0.5;">请及时续费或归还车辆</text>
+				<view class="flex-row flex-between align-center padding_about_40">
+					<view class="car-name-view" @tap="navSwitchCar">
+						<text style="margin-right: 10rpx;">{{car_info.car_name}}</text>
+						<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI"
+							style="width: 14rpx;height: 14rpx;" alt="">
+					</view>
+					<view @click="routerLink('/pages/message/index')" class="news">
+						<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num"></view>
+						<image src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx"
+							style="width: 48rpx;height: 48rpx;" mode=""></image>
+					</view>
 				</view>
-				<view class="renew-btn">去续费</view>
-			</view>
-			<view class="car-img-view"  @tap="toMoreInfoPage">
-				<view class="quantity-view flex-row">
-					<text class="quantity flex-row">{{car_info.soc}} <text style="font-size: 28rpx;font-weight: 500;">%</text></text>
-					<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10" :show-percent="false" :percent="car_info.soc"></u-line-progress>
-					<text class="quantity-text flex-row">
-						<text style="font-weight:400;font-size: 22rpx;">{{$t("续航")}}</text>
-						<text style="font-size: 36rpx;">{{car_info.endurance}}</text><text style="font-size: 30rpx;">km</text> 
-					</text>
+				<view v-if="isOverdueShow" class="overdue-view flex-row flex-between">
+					<view class="overdue-view-text flex-row">
+						<text class="overdue-text-left">您已逾期
+							<text class="overdue-num">
+								<block v-if="orderInfo.hire_duration_time">
+									{{orderInfo.hire_duration_time.day > 0 ? orderInfo.hire_duration_time.day :'' }}<text
+										v-if="orderInfo.hire_duration_time.day>0">日</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
+										v-if="orderInfo.hire_duration_time.hour>0">小时</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
+										v-if="orderInfo.hire_duration_time.minute>0">分</text>
+								</block>
+							</text>
+						</text>
+						<text style="font-size: 24rpx;opacity: 0.5;">请及时续费或归还车辆</text>
+					</view>
+					<view @click="routerLink('/pages/order/order')" class="renew-btn">去续费</view>
 				</view>
-				<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
-				<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt="">
-				<view class="flex-row align-center update-time-view" >
-					<text style="margin-right: 10rpx;">{{$t("车辆已关机")}} </text>
-					<text style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time|| ''}}11-25 23:05 </text>
-					<img src="https://qiniu.bms16.com/FsL6XWGoIhfsVB7jRg6EGFVsuaTZ" style="width: 24rpx;height: 32rpx;" alt="">
+				<view class="car-img-view" @tap="toMoreInfoPage">
+					<view class="quantity-view flex-row">
+						<text class="quantity flex-row">{{car_info.soc}} <text
+								style="font-size: 28rpx;font-weight: 500;">%</text></text>
+						<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10" :show-percent="false"
+							:percent="car_info.soc"></u-line-progress>
+						<text class="quantity-text flex-row">
+							<text style="font-weight:400;font-size: 22rpx;">{{$t("续航")}}</text>
+							<text style="font-size: 36rpx;">{{car_info.endurance}}</text><text
+								style="font-size: 30rpx;">km</text>
+						</text>
+					</view>
+					<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
+					<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
+						style="width: 100%;height: 526rpx;" alt="">
+					<view class="flex-row align-center update-time-view">
+						<text style="margin-right: 10rpx;">{{$t("车辆已关机")}} </text>
+						<text style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time|| ''}}11-25 23:05 </text>
+						<img src="https://qiniu.bms16.com/FsL6XWGoIhfsVB7jRg6EGFVsuaTZ"
+							style="width: 24rpx;height: 32rpx;" alt="">
+					</view>
 				</view>
-			</view>
-			<Control :contrilList="contrilList" />
-			
-			
-			<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time" class="flex-row flex-between map-card-view" >
-				<MapCard latitude="23.099994" longitude="113.324004" :carAddress="carAddress" :carLocation="carLocation"/>
-				
-				<view class="card-right">
-					<view class="card-bg" @tap="navTravelingTrack">
-						<view class="flex-row flex-between card-top-title">
-							<view class="flex-row align-center">
-								<img style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FkrcMCV__HraZ0W0NBNdEZPIlwss" alt="">
-								<text class="margin_l_8">{{isTrackOrAll?'最近骑行':'总里程'}}</text>
+				<Control :contrilList="contrilList" />
+
+
+				<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time"
+					class="flex-row flex-between map-card-view">
+					<MapCard :car_info="car_info" />
+
+					<view class="card-right">
+						<view class="card-bg" @tap="navTravelingTrack">
+							<view class="flex-row flex-between card-top-title">
+								<view class="flex-row align-center">
+									<img style="width: 36rpx;height: 36rpx;"
+										src="https://qiniu.bms16.com/FkrcMCV__HraZ0W0NBNdEZPIlwss" alt="">
+									<text class="margin_l_8">{{isTrackOrAll?'最近骑行':'总里程'}}</text>
+								</view>
+								<view @tap.stop="isTrackOrAll=!isTrackOrAll"><img style="width: 24rpx;height: 20rpx;"
+										src="https://qiniu.bms16.com/FltPK-o7KGS3dQ2pfQHXGSxOdzaN" alt=""></view>
 							</view>
-							<view @tap.stop="isTrackOrAll=!isTrackOrAll"><img style="width: 24rpx;height: 20rpx;" src="https://qiniu.bms16.com/FltPK-o7KGS3dQ2pfQHXGSxOdzaN" alt=""></view>
+							<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text></view>
 						</view>
-						<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text></view>
-					</view>
-					
-					<view class="card-bg">
-						<view class="flex-row card-top-title">
-							<img style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FtalApKa3STyruaBxxRB4O9hHXyE" alt="">
-							<text class="margin_l_8">{{$t("换电套餐")}}</text>
+
+						<view class="card-bg">
+							<view class="flex-row card-top-title">
+								<img style="width: 36rpx;height: 36rpx;"
+									src="https://qiniu.bms16.com/FtalApKa3STyruaBxxRB4O9hHXyE" alt="">
+								<text class="margin_l_8">{{$t("换电套餐")}}</text>
+							</view>
+							<view v-if="car_info.package_type == 1" class=" card-top-text">
+								{{calculateRemainingDays(car_info.exchange_package_info.expire_time)}} <text
+									class="font_24">{{$t("天")}}</text>
+							</view>
+							<view v-if="car_info.package_type == 2" class=" card-top-text">{{item.last_num}} <text
+									class="font_24">{{$t("次")}}</text></view>
+							<view v-if="car_info.package_type == 3" class=" card-top-text">
+								{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text class="font_24">{{$t("次")}}</text>
+							</view>
 						</view>
-						<view v-if="car_info.package_type == 1" class=" card-top-text">{{calculateRemainingDays(car_info.exchange_package_info.expire_time)}} <text class="font_24">{{$t("天")}}</text></view>
-						<view v-if="car_info.package_type == 2" class=" card-top-text">{{item.last_num}} <text class="font_24">{{$t("次")}}</text></view>
-						<view v-if="car_info.package_type == 3" class=" card-top-text">{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text class="font_24">{{$t("次")}}</text></view>
 					</view>
 				</view>
-			</view>
-			<view class="config-view">
-				<view @tap="navToPage"  class="flex-row config-car-view">
-					<view class="margin_r_20"><img class="icon_style_64" src="https://qiniu.bms16.com/Ftzyvs5whxDdMFksYChHaWKVb0Uk" alt=""></view>
-					<view class="flex-row config-text-view" @tap="inductiveUnlockHandle">
-						<view class="flex-row font_w_600">{{$t("感应解锁")}}</view>
-						<view class="flex-row tip-text-config">{{$t("请先链接蓝牙")}}</view>
+				<view class="config-view">
+					<view @tap="navToPage" class="flex-row config-car-view">
+						<view class="margin_r_20"><img class="icon_style_64"
+								src="https://qiniu.bms16.com/Ftzyvs5whxDdMFksYChHaWKVb0Uk" alt=""></view>
+						<view class="flex-row config-text-view" @tap="inductiveUnlockHandle">
+							<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="">
 					</view>
-					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
-				</view>
-				<view @tap="navToPage"  data-url="/pages/userManagement/userManagement"  class="flex-row config-car-view">
-					<view class="margin_r_20"><img class="icon_style_64"  src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt=""></view>
-					<view class="flex-row config-text-view">
-						<view class="flex-row font_w_600">{{$t("用车人管理")}}</view>
-						<view class="flex-row tip-text-config">{{car_info.share_num + $t("个家庭账号")}}</view>
+					<view @tap="navToPage" data-url="/pages/userManagement/userManagement"
+						class="flex-row config-car-view">
+						<view class="margin_r_20"><img class="icon_style_64"
+								src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt=""></view>
+						<view class="flex-row config-text-view">
+							<view class="flex-row font_w_600">{{$t("用车人管理")}}</view>
+							<view class="flex-row tip-text-config">{{car_info.share_num + $t("个家庭账号")}}</view>
+						</view>
+						<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 					</view>
-					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
-				</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 tip-text-config">{{$t("软件版本") + (car_info.firmware||'')}}</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 tip-text-config">{{$t("软件版本") + (car_info.firmware||'')}}</view>
+						</view>
+						<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 					</view>
-					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 				</view>
-			</view>
-			<view style="height: 264rpx;"></view>
+				<view style="height: 264rpx;"></view>
 			</view>
 		</block>
-		
+
 		<block v-else>
 			<UnleasedPages :model_list="model_list" :img_list="img_list" />
 		</block>
 		<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />
-		<CustomTabbar @changCar='changCar' curt-tab="home"/>
+		<CustomTabbar @changCar='changCar' curt-tab="home" />
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -125,31 +155,19 @@
 	export default {
 		data() {
 			return {
-				newsList:{},
-				img_list:[],
-				isLogin:false,
-				isOverdueShow:false,
-				contrilList:[],
-				carLocation: [{
-					id: 1345,
-					latitude: 23.099994,
-					longitude: 113.324004,
-					iconPath: 'https://qiniu.bms16.com/FjzP68_NSPJbde_JraN5dJRnyqqJ',
-					width: 60,
-					height: 60,
-					customCallout: {
-						display: 'ALWAYS', // 'BYCLICK':点击显示; 'ALWAYS':常显
-					},
-				}], // 标记点
-				carAddress:'普宁升记炒饭肠粉百...',
-				isTrackOrAll:true,
-				model_list:[],
-				car_list:[],//用户车辆列表
-				car_sn:'',//当前车辆编号
-				isHideInduction:true,
-				car_info:{
-					exchange_package_info:{
-						activity_time:0
+				newsList: {},
+				img_list: [],
+				isLogin: false,
+				isOverdueShow: false,
+				contrilList: [],
+				isTrackOrAll: true,
+				model_list: [],
+				car_list: [], //用户车辆列表
+				car_sn: '', //当前车辆编号
+				isHideInduction: true,
+				car_info: {
+					exchange_package_info: {
+						activity_time: 0
 					}
 				}
 			};
@@ -167,12 +185,12 @@
 		 */
 		onLoad: function(options) {
 			this.locationFn()
-				this.loadModelList()
+			this.loadModelList()
 			const user_token = storage.getUserToken()
-				if (!user_token) {
-					this.loadIsLogin()
-					return
-				}
+			if (!user_token) {
+				this.loadIsLogin()
+				return
+			}
 		},
 		/**
 		 * 生命周期函数--监听页面显示
@@ -181,18 +199,20 @@
 			this.contrilList = getFunctionTag().activeTag
 			const user_token = storage.getUserToken()
 			this.car_info = uni.getStorageSync('car_info') || {};
-				if (!user_token) {
-					this.isLogin = false
-					//this.loadIsLogin()
-					
-					return
-				}
-				this.newsNumFn()
-				this.isLogin = true
-				if(!this.car_info.car_sn){
-					this.loadUserCarList()
-				}
-			
+			if (!user_token) {
+				this.isLogin = false
+				//this.loadIsLogin()
+
+				return
+			}
+			this.newsNumFn()
+			this.isLogin = true
+			if (!this.car_info.car_sn) {
+				this.loadUserCarList()
+			} else {
+				this.loadCarDetail(this.car_info.car_sn)
+			}
+
 		},
 		// 分享给好友
 		onShareAppMessage: function(res) { //发送给朋友
@@ -202,13 +222,15 @@
 			}
 		},
 		methods: {
-			async newsNumFn(){
-				let {data} = await request.postApi(config_gyq.API_FLK_MESSAGE_UNREAD_COUNT,{})
-				if(data.code == 200){
+			async newsNumFn() {
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_MESSAGE_UNREAD_COUNT, {})
+				if (data.code == 200) {
 					this.newsList = data.data
 				}
-				
-				
+
+
 			},
 			locationFn() {
 				uni.getLocation({
@@ -221,15 +243,15 @@
 					}
 				})
 			},
-			changCar(e){
+			changCar(e) {
 				this.car_info = e
 			},
-			routerLink(url){
+			routerLink(url) {
 				uni.navigateTo({
 					url
 				})
 			},
-			loadIsLogin(){
+			loadIsLogin() {
 				uni.showModal({
 					title: '提示',
 					content: '您还未登录，请先登录',
@@ -247,7 +269,7 @@
 					complete: function(res) {},
 				})
 			},
-			connectBluetooth(){
+			connectBluetooth() {
 				var device = {
 					mac_id: "900000997",
 					btid: "900000997",
@@ -256,55 +278,58 @@
 					device_type: "ZXCar"
 				};
 			},
-			toMoreInfoPage(){
+			toMoreInfoPage() {
 				uni.navigateTo({
 					url: '/pages/moreInfo/moreInfo',
 				});
 			},
-			navTravelingTrack(){
+			navTravelingTrack() {
 				uni.navigateTo({
-					url: '/pages/travelingTrack/travelingTrack?longitude=' + this.longitude +'&latitude=' + this.latitude,
+					url: '/pages/travelingTrack/travelingTrack?longitude=' + this.longitude + '&latitude=' + this
+						.latitude,
 					success: function(res) {},
 					fail: function(res) {},
 					complete: function(res) {}
 				});
 			},
 			inductiveUnlockHandle() {
-				this.isHideInduction=false
-				let isOpenAllPermission=false
-				app.globalData.permissionArr.map(item=>{
-					if(!item.state) isOpenAllPermission=true
+				this.isHideInduction = false
+				let isOpenAllPermission = false
+				app.globalData.permissionArr.map(item => {
+					if (!item.state) isOpenAllPermission = true
 				})
 				// console.log(this.isOpenAllPermission,'this.isOpenAllPermission');
-				if(!isOpenAllPermission){
+				if (!isOpenAllPermission) {
 					common.simpleToast('所需权限开启成功,前往开启蓝牙配对...');
-					uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-				}else{
-					this.$refs.bluetoothUnlockAuth.open();	
+					uni.navigateTo({
+						url: '/pages/bluetoothUnlock/bluetoothPair'
+					})
+				} else {
+					this.$refs.bluetoothUnlockAuth.open();
 				}
-				
+
 			},
-			showInduction(){
-				this.isHideInduction=true
+			showInduction() {
+				this.isHideInduction = true
 			},
 			loadModelList() {
 				const me = this
 				http.postApi(config.API_RECOMMEND_CAR_MODEL_LIST, {}, (resp) => {
 					if (resp.data.code === 200) {
-						const list=resp.data.data
+						const list = resp.data.data
 						console.log('哈哈哈啊哈')
 						console.log(resp.data.data)
-						const img_list=resp.data.data.map(item=>item.image)
+						const img_list = resp.data.data.map(item => item.image)
 						me.setData({
-							model_list:list,
-							img_list:img_list
+							model_list: list,
+							img_list: img_list
 						})
 					} else {
 						common.simpleToast(resp.data.msg);
 					}
 				})
 			},
-			srcFn(url){
+			srcFn(url) {
 				uni.navigateTo({
 					url: url
 				});
@@ -362,17 +387,17 @@
 				// 	})
 				// }
 			},
-			loadUserCarList(){
+			loadUserCarList() {
 				const me = this
 				common.loading()
 				http.postApi(config.API_FLK_CAR_DEVICE_LIST, {}, (resp) => {
 					uni.hideLoading();
 					if (resp.data.code === 200) {
-						const list=resp.data.data.list
-						if(list.length > 0){
+						const list = resp.data.data.list
+						if (list.length > 0) {
 							me.setData({
-								car_list:list,
-								car_sn:list[0].car_sn||'',
+								car_list: list,
+								car_sn: list[0].car_sn || '',
 							})
 							me.loadCarDetail(list[0].car_sn)
 						}
@@ -381,27 +406,39 @@
 					}
 				})
 			},
-			loadCarDetail(car_sn){
+			loadCarDetail(car_sn) {
 				const me = this
 				common.loading()
-				http.postApi(config.API_FLK_CAR_DETAIL, {car_sn}, (resp) => {
+				http.postApi(config.API_FLK_CAR_DETAIL, {
+					car_sn
+				}, (resp) => {
 					uni.hideLoading();
 					if (resp.data.code === 200) {
 						resp.data.data.car_sn = car_sn
 						me.setData({
-							car_info:resp.data.data,
+							car_info: resp.data.data,
 						})
 						uni.setStorageSync('car_info', this.car_info);
+						//判断逾期
+						if(!resp.data.data.sold_time) return 
+						let time = Math.ceil(resp.data.data.hire_end_time - Math.floor(new Date()) / 1000) / 60
+						if (time > 0) {
+							this.isOverdueShow = true
+							this.car_info.hire_end_time = common.getTimeToDay(time)
+						} else {
+							this.isOverdueShow = false
+						}
+
 					} else {
 						common.simpleToast(resp.data.msg);
 					}
 				})
 			},
-			navSwitchCar(){
-				const me=this
+			navSwitchCar() {
+				const me = this
 				//如果租/购多个车辆的话可以切换当前车辆
 				uni.navigateTo({
-					url:  `/pages/carList/carList?list=${encodeURIComponent(JSON.stringify(me.car_list))}&car_sn=${me.car_sn}`,
+					url: `/pages/carList/carList?list=${encodeURIComponent(JSON.stringify(me.car_list))}&car_sn=${me.car_sn}`,
 				})
 			}
 
@@ -411,9 +448,11 @@
 
 <style lang="scss" scoped>
 	@import './index.css';
-	.news{
+
+	.news {
 		position: relative;
-		.num{
+
+		.num {
 			position: absolute;
 			right: 0;
 			top: 0;

pages/orderStatus/orderStatus.vue

@@ -526,6 +526,7 @@
 						} else {
 							if (me.orderInfo.order_status == 4) {
 								me.overdueMoneyFn(me.orderInfo.car_sn)
+								
 								me.orderInfo.hire_duration_time = common.getTimeToDay(Math
 									.ceil(Math
 										.floor(new Date()) / 1000 - me.orderInfo

pages/service/service.vue

@@ -1,22 +1,23 @@
 <template>
 	<view class="service-main">
 		<!-- #ifdef MP-WEIXIN -->
-			<map @markertap='markertapFn' class="my_app" id="myMap" :longitude="myLocation.longitude"
-				:latitude="myLocation.latitude" :scale="18" show-location enable-3D show-compass enable-overlooking
-				:enable-satellite="false" :markers="markers" :polyline="polylines" :enable-traffic="false"
-				style="width: 100%; height: calc(50vh - 0rpx)">
-				<block v-for="(item, index) in nearCabinetList" :key="index">
-					<cover-view v-if="selectType === 'cabinet'" slot="callout" :marker-id="item.id" class="mark blue_bg">
-						{{ item.available_cnt }}
-					</cover-view>
-				</block>
-			</map>
+		<map @markertap='markertapFn' class="my_app" id="myMap" :longitude="myLocation.longitude"
+			:latitude="myLocation.latitude" :scale="18" show-location enable-3D show-compass enable-overlooking
+			:enable-satellite="false" :markers="markers" :polyline="polylines" :enable-traffic="false"
+			style="width: 100%; height: calc(50vh - 0rpx)">
+			<block v-for="(item, index) in nearCabinetList" :key="index">
+				<cover-view v-if="selectType === 'cabinet'" slot="callout" :marker-id="item.id" class="mark blue_bg">
+					{{ item.available_cnt }}
+				</cover-view>
+			</block>
+		</map>
 		<!-- #endif -->
-		
+
 		<!-- #ifdef APP -->
-		<googleMap keyId="1" width="100%" height='calc(50vh - 0rpx)'   @click="changMarkertap"  v-if="myLocation.latitude" :mapData='markers' :myLocation='myLocation'  ></googleMap>
+		<googleMap keyId="1" width="100%" height='calc(50vh - 0rpx)' @click="changMarkertap" v-if="myLocation.latitude"
+			:mapData='markers' :myLocation='myLocation'></googleMap>
 		<!-- #endif -->
-		
+
 		<!-- 地图控件 -->
 		<cover-view :class="[
         'control-icon-view',
@@ -102,7 +103,7 @@
 					longitude: 0,
 				},
 				selectType: "store",
-				type:1,
+				type: 1,
 				nearStoreList: [],
 				nearCabinetList: [],
 				markers: {},
@@ -130,13 +131,13 @@
 			this.loadModelType();
 			this.locationFn()
 		},
-		
+
 		methods: {
 			//点击图标跳转
-			changMarkertap(e){
+			changMarkertap(e) {
 				console.log(e)
 			},
-			
+
 			markertapFn(e) {
 				let markerId = e.markerId
 				if (markerId == 5000) return
@@ -216,7 +217,9 @@
 				http.postApi(config.API_NEAR_SHOP_LIST, pData, (resp) => {
 					if (resp.data.code == 200) {
 						me.markers = {}
-						let markers = {markers:[]}
+						let markers = {
+							markers: []
+						}
 						nearCabinetList = resp.data.data.list || [];
 						// if (nearCabinetList.length != 0) {
 						// 	nearCabinetList.forEach((store, index) => {
@@ -228,6 +231,7 @@
 						// 		store.iconPath = CABINET_ICON_URL;
 						// 	});
 						// }
+						console.log(markers.markers)
 						markers.markers = nearCabinetList.map(item => {
 							return {
 								width: 50,
@@ -237,10 +241,10 @@
 								latitude: item.latitude,
 								iconPath: CABINET_ICON_URL,
 								iconPathActive: SHOPSELECTIMG,
-								content:'233'
+								content: '233'
 							}
 						})
-						
+
 						this.getLocationPostion(this.myLocation, markers);
 						// console.log(nearCabinetList, "nearCabinetList");
 						me.setData({
@@ -277,7 +281,7 @@
 							latitude: item.latitude,
 							iconPath: CABINET_ICON_URLS,
 							iconPathActive: CABINET_ICON_URLS,
-							content:'21'
+							content: '21'
 						}
 					})
 					this.getLocationPostion(this.myLocation, markers);
@@ -289,7 +293,7 @@
 					common.simpleToast(data.msg);
 				}
 			},
-			
+
 			getLocationPostion(centerLocation, markers) {
 				const locationData = {
 					longitude: centerLocation.longitude,