|
@@ -10,7 +10,7 @@ import Profile from '../account/Profile'
|
|
|
import ChooseAuth from '@/pages/account/ChooseAuth'
|
|
import ChooseAuth from '@/pages/account/ChooseAuth'
|
|
|
import Auth from '@/pages/account/Auth'
|
|
import Auth from '@/pages/account/Auth'
|
|
|
import Setting from '@/pages/account/Setting'
|
|
import Setting from '@/pages/account/Setting'
|
|
|
-import SetSchedule from '@/pages/clock/SetSchedule'
|
|
|
|
|
|
|
+import SetSchedule from '@/pages/clock/SetSchedule'
|
|
|
import ChooseScenario from '@/pages/clock/ChooseScenario'
|
|
import ChooseScenario from '@/pages/clock/ChooseScenario'
|
|
|
import RecordsHistory from '@/pages/common/RecordsHistory'
|
|
import RecordsHistory from '@/pages/common/RecordsHistory'
|
|
|
import Food from '@/pages/food/Food'
|
|
import Food from '@/pages/food/Food'
|
|
@@ -57,10 +57,11 @@ const App: React.FC = () => {
|
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
export default function RNMain() {
|
|
export default function RNMain() {
|
|
|
- const ClockPage = ()=> <Clock />
|
|
|
|
|
- const MetricPage = ()=> <Metric />
|
|
|
|
|
- const WorkoutPage = ()=> <Workout />
|
|
|
|
|
- const ProfilePage = ()=> <Profile />
|
|
|
|
|
|
|
+ const ClockPage = () => <Clock />
|
|
|
|
|
+ const MetricPage = () => <Metric />
|
|
|
|
|
+ const WorkoutPage = () => <Workout />
|
|
|
|
|
+ const ProfilePage = () => <Profile />
|
|
|
|
|
+ const DemoAPage = () => <DemoA />
|
|
|
// const FoodPage = ()=><Food/>
|
|
// const FoodPage = ()=><Food/>
|
|
|
|
|
|
|
|
function tabNavigator() {
|
|
function tabNavigator() {
|
|
@@ -76,9 +77,10 @@ export default function RNMain() {
|
|
|
tabBarInactiveTintColor: 'gray', // 非活动标签的颜色
|
|
tabBarInactiveTintColor: 'gray', // 非活动标签的颜色
|
|
|
})}>
|
|
})}>
|
|
|
<Tab.Screen name="Clock" component={ClockPage} />
|
|
<Tab.Screen name="Clock" component={ClockPage} />
|
|
|
|
|
+ <Tab.Screen name='DemoA' component={DemoAPage} />
|
|
|
{/* <Tab.Screen name="Food" component={FoodPage} /> */}
|
|
{/* <Tab.Screen name="Food" component={FoodPage} /> */}
|
|
|
<Tab.Screen name="Metric" component={MetricPage} />
|
|
<Tab.Screen name="Metric" component={MetricPage} />
|
|
|
- <Tab.Screen name="Workout" component={WorkoutPage}/>
|
|
|
|
|
|
|
+ <Tab.Screen name="Workout" component={WorkoutPage} />
|
|
|
<Tab.Screen name="Profile" component={ProfilePage} />
|
|
<Tab.Screen name="Profile" component={ProfilePage} />
|
|
|
</Tab.Navigator>
|
|
</Tab.Navigator>
|
|
|
)
|
|
)
|
|
@@ -99,14 +101,14 @@ export default function RNMain() {
|
|
|
headerStyle: {
|
|
headerStyle: {
|
|
|
backgroundColor: 'black',
|
|
backgroundColor: 'black',
|
|
|
borderBottomWidth: 0, // 隐藏导航条底部边框
|
|
borderBottomWidth: 0, // 隐藏导航条底部边框
|
|
|
- borderBottomColor:'red'
|
|
|
|
|
|
|
+ borderBottomColor: 'red'
|
|
|
},
|
|
},
|
|
|
headerTintColor: 'white',
|
|
headerTintColor: 'white',
|
|
|
tabBarStyle: { backgroundColor: 'black' }, // tabbar的背景色
|
|
tabBarStyle: { backgroundColor: 'black' }, // tabbar的背景色
|
|
|
tabBarActiveTintColor: 'white', // 活动标签的颜色
|
|
tabBarActiveTintColor: 'white', // 活动标签的颜色
|
|
|
tabBarInactiveTintColor: 'gray', // 非活动标签的颜色
|
|
tabBarInactiveTintColor: 'gray', // 非活动标签的颜色
|
|
|
})}>
|
|
})}>
|
|
|
- <Stack.Screen name='Main' component={tabNavigator} options={{ headerShown: false }}/>
|
|
|
|
|
|
|
+ <Stack.Screen name='Main' component={tabNavigator} options={{ headerShown: false }} />
|
|
|
<Stack.Screen name='ChooseAuth' component={ChooseAuth} />
|
|
<Stack.Screen name='ChooseAuth' component={ChooseAuth} />
|
|
|
<Stack.Screen name='Auth' component={Auth} />
|
|
<Stack.Screen name='Auth' component={Auth} />
|
|
|
<Stack.Screen name='Setting' component={Setting} />
|
|
<Stack.Screen name='Setting' component={Setting} />
|