Merge branch 'dev'

FEMessage · Oct 12, 2019 · 8988384 · 8988384
2 parents 661eefc + 90f1554
commit 8988384
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/template/frameworks/mobile/assets/global.less b/template/frameworks/mobile/assets/global.less
@@ -1,5 +1,6 @@
 body {
   font-size: 28px;
+  .safe-area-inset-bottom();
 }
 
 .text-center {
@@ -34,3 +35,16 @@ body {
   position: relative;
   height: 120px;
 }
+
+// 安全区适配 (https://developer.mozilla.org/en-US/docs/Web/CSS/@viewport/viewport-fit)
+.safe-area-inset-bottom {
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}
+// vant 组件安全区全局适配
+.van-tabbar--fixed,
+.van-goods-action,
+.van-submit-bar,
+.van-popup--bottom {
+  .safe-area-inset-bottom();
+}
diff --git a/template/nuxt/nuxt.config.js b/template/nuxt/nuxt.config.js
@@ -126,7 +126,11 @@ module.exports = {
     title: '',
     meta: [
       {charset: 'utf-8'},
+      <%_ if (template === 'mobile') { _%>
+      {name: 'viewport', content: 'width=device-width, initial-scale=1, user-scalable=no, viewport-fit=cover'},
+      <%_ } else { _%>
       {name: 'viewport', content: 'width=device-width, initial-scale=1'},
+      <%_ } _%>
       {'http-equiv': 'x-ua-compatible', content: 'IE=edge, chrome=1'},
       {
         hid: 'description',