主要更新uniapp相关功能

uniapp/components/sub/SubTodo.vue

@@ -1,6 +1,6 @@
-<template>
-	<view class="page">
-		<view class="head">
+<template>
+	<view class="page" :class="{ embedded }">
+		<view v-if="!embedded" class="head" :style="headPad">
 			<view class="head-row" @tap="goBackNav">
 				<FaIcon name="chevron-left" color="#1f2b48" :size="18" />
 				<text class="head-back">返回导航</text>
@@ -49,12 +49,15 @@
 			<view class="bottom-space" />
 		</view>
 
-		<AppTabbar :group="slug" current="todo" />
+		<AppTabbar v-if="!embedded" :group="slug" current="todo" />
 	</view>
 </template>
 
 <script setup>
 import { ref, computed, onMounted } from 'vue'
+import { mpHeadPad } from '@/utils/mpHead.js'
+
+const headPad = mpHeadPad()
 import { onShow } from '@dcloudio/uni-app'
 import { isLoggedIn } from '@/utils/auth.js'
 import { request } from '@/api/request.js'
@@ -62,9 +65,12 @@ import { useSubsystem } from '@/utils/subsystem.js'
 import AppTabbar from '@/components/AppTabbar.vue'
 
 const props = defineProps({
-	slug: { type: String, required: true }
+	slug: { type: String, required: true },
+	embedded: { type: Boolean, default: false }
 })
 
+const emit = defineEmits(['switch-tab', 'back'])
+
 const { sub, loading, load } = useSubsystem(props.slug)
 const pending = ref([])
 const finished = ref([])
@@ -98,6 +104,10 @@ function todayStr() {
 }
 
 function goBackNav() {
+	if (props.embedded) {
+		emit('back')
+		return
+	}
 	uni.reLaunch({ url: '/pages/nav/nav' })
 }
 
@@ -124,11 +134,19 @@ onShow(() => {
 
 .page {
 	@include page-shell;
+
+	// 嵌入模式下由父页（tabs.vue）的 scroll-view 统一滚动，这里改为自然高度
+	&.embedded {
+		height: auto;
+	}
 }
 
 .head {
 	flex-shrink: 0;
 	padding: calc(var(--status-bar-height, 44px) + 20rpx) $page-padding-x 28rpx;
+	/* #ifdef MP-WEIXIN */
+	padding-top: calc(env(safe-area-inset-top, 25px) + 84rpx);
+	/* #endif */
 	background: $color-card;
 	box-shadow: $shadow-header;
 }