Merge branch 'master' into beta2

yaneng · Nov 8, 2019 · 083bc96 · 083bc96
2 parents 5714438 + 8b1cb88
commit 083bc96
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en.
 	-  [命令行 生成 `Flutter Go Widget` 标准公共模版](https://github.com/alibaba/flutter-go/blob/beta/docs/widget.md)
 	-  `markdown` 模版动态化生成（合并到master分支后）
 - [x] ` Flutter Go ` 官方 `APP` 版本自动升级
-- [ ] 多端模版同步( pc端，native端同步 )
+- [x] 多端模版同步( pc端，native端同步 )
 - [ ] `Flutter Go` store
 
 

diff --git a/lib/views/fourth_page/pages.dart b/lib/views/fourth_page/pages.dart
@@ -71,6 +71,7 @@ class Page extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final paddingTop = MediaQuery.of(context).padding.top;
     return Stack(
         //alignment: const Alignment(1.2, 0.6),
         children: [
@@ -90,7 +91,7 @@ class Page extends StatelessWidget {
           ),
           Positioned(
               right: -5.0,
-              top: 2.0,
+              top: paddingTop + 2.0,
               child: creatButton(context, 'GitHub', Icons.arrow_forward, 'goGithub')
           ),
         ]

diff --git a/lib/views/web_page/web_view_page.dart b/lib/views/web_page/web_view_page.dart
@@ -76,6 +76,7 @@ class _WebViewPageState extends State<WebViewPage> {
         withZoom: false,
         withLocalStorage: true,
         withJavascript: true,
+        hidden: true,
       ),
     );
   }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -52,7 +52,6 @@ dependencies:
   package_info: ^0.4.0+3
   flutter_jpush: ^0.0.4
   zefyr: ^0.8.0
-#    path: ./zefyr
   pull_to_refresh: ^1.5.6