fix bug

@@ -102,7 +102,7 @@ module.exports = (Vue) => {
                 stateTxt = '待收货';
                 stateTxt = '待收货';
                 break;
                 break;
             case 6:
             case 6:
-                stateTxt = '已完成';
+                stateTxt = '交易成功';
                 break;
                 break;
             default:
             default:
                 stateTxt = '';
                 stateTxt = '';

 <template>
 <template>
     <template v-if="show">
     <template v-if="show">
         <div class="order-status">
         <div class="order-status">
-            <p>{{order.statusStr}}</p>
+            <p v-if="order.isCancel === 'Y'">交易已取消</p>
+            <p v-else>{{order.status | convertOrderState}}</p>
             <p v-if="order.isCancel !== 'Y' && order.status == 0 && order.payLefttime != 0">剩余: <span v-count-down v-bind:left-time="order.payLefttime"></span>，订单将被取消</p>
             <p v-if="order.isCancel !== 'Y' && order.status == 0 && order.payLefttime != 0">剩余: <span v-count-down v-bind:left-time="order.payLefttime"></span>，订单将被取消</p>
         </div>
         </div>
         <div class="order-address">
         <div class="order-address">

@@ -5,7 +5,8 @@
                 <div class="order-detail">
                 <div class="order-detail">
                     <div class="order-code">
                     <div class="order-code">
                         <p>订单号:{{order.orderCode}}</p>
                         <p>订单号:{{order.orderCode}}</p>
-                        <p>{{order.statusStr}}</p>
+                        <p v-if="order.isCancel === 'Y'">交易已取消</p>
+                        <p v-else>{{order.status | convertOrderState}}</p>
                     </div>
                     </div>
                     <div class="order-goods" >
                     <div class="order-goods" >
                         <div class="goods-info" v-for="goods in order.orderGoods">
                         <div class="goods-info" v-for="goods in order.orderGoods">