From 77029700ed7f387160f00d61cf91da4551f1de59 Mon Sep 17 00:00:00 2001
From: zzp <34701892@qq.com>
Date: Thu, 28 Aug 2025 11:41:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(tabbar):=20=E6=B7=BB=E5=8A=A0=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85=E8=B5=84=E8=AE=AF=E6=A0=87=E7=AD=BE=E9=A1=B5=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=87=E7=AD=BE=E6=A0=8F=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增国内资讯标签页，包含激活和非激活状态图标
- 调整标签栏顺序，将我的页面与国内资讯位置互换
- 优化标签栏条件渲染逻辑，使用v-else简化代码
---
 src/assets/activeCaixun.png    | Bin 0 -> 674 bytes
 src/assets/caixun.png          | Bin 0 -> 555 bytes
 src/components/mini/Tabbar.vue |  29 +++++++++++++++------
 src/pages/home/index.vue       |  45 +++++++++++++++++++++++++++------
 4 files changed, 58 insertions(+), 16 deletions(-)
 create mode 100644 src/assets/activeCaixun.png
 create mode 100644 src/assets/caixun.png

diff --git a/src/assets/activeCaixun.png b/src/assets/activeCaixun.png
new file mode 100644
index 0000000000000000000000000000000000000000..df0054f5dfe73965d64ec71eb6507c900ed2542f
GIT binary patch
literal 674
zcmV;T0$u%yP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0yjxSK~#7F?U+w!
z(@-48zpwk3WK!GHn4)V@)MG?pBGsjM^W<$u+nb(5c2n3%)XUJbw;mNiMerb#cFNdp
z1}}maBWkq+ZIGD;*XH?NC0J^+q<aa9ybqM*m%jY+$?v^9UIIuYe;3jlyw!~i;AWzo
zs@Qq6W=Cl`Oy0b?ZXrnUlRj5v8w1g?2<Yt=Qk8yLE~UV`#4b@{VGhx$O`9vlfr52?
zj$IHlWK#VSn&wAarCVE?FUnFCr_GwhgALu#JD?AS6!Wo|VBQZ#2ers9U0WKTJr*kY
zy>j=^=ABB3I!=y)zWksY#Sy^vKzUC@94gzBf&i1}=if}NKDjb><lq{sd}gFuHCm-H
z$w5@mCw*h_9?>*j@f>#6t$~b&HLw?Np6WkFc4@A9;`qDq(<e80JeJ$<D23VO*3;@d
zVrEAbq??Z7EI&Woe)W2{e@werUPl55b+NOuI^*y2Dk1@d1WC)8K*9(Kc34*<VPbiT
zlSB%NA_YZ}f}%)4QKX<Kq3gkk1Nla8OfqSgZ#(ukrCt9V+sZkJP(hU~>x2ID>WzPU
zv5?v`<sxAQR`BbEh3kk2$!6cHX9~~KR~Och0DTpt4>2UP+1%&ce_U!5&PKkeZS#RX
z>Wv8m`KTM`QlPi+=i8jc(wEs7Fr$7V8HBJPr^!BZxa`Fpza=df<fw?4Pb~9bwktx)
ze(b@!9EThywuzd}H>SV8*L*SbSPmjK!CzJ6<F5OYNd6ms0y#gd7DlDo-2eap07*qo
IM6N<$f&}R_1ONa4

literal 0
HcmV?d00001

diff --git a/src/assets/caixun.png b/src/assets/caixun.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fad56bdcc94112ce2123393482cc9f1d474ee2d
GIT binary patch
literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0l-N_K~#7F?U&n8
zgFqC94<wJtm<}WzU@q^Z13NHQVC*1PV5}fX1<?wE@43){*a1E#fd83cl`uHju<Mv{
z_M2h$!gBc7T^J6L!SJ_O`G)JdEfg)eODPJ1Ad(q)N?gPY=_kQ%x4T5)ktAuFhL&Yb
z;y9icWm(F$?K@P57~_yU{(8M0h(^6|!#09(`F<=4#$9ALo<L*-p@DdM)Lrx~a$*r;
zen`Z;#5gD4S1%iwB#Bp?>N0x0o`--_7OB;0+kU@4*zI-^<d*1b;oK|g<JD^AAB%-&
z;uvqm{yHg;-MEddF++KSrCvaYXM*?Je6!gMNfDbg0I?AY-j7bUtReQ%kTjr0kY5li
z=aXoo{y>`0BFJFh&T{o<(u6j_{AWh?`zV7p!Qa9Ns$v9HF@mZXK~;>PDn?KhBdE&R
z3zjBLoLwOiB1r=N-A95n6CENaMt<Va33+xI2Q!F(Resf7TsQ4>I$tRx<hJM=Qw2F(
z_j1rCMKIIXC?0V*g;Sj6-8LGH!1w*iDS)yd!%NDEJAF%r&1UmTMNFVA?c~|Yb=~Wb
tW3;`+`~5x;btLU)n|6lTVKDp~J^}fksJ#Jy?3(}p002ovPDHLkV1lWV@-qMc

literal 0
HcmV?d00001

diff --git a/src/components/mini/Tabbar.vue b/src/components/mini/Tabbar.vue
index c6cea0c..3fd11db 100644
--- a/src/components/mini/Tabbar.vue
+++ b/src/components/mini/Tabbar.vue
@@ -2,13 +2,13 @@
   <view class="tabbar">
     <view class="tabbar_item" @click="tabChange(0)">
       <image
-        v-if="tabIndex == 1"
-        src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/newmini/home_icon_normal.png"
+        v-if="tabIndex == 0"
+        src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/newmini/home_icon_pre.png"
         class="tabbar_img"
       />
       <image
-        v-if="tabIndex == 0"
-        src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/newmini/home_icon_pre.png"
+        v-else
+        src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/newmini/home_icon_normal.png"
         class="tabbar_img"
       />
       <text
@@ -18,18 +18,31 @@
       >
     </view>
 
-    <view class="tabbar_item" @click="tabChange(1)">
+    <view class="tabbar_item" @click="tabChange(2)">
       <image
-        v-if="tabIndex == 0"
-        src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/newmini/mine_icon_normal.png"
+        v-if="tabIndex == 2"
+        src="../../assets/activeCaixun.png"
         class="tabbar_img"
       />
+      <image v-else src="../../assets/caixun.png" class="tabbar_img" />
+      <text
+        class="tabbar_title"
+        :style="{ color: tabIndex == 2 ? '#D13E3C' : '#757A80' }"
+        >国内资讯</text
+      >
+    </view>
+
+    <view class="tabbar_item" @click="tabChange(1)">
       <image
         v-if="tabIndex == 1"
         src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/newmini/mine_icon_pre.png"
         class="tabbar_img"
       />
-
+      <image
+        v-else
+        src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/newmini/mine_icon_normal.png"
+        class="tabbar_img"
+      />
       <text
         class="tabbar_title"
         :style="{ color: tabIndex == 1 ? '#D13E3C' : '#757A80' }"
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 2038d8e..eaedba5 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -1,10 +1,23 @@
 <template>
-  <view class="root" :style="{ backgroundColor: tabIndex == 4 ? '#f6f6f6' : '#ffffff' }">
+  <view
+    class="root"
+    :style="{ backgroundColor: tabIndex == 4 ? '#f6f6f6' : '#ffffff' }"
+  >
     <!-- 首页 start -->
-    <Index v-if="menuStateConfig.home.active" :columnState="menuStateConfig.home" :colList="homeColList" @onChange="handleMenuChange"></Index>
+    <Index
+      v-if="menuStateConfig.home.active"
+      :columnState="menuStateConfig.home"
+      :colList="homeColList"
+      @onChange="handleMenuChange"
+    ></Index>
     <!-- 首页 end -->
     <!-- vip start -->
-    <vip v-if="menuStateConfig.vip.active" :columnState="menuStateConfig.vip" :colList="vipColList" @onChange="handleMenuChange"></vip>
+    <vip
+      v-if="menuStateConfig.vip.active"
+      :columnState="menuStateConfig.vip"
+      :colList="vipColList"
+      @onChange="handleMenuChange"
+    ></vip>
     <!-- vip end -->
     <!-- 我的 start -->
     <mine v-if="menuStateConfig.mine.active"></mine>
@@ -19,14 +32,24 @@
       @change="handleMenuChange($event, 'tabbar')"
       z-index="600"
     >
-      <u-tabbar-item :text="item.title" v-for="(item, index) in menuList" :key="index">
+      <u-tabbar-item
+        :text="item.title"
+        v-for="(item, index) in menuList"
+        :key="index"
+      >
         <template #active-icon>
           <view v-if="index == 0" style="height: 40rpx"></view>
-          <image :src="item.iconc" :class="[index == 0 ? 'vipcass_c' : 'menu_icon']"></image>
+          <image
+            :src="item.iconc"
+            :class="[index == 0 ? 'vipcass_c' : 'menu_icon']"
+          ></image>
         </template>
         <template #inactive-icon>
           <view v-if="index == 0" style="height: 40rpx"></view>
-          <image :src="item.icon" :class="[index == 0 ? 'vipcass' : 'menu_icon']"></image>
+          <image
+            :src="item.icon"
+            :class="[index == 0 ? 'vipcass' : 'menu_icon']"
+          ></image>
         </template>
       </u-tabbar-item>
     </u-tabbar>
@@ -135,11 +158,17 @@ const setMenuStateConfig = (option: any) => {
   const __menuStateConfig = Session.get("menuStateConfig");
 
   if (__menuStateConfig) {
-    const activeObject: any = Object.values(__menuStateConfig).find((item: any) => item.active);
+    const activeObject: any = Object.values(__menuStateConfig).find(
+      (item: any) => item.active
+    );
     const activeId = activeObject ? activeObject.id : 0;
     tabIndex.value = activeId;
     menuStateConfig.value = __menuStateConfig;
-  } else if (option?.tabIndex || option?.columnIndex || option?.subColumnIndex) {
+  } else if (
+    option?.tabIndex ||
+    option?.columnIndex ||
+    option?.subColumnIndex
+  ) {
     const index = Number(option?.tabIndex) || 0;
     const columnIndex = Number(option?.columnIndex) || 0;
     const subColumnIndex = Number(option?.subColumnIndex) || 0;