Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/lyys

src/App.vue

@@ -24,6 +24,12 @@ export default {
     welcome
   },
   mounted(){
+    window.addEventListener('popstate',()=>{
+      if (this.isWel) {
+        this.isWel = false
+        this.changZINDEX = -10000
+      }
+    },false)
     
     this.$bus.$on('reset', ()=>{
       window.location.reload()

src/components/welcome.vue

@@ -77,6 +77,9 @@ export default {
   width: 100%;
   height: 100%;
   overflow: hidden;
+  background-color: #635c40;
+  display: flex;
+  align-items: center;
   > video {
     width: 100%;
   }

src/views/Home.vue

@@ -52,6 +52,8 @@ export default {
   position: relative;
   background-size: 100% auto;
   background-repeat: no-repeat;
+  background-position: center left;
+  background-color: #635c40;
   overflow: hidden;
   .title_bar {
     width: 26%;