十一月十一凌晨更新

pages/orderList/OrderDetail/OrderDetail.vue

@@ -86,13 +86,14 @@
 				下单时间
 				<text class="fr">{{orderItem.createDatetime}}</text>
 			</view>
-			<view class="margin-bottom-sm">
+			<!-- <view class="margin-bottom-sm">
 				扣款时间
 				<text class="fr">{{orderItem.paydatetime}}</text>
-			</view>
+			</view> -->
 			<view class="padding-bottom-sm">
 				开票状态
-				<text class="fr">{{orderItem.invoiceState|invoiceStateFormat}}</text>
+				<text class="fr" v-if="formQr">未开票</text>
+				<text class="fr" v-else>{{orderItem.invoiceState|invoiceStateFormat}}</text>
 			</view>
 			<!-- <view class="margin-bottom-sm" v-if="orderItem.paydatetime">
         支付时间
@@ -121,12 +122,28 @@
 				// orderId:'',
 				orderId: uni.getStorageSync('orderId'),
 				formQr: uni.getStorageSync('formQr') ? true : false,
+				tempOrderInfo: uni.getStorageSync('tempOrderInfo'),
 				orderItem: {},
 				baseURL: this.global.baseURL
 			}
 		},
 		created() {
-			this.getOrderDetail()
+			if (this.formQr && !this.tempOrderInfo.payOrderId) {
+				this.orderItem = {
+					...this.tempOrderInfo,
+					orderID: this.tempOrderInfo.payOrderId,
+					amount: this.tempOrderInfo.standardAmount,
+					realamount: this.tempOrderInfo.oilAmount,
+					userName: this.tempOrderInfo.driverId,
+					carNo: this.tempOrderInfo.plateNumber,
+					createDatetime: this.tempOrderInfo.createTime,
+					paydatetime: this.tempOrderInfo.payTime,
+					bar: this.tempOrderInfo.oilGun,
+					vol: this.tempOrderInfo.volume,
+				}
+			} else {
+				this.getOrderDetail()
+			}
 		},
 		onHide() {
 			this.clearStatus()
@@ -139,7 +156,7 @@
 				uni.removeStorageSync('formQr')
 			},
 			scanQr() {
-				scanUrl = '/pages/station-info/scan-camera/scan-camera'
+				var scanUrl = '/pages/station-info/scan-camera/scan-camera'
 				uni.navigateTo({
 					url: scanUrl,
 					fail: (err) => {

pages/orderList/dailyOrder/dailyOrder.vue

@@ -63,11 +63,11 @@
 	import cloudSiteApi from '@/api/cloud-site.js'
 	import OrderItem from '@/components/order-item'
 	import UniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
-	import Empty from '@/components/Empty'
+
 	export default {
 		components: {
 			OrderItem,
-			Empty,
+
 			UniLoadMore
 		},
 		data() {

pages/orderList/orderList.vue

@@ -63,11 +63,11 @@
 	import cloudSiteApi from '@/api/cloud-site.js'
 	import OrderItem from '@/components/order-item'
 	import UniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
-	import Empty from '@/components/Empty'
+
 	export default {
 		components: {
 			OrderItem,
-			Empty,
+
 			UniLoadMore
 		},
 		data() {