diff --git a/backend/src/views/user/userProfile.vue b/backend/src/views/user/userProfile.vue index 56e61fe..f7409b8 100644 --- a/backend/src/views/user/userProfile.vue +++ b/backend/src/views/user/userProfile.vue @@ -1,5 +1,5 @@ + + + + + + + + diff --git a/uniapp/pages/dashboard/dashboard.vue b/uniapp/pages/dashboard/dashboard.vue index afc7083..6163739 100644 --- a/uniapp/pages/dashboard/dashboard.vue +++ b/uniapp/pages/dashboard/dashboard.vue @@ -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() diff --git a/uniapp/pages/features/features.vue b/uniapp/pages/features/features.vue index 001cac6..96cfe6f 100644 --- a/uniapp/pages/features/features.vue +++ b/uniapp/pages/features/features.vue @@ -97,7 +97,7 @@ const headPad = mpHeadPad() import { onShow } from '@dcloudio/uni-app' import { isLoggedIn } from '@/utils/auth.js' import { fetchHome } from '@/api/workspace.js' -import { openMenu } from '@/utils/nav.js' +import { openMenu, orderQuickMenus } from '@/utils/nav.js' import AppTabbar from '@/components/MainTabbar.vue' const MODULE_ICONS = { @@ -159,6 +159,7 @@ const groups = computed(() => { const dirGroups = [] groupMap.forEach((g) => dirGroups.push(g)) dirGroups.sort((a, b) => (a.sort || 0) - (b.sort || 0)) + common.items = orderQuickMenus(common.items) const all = [] if (common.items.length) all.push(common) @@ -216,7 +217,7 @@ async function load() { onMounted(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } load() diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue index 7a04f56..c39129d 100644 --- a/uniapp/pages/index/index.vue +++ b/uniapp/pages/index/index.vue @@ -7,10 +7,9 @@ diff --git a/uniapp/pages/login/forget.vue b/uniapp/pages/login/forget.vue index 49d190f..3422f6b 100644 --- a/uniapp/pages/login/forget.vue +++ b/uniapp/pages/login/forget.vue @@ -417,7 +417,7 @@ async function handleResetPassword() { resetCountdown() uni.showToast({ title: '重置成功,请登录', icon: 'success' }) setTimeout(() => { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) }, 600) } catch (err) { } finally { @@ -432,7 +432,7 @@ function backToPrev() { } function goBack() { - uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/login/login' }) }) + uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/nav/nav' }) }) } onUnmounted(() => { diff --git a/uniapp/pages/login/login.vue b/uniapp/pages/login/login.vue index b38c5f7..651e95b 100644 --- a/uniapp/pages/login/login.vue +++ b/uniapp/pages/login/login.vue @@ -3,213 +3,162 @@ - - - + + + + 返回 - {{ navTitle }} + {{ step === 'tenant' ? '选择企业' : '登录 / 注册' }} \ No newline at end of file +.mode-tabs { display: flex; gap: 8rpx; padding: 6rpx; margin-bottom: 28rpx; border-radius: $radius-full; background: #f1f5f9; } +.mode-tab { flex: 1; padding: 16rpx 0; text-align: center; font-size: 24rpx; color: $color-text-secondary; border-radius: $radius-full; transition: all .15s ease; } +.mode-tab.on { background: #ffffff; color: #2563eb; font-weight: 600; box-shadow: 0 4rpx 12rpx rgba(15,23,42,.08); } +.panel-head { margin-bottom: 24rpx; } +.panel-title { display: block; font-size: 32rpx; font-weight: 700; color: $color-text; } +.panel-sub { display: block; margin-top: 10rpx; font-size: 23rpx; color: $color-text-muted; line-height: 1.5; } +.error-box { margin-bottom: 20rpx; padding: 18rpx 20rpx; border-radius: $radius-md; background: #fef2f2; border: 1rpx solid #fecaca; } +.error-text { font-size: 24rpx; color: $color-danger; } +.field { margin-bottom: 24rpx; } +.field-label { display: block; margin-bottom: 12rpx; font-size: 24rpx; font-weight: 600; color: #334155; } +.input-wrap { position: relative; display: flex; align-items: center; gap: 12rpx; height: 88rpx; padding: 0 22rpx; border: 1rpx solid #dce7f7; border-radius: $radius-md; background: #fbfdff; } +.field-input { flex: 1; height: 100%; font-size: 28rpx; color: $color-text; } +.eye-btn { padding: 10rpx; } +.code-row { display: flex; gap: 16rpx; } +.code-input { height: 88rpx; padding: 0 22rpx; border: 1rpx solid #dce7f7; border-radius: $radius-md; background: #fbfdff; font-size: 28rpx; flex: 1; } +.code-btn { width: 220rpx; height: 88rpx; border: none; border-radius: $radius-md; background: #eaf2ff; color: #2563eb; font-size: 25rpx; font-weight: 600; } +.code-btn[disabled] { opacity: .6; } +.btn { display: flex; align-items: center; justify-content: center; gap: 12rpx; width: 100%; height: 92rpx; border: none; border-radius: $radius-full; font-size: 30rpx; font-weight: 600; } +.btn-primary { margin-top: 12rpx; background: linear-gradient(135deg, #60a5fa, #2563eb); color: #ffffff; box-shadow: 0 10rpx 24rpx rgba(37,99,235,.22); } +.btn[disabled] { opacity: .6; } +.tip-row { margin-top: 24rpx; text-align: center; } +.tip-text { font-size: 23rpx; line-height: 1.6; color: $color-text-muted; } +.tenant-list { margin-top: 8rpx; } +.tenant-item { display: flex; align-items: center; gap: 18rpx; padding: 24rpx 20rpx; margin-bottom: 18rpx; border: 1rpx solid #e6edf8; border-radius: 18rpx; background: #fff; } +.tenant-avatar { width: 72rpx; height: 72rpx; flex-shrink: 0; display: flex; align-items: center; justify-content: center; border-radius: 18rpx; background: linear-gradient(135deg, #60a5fa, #2563eb); } +.tenant-info { flex: 1; min-width: 0; } +.tenant-name { display: block; font-size: 28rpx; font-weight: 600; color: $color-text; } +.tenant-meta { display: block; margin-top: 6rpx; font-size: 22rpx; color: $color-text-muted; } +.back-row { margin-top: 20rpx; text-align: center; font-size: 26rpx; color: $color-text-muted; } + diff --git a/uniapp/pages/login/register.vue b/uniapp/pages/login/register.vue index 10170c6..5415e0b 100644 --- a/uniapp/pages/login/register.vue +++ b/uniapp/pages/login/register.vue @@ -195,7 +195,7 @@ async function handleSubmit() { setTenantName(form.tenant_name.trim()) uni.showToast({ title: '注册成功,请登录', icon: 'success' }) setTimeout(() => { - uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/login/login' }) }) + uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/nav/nav' }) }) }, 500) } catch { } finally { @@ -204,7 +204,7 @@ async function handleSubmit() { } function goBack() { - uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/login/login' }) }) + uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/nav/nav' }) }) } onUnmounted(() => { diff --git a/uniapp/pages/nav/nav.vue b/uniapp/pages/nav/nav.vue index ee16543..df074b5 100644 --- a/uniapp/pages/nav/nav.vue +++ b/uniapp/pages/nav/nav.vue @@ -7,7 +7,7 @@ 工作台 - + @@ -32,26 +32,8 @@ - - - {{ card.name }} + 登录后可体验 @@ -115,6 +98,19 @@ + + @@ -127,36 +123,22 @@ import { onShow } from '@dcloudio/uni-app' import { isLoggedIn, getTenants, getTid, setAuthTokens, setTenants, setTid, setTenantName, getUser, setUser } from '@/utils/auth.js' import { switchTenant, loginByMiniapp } from '@/api/auth.js' import { fetchHome, fetchPublicModules, fetchPublicMenus, clearHomeCache } from '@/api/workspace.js' -import { onboardingPhone, getOnboardingStatus } from '@/api/onboarding.js' -import { setPendingCard, takePendingCard } from '@/utils/onboarding.js' +import { getOnboardingStatus } from '@/api/onboarding.js' import { openMenu } from '@/utils/nav.js' import { getSubsystemByModule, goSubsystem } from '@/config/subsystems.js' -import { getGuestToken, setGuestToken, clearGuestToken } from '@/utils/guest.js' -import { guestMiniLogin, guestMerge } from '@/api/guest.js' +import { getGuestToken, clearGuestToken } from '@/utils/guest.js' +import { guestMerge } from '@/api/guest.js' -const guestAuthVisible = ref(false) -const guestAuthLoading = ref(false) -const guestAuthDismissed = ref(false) -const phoneBusy = ref(false) -let isMp = false -// #ifdef MP-WEIXIN -isMp = true -// #endif +const guestLoginVisible = ref(false) +const guestLoginTitle = ref('登录后可体验') -function canRequestGuestPhone() { - // #ifdef MP-WEIXIN - return true - // #endif - // eslint-disable-next-line no-unreachable - return false +function openGuestLogin(name) { + guestLoginTitle.value = name ? '「' + name + '」登录后可体验' : '登录后可体验' + guestLoginVisible.value = true } -function maybeAskGuestAuth() { - if (!guest.value || getGuestToken() || guestAuthDismissed.value || !canRequestGuestPhone()) { - guestAuthVisible.value = false - return - } - guestAuthVisible.value = true +function closeGuestLogin() { + guestLoginVisible.value = false } function navUniLoginCode() { @@ -169,58 +151,6 @@ function navUniLoginCode() { }) } -async function onGuestPhone(e) { - const detail = (e && e.detail) || {} - if (String(detail.errMsg || '').indexOf('ok') === -1 || !detail.code) { - uni.showToast({ title: '未获取到手机号,请重试', icon: 'none' }) - return - } - if (guestAuthLoading.value) return - guestAuthLoading.value = true - try { - const code = await navUniLoginCode() - let appid = '' - try { - appid = (uni.getAccountInfoSync().miniProgram || {}).appId || '' - } catch (err) { - appid = '' - } - const res = await guestMiniLogin({ code, phoneCode: detail.code, appid }) - if (res && res.type === 'user') { - guestAuthVisible.value = false - await completeUserLogin(res) - return - } - if (!res || !res.token) throw new Error('未返回游客令牌') - setGuestToken(res.token) - guestAuthVisible.value = false - uni.showToast({ title: '验证成功,数据可保存了', icon: 'none' }) - } catch (err) { - console.error('[nav] guest mini-login failed:', err) - uni.showToast({ title: (err && err.message) || '验证失败,请重试', icon: 'none' }) - } finally { - guestAuthLoading.value = false - } -} - -async function completeUserLogin(res) { - const list = Array.isArray(res.tenants) ? res.tenants : [] - setAuthTokens(res.tokens || {}) - if (res.need_choose_tenant && list.length > 1) { - askChooseTenant(list) - return - } - const t0 = list[0] || {} - setTenants(list) - if (t0.tid) { - setTid(t0.tid) - setTenantName(t0.tenant_name || '') - } - await mergeGuestIfAny() - await load(true) - uni.showToast({ title: '已登录,欢迎回来', icon: 'none' }) -} - const tenantPickerVisible = ref(false) const tenantPickerRequired = ref(false) const tenantPickerMode = ref('login') @@ -294,11 +224,6 @@ async function pickTenant(item) { } } -function skipGuestAuth() { - guestAuthDismissed.value = true - guestAuthVisible.value = false -} - async function mergeGuestIfAny() { if (!getGuestToken()) return try { @@ -343,18 +268,19 @@ const leafMenus = computed(() => menus.value.filter((m) => m.leaf !== false && ! const cards = computed(() => { if (guest.value) { - return publicModules.value.map((mod, index) => { - const code = String(mod.code || '').toLowerCase() - const needTenant = mod.require_login !== 0 - return { + return publicModules.value.map((mod, index) => { + const code = String(mod.code || '').toLowerCase() + const needTenant = mod.require_login !== 0 + const locked = needTenant + return { id: mod.id, code: mod.code, path: mod.path || '', name: mod.name || '未命名系统', - desc: mod.description || (needTenant ? '加入企业后可用' : '可直接使用'), + desc: locked ? '登录后可体验完整功能' : (mod.description || '可直接使用'), icon: MODULE_ICONS[code] || 'cube', tint: 'tint-' + (index % 8), - locked: false, + locked, needTenant, items: [], total: 0 @@ -429,6 +355,11 @@ function goProfile() { uni.navigateTo({ url: '/pages/profile/profile' }) } +function goLogin() { + closeGuestLogin() + uni.navigateTo({ url: '/pages/login/login' }) +} + function chooseTenant() { const list = tenants.value if (list.length <= 1) { uni.showToast({ title: list.length ? '当前账号仅绑定一个企业' : '暂无可切换的企业', icon: 'none' }) @@ -438,49 +369,6 @@ function chooseTenant() { openTenantPicker(list, 'switch', false) } -async function onCardPhone(e, card = null) { - const detail = (e && e.detail) || {} - if (String(detail.errMsg || '').indexOf('ok') === -1 || !detail.code) { - uni.showToast({ title: '请先完成手机号验证才能使用', icon: 'none' }) - return - } - if (phoneBusy.value) return - phoneBusy.value = true - uni.showLoading({ title: '验证中...', mask: true }) - try { - const code = await navUniLoginCode() - let appid = '' - try { - appid = (uni.getAccountInfoSync().miniProgram || {}).appId || '' - } catch (err) { - appid = '' - } - if (card) setPendingCard(card) - const res = await onboardingPhone({ code, phoneCode: detail.code, appid }) - if (res && res.need_register) { - uni.hideLoading() - uni.navigateTo({ - url: '/pages/onboarding/register?token=' + encodeURIComponent(res.register_token || '') + - '&mobile_mask=' + encodeURIComponent(res.mobile_mask || '') - }) - return - } - const ready = await silentLogin(code, detail.code) - if (!ready) return - await load(true) - if (card) { - await enter(card) - takePendingCard() - } - } catch (err) { - console.error('[nav] onboarding phone failed:', err) - uni.showToast({ title: (err && err.message) || '验证失败,请重试', icon: 'none' }) - } finally { - uni.hideLoading() - phoneBusy.value = false - } -} - async function silentLogin(code, phoneCode) { const res = await loginByMiniapp({ code, phoneCode }) if (!res || !res.tokens || !res.tokens.access_token) { @@ -503,11 +391,20 @@ async function silentLogin(code, phoneCode) { async function enter(card) { if (card.locked) { + if (guest.value) { + openGuestLogin(card.name) + return + } openMenu({ locked: true, title: card.name }) return } if (guest.value) { - uni.showToast({ title: '请先完成手机号验证', icon: 'none' }) + if (goSubsystemByModule(card.code)) return + if (card.path) { + openMenu({ title: card.name, path: card.path, leaf: true }, card.name) + return + } + uni.showToast({ title: card.name + '暂未开放', icon: 'none' }) return } if (card.needTenant) { @@ -554,10 +451,6 @@ onMounted(() => { onShow(() => { if (!loading.value) load() - const pending = takePendingCard() - if (pending && isLoggedIn()) { - setTimeout(() => enter(pending), 600) - } }) @@ -770,64 +663,18 @@ onShow(() => { color: $color-text-muted; } -.cell-button { - display: block; - margin: 0 0 20rpx 0; - padding: 0 20rpx 0 0; - background: transparent; - border: none; - border-radius: 0; - line-height: normal; - text-align: left; - - &::after { - border: none; - } +.portal-lock-tag { + padding: 4rpx 14rpx; + border-radius: 20rpx; + background: #eef2f8; + color: #8a9bb3; + font-size: 20rpx; } .bottom-space { height: 48rpx; } -.guest-auth-mask { - position: fixed; - left: 0; - right: 0; - top: 0; - bottom: 0; - z-index: 99; -} - -.guest-auth-full { - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 100%; - padding: 0; - margin: 0; - border: none; - border-radius: 0; - background: transparent; - opacity: 0; - - &::after { - border: none; - } -} - -.guest-auth-later { - position: absolute; - left: 0; - right: 0; - bottom: 64rpx; - z-index: 100; - text-align: center; - font-size: 24rpx; - color: #94a3b8; - padding: 16rpx; -} - .tenant-picker-mask { position: fixed; left: 0; @@ -995,4 +842,77 @@ onShow(() => { font-size: 22rpx; color: $color-text-muted; } + +.guest-login-mask { + position: fixed; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 1200; + display: flex; + align-items: center; + justify-content: center; + padding: 0 60rpx; + background: rgba(15, 23, 42, .48); +} +.guest-login-card { + width: 100%; + max-width: 560rpx; + padding: 48rpx 40rpx 32rpx; + border-radius: 28rpx; + background: #ffffff; + box-shadow: 0 20rpx 60rpx rgba(15, 23, 42, .18); + display: flex; + flex-direction: column; + align-items: center; +} +.guest-login-icon { + width: 96rpx; + height: 96rpx; + display: flex; + align-items: center; + justify-content: center; + border-radius: 28rpx; + background: #eaf2ff; +} +.guest-login-title { + margin-top: 24rpx; + font-size: 32rpx; + font-weight: 700; + color: #17345f; + text-align: center; +} +.guest-login-desc { + margin-top: 16rpx; + font-size: 24rpx; + line-height: 1.6; + color: #64748b; + text-align: center; +} +.guest-login-btn { + width: 100%; + height: 88rpx; + margin: 36rpx 0 0; + padding: 0; + display: flex; + align-items: center; + justify-content: center; + gap: 12rpx; + border: none; + border-radius: $radius-full; + background: linear-gradient(135deg, #60a5fa, #2563eb); + color: #ffffff; + font-size: 28rpx; + font-weight: 600; + box-shadow: 0 10rpx 24rpx rgba(37, 99, 235, .22); + + &::after { border: none; } +} +.guest-login-cancel { + margin-top: 20rpx; + padding: 16rpx; + font-size: 26rpx; + color: #8a9bb3; +} diff --git a/uniapp/pages/oa/attendance/index.vue b/uniapp/pages/oa/attendance/index.vue index f185937..e9ea6ed 100644 --- a/uniapp/pages/oa/attendance/index.vue +++ b/uniapp/pages/oa/attendance/index.vue @@ -623,7 +623,7 @@ async function punch(type) { onShow(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } startTimer() diff --git a/uniapp/pages/oa/compensation/detail.vue b/uniapp/pages/oa/compensation/detail.vue index 2af7984..7bbe704 100644 --- a/uniapp/pages/oa/compensation/detail.vue +++ b/uniapp/pages/oa/compensation/detail.vue @@ -155,7 +155,7 @@ const deductItems = computed(() => { onMounted(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } const pages = getCurrentPages() diff --git a/uniapp/pages/oa/compensation/index.vue b/uniapp/pages/oa/compensation/index.vue index b7ea8c5..3be5d1c 100644 --- a/uniapp/pages/oa/compensation/index.vue +++ b/uniapp/pages/oa/compensation/index.vue @@ -58,7 +58,7 @@ const currentMonth = `${now.getFullYear()}-${pad(now.getMonth() + 1)}` onMounted(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } loadPayrolls() diff --git a/uniapp/pages/oa/contact/detail.vue b/uniapp/pages/oa/contact/detail.vue index 49a2337..cfdc5a4 100644 --- a/uniapp/pages/oa/contact/detail.vue +++ b/uniapp/pages/oa/contact/detail.vue @@ -159,7 +159,7 @@ const callPhone = computed(() => (contact.value ? primaryPhone(contact.value) : onLoad((options) => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } id.value = Number((options && options.id) || 0) diff --git a/uniapp/pages/oa/contact/index.vue b/uniapp/pages/oa/contact/index.vue index f908b4c..db93dfe 100644 --- a/uniapp/pages/oa/contact/index.vue +++ b/uniapp/pages/oa/contact/index.vue @@ -109,7 +109,7 @@ const hasMore = ref(false) onMounted(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } loadOrgTree() diff --git a/uniapp/pages/oa/dailyreport/index.vue b/uniapp/pages/oa/dailyreport/index.vue index 51db7a1..cbe5664 100644 --- a/uniapp/pages/oa/dailyreport/index.vue +++ b/uniapp/pages/oa/dailyreport/index.vue @@ -406,7 +406,7 @@ function onCalendarCellTap(cell) { onShow(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } reload() diff --git a/uniapp/pages/oa/document/detail.vue b/uniapp/pages/oa/document/detail.vue index 9866e86..d6838d6 100644 --- a/uniapp/pages/oa/document/detail.vue +++ b/uniapp/pages/oa/document/detail.vue @@ -103,7 +103,7 @@ const loading = ref(true) onMounted(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } const pages = getCurrentPages() diff --git a/uniapp/pages/oa/document/index.vue b/uniapp/pages/oa/document/index.vue index 4a4faff..026d4a9 100644 --- a/uniapp/pages/oa/document/index.vue +++ b/uniapp/pages/oa/document/index.vue @@ -105,7 +105,7 @@ const loading = ref(false) onMounted(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } loadCategories() diff --git a/uniapp/pages/oa/employeefile/detail.vue b/uniapp/pages/oa/employeefile/detail.vue index 371b522..4df44a9 100644 --- a/uniapp/pages/oa/employeefile/detail.vue +++ b/uniapp/pages/oa/employeefile/detail.vue @@ -192,7 +192,7 @@ const recordGroups = computed(() => { onLoad((options) => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } fileId.value = Number((options && options.id) || 0) diff --git a/uniapp/pages/oa/employeefile/index.vue b/uniapp/pages/oa/employeefile/index.vue index 8567732..b3a04ca 100644 --- a/uniapp/pages/oa/employeefile/index.vue +++ b/uniapp/pages/oa/employeefile/index.vue @@ -109,7 +109,7 @@ const hasMore = ref(false) onLoad(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } init() diff --git a/uniapp/pages/oa/notice/detail.vue b/uniapp/pages/oa/notice/detail.vue index 7324dd2..1cf0715 100644 --- a/uniapp/pages/oa/notice/detail.vue +++ b/uniapp/pages/oa/notice/detail.vue @@ -58,7 +58,7 @@ const loading = ref(true) onMounted(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } const pages = getCurrentPages() diff --git a/uniapp/pages/oa/notice/index.vue b/uniapp/pages/oa/notice/index.vue index 92ceaad..c7f8ed0 100644 --- a/uniapp/pages/oa/notice/index.vue +++ b/uniapp/pages/oa/notice/index.vue @@ -57,7 +57,7 @@ const loading = ref(false) onMounted(() => { if (!isLoggedIn()) { - uni.reLaunch({ url: '/pages/login/login' }) + uni.reLaunch({ url: '/pages/nav/nav' }) return } loadNotices() diff --git a/uniapp/pages/onboarding/register.vue b/uniapp/pages/onboarding/register.vue index d06e224..1557a46 100644 --- a/uniapp/pages/onboarding/register.vue +++ b/uniapp/pages/onboarding/register.vue @@ -1,9 +1,18 @@ @@ -27,12 +37,15 @@