Merge branch 'lw_test' into gyq_test

pages/orderStatus/orderStatus.css

@@ -952,6 +952,11 @@
 .get-time-view{
 	font-weight: 400;
 	align-items: center;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 600;
+	font-size: 48rpx;
+	color: #060809;
+	margin-bottom: 48rpx;
 }
 .serviceList{
 	display: flex;

pages/orderStatus/orderStatus.vue

@@ -4,25 +4,26 @@
 			<navBar bgColor="transparent" left="0"></navBar>
 			<view>
 				<view v-if="orderInfo.pay_status!=2">
-					<view v-if="orderInfo.pay_status == 0">待支付</view>
-					<view v-else-if="orderInfo.pay_status == 1">支付中</view>
-					<view v-else-if="orderInfo.pay_status == 3">支付失败</view>
-					<view v-else-if="orderInfo.pay_status == 4">支付取消</view>
-					<view v-else-if="orderInfo.pay_status == 5">线下待审核</view>
-					<view v-else-if="orderInfo.pay_status == 6">线下审核拒绝</view>
+					<view class="get-time-view flex-row" v-if="orderInfo.pay_status == 0">待支付</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 1">支付中</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 3">支付失败</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 4">支付取消</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 5">线下待审核</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 6">线下审核拒绝</view>
+					
 				</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>
-				</view>
-				<view v-if="orderInfo.order_status == 2">请上传车辆图片激活车辆</view>
 				<block v-if="orderInfo.pay_status == 2">
-					<view v-if="orderInfo.order_status == 3" class="blue-text">使用中...</view>
-					<view v-if="orderInfo.order_status == 4" class="red-text">已逾期</view>
-					<view v-if="orderInfo.order_status == 5">待门店确认</view>
-					<view v-if="orderInfo.order_status == 6">还车中,等待门店取车</view>
-					<view v-if="orderInfo.order_status == 7">已完成</view>
+					<view :class="['get-time-view', 'flex-row', 'blue-text']" v-if="orderInfo.order_status == 3">使用中...</view>
+					<view :class="['get-time-view', 'flex-row', 'red-text']" v-if="orderInfo.order_status == 4">已逾期</view>
+					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 2">请上传车辆图片激活车辆</view>
+					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 5">待门店确认</view>
+					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 6">还车中,等待门店取车</view>
+					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 7">已完成</view>
+					<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></view>
 					<view v-if="orderInfo.order_status == 10">已完结</view>
 				</block>
-				<view v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">已取消</view>
+				
 			</view>
 
 			<view class="time-money">

pages/storeDetails/storeDetails.css

@@ -37,6 +37,10 @@
 	font-size: 40rpx;
 	color: #060809;
 	margin-bottom: 24rpx;
+	width: 600rpx;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 }
 .store-type{
 	border-radius: 8rpx;
@@ -341,6 +345,8 @@
 		left: 20rpx;
 		top: 100rpx;
 		z-index: 1000;
+		display: flex;
+		align-items: center;
 	}
 	.return-view {
 		width: 40rpx;