From bee34517d41932b24c2dfe5fa81c5993ffb22add Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 27 Feb 2023 10:23:48 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20diy=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/components/main/main.vue   | 25 ++++++++++++++++---
 .../src/pages/setting/devise/diyIndex.vue     | 24 ++++++++++--------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/template/admin/src/components/main/main.vue b/template/admin/src/components/main/main.vue
index 94cda1d65..53e6fb155 100644
--- a/template/admin/src/components/main/main.vue
+++ b/template/admin/src/components/main/main.vue
@@ -41,7 +41,7 @@
           <!-- 需要放在菜单上面的内容，如Logo，写在side-menu标签内部，如下 -->
         </side-menu>
       </Sider>
-      <Content class="main-content-con">
+      <Content class="main-content-con" :class="{ 'all-desk': headMenuNoShow }">
         <Layout class="main-layout-con">
           <div class="tag-nav-wrapper" v-if="!headMenuNoShow">
             <tags-nav :value="$route" @input="handleClick" :list="tagNavList" @on-close="handleCloseTag" />
@@ -55,7 +55,13 @@
             </keep-alive>
             <router-view v-if="!$route.meta.keepAlive && reload" class="main-warper"></router-view>
             <!-- <router-view v-if="reload" style="min-height: 600px" /> -->
-            <ABackTop :height="100" :bottom="80" :right="50" container=".content-wrapper"></ABackTop>
+            <ABackTop
+              v-if="!headMenuNoShow"
+              :height="100"
+              :bottom="80"
+              :right="50"
+              container=".content-wrapper"
+            ></ABackTop>
             <i-copyright v-if="!headMenuNoShow" />
           </Content>
         </Layout>
@@ -285,7 +291,7 @@ export default {
 .main .tag-nav-wrapper {
   // height: 10px;
   background: unset;
-  padding:  0 15px;
+  padding: 0 15px;
 }
 .open-image {
   display: flex;
@@ -305,4 +311,17 @@ export default {
 .main-warper {
   min-height: calc(~'100vh - 166px');
 }
+.all-desk {
+  height: 100vh !important;
+  padding: 0 !important;
+  .main-content-con,
+  .main-warper,
+  .main-layout-con,
+  .content-wrapper {
+    height: 100vh !important;
+  }
+  .content-wrapper {
+    padding: 0;
+  }
+}
 </style>
diff --git a/template/admin/src/pages/setting/devise/diyIndex.vue b/template/admin/src/pages/setting/devise/diyIndex.vue
index ffaf6ccae..c6100878c 100644
--- a/template/admin/src/pages/setting/devise/diyIndex.vue
+++ b/template/admin/src/pages/setting/devise/diyIndex.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="diy-page">
-    <div class="i-layout-page-header header_top">
-      <div class="i-layout-page-header fl_header">
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/setting/pages/devise' }"
           ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
         >
@@ -19,7 +19,7 @@
     </div>
 
     <Card :bordered="false" dis-hover class="ivu-mt" style="margin: 0 10px">
-      <div class="diy-wrapper" :style="'height:' + (clientHeight - 150) + 'px;'">
+      <div class="diy-wrapper">
         <!-- 左侧 -->
         <div class="left">
           <div class="title-bar">
@@ -33,7 +33,7 @@
               {{ item.title }}
             </div>
           </div>
-          <div class="wrapper" :style="'height:' + (clientHeight - 150) + 'px;'" v-if="tabCur == 0">
+          <div class="wrapper"  v-if="tabCur == 0">
             <div v-for="(item, index) in leftMenu" :key="index">
               <div class="tips" @click="item.isOpen = !item.isOpen">
                 {{ item.title }}
@@ -120,9 +120,7 @@
                       (colorTxt ? colorPickerTxt : '') +
                       ';background-image: url(' +
                       (picTxt ? picUrlTxt : '') +
-                      ');height:' +
-                      rollHeight +
-                      'px;'
+                      ');height:calc(100vh - 200px)'
                     "
                     ref="imgContainer"
                   >
@@ -902,7 +900,9 @@ export default {
 .wrapper-con {
   /* min-width 700px; */
 }
-
+.main .content-wrapper{
+  padding: 0 !important;
+}
 .defaultData {
   /* margin-left 20px; */
   cursor: pointer;
@@ -988,6 +988,7 @@ export default {
 .ivu-mt {
   display: flex;
   justify-content: space-between;
+  margin-bottom: 10px;
 }
 
 .iconfont-diy {
@@ -1000,9 +1001,7 @@ export default {
   min-width: 1100px;
   display: flex;
   justify-content: space-between;
-  margin-bottom: 20px;
-
-  /* height: 84.5vh; */
+  height: 100%;
   .left {
     min-width: 300px;
     max-width: 300px;
@@ -1363,6 +1362,9 @@ export default {
 
 /deep/ .ivu-card-body {
   width: 100%;
+  padding:0;
+  height: calc(100vh - 73px);
+
 }
 
 .rbtn {