From 682a742497ebc69afee76ae72ecd2109787ae48e Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Wed, 2 Jun 2021 01:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/Logistics/index.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pages/order/Logistics/index.vue b/pages/order/Logistics/index.vue
index e9bb225..4044dbb 100644
--- a/pages/order/Logistics/index.vue
+++ b/pages/order/Logistics/index.vue
@@ -135,11 +135,7 @@ export default {
       }
       express(params)
         .then(res => {
-<<<<<<< HEAD
-          this.logisticsList = res.data.traces.reverse()
-=======
           this.logisticsList = res.data.Traces.reverse();
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
         })
         .catch(err => {
           uni.showToast({