From 44793139200542f51c42a740dfc9ff7be2a763b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Tue, 15 Nov 2022 14:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsOrder/index.vue | 14 +++--------
 src/views/system/order/index.vue      | 36 ++++++++-------------------
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 496b751..a991696 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -31,7 +31,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
+
 
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select
@@ -85,9 +85,9 @@
         label="商品名称"
         align="center"
         prop="goodsName"
-      
+
       />
-     
+
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
    <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
@@ -111,9 +111,6 @@
             v-if="scope.row.orderStatus == 'RECEIVED_GOODS'"
             >已收货</el-button
           >
-          <el-button type="success" v-if="scope.row.orderStatus == 'COMPLETE'"
-            >服务完成</el-button
-          >
           <el-button
             type="warning"
             v-if="scope.row.orderStatus == 'WAIT_REFUND'"
@@ -651,10 +648,7 @@ export default {
           value: "REFUNDED",
           label: "退款成功",
         },
-        {
-          value: "COMPLETE",
-          label: "服务完成",
-        },
+
         {
           value: "WAIT_RETURNED_GOODS",
           label: "待退货",
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 3755a01..e0e9949 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -117,17 +117,14 @@
             v-if="scope.row.orderStatus == 'WAIT_REFUND'"
             >退款中</el-button
           >
-          <el-button
-            type="warning"
-            v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'"
-            >待退货</el-button
+          <el-button type="warning" v-if="scope.row.orderStatus == 'REFUNDED'"
+            >已退款</el-button
           >
+
           <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
             >已取消</el-button
           >
-          <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'"
-            >退款成功</el-button
-          >
+
         </template>
       </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
@@ -546,27 +543,20 @@ export default {
           value: "WAIT_DISPATCH",
           label: "待派单",
         },
+        {
+          value: "REFUNDED",
+          label: "已退款",
+        },
 
         {
           value: "WAIT_REFUND",
           label: "退款中",
         },
-        {
-          value: "REFUNDED",
-          label: "退款成功",
-        },
         {
           value: "COMPLETE",
           label: "服务完成",
         },
-        {
-          value: "WAIT_RETURNED_GOODS",
-          label: "待退货",
-        },
-        {
-          value: "RETURNED_GOODS",
-          label: "已退货",
-        },
+
         {
           value: "NOT_FINISH",
           label: "未完成",
@@ -675,12 +665,8 @@ export default {
           return "退款中";
         case "CANCEL":
           return "已取消";
-        case "REFUNDED":
-          return "退款成功";
-        case "WAIT_RETURNED_GOODS":
-          return "待退货";
-        case "RETURNED_GOODS":
-          return "已退货";
+          case "REFUNDED":
+          return "已退款";
         default:
           break;
       }