1405/04/10-fix bugs

This commit is contained in:
2026-07-01 18:16:12 +03:30
parent 4fa2c0d57d
commit c3aaeaf91a
33 changed files with 832 additions and 1051 deletions
+1
View File
@@ -18,6 +18,7 @@ export const GUEST_PRIMARY_NAV: AppNavItem[] = [
/** منوی FAB موبایل + بخش فرعی سایدبار دسکتاپ — کاربر لاگین‌شده */
export const AUTH_SECONDARY_NAV: AppNavItem[] = [
{ id: 'notifyTrigger', routeName: 'notifyTrigger', label: 'هشدار قیمت', icon: 'vuesax-linear:bill' },
{ id: 'buyProduct', routeName: 'buyProduct', label: 'فروشگاه', icon: 'vuesax-linear:coin' },
{ id: 'fund', routeName: 'fund', label: 'دارایی ها', icon: 'vuesax-linear:archive-1' },
{ id: 'user', routeName: 'user', label: 'حساب کاربری', icon: 'vuesax-linear:user' },
+30 -10
View File
@@ -1,5 +1,5 @@
<template>
<div>
<div class="mobile-app-layout">
<MobileOverflowMenu
:show="popVisible"
@close="closeOverflowMenu"
@@ -7,27 +7,34 @@
/>
<div :class="['main-with-bottom-chrome', { 'main-with-bottom-chrome--no-nav': hideMenu }]">
<router-view v-slot="{ Component, route }">
<transition :name="route.meta.transition || 'fade'">
<component :is="Component" class="main-with-bottom-chrome-inner" />
<router-view v-slot="{ Component, route: activeRoute }">
<transition :name="activeRoute.meta.transition || 'fade'">
<component :is="Component" :key="activeRoute.fullPath" class="main-with-bottom-chrome-inner" />
</transition>
</router-view>
</div>
<MobileBottomNav
v-if="!hideMenu"
:nav-item-class="navItemClass"
@navigate="navigateTo"
@toggle-overflow="toggleOverflowMenu"
/>
<Teleport to="body">
<MobileBottomNav
v-if="!hideMenu"
:nav-item-class="navItemClass"
@navigate="navigateTo"
@toggle-overflow="toggleOverflowMenu"
/>
</Teleport>
</div>
</template>
<script lang="ts" setup>
import { onMounted, watch } from 'vue'
import { useRoute } from 'vue-router'
import { useAppNavigation } from '../composables/useAppNavigation'
import { recoverMobileViewportAfterAuth, resetMobileAppScroll } from '../composables/useMobileScrollReset'
import MobileBottomNav from './MobileBottomNav.vue'
import MobileOverflowMenu from './MobileOverflowMenu.vue'
const route = useRoute()
const {
popVisible,
hideMenu,
@@ -36,6 +43,19 @@ const {
toggleOverflowMenu,
closeOverflowMenu,
} = useAppNavigation()
watch(
() => route.fullPath,
() => {
resetMobileAppScroll()
},
{ flush: 'post' },
)
onMounted(() => {
resetMobileAppScroll()
recoverMobileViewportAfterAuth()
})
</script>
<style lang="less" src="./mobile-layout.less"></style>
+28 -8
View File
@@ -3,10 +3,12 @@
<div class="tabs bottom-0">
<template v-for="item in leftTabs" :key="item.id">
<div :class="navItemClass(item.routeName)" class="tab" @click="$emit('navigate', item.routeName)">
<a-badge v-if="item.routeName === 'cart'" :count="cartCount">
<Icon :icon="item.icon" size="24" />
</a-badge>
<Icon v-else :icon="item.icon" size="24" />
<div class="tab__icon">
<a-badge v-if="item.routeName === 'cart'" :count="cartCount">
<Icon :icon="item.icon" size="24" />
</a-badge>
<Icon v-else :icon="item.icon" size="24" />
</div>
<div class="text-xs mt-1 font-bold">{{ item.label }}</div>
</div>
</template>
@@ -21,10 +23,12 @@
<template v-for="item in rightTabs" :key="item.id">
<div :class="navItemClass(item.routeName)" class="tab" @click="$emit('navigate', item.routeName)">
<a-badge v-if="item.routeName === 'cart'" :count="cartCount">
<Icon :icon="item.icon" size="24" />
</a-badge>
<Icon v-else :icon="item.icon" size="24" />
<div class="tab__icon">
<a-badge v-if="item.routeName === 'cart'" :count="cartCount">
<Icon :icon="item.icon" size="24" />
</a-badge>
<Icon v-else :icon="item.icon" size="24" />
</div>
<div class="text-xs mt-1 font-bold">{{ item.label }}</div>
</div>
</template>
@@ -61,3 +65,19 @@ const primaryItems = computed(() => getPrimaryNavItems(isToken()))
const leftTabs = computed(() => primaryItems.value.slice(0, 2))
const rightTabs = computed(() => primaryItems.value.slice(2))
</script>
<style scoped>
.tab__icon {
display: flex;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
flex-shrink: 0;
color: inherit;
}
.tab__icon :deep(.ant-badge) {
color: inherit;
}
</style>
+24 -13
View File
@@ -2,12 +2,12 @@
<Transition>
<div
v-if="show"
class="top-0 bottom-0 bg-black wrap-fix z-2000 opacity-60"
class="top-0 bottom-0 bg-black wrap-fix z-5000 opacity-60"
@click="$emit('close')"
/>
</Transition>
<Transition name="slide-fade">
<div v-if="show" class="wrap-fix bottom-11vh z-2000">
<div v-if="show" class="wrap-fix bottom-11vh z-5000 flex justify-center items-end">
<div class="relative flex flex-col items-center">
<div
class="flex items-center justify-center bg-white rounded-full w-[30px] h-[30px] mb-2"
@@ -37,6 +37,17 @@
<div>دریافت طلای فیزیکی</div>
</div>
</BasicButton>
<BasicButton
v-if="authenticated"
icon-size="16"
class="!font-bold w-15rem"
@click="go('notifyTrigger')"
>
<div class="flex gap-2 items-center">
<BasicIcon icon="vuesax-linear:bill" size="16" class="absolute right-2" />
<div>هشدار قیمت</div>
</div>
</BasicButton>
<BasicButton
v-if="authenticated"
icon-size="16"
@@ -48,17 +59,17 @@
<div>خرید محصول</div>
</div>
</BasicButton>
<BasicButton
v-if="authenticated"
icon-size="16"
class="!font-bold w-15rem"
@click="go('list')"
>
<div class="flex gap-2 items-center">
<BasicIcon icon="vuesax-linear:receipt-item" size="16" class="absolute right-2" />
<div>لیست دریافتی ها</div>
</div>
</BasicButton>
<!-- <BasicButton-->
<!-- v-if="authenticated"-->
<!-- icon-size="16"-->
<!-- class="!font-bold w-15rem"-->
<!-- @click="go('list')"-->
<!-- >-->
<!-- <div class="flex gap-2 items-center">-->
<!-- <BasicIcon icon="vuesax-linear:receipt-item" size="16" class="absolute right-2" />-->
<!-- <div>لیست دریافتی ها</div>-->
<!-- </div>-->
<!-- </BasicButton>-->
<BasicButton
v-if="authenticated"
icon-size="16"
+37 -7
View File
@@ -1,16 +1,17 @@
.bottom-appbar {
z-index: var(--app-z-nav, 5000);
height: var(--app-nav-height, 80px);
position: fixed;
display: flex;
justify-content: space-evenly;
background: #fff;
bottom: 0;
right: 0;
left: 0;
width: 100%;
max-width: 100vw;
height: calc(var(--app-nav-height, 80px) + var(--app-safe-bottom, env(safe-area-inset-bottom, 0px)));
padding-bottom: var(--app-safe-bottom, env(safe-area-inset-bottom, 0px));
box-sizing: border-box;
display: flex;
justify-content: space-evenly;
background: #fff;
@media screen and (min-width: 426px) {
width: 426px;
@@ -39,6 +40,16 @@
align-items: center;
justify-content: center;
align-content: center;
&.text-primary .tab__icon,
&.text-primary .tab__icon .ant-badge {
color: @primary-color;
}
&.text-gray-400 .tab__icon,
&.text-gray-400 .tab__icon .ant-badge {
color: #9ca3af;
}
}
.main_in {
@@ -121,19 +132,38 @@
opacity: 0;
}
.mobile-app-layout {
height: 100%;
max-height: 100%;
overflow: hidden;
display: flex;
flex-direction: column;
}
.main-with-bottom-chrome {
min-height: calc(100vh - var(--app-bottom-chrome-height, 80px));
flex: 1 1 auto;
min-height: 0;
overflow: hidden;
display: flex;
flex-direction: column;
}
.main-with-bottom-chrome-inner {
flex: 1 1 auto;
min-height: 0;
width: 100%;
min-height: min(100%, calc(100vh - var(--app-bottom-chrome-height, 80px)));
overflow-y: auto;
overflow-x: hidden;
-webkit-overflow-scrolling: touch;
overscroll-behavior-y: contain;
}
.main-with-bottom-chrome-inner--contained {
overflow: hidden;
}
.main-with-bottom-chrome--no-nav,
.main-with-bottom-chrome--no-nav .main-with-bottom-chrome-inner {
min-height: 100vh;
flex: 1 1 auto;
min-height: 0;
}
+59
View File
@@ -1,4 +1,42 @@
/**
* Mobile shell width rules.
* Below 426px: full viewport (phones).
* 426px–767px: centered 426px frame (tablet-ish mobile).
*/
html:not(.app-layout--desktop) {
html,
body,
#app {
min-height: 0;
height: 100dvh;
max-height: 100dvh;
overflow: hidden;
}
body {
overscroll-behavior: none;
}
.desktopConfig,
.app-main {
min-height: 0;
height: 100dvh;
max-height: 100dvh;
overflow: hidden;
}
.app-main > * {
height: 100%;
max-height: 100%;
overflow: hidden;
}
.app-dock-add-bar,
.wallet-card-slider {
box-sizing: border-box;
}
@media screen and (max-width: 425.98px) {
body {
display: block !important;
@@ -8,6 +46,7 @@ html:not(.app-layout--desktop) {
#app,
.desktopConfig,
.app-main,
.main-with-bottom-chrome,
.main-with-bottom-chrome-inner {
width: 100% !important;
@@ -25,6 +64,16 @@ html:not(.app-layout--desktop) {
margin: 0 !important;
transform: none !important;
}
.app-dock-add-bar,
.wallet-card-slider {
width: 100% !important;
max-width: 100vw !important;
left: 0 !important;
right: 0 !important;
margin: 0 !important;
transform: none !important;
}
}
@media screen and (min-width: 426px) and (max-width: 767.98px) {
@@ -47,5 +96,15 @@ html:not(.app-layout--desktop) {
margin: 0 !important;
transform: translateX(-50%) !important;
}
.app-dock-add-bar,
.wallet-card-slider {
width: 426px !important;
max-width: 426px !important;
left: 50% !important;
right: auto !important;
margin: 0 !important;
transform: translateX(-50%) !important;
}
}
}