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

# Conflicts:
#	template/admin/src/pages/setting/devise/diyIndex.vue

template/admin/src/components/main/components/header-search/index.vue

@@ -38,7 +38,7 @@
 .search /deep/ .ivu-select-input{
   padding-left: 19px;
   border-radius: 30px;
-  background-color: rgba(255,255,255,0.3);
+  background-color: #f0faff;
 }
 </style>
 <script>

template/admin/src/components/main/main.less

@@ -30,7 +30,7 @@
     padding: 0;
     height: 42px;
     background: #f0f0f0;
-    margin-bottom: 3px;
+    margin-bottom: 14px;
   }
   .content-wrapper {
     padding: 0 16px;

template/admin/src/components/systemStore/index.vue

@@ -10,9 +10,6 @@
       @on-cancel="cancel"
     >
       <div class="article-manager">
-        <!--<div class="i-layout-page-header">-->
-        <!--<PageHeader class="product_tabs" :title="$route.meta.title" hidden-breadcrumb></PageHeader>-->
-        <!--</div>-->
         <Card :bordered="false" dis-hover class="ivu-mt">
           <Form
             ref="formItem"

template/admin/src/pages/agent/agentManage.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mb-16">
       <Form
         ref="formValidate"
         :model="formValidate"

template/admin/src/pages/app/app/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div :style="bgcolors">
-    <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div style="float: right">
         <Button class="bnt" type="primary" @click="onsubmit('formValidate')">保存</Button>

template/admin/src/pages/app/routine/download/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">
       <div class="flex-wrapper">
         <!-- :src="iframeUrl" -->

template/admin/src/pages/app/wechat/menus/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="article-manager">
-    <div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
+    <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">

template/admin/src/pages/app/wechat/newsCategory/save.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="newsBox">
-    <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 + '/app/wechat/news_category/index' }"
           ><Button icon="ios-arrow-back" size="small" type="text" v-show="$route.params.id">返回</Button></router-link
         >

template/admin/src/pages/app/wechat/reply/follow.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
+    <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">

template/admin/src/pages/app/wechat/user/user.vue

@@ -1,9 +1,7 @@
 <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>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <div class="table_box">

template/admin/src/pages/cms/addArticle/index.vue

@@ -1,16 +1,12 @@
 <template>
   <div class="article-manager">
-    <div class="i-layout-page-header header_top">
-      <div class="i-layout-page-header fl_header">
-        <router-link :to="{ path: $routeProStr + '/cms/article/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
-        >
-        <Divider type="vertical" />
-        <span
-          class="ivu-page-header-title mr20"
-          style="padding: 0"
-          v-text="$route.params.id ? '编辑文章' : '添加文章'"
-        ></span>
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
+        <span>
+          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+        </span>
+        <Divider type="vertical"/>
+        <span class="ivu-page-header-title">{{ $route.params.id ? '编辑文章' : '添加文章' }}</span>
       </div>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">

template/admin/src/pages/division/agent/agreement.vue

@@ -1,9 +1,7 @@
 <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>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Form :label-width="80" @submit.native.prevent>

template/admin/src/pages/division/agent/applyList.vue

@@ -341,7 +341,7 @@ export default {
 .left-wrapper {
   height: 904px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {

template/admin/src/pages/division/agent/index.vue

@@ -398,7 +398,7 @@ export default {
 .left-wrapper {
   height: 904px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {

template/admin/src/pages/division/list/index.vue

@@ -419,7 +419,7 @@ export default {
 .left-wrapper {
   height: 904px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {

template/admin/src/pages/finance/billingRecords/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ive-mt">
-      <div class="ive-mt tabbox">
+    <Card :bordered="false" dis-hover class="ivu-mt">
+      <div class="ivu-mt tabbox">
         <Tabs @on-click="onClickTab" class="mb20">
           <TabPane label="日账单" name="day" />
           <TabPane label="周账单" name="week" />
@@ -280,16 +280,11 @@ export default {
 </script>
 
 <style scoped lang="less">
-/deep/.ivu-page-header,
-/deep/.ivu-tabs-bar {
-  border-bottom: 1px solid #ffffff;
-}
+
 /deep/.ivu-card-body {
   padding: 0;
 }
-/deep/.ivu-tabs-nav {
-  height: 45px;
-}
+
 .tabbox {
   padding: 16px 20px 0px;
 }

template/admin/src/pages/finance/commission/index.vue

@@ -42,7 +42,7 @@
               />
             </FormItem>
           </Col>
-          <Col span="4">
+          <Col >
             <Button type="primary" icon="ios-search" @click="userSearchs">搜索</Button>
             <Button v-auth="['export-userCommission']" class="export" icon="ios-share-outline" @click="exports"
               >导出

template/admin/src/pages/finance/financialRecords/bill/index.vue

@@ -1,9 +1,7 @@
 <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>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Form

template/admin/src/pages/finance/financialRecords/recharge/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mb-16">
       <Form
         ref="formValidate"
         :model="formValidate"

template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue

@@ -600,7 +600,7 @@ export default {
 .left-wrapper {
   height: 904px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {

template/admin/src/pages/marketing/channelCode/codeStatistic.vue

@@ -1,19 +1,11 @@
 <template>
   <div>
-    <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
         <span>
-          <Button
-            class="return"
-            icon="ios-arrow-back"
-            size="small"
-            type="text"
-            @click="$router.go(-1)"
-            :disabled="disabled"
-            >返回</Button
-          >
+          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
         </span>
-        <Divider class="return" type="vertical" />
+        <Divider type="vertical"/>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>

template/admin/src/pages/marketing/channelCode/createCode.vue

@@ -1,15 +1,14 @@
 <template>
   <div>
-    <div class="i-layout-page-header header">
-      <div class="i-layout-page-header fl_header">
-        <span class="">
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
+        <span>
           <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
         </span>
-        <Divider class="" type="vertical" />
-        <span class="ivu-page-header-title mr20" v-text="$route.query.id ? '编辑渠道码' : '添加渠道码'"></span>
+        <Divider type="vertical"/>
+        <span class="ivu-page-header-title">{{ $route.query.id ? '编辑渠道码' : '添加渠道码' }}</span>
       </div>
     </div>
-
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Form :model="formData" :label-width="150" :rules="ruleValidate">
         <FormItem label="二维码名称">
@@ -499,10 +498,6 @@ export default {
   margin: 30px 0 30px 50px;
 }
 
-.fl_header {
-  padding-bottom: 10px;
-}
-
 textarea {
   padding: 5px;
   border-radius: 3px;
@@ -572,10 +567,6 @@ textarea {
   }
 }
 
-.i-layout-page-header {
-  padding-left: 13px;
-}
-
 .labelInput {
   border: 1px solid #dcdee2;
   width: 320px;

template/admin/src/pages/marketing/live/add_goods.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <div class="i-layout-page-header header_top">
-      <div class="i-layout-page-header fl_header">
-        <router-link :to="{ path: $routeProStr + '/marketing/live/live_goods' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
-        >
-        <Divider type="vertical" />
-        <span class="ivu-page-header-title" style="padding: 0">{{ $route.meta.title }}</span>
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
+        <span>
+          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+        </span>
+        <Divider type="vertical"/>
+        <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">

template/admin/src/pages/marketing/live/creat_live.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <div class="i-layout-page-header header_top">
-      <div class="i-layout-page-header fl_header">
-        <router-link :to="{ path: $routeProStr + '/marketing/live/live_room' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
-        >
-        <Divider type="vertical" />
-        <span class="ivu-page-header-title" style="padding: 0">{{ $route.meta.title }}</span>
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
+        <span>
+          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+        </span>
+        <Divider type="vertical"/>
+        <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">

template/admin/src/pages/marketing/lottery/create.vue

@@ -6,7 +6,7 @@
           <TabPane v-for="(item, index) in tabs" :label="item.name" :name="item.type" :key="index" />
         </Tabs>
       </div>
-      <Row type="flex" class="mt30 acea-row row-middle row-center">
+      <Row type="flex" class="mt10 acea-row row-middle row-center">
         <Col span="23">
           <Form
             class="form mt30"

template/admin/src/pages/marketing/point_statistic/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mb-16">
       <dateRadio @selectDate="onSelectDate"></dateRadio>
       <DatePicker
         :editable="false"
@@ -16,14 +16,14 @@
         class="mr20"
       ></DatePicker>
     </Card>
-    <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
+    <cards-data  :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
     <Card :bordered="false" dis-hover>
       <h3>积分使用趋势</h3>
       <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
     </Card>
     <Spin size="large" fix v-if="spinShow"></Spin>
     <div class="code-row-bg">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <Card :bordered="false" dis-hover class="ivu-mt mt10 mr10">
         <div class="acea-row row-between-wrapper">
           <h3 class="header-title">积分来源分析</h3>
           <div class="change-style" @click="echartLeft = !echartLeft">切换样式</div>
@@ -52,7 +52,7 @@
           </Table>
         </div>
       </Card>
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <Card :bordered="false" dis-hover class="ivu-mt mt10">
         <div class="acea-row row-between-wrapper">
           <h3 class="header-title">积分消耗</h3>
           <div class="change-style" @click="echartRight = !echartRight">切换样式</div>
@@ -338,7 +338,6 @@ export default {
 }
 .code-row-bg .ivu-mt {
   width: 100%;
-  margin: 0 5px;
 }
 .ech-box {
   margin-top: 10px;

template/admin/src/pages/marketing/recharge/index.vue

@@ -1076,7 +1076,7 @@ export default {
 .left-wrapper {
   min-width: 213px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {

template/admin/src/pages/marketing/sign/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div :style="bgcolors">
-    <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>
     <div class="box-wrapper">
@@ -867,7 +867,7 @@ export default {
 .left-wrapper {
   min-width: 213px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {
@@ -1149,11 +1149,6 @@ export default {
   // width 80px!important
 }
 
-/deep/.i-layout-page-header {
-  height: 66px;
-  background-color: #fff;
-  border-bottom: 1px solid #e8eaec;
-}
 
 /deep/.ivu-page-header {
   border-bottom: unset;
@@ -1162,14 +1157,7 @@ export default {
   width: 100%;
 }
 
-/deep/.i-layout-page-header {
-  height: 66px;
-  background-color: #fff;
-  border-bottom: 1px solid #e8eaec;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
+
 
 .box-wrapper {
   display: flex;

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <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 + '/marketing/store_bargain/index' }"
           ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
         >

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

@@ -1,27 +1,27 @@
 <template>
   <div>
-    <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
         <span>
-          <Button class="return" icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
         </span>
-        <Divider class="return" type="vertical" />
+        <Divider type="vertical"/>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
     <div>
       <Tabs v-model="currentTab" @on-click="onClickTab">
-        <TabPane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
+        <TabPane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index"/>
       </Tabs>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Form
-        ref="pagination"
-        :model="pagination"
-        :label-width="labelWidth"
-        label-position="right"
-        @submit.native.prevent
+          ref="pagination"
+          :model="pagination"
+          :label-width="labelWidth"
+          label-position="right"
+          @submit.native.prevent
       >
         <Row type="flex" :gutter="24">
           <Col span="6" v-if="type == 1">
@@ -39,29 +39,29 @@
           <Col span="6">
             <FormItem label="搜索：" label-for="title">
               <Input
-                search
-                enter-button
-                v-model="pagination.real_name"
-                placeholder="请输入用户姓名|手机号|UID"
-                @on-search="searchList"
+                  search
+                  enter-button
+                  v-model="pagination.real_name"
+                  placeholder="请输入用户姓名|手机号|UID"
+                  @on-search="searchList"
               />
             </FormItem>
           </Col>
         </Row>
       </Form>
       <Table
-        :columns="type ? thead2 : thead"
-        :data="tbody"
-        ref="table"
-        class="mt25"
-        :loading="loading"
-        highlight-row
-        no-userFrom-text="暂无数据"
-        no-filtered-userFrom-text="暂无筛选结果"
+          :columns="type ? thead2 : thead"
+          :data="tbody"
+          ref="table"
+          class="mt25"
+          :loading="loading"
+          highlight-row
+          no-userFrom-text="暂无数据"
+          no-filtered-userFrom-text="暂无筛选结果"
       >
         <template slot-scope="{ row }" slot="avatar">
           <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
+            <img v-lazy="row.avatar"/>
           </div>
         </template>
         <template slot-scope="{ row }" slot="num">
@@ -78,43 +78,43 @@
       </Table>
       <div class="acea-row row-right page">
         <Page
-          :total="total"
-          :current="pagination.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="pagination.limit"
+            :total="total"
+            :current="pagination.page"
+            show-elevator
+            show-total
+            @on-change="pageChange"
+            :page-size="pagination.limit"
         />
       </div>
     </Card>
     <!-- 详情模态框-->
     <Modal
-      v-model="modals"
-      class="tableBox"
-      scrollable
-      footer-hide
-      closable
-      title="查看详情"
-      :mask-closable="false"
-      width="750"
+        v-model="modals"
+        class="tableBox"
+        scrollable
+        footer-hide
+        closable
+        title="查看详情"
+        :mask-closable="false"
+        width="750"
     >
       <Table
-        ref="selection"
-        :columns="columns2"
-        :data="tabList3"
-        :loading="loading2"
-        no-data-text="暂无数据"
-        highlight-row
-        max-height="600"
-        size="small"
-        no-filtered-data-text="暂无筛选结果"
+          ref="selection"
+          :columns="columns2"
+          :data="tabList3"
+          :loading="loading2"
+          no-data-text="暂无数据"
+          highlight-row
+          max-height="600"
+          size="small"
+          no-filtered-data-text="暂无筛选结果"
       >
         <template slot-scope="{ row }" slot="nickname">
           <span> {{ row.nickname + ' / ' + row.uid }}</span>
         </template>
         <template slot-scope="{ row }" slot="avatar">
           <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
+            <img v-lazy="row.avatar"/>
           </div>
         </template>
         <template slot-scope="{ row }" slot="action">
@@ -137,7 +137,7 @@ import {
 
 export default {
   name: 'index',
-  components: { cardsData },
+  components: {cardsData},
   data() {
     return {
       modals: false,
@@ -328,14 +328,14 @@ export default {
       if (this.type == 0) {
         getbargainStatisticsPeople(this.id, this.pagination).then((res) => {
           this.loading = false;
-          const { count, list } = res.data;
+          const {count, list} = res.data;
           this.total = count;
           this.tbody = list;
         });
       } else {
         getbargainStatisticsOrder(this.id, this.pagination).then((res) => {
           this.loading = false;
-          const { count, list } = res.data;
+          const {count, list} = res.data;
           this.total = count;
           this.tbody = list;
         });
@@ -361,15 +361,15 @@ export default {
       this.modals = true;
       this.rows = row;
       bargainUserInfoApi(row.id)
-        .then(async (res) => {
-          let data = res.data;
-          this.tabList3 = data.list;
-          this.loading = false;
-        })
-        .catch((res) => {
-          this.loading = false;
-          this.$Message.error(res.msg);
-        });
+          .then(async (res) => {
+            let data = res.data;
+            this.tabList3 = data.list;
+            this.loading = false;
+          })
+          .catch((res) => {
+            this.loading = false;
+            this.$Message.error(res.msg);
+          });
     },
   },
 };
@@ -411,12 +411,7 @@ export default {
   margin-bottom: 6px;
 }
 
-.i-layout-page-header {
-  padding-left: 5px;
-  padding-bottom: 1px;
-  margin-bottom: 10px;
-}
-/deep/ .ivu-tabs-nav-scroll{
+/deep/ .ivu-tabs-nav-scroll {
   background-color: #fff;
   padding-top: 5px;
 }
@@ -427,9 +422,10 @@ export default {
   border-radius: 4px;
   cursor: pointer;
 
-  img {
-    width: 100%;
-    height: 100%;
-  }
+img {
+  width: 100%;
+  height: 100%;
+}
+
 }
 </style>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <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 + '/marketing/store_combination/index' }"
           ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
         >

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

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
         <span>
-          <Button class="return" icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
         </span>
-        <Divider class="return" type="vertical" />
+        <Divider type="vertical" />
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
@@ -406,11 +406,6 @@ export default {
   margin-bottom: 6px;
 }
 
-.i-layout-page-header {
-  padding-left: 5px;
-  padding-bottom 1px
-  margin-bottom 10px
-}
 /deep/ .ivu-tabs-nav-scroll{
   background-color: #fff;
   padding-top 5px

template/admin/src/pages/marketing/storeCouponIssue/create.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <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 + '/marketing/store_coupon_issue/index' }"
           ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
         >

template/admin/src/pages/marketing/storeIntegral/create.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <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 + '/marketing/store_integral/index' }"
           ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
         >

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

@@ -1,16 +1,12 @@
 <template>
   <div>
-    <div class="i-layout-page-header header_top">
-      <div class="i-layout-page-header fl_header">
-        <router-link :to="{ path: $routeProStr + '/marketing/store_seckill/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
-        >
-        <Divider type="vertical" />
-        <span
-          class="ivu-page-header-title mr20"
-          style="padding: 0"
-          v-text="$route.params.id ? '编辑秒杀商品' : '添加秒杀商品'"
-        ></span>
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
+        <span>
+          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+        </span>
+        <Divider type="vertical"/>
+        <span class="ivu-page-header-title">{{ $route.params.id ? '编辑秒杀商品' : '添加秒杀商品' }}</span>
       </div>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">

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

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
+      <div class="fl_header">
         <span>
-          <Button class="return" icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
         </span>
-        <Divider class="return" type="vertical" />
+        <Divider type="vertical"/>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
@@ -262,11 +262,6 @@ 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;
@@ -285,7 +280,4 @@ export default {
 .return {
   margin-bottom: 6px;
 }
-.i-layout-page-header {
-  padding-left: 13px;
-}
 </style>

template/admin/src/pages/notify/smsConfig/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="i-layout-page-header pt10">
+    <div class="i-layout-page-header header-title">
         <span class="ivu-page-header-title" v-if="!isShowList">短信账户</span>
         <div v-if="isShowList" class="acea-row row-between-wrapper picTxt">
           <div slot="content">

template/admin/src/pages/product/productReply/index.vue

@@ -1,12 +1,10 @@
 <template>
   <div class="article-manager">
-    <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
         <router-link :to="{ path: $routeProStr + '/product/product_list' }" v-if="$route.params.id"
           ><Button icon="ios-arrow-back" size="small" class="mr20">返回</Button></router-link
         >
         <span class="ivu-page-header-title mr20">商品评论管理</span>
-      </div>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Form ref="formValidate" :model="formValidate" :label-width="75" label-position="left" @submit.native.prevent>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="agreemant">
-    <Card :bordered="false" dis-hover class="ivu-mt" :padding="0">
+    <Card :bordered="false" dis-hover class="ivu-mt">
       <div class="new_card_pd">
         <Tabs v-model="currentTab" @on-click="changeTab">
           <TabPane :label="item.label" :name="item.value.toString()" v-for="(item, index) in headerList" :key="index" />
@@ -8,7 +8,7 @@
       </div>
     </Card>
 
-    <Row class="mb10 content">
+    <Row class="content">
       <Col span="16">
         <WangEditor style="width: 100%" :content="formValidate.content" @editorContent="getEditorContent"></WangEditor>
       </Col>
@@ -107,12 +107,10 @@ export default {
 <style lang="stylus" scoped>
 .agreemant {
   background-color: #fff;
-  padding: 5px 15px ;
-  margin-top 10px;
 }
 
 .content {
-  padding: 10px 0px;
+  padding: 10px 16px;
 }
 
 .ifam {

template/admin/src/pages/setting/devise/diyIndex.vue

@@ -881,6 +881,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
+
 .ysize {
   background-size: 100%;
 }

template/admin/src/pages/setting/devise/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="i-layout-page-header">
-      <span class="ivu-page-header-title mr20">页面装修</span>
+    <div class="i-layout-page-header header-title">
+      <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div>
         <div style="float: right" v-if="cardShow == 1 || cardShow == 2">
           <Button class="bnt" type="primary" @click="submit" :loading="loadingExist">保存</Button>
@@ -513,9 +513,6 @@ export default {
 }
 
 /deep/.i-layout-page-header {
-  height: 66px;
-  background-color: #fff;
-  border-bottom: 1px solid #e8eaec;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -616,7 +613,7 @@ export default {
 
 .left-wrapper {
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .picCon {

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

@@ -16,7 +16,7 @@
             <Input v-model="formValidate.keyword" placeholder="请输入等级名称" style="width: 200px" />
           </div>
           <Button type="primary" @click="search">搜索</Button>
-          <Button type="success" icon="md-add" @click="groupAdd()" class="ml20">添加数据</Button>
+          <Button type="success" icon="md-add" @click="groupAdd()" class="ml20">添加等级</Button>
         </div>
       </div>
       <Row type="flex">
@@ -454,7 +454,7 @@ export default {
 .left-wrapper {
   height: 904px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {

template/admin/src/pages/setting/multiLanguage/langList.vue

@@ -46,11 +46,12 @@
         </Row>
       </Form>
     </Card>
-    <Alert class="mt10">
+    <Alert class="mt10" closable="true">
       使用说明
-      <template slot="desc"
-        >添加用户端页面语言，添加完成之后状态码为中文文字，前端页面使用 $t(`xxxx`)，js文件中使用 this.t(`xxxx`) 或者使用
-        that.t(`xxxx`)<br />添加后端接口语言，添加完成之后状态码为6位数字，后台抛错或者控制器返回文字的时候直接填写状态码数字
+      <template slot="desc" >
+        1、前端页面：添加用户端页面语言，添加完成之后状态码为中文文字，前端页面使用 $t(`xxxx`)，js文件中使用 this.t(`xxxx`) 或者使用
+        that.t(`xxxx`)<br />
+        2、后端接口：添加后端接口语言，添加完成之后状态码为6位数字，后台抛错或者控制器返回文字的时候直接填写状态码数字
       </template>
     </Alert>
     <Card :bordered="false" dis-hover>

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

@@ -26,10 +26,10 @@
           >
         </Col>
       </Row>
-      <Alert v-if="currentTab == 1">
+      <Alert v-if="currentTab == 1" closable="true">
         <template slot="desc">
-          登录微信公众号后台，选择模版消息，将模版消息的所在行业修改副行业为《其他/其他》<br />登录微信小程序后台，基本设置，服务类目增加《生活服务
-          > 百货/超市/便利店》
+          1、公众号：登录微信公众号后台，选择模版消息，将模版消息的所在行业修改副行业为《其他/其他》<br />
+          2、小程序：登录微信小程序后台，基本设置，服务类目增加《生活服务> 百货/超市/便利店》
         </template>
       </Alert>
       <Table

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

@@ -1,5 +1,8 @@
 <template>
   <div>
+    <div class="i-layout-page-header header-title" v-if="!headerList.length">
+      <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">
@@ -224,8 +227,8 @@ export default {
 }
 
 .fromBox {
-  min-height: 600px;
-  margin-top 0px !important ;
+  min-height: calc(100vh - 200px);
+  margin-top: 0px !important ;
 }
 .article-manager /deep/ .ivu-form-item{
   margin-bottom: 20px !important;

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

@@ -1,28 +1,6 @@
 <template>
   <div>
-    <!-- <div class="i-layout-page-header">
-      <PageHeader
-        class="product_tabs"
-        :title="$route.meta.title"
-        hidden-breadcrumb
-      >
-        <div slot="title">
-          <div style="float: left">
-            <span v-text="$route.meta.title" class="mr20"></span>
-          </div>
-          <div style="float: right">
-            <Button
-              class="bnt"
-              type="primary"
-              @click="submit"
-              :loading="loadingExist"
-              >保存</Button
-            >
-          </div>
-        </div>
-      </PageHeader>
-    </div> -->
-    <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div>
         <div style="float: right">
@@ -248,9 +226,6 @@ export default {
 }
 
 /deep/.i-layout-page-header {
-  height: 66px;
-  background-color: #fff;
-  border-bottom: 1px solid #e8eaec;
   display: flex;
   align-items: center;
   justify-content: space-between;

template/admin/src/pages/statistic/user/components/userInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card :bordered="false" dis-hover class="ivu-mt">
+  <Card :bordered="false" dis-hover class="ivu-mt-16">
     <div class="acea-row row-between-wrapper">
       <div class="header-title mb20">
         用户概况

template/admin/src/pages/statistic/user/components/userRegion.vue

@@ -1,7 +1,7 @@
 <template>
   <Row :gutter="16">
     <Col :xs="24" :sm="24" :md="24" :lg="18">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <Card :bordered="false" dis-hover class="ivu-mt-16">
         <div class="acea-row row-between-wrapper">
           <div class="header-title mb20">用户地域分布</div>
         </div>
@@ -20,7 +20,7 @@
       </Card>
     </Col>
     <Col :xs="24" :sm="24" :md="24" :lg="6">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <Card :bordered="false" dis-hover class="ivu-mt-16">
         <div class="acea-row row-between-wrapper">
           <div class="header-title mb20">用户性别比例</div>
         </div>

template/admin/src/pages/statistic/user/components/wechetInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card :bordered="false" dis-hover class="ivu-mt">
+  <Card :bordered="false" dis-hover class="ivu-mt-16">
     <div class="acea-row row-between-wrapper">
       <div class="header-title mb20">
         公众号用户概括

template/admin/src/pages/statistic/user/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="article-manager">
-    <div class="i-layout-page-header pt10">
+    <div class="i-layout-page-header">
       <Form ref="formInline" :model="formInline" inline>
         <FormItem class="mr20">
           用户渠道:
@@ -109,12 +109,7 @@ export default {
 </script>
 
 <style scoped>
-.pt10 {
-  padding-top: 10px;
-}
-.i-layout-page-header {
-  margin: 10px 0 10px 0;
-}
+
 .ivu-form-item {
   padding-bottom: 10px;
   margin-bottom: 0;

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <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 + '/system/config/system_config_tab/index' }"
           ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
         >

template/admin/src/pages/system/crontab/index.vue

@@ -1,9 +1,10 @@
 <template>
   <Card :bordered="false" dis-hover>
-    <Alert>
+    <Alert closable="true">
       <template slot="desc">
-        如果使用命令启动定时任务，修改定时任务之后需要重新启动命令才能生效<br />
-        使用接口访问情况下，修改定时任务不需要重新启动，接口地址 https://您的域名/api/crontab/run
+        启动定时任务两种方式：<br />
+        1、使用命令启动：php think timer start --d<br />
+        2、使用接口触发定时任务，接口地址 https://您的域名/api/crontab/run
       </template>
     </Alert>
     <Button type="primary" @click="addTask">添加定时任务</Button>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <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 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
         >
@@ -346,9 +346,6 @@ 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

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

@@ -1,22 +1,6 @@
 <template>
   <div>
-    <!-- <div class="i-layout-page-header">
-			<PageHeader
-					class="product_tabs"
-					:title="$route.meta.title"
-					hidden-breadcrumb
-			>
-				<div slot="title">
-					<div style="float: left;">
-						<span v-text="$route.meta.title" class="mr20"></span>
-					</div>
-					<div style="float: right;">
-						<Button class="bnt" type="primary" @click="save">保存</Button>
-					</div><strong></strong>
-				</div>
-			</PageHeader>
-		</div> -->
-    <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div>
         <div style="float: right">
@@ -25,8 +9,8 @@
       </div>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row class="ivu-mt box-wrapper">
-        <Col :xs="24" :sm="24" :md="6" :lg="3" class="left-wrapper">
+      <Row class="box-wrapper">
+        <Col :xs="24" :sm="24" :md="6" :lg="3">
           <div class="left_box">
             <div class="left_cont" :class="pageId == 1 ? 'on' : ''" @click="menu(1)">网站LOGO</div>
             <div class="left_cont" :class="pageId == 'pc_home_banner' ? 'on' : ''" @click="menu('pc_home_banner')">
@@ -493,7 +477,9 @@ export default {
 /deep/ .ivu-menu-vertical.ivu-menu-light:after {
   display: none;
 }
-
+.ivu-mt {
+  min-height: calc(100vh - 280px);
+}
 .nofonts {
   text-align: center;
   line-height: 137px;
@@ -638,12 +624,6 @@ export default {
   }
 }
 
-.left-wrapper {
-  // height 904px
-  background: #fff;
-  border-right: 1px solid #dcdee2;
-}
-
 .on {
   color: #1890ff;
   background-color: #f0faff;
@@ -868,9 +848,6 @@ export default {
 }
 
 /deep/.i-layout-page-header {
-  height: 66px;
-  background-color: #fff;
-  border-bottom: 1px solid #e8eaec;
   display: flex;
   align-items: center;
   justify-content: space-between;

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

@@ -1,6 +1,6 @@
 <template>
   <div :style="bgcolors">
-    <div class="i-layout-page-header">
+    <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div>
         <div style="float: right">
@@ -1491,7 +1491,7 @@ export default {
 .left-wrapper {
   min-width: 213px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {
@@ -1773,12 +1773,6 @@ export default {
   // width 80px!important
 }
 
-/deep/.i-layout-page-header {
-  height: 66px;
-  background-color: #fff;
-  border-bottom: 1px solid #e8eaec;
-}
-
 /deep/.ivu-page-header {
   border-bottom: unset;
   position: fixed;
@@ -1787,9 +1781,6 @@ export default {
 }
 
 /deep/.i-layout-page-header {
-  height: 66px;
-  background-color: #fff;
-  border-bottom: 1px solid #e8eaec;
   display: flex;
   align-items: center;
   justify-content: space-between;

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

@@ -2,10 +2,10 @@
   <div>
     <div class="i-layout-page-header header-title">
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
-        <div class="clear_tit">
+        <span class="clear_tit">
           <Icon type="md-information-circle" color="#ED4014" />
           <span>清除数据请谨慎，清除就无法恢复哦！</span>
-        </div>
+        </span>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Row type="flex" :gutter="24">
@@ -169,12 +169,11 @@ export default {
 
 <style scoped lang="stylus">
 .clear_tit
-    display flex
     align-items center
+    margin: 15px
     span
         font-size 14px
         color #ED4014
-        margin: 15px 0
 .clear_box
     border 1px solid #DADFE6
     border-radius 3px

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

@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="i-layout-page-header">
-        <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
-    </div>
     <Row type="flex">
       <Col span="24">
         <div class="index_from page-account-container">
@@ -103,9 +100,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.i-layout-page-header{
-  padding: 18px 32px;
-}
+
 .maxInpt{
     max-width: 400px;
     margin-left: auto;

template/admin/src/pages/user/grade/right/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
+    <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">

template/admin/src/pages/user/label/index.vue

@@ -276,7 +276,7 @@ export default {
 .left-wrapper {
   height: 904px;
   background: #fff;
-  border-right: 1px solid #dcdee2;
+  border-right: 1px solid #f2f2f2;
 }
 
 .menu-item {

template/admin/src/styles/style.css

@@ -514,9 +514,19 @@ body {
   padding: 7px 32px 0 32px;
 }
 .header-title {
-  padding: 10px 16px;
+  padding: 10px 20px;
   border-bottom: 1px solid #f2f2f2;
   margin-bottom: 10px;
+  border-radius:5px;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: justify;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
 }
 .ivu-page-header-title {
   display: inline-block;
@@ -527,6 +537,12 @@ body {
 .main .content-wrapper {
   padding-top: 0;
 }
+.left-wrapper{
+  height: calc(100vh - 120px);
+  background: #fff;
+  border-right: 1px solid #f2f2f2;
+
+}
 .ivu-tabs-bar {
   margin-bottom: 0;
 }