订单展示优化

pages/order/order.vue

@@ -72,11 +72,11 @@
 					</view>
 					<view class="order-item-content ddflex">
 						<view class="order-item-content-label">租借时长</view>
-						<view class="order-item-content-data fflex tover">{{item.time}}小时</view>
+						<view class="order-item-content-data fflex tover">{{item.time?item.time+'小时':'/'}}</view>
 					</view>
 					<view class="order-item-content ddflex">
 						<view class="order-item-content-label">应付金额</view>
-						<view class="order-item-content-data fflex tover" style="color: #EB5C20;">{{(item.totalMoney||item.totalMoney===0||item.totalMoney==='0')?item.totalMoney:'/'}}元</view>
+						<view class="order-item-content-data fflex tover" style="color: #EB5C20;">{{(item.totalMoney||item.totalMoney===0||item.totalMoney==='0')?item.totalMoney+'元':'/'}}</view>
 					</view>
 				</view>
 				<!-- <view v-if="index!=1" class="order-btns ddflex">

pages/orderDetail/orderDetail.vue

@@ -2,19 +2,19 @@
 	<view style="padding-bottom: 50rpx;">
 		<view class="money-box ddflex">
 			<view class="state">
-				<view>{{info.refundStatus==0?'未归还':info.refundStatus==1?'已归还':info.refundStatus==2?'丢失':''}}</view>
+				<view>{{info.lease.returnStatus==0?'未归还':info.lease.returnStatus==1?'已归还':info.lease.returnStatus==2?'丢失':''}}</view>
 				<view class="act-color">{{info.status==0?'待支付':info.status==1?'待支付':info.status==2?'取消订单':info.status==3?'已支付':''}}</view>
 			</view>
 			<view class="money act-color ddflex">
 				<text class="symbol">￥</text>
-				<text>{{(info.totalMoney||info.totalMoney===0||info.totalMoney==='0')?info.totalMoney:'/'}}</text>
+				<text>{{(info.totalMoney||info.totalMoney===0||info.totalMoney==='0')?info.totalMoney:'0'}}</text>
 			</view>
 		</view>
 		
 		<view class="info-box">
 			<view class="info-item ddflex">
 				<view class="info-item-label">使用时长</view>
-				<view class="info-item-data fflex tover">{{info.type==2?'一次':info.lease.time}}</view>
+				<view class="info-item-data fflex tover">{{info.type==2?'一次':info.lease.time?info.lease.time+'分钟':'/'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">计费方式</view>
@@ -22,19 +22,19 @@
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">使用费用</view>
-				<view class="info-item-data fflex tover">￥{{info.realMoney}}</view>
+				<view class="info-item-data fflex tover">{{info.realMoney?'￥'+info.realMoney:'/'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">超时</view>
-				<view class="info-item-data fflex tover">{{info.timeoutTime?info.timeoutTime:0}}小时</view>
+				<view class="info-item-data fflex tover">{{info.timeoutTime?info.timeoutTime+'小时':'/'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">超时费用</view>
-				<view class="info-item-data fflex tover">￥{{info.timeoutMoney?info.timeoutMoney:0}}</view>
+				<view class="info-item-data fflex tover">{{info.timeoutMoney?'￥'+info.timeoutMoney:'/'}}</view>
 			</view>	
 			<view class="info-item ddflex">
 				<view class="info-item-label">订单总额</view>
-				<view class="info-item-data fflex tover act-color">￥{{info.totalMoney}}</view>
+				<view class="info-item-data fflex tover act-color">{{info.totalMoney?'￥'+info.totalMoney:'/'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">支付方式</view>
@@ -72,7 +72,7 @@
 			</view>
 			<view class="info-item ddflex mag-b50">
 				<view class="info-item-label">归还时间</view>
-				<view class="info-item-data fflex tover">{{info.lease.returnTime}}</view>
+				<view class="info-item-data fflex tover">{{info.lease.returnTime?info.lease.returnTime:'/'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">电池ID</view>
@@ -96,15 +96,15 @@
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">归还门店</view>
-				<view class="info-item-data fflex tover">{{info.lease.returnStoreName}}</view>
+				<view class="info-item-data fflex tover">{{info.lease.returnStoreName?info.lease.returnStoreName:'/'}}</view>
 			</view>
 			<view class="info-item dflex">
 				<view class="info-item-label">归还地点</view>
-				<view class="info-item-data fflex">{{info.lease.returnStoreAddress}}</view>
+				<view class="info-item-data fflex">{{info.lease.returnStoreAddress?info.lease.returnStoreAddress:'/'}}</view>
 			</view>
 			<view class="info-item ddflex mag-b50">
 				<view class="info-item-label">归还机柜</view>
-				<view class="info-item-data fflex tover">{{info.lease.returnDevId}}</view>
+				<view class="info-item-data fflex tover">{{info.lease.returnDevId?info.lease.returnDevId:'/'}}</view>
 			</view>
 			<!-- <view class="info-item ddflex">
 				<view class="info-item-label">用户手机号</view>