diff --git a/src/App.vue b/src/App.vue index c422304..b89e1e9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,12 +4,14 @@ // onShow(() => {}) // onHide(() => {}) +// zhezhengding:浙政钉 | shihua:诗画 const tabbar = [ { - pagePath: "pages/tabbar/home", - text: "首页", - iconPath: "/static/tabbar/home.png", - selectedIconPath: "/static/tabbar/home-select.png", + pagePath: "pages/tabbar/canteen", + text: "食堂", + iconPath: "/static/tabbar/canteen.png", + selectedIconPath: "/static/tabbar/canteen-select.png", + auth: ["zhezhengding", "shihua"], }, // { // "pagePath": "pages/tabbar/shop", @@ -22,24 +24,28 @@ const tabbar = [ text: "订单", iconPath: "/static/tabbar/order.png", selectedIconPath: "/static/tabbar/order-select.png", + auth: ["zhezhengding"], }, { pagePath: "pages/tabbar/flowStatistics", text: "流水统计", iconPath: "/static/tabbar/order.png", selectedIconPath: "/static/tabbar/order-select.png", + auth: ["shihua"], }, { pagePath: "pages/tabbar/individualOrder", text: "订单", iconPath: "/static/tabbar/order.png", selectedIconPath: "/static/tabbar/order-select.png", + auth: ["shihua"], }, { pagePath: "pages/tabbar/my", text: "我的", iconPath: "/static/tabbar/my.png", selectedIconPath: "/static/tabbar/my-select.png", + auth: ["zhezhengding", "shihua"], }, ] @@ -50,27 +56,58 @@ export default { methods: { _initTabbar() { - tabbar.forEach(({ pagePath, text, iconPath, selectedIconPath }, index) => { - if (index === 2 || index === 3) { - uni.setTabBarItem({ - index: index, - pagePath, - text, - iconPath, - selectedIconPath, - visible: false, + console.log("环境判断") + + let appEnv = 1 // 1:浙政钉 2:诗画 + + switch (appEnv) { + case 1: + tabbar.forEach(({ pagePath, text, iconPath, selectedIconPath, auth }, index) => { + if (auth.includes("zhezhengding")) { + uni.setTabBarItem({ + index, + pagePath, + text, + iconPath, + selectedIconPath, + visible: true, + }) + } else { + uni.setTabBarItem({ + index, + pagePath, + text, + iconPath, + selectedIconPath, + visible: false, + }) + } }) - } else { - uni.setTabBarItem({ - index: index, - pagePath, - text, - iconPath, - selectedIconPath, - visible: true, + break + case 2: + tabbar.forEach(({ pagePath, text, iconPath, selectedIconPath, auth }, index) => { + if (auth.includes("shihua")) { + uni.setTabBarItem({ + index, + pagePath, + text, + iconPath, + selectedIconPath, + visible: true, + }) + } else { + uni.setTabBarItem({ + index, + pagePath, + text, + iconPath, + selectedIconPath, + visible: false, + }) + } }) - } - }) + break + } }, }, } diff --git a/src/pages.json b/src/pages.json index 6c5ab70..26907c7 100644 --- a/src/pages.json +++ b/src/pages.json @@ -10,9 +10,9 @@ }, "pages": [ { - "path": "pages/tabbar/home", + "path": "pages/tabbar/canteen", "style": { - "navigationBarTitleText": "首页", + "navigationBarTitleText": "食堂", "disableScroll": true } }, @@ -294,7 +294,7 @@ "tabBar": { "list": [ { - "pagePath": "pages/tabbar/home", + "pagePath": "pages/tabbar/canteen", "text": "", "iconPath": "", "selectedIconPath": "" @@ -331,10 +331,10 @@ } // { - // "pagePath": "pages/tabbar/home", - // "text": "首页", - // "iconPath": "static/tabbar/home.png", - // "selectedIconPath": "static/tabbar/home-select.png" + // "pagePath": "pages/tabbar/canteen", + // "text": "食堂", + // "iconPath": "static/tabbar/canteen.png", + // "selectedIconPath": "static/tabbar/canteen-select.png" // }, // { // "pagePath": "pages/tabbar/shop", diff --git a/src/pages/tabbar/home.vue b/src/pages/tabbar/canteen.vue similarity index 100% rename from src/pages/tabbar/home.vue rename to src/pages/tabbar/canteen.vue diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts index 3d07e3a..bba1f5c 100644 --- a/src/sheep/utils/request.ts +++ b/src/sheep/utils/request.ts @@ -113,6 +113,8 @@ const checkAndRefreshToken = async (tokenStorage: any) => { // 请求拦截器 http.interceptors.request.use(async (config) => { + console.log("请求之前") + const tokenStorage = uni.getStorageSync(TOKEN_KEY) const config_header: any = config?.header || {} diff --git a/src/static/tabbar/canteen-select.png b/src/static/tabbar/canteen-select.png new file mode 100644 index 0000000..7887b99 Binary files /dev/null and b/src/static/tabbar/canteen-select.png differ diff --git a/src/static/tabbar/canteen.png b/src/static/tabbar/canteen.png new file mode 100644 index 0000000..75f8244 Binary files /dev/null and b/src/static/tabbar/canteen.png differ