Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/pages/setting/setSystem/index.vue

@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
-      <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
-    </div>
   <div class="article-manager">
     <Card :bordered="false" dis-hover class="ivu-mt fromBox">
       <Tabs v-model="currentTab" @on-click="changeTab" v-if="headerList.length">

template/admin/src/pages/setting/storage/index.vue

@@ -1,8 +1,5 @@
 <template>
   <div >
-    <div class="i-layout-page-header header_top">
-      <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
-    </div>
     <div class="message">
       <Card :bordered="false" dis-hover class="">
         <div class="mb20">

template/admin/src/pages/system/maintain/systemCleardata/index.vue

@@ -1,13 +1,11 @@
 <template>
   <div>
-    <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
         <div class="clear_tit">
           <Icon type="md-information-circle" color="#ED4014" />
           <span>清除数据请谨慎，清除就无法恢复哦！</span>
         </div>
-      </div>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Row type="flex" :gutter="24">

template/admin/src/pages/system/maintain/systemDatabackup/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt tableBox">
-      <div slot="title">
-        <span class="ivu-pl-8">数据库备份记录</span>
-      </div>
+    <div class="i-layout-page-header header-title">
+      <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
+    </div>
+    <Card :bordered="false" dis-hover class="ivu-mt">
       <Table
         ref="selection"
         :columns="columns4"

template/admin/src/pages/system/maintain/systemFile/index.vue

@@ -1,5 +1,8 @@
 <template>
   <div>
+    <div class="i-layout-page-header header-title">
+      <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
+    </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Table
         ref="selection"
@@ -8,7 +11,6 @@
         :loading="loading"
         no-data-text="暂无数据"
         highlight-row
-        class="mt25"
         no-filtered-data-text="暂无筛选结果"
       >
         <template slot-scope="{ row }" slot="nickname">

template/admin/src/styles/style.css

@@ -513,6 +513,10 @@ body {
   background-color: #fff;
   padding: 7px 32px 0 32px;
 }
+.header-title {
+  padding: 18px 32px;
+  border-bottom: 1px solid #f2f2f2;
+}
 .ivu-page-header-title {
   display: inline-block;
   color: #17233d;