bug修改

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)
 				})

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

@@ -21,7 +21,6 @@
 				<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>

pages/index/index.vue

@@ -360,7 +360,6 @@
 				})
 			},
 			toMoreInfoPage() {
-				console.log(1111);
 				uni.navigateTo({
 					url: '/pages/moreInfo/moreInfo',
 				});

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>
@@ -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/storeDetails/storeDetails.vue

@@ -121,7 +121,7 @@
 			</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>