From 8def448ca7db8ba6868ac2823e765dea9b43998a Mon Sep 17 00:00:00 2001 From: hua <1029559041@qq.com> Date: Fri, 21 Aug 2020 09:22:48 +0800 Subject: [PATCH] update --- Weibo/ContentView.swift | 13 +++---------- Weibo/LoginView.swift | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Weibo/ContentView.swift b/Weibo/ContentView.swift index c6fd58d..8123b52 100644 --- a/Weibo/ContentView.swift +++ b/Weibo/ContentView.swift @@ -17,23 +17,16 @@ struct ContentView: View { @EnvironmentObject var user:User @State var selection=2 - - + var body: some View { TabView(selection: self.$selection) { - if self.user.access_token==nil{ + if (self.user.access_token != nil){ IndexView().tabItem { VStack { Image("house") Text("首页") .foregroundColor(Color.black) - } }.tag(1).hidden() - }else{ - IndexView().tabItem { VStack { - Image("house") - Text("首页") - .foregroundColor(Color.black) - } }.tag(1) + } }.tag(1) } LoginView().tabItem { VStack { diff --git a/Weibo/LoginView.swift b/Weibo/LoginView.swift index db6af72..c73f597 100644 --- a/Weibo/LoginView.swift +++ b/Weibo/LoginView.swift @@ -86,12 +86,12 @@ struct UserView:View { var body:some View{ VStack { HStack { - ImageView(imageUrl: self.user.avatar_hd!) + ImageView(imageUrl: self.user.avatar_hd ?? "") .frame(width: 60.0, height: 60.0) .clipShape(/*@START_MENU_TOKEN@*/Circle()/*@END_MENU_TOKEN@*/) VStack { Text(self.user.name!) - Text("简介:\(self.user.desc!)") + Text("简介:\(self.user.desc ?? "")") } Spacer() Button(action: {