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({ diff --git a/pages/shop/GoodsClass/index.vue b/pages/shop/GoodsClass/index.vue index 9a0c2e1..ff84bd7 100644 --- a/pages/shop/GoodsClass/index.vue +++ b/pages/shop/GoodsClass/index.vue @@ -69,7 +69,6 @@ export default { } }, mounted: function() { - // document.addEventListener("scroll", this.onScroll, false); this.loadCategoryData(); }, methods: { @@ -89,7 +88,6 @@ export default { this.category.forEach((cate, i) => { if (cate.id === n) index = i; }); - if (index !== this.navActive) { this.asideTap(index); } @@ -117,11 +115,8 @@ export default { asideTap(index) { this.navActive = index; } - }, - beforeDestroy: function() { - // document.removeEventListener("scroll", this.onScroll, false); } -}; +}