Merge branch 'master' of http://gitlab.5jstore.com/zhuguorui/breast-feeding-ai-demo-web

# Conflicts:
#	src/utils/evicePixelRatio.js

src/views/complete.vue

@@ -106,7 +106,7 @@ export default {
   height: 100%;
 }
 .pc {
-  height: 100vh;
+  height: calc(var(--vh, 1vh) * 100);
   align-items: center;
   .main_content {
     width: 375px;

src/views/index.vue

@@ -685,7 +685,7 @@ export default {
   height: 100%;
 }
 .pc {
-  height: 100vh;
+  height: calc(var(--vh, 1vh) * 100);
   align-items: center;
   .main_content {
     width: 375px;
@@ -874,8 +874,8 @@ export default {
       position: fixed;
       left: 0;
       top: 0;
-      width: 100vw;
-      height: calc(var(--vh, 1vh) * 100);
+      width: 100%;
+      height: 100%;
       display: flex;
       align-items: center;
       justify-content: center;