zhoujump пре 1 месец
родитељ
комит
f4a2e7c57c
2 измењених фајлова са 39 додато и 41 уклоњено
  1. 0 38
      src/App.vue
  2. 39 3
      src/layout/index.vue

+ 0 - 38
src/App.vue

@@ -8,23 +8,15 @@
       :is-collapse="isCollapse"
       @changeCollapse="isCollapse = !isCollapse"
     />
-    <div :class="['packet-mask',showPacket?'show':'']">
-      <packetList class="packet-list" @close="showPacket=false" />
-    </div>
   </div>
 </template>
 
 <script>
-import i18n from '@/locales/i18n'
-import packetList from '@/views/components/packetList.vue'
 import router from '@/router'
 import { canIShow } from '@/permission'
 import hugerte from 'hugerte'
 export default {
   name: 'App',
-  components: {
-    packetList
-  },
   data() {
     return {
       roles: [],
@@ -33,7 +25,6 @@ export default {
       menuActive: 0,
       breadcrumb: [],
       isCollapse: false,
-      showPacket: false
     }
   },
   created() {
@@ -41,9 +32,6 @@ export default {
   },
   mounted() {
     this.initStore()
-    this.$bus.$on('showPacket', (val) => {
-      this.showPacket = val
-    })
   },
   methods: {
     initStore() {
@@ -127,32 +115,6 @@ export default {
    width: 100%;
    overflow: hidden;
  }
- .packet-mask{
-   display: flex;
-   align-items: center;
-   justify-content: center;
-   transition-duration: 300ms;
-   z-index: 1999;
-   position: fixed;
-   left: 0;
-   top: 0;
-   width: 100%;
-   height: 100%;
-   background-color: #00000044;
-   pointer-events: none;
-   opacity: 0;
-   .packet-list{
-     transition-duration: 300ms;
-     transform: translateY(40px);
-   }
-   &.show{
-     pointer-events: auto;
-     opacity: 1;
-     .packet-list{
-       transform: translateY(0);
-     }
-   }
- }
  textarea{
    font-family: inherit;
  }

+ 39 - 3
src/layout/index.vue

@@ -87,11 +87,14 @@
         <div class="body-inner trans" :class="{'animation':isAnimation}" />
       </div>
     </div>
+    <div :class="['packet-mask',showPacket?'show':'']">
+      <packetList class="packet-list" @close="showPacket=false" />
+    </div>
   </div>
 </template>
 
 <script>
-import { canIShow } from '@/permission'
+import packetList from '@/views/components/packetList.vue'
 export default {
   name: 'Layout',
   props: [
@@ -108,7 +111,8 @@ export default {
       packetData: {
         invitation: false,
         expo: false
-      }
+      },
+      showPacket: false
     }
   },
   computed: {
@@ -117,6 +121,9 @@ export default {
   mounted() {
     this.getPacket()
     this.refreshUser()
+    this.$bus.$on('showPacket', (val) => {
+      this.showPacket = val
+    })
   },
   methods: {
     refreshUser() {
@@ -170,7 +177,10 @@ export default {
         name: route.name
       })
     }
-  }
+  },
+  components: {
+    packetList
+  },
 }
 </script>
 
@@ -182,6 +192,32 @@ export default {
     width: 100%;
     display: grid;
     grid-template-columns: auto 1fr;
+  .packet-mask{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition-duration: 300ms;
+    z-index: 1999;
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background-color: #00000044;
+    pointer-events: none;
+    opacity: 0;
+    .packet-list{
+      transition-duration: 300ms;
+      transform: translateY(40px);
+    }
+    &.show{
+      pointer-events: auto;
+      opacity: 1;
+      .packet-list{
+        transform: translateY(0);
+      }
+    }
+  }
     .layout-left,.layout-right{
       display: grid;
       grid-template-rows: 80px 1fr;