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>
@@ -33,10 +38,10 @@ import fixed1920 from "@/views/components/fixed1920.vue";
 import MainThemeTools from "./main-theme-tools";
 
 export default {
-  provide () {
+  provide() {
     return {
       // 刷新
-      refresh () {
+      refresh() {
         this.$store.state.contentIsNeedRefresh = true;
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false;
@@ -44,7 +49,7 @@ export default {
       },
     };
   },
-  data () {
+  data() {
     return {
       loading: true,
       userType: localStorage.getItem("userType"),
@@ -54,13 +59,13 @@ export default {
     MainNavbar,
     MainContent,
     fixed1920,
-    MainThemeTools
+    MainThemeTools,
   },
 
   watch: {
     $route: "routeHandle",
   },
-  async created () {
+  async created() {
     this.windowResizeHandle();
     this.routeHandle(this.$route);
     Promise.all([this.getWorkUserInfo()]).then(() => {
@@ -69,11 +74,11 @@ export default {
   },
   computed: {},
   methods: {
-    changeCustomerName (customerName) {
+    changeCustomerName(customerName) {
       this.$refs["ref_navbar"].changeCustomerName(customerName);
     },
     // 窗口改变大小
-    windowResizeHandle () {
+    windowResizeHandle() {
       this.$store.state.sidebarFold =
         document.documentElement["clientWidth"] <= 992 || false;
       window.addEventListener(
@@ -85,7 +90,7 @@ export default {
       );
     },
     // 路由, 监听
-    routeHandle (route) {
+    routeHandle(route) {
       if (!route.meta.isTab) {
         this.$store.state.mainShuju.activeName = "";
         this.$store.state.mainShuju.contentTabsActiveName = "";
@@ -111,7 +116,7 @@ export default {
     },
 
     // 获取当前管理员信息
-    async getWorkUserInfo () {
+    async getWorkUserInfo() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
       const { data, code, msg } = await requestPost(url, params);

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>