Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal

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));
                 }
 
             }