Browse Source

bug修改

郭宇琦 5 days ago
parent
commit
28f0510dc8
3 changed files with 17 additions and 3 deletions
  1. 2 1
      locale/en.json
  2. 2 1
      locale/zh.json
  3. 13 1
      pages/orderStatus/orderStatus.vue

+ 2 - 1
locale/en.json

@@ -849,5 +849,6 @@
 	"祝您骑行愉快": "Enjoy Your Ride!",
 	"车辆已被租售!": "Vehicle Rented or Sold!",
 	"全部": "All",
-	"立即支付": "Pay Now"
+	"立即支付": "Pay Now",
+	"购买时间":"Buy Time"
 }

+ 2 - 1
locale/zh.json

@@ -849,5 +849,6 @@
 	"祝您骑行愉快": "祝您骑行愉快",
 	"车辆已被租售!": "车辆已被租售!",
 	"全部": "全部",
-	"立即支付": "立即支付"
+	"立即支付": "立即支付",
+	"购买时间":"购买时间"
 }

+ 13 - 1
pages/orderStatus/orderStatus.vue

@@ -186,7 +186,7 @@
 			<!-- </view> -->
 		</view>
 
-		<view v-if="(orderInfo.hire_begin_time!=0&&orderInfo.hire_end_time!=0)||orderInfo.order_type!=3 ||orderInfo.order_status!=5||orderInfo.order_status!=6" class="return-info">
+		<view v-if="(orderInfo.hire_begin_time!=0&&orderInfo.hire_end_time!=0 && orderInfo.order_type!=3) && orderInfo.order_status!=5 && orderInfo.order_status!=6 " class="return-info">
 			<view class="return-top flex-row flex-between">
 				<view>{{ $t('取还时间') }}</view>
 				<view>
@@ -206,6 +206,15 @@
 				<view>{{tools.formatTimeDate(orderInfo.hire_end_time)}}</view> -->
 			</view>
 		</view>
+		
+		<view v-if="orderInfo.order_type == 3" class="return-info">
+			<view class="return-top flex-row flex-between">
+				<view>{{ $t('购买时间') }}</view>
+			</view>
+			<view class="return-bottom flex-row">
+				<view>{{dayjsFn(orderInfo.pay_time)}}</view>
+			</view>
+		</view>
 
 
 		<view v-if="orderInfo.order_status==2||orderInfo.order_status==3||orderInfo.order_status==4"
@@ -413,6 +422,9 @@
 		computed: {},
 
 		methods: {
+			dayjsFn(time){
+				return dayjs(time * 1000).format('YYYY-MM-DD HH:mm:ss')
+			},
 			getAddressName(latitude, longitude) {
 				const pData = {
 					lng: longitude,