Merge branch 'dev-登录返回旧业面' into dev-烟台中转登录2

src/assets/scss/main-shuju.scss

@@ -159,6 +159,13 @@
       }
     }
   }
+
+  &.z-iframe {
+    padding-top: 0;
+    .aui-content--tabs {
+      padding-top: 0;
+    }
+  }
 }
 
 /* Navbar

src/views/main-shuju/main.vue

@@ -1,6 +1,7 @@
 <template>
   <fixed1920>
-    <div v-loading.fullscreen.lock="loading"
+    <div
+      v-loading.fullscreen.lock="loading"
       :element-loading-text="$t('loading')"
       :class="[
         'g-bd',
@@ -8,15 +9,19 @@
         {
           'z-sidebar--noside': true,
         },
-      ]">
+        { 'z-iframe': $store.state.inIframe },
+      ]"
+    >
       <template v-if="!loading">
-        <main-navbar ref="ref_navbar" />
+        <main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
 
         <div class="g-cnt">
-          <main-content v-if="!$store.state.contentIsNeedRefresh"
-                        @changeCustomerName="changeCustomerName" />
+          <main-content
+            v-if="!$store.state.contentIsNeedRefresh"
+            @changeCustomerName="changeCustomerName"
+          />
         </div>
-        <main-theme-tools v-if="!$store.state.inIframe" />
+        <main-theme-tools />
       </template>
     </div>
   </fixed1920>
@@ -54,7 +59,7 @@ export default {
     MainNavbar,
     MainContent,
     fixed1920,
-    MainThemeTools
+    MainThemeTools,
   },
 
   watch: {

src/views/main.vue

@@ -22,7 +22,7 @@
           @changeCustomerName="changeCustomerName"
         />
       </div>
-      <main-theme-tools v-if="!$store.state.inIframe" />
+      <main-theme-tools />
 
       <!-- <secretary-log-notice v-if="!$store.state.inIframe" /> -->
     </template>