0402_xxq

.hbuilderx/launch.json

@@ -20,7 +20,7 @@
         },
         {
             "openVueDevtools" : false,
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

component/returnCar/returnCar.vue

@@ -122,9 +122,12 @@ export default {
 .close-view{
 	width: 60rpx;
 	height: 60rpx;
-	line-height: 60rpx;
+	/* line-height: 60rpx; */
 	background: #F4F5F6;
 	border-radius: 50%;
 	text-align: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 </style>

pages/index/components/mapCard/mapCard.vue

@@ -15,14 +15,14 @@
 		<!-- #endif -->
 		<!-- #ifndef APP -->
 		<map class="map"  :longitude="car_info.longitude"
-			:latitude="car_info.latitude" scale="16" show-location :style="{width:'300rpx',height: height?'258rpx':'140rpx'}" :markers="carLocation">
+			:latitude="car_info.latitude" scale="16" show-location :style="{width:'100%',height: height?'258rpx':'140rpx'}" :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 class="car-address">{{carAddress}}</view>
 	</view>
 </template>
 
@@ -144,7 +144,7 @@
 	height: 80rpx;
 	line-height: 80rpx;
 	text-align: center;
-	width: 300rpx;
+	width: 324rpx;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- #ifdef APP -->
-		<u-no-network zIndex='9999' @retry='retry'></u-no-network>
+		<u-no-network zIndex='9' @retry='retry'></u-no-network>
 		<!-- #endif -->
 		<view v-if="isConnected">
 			<block v-if="isLogin && car_info.car_sn">

pages/orderStatus/orderStatus.vue

@@ -25,7 +25,7 @@
 					<view class="get-time-view flex-row"
 						v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">已取消</view>
 					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 1 "><text>请于</text><text
-							class="get-car-time">{{tools.formatTimeSecond( orderInfo.pick_up_time)}}</text><text>到门店取车</text>
+						class="get-car-time">{{tools.formatTimeSecond( orderInfo.pick_up_time)}}</text><text>到门店取车</text>
 					</view>
 					<view v-if="orderInfo.order_status == 10">已完结</view>
 				</block>
@@ -36,27 +36,28 @@
 				<view v-if="orderInfo.order_type != 3" class="flex-row flex-between">
 					<view class="money-item">
 						<view :class="orderInfo.order_status == 4?'red-status':''">
-							<block v-if="orderInfo.hire_duration_time">{{orderInfo.hire_duration_time}}</block>
+							<block v-if="orderInfo.hire_duration_time&&orderInfo.hire_duration_time>0">{{orderInfo.hire_duration_time}}</block>
 							<block v-else>{{Number(orderInfo.hire_cycle) * (orderInfo.hire_duration)}}</block>
 						</view>
 						
-						<view>{{((orderInfo.order_status == 2) || orderInfo.order_status == 3)?'租期剩余':(orderInfo.order_status == 4 ? '逾期时长':'租借周期')}}·<text style="opacity: 0.4;">{{leaseUnits(orderInfo.hire_duration_unit)}}</text></view>
+						<view>{{(orderInfo.order_status == 2 || orderInfo.order_status == 3)?'租期剩余':(orderInfo.order_status == 4 ? '逾期时长':'租借周期')}}·<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">
 							租期剩余·天</view>
 						<view v-else-if="orderInfo.order_status == 4 " class="red-status">逾期时长·天</view>
 						<view v-else>租借周期·天</view> -->
 					</view>
-					<view v-if="orderInfo.order_status != 4" class="money-item">
+					<view v-if="orderInfo.order_status != 4||orderInfo.overdue_money==0" class="money-item">
 						<view>
-							{{(orderInfo.hire_money + orderInfo.deposit / 100).toFixed(2)}}
+							{{((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 v-if="orderInfo.order_status == 4&&orderInfo.overdue_money!=0" class="money-item">
 						<view style="color:#F95151" class="red-status">
 							{{(orderInfo.money / 100).toFixed(2)}}
+							<!-- {{(orderInfo.overdue_money / 100).toFixed(2)}} -->
 						</view>
 						<view style="color:#F95151">逾期金额·$</view>
 					</view>