bug修改

component/googleMap/googleMap.vue

@@ -187,9 +187,8 @@
 			},
 			//点击marker触发
 			loadMarkertap(marker, item) {
-				let markerId = marker.data.markerId
-				console.log(marker.data)
-				if (markerId == 5000) return
+				let markerId = marker.data.id
+				if (markerId == 50000) return
 				if (this.types == 1) this.shopMarkerFn(marker, item)
 				if (this.types == 2) this.nearCabinetMarkerFn(marker, item)
 				// if(this.type == 3) this.shopMarkerFn(marker)

pages/index/index.vue

@@ -31,11 +31,11 @@
 						<view class="overdue-view-text flex-row">
 							<text class="overdue-text-left">{{$t("您已逾期")}}
 								<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">{{$t("日")}}</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
-											v-if="orderInfo.hire_duration_time.hour>0">{{$t("小时")}}</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
-											v-if="orderInfo.hire_duration_time.minute>0">{{$t("分")}}</text>
+									<block v-if="car_info.hire_duration_time">
+										{{car_info.hire_duration_time.day > 0 ? car_info.hire_duration_time.day :'' }}<text
+											v-if="car_info.hire_duration_time.day>0">{{$t("日")}}</text>{{car_info.hire_duration_time.hour > 0 ? car_info.hire_duration_time.hour :'' }}<text
+											v-if="car_info.hire_duration_time.hour>0">{{$t("小时")}}</text>{{car_info.hire_duration_time.minute > 0 ? car_info.hire_duration_time.minute :'' }}<text
+											v-if="car_info.hire_duration_time.minute>0">{{$t("分")}}</text>
 									</block>
 								</text>
 							</text>
@@ -199,6 +199,7 @@
 	export default {
 		data() {
 			return {
+				orderInfo:{},
 				time:null,
 				isModel: false,
 				isConnected: false,

utils/util.js

@@ -2,7 +2,10 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration);
 const systemInfo = uni.getSystemInfoSync();
- const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
+console.log(systemInfo.language)
+
+ // const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
+ const Language ='zh' // 'zh' | 'en'
 const formatTime = (date) => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;