Merge branch 'dev-freight-0422' into release

* dev-freight-0422:
  订单详情
  应付加上运费
  添加运费字段

src/views/goods/order-detail.vue

@@ -96,8 +96,9 @@
         <div class="total-set">
           <p><span>商品总额：</span><span>￥{{orderDetailData.totalPrice | toFixed2}}</span></p>
           <p><span>优惠：</span><span>-￥{{orderDetailData.totalCouponFee | toFixed2}}</span></p>
+          <p><span>运费：</span><span>￥{{orderDetailData.expressFee | toFixed2}}</span></p>
           <p class="total-price" v-if="showStatus == 1 || showStatus == 2 || showStatus == 3"><span>实付：</span><span>￥{{orderDetailData.amount | toFixed2}}</span></p>
-          <p class="total-price" v-if="showStatus == 4"><span>应付：</span><span>￥{{orderDetailData.totalPrice | toFixed2}}</span></p>
+          <p class="total-price" v-if="showStatus == 4"><span>应付：</span><span>￥{{(orderDetailData.totalPrice)| toFixed2}}</span></p>
           <p class="total-price" v-if="showStatus == 5"><span>实付：</span><span>￥0.00</span></p>
         </div>
       </div>