解决冲突

4 years ago · 682a742497
1 changed files with 0 additions and 4 deletions
--- 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({