diff --git a/app.json b/app.json index 143f44c..1c056fb 100644 --- a/app.json +++ b/app.json @@ -45,6 +45,12 @@ "iconPath": "assets/icon/tabs/tab1.png", "selectedIconPath": "assets/icon/tabs/tab1-active.png" }, + { + "pagePath": "pages/shop/index/index", + "text": "生活圈", + "iconPath": "assets/icon/tabs/tab2.png", + "selectedIconPath": "assets/icon/tabs/tab2-active.png" + }, { "pagePath": "pages/order/index/index", "text": "订单", diff --git a/pages/order/index/index.js b/pages/order/index/index.js index c359030..89fbb12 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -75,8 +75,8 @@ Page({ onLoad(options) { app.globalData.needRefreshOrderList = false; if(app.globalData.accessToken){ - this.pager.tab1.loading = false; - this.pager.tab3.loading = false; + this.data.pager.tab1.loading = false; + this.data.pager.tab3.loading = false; this.loadOrderList(); this.loadMerchantOrderList(); diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index 080d4b4..e968837 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -1,17 +1,17 @@ - + - +