Merge branch 'feature/ufo-activitys' into 'develop'

安卓不进行安全区域适配

app.vue中mounted时，安卓不再进行windowHeight计算

See merge request !10

@@ -46,7 +46,7 @@ export default {
     });
     });
 
 
     this.getZkConfig();
     this.getZkConfig();
-    if (typeof window !== 'undefined') {
+    if (typeof window !== 'undefined' && !/Android/i.test(navigator.userAgent)) {
       if (window.screen.availHeight - window.innerHeight > 100) {
       if (window.screen.availHeight - window.innerHeight > 100) {
         this.windowHeight = (window.screen.availHeight - 88) + 'px';
         this.windowHeight = (window.screen.availHeight - 88) + 'px';
       } else {
       } else {

@@ -102,10 +102,4 @@ export default {
   width: 100%;
   width: 100%;
   background-color: white;
   background-color: white;
 }
 }
-
-/*@supports (bottom: env(safe-area-inset-bottom)) {
-  .footer {
-    height: calc(env(safe-area-inset-bottom) + 100px);
-  }
-}*/
 </style>
 </style>