更新若干
This commit is contained in:
1 parent
54c90072fb
commit
5682069553
59 files changed
+3813
-1617
No files matched your search
@@ -183,7 +183,7 @@ const headPad = mpHeadPad()
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import { isLoggedIn } from '@/utils/auth.js'
|
||||
import { fetchHome } from '@/api/workspace.js'
|
||||
import { openMenu, resolveNativeRoute } from '@/utils/nav.js'
|
||||
import { openMenu, resolveNativeRoute, orderQuickMenus, QUICK_TITLE_ICONS } from '@/utils/nav.js'
|
||||
import { request } from '@/api/request.js'
|
||||
import AppTabbar from '@/components/MainTabbar.vue'
|
||||
|
||||
@@ -286,16 +286,16 @@ const quickApps = computed(() => {
|
||||
key: 'm' + menu.id,
|
||||
name: menu.title,
|
||||
menu,
|
||||
icon: icon || 'circle',
|
||||
icon: icon || menu.icon || QUICK_TITLE_ICONS[menu.title] || 'circle',
|
||||
tint: 'tint-' + (picked.length % 8)
|
||||
})
|
||||
}
|
||||
|
||||
leafMenus.value.filter((m) => resolveNativeRoute(m)).forEach((m) => push(m))
|
||||
moduleGroups.value.filter((g) => !g.locked).forEach((g) => push(g.items[0], g.icon))
|
||||
commonMenus.value.forEach((m, i) => push(m, TOOL_ICONS[i % TOOL_ICONS.length]))
|
||||
commonMenus.value.forEach((m, i) => push(m, QUICK_TITLE_ICONS[m.title] || TOOL_ICONS[i % TOOL_ICONS.length]))
|
||||
|
||||
return picked
|
||||
return orderQuickMenus(picked)
|
||||
})
|
||||
|
||||
const kpiList = computed(() => [
|
||||
@@ -410,7 +410,7 @@ function formatTime(dateStr) {
|
||||
|
||||
onMounted(() => {
|
||||
if (!isLoggedIn()) {
|
||||
uni.reLaunch({ url: '/pages/login/login' })
|
||||
uni.reLaunch({ url: '/pages/nav/nav' })
|
||||
return
|
||||
}
|
||||
loadAll()
|
||||
|
||||
Reference in new issue
Block a user