代金券列表显示修改

packageUser/pages/user/order/order.wxml

@@ -61,7 +61,7 @@
 	    </view>
     </view>
     <view class="orderDetail-payPrice">
-    	
+    	<!--
       <view class="orderDetail-payPrice__title">实际支付</view>
       <view class="orderDetail-payPrice__count" wx:if="{{order.status === 'unpay'}}">
         <currency style="float: left;height: 80rpx;" symbol="￥" value="{{order.product.price * order.count}}"></currency>
@@ -69,12 +69,22 @@
       或 {{order.product.robo_balance_price * order.count / 100}}代金券</view>
         <view style="float: left;height: 80rpx;margin-left: 5rpx;" wx:if="{{order.product.mall_balance_price}}">或 {{order.product.mall_balance_price * order.count / 100}}代金券</view>
       </view>
-      <view class="orderDetail-payPrice__count" wx:if="{{order.status !== 'unpay'}}">
-        <currency symbol="￥" value="{{order.total_price+order.freight}}" wx:if="{{order.pay_way === 'weixinpay'}}"></currency>
-        <text wx:if="{{order.pay_way === 'balance'}}">{{(order.total_price+order.freight) / 100}}代金券</text>
-        <text wx:if="{{order.pay_way === 'integral'}}">{{(order.total_price+order.freight) / 100}}代金券</text>
-        <view class="clean"></view>
-        
+      -->
+      <view wx:if="{{order.status === 'unpay'}}">
+	      <view>
+	      	<view class="orderDetail-payPrice__title">还需支付合计总额</view>
+	      	<text class="orderDetail-payPrice__count">{{order.total_price / 100}}</text>
+	      </view>
+      </view>
+      <view wx:if="{{order.status !== 'unpay'}}">
+	      <view style="overflow: hidden;width: 100%;">
+	      	<view class="orderDetail-payPrice__title">代金券抵扣</view>
+	      	<text class="orderDetail-payPrice__count">{{pay_way == 'balance' ? (order.coupon_price+order.freight) / 100 : order.coupon_price / 100}}代金券</text>
+	      </view>
+	      <view style="overflow: hidden;width: 100%;">
+	      	<view class="orderDetail-payPrice__title">微信支付</view>
+	      	<currency style="float: right;height: 44px;color: #eab86a;" symbol="￥" value="{{pay_way != 'balance' ? (order.paied_price+order.freight)  / 100 : order.paied_price  / 100}}"></currency>
+	      </view>
       </view>
       <view class="clean"></view>
     </view>

packageUser/pages/user/orders/orders.wxml

@@ -37,7 +37,7 @@
           <text> 或</text> {{item.product.mall_balance_price * item.count / 100}}代金券
         </view>-->
         <text style="float: right;margin-left: 5rpx;" wx:if="{{item.product.robo_balance_price}}">
-          <text> 或</text> {{(item.total_price+item.freight) / 100}}代金券
+          <text> 或</text> {{(item.total_price+item.freight) / 100}}
         </text>
         <currency style="float: right;" symbol="￥" value="{{item.total_price+item.freight}}"></currency>
         <view class="clean"></view>
@@ -46,7 +46,7 @@
       <view class="order-allprice" wx:if="{{item.status !== 'unpay'}}">共{{item.count}}件商品 合计：
         <view style="float: right;" wx:if="{{item.pay_way == 'integral' && item.product.mall_balance_price}}">{{(item.total_price+item.freight) / 100}}代金券
         </view>
-        <text style="float: right;" wx:elif="{{item.pay_way == 'balance'}}">{{(item.total_price+item.freight) / 100}}代金券
+        <text style="float: right;" wx:elif="{{item.pay_way == 'balance'}}">{{(item.total_price+item.freight) / 100}}
         </text>
         <currency style="float: right;" wx:if="{{item.pay_way == 'weixinpay'}}" symbol="￥" value="{{item.total_price+item.freight}}"></currency>
         <view class="clean"></view>