物流时间问题，订单应付额问题

packageUser/pages/user/logistics/logistics.js

@@ -1,4 +1,5 @@
 var _request = require('../../../../utils/request.js')
+var util = require('../../../../utils/util.js')
 var rid
 Page({
   data: {

packageUser/pages/user/logistics/logistics.json

@@ -1,7 +1,8 @@
 {
   "navigationBarTitleText": "查看物流",
   "usingComponents": {
-    "currency": "../../../../component/currency/currency"
+    "currency": "../../../../component/currency/currency",
+    "format-time": "../../../../component/formatTime/formatTime"
   },
   "backgroundColor": "#f3f3f3"
 }

packageUser/pages/user/logistics/logistics.wxml

@@ -19,8 +19,8 @@
 	<hr class="hrline" />
 	<view class="logistics-tit">
 	  	<p style="margin-top:0">订单编号：{{order.order_id}}</p>
-	    <p>下单时间：{{order.paied_time}}</p>
-	    <p>发货时间：{{order.dispatch_time}}</p>
+	    <p>下单时间：<format-time type="formatTime" value="{{order.ctime}}" ></format-time></p>
+	    <p>发货时间：<format-time type="formatTime" value="{{order.dtime}}" ></format-time></p>
 	</view>
 	<hr class="hrline" />
 	<view class="logistics-list">

packageUser/pages/user/order/order.wxml

@@ -73,7 +73,7 @@
       <view wx:if="{{order.status === 'unpay'}}">
 	      <view>
 	      	<view class="orderDetail-payPrice__title">还需支付合计总额</view>
-	      	<text class="orderDetail-payPrice__count">{{order.total_price / 100}}</text>
+	      	<text class="orderDetail-payPrice__count">{{(order.total_price+order.freight-order.coupon_price) / 100}}</text>
 	      </view>
       </view>
       <view wx:if="{{order.status !== 'unpay'}}">