添加tabbar及分类

pages/mall/merchant/orders.uvue

@@ -2,11 +2,9 @@
 <template>
 	<view class="orders-page">
 		<!-- #ifdef MP-WEIXIN -->
-		<view style="padding-top: var(--status-bar-height); background-color: #ffffff; display: flex; flex-direction: row; align-items: flex-end; border-bottom: 1rpx solid #eeeeee; box-sizing: border-box; height: calc(88rpx + var(--status-bar-height));">
-			<view style="display: flex; flex-direction: row; align-items: center; padding: 0 30rpx; height: 88rpx;" @click="uni.navigateBack()">
-				<text style="font-size: 44rpx; color: #333333; line-height: 1; margin-right: 6rpx;">‹</text>
-				<text style="font-size: 28rpx; color: #333333;">返回</text>
-			</view>
+		<!-- Tab 页无返回按鈕，展示顶部安全区 + 页面标题 -->
+		<view class="mp-tab-navbar">
+			<text class="mp-tab-title">订单管理</text>
 		</view>
 		<!-- #endif -->
 		<!-- 标签页切换 -->
@@ -174,11 +172,14 @@
 				</view>
 			</view>
 		</view>
+		<!-- 商家端自定义 TabBar -->
+		<merchant-tab-bar :current="2"></merchant-tab-bar>
 	</view>
 </template>
 
 <script lang="uts">
 	import supa from '@/components/supadb/aksupainstance.uts'
+	import MerchantTabBar from '@/components/merchant-tabbar/MerchantTabBar.uvue'
 
 	type OrderItemType = {
 		id: string
@@ -222,6 +223,7 @@
 	}
 
 	export default {
+		components: { MerchantTabBar },
 		data() {
 			return {
 				tabs: [
@@ -637,6 +639,9 @@
 		min-height: 100vh;
 	}
 
+	.mp-tab-navbar { height: calc(88rpx + var(--status-bar-height)); padding-top: var(--status-bar-height); background-color: #ffffff; display: flex; flex-direction: row; align-items: center; justify-content: center; border-bottom-width: 1rpx; border-bottom-style: solid; border-bottom-color: #f0f0f0; }
+	.mp-tab-title { font-size: 34rpx; font-weight: bold; color: #333333; }
+
 	.tabs-container {
 		background-color: #fff;
 		position: sticky;
@@ -723,7 +728,7 @@
 
 	.orders-list {
 		padding: 0 20rpx;
-		height: calc(100vh - 300rpx);
+		height: calc(100vh - 460rpx);
 	}
 
 	.loading-container, .empty-container {