diff --git a/AppShell.xaml.cs b/AppShell.xaml.cs index d830ec0..70268f9 100644 --- a/AppShell.xaml.cs +++ b/AppShell.xaml.cs @@ -27,15 +27,15 @@ namespace SunlightAggregationTerminal await Navigation.PushModalAsync(loading); if (await AppModels.LogIn()) - {//拒绝登陆时打开登录页面 + { await loading.Navigation.PopModalAsync(); } - else - { + else + {//拒绝登陆时打开登录页面 await loading.Navigation.PopModalAsync(); var logpage = new View.LogPage(); - await Navigation.PushModalAsync(logpage); + await Navigation.PushModalAsync(new NavigationPage(logpage)); } } diff --git a/SunlightAggregationTerminal.csproj b/SunlightAggregationTerminal.csproj index 4bd297c..244b6b1 100644 --- a/SunlightAggregationTerminal.csproj +++ b/SunlightAggregationTerminal.csproj @@ -101,6 +101,12 @@ + + + LogLoading.xaml + + + MSBuild:Compile @@ -135,6 +141,9 @@ MSBuild:Compile + + MSBuild:Compile + MSBuild:Compile diff --git a/View/LogLoading.xaml b/View/LogLoading.xaml new file mode 100644 index 0000000..1995db6 --- /dev/null +++ b/View/LogLoading.xaml @@ -0,0 +1,21 @@ + + + + +