feat: 流程走通
This commit is contained in:
parent
10ecd93b54
commit
5f877b56b3
@ -267,7 +267,11 @@ struct ContentView: View {
|
||||
}
|
||||
.background(Color.themeTextWhiteSecondary)
|
||||
.navigationBarHidden(true)
|
||||
.navigationBarBackButtonHidden(true)
|
||||
}
|
||||
.navigationViewStyle(StackNavigationViewStyle())
|
||||
.navigationBarHidden(true)
|
||||
.navigationBarBackButtonHidden(true)
|
||||
}
|
||||
|
||||
/// 显示用户资料弹窗
|
||||
|
||||
@ -12,6 +12,7 @@ enum AppRoute: Hashable {
|
||||
case memories
|
||||
case subscribe
|
||||
case userInfo
|
||||
case content
|
||||
|
||||
@ViewBuilder
|
||||
var view: some View {
|
||||
@ -36,6 +37,8 @@ enum AppRoute: Hashable {
|
||||
SubscribeView()
|
||||
case .userInfo:
|
||||
UserInfo()
|
||||
case .content:
|
||||
ContentView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ struct JoinModal: View {
|
||||
Spacer()
|
||||
Button(action: {
|
||||
withAnimation {
|
||||
isPresented = false
|
||||
Router.shared.navigate(to: .content)
|
||||
}
|
||||
}) {
|
||||
Image(systemName: "xmark")
|
||||
|
||||
@ -45,11 +45,9 @@ struct WakeApp: App {
|
||||
} else {
|
||||
// 根据登录状态显示不同视图
|
||||
if authState.isAuthenticated {
|
||||
// 已登录:显示userInfo页面
|
||||
MediaUploadView()
|
||||
// 已登录:显示主页面
|
||||
ContentView()
|
||||
.environmentObject(authState)
|
||||
// ContentView()
|
||||
// .environmentObject(authState)
|
||||
} else {
|
||||
// 未登录:显示登录界面
|
||||
LoginView()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user