Merge remote-tracking branch 'origin/dev' into dev

peng

2025-06-27 0fecd04611cfda01b4843613fa3c9137cd9852eb

Merge remote-tracking branch 'origin/dev' into dev

 components/TopBar.vue

@@ -1,5 +1,5 @@
<template>
    <view class="top-bar" :style="{paddingTop: statusBarHeight + 'rpx'}">
    <view class="top-bar" :style="{paddingTop: statusBarHeight + 'px'}">
        <view class="top-bar-content">
            <!-- 标题列表 -->
            <scroll-view class="title-scroll" scroll-x="true" scroll-with-animation :scroll-left="scrollLeft">
@@ -108,7 +108,7 @@
        
        .top-bar .title-scroll {
            width: 100%;
            height: 80rpx;
            height: 40px;
            white-space: nowrap;
        }