From bb96ecabe98bd99de63edd037a7a24b43eef577c Mon Sep 17 00:00:00 2001
From: panqihua <panqihua@melt.icu>
Date: Tue, 17 Jan 2023 15:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/platform/components/order_detail.vue         | 10 +++++++---
 src/views/platform/components/progress.vue             |  2 +-
 src/views/platform/order_management/delivery_order.vue |  2 +-
 src/views/platform/self-operated-mall/order.vue        |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/platform/components/order_detail.vue b/src/views/platform/components/order_detail.vue
index 4921712..f79e0ea 100644
--- a/src/views/platform/components/order_detail.vue
+++ b/src/views/platform/components/order_detail.vue
@@ -107,9 +107,7 @@ export default {
     components: { OrderProgress },
     props: {
         // 是否显示dialog
-        open: Boolean,
-        //TODO: 1 自营商城订单详情，2 骑手配送订单详情，应该通过订单类型来判断，先开发UI所以这么写。
-        type: Number
+        open: Boolean
     },
     data() {
         return {
@@ -142,6 +140,12 @@ export default {
             this.$modal.msgSuccess('保存成功')
             this.$emit('close')
         }
+    },
+    computed: {
+        //自营商城-订单管理-详情:1，订单管理-外卖订单-订单详情：2
+        type() {
+            return this.$route.fullPath.includes('self-operated-mall') ? 1 : 2
+        }
     }
 }
 </script>
diff --git a/src/views/platform/components/progress.vue b/src/views/platform/components/progress.vue
index 45f91ab..9864d4a 100644
--- a/src/views/platform/components/progress.vue
+++ b/src/views/platform/components/progress.vue
@@ -46,7 +46,7 @@
 export default {
     name: 'Progress',
     props: {
-        //TODO: 1 自营商城订单详情，2 骑手配送订单详情，应该通过订单类型来判断，先开发UI所以这么写。
+        //1 自营商城订单详情，2 骑手配送订单详情
         type: Number
     }
 }
diff --git a/src/views/platform/order_management/delivery_order.vue b/src/views/platform/order_management/delivery_order.vue
index 48977ac..7b0498a 100644
--- a/src/views/platform/order_management/delivery_order.vue
+++ b/src/views/platform/order_management/delivery_order.vue
@@ -59,7 +59,7 @@
             </el-table-column>
         </el-table>
 
-        <order-detail :open="open" @close="open = false" :type="2" />
+        <order-detail :open="open" @close="open = false" />
 
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize" @pagination="getList" />
diff --git a/src/views/platform/self-operated-mall/order.vue b/src/views/platform/self-operated-mall/order.vue
index 66e95c4..9130267 100644
--- a/src/views/platform/self-operated-mall/order.vue
+++ b/src/views/platform/self-operated-mall/order.vue
@@ -77,7 +77,7 @@
         </el-table>
 
 
-        <order-detail :open="open" @close="open = false" :type="1" />
+        <order-detail :open="open" @close="open = false" />
 
 
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"