Merge remote-tracking branch 'origin/master'

data-room-ui/packages/BigScreenDesign/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="(!pageLoading) && hasPermission"
+    v-if="hasPermission"
     class="bs-page-design-wrap"
   >
     <PageTopSetting
@@ -237,6 +237,7 @@ export default {
   //   })
   // },
   created () {
+    this.changePageLoading(true)
     this.permission()
     /**
        * 以下是为了解决在火狐浏览器上推拽时弹出tab页到搜索问题

data-room-ui/packages/BigScreenRun/index.vue

@@ -1,11 +1,12 @@
 <template>
+  <div v-if="hasPermission">
     <div
-    v-if="!pageLoading"
+      v-loading="pageLoading"
+      element-loading-background="#151A26"
       class="bs-preview-wrap"
       :style="previewWrapStyle"
     >
       <div
-      v-if="hasPermission"
         class="bs-render-wrap render-theme-wrap"
         :style="renderStyle"
       >
@@ -28,8 +29,9 @@
           />
         </div>
       </div>
-    <NotPermission v-else />
     </div>
+  </div>
+  <NotPermission v-else />
 </template>
 <script>
 import { get } from 'data-room-ui/js/utils/http'