From 8d643d694e42d22ee612c7176236792bcfc8014b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Thu, 12 Nov 2020 19:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order-list/order-list-cell.vue | 3 ++-
 src/pages/user/order/order_detail.vue         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue
index 74b05a5..fe0e42b 100644
--- a/src/components/order-list/order-list-cell.vue
+++ b/src/components/order-list/order-list-cell.vue
@@ -192,6 +192,7 @@
           <div v-else-if="cellItem.pay_status == -1">订单已取消</div>
           <el-popover
             v-if="
+              cellItem.order_type != 3 &&
               cellItem.approval_second_level == 1 &&
               cellItem.pay_status != -1 &&
               cellItem.is_estimated == 0
@@ -360,7 +361,7 @@ export default {
   },
   methods: {
     addEvaluation() {
-      if (this.textarea == "" && this.serviceRate == null) {
+      if (this.textarea == "" || this.serviceRate == null) {
         this.$message({
           message: "请先完善评价内容",
           type: "error",
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index f74c14b..ad15357 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -80,6 +80,7 @@
           <div class="btn_group">
             <el-popover
               v-if="
+                orderDetail.order_type != 3 &&
                 orderDetail.is_estimated == 0 &&
                 orderDetail.approval_second_level == 1 &&
                 orderDetail.pay_status != -1
-- 
2.26.0