cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
taozi
2021-06-02 01:18:53 +08:00
parent a3440305b8
commit 682a742497
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/order/Logistics/index.vue
View File

@ -135,11 +135,7 @@ export default {
} }
express(params) express(params)
.then(res => { .then(res => {
<<<<<<< HEAD
this.logisticsList = res.data.traces.reverse()
=======
this.logisticsList = res.data.Traces.reverse(); this.logisticsList = res.data.Traces.reverse();
>>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
}) })
.catch(err => { .catch(err => {
uni.showToast({ uni.showToast({