diff --git a/AwesomeProject/entry/src/main/controller/Home1.tsx b/AwesomeProject/entry/src/main/controller/Home1.tsx
index e0c0dccf743cf7e8666f6e5ee61a9da276df5fee..08289c46f460799cae1fba420e7f0ef08fa865ae 100644
--- a/AwesomeProject/entry/src/main/controller/Home1.tsx
+++ b/AwesomeProject/entry/src/main/controller/Home1.tsx
@@ -117,8 +117,8 @@ class TestWaterfallFlowScreen extends Component<{}, TestWaterfallFlowScreenState
}
+ style={{ flex: 1, marginTop: 40 }}
+ ListHeaderComponent={}
// ListFooterComponent={}
// ListEmptyComponent={}
data={data}
diff --git a/AwesomeProject/entry/src/main/view/SearchBar.tsx b/AwesomeProject/entry/src/main/view/SearchBar.tsx
index 64cfa262bc5b7c1472a99db83628998377458f87..145647199b3b8787f22401826691a2281378623d 100644
--- a/AwesomeProject/entry/src/main/view/SearchBar.tsx
+++ b/AwesomeProject/entry/src/main/view/SearchBar.tsx
@@ -8,10 +8,10 @@ import {
Text,
ImageBackground,
} from 'react-native';
-
+import { SafeAreaView } from '@react-native-oh-tpl/react-native-safe-area-context'
const SearchBar = () => {
return (
-
+
{/* 第二行 搜索栏 */}
@@ -24,10 +24,14 @@ const SearchBar = () => {
style={styles.icon}
/>
-
+
-
+
);
};
@@ -36,79 +40,27 @@ const styles = StyleSheet.create({
backgroundColor: '#ADD8E6', // 深蓝色背景
//paddingBottom: 10, // 底部边距
},
- statusBar: {
- height: 20, // 时间栏和信号栏高度
- //backgroundColor: '#ADD8E6', // 白色背景,模拟时间栏和信号栏
- },
searchContainer: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
- padding: 10,
+ borderRadius: 24,
+ backgroundColor: 'rgba(0, 0, 0, 0.05)',
+ margin: 8,
+ marginLeft: 16,
+ marginRight: 16,
},
input: {
flex: 0.9,
height: 40,
width: 120,
fontSize: 16,
- backgroundColor: 'rgba(255, 255, 255, 0)', // 背景透明度为10%
+
},
icon: {
- width: 30,
- height: 30,
- },
- mapIcon: {
- width: 20,
- height: 20,
- },
- tabContainer: {
- flex: 1,
- flexDirection: 'row',
- flexWrap: 'wrap', // 修改2:允许多行布局
- justifyContent: 'space-around',
- paddingHorizontal: 10,
- },
- tabButton: {
- backgroundColor: '#004080', // 浅蓝色背景
- paddingVertical: 5, // 修改4:减少内边距以适应新的高度
- paddingHorizontal: 10,
- borderRadius: 20,
- marginBottom: 10,
- marginLeft: 4,
- marginRight: 4,
- height: 30, // 修改5:调整高度确保文字能显示
- justifyContent: 'center',
- alignItems: 'center', // 修改6:确保文本居中对齐
- },
- tabText: {
- color: '#fff', // 白色文字
- fontSize: 12, // 修改7:增加字体大小以便在iOS上更容易显示
- },
- mapText: {
- justifyContent: 'center',
- textAlign: 'center',
- marginTop: 5,
- color: '#fff', // 白色文字
- fontSize: 10,
- },
- mapContainer: {
- flexDirection: 'row',
- },
- mapLocal: {
- flexDirection: 'column',
- alignItems: 'center',
- },
- backgroundImageAll: {
- justifyContent: 'center',
- alignItems: 'center',
- height: 100,
- width: '100%',
- },
- backgroundImage: {
- flex: 1,
- justifyContent: 'center',
- alignItems: 'center',
- overflow: 'hidden', // Ensure the border radius is applied by hiding overflow
+ width: 16,
+ height: 16,
+ marginRight: 8,
},
backgroundSearch: {
flex: 1,
@@ -117,13 +69,6 @@ const styles = StyleSheet.create({
alignItems: 'center',
//marginBottom : 100,
},
- backgroundSearch1: {
- flex: 1,
- flexDirection: 'row',
- justifyContent: 'center',
- alignItems: 'center',
- height: 50,
- },
});
export default SearchBar;
diff --git a/AwesomeProject/entry/src/main/view/SwiperDemo.tsx b/AwesomeProject/entry/src/main/view/SwiperDemo.tsx
index f9f4ea083acea3755dd083450da7f7127e2214c9..35f815e8078c9a2e163b975ca8652c25fdf78899 100644
--- a/AwesomeProject/entry/src/main/view/SwiperDemo.tsx
+++ b/AwesomeProject/entry/src/main/view/SwiperDemo.tsx
@@ -120,7 +120,7 @@ const styles = StyleSheet.create({
viewContainer: {
justifyContent: 'center',
alignItems: 'center',
- height: 240,
+ height: 250,
},
loadingIndicator: {
flex: 1,
@@ -137,15 +137,15 @@ const styles = StyleSheet.create({
right: 0,
},
container: {
- flex: 1,
paddingVertical: 5,
- height: 240,
+ height: 218,
},
swiperContainer: {
- height: 240,
+ height: 250,
},
paginationStyle: {
- bottom: 15,
+ bottom: 6,
+ height: 32,
},
dot: {
backgroundColor: 'rgba(0,0,0,.2)',
@@ -155,8 +155,8 @@ const styles = StyleSheet.create({
margin: 3,
},
activeDot: {
- backgroundColor: '#007aff',
- width: 16,
+ backgroundColor: 'rgb(10, 89, 247)',
+ width: 12,
height: 8,
borderRadius: 4,
margin: 3,
@@ -171,6 +171,12 @@ const styles = StyleSheet.create({
alignItems: 'center',
width: '20%',
},
+ fold:{
+ width: '16.6%',
+ },
+ pad: {
+ width: '10%',
+ },
itemImage: {
width: 40,
height: 40,