Browse Source

样式调整

chenrui 3 years ago
parent
commit
211cccd346

+ 1 - 1
src/components/Menu/SideMenu.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <a-layout-sider
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="190px"
+    width="160px"
     :collapsible="collapsible"
     :collapsible="collapsible"
     v-model="collapsed"
     v-model="collapsed"
     :trigger="null">
     :trigger="null">

+ 4 - 2
src/components/custom.less

@@ -17,6 +17,7 @@ body{
       .ant-input,.ant-select-selection{
       .ant-input,.ant-select-selection{
         border-radius: 2px;
         border-radius: 2px;
         padding: 0px 11px;
         padding: 0px 11px;
+        font-size: 12px;
       }
       }
       .ant-form-item-label{
       .ant-form-item-label{
         line-height: 32px!important;
         line-height: 32px!important;
@@ -139,17 +140,18 @@ body{
         background: #fafafa!important;
         background: #fafafa!important;
         font-weight: bold;
         font-weight: bold;
         color: #333!important;
         color: #333!important;
+        padding: 5px 5px 2px!important;
       }
       }
     }
     }
   }
   }
   .ant-table-row{
   .ant-table-row{
     .ant-table-row-cell-break-word, td{
     .ant-table-row-cell-break-word, td{
-      padding: 3px 4px!important;
+      padding: 2px 4px!important;
       color: #333!important;
       color: #333!important;
     }
     }
   }
   }
   .ant-pagination.ant-table-pagination{
   .ant-pagination.ant-table-pagination{
-    margin: 10px 0;
+    margin: 10px 0 0;
   }
   }
   .ant-table-small > .ant-table-content > .ant-table-body{
   .ant-table-small > .ant-table-content > .ant-table-body{
     margin: 0;
     margin: 0;

+ 4 - 4
src/components/global.less

@@ -108,8 +108,8 @@ body {
             margin:0 25px;
             margin:0 25px;
           }
           }
           .ant-menu.ant-menu-horizontal{
           .ant-menu.ant-menu-horizontal{
-            max-width: calc(100vw - 190px - 238px - 25px);
-            flex: 1 1 calc(100vw - 190px - 238px - 25px);
+            max-width: calc(100vw - 160px - 238px - 25px);
+            flex: 1 1 calc(100vw - 160px - 238px - 25px);
           }
           }
         }
         }
         .header-index-right{
         .header-index-right{
@@ -133,7 +133,7 @@ body {
       transition: width 0.2s;
       transition: width 0.2s;
 
 
       &.ant-header-side-opened {
       &.ant-header-side-opened {
-        width: calc(100% - 190px);
+        width: calc(100% - 160px);
       }
       }
 
 
       &.ant-header-side-closed {
       &.ant-header-side-closed {
@@ -151,7 +151,7 @@ body {
       right:0;
       right:0;
       margin: auto;
       margin: auto;
       &.ant-header-side-opened {
       &.ant-header-side-opened {
-        width: calc(100% - 190px);
+        width: calc(100% - 160px);
       }
       }
       
       
       &.ant-header-side-closed {
       &.ant-header-side-closed {

+ 2 - 2
src/layouts/BasicLayout.vue

@@ -130,7 +130,7 @@ export default {
         return '0'
         return '0'
       }
       }
       if (this.sidebarOpened) {
       if (this.sidebarOpened) {
-        return '190px'
+        return '160px'
       }
       }
       return '80px'
       return '80px'
     },
     },
@@ -220,7 +220,7 @@ export default {
     paddingCalc () {
     paddingCalc () {
       let left = ''
       let left = ''
       if (this.sidebarOpened) {
       if (this.sidebarOpened) {
-        left = this.isDesktop() ? '190px' : '80px'
+        left = this.isDesktop() ? '160px' : '80px'
       } else {
       } else {
         left = (this.isMobile() && '0') || ((this.fixSidebar && '80px') || '0')
         left = (this.isMobile() && '0') || ((this.fixSidebar && '80px') || '0')
       }
       }

+ 2 - 9
src/views/salesManagement/salesQuery/list.vue

@@ -96,7 +96,7 @@
       <s-table
       <s-table
         class="sTable fixPagination"
         class="sTable fixPagination"
         ref="table"
         ref="table"
-        :style="{ height: tableHeight+87+'px' }"
+        :style="{ height: tableHeight+77+'px' }"
         size="small"
         size="small"
         :rowKey="(record) => record.id"
         :rowKey="(record) => record.id"
         :columns="columns"
         :columns="columns"
@@ -414,7 +414,7 @@ export default {
     },
     },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 275
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
     }
   },
   },
   mounted () {
   mounted () {
@@ -442,10 +442,3 @@ export default {
   }
   }
 }
 }
 </script>
 </script>
-<style lang="less">
-  .ssalesManagementList-wrap{
-    .sTable{
-      margin-top: 15px;
-    }
-  }
-</style>