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