Przeglądaj źródła

Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131

xucaiqin 3 miesięcy temu
rodzic
commit
802b5c1f79

+ 15 - 6
sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -834,6 +834,9 @@ public class AuthServiceImpl implements IAuthService {
         if (flag == 1) {
             return buildDefaultDriverTabBar();
         }
+        if (flag == 0 && !isDoorKeeper && !isForkliftDriver && !isBuyer){
+            return buildBuyerTabBar();
+        }
         return List.of();
     }
 
@@ -841,15 +844,21 @@ public class AuthServiceImpl implements IAuthService {
         List<LoginResVo1.TabBarItem> items = new ArrayList<>();
         items.add(buildTabBarItem(
                 "商城",
-                "static/tabbar/mall.png",
-                "static/tabbar/mall_select.png",
-                "pages/mall/index"
+                "/static/tabbar/mall_select.png",
+                "/static/tabbar/mall.png",
+                "/pages/mall/index"
         ));
         items.add(buildTabBarItem(
                 "贸易订单",
-                "static/tabbar/trade.png",
-                "static/tabbar/trade_select.png",
-                "pages/tradeOrder/index"
+                "/static/tabbar/trade_select.png",
+                "/static/tabbar/trade.png",
+                "/pages/tradeOrder/index"
+        ));
+        items.add(buildTabBarItem(
+                "个人中心",
+                "/static/tabbar/my_select.png",
+                "/static/tabbar/my.png",
+                "/pages/forklift/my"
         ));
         return items;
     }