bug修复

pages/index/components/mapCard/mapCard.vue

@@ -2,7 +2,7 @@
 	<view class="container-view-car" @tap="navCarLocation">
 		<!-- #ifdef APP -->
 		<view :style="{width:'100%',height: height?'258rpx':'140rpx'}" class="map">
-			<cover-view  class="top-car-location">
+			<cover-view v-if="!isShowReturnCar"  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">{{ $t('车辆位置') }}</cover-view>
 			</cover-view>
@@ -16,7 +16,7 @@
 		<!-- #ifndef APP -->
 		<map class="map"  :longitude="car_info.longitude"
 			:latitude="car_info.latitude" scale="16" show-location :style="{width:'100%',height: height?'258rpx':'140rpx'}" :markers="carLocation">
-			<view class="top-car-location flex-row">
+			<view  class="top-car-location flex-row">
 				<img style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FrKY7Ex5za22plr39ddIsJcjFVpi" alt="">
 				<text>{{ $t('车辆位置') }}</text>
 			</view>
@@ -45,6 +45,7 @@
 		 * 组件的属性列表
 		 */
 		props: {
+			
 			car_info: {
 				type: Object,
 				default: {}
@@ -53,6 +54,10 @@
 				type: Boolean,
 				default: true
 			},
+			isShowReturnCar: {
+				type: Boolean,
+				default: true
+			},
 		},
 		
 		mounted() {

pages/index/index.vue

@@ -77,11 +77,11 @@
 								:style="{width: '24rpx',height: '32rpx'}" alt="">
 						</view>
 					</view>
-					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail" :isOverdueShow="isOverdueShow"/>
+					<Control  :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail" :isOverdueShow="isOverdueShow"/>
 					
 			
 					<view :class="['flex-row', 'flex-between', 'map-card-view',car_info.exchange_package_info && car_info.exchange_package_info.activity_time?'height_362':'height_260']">
-						<MapCard :car_info="car_info" :height="!!(car_info.exchange_package_info && car_info.exchange_package_info.activity_time)"/>
+						<MapCard :isShowReturnCar='isShowReturnCar' :car_info="car_info" :height="!!(car_info.exchange_package_info && car_info.exchange_package_info.activity_time)"/>
 			
 						<view class="card-right">
 							<view class="card-bg" @tap="navTravelingTrack">
@@ -169,7 +169,7 @@
 		</view>
 		
 		
-		<returnCar :isShowReturnCar="isShowReturnCar" typePage="index" @closeShowReturnCarBtn="()=>isShowReturnCar=false"
+		<returnCar :isShowReturnCar='isShowReturnCar' typePage="index" @closeShowReturnCarBtn="isShowReturnCar=false"
 			@navStoreBtn="navStoreBtn" @immediatelyReturnBtn="immediatelyReturnBtn" />
 	</view>
 </template>
@@ -569,9 +569,8 @@
 			},
 			tapReturnCar() {
 				this.overdueMoneyFn(this.car_info.car_sn)
-				this.setData({
-					isShowReturnCar: true
-				})
+				this.isShowReturnCar = true
+				console.log(this.isShowReturnCar)
 			},
 			//逾期费用计算
 			async overdueMoneyFn(car_sn) {

pages/orderStatus/orderStatus.vue

@@ -3,7 +3,7 @@
 	
 	<view class="container-view">
 		<view class="time-info">
-			<navBar bgColor="transparent" left="0"></navBar>
+			<navigation :scroll='scrollTop' type></navigation>
 			<view>
 				<view v-if="orderInfo.pay_status!=2">
 					<view class="get-time-view flex-row" v-if="orderInfo.pay_status == 0">{{ $t('待支付') }}</view>
@@ -24,8 +24,8 @@
 					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 7">{{ $t('已完成') }}</view>
 					<view class="get-time-view flex-row"
 						v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">{{ $t('已取消') }}</view>
-					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 1 "><text>{{ $t('请于') }}</text><text
-							class="get-car-time">{{tools.formatTimeSecond( orderInfo.pick_up_time)}}</text><text>{{ $t('到门店取车') }}</text>
+					<view class="get-time-view " v-if="orderInfo.order_status == 1 "><text>{{ $t('请于') }}</text><text
+							class="get-car-time">{{tools.formatTimeSecond( orderInfo.pick_up_time)}} </text><text>{{ $t('到门店取车') }}</text>
 					</view>
 					<view v-if="orderInfo.order_status == 10">{{ $t('已完结') }}</view>
 				</block>
@@ -361,6 +361,9 @@
 			PayTypeModel,
 			carPlan
 		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
+		},
 		data() {
 			return {
 				overdueData: {},