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

code/src/components/popupLayout/Loading.vue

@@ -96,6 +96,7 @@ export default {
 .mobilec{
   .loading-body{
     width: 100%;
+    background: rgba(0, 0, 0, 0.7);
     .ui-con{
       left: 50%;
     }

code/src/pages/index/index.vue

@@ -32,7 +32,7 @@ import history from '@/pages/history'
 import bg from '@/components/background'
 
 
-// http://192.168.0.44:8110/
+// http://192.168.0.245:8110/
 let temp = ''
 const outKey = "791"
 const inKey = "762"

code/src/pages/layout/aside.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <div v-if="!$isMobile" class="layout"  :class="{isShow:isShow}">
+      {{isShow}}
       <img class="bg" :src="require(`@/assets/images/aside_bg.jpg`)" alt="">
       <ul class="aside">
         <li :class="{active:item.id===activeIdx}" v-for="(item,i) in asdie" :key="i" @click="handleItem(item)" >
@@ -149,15 +150,24 @@ export default {
   },
   methods:{
     handleItem(item){
+        
+
       this.$hideBroadcast()
       if (!item.path) {
         return 
       }
       if (item.type === 'switch') {
         this.isOutScene = !this.isOutScene
+        if (!this.isOutScene) {
+          setTimeout(() => {
+            this.isShow = !this.isShow 
+          });
+        }
       }
+      
       this.$router.push(item.path)
       this.activeIdx = item.id
+      
     },
     mobileHandleClick(path) {
       this.$router.push({path:path})