合并冲突

2021-06-02 01:05:04 +08:00
parent a2042820b9 11d6bda868
commit 43ac4aaab9
4 changed files with 26 additions and 8 deletions
--- a/pages/order/Logistics/index.vue
+++ b/pages/order/Logistics/index.vue
@ -135,7 +135,11 @@ export default {
      }
      express(params)
        .then(res => {
+<<<<<<< HEAD
          this.logisticsList = res.data.traces.reverse()
+=======
+          this.logisticsList = res.data.Traces.reverse();
+>>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
        })
        .catch(err => {
          uni.showToast({