修复 导航栏 高度的问题
This commit is contained in:
61
src/components/BackNavbar/index.scss
Normal file
61
src/components/BackNavbar/index.scss
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
.back-navbar {
|
||||||
|
position: sticky;
|
||||||
|
top: 0;
|
||||||
|
z-index: 100;
|
||||||
|
background: #ffffff;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
|
||||||
|
.navbar-content {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0 15px;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
|
||||||
|
.navbar-left {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
|
||||||
|
.back-button {
|
||||||
|
width: 24px;
|
||||||
|
height: 24px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: opacity 0.2s;
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
opacity: 0.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.back-icon {
|
||||||
|
width: 12px;
|
||||||
|
height: 12px;
|
||||||
|
border-left: 2px solid #000000;
|
||||||
|
border-bottom: 2px solid #000000;
|
||||||
|
transform: rotate(45deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-avatar {
|
||||||
|
width: 28px;
|
||||||
|
height: 28px;
|
||||||
|
border-radius: 50%;
|
||||||
|
overflow: hidden;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-title {
|
||||||
|
font-family: "PingFang SC";
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 20px;
|
||||||
|
line-height: 1.4;
|
||||||
|
letter-spacing: 0.019em;
|
||||||
|
color: #000000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
66
src/components/BackNavbar/index.tsx
Normal file
66
src/components/BackNavbar/index.tsx
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { View, Text, Image } from '@tarojs/components';
|
||||||
|
import { getNavbarHeight } from '@/utils/getNavbarHeight';
|
||||||
|
import { useUserInfo } from '@/store/userStore';
|
||||||
|
import Taro from '@tarojs/taro';
|
||||||
|
import './index.scss';
|
||||||
|
|
||||||
|
interface BackNavbarProps {
|
||||||
|
title?: string;
|
||||||
|
showAvatar?: boolean;
|
||||||
|
showBackButton?: boolean;
|
||||||
|
onBack?: () => void;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const BackNavbar: React.FC<BackNavbarProps> = ({
|
||||||
|
title = '消息',
|
||||||
|
showAvatar = true,
|
||||||
|
showBackButton = false,
|
||||||
|
onBack,
|
||||||
|
className = ''
|
||||||
|
}) => {
|
||||||
|
const userInfo = useUserInfo();
|
||||||
|
const { statusBarHeight, navBarHeight, totalHeight } = getNavbarHeight();
|
||||||
|
|
||||||
|
const handleBack = () => {
|
||||||
|
if (onBack) {
|
||||||
|
onBack();
|
||||||
|
} else {
|
||||||
|
Taro.navigateBack();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
className={`back-navbar ${className}`}
|
||||||
|
style={{
|
||||||
|
paddingTop: `${statusBarHeight}px`,
|
||||||
|
height: `${totalHeight}px`
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<View
|
||||||
|
className="navbar-content"
|
||||||
|
style={{ height: `${navBarHeight}px` }}
|
||||||
|
>
|
||||||
|
<View className="navbar-left">
|
||||||
|
{showBackButton && (
|
||||||
|
<View className="back-button" onClick={handleBack}>
|
||||||
|
<View className="back-icon"></View>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
{showAvatar && (
|
||||||
|
<Image
|
||||||
|
className="navbar-avatar"
|
||||||
|
src={userInfo?.userInfo?.avatar_url}
|
||||||
|
mode="aspectFill"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<Text className="navbar-title">{title}</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default BackNavbar;
|
||||||
@@ -2,13 +2,14 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: start;
|
||||||
padding: 60px 16px;
|
padding: 60px 16px;
|
||||||
min-height: 400px;
|
min-height: 400px;
|
||||||
|
margin-top: 40px;
|
||||||
|
|
||||||
.empty-icon {
|
.empty-icon {
|
||||||
width: 221px;
|
width:132.7px;
|
||||||
height: 200px;
|
height: 120px;
|
||||||
position: relative;
|
position: relative;
|
||||||
border-radius: 20px;
|
border-radius: 20px;
|
||||||
margin-bottom: 12px;
|
margin-bottom: 12px;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import GameManagePopup from './GameManagePopup';
|
|||||||
import FollowUserCard from './FollowUserCard/index';
|
import FollowUserCard from './FollowUserCard/index';
|
||||||
import Comments from "./Comments";
|
import Comments from "./Comments";
|
||||||
import GeneralNavbar from "./GeneralNavbar";
|
import GeneralNavbar from "./GeneralNavbar";
|
||||||
|
import BackNavbar from "./BackNavbar";
|
||||||
import RadarChart from './Radar'
|
import RadarChart from './Radar'
|
||||||
import EmptyState from './EmptyState';
|
import EmptyState from './EmptyState';
|
||||||
import NTRPTestEntryCard from './NTRPTestEntryCard'
|
import NTRPTestEntryCard from './NTRPTestEntryCard'
|
||||||
@@ -52,6 +53,7 @@ export {
|
|||||||
FollowUserCard,
|
FollowUserCard,
|
||||||
Comments,
|
Comments,
|
||||||
GeneralNavbar,
|
GeneralNavbar,
|
||||||
|
BackNavbar,
|
||||||
RadarChart,
|
RadarChart,
|
||||||
EmptyState,
|
EmptyState,
|
||||||
NTRPTestEntryCard,
|
NTRPTestEntryCard,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { View, Text, ScrollView, Image, Input } from "@tarojs/components";
|
import { View, Text, ScrollView, Image, Input } from "@tarojs/components";
|
||||||
import { Avatar } from "@nutui/nutui-react-taro";
|
import { Avatar } from "@nutui/nutui-react-taro";
|
||||||
import { withAuth, EmptyState } from "@/components";
|
import { withAuth, EmptyState, BackNavbar } from "@/components";
|
||||||
import commentService, { CommentActivity } from "@/services/commentService";
|
import commentService, { CommentActivity } from "@/services/commentService";
|
||||||
import { formatShortRelativeTime } from "@/utils/timeUtils";
|
import { formatShortRelativeTime } from "@/utils/timeUtils";
|
||||||
import Taro from "@tarojs/taro";
|
import Taro from "@tarojs/taro";
|
||||||
@@ -285,14 +285,12 @@ const CommentReply = () => {
|
|||||||
return (
|
return (
|
||||||
<View className="comment-reply-container">
|
<View className="comment-reply-container">
|
||||||
{/* 顶部导航栏 */}
|
{/* 顶部导航栏 */}
|
||||||
<View className="navbar">
|
<BackNavbar
|
||||||
<View className="navbar-content">
|
title="收到的评论和回复"
|
||||||
<View className="back-button" onClick={handleBack}>
|
showBackButton={true}
|
||||||
<View className="back-icon"></View>
|
showAvatar={false}
|
||||||
</View>
|
onBack={handleBack}
|
||||||
<Text className="navbar-title">收到的评论和回复</Text>
|
/>
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
|
|
||||||
{/* 评论列表 */}
|
{/* 评论列表 */}
|
||||||
<ScrollView
|
<ScrollView
|
||||||
|
|||||||
@@ -8,42 +8,6 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
|
|
||||||
// 顶部导航栏
|
|
||||||
.navbar {
|
|
||||||
background: #ffffff;
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
z-index: 100;
|
|
||||||
// box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.06);
|
|
||||||
|
|
||||||
.navbar-content {
|
|
||||||
height: 56px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
padding: 0 15px;
|
|
||||||
margin-top: 44px;
|
|
||||||
|
|
||||||
.navbar-left {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
|
|
||||||
.navbar-avatar {
|
|
||||||
width: 28px;
|
|
||||||
height: 28px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-title {
|
|
||||||
font-family: "PingFang SC";
|
|
||||||
font-weight: 600;
|
|
||||||
font-size: 20px;
|
|
||||||
line-height: 1.4;
|
|
||||||
letter-spacing: 0.019em;
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 分类标签区
|
// 分类标签区
|
||||||
.category-tabs {
|
.category-tabs {
|
||||||
@@ -134,7 +98,7 @@
|
|||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
border: 0.5px solid rgba(0, 0, 0, 0.08);
|
border: 0.5px solid rgba(0, 0, 0, 0.08);
|
||||||
border-radius: 20px;
|
border-radius: 20px;
|
||||||
box-shadow: 0px 4px 36px 0px rgba(0, 0, 0, 0.06);
|
// box-shadow: 0px 4px 36px 0px rgba(0, 0, 0, 0.06);
|
||||||
padding: 0 0 12px;
|
padding: 0 0 12px;
|
||||||
transition: all 0.2s;
|
transition: all 0.2s;
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { View, Text, Image, ScrollView } from "@tarojs/components";
|
import { View, Text, Image, ScrollView } from "@tarojs/components";
|
||||||
import { Avatar } from "@nutui/nutui-react-taro";
|
|
||||||
import GuideBar from "@/components/GuideBar";
|
import GuideBar from "@/components/GuideBar";
|
||||||
import { withAuth, EmptyState } from "@/components";
|
import { withAuth, EmptyState, BackNavbar } from "@/components";
|
||||||
import noticeService from "@/services/noticeService";
|
import noticeService from "@/services/noticeService";
|
||||||
import { useUserInfo } from "@/store/userStore";
|
|
||||||
import { formatRelativeTime } from "@/utils/timeUtils";
|
import { formatRelativeTime } from "@/utils/timeUtils";
|
||||||
import Taro from "@tarojs/taro";
|
import Taro from "@tarojs/taro";
|
||||||
import "./index.scss";
|
import "./index.scss";
|
||||||
@@ -27,7 +25,6 @@ interface MessageItem {
|
|||||||
type MessageCategory = "comment" | "follow";
|
type MessageCategory = "comment" | "follow";
|
||||||
|
|
||||||
const Message = () => {
|
const Message = () => {
|
||||||
const userInfo = useUserInfo() as any;
|
|
||||||
const [activeTab, setActiveTab] = useState<MessageCategory | null>(null);
|
const [activeTab, setActiveTab] = useState<MessageCategory | null>(null);
|
||||||
const [messageList, setMessageList] = useState<MessageItem[]>([]);
|
const [messageList, setMessageList] = useState<MessageItem[]>([]);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
@@ -135,18 +132,7 @@ const Message = () => {
|
|||||||
return (
|
return (
|
||||||
<View className="message-container">
|
<View className="message-container">
|
||||||
{/* 顶部导航栏 */}
|
{/* 顶部导航栏 */}
|
||||||
<View className="navbar">
|
<BackNavbar title="消息" />
|
||||||
<View className="navbar-content">
|
|
||||||
<View className="navbar-left">
|
|
||||||
<Avatar
|
|
||||||
className="navbar-avatar"
|
|
||||||
src={userInfo?.avatar_url}
|
|
||||||
size="28px"
|
|
||||||
/>
|
|
||||||
<Text className="navbar-title">消息</Text>
|
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
|
|
||||||
{/* 分类标签 */}
|
{/* 分类标签 */}
|
||||||
<View className="category-tabs">
|
<View className="category-tabs">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { View, Text, ScrollView } from "@tarojs/components";
|
import { View, Text, ScrollView } from "@tarojs/components";
|
||||||
import { Avatar } from "@nutui/nutui-react-taro";
|
import { Avatar } from "@nutui/nutui-react-taro";
|
||||||
import { withAuth, EmptyState } from "@/components";
|
import { withAuth, EmptyState, BackNavbar } from "@/components";
|
||||||
import FollowService from "@/services/followService";
|
import FollowService from "@/services/followService";
|
||||||
import { formatShortRelativeTime } from "@/utils/timeUtils";
|
import { formatShortRelativeTime } from "@/utils/timeUtils";
|
||||||
import Taro from "@tarojs/taro";
|
import Taro from "@tarojs/taro";
|
||||||
@@ -195,14 +195,12 @@ const NewFollow = () => {
|
|||||||
return (
|
return (
|
||||||
<View className="new-follow-container">
|
<View className="new-follow-container">
|
||||||
{/* 顶部导航栏 */}
|
{/* 顶部导航栏 */}
|
||||||
<View className="navbar">
|
<BackNavbar
|
||||||
<View className="navbar-content">
|
title="新增关注"
|
||||||
<View className="back-button" onClick={handleBack}>
|
showBackButton={true}
|
||||||
<View className="back-icon"></View>
|
showAvatar={false}
|
||||||
</View>
|
onBack={handleBack}
|
||||||
<Text className="navbar-title">新增关注</Text>
|
/>
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
|
|
||||||
{/* 关注列表 */}
|
{/* 关注列表 */}
|
||||||
<ScrollView
|
<ScrollView
|
||||||
|
|||||||
Reference in New Issue
Block a user