From bc29c20650e12aeb16967241ce835028341100fd Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 2 Sep 2025 16:34:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(tabbar):=20=E5=BA=95=E9=83=A8tabbar?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E7=A7=BB=E9=99=A4=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=B8=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/backIcon.vue     | 24 ++++++++++--------------
 components/cl-tabbar.vue    | 17 ++++++++---------
 pages.json                  |  3 ---
 pages/mine/index.vue        |  2 +-
 pages/mine/share/index.vue  |  2 +-
 pages/shoppingCar/index.vue |  2 +-
 pages/specialArea/index.vue |  2 +-
 pages/specialArea/list.vue  |  2 +-
 8 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/components/backIcon.vue b/components/backIcon.vue
index 3370241..90bf0c6 100644
--- a/components/backIcon.vue
+++ b/components/backIcon.vue
@@ -1,23 +1,19 @@
 <!--
- * @Descripttion: 
- * @version: 
+ * @Descripttion:
+ * @version:
  * @Author: kBank
  * @Date: 2022-11-21 16:46:09
 -->
 <template>
-  <view class="navBar"
-        @tap="toBack">
-    <u-icon name="arrow-left"
-            size="14"
-            color="#333"></u-icon>
+  <view class="navBar" @tap="toBack">
+    <u-icon name="arrow-left" size="14" color="#333"></u-icon>
   </view>
-
 </template>
 
 <script>
 export default {
   name: 'navBar',
-  props:['diff'],
+  props: ['diff'],
   data() {
     return {}
   },
@@ -35,15 +31,15 @@ export default {
           uni.switchTab({ url: '/pages/specialArea/index' })
         } else if (this.diff == 1) {
           uni.switchTab({ url: '/pages/index/index' })
-        }else if (this.diff == 2) {
+        } else if (this.diff == 2) {
           uni.navigateBack()
         } else {
-          if(pages[pages.length - 2]&&pages[pages.length - 2].route){
+          if (pages[pages.length - 2] && pages[pages.length - 2].route) {
             uni.navigateBack()
-          }else{
+          } else {
             uni.switchTab({ url: '/pages/index/index' })
           }
-            // uni.navigateBack()
+          // uni.navigateBack()
         }
       }
     },
@@ -64,4 +60,4 @@ export default {
   justify-content: center;
   align-items: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/components/cl-tabbar.vue b/components/cl-tabbar.vue
index 09fc624..2e762a2 100644
--- a/components/cl-tabbar.vue
+++ b/components/cl-tabbar.vue
@@ -30,7 +30,7 @@
           src="@/static/images/one2.png"
         ></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="'会员专区'">
+      <!-- <u-tabbar-item :text="'会员专区'">
         <image
           class="u-page__item__slot-icon"
           slot="active-icon"
@@ -41,7 +41,7 @@
           slot="inactive-icon"
           src="@/static/images/five2.jpg"
         ></image>
-      </u-tabbar-item>
+      </u-tabbar-item> -->
       <u-tabbar-item :text="'个人推广'">
         <image
           class="u-page__item__slot-icon"
@@ -67,7 +67,6 @@
           src="@/static/images/three2.png"
         ></image>
       </u-tabbar-item>
-
       <u-tabbar-item :text="'我的'">
         <image
           class="u-page__item__slot-icon"
@@ -105,7 +104,7 @@
           src="@/static/images/one11.jpg"
         ></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="'会员专区'">
+      <!-- <u-tabbar-item :text="'会员专区'">
         <image
           class="u-page__item__slot-icon2"
           slot="active-icon"
@@ -116,7 +115,7 @@
           slot="inactive-icon"
           src="@/static/images/five11.jpg"
         ></image>
-      </u-tabbar-item>
+      </u-tabbar-item> -->
       <u-tabbar-item :text="'个人推广'">
         <image
           class="u-page__item__slot-icon1"
@@ -172,10 +171,10 @@ export default {
           text: '首页',
           path: 'pages/index/index',
         },
-        {
-          text: '会员专区',
-          path: 'pages/specialArea/index',
-        },
+        // {
+        //   text: '会员专区',
+        //   path: 'pages/specialArea/index',
+        // },
         {
           text: '个人推广',
           path: 'pages/mine/share/index',
diff --git a/pages.json b/pages.json
index 804b09b..469a520 100644
--- a/pages.json
+++ b/pages.json
@@ -916,9 +916,6 @@
       {
         "pagePath": "pages/index/index"
       },
-      {
-        "pagePath": "pages/specialArea/index"
-      },
       {
         "pagePath": "pages/shoppingCar/index"
       },
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 3d8b7cb..61ab7dc 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -232,7 +232,7 @@
         :text="'退出登录'"
       ></u-button>
     </view>
-    <cl-tabbar :current="4"></cl-tabbar>
+    <cl-tabbar :current="3"></cl-tabbar>
     <u-popup
       :show="pswShow"
       class="pspopup"
diff --git a/pages/mine/share/index.vue b/pages/mine/share/index.vue
index c8cb571..e89949b 100644
--- a/pages/mine/share/index.vue
+++ b/pages/mine/share/index.vue
@@ -28,7 +28,7 @@
         <img class="fullscreen-image" :src="generatedImageUrl" @click.stop="" />
       </view>
     </view>
-    <cl-tabbar class="tabbar" :current="2" />
+    <cl-tabbar class="tabbar" :current="1" />
   </view>
 </template>
 
diff --git a/pages/shoppingCar/index.vue b/pages/shoppingCar/index.vue
index f30ac29..7d7d2fd 100644
--- a/pages/shoppingCar/index.vue
+++ b/pages/shoppingCar/index.vue
@@ -139,7 +139,7 @@
         </view>
       </view>
     </view>
-    <cl-tabbar :current="3"></cl-tabbar>
+    <cl-tabbar :current="2"></cl-tabbar>
     <view class="pp">
       <u-popup
         :show="dialogVisible2"
diff --git a/pages/specialArea/index.vue b/pages/specialArea/index.vue
index 9164c9d..a195f1c 100644
--- a/pages/specialArea/index.vue
+++ b/pages/specialArea/index.vue
@@ -8,7 +8,7 @@
   <view class="content">
     <special-area-wrapper v-if="specialAreaVisble" :userInfo="userInfo" />
 
-    <cl-tabbar :current="1"></cl-tabbar>
+    <!-- <cl-tabbar :current="1"></cl-tabbar> -->
   </view>
 </template>
 
diff --git a/pages/specialArea/list.vue b/pages/specialArea/list.vue
index fc974e6..8172736 100644
--- a/pages/specialArea/list.vue
+++ b/pages/specialArea/list.vue
@@ -214,7 +214,7 @@ export default {
       goodList: [],
       titLabel: '',
       itemChildren: [],
-      diff: 0,
+      diff: null,
       shopCarLength: false,
       userInfo: {},
       pkCountry: 1,