订单

pages/order/order.vue

@@ -6,6 +6,7 @@
 					<view>{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
+				<view v-else>订单</view>
 			</view>
 			<view class="tab-box">
 				<view class="fflex ddflex">
@@ -75,7 +76,7 @@
 					</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.payMoney}}元</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

@@ -3,11 +3,11 @@
 		<view class="money-box ddflex">
 			<view class="state">
 				<view>{{info.refundStatus==0?'未归还':info.refundStatus==1?'已归还':info.refundStatus==2?'丢失':''}}</view>
-				<view class="act-color">{{info.status==0?'待支付':info.status==1?'已结算':info.status==2?'取消订单':info.status==3?'已支付':''}}</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.payMoney}}</text>
+				<text>{{(info.totalMoney||info.totalMoney===0||info.totalMoney==='0')?info.totalMoney:'/'}}</text>
 			</view>
 		</view>
 		
@@ -38,7 +38,7 @@
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">支付方式</view>
-				<view class="info-item-data fflex tover">{{info.payType==1?'钱包支付':'微信支付'}}</view>
+				<view class="info-item-data fflex tover">{{info.payType==1?'钱包支付':info.payType==2?'微信支付':info.payType==3?'汇付':'/'}}</view>
 			</view>
 			<view class="info-item dflex">
 				<view class="info-item-label">收费标准</view>