bug修改

component/googleMap/googleMap.vue

@@ -49,8 +49,7 @@
 				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)
 				};
 
@@ -89,7 +88,10 @@
 				// 存储当前选中的 Marker
 				_this.selectedMarker = null;
 				_this.map = new google.maps.Map(document.getElementById("mapModule" + this.keyId), myOptions);
-
+				setTimeout(function() {
+					const elements = document.querySelectorAll(".gm-style-cc, .gmnoprint[role='menubar']");
+					elements.forEach(el => el.style.display = "none");
+				}, 800);
 				//地图绑定事件
 				new google.maps.event.addListener(_this.map, "click", function(event) {
 					_this.$ownerInstance.callMethod('bindTapMap')

pages/index/index.vue

@@ -51,7 +51,7 @@
 							</text>
 							<text style="font-size: 24rpx;opacity: 0.5;">{{$t("请及时续费或归还车辆")}}</text>
 						</view>
-						<view @click="routerLink('/pages/order/order')" class="renew-btn">{{$t("去续费")}}</view>
+						<view @click="$srcFn(`/pages/orderStatus/orderStatus?sub_sn=${this.car_info.sub_sn}`)" class="renew-btn">{{$t("去续费")}}</view>
 					</view>
 					<view class="car-img-view" >
 						<view v-if="!car_info.sold_time" class="flex-row flex-between" style="align-items: center;">
@@ -580,9 +580,10 @@
 				});
 			},
 			tapReturnCar() {
-				this.overdueMoneyFn(this.car_info.car_sn)
-				this.isShowReturnCar = true
-				console.log(this.isShowReturnCar)
+				uni.navigateTo({ url: `/pages/orderStatus/orderStatus?sub_sn=${this.car_info.sub_sn}&isReturn=true` })
+				// this.overdueMoneyFn(this.car_info.car_sn)
+				// this.isShowReturnCar = true
+				// console.log(this.isShowReturnCar)
 			},
 			//逾期费用计算
 			async overdueMoneyFn(car_sn) {

pages/orderStatus/orderStatus.vue

@@ -40,7 +40,7 @@
 							<block v-else>{{Number(orderInfo.hire_cycle) * (orderInfo.hire_duration)}}</block>
 						</view>
 						
-						<view class="red-status">{{((orderInfo.order_status == 2) || orderInfo.order_status == 3)?$t('租期剩余'):(orderInfo.order_status == 4 ? $t('逾期时长'):$t('租借周期'))}}·<text style="opacity: 0.4;">{{leaseUnits(orderInfo.hire_duration_unit)}}</text></view>
+						<view :class="orderInfo.order_status == 4?'red-status':''">{{((orderInfo.order_status == 2) || orderInfo.order_status == 3)?$t('租期剩余'):(orderInfo.order_status == 4 ? $t('逾期时长'):$t('租借周期'))}}·<text style="opacity: 0.4;">{{leaseUnits(orderInfo.hire_duration_unit)}}</text></view>
 						
 						<!-- <view v-if="(orderInfo.order_status == 2&&orderInfo.hire_type==2) || orderInfo.order_status == 3">
 							{{ $t('租期剩余') }}·{{ $t('天') }}</view>
@@ -247,7 +247,7 @@
 					<!-- 待激活 待取车-->
 					<view class="grow_1" v-if="orderInfo.order_status == 0 ||orderInfo.order_status == 1">
 						<view
-							v-if="(orderInfo.order_status == 0 ||orderInfo.order_status == 1 || orderInfo.pay_status == 5 || orderInfo.pay_status == 0) && orderInfo.order_type != 3"
+							v-if="(orderInfo.order_status == 0 ||orderInfo.order_status == 1 || orderInfo.pay_status == 5 || orderInfo.pay_status == 0) "
 							class="cancel" @tap="clickCancel">{{$t('结束订单')}}</view>
 							<view  @tap="callStorePhone" class="deposit-btn">{{$t('联系门店')}}</view>
 							<view v-if="orderInfo.order_status == 1" @tap="navToScan" class="sesame-btn ">{{$t('扫码绑定')}}</view>
@@ -263,7 +263,7 @@
 					<view class="grow_1" v-if="(orderInfo.order_status == 5||orderInfo.order_status == 6||orderInfo.order_status == 7||orderInfo.order_status == 8||orderInfo.order_status == 9)">
 						<view  @tap="callStorePhone" class="link-phone-btn">{{$t('联系门店')}}</view>
 					</view>	
-					<view class="grow_1" v-if="orderInfo.order_type == 3">
+					<view class="grow_1" v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type == 3 && orderInfo.pay_status != 5">
 						<view  @tap="callStorePhone" class="link-phone-btn">{{$t('联系门店')}}</view>
 					</view>	
 			</view>
@@ -406,6 +406,9 @@
 		 */
 		onLoad: function(options) {
 			this.sub_sn = options.sub_sn || ''
+			if(options.isReturn == 'true'){
+				this.isShowReturnCar = true
+			}
 			this.bindOrderInfo()
 		},
 		/**
@@ -621,9 +624,12 @@
 				}, (resp) => {
 					if (resp.data.code === 200) {
 						me.orderInfo = resp.data.data.order_info
+						me.selectType = me.orderInfo.hire_duration_unit
 						me.orderInfo.model_images = me.orderInfo.model_images.split(',')[0]
 						if(!me.orderInfo.address){
-							me.getAddressName(me.orderInfo.latitude,me.orderInfo.longitude)
+							if(me.orderInfo.latitude && me.orderInfo.longitude){
+								me.getAddressName(me.orderInfo.latitude,me.orderInfo.longitude)
+							}
 						}
 						
 						// 

pages/service/components/leaseType/leaseType.vue

@@ -1,194 +1,203 @@
 <template>
-    <view class="container-view-contril">
-		<u-popup zIndex='9999' v-model="showLeaseType" :mask-close-able='false' :closeable="false" mode="bottom" border-radius="32">
-		    <view class="bottom-popup">
-		        <view class="title">{{ selectType == 'cabinet' ? $t('车辆类型') : $t('租借类型')}}</view>
-		        <scroll-view style="max-height: 700rpx;" scroll-y>
-		        	<view class="item-wrap">
-		        	    <template v-if="selectType == 'cabinet'">
-		        	        <view 
-		        	            v-for="(item, index) in modelTypeList" 
-		        	            :class="['item', leaseType == item.name && 'checked']"
-		        	            :key="index"
-		        	            @click="leaseType = item.name"
-		        	        >
-		        	            {{ item.name }}
-		        	        </view>
-		        	    </template>
-		        	    <template v-if="selectType == 'store'" >
-		        	        <view class="">
-		        	        	<view class="flexs">
-		        	        		<view
-		        	        		    v-for="(item, index) in LEASE_TYPE_ARR" 
-		        	        		    :class="['item', leaseType == item.value && 'checked']"
-		        	        		    :key="index"
-		        	        		    @click="leaseType = item.value"
-		        	        			v-if="item.value != 100"
-		        	        		>
-		        	        		    {{ item.label }}
-		        	        		</view>
-		        	        	</view>
-		        	        	<view class="bugFlex">
-		        	        		  <view class="title">{{ $t('购买') }}</view>
-		        	        		  <u-switch v-model="buy"></u-switch>
-		        	        	</view>
-		        	        </view>
-							
-		        	    </template>
-		        	</view>
-		        </scroll-view>
-				
+	<view class="container-view-contril">
+		<u-popup zIndex='9999' v-model="showLeaseType" :mask-close-able='false' :closeable="false" mode="bottom"
+			border-radius="32">
+			<view class="bottom-popup">
+				<view class="title">{{ selectType == 'cabinet' ? $t('车辆类型') : $t('租借类型')}}</view>
+				<scroll-view style="max-height: 700rpx;" scroll-y>
+					<view class="item-wrap">
+						<template v-if="selectType == 'cabinet'">
+							<view v-for="(item, index) in modelTypeList"
+								:class="['item', leaseType == item.name && 'checked']" :key="index"
+								@click="leaseType = item.name">
+								{{ item.name }}
+							</view>
+						</template>
+						<template v-if="selectType == 'store'">
+							<view class="">
+								<view class="flexs">
+									<view v-for="(item, index) in LEASE_TYPE_ARR"
+										:class="['item', leaseType == item.value && 'checked']" :key="index"
+										@click="leaseType = item.value" v-if="item.value != 100">
+										{{ item.label }}
+									</view>
+								</view>
+								<view class="bugFlex">
+									<view class="title">{{ $t('购买') }}</view>
+									<u-switch v-model="buy"></u-switch>
+								</view>
+							</view>
+
+						</template>
+					</view>
+				</scroll-view>
+
 				<view class="options-wrap">
-		            <view class="btn cancle" @click="closeLeaseType">{{$t('取消')}}</view>
-		            <view class="btn confirm" @click="chooseLeaseType">{{$t('确定')}}</view>
-		        </view>
+					<view class="btn cancle" @click="closeLeaseType">{{$t('取消')}}</view>
+					<view class="btn confirm" @click="chooseLeaseType">{{$t('确定')}}</view>
+				</view>
 				<view style="height: 170rpx;"></view>
-		    </view>
-		
+			</view>
+
 		</u-popup>
-    </view>
+	</view>
 </template>
 
 <script>
-	import { LEASE_TYPE_ARR } from '@/common/constant.js'
-export default {
-    data() {
-        return {
-			// showLeaseType: false,
-			LEASE_TYPE_ARR,
-			leaseType:100,
-			buy:true
-		};
-    },
-    /**
-     * 组件的属性列表
-     */
-    props: {
-		modelTypeList:{
-			type:Array,
-		},
-        showLeaseType: {
-			type: Boolean,
-			default: false
+	import {
+		LEASE_TYPE_ARR
+	} from '@/common/constant.js'
+	export default {
+		data() {
+			return {
+				// showLeaseType: false,
+				LEASE_TYPE_ARR: LEASE_TYPE_ARR.sort((x, y) => {
+					return x.sort - y.sort
+				}),
+				leaseType: 100,
+				buy: true
+			};
 		},
-		isBuy:{
-			type: Boolean,
-			default: true
-		},
-		shopType:{
-			type: Number,
-			default: 1
-		},
-        selectType: {
-			type: String,
-			default: ''
+		/**
+		 * 组件的属性列表
+		 */
+		props: {
+			modelTypeList: {
+				type: Array,
+			},
+			showLeaseType: {
+				type: Boolean,
+				default: false
+			},
+			isBuy: {
+				type: Boolean,
+				default: true
+			},
+			shopType: {
+				type: Number,
+				default: 1
+			},
+			selectType: {
+				type: String,
+				default: ''
+			},
+
 		},
+		mounted() {
 
-    },
-	mounted() {
-		
-		this.leaseType = this.shopType
-		this.buy = this.isBuy
-	},
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-		closeLeaseType() {
-            this.$emit('closeSelectType')
+			this.leaseType = this.shopType
+			this.buy = this.isBuy
 		},
-        chooseLeaseType() {
-			console.log(this.buy)
-            this.$emit('checkCabinetType', {
-				selectType:this.selectType,
-				leaseType:this.leaseType,
-				isBuy:this.buy
-			})
+		/**
+		 * 组件的方法列表
+		 */
+		methods: {
+			closeLeaseType() {
+				this.$emit('closeSelectType')
+			},
+			chooseLeaseType() {
+				console.log(this.buy)
+				this.$emit('checkCabinetType', {
+					selectType: this.selectType,
+					leaseType: this.leaseType,
+					isBuy: this.buy
+				})
+			}
 		}
-	}
-};
+	};
 </script>
 <style lang="scss" scoped>
-	.bugFlex{
+	.bugFlex {
 		display: flex;
 		justify-content: space-between;
 		margin-top: 30rpx;
 	}
-	.flexs{
+
+	.flexs {
 		display: flex;
 		flex-wrap: wrap;
 	}
-.bottom-popup {
-        padding: 40rpx 32rpx 32rpx 32rpx;
-        padding-bottom: env(safe-area-inset-bottom);
-        .title {
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 600;
-            font-size: 40rpx;
-            color: #060809;
-            line-height: 40rpx;
-            text-align: left;
-            font-style: normal;
-            margin-bottom: 48rpx;
-        }
-        .item-wrap {
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            .item {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                margin-bottom: 36rpx;
-                width: 218rpx;
-                height: 80rpx;
-                background: #F3F8FF;
-                border-radius: 16rpx;
-                border: 4rpx solid #F3F8FF;
-                box-sizing: border-box;
-                font-family: PingFangSC, PingFang SC;
-                font-weight: 400;
-                font-size: 32rpx;
-                color: #060809;
-                text-align: center;
-                font-style: normal;
+
+	.bottom-popup {
+		padding: 40rpx 32rpx 32rpx 32rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+
+		.title {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 600;
+			font-size: 40rpx;
+			color: #060809;
+			line-height: 40rpx;
+			text-align: left;
+			font-style: normal;
+			margin-bottom: 48rpx;
+		}
+
+		.item-wrap {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.item {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-bottom: 36rpx;
+				width: 218rpx;
+				height: 80rpx;
+				background: #F3F8FF;
+				border-radius: 16rpx;
+				border: 4rpx solid #F3F8FF;
+				box-sizing: border-box;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #060809;
+				text-align: center;
+				font-style: normal;
 				margin-right: 16rpx;
-				&:nth-child(3n+3){
+
+				&:nth-child(3n+3) {
 					margin-right: 0;
 				}
-            }
-            .checked {
-                background: #FFFFFF;
-                border-radius: 16rpx;
-                border: 4rpx solid #0A59F7;
-            }
-        }
-        .options-wrap {
-            display: flex;
-            justify-content: space-between;
-            .btn {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                width: 334rpx;
-                height: 80rpx;
-                font-family: PingFangSC, PingFang SC;
-                font-weight: 500;
-                font-size: 32rpx;
-                line-height: 32rpx;
-                text-align: center;
-                font-style: normal;
-                border-radius: 40rpx;
-                
-            }
-            .cancle {
-                background: #EBECEC;
+			}
+
+			.checked {
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				border: 4rpx solid #0A59F7;
+			}
+		}
+
+		.options-wrap {
+			display: flex;
+			justify-content: space-between;
+
+			.btn {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 334rpx;
+				height: 80rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 32rpx;
+				line-height: 32rpx;
+				text-align: center;
+				font-style: normal;
+				border-radius: 40rpx;
+
+			}
+
+			.cancle {
+				background: #EBECEC;
 				color: #060809;
-            }
-            .confirm {
-                background: #060809;
-                color: #FFFFFF;
-            }
-        }
-    }
-</style>
+			}
+
+			.confirm {
+				background: #060809;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>