Fix desktop responsive layout: sidebar, content sizing, remove duplicate tab bar
- Replace uni-app custom-tab-bar with manual NavBar component in App.vue (uni-app auto-detection was not including component in build) - Mobile: NavBar hidden via CSS display:none, uni-app default tab bar handles nav - Desktop: NavBar visible as 220px left sidebar, uni-app tab bar hidden - Content area: max-width 1200px with margin-left:220px, centered - Buttons/inputs/cards: global desktop CSS overrides for reasonable sizing - Clean approach: NavBar always in DOM, CSS media queries control visibility (no v-if, no conflicting !important)
This commit is contained in:
TradeMate Dev
+35
-2
@@ -1,8 +1,12 @@
|
||||
<template>
|
||||
<div class="app-wrapper">
|
||||
<NavBar />
|
||||
<router-view />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import NavBar from './components/nav-bar.vue'
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@@ -18,7 +22,7 @@ html, body, #app {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* Let uni-app framework manage layout for native tabbar */
|
||||
/* Let uni-app pages scroll */
|
||||
uni-page {
|
||||
overflow-y: auto !important;
|
||||
}
|
||||
@@ -29,12 +33,22 @@ uni-page-body {
|
||||
|
||||
/* ===== Desktop responsive (≥1024px) ===== */
|
||||
@media (min-width: 1024px) {
|
||||
/* Hide the built-in uni-app tab bar on desktop */
|
||||
uni-tabbar {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
/* Sidebar — shift page content right */
|
||||
uni-page-body {
|
||||
margin-left: 220px !important;
|
||||
font-size: 16px !important;
|
||||
}
|
||||
|
||||
/* Remove the tab-bar-height bottom padding that uni-app adds for tab pages */
|
||||
.uni-app--showtabbar uni-page-wrapper:after {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
/* Constrain + center page content */
|
||||
uni-page-body > view {
|
||||
max-width: 1200px !important;
|
||||
@@ -49,7 +63,26 @@ uni-page-body {
|
||||
border-radius: 20px !important;
|
||||
}
|
||||
|
||||
/* Fix floating AI assistant (clear sidebar + reasonable position) */
|
||||
/* Buttons: reasonable desktop sizing */
|
||||
uni-page-body button,
|
||||
uni-page-body .btn-primary,
|
||||
uni-page-body .btn-secondary,
|
||||
uni-page-body .uni-btn,
|
||||
uni-page-body [class*="btn-"] {
|
||||
min-width: 120px;
|
||||
padding: 12px 32px !important;
|
||||
font-size: 15px !important;
|
||||
}
|
||||
|
||||
/* Inputs */
|
||||
uni-page-body input,
|
||||
uni-page-body textarea,
|
||||
uni-page-body .uni-input-input {
|
||||
font-size: 15px !important;
|
||||
padding: 10px 16px !important;
|
||||
}
|
||||
|
||||
/* Fix floating AI assistant (clear sidebar) */
|
||||
.ai-float-btn {
|
||||
right: 40px !important;
|
||||
bottom: 40px !important;
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
<template>
|
||||
<div class="nav-bar">
|
||||
<div class="nav-brand">TradeMate</div>
|
||||
<div
|
||||
v-for="(item, index) in navList"
|
||||
:key="index"
|
||||
class="nav-item"
|
||||
:class="{ active: currentIndex === index }"
|
||||
@click="handleNav(index)"
|
||||
>
|
||||
<span class="nav-icon">{{ item.icon }}</span>
|
||||
<span class="nav-text">{{ item.text }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted, onUnmounted } from 'vue'
|
||||
|
||||
const currentIndex = ref(0)
|
||||
|
||||
const navList = ref([
|
||||
{ pagePath: '/pages/index/index', text: '首页', icon: '🏠' },
|
||||
{ pagePath: '/pages/customers/customers', text: '客户', icon: '👥' },
|
||||
{ pagePath: '/pages/marketing/marketing', text: '营销', icon: '📢' },
|
||||
{ pagePath: '/pages/quotation/quotation', text: '报价', icon: '📄' },
|
||||
{ pagePath: '/pages/profile/profile', text: '我的', icon: '👤' },
|
||||
])
|
||||
|
||||
const updateCurrentIndex = () => {
|
||||
const hash = window.location.hash || ''
|
||||
for (let i = 0; i < navList.value.length; i++) {
|
||||
if (hash.includes(navList.value[i].pagePath)) {
|
||||
currentIndex.value = i
|
||||
return
|
||||
}
|
||||
}
|
||||
currentIndex.value = 0
|
||||
}
|
||||
|
||||
const handleNav = (index) => {
|
||||
if (currentIndex.value === index) return
|
||||
const url = navList.value[index].pagePath
|
||||
uni.switchTab({ url })
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
updateCurrentIndex()
|
||||
window.addEventListener('hashchange', updateCurrentIndex)
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
window.removeEventListener('hashchange', updateCurrentIndex)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.nav-bar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
.nav-bar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 220px;
|
||||
height: 100vh;
|
||||
background: #fff;
|
||||
box-shadow: 4px 0 16px rgba(0,0,0,0.08);
|
||||
z-index: 999999;
|
||||
border-right: 1px solid #e0e0e0;
|
||||
box-sizing: border-box;
|
||||
padding-top: 24px;
|
||||
}
|
||||
|
||||
.nav-brand {
|
||||
font-size: 20px;
|
||||
font-weight: 700;
|
||||
color: #1890ff;
|
||||
padding: 20px 24px 32px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.nav-item {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
padding: 14px 24px;
|
||||
margin: 2px 12px;
|
||||
border-radius: 12px;
|
||||
gap: 14px;
|
||||
cursor: pointer;
|
||||
transition: background 0.15s;
|
||||
}
|
||||
|
||||
.nav-item:hover {
|
||||
background: #f0f7ff;
|
||||
}
|
||||
|
||||
.nav-item.active {
|
||||
background: #e6f0ff;
|
||||
}
|
||||
|
||||
.nav-icon {
|
||||
font-size: 22px;
|
||||
line-height: 1;
|
||||
font-family: "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", sans-serif;
|
||||
}
|
||||
|
||||
.nav-text {
|
||||
font-size: 15px;
|
||||
color: #555;
|
||||
}
|
||||
|
||||
.nav-item.active .nav-text {
|
||||
color: #1890ff;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,170 +0,0 @@
|
||||
<template>
|
||||
<div class="tab-bar">
|
||||
<div class="tab-bar-brand">TradeMate</div>
|
||||
<div
|
||||
v-for="(item, index) in tabList"
|
||||
:key="index"
|
||||
class="tab-bar-item"
|
||||
:class="{ active: currentIndex === index }"
|
||||
@click="handleSwitchTab(index)"
|
||||
>
|
||||
<span class="tab-bar-icon">{{ item.icon }}</span>
|
||||
<span class="tab-bar-text">{{ item.text }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted, onUnmounted } from 'vue'
|
||||
|
||||
const currentIndex = ref(0)
|
||||
|
||||
const tabList = ref([
|
||||
{ pagePath: '/pages/index/index', text: '首页', icon: '🏠' },
|
||||
{ pagePath: '/pages/customers/customers', text: '客户', icon: '👥' },
|
||||
{ pagePath: '/pages/marketing/marketing', text: '营销', icon: '📢' },
|
||||
{ pagePath: '/pages/quotation/quotation', text: '报价', icon: '📄' },
|
||||
{ pagePath: '/pages/profile/profile', text: '我的', icon: '👤' },
|
||||
])
|
||||
|
||||
const updateCurrentIndex = () => {
|
||||
const hash = window.location.hash || ''
|
||||
console.log('Hash:', hash)
|
||||
for (let i = 0; i < tabList.value.length; i++) {
|
||||
if (hash.includes(tabList.value[i].pagePath)) {
|
||||
currentIndex.value = i
|
||||
return
|
||||
}
|
||||
}
|
||||
currentIndex.value = 0
|
||||
}
|
||||
|
||||
const handleSwitchTab = (index) => {
|
||||
if (currentIndex.value === index) return
|
||||
const url = tabList.value[index].pagePath
|
||||
uni.switchTab({ url })
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
console.log('TabBar mounted, tabList:', tabList.value)
|
||||
updateCurrentIndex()
|
||||
window.addEventListener('hashchange', updateCurrentIndex)
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
window.removeEventListener('hashchange', updateCurrentIndex)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style>
|
||||
/* ===== Mobile: bottom tab bar ===== */
|
||||
.tab-bar {
|
||||
position: fixed !important;
|
||||
bottom: 0 !important;
|
||||
left: 0 !important;
|
||||
right: 0 !important;
|
||||
height: 80px !important;
|
||||
background: #fff !important;
|
||||
display: flex !important;
|
||||
flex-direction: row !important;
|
||||
box-shadow: 0 -4px 16px rgba(0,0,0,0.2) !important;
|
||||
z-index: 999999 !important;
|
||||
border-top: 1px solid #e0e0e0 !important;
|
||||
padding-bottom: env(safe-area-inset-bottom) !important;
|
||||
box-sizing: border-box !important;
|
||||
}
|
||||
|
||||
.tab-bar-item {
|
||||
flex: 1 !important;
|
||||
display: flex !important;
|
||||
flex-direction: column !important;
|
||||
align-items: center !important;
|
||||
justify-content: center !important;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.tab-bar-brand {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.tab-bar-icon {
|
||||
font-size: 28px !important;
|
||||
line-height: 1.5 !important;
|
||||
font-family: "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", sans-serif !important;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.tab-bar-text {
|
||||
font-size: 12px !important;
|
||||
color: #999 !important;
|
||||
}
|
||||
|
||||
.tab-bar-item.active .tab-bar-text {
|
||||
color: #1890ff !important;
|
||||
font-weight: bold !important;
|
||||
}
|
||||
|
||||
/* ===== Desktop: left sidebar ===== */
|
||||
@media (min-width: 1024px) {
|
||||
.tab-bar {
|
||||
top: 0 !important;
|
||||
left: 0 !important;
|
||||
bottom: 0 !important;
|
||||
right: auto !important;
|
||||
width: 220px !important;
|
||||
height: 100vh !important;
|
||||
flex-direction: column !important;
|
||||
box-shadow: 4px 0 16px rgba(0,0,0,0.08) !important;
|
||||
border-top: none !important;
|
||||
border-right: 1px solid #e0e0e0 !important;
|
||||
padding-bottom: 0 !important;
|
||||
padding-top: 24px !important;
|
||||
align-items: stretch !important;
|
||||
}
|
||||
|
||||
.tab-bar-brand {
|
||||
display: flex !important;
|
||||
font-size: 20px !important;
|
||||
font-weight: 700 !important;
|
||||
color: #1890ff !important;
|
||||
padding: 20px 24px 32px !important;
|
||||
text-align: center !important;
|
||||
justify-content: center !important;
|
||||
}
|
||||
|
||||
.tab-bar-item {
|
||||
flex: 0 0 auto !important;
|
||||
flex-direction: row !important;
|
||||
padding: 16px 24px !important;
|
||||
margin: 2px 12px !important;
|
||||
border-radius: 12px !important;
|
||||
justify-content: flex-start !important;
|
||||
gap: 14px !important;
|
||||
transition: background 0.15s !important;
|
||||
}
|
||||
|
||||
.tab-bar-item:hover {
|
||||
background: #f0f7ff !important;
|
||||
}
|
||||
|
||||
.tab-bar-item.active {
|
||||
background: #e6f0ff !important;
|
||||
}
|
||||
|
||||
.tab-bar-icon {
|
||||
font-size: 22px !important;
|
||||
margin-bottom: 0 !important;
|
||||
line-height: 1 !important;
|
||||
}
|
||||
|
||||
.tab-bar-text {
|
||||
font-size: 15px !important;
|
||||
color: #555 !important;
|
||||
}
|
||||
|
||||
.tab-bar-item.active .tab-bar-text {
|
||||
color: #1890ff !important;
|
||||
font-weight: 600 !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -111,7 +111,7 @@
|
||||
"backgroundColor": "#f5f5f5"
|
||||
},
|
||||
"tabBar": {
|
||||
"custom": true,
|
||||
"custom": false,
|
||||
"color": "#666666",
|
||||
"selectedColor": "#1890ff",
|
||||
"backgroundColor": "#ffffff",
|
||||
|
||||
Reference in New Issue
Block a user