合并冲突

2021-06-02 01:21:34 +08:00
parent a3440305b8
commit c2d0529ab5
3 changed files with 1 additions and 46 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({