From d2b266ef19e793515b9351bc33bb1ac0bcda6a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 21 Nov 2022 10:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsOrder/index.vue  |  7 ++--
 src/views/system/goodsOrder/indexjs.js | 24 ++++++-------
 src/views/system/order/index.vue       |  5 +--
 src/views/system/order/indexjs.js      | 48 ++++++++++++--------------
 4 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 807d0b8..ed5727e 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -77,7 +77,7 @@
             >待付款</el-button
           >
           <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'"
-            >已付款</el-button
+            >待发货</el-button
           >
           <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
             >已取消</el-button
@@ -108,9 +108,6 @@
           <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'"
             >退款成功</el-button
           >
-          <el-button type="warning" v-if="scope.row.orderStatus == 'EVALUATED'"
-            >已评价</el-button
-          >
           <el-button
             type="danger"
             v-if="scope.row.orderStatus == 'RETURNED_GOODS'"
@@ -354,7 +351,7 @@
             "
           >
             <img
-            style="width:240px"
+              style="width: 240px"
               v-for="(item, index) in ratelist.orderEvaluatePictureInfoList"
               :src="baseurl + item.evaluatePictureUrl"
               alt=""
diff --git a/src/views/system/goodsOrder/indexjs.js b/src/views/system/goodsOrder/indexjs.js
index b7669b4..7f18d83 100644
--- a/src/views/system/goodsOrder/indexjs.js
+++ b/src/views/system/goodsOrder/indexjs.js
@@ -41,7 +41,7 @@ export default {
                 },
                 {
                     value: "RECEIVED_GOODS",
-                    label: "未评价",
+                    label: "待评价",
                 },
                 {
                     value: "EVALUATED",
@@ -182,23 +182,23 @@ export default {
                 case "WAIT_PAY":
                     return "待付款";
                 case "PAY":
-                    return "已付款";
-                case "CANCEL":
-                    return "已取消";
+                    return "待发货";
                 case "WAIT_RECEIVED_GOODS":
                     return "待收货";
                 case "RECEIVED_GOODS":
-                    return "未评价";
-                case "WAIT_REFUND":
-                    return "退款中";
-                case "REFUNDED":
-                    return "退款成功";
+                    return "待评价";
+                case "EVALUATED":
+                    return "交易完成";
                 case "WAIT_RETURNED_GOODS":
                     return "待退货";
                 case "RETURNED_GOODS":
                     return "已退货";
-                case "EVALUATED":
-                    return "交易完成";
+                case "WAIT_REFUND":
+                    return "退款中";
+                case "REFUNDED":
+                    return "退款成功";
+                case "CANCEL":
+                    return "已取消";
                 default:
                     break;
             }
@@ -429,4 +429,4 @@ export default {
             );
         },
     },
-};
+};
\ No newline at end of file
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 5211e06..8174583 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -92,7 +92,7 @@
             >未完成</el-button
           >
           <el-button type="primary" v-if="scope.row.orderStatus == 'COMPLETE'"
-            >未评价</el-button
+            >待评价</el-button
           >
           <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
             >服务完成</el-button
@@ -105,9 +105,6 @@
           <el-button type="warning" v-if="scope.row.orderStatus == 'REFUNDED'"
             >退款成功</el-button
           >
-          <el-button type="warning" v-if="scope.row.orderStatus == 'EVALUATED'"
-            >已评价</el-button
-          >
           <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
             >已取消</el-button
           >
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js
index e3d2764..d6b2f7d 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -25,36 +25,34 @@ export default {
                     value: "PAY",
                     label: "已付款",
                 },
-                {
-                    value: "CANCEL",
-                    label: "已取消",
-                },
                 {
                     value: "WAIT_DISPATCH",
                     label: "待派单",
                 },
                 {
-                    value: "REFUNDED",
-                    label: "已退款",
-                },
-
-                {
-                    value: "WAIT_REFUND",
-                    label: "退款中",
+                    value: "NOT_FINISH",
+                    label: "未完成",
                 },
                 {
                     value: "COMPLETE",
-                    label: "未评价",
+                    label: "待评价",
                 },
                 {
                     value: "EVALUATED",
                     label: "服务完成",
                 },
-
                 {
-                    value: "NOT_FINISH",
-                    label: "未完成",
+                    value: "WAIT_REFUND",
+                    label: "退款中",
                 },
+                {
+                    value: 'REFUNDED',
+                    label: '退款成功'
+                },
+                {
+                    value: "CANCEL",
+                    label: "已取消",
+                }
             ],
             value: "",
             // 遮罩层
@@ -154,22 +152,22 @@ export default {
             switch (orderStatus) {
                 case "WAIT_PAY":
                     return "待付款";
+                case "PAY":
+                    return "已付款";
                 case "WAIT_DISPATCH":
                     return "待派单";
                 case "NOT_FINISH":
                     return "未完成";
                 case "COMPLETE":
-                    return "未评价";
-                case "PAY":
-                    return "已付款";
-                case "WAIT_REFUND":
-                    return "退款中";
-                case "CANCEL":
-                    return "已取消";
-                case "REFUNDED":
-                    return "已退款";
+                    return "待评价";
                 case "EVALUATED":
                     return "服务完成";
+                case "WAIT_REFUND":
+                    return "退款中";
+                case "REFUNDED":
+                    return "退款成功";
+                case "CANCEL":
+                    return "已取消";
                 default:
                     break;
             }
@@ -365,4 +363,4 @@ export default {
             );
         },
     },
-};
+};
\ No newline at end of file