Browse Source

2024.05.04
- 完善待处理订单页订单状态和订单编号和支付方式的字段显示;

zweiqin 11 months ago
parent
commit
262b192fef
2 changed files with 25 additions and 6 deletions
  1. 10 5
      src/views/order/pending/index.vue
  2. 15 1
      src/views/order/pending/pendDetails.vue

+ 10 - 5
src/views/order/pending/index.vue

@@ -61,11 +61,16 @@
           <el-table-column label="订单状态" show-overflow-tooltip>
             <template slot-scope="scope">
               <span v-if="scope.row.state == 1">待付款</span>
-              <span v-if="scope.row.state == 2">待发货</span>
-              <span v-if="scope.row.state == 3">已发货</span>
-              <span v-if="scope.row.state == 4">已完成</span>
-              <span v-if="scope.row.state == 5">已关闭</span>
-              <span v-if="scope.row.state == 6">待成团</span>
+              <span v-else-if="scope.row.state == 2">待发货</span>
+              <span v-else-if="scope.row.state == 3">待收货</span>
+              <span v-else-if="scope.row.state == 4">已完成</span>
+              <span v-else-if="scope.row.state == 5">交易关闭(已取消)</span>
+              <span v-else-if="scope.row.state == 6">待成团</span>
+              <span v-else-if="scope.row.state == 7">待售后</span>
+              <span v-else-if="scope.row.state == 8">待核销(未付款)</span>
+              <span v-else-if="scope.row.state == 9">待核销(已付款)</span>
+              <span v-else-if="scope.row.state == 10">已核销</span>
+              <span v-else>--</span>
             </template>
           </el-table-column>
           <el-table-column prop="customerName" label="下单账户" show-overflow-tooltip />

+ 15 - 1
src/views/order/pending/pendDetails.vue

@@ -19,6 +19,12 @@
               </li>
               <li>
                 <p>
+                  <span>订单编号:</span>
+                  <span>{{ order.orderFormid }}</span>
+                </p>
+              </li>
+              <li>
+                <p>
                   <span>订单状态:</span>
                   <span v-if="order.state === 1">待付款</span>
                   <span v-if="order.state === 2">待发货</span>
@@ -35,7 +41,15 @@
                 <p>
                   <span>支付方式:</span>
                   <span v-if="order.paymentMode === 1">微信</span>
-                  <span v-if="order.paymentMode === 2">支付宝</span>
+                  <span v-else-if="order.paymentMode === 2">支付宝</span>
+                  <span v-else-if="order.paymentMode === 3">花呗分期</span>
+                  <span v-else-if="order.paymentMode === 4">通联支付</span>
+                  <span v-else-if="order.paymentMode === 5">平台余额支付</span>
+                  <span v-else-if="order.paymentMode === 6">商家余额支付</span>
+                  <span v-else-if="order.paymentMode === 7">佣金支付</span>
+                  <span v-else-if="order.paymentMode === 8">交易金支付</span>
+                  <span v-else-if="order.paymentMode === 9">惠市宝支付</span>
+                  <span v-else>--</span>
                 </p>
                 <p>
                   <span>物流方案:</span>