From 3464ee6ba0bd805a903f0f9e18140d8d34e71685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Sun, 20 Nov 2022 16:06:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=B2=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsOrder/index.vue  |  3 +
 src/views/system/goodsOrder/indexjs.js |  8 +++
 src/views/system/order/index.vue       |  3 +
 src/views/system/order/indexjs.js      | 82 ++++++++++++++------------
 4 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index cdff701..6e328d4 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -105,6 +105,9 @@
           <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'"
diff --git a/src/views/system/goodsOrder/indexjs.js b/src/views/system/goodsOrder/indexjs.js
index 25421a1..3dca788 100644
--- a/src/views/system/goodsOrder/indexjs.js
+++ b/src/views/system/goodsOrder/indexjs.js
@@ -60,6 +60,11 @@ export default {
                     value: "REFUNDED",
                     label: "退款成功",
                 },
+                {
+                    value: "EVALUATED",
+                    label: "已评价",
+                },
+               
             ],
             // 遮罩层
             loading: true,
@@ -189,6 +194,9 @@ export default {
                     return "待退货";
                 case "RETURNED_GOODS":
                     return "已退货";
+                    case "EVALUATED":
+                        return "已评价";
+                    
                 default:
                     break;
             }
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index eecabf7..85fac24 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -102,6 +102,9 @@
           <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 36a61a3..5decb9c 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -15,39 +15,43 @@ export default {
         return {
             baseurl: null,
             orderStatuslist: [{
-                    value: "WAIT_PAY",
-                    label: "待付款",
-                },
-                {
-                    value: "PAY",
-                    label: "已付款",
-                },
-                {
-                    value: "CANCEL",
-                    label: "已取消",
-                },
-                {
-                    value: "WAIT_DISPATCH",
-                    label: "待派单",
-                },
-                {
-                    value: "REFUNDED",
-                    label: "已退款",
-                },
+                value: "WAIT_PAY",
+                label: "待付款",
+            },
+            {
+                value: "PAY",
+                label: "已付款",
+            },
+            {
+                value: "CANCEL",
+                label: "已取消",
+            },
+            {
+                value: "WAIT_DISPATCH",
+                label: "待派单",
+            },
+            {
+                value: "REFUNDED",
+                label: "已退款",
+            },
 
-                {
-                    value: "WAIT_REFUND",
-                    label: "退款中",
-                },
-                {
-                    value: "COMPLETE",
-                    label: "服务完成",
-                },
+            {
+                value: "WAIT_REFUND",
+                label: "退款中",
+            },
+            {
+                value: "COMPLETE",
+                label: "服务完成",
+            },
 
-                {
-                    value: "NOT_FINISH",
-                    label: "未完成",
-                },
+            {
+                value: "NOT_FINISH",
+                label: "未完成",
+            },
+            {
+                value: "EVALUATED",
+                label: "已评价",
+            },
             ],
             value: "",
             // 遮罩层
@@ -159,6 +163,8 @@ export default {
                     return "退款中";
                 case "CANCEL":
                     return "已取消";
+                case "EVALUATED":
+                    return "已评价";
                 case "REFUNDED":
                     return "已退款";
                 default:
@@ -312,24 +318,24 @@ export default {
         handleDelete(row) {
             // console.log('row :>> ', row);
             this.$confirm("是否确认删除订单信息的数据项？", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
                 .then(() => {
                     deldetailed(row.appointmentOrderId).then((res) => {
                         this.$message.success("删除成功");
                         this.getList();
                     });
                 })
-                .catch(() => {});
+                .catch(() => { });
         },
         /** 导出按钮操作 */
         handleExport() {
             this.download(
                 "system/nurseType/export", {
-                    ...this.queryParams,
-                },
+                ...this.queryParams,
+            },
                 `nurseType_${new Date().getTime()}.xlsx`
             );
         },

From 4ae1f94f1cc0b6bba215fbb58c79d167fa81144e 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 09:39:43 +0800
Subject: [PATCH 2/3] =?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/api/system/goodsOrder.js           |   7 ++
 src/api/system/order.js                |   4 +-
 src/views/system/goodsOrder/index.vue  | 106 +++++++++++++++----------
 src/views/system/goodsOrder/indexjs.js |  25 ++++--
 src/views/system/order/index.vue       |  29 +++++--
 src/views/system/order/indexjs.js      |  41 ++++++++--
 6 files changed, 152 insertions(+), 60 deletions(-)

diff --git a/src/api/system/goodsOrder.js b/src/api/system/goodsOrder.js
index cd126aa..df5f771 100644
--- a/src/api/system/goodsOrder.js
+++ b/src/api/system/goodsOrder.js
@@ -40,6 +40,13 @@ export function editExpressNo(data) {
     })
 }
 
+//查看评价图片
+export function selectOrderEvaluate(id) {
+    return request({
+        url: `/nurseApp/orderEvaluate/selectOrderEvaluate?orderNo=${id}`,
+        method: 'get',
+    })
+}
 // 退款确定按钮
 export function weChatRefundOrderApply(data) {
     return request({
diff --git a/src/api/system/order.js b/src/api/system/order.js
index ff75b7f..2d32ff4 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // 查询护理类型信息列表
 export function appointmentOrderDetailsList(query) {
     return request({
-        url: 'system/appointmentOrder/list',
+        url: '/system/appointmentOrder/list',
         method: 'get',
         params: query
     })
@@ -68,4 +68,4 @@ export function confirmCancel(appointmentOrderId) {
         url: `/system/appointmentOrder/confirmCancel?appointmentOrderId=${appointmentOrderId}`,
         method: 'post'
     })
-}
+}
\ No newline at end of file
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index cdff701..d466e46 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -90,7 +90,10 @@
           <el-button
             type="primary"
             v-if="scope.row.orderStatus == 'RECEIVED_GOODS'"
-            >已收货</el-button
+            >待评价</el-button
+          >
+          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
+            >交易完成</el-button
           >
           <el-button
             type="warning"
@@ -209,7 +212,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <!-- 查看商品信息弹框 -->
+    <!-- 查看商品订单弹框 -->
     <el-dialog
       title="订单详情"
       :visible.sync="innerorder"
@@ -224,56 +227,38 @@
         label-width="120px"
       >
         <el-form-item label="订单编号" prop="orderNo">
-          <el-input
-            v-model="orderList.orderNo"
-            :disabled="true"
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.orderNo" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item label="商品名称" prop="goodsName">
           <el-input
             v-model="orderList.goodsName"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            disabled
             style="width: 240px"
           />
         </el-form-item>
         <el-form-item label="订单金额" prop="totalPrice">
           <el-input
             v-model="orderList.totalPrice"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            disabled
             style="width: 240px"
           />
         </el-form-item>
         <el-form-item label="收货人" prop="receiveAddress">
           <el-input
             v-model="orderList.receiver"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            disabled
             style="width: 240px"
           />
         </el-form-item>
         <el-form-item label="收货地址" prop="receiveAddress">
           <el-input
             v-model="orderList.receiveAddress"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            disabled
             style="width: 240px"
           />
         </el-form-item>
         <el-form-item label="手机号" prop="phone">
-          <el-input
-            v-model="orderList.phone"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
-            style="width: 240px"
-          />
+          <el-input v-model="orderList.phone" disabled style="width: 240px" />
         </el-form-item>
 
         <!-- <el-form-item label="商品属性" prop="goodsAttributeName">
@@ -305,40 +290,75 @@
         </el-form-item> -->
 
         <el-form-item label="订单状态" prop="orderStatus">
-          <!-- <el-form-item label="退款类型" prop="refundType">
-          <el-input
-            :value="refundTypeStatus(refundlist.refundType)"
-            disabled
-            style="width: 205px"
-          />
-        </el-form-item> -->
           <el-input
             :value="orderStatusinfo(orderList.orderStatus)"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            disabled
             style="width: 240px"
           />
         </el-form-item>
         <el-form-item label="下单方式" prop="buySource">
           <el-input
             :value="buySourceinfo(orderList.buySource)"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            disabled
             style="width: 240px"
           />
         </el-form-item>
         <el-form-item label="购买来源" prop="orderChannel">
           <el-input
             :value="orderChannelinfo(orderList.orderChannel)"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            disabled
             style="width: 240px"
           />
         </el-form-item>
-
+        <el-form-item label="综合评分" v-if="ratelist.compositeScore">
+          <div style="width: 240px">
+            <el-rate
+              v-if="ratelist.compositeScore"
+              v-model="ratelist.compositeScore"
+              style="padding-top: 7px"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"
+            >
+            </el-rate>
+            <el-input
+              v-else
+              type="text"
+              disabled
+              style="width: 240px"
+              placeholder="未评分"
+            ></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item label="评价内容" v-if="ratelist.evaluateContent">
+          <el-input
+            type="textarea"
+            disabled
+            style="width: 240px"
+            v-model="ratelist.evaluateContent"
+          />
+        </el-form-item>
+        <el-form-item
+          label="评价图片"
+          v-if="ratelist.orderEvaluatePictureInfoList"
+        >
+          <div
+            style="
+              display: flex;
+              flex-wrap: wrap;
+              justify-content: space-around;
+            "
+          >
+            <img
+            style="width:240px"
+              v-for="(item, index) in ratelist.orderEvaluatePictureInfoList"
+              :src="baseurl + item.evaluatePictureUrl"
+              alt=""
+              :key="index"
+            />
+          </div>
+        </el-form-item>
         <!-- <el-table
         :data="orderList"
         align="center"
diff --git a/src/views/system/goodsOrder/indexjs.js b/src/views/system/goodsOrder/indexjs.js
index 25421a1..3219d55 100644
--- a/src/views/system/goodsOrder/indexjs.js
+++ b/src/views/system/goodsOrder/indexjs.js
@@ -9,13 +9,15 @@ import {
     editExpressNo,
     goodsOrderrefund,
     weChatRefundOrderApply,
+    selectOrderEvaluate
 } from "@/api/system/goodsOrder";
 import { getListByUser } from "@/api/system/userlist.js";
-
+import baseurl from '@/api/baseurl.js'
 export default {
     name: "GoodsOrder",
     data() {
         return {
+            baseurl: null,
             // 查看商品信息
             innerorder: false,
             // 查看物流信息
@@ -24,6 +26,7 @@ export default {
             innerrefund: false,
             orderList: [],
             refundlist: [],
+            ratelist: {}, //评分list
             orderStatuslist: [{
                     value: "WAIT_PAY",
                     label: "待付款",
@@ -38,6 +41,10 @@ export default {
                 },
                 {
                     value: "RECEIVED_GOODS",
+                    label: "未评价",
+                },
+                {
+                    value: "EVALUATED",
                     label: "交易完成",
                 },
                 {
@@ -117,6 +124,7 @@ export default {
         };
     },
     created() {
+        this.baseurl = baseurl
         this.getList();
     },
     methods: {
@@ -180,7 +188,7 @@ export default {
                 case "WAIT_RECEIVED_GOODS":
                     return "待收货";
                 case "RECEIVED_GOODS":
-                    return "已收货";
+                    return "未评价";
                 case "WAIT_REFUND":
                     return "退款中";
                 case "REFUNDED":
@@ -189,6 +197,8 @@ export default {
                     return "待退货";
                 case "RETURNED_GOODS":
                     return "已退货";
+                case "EVALUATED":
+                    return "交易完成";
                 default:
                     break;
             }
@@ -229,11 +239,18 @@ export default {
         },
         // 查看商品信息
         seeOrder(row) {
-            console.log(row);
             const id = row.orderNo;
             getGoodsOrderlist(id).then((res) => {
                 this.orderList = res.data;
                 this.innerorder = true;
+                if (row.orderStatus == 'EVALUATED') {
+                    this.ratelist = {}
+                    selectOrderEvaluate(id).then(res => {
+                        if (res.data) {
+                            this.ratelist = res.data
+                        }
+                    })
+                }
             });
         },
         // 查看录入物流单号弹框
@@ -291,7 +308,6 @@ export default {
             this.open = false;
             this.reset();
         },
-
         //退款取消按钮
         refundcancel() {
             this.innerrefund = false;
@@ -347,7 +363,6 @@ export default {
             };
             this.handleQuery();
         },
-
         // 多选框选中数据
         handleSelectionChange(selection) {
             this.ids = selection.map((item) => item.id);
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index eecabf7..2c35da2 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -91,7 +91,10 @@
           <el-button type="primary" v-if="scope.row.orderStatus == 'NOT_FINISH'"
             >未完成</el-button
           >
-          <el-button type="success" v-if="scope.row.orderStatus == 'COMPLETE'"
+          <el-button type="primary" v-if="scope.row.orderStatus == 'COMPLETE'"
+            >未评价</el-button
+          >
+          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
             >服务完成</el-button
           >
           <el-button
@@ -108,7 +111,6 @@
         </template>
       </el-table-column>
       <el-table-column label="会员名称" align="center" prop="patientName" />
-
       <el-table-column
         label="操作"
         align="center"
@@ -224,21 +226,27 @@
         <el-form-item
           label="服务到岗照片"
           prop="onDutyPictureUrl"
-          v-if="query.orderStatus == 'COMPLETE'"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
         >
           <img class="img" :src="baseurl + query.onDutyPictureUrl" alt="" />
         </el-form-item>
         <el-form-item
           label="服务结束照片"
           prop="serviceEndPictureUrl"
-          v-if="query.orderStatus == 'COMPLETE'"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
         >
           <img class="img" :src="baseurl + query.serviceEndPictureUrl" alt="" />
         </el-form-item>
         <el-form-item
           label="用户确认签名"
           prop="userSignaturePictureUrl"
-          v-if="query.orderStatus == 'COMPLETE'"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
         >
           <img
             class="img"
@@ -246,6 +254,17 @@
             alt=""
           />
         </el-form-item>
+        <el-form-item
+          label="评价满意度"
+          prop="evaluateSatisfaction"
+          v-if="query.orderStatus == 'EVALUATED'"
+        >
+          <el-input
+            v-model="query.evaluateSatisfaction"
+            disabled
+            style="width: 250px"
+          />
+        </el-form-item>
         <el-table
           :data="query.appointmentOrderConsumableList"
           align="center"
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js
index 36a61a3..37008e5 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -7,6 +7,9 @@ import {
     xylWeChatRefundNotify,
     appointmentOrderDetails,
 } from "@/api/system/order";
+import {
+    selectOrderEvaluate
+} from "@/api/system/goodsOrder";
 import { getListByUser } from "@/api/system/userlist.js";
 import baseurl from '@/api/baseurl.js'
 export default {
@@ -41,6 +44,10 @@ export default {
                 },
                 {
                     value: "COMPLETE",
+                    label: "未评价",
+                },
+                {
+                    value: "EVALUATED",
                     label: "服务完成",
                 },
 
@@ -111,7 +118,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
             },
-            query: [],
+            query: {},
             // 表单参数
             form: {},
             // 表单校验
@@ -152,7 +159,7 @@ export default {
                 case "NOT_FINISH":
                     return "未完成";
                 case "COMPLETE":
-                    return "服务完成";
+                    return "未评价";
                 case "PAY":
                     return "已付款";
                 case "WAIT_REFUND":
@@ -161,12 +168,15 @@ export default {
                     return "已取消";
                 case "REFUNDED":
                     return "已退款";
+                case "EVALUATED":
+                    return "服务完成";
                 default:
                     break;
             }
         },
         // 查看
         seeLook(row) {
+            this.loading = true
             const id = row.orderNo;
             appointmentOrderDetails(id).then((res) => {
                 res.data.forEach((e) => {
@@ -176,12 +186,33 @@ export default {
                     }
                 });
                 this.query = res.data[0];
-                this.innerVisible4 = true;
+                this.query.evaluateSatisfaction = null
+                if (row.orderStatus == 'EVALUATED') {
+                    selectOrderEvaluate(id).then(res => {
+                        if (res.data) {
+                            if (res.data.evaluateSatisfaction == 'COMMONLY') {
+                                this.query.evaluateSatisfaction = '一般'
+                            } else if (res.data.evaluateSatisfaction == 'SATISFIED') {
+                                this.query.evaluateSatisfaction = '满意'
+                            } else if (res.data.evaluateSatisfaction == 'DISSATISFIED') {
+                                this.query.evaluateSatisfaction = '不满意'
+                            }
+                            this.loading = false
+                            this.innerVisible4 = true;
+
+                        } else {
+                            this.loading = false
+                            this.innerVisible4 = true;
+                        }
+                    })
+                } else {
+                    this.loading = false
+                    this.innerVisible4 = true;
+                }
             });
         },
         // 派单
         dispatch(row) {
-            console.log(row);
             this.querynursePersonname.orderNo = row.orderNo;
             this.nurseName = "请选择护理员";
             this.innerdispatch = true;
@@ -253,7 +284,7 @@ export default {
             this.info();
             this.nurseStationshow = true
         },
-        /** 查询护理类型信息列表 */
+        /** 订单信息列表 */
         getList() {
             this.loading = true;
             appointmentOrderDetailsList(this.queryParams).then((response) => {

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 3/3] =?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