From ed79db43ab758a46dcba2c92b8ed2252440a2970 Mon Sep 17 00:00:00 2001 From: weiwei Date: Tue, 25 Mar 2025 13:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 83 +++++++++++++++------ src/pages.json | 14 ++-- src/pages/tabbar/{home.vue => canteen.vue} | 0 src/sheep/utils/request.ts | 2 + src/static/tabbar/canteen-select.png | Bin 0 -> 1797 bytes src/static/tabbar/canteen.png | Bin 0 -> 1731 bytes 6 files changed, 69 insertions(+), 30 deletions(-) rename src/pages/tabbar/{home.vue => canteen.vue} (100%) create mode 100644 src/static/tabbar/canteen-select.png create mode 100644 src/static/tabbar/canteen.png 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 0000000000000000000000000000000000000000..7887b99c3e95cbc5897eaf5af9ea52f1df85b336 GIT binary patch literal 1797 zcmV+g2m1JlP)Px*zez+vRA@uhSq+R_RTcied*6gotrW7l^QHk~!DuTQZHR_QsEvU@&_J*jEYUWB z7As0HwDV@srrRjn_g;%lQxUC3Y5@sgFd%JEFhvt28u>BCkdUPzO?Td4WfLK#-R^tu z=zTM9c4l^V-t4k%cTO_NOFHBfbEQ52I!rDT+&=2>Z-uw?;Ck@ zu7qqS`aXakG&|0h15YhWcp|h*@eTlAC$N9+02mZ2e_S3X zI`H&OhIi3-erQ{eOQRu$9EfbE3qKz|)IhXwI#Q2ZBS2+5BF_$a`|0xX^a@Q(sd-&t_NYX$smQ)LJbh(5NqvTec9cKEvn z(0`X)tRmS0$jTN)FM`<9csh1UMgM?&iLtD2-7W#V37}yYGV2E$E3Uq$lfJG1^p{R7 zR+4)Lz~TmFZ5_{-qRkY39^m@GC4*^nZmHFJ*JYGAx zm2b~z4djc_77~N$WP#jJ@vKLah!w;8gj`th^w(wzrro?`qX^>zAkMFi?+ZM=X4(My z9r>g}{1*W4uhrQ^LsgPnAkn%+DfQ0-m%qpYVLM_@=K-a|og>@kz1B(IE=IS5sF$cn zytU%z>Va&X+qQ%XrD(4RQsi&wlWOUaojjgSZkK_=ozkarSa`(caH|p9iJu1Ia{&Z_ zXI7`SFo&+H8$kjxAV508T6=j!6-FA$e6aLkV3vf?b zYN>p+Es*6xK2>pbQ?GB=<{8<*vy#&{@5nVo{M1DGsv9aElk&~XfQc^1Z&phL4+pMZ zo#niVzF5)zsvMsPJUuii3!7wFu$?bW;!mx-!VKeyqjZLptHvF#qmK>ZAs+uYsC+Ss!WrpjFIypsqfkfnyif`Rm2Vnm6(mEj2 zx62;yZ3a+^h9DT|fegH(Ew$vx-5hBG&_iW3>3&e}FY-?KEWt0%=`2vL4_wPUyG*na z>A!qQ)>7j8=Pm&GbKqIaTm5V5@N6e~2tZfe=jjGYiLWgC$*|ltL3A++rLhFmXnCprR{EV zP1|TY&ul0B4ZyFQ39nO|!gxi+&2_v`b$-}#qEP_mHQ}_AK-N?|%RD)Dq|CQbyA=Nu zA{S>Vn$2+`ZmYQZC*A1G1Yne$u3MV`!(hBFt85y9bp^moFrWNMY-ss%(oK-Mkr@MI zuPD8_vW;y&WK5-`YXGT&f)lP5sI`Dx(T!&rGDj)cD^T|bKF!T=+B9tdsRg?f4+H#nla57K%>PEZ5;cQQtEn8olnqw5>0>q1z^6?90ugD nP+kaQ{q%o)zB6NwTPFSwE%%crhI$YG00000NkvXXu0mjf9#Cvz literal 0 HcmV?d00001 diff --git a/src/static/tabbar/canteen.png b/src/static/tabbar/canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..75f82447fd15e721c2edc4024afe9ef684587bfb GIT binary patch literal 1731 zcmV;!20ZzRP)Px*eMv+?RA@uhS`CO*RS=#zZ)GX^u`t4-A|pz(sE9%eEy6G=iZU~!68GIR=UF_; zEQwlN>4z{&w07S;XV<=rbD9Vb6AWS5R3QH3h-d)$! zeFG1d^D}3@nK^T2=8Dh))ZN`Zxvj13K>)Z40Ok-V6XD{4tTNTZ!nz zmH^t^PKDJ2sTxiJmET6+NitOS5_lENe6EUoq1HDhDVg?!(?7ZLAE$@LWxoh@U` zjJ>_RE13C4L|i{+?m$;pSKGvi6JG&>LvSthJW_ zz|#P5bVB$o0FWo5jWXt(Tg=RIna5TAA93vg2jHB0h?$q9T;_Qqx0|vxJD2|E~a?b7um;@c=M^nI}XC?qKHdr$!lnjE#RE<0N@^GJ|V?x2LSwth?~ph@()U>@3^8;060}Cbuu$gLc~e+ z03+g~TI)M}-@g(OUrl-jBEHq%-#@=tEN-i(fe`~Jl}b}{x!h7_o}FU!r38uO>)6Z` z&biB(S*OD#0Q{bcLc(S-5k1n3--rP8^z=+pO1&!@Ofah}xV5&Ena@W=O+-I6I=l%G z5GyLB=H&DFud@6y6F?NkL_3Ga%$T{;7!&$zlB~67Gjk~#+hmL>)LAo6G)+X3D#+tB zyP_C*0}hJT4j|$jt@Z0!!pnRn0Bh}UNz*d(ZN`{YjhHvHfCw8$7DVhMqIZOkJYyP+VdI_N!nXO5@LyHQ=Re9CDZQcoaX=9^jx zK)GB#Y2m_!(zOU(=$1+m{&))k*g`}nRWEU=R618F6~3Y^LN5~0+$sS1qs8vQtwhva z1Hd`=pk#|JV1Zph5KJx<3cu6-rAk!* z&bj%OUeA+b7{EuBM(>QYd^H)KwN`4<5oMqI8z?hhVvLcFT@BR$=hnh7SY~MEskXr`4PgS@q%z!N+G7Cm3BK>ok`6N>UN(x3hWu}n zjY_FEJkOIp)Tn9H0Fo#6^z@v8h*vA6q^m5SS>xXy03cs!;@_ujZEYJmIy!cZTH@5k Ze*iERuj1Z?;+g;e002ovPDHLkV1frpH