style: 样式调整

template/admin/src/pages/marketing/storeBargain/statistics.vue

@@ -412,7 +412,13 @@ export default {
 }
 
 .i-layout-page-header {
-  padding-left: 13px;
+  padding-left: 5px;
+  padding-bottom: 1px;
+  margin-bottom: 10px;
+}
+/deep/ .ivu-tabs-nav-scroll{
+  background-color: #fff;
+  padding-top: 5px;
 }
 
 .tabBox_img {

template/admin/src/pages/marketing/storeCombination/statistics.vue

@@ -407,9 +407,14 @@ export default {
 }
 
 .i-layout-page-header {
-  padding-left: 13px;
+  padding-left: 5px;
+  padding-bottom 1px
+  margin-bottom 10px
+}
+/deep/ .ivu-tabs-nav-scroll{
+  background-color: #fff;
+  padding-top 5px
 }
-
 .tabBox_img {
   width: 36px;
   height: 36px;

template/admin/src/pages/marketing/storeSeckill/statistics.vue

@@ -247,7 +247,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang='less' scoped>
 .cl {
   margin-right: 20px;
 }
@@ -262,6 +262,15 @@ export default {
 .ech-box {
   margin-top: 10px;
 }
+.i-layout-page-header {
+  padding-left: 5px;
+  padding-bottom: 1px;
+  margin-bottom: 10px;
+}
+/deep/ .ivu-tabs-nav-scroll{
+  background-color: #fff;
+  padding-top: 5px;
+}
 .change-style {
   border: 1px solid #ccc;
   border-radius: 15px;

template/admin/src/pages/system/group/list.vue

@@ -2,10 +2,10 @@
   <div>
     <div class="i-layout-page-header header_top">
       <div class="i-layout-page-header fl_header">
-        <router-link :to="{ path: $routeProStr + '/system/config/system_group/index' }"
+        <router-link v-if="$route.params.id != 49" :to="{ path: $routeProStr + '/system/config/system_group/index' }"
           ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
         >
-        <Divider type="vertical" />
+        <Divider v-if="$route.params.id != 49" type="vertical" />
         <span class="ivu-page-header-title mr20" style="padding: 0" v-text="$route.meta.title"></span>
       </div>
     </div>
@@ -27,70 +27,68 @@
           </Menu>
         </Col>
         <Col :xs="24" :sm="24" :md="$route.params.id ? 24 : 17" :lg="$route.params.id ? 24 : 20" ref="rightBox">
-          <Card :bordered="false" dis-hover>
-            <Form
-              ref="formValidate"
-              :model="formValidate"
-              :label-width="labelWidth"
-              :label-position="labelPosition"
-              @submit.native.prevent
-            >
-              <Row type="flex" :gutter="24">
-                <Col v-bind="grid">
-                  <FormItem label="是否显示：">
-                    <Select v-model="formValidate.status" placeholder="请选择" clearable @on-change="userSearchs">
-                      <Option value="1">显示</Option>
-                      <Option value="0">不显示</Option>
-                    </Select>
-                  </FormItem>
-                </Col>
-              </Row>
-              <Row type="flex">
-                <Col v-bind="grid">
-                  <Button type="primary" icon="md-add" @click="groupAdd('添加数据')" class="mr20">添加数据</Button>
-                </Col>
-              </Row>
-            </Form>
-            <Table
-              :columns="columns1"
-              :data="tabList"
-              ref="table"
-              class="mt25"
-              :loading="loading"
-              highlight-row
-              no-userFrom-text="暂无数据"
-              no-filtered-userFrom-text="暂无筛选结果"
-            >
-              <template slot-scope="{ row, index }" slot="status">
-                <i-switch
-                  v-model="row.status"
-                  :value="row.status"
-                  :true-value="1"
-                  :false-value="0"
-                  @on-change="onchangeIsShow(row)"
-                  size="large"
-                >
-                  <span slot="open">显示</span>
-                  <span slot="close">隐藏</span>
-                </i-switch>
-              </template>
-              <template slot-scope="{ row, index }" slot="action">
-                <a @click="edit(row, '编辑')">编辑</a>
-                <Divider type="vertical" />
-                <a @click="del(row, '删除这条信息', index)">删除</a>
-              </template>
-            </Table>
-            <div class="acea-row row-right page">
-              <Page
-                :total="total"
-                :current="formValidate.page"
-                show-elevator
-                show-total
-                @on-change="pageChange"
-                :page-size="formValidate.limit"
-              />
-            </div>
-          </Card>
+          <Form
+            ref="formValidate"
+            :model="formValidate"
+            :label-width="labelWidth"
+            :label-position="labelPosition"
+            @submit.native.prevent
+          >
+            <Row type="flex" :gutter="24">
+              <Col v-bind="grid">
+                <FormItem label="是否显示：">
+                  <Select v-model="formValidate.status" placeholder="请选择" clearable @on-change="userSearchs">
+                    <Option value="1">显示</Option>
+                    <Option value="0">不显示</Option>
+                  </Select>
+                </FormItem>
+              </Col>
+            </Row>
+            <Row type="flex">
+              <Col v-bind="grid">
+                <Button type="primary" icon="md-add" @click="groupAdd('添加数据')" class="mr20">添加数据</Button>
+              </Col>
+            </Row>
+          </Form>
+          <Table
+            :columns="columns1"
+            :data="tabList"
+            ref="table"
+            class="mt25"
+            :loading="loading"
+            highlight-row
+            no-userFrom-text="暂无数据"
+            no-filtered-userFrom-text="暂无筛选结果"
+          >
+            <template slot-scope="{ row, index }" slot="status">
+              <i-switch
+                v-model="row.status"
+                :value="row.status"
+                :true-value="1"
+                :false-value="0"
+                @on-change="onchangeIsShow(row)"
+                size="large"
+              >
+                <span slot="open">显示</span>
+                <span slot="close">隐藏</span>
+              </i-switch>
+            </template>
+            <template slot-scope="{ row, index }" slot="action">
+              <a @click="edit(row, '编辑')">编辑</a>
+              <Divider type="vertical" />
+              <a @click="del(row, '删除这条信息', index)">删除</a>
+            </template>
+          </Table>
+          <div class="acea-row row-right page">
+            <Page
+              :total="total"
+              :current="formValidate.page"
+              show-elevator
+              show-total
+              @on-change="pageChange"
+              :page-size="formValidate.limit"
+            />
+          </div>
         </Col>
       </Row>
     </Card>
@@ -348,7 +346,9 @@ export default {
 /deep/ .ivu-menu-vertical.ivu-menu-light:after{
     display none
 }
-
+/deep/ .i-layout-page-header{
+  padding-left: 10px!important;
+}
 .left-wrapper
     height 904px
     background #fff