Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-mer

src/views/order/pending/pendDetails.vue

@@ -26,11 +26,17 @@
               <li>
                 <p>
                   <span>订单状态:</span>
-                  <span v-if="order.state === 1">待付款</span>
-                  <span v-if="order.state === 2">待发货</span>
-                  <span v-if="order.state === 3">待收货</span>
-                  <span v-if="order.state === 4">已完成</span>
-                  <span v-if="order.state === 5">已取消</span>
+                  <span v-if="order.state == 1">待付款</span>
+                  <span v-else-if="order.state == 2">待发货</span>
+                  <span v-else-if="order.state == 3">待收货</span>
+                  <span v-else-if="order.state == 4">已完成</span>
+                  <span v-else-if="order.state == 5">交易关闭（已取消）</span>
+                  <span v-else-if="order.state == 6">待成团</span>
+                  <span v-else-if="order.state == 7">待售后</span>
+                  <span v-else-if="order.state == 8">待核销（未付款）</span>
+                  <span v-else-if="order.state == 9">待核销（已付款）</span>
+                  <span v-else-if="order.state == 10">已核销</span>
+                  <span v-else>--</span>
                 </p>
                 <p>
                   <span>售后状态:</span>