Merge remote-tracking branch 'origin/master'

马宇豪

2023-07-21 fc38d1c92f01a224e8373c4425481bb1d85e2bf3

 pages/tabBar/utils/tabBar.js

@@ -1,16 +1,34 @@
const user_leader = [
         {
            "pagePath": "pages/tabBar/examine/examine",
            "pagePath": "pages/tabBar/firstPage/firstPage",
            "iconPath": "/static/notice1.png",
            "selectedIconPath": "/static/notice1-selected.png",
            "text": "通知审核"
            "text": "首页"
         },
         {
            "pagePath": "pages/tabBar/current/current",
            "iconPath": "/static/send.png",
            "selectedIconPath": "/static/send_selected.png",
            "text": "信息"
         },
         // {
         //    "pagePath": "pages/tabBar/examine/examine",
         //    "iconPath": "/static/notice1.png",
         //    "selectedIconPath": "/static/notice1-selected.png",
         //    "text": "通知审核"
         // },
         {
            "pagePath": "pages/tabBar/weather/weather",
            "iconPath": "/static/notice1.png",
            "selectedIconPath": "/static/notice1-selected.png",
            "text": "气象"
         },
         {
            "pagePath": "pages/tabBar/count/count",
            "iconPath": "/static/notice1.png",
            "selectedIconPath": "/static/notice1-selected.png",
            "text": "信息统计"
         }
         },
]

const user_other = [
@@ -27,6 +45,12 @@
      "text": "我的叫应"
   },
   {
      "pagePath": "pages/tabBar/current/current",
      "iconPath": "/static/send.png",
      "selectedIconPath": "/static/send_selected.png",
      "text": "信息"
   },
   {
      "pagePath": "pages/tabBar/information/information",
      "iconPath": "/static/send.png",
      "selectedIconPath": "/static/send_selected.png",