From 68b7e447e767ba78e7bb72952fe2767a42e0c2be Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Sun, 20 Nov 2022 16:06:07 +0800
Subject: [PATCH 1/4] =?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 | 9 +++++++++
 src/views/system/order/index.vue      | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 9bfeea8..9b872d1 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -119,6 +119,9 @@
             v-if="scope.row.orderStatus == 'RETURNED_GOODS'"
             >已退货</el-button
           >
+           <el-button type="warning" v-if="scope.row.orderStatus == 'EVALUATED'"
+            >已评价</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column
@@ -645,6 +648,10 @@ export default {
           value: "RETURNED_GOODS",
           label: "已退货",
         },
+        {
+          value: "EVALUATED",
+          label: "已评价",
+        },
       ],
       // 遮罩层
       loading: true,
@@ -736,6 +743,8 @@ 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 bd65493..60bc920 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -116,6 +116,9 @@
           <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
             >已取消</el-button
           >
+           <el-button type="warning" v-if="scope.row.orderStatus == 'EVALUATED'"
+            >已评价</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
@@ -520,6 +523,10 @@ export default {
           value: "NOT_FINISH",
           label: "未完成",
         },
+         {
+          value: "EVALUATED",
+          label: "已评价",
+        },
       ],
       value: "",
       // 遮罩层
@@ -629,6 +636,8 @@ export default {
           return "已取消";
         case "REFUNDED":
           return "已退款";
+           case "EVALUATED":
+          return "已评价";
         default:
           break;
       }

From ec3d26b01da4b16dc89484a6f84274efa599faca 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:45:14 +0800
Subject: [PATCH 2/4] =?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/views/system/goodsOrder/index.vue | 202 +++++++++++---------------
 src/views/system/order/index.vue      |  80 ++++++++--
 3 files changed, 154 insertions(+), 135 deletions(-)

diff --git a/src/api/system/goodsOrder.js b/src/api/system/goodsOrder.js
index cd126aa..d2b984e 100644
--- a/src/api/system/goodsOrder.js
+++ b/src/api/system/goodsOrder.js
@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+//查看评价图片
+export function selectOrderEvaluate(id) {
+    return request({
+        url: `/nurseApp/orderEvaluate/selectOrderEvaluate?orderNo=${id}`,
+        method: 'get',
+    })
+}
 // 查询商品订单列表
 export function listGoodsOrder(query) {
     return request({
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 9bfeea8..b079605 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -81,7 +81,6 @@
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-          <!-- {{ orderStatus(scope.row.orderStatus) }} -->
           <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
             >待付款</el-button
           >
@@ -99,7 +98,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"
@@ -284,43 +286,7 @@
             style="width: 240px"
           />
         </el-form-item>
-
-        <!-- <el-form-item label="商品属性" prop="goodsAttributeName">
-          <el-input
-            v-model="orderList.goodsAttributeName"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
-            style="width: 240px"
-          />
-        </el-form-item> -->
-        <!-- <el-form-item label="商品价格" prop="goodsPrice">
-          <el-input
-            v-model="orderList.goodsPrice"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
-            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"
-            style="width: 240px"
-          />
-        </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
@@ -347,57 +313,46 @@
             style="width: 240px"
           />
         </el-form-item>
-
-        <!-- <el-table
-        :data="orderList"
-        align="center"
-        style="margin: 10px 0 20px 0; padding-bottom: 20px"
-      >
-        <el-table-column
-          prop="orderNo"
-          label="订单编号"
-          width="120"
-          align="center"
+        <el-form-item label="综合评分" v-if="ratelist.compositeScore">
+          <div style="width: 240px">
+            <el-rate
+              v-model="ratelist.compositeScore"
+              style="padding-top: 7px"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"
+            >
+            </el-rate>
+          </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"
         >
-        </el-table-column>
-        <el-table-column
-          prop="receiveAddress"
-          label="地址"
-          width="120"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="receiver"
-          label="收货人"
-          width="120"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column prop="phone" label="手机号" width="120" align="center">
-        </el-table-column>
-        <el-table-column
-          prop="goodsName"
-          label="商品名称"
-          width="120"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="goodsAttributeName"
-          label="商品属性"
-          width="120"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="goodsPrice"
-          label="商品价格"
-          width="120"
-          align="center"
-        >
-        </el-table-column>
-      </el-table> -->
+          <div
+            style="
+              display: flex;
+              flex-wrap: wrap;
+              justify-content: space-around;
+            "
+          >
+            <img
+              v-for="(item, index) in ratelist.orderEvaluatePictureInfoList"
+              :src="item.evaluatePictureUrl"
+              alt=""
+              :key="index"
+            />
+          </div>
+        </el-form-item>
       </el-form>
     </el-dialog>
     <!-- 查看物流信息弹框 -->
@@ -589,6 +544,7 @@ import {
   editExpressNo,
   goodsOrderrefund,
   weChatRefundOrderApply,
+  selectOrderEvaluate,
 } from "@/api/system/goodsOrder";
 import { getListByUser } from "@/api/system/userlist.js";
 
@@ -605,6 +561,7 @@ export default {
       orderList: [],
       refundlist: [],
       nurseStationlist: [],
+      ratelist: [], //评分list
       orderStatuslist: [
         {
           value: "WAIT_PAY",
@@ -612,21 +569,31 @@ export default {
         },
         {
           value: "PAY",
-          label: "已付款",
+          label: "待发货",
+        },
+        {
+          value: "WAIT_RECEIVED_GOODS",
+          label: "待收货",
+        },
+        {
+          value: "RECEIVED_GOODS",
+          label: "未评价",
+        },
+        {
+          value: "EVALUATED",
+          label: "交易完成",
         },
         {
           value: "CANCEL",
           label: "已取消",
         },
-
         {
-          value: "WAIT_RECEIVED_GOODS",
-          label: "待收货",
+          value: "WAIT_RETURNED_GOODS",
+          label: "待退货",
         },
-
         {
-          value: "RECEIVED_GOODS",
-          label: "已收货",
+          value: "RETURNED_GOODS",
+          label: "已退货",
         },
         {
           value: "WAIT_REFUND",
@@ -636,15 +603,6 @@ export default {
           value: "REFUNDED",
           label: "退款成功",
         },
-
-        {
-          value: "WAIT_RETURNED_GOODS",
-          label: "待退货",
-        },
-        {
-          value: "RETURNED_GOODS",
-          label: "已退货",
-        },
       ],
       // 遮罩层
       loading: true,
@@ -727,7 +685,7 @@ export default {
         case "WAIT_RECEIVED_GOODS":
           return "待收货";
         case "RECEIVED_GOODS":
-          return "已收货";
+          return "未评价";
         case "WAIT_REFUND":
           return "退款中";
         case "REFUNDED":
@@ -736,6 +694,8 @@ export default {
           return "待退货";
         case "RETURNED_GOODS":
           return "已退货";
+        case "EVALUATED":
+          return "交易完成";
         default:
           break;
       }
@@ -781,6 +741,14 @@ export default {
       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;
+            }
+          });
+        }
       });
     },
     // 查看录入物流单号弹框
@@ -800,7 +768,6 @@ export default {
         this.queryexpressNo.expressNo = "";
         this.getList();
         this.innerlogistics = false;
-
       });
     },
     // 取消按钮
@@ -832,7 +799,6 @@ export default {
         }
         this.getList();
         this.innerrefund = false;
-
       });
     },
     // refund(id){
@@ -914,13 +880,13 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-       console.log(this.nurseStationlist)
-      console.log(this.nurseStationlist)
-      if (this.nurseStationlist[0]){
-         this.queryParams.pageNum = 1;
-         this.queryParams.pageSize = 10;
-         this.queryParams.orderNo = null;
-         this.queryParams.orderStatus = null;
+      console.log(this.nurseStationlist);
+      console.log(this.nurseStationlist);
+      if (this.nurseStationlist[0]) {
+        this.queryParams.pageNum = 1;
+        this.queryParams.pageSize = 10;
+        this.queryParams.orderNo = null;
+        this.queryParams.orderStatus = null;
       }
 
       // this.queryParams = {
@@ -988,7 +954,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1006,7 +972,7 @@ export default {
         this.total2 = res.total;
         this.nurseStationlist = res.rows;
         this.queryParams.nurseStationId = res.rows[0].id;
-        this.getList()
+        this.getList();
         // this.handleQuery();
       });
     },
@@ -1016,12 +982,10 @@ export default {
         pageSize: 9999,
       };
       getListByUser(queryFor).then((res) => {
-        console.log(res)
+        console.log(res);
         this.handstationlist = res.rows;
       });
     },
-
-
   },
 };
 </script>
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index bd65493..6bedf1e 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -101,7 +101,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
@@ -110,9 +113,8 @@
             >退款中</el-button
           >
           <el-button type="warning" v-if="scope.row.orderStatus == 'REFUNDED'"
-            >已退款</el-button
+            >退款成功</el-button
           >
-
           <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
             >已取消</el-button
           >
@@ -231,19 +233,42 @@
             style="width: 250px"
           />
         </el-form-item>
-        <el-form-item label="服务到岗照片" prop="onDutyPictureUrl" v-if="query.orderStatus == 'COMPLETE'">
+        <el-form-item
+          label="服务到岗照片"
+          prop="onDutyPictureUrl"
+          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'">
+        <el-form-item
+          label="服务结束照片"
+          prop="serviceEndPictureUrl"
+          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'">
+        <el-form-item
+          label="用户确认签名"
+          prop="userSignaturePictureUrl"
+          v-if="query.orderStatus == 'COMPLETE'||query.orderStatus == 'EVALUATED'"
+        >
           <img
             class="img"
             :src="baseurl + query.userSignaturePictureUrl"
             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"
@@ -479,12 +504,13 @@ import {
   appointmentOrderDetails,
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
-import baseurl from '@/api/baseurl.js'
+import baseurl from "@/api/baseurl.js";
+import { selectOrderEvaluate } from "@/api/system/goodsOrder";
 export default {
   name: "order",
   data() {
     return {
-      baseurl:null,
+      baseurl: null,
       orderStatuslist: [
         {
           value: "WAIT_PAY",
@@ -513,6 +539,10 @@ export default {
         },
         {
           value: "COMPLETE",
+          label: "未评价",
+        },
+        {
+          value: "EVALUATED",
           label: "服务完成",
         },
 
@@ -585,7 +615,7 @@ export default {
     };
   },
   created() {
-    this.baseurl = baseurl
+    this.baseurl = baseurl;
     this.getList();
     this.info();
     this.infos();
@@ -620,7 +650,7 @@ export default {
         case "NOT_FINISH":
           return "未完成";
         case "COMPLETE":
-          return "服务完成";
+          return "未评价";
         case "PAY":
           return "已付款";
         case "WAIT_REFUND":
@@ -629,14 +659,16 @@ export default {
           return "已取消";
         case "REFUNDED":
           return "已退款";
+        case "EVALUATED":
+          return "服务完成";
         default:
           break;
       }
     },
     // 查看
     seeLook(row) {
+      this.loading = true;
       const id = row.orderNo;
-      // console.log(row);
       appointmentOrderDetails(id).then((res) => {
         res.data.forEach((e) => {
           if (e.serviceDate) {
@@ -646,15 +678,32 @@ export default {
         });
         this.query = res.data[0];
         this.innerVisible4 = true;
-        console.log(this.query);
+        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;
-      console.log(this.querynursePersonname.orderNo);
-      // console.log(row)
       this.nurseName = "请选择护理员";
       this.innerdispatch = true;
       this.nursePersonid = "";
@@ -813,7 +862,6 @@ export default {
 </script>
 
 <style scoped>
-
 .img {
   width: 250px;
   height: 250px;

From e6dfa1e9ded5c606c381b1fdc7b96b0c1604d0c1 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:02 +0800
Subject: [PATCH 3/4] =?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 | 25 +++++----
 src/views/system/order/index.vue      | 80 ++++++++++++++-------------
 2 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index b079605..2b42115 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -81,11 +81,12 @@
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
+          <!-- {{ orderStatus(scope.row.orderStatus) }} -->
           <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
             >待付款</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
@@ -577,7 +578,7 @@ export default {
         },
         {
           value: "RECEIVED_GOODS",
-          label: "未评价",
+          label: "待评价",
         },
         {
           value: "EVALUATED",
@@ -679,23 +680,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;
       }
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 6bedf1e..6ca3e45 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -22,14 +22,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="会员名称" prop="patientName">
-        <el-input
-          v-model="queryParams.patientName"
-          placeholder="请输入会员名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="订单编号" prop="orderNo">
         <el-input
           v-model="queryParams.orderNo"
@@ -38,7 +30,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
@@ -53,7 +44,14 @@
           </el-option>
         </el-select>
       </el-form-item>
-
+      <el-form-item label="会员名称" prop="patientName">
+        <el-input
+          v-model="queryParams.patientName"
+          placeholder="请输入会员名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -77,7 +75,6 @@
         align="center"
         prop="nurseStationName"
       />
-      <el-table-column label="会员名称" align="center" prop="patientName" />
       <el-table-column label="订单编号" align="center" prop="orderNo" />
       <el-table-column
         label="护理项目名称"
@@ -102,7 +99,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
@@ -121,6 +118,7 @@
         </template>
       </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
+      <el-table-column label="会员名称" align="center" prop="patientName" />
       <el-table-column
         label="操作"
         align="center"
@@ -236,21 +234,27 @@
         <el-form-item
           label="服务到岗照片"
           prop="onDutyPictureUrl"
-          v-if="query.orderStatus == 'COMPLETE'||query.orderStatus == 'EVALUATED'"
+          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'||query.orderStatus == 'EVALUATED'"
+          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'||query.orderStatus == 'EVALUATED'"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
         >
           <img
             class="img"
@@ -520,35 +524,33 @@ 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: "",
@@ -645,22 +647,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;
       }

From 01df7202181cca9644d62eeadf4ddb2f03bf224e 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:15:20 +0800
Subject: [PATCH 4/4] =?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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 2b42115..d181147 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -347,8 +347,9 @@
             "
           >
             <img
+              style="width: 240px"
               v-for="(item, index) in ratelist.orderEvaluatePictureInfoList"
-              :src="item.evaluatePictureUrl"
+              :src="baseurl + item.evaluatePictureUrl"
               alt=""
               :key="index"
             />
@@ -548,11 +549,13 @@ import {
   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,
       // 查看物流信息
@@ -658,6 +661,7 @@ export default {
     };
   },
   created() {
+    this.baseurl = baseurl;
     this.getList();
     this.info();
     this.infos();