carljin 3 years ago
parent
commit
5b8a438029
3 changed files with 5 additions and 3 deletions
  1. 2 1
      pages/center/order/order.vue
  2. 2 1
      pages/index/index.vue
  3. 1 1
      pages/payLists/payLists.vue

+ 2 - 1
pages/center/order/order.vue

@@ -64,7 +64,6 @@
                 </view>
                 <view class="order-center">
                   <view class="order-center-item">订单编号:{{ orderItem.orderId }}</view>
-				  <view class="order-center-item" v-if="orderItem.deviceType !=1">设备编号:{{ orderItem.deviceNo }}</view>
                   <view class="order-center-item">入场时间:{{ orderItem.inTime }}</view>
 				  <view
 				    class="order-center-item"
@@ -96,6 +95,8 @@
                     实缴金额:
                     <span class="pay-amount">{{ orderItem.actualAmount }}</span>
                   </view>
+					<view class="order-center-item">泊位号:{{ orderItem.spaceName }}</view>
+					<view class="order-center-item" v-if="orderItem.deviceType !=1">车位锁设备号:{{ orderItem.deviceNo }}</view>
                 </view>
                 <view class="order-bottom">
                   <u-cell-item title="收费标准" @click.native.stop="jumpChargeStandard(orderItem)"></u-cell-item>

+ 2 - 1
pages/index/index.vue

@@ -459,7 +459,8 @@ export default {
             }
             // 无感和手动
             const enableFeepay = []
-            res.data.orderList.forEach(item => {
+						const orderList = res.data?.orderList ?? []
+            orderList.forEach(item => {
               if (item.enableFeepay) {
                 enableFeepay.push(item.enableFeepay)
               } else {

+ 1 - 1
pages/payLists/payLists.vue

@@ -14,11 +14,11 @@
 						</view>
 						<view class="pay-center">
 							<view class="pay-center-item">停车泊位:{{payItem.spaceName}}</view>
-							<view class="pay-center-item" v-if="payItem.deviceType != 1">设备编号:{{payItem.deviceNo}}</view>
 							<view class="pay-center-item">入场时间:{{payItem.inTime}}</view>
 							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">出场时间:{{payItem.outTime}}</view>
 							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">停留时间:{{payItem.duration}}</view>
 							<view class="pay-center-item">应付金额:<span class="pay-amount">{{payItem.payAmount}}</span></view>
+							<view class="pay-center-item" v-if="payItem.deviceType != 1">车位锁设备号:{{payItem.deviceNo}}</view>
 						</view>
 						<view class="pay-bottom">
 							<!-- <u-cell-item title="去支付" @click="paythis(payItem.orderId)" style="color: #008CFF;"></u-cell-item> -->