From 70f01ff4bba6430a63fb6330d5818f52257c84fa Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 04 十一月 2023 13:05:41 +0800 Subject: [PATCH] 2023-11-04 --- src/index.js | 1 + src/views/sso/index.jsx | 4 +++- src/tabviews/custom/components/card/cardcellList/index.jsx | 5 +++-- src/views/billprint/index.jsx | 1 + src/views/login/index.jsx | 4 +++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index 2e62f85..b0c1060 100644 --- a/src/index.js +++ b/src/index.js @@ -175,6 +175,7 @@ GLOB.showline = _systemMsg.showline || '' GLOB.navBar = _systemMsg.navBar || 'shutter' GLOB.appVersion = _systemMsg.app_version || '' + sessionStorage.setItem('appname', _systemMsg.appname || '') let levels = [30, 10, 20, 40, 50, 60, 70, 80, 90, 100] diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx index c9f4fe3..9e1377f 100644 --- a/src/tabviews/custom/components/card/cardcellList/index.jsx +++ b/src/tabviews/custom/components/card/cardcellList/index.jsx @@ -294,12 +294,13 @@ if (card.datatype === 'static') { val = card.value || '' - if (/@username@|@fullName@|@mk_city@|@bid@/ig.test(val)) { + if (/@username@|@fullName@|@mk_city@|@appname@|@bid@/ig.test(val)) { let userName = sessionStorage.getItem('User_Name') || '' let fullName = sessionStorage.getItem('Full_Name') || '' let city = sessionStorage.getItem('city') || '' + let appname = sessionStorage.getItem('appname') || '' let bid = data.$$BID || '' - val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).replace(/@bid@/ig, bid) + val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).replace(/@appname@/ig, appname).replace(/@bid@/ig, bid) } else if (/@month@/ig.test(val)) { val = val.replace(/@month@/ig, new Date().toLocaleString('en-US', { month: 'long' })) } else if (/@week@/ig.test(val)) { diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx index 8012bf6..4ef6821 100644 --- a/src/views/billprint/index.jsx +++ b/src/views/billprint/index.jsx @@ -184,6 +184,7 @@ if (res.status) { window.GLOB.style = res.CSS document.title = res.titleName + sessionStorage.setItem('appname', res.appname || '') if (window.GLOB.style && styles[window.GLOB.style]) { document.body.className = styles[window.GLOB.style] + ' ' + (res.split_line_show === 'false' ? 'hidden-split-line' : '') diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx index a256e8a..2920480 100644 --- a/src/views/login/index.jsx +++ b/src/views/login/index.jsx @@ -614,7 +614,8 @@ webSite: res.WebSite || '', navBar: res.menu_type, // shutter 鐧惧彾绐椼�乴inkage_navigation 鑱斿姩鑿滃崟銆乴inkage 鑱斿姩鑿滃崟_鏃犲鑸爮銆乵enu_board 鑿滃崟闈㈡澘銆乵enu_board_navigation 鑿滃崟闈㈡澘_鏍囩椤� app_version: res.app_version, - Member_Level: 0 + Member_Level: 0, + appname: res.appname || '' } if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) { @@ -701,6 +702,7 @@ window.GLOB.style = systemMsg.style window.GLOB.navBar = systemMsg.navBar window.GLOB.appVersion = systemMsg.app_version + sessionStorage.setItem('appname', res.appname || '') if (window.GLOB.style && styles[window.GLOB.style]) { document.body.className = styles[window.GLOB.style] + ' ' + (res.split_line_show === 'false' ? 'hidden-split-line' : '') diff --git a/src/views/sso/index.jsx b/src/views/sso/index.jsx index 48b2474..5b11539 100644 --- a/src/views/sso/index.jsx +++ b/src/views/sso/index.jsx @@ -83,7 +83,8 @@ webSite: res.WebSite || '', navBar: res.menu_type, app_version: res.app_version, - Member_Level: 0 + Member_Level: 0, + appname: res.appname || '' } if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) { @@ -131,6 +132,7 @@ window.GLOB.style = systemMsg.style window.GLOB.navBar = systemMsg.navBar window.GLOB.appVersion = systemMsg.app_version + sessionStorage.setItem('appname', res.appname || '') if (window.GLOB.style && styles[window.GLOB.style]) { document.body.className = styles[window.GLOB.style] + ' ' + (res.split_line_show === 'false' ? 'hidden-split-line' : '') -- Gitblit v1.8.0