From 34ad2076f01cd5fcc4a1184fd32f1e4973d8eeb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=87?= <hbycchenxiao@163.com>
Date: Fri, 28 Mar 2025 20:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                     | 6 ++++++
 pages/order/index/index.js   | 4 ++--
 pages/order/index/index.wxml | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

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 @@
 <!-- <nav-bar class="nav-bar"/> -->
 <view class="custom-scroll-view">
   
-  <!-- <view class="tab-bar">
+  <view class="tab-bar">
     <view class="item-container {{tabIndex==0?'current':''}}" bind:tap="changeTab" data-index="0">
       <view class="item">配送订单</view>
-    </view> -->
+    </view>
     <!-- <view class="item-container {{tabIndex==1?'current':''}}" bind:tap="changeTab" data-index="1">
       <view class="item">消费买单</view>
     </view> -->
-    <!-- <view class="item-container {{tabIndex==2?'current':''}}" bind:tap="changeTab" data-index="2">
+    <view class="item-container {{tabIndex==2?'current':''}}" bind:tap="changeTab" data-index="2">
       <view class="item">商品订单</view>
     </view>
-  </view> -->
+  </view>
   <!-- <swiper  style="height:{{scrollViewHeight*2}}rpx"> -->
 
   <!--  跑腿列表   -->