From b451cc9f89421c5cce13d934f9c281425db22940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Mon, 9 May 2022 10:47:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=94=AE=E5=90=8E=E5=8D=95=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E8=B7=9F=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/sales/service.js |  7 ++++
 src/views/sales/order/track.vue    | 12 +++---
 src/views/sales/service/detail.vue |  6 +--
 src/views/sales/service/track.vue  | 67 ------------------------------
 4 files changed, 17 insertions(+), 75 deletions(-)
 delete mode 100644 src/views/sales/service/track.vue

diff --git a/src/store/modules/sales/service.js b/src/store/modules/sales/service.js
index 0d9f54a..6ee8b49 100644
--- a/src/store/modules/sales/service.js
+++ b/src/store/modules/sales/service.js
@@ -118,6 +118,13 @@ const actions = {
             init: true,
         });
     },
+    track: async (context, id) => {
+        let res = await api.logistics(id);
+        if (!res) {
+            ElMessage.error('加载物流信息失败');
+        }
+        return res;
+    },
     refundDetail: async (context, id) => {
         let res = await api.refundDetail(id);
         if (!res) {
diff --git a/src/views/sales/order/track.vue b/src/views/sales/order/track.vue
index 59aa4de..5dc26d6 100644
--- a/src/views/sales/order/track.vue
+++ b/src/views/sales/order/track.vue
@@ -28,11 +28,13 @@
 </template>
 
 <script setup lang="jsx">
+    const props = defineProps({
+        service: {
+            type: Boolean,
+            default: false,
+        },
+    });
     const store = useStore();
-    const opts = computed(() => store.state.order.opts);
-    if (!unref(opts).init) {
-        store.dispatch('order/load');
-    }
     const state = reactive({
         loading: false,
         visible: false,
@@ -44,7 +46,7 @@
     const show = async (orderId) => {
         state.visible = true;
         state.loading = true;
-        let res = await store.dispatch('order/track', orderId);
+        let res = await store.dispatch(props.service ? 'service/track' : 'order/track', orderId);
         Object.assign(state.info, res || {});
         state.loading = false;
     };
diff --git a/src/views/sales/service/detail.vue b/src/views/sales/service/detail.vue
index 52fb8aa..39e24e7 100644
--- a/src/views/sales/service/detail.vue
+++ b/src/views/sales/service/detail.vue
@@ -258,12 +258,12 @@
                 </template>
             </el-scrollbar>
         </div>
-        <OrderTrack ref="refsOrderTrack" />
+        <OrderTrack ref="refsOrderTrack" service />
     </div>
 </template>
 
 <script setup lang="jsx">
-    import OrderTrack from './track.vue';
+    import OrderTrack from '../order/track.vue';
     const store = useStore();
     const route = useRoute();
     const { proxy } = getCurrentInstance();
@@ -410,7 +410,7 @@
     };
     const refsOrderTrack = ref(null);
     const handleTrack = () => {
-        unref(refsOrderTrack).show(state.detail.refundLogistics);
+        unref(refsOrderTrack).show(state.detail.refundId);
     };
     /* 同意退货/退款 */
     const handleResolveRefundOrReturn = async () => {
diff --git a/src/views/sales/service/track.vue b/src/views/sales/service/track.vue
deleted file mode 100644
index ae91627..0000000
--- a/src/views/sales/service/track.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-    <el-dialog v-model="state.visible" title="物流跟踪">
-        <div v-loading="state.loading" class="track-container">
-            <h3>
-                <span class="name">{{ state.info.companyName }}</span>
-                <span class="no">{{ state.info.trackingNo }}</span>
-                <el-button type="text" @click="$copy(`${state.info.companyName} ${state.info.trackingNo}`)">
-                    复制
-                </el-button>
-            </h3>
-            <el-scrollbar max-height="50vh">
-                <el-timeline>
-                    <el-timeline-item
-                        v-for="(item, index) in state.info.logisticsDataList"
-                        :key="index"
-                        placement="top"
-                        :timestamp="item.time"
-                    >
-                        {{ item.context }}
-                    </el-timeline-item>
-                </el-timeline>
-            </el-scrollbar>
-        </div>
-        <template #footer>
-            <el-button @click="close">关闭</el-button>
-        </template>
-    </el-dialog>
-</template>
-
-<script setup lang="jsx">
-    const store = useStore();
-    const opts = computed(() => store.state.order.opts);
-    if (!unref(opts).init) {
-        store.dispatch('order/load');
-    }
-    const state = reactive({
-        loading: false,
-        visible: false,
-        info: {
-            logisticsDataList: [],
-        },
-    });
-
-    const show = async (info) => {
-        state.visible = true;
-        Object.assign(state.info, info);
-        state.loading = false;
-    };
-    const close = () => {
-        state.visible = false;
-    };
-    defineExpose({
-        show,
-        close,
-    });
-</script>
-
-<style lang="less" scoped>
-    .track-container {
-        h3 {
-            margin-bottom: @layout-space;
-            .no {
-                margin: 0 @layout-space;
-            }
-        }
-    }
-</style>