merge

@@ -60,6 +60,10 @@ const _getOrderStatus = (order, showLogistics) => {
     // 先判断订单付款方式，根据不同的付款方式计算订单状态。（注:货到付款没有待付款状态）
     // 支付方式为非货到付款时，计算订单状态。
     if (parseInt(order.paymentType, 10) !== 2) {
+        Object.assign(result, {
+            isPayonline: true
+        });
+
         switch (order.status) {
             case 0:
 
@@ -75,7 +79,8 @@ const _getOrderStatus = (order, showLogistics) => {
 
                 /* 已付款状态不给查看物流 URL */
                 Object.assign(result, {
-                    unreceived: true
+                    unreceived: true,
+                    payAly: true
                 });
                 break;
             case 4:
@@ -83,7 +88,8 @@ const _getOrderStatus = (order, showLogistics) => {
 
                 /* 已发货状态，给查看物流或二维码URL */
                 Object.assign(result, {
-                    unreceived: true
+                    unreceived: true,
+                    payAly: true
                 });
 
                 /* 是否门票 */
@@ -99,7 +105,8 @@ const _getOrderStatus = (order, showLogistics) => {
 
                 /* 已成功订单，给查看物流或二维码URL */
                 Object.assign(result, {
-                    completed: true
+                    completed: true,
+                    payAly: true
                 });
 
                 /* 是否门票 */
@@ -115,6 +122,10 @@ const _getOrderStatus = (order, showLogistics) => {
                 break;
         }
     } else {
+        Object.assign(result, {
+            payAly: true,
+            paymentName: (order.paymentName !== '') ? order.paymentName : '货到付款'
+        });
 
         /* 订单为货到付款订单时，计算订单状态。(货到付款没有待付款状态) */
         switch (order.status) {
@@ -303,6 +314,8 @@ const orderDetailData = (uid, orderCode) => {
                     cancelReason: resons
                 });
 
+                //console.log(orderDetail)
+
                 return orderDetail;
             });
 

@@ -36,6 +36,9 @@
                 	<span class="sub-title">订单编号：{{orderCode}}</span>
                     <span >订单状态：{{statusStr}}</span>
                     <span>下单时间：<b class="createTime">{{createTime}}</b></span>
+                    {{#if payAly}}
+                    <span>支付方式：{{paymentName}}</span>
+                    {{/if}}
                 </p>
                 <a href="{{serviceUrl}}" target="_blank" class="iconfont icon-right">&#xe63c;</a>
             </div>
@@ -71,7 +74,7 @@
             </li>
             {{/each}}
             <li>
-                实付金额
+                {{#if isPayonline}}实付金额{{else}}应付金额{{/if}}
                 <span>{{amount}}</span>
             </li>
         </ul>