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

template/admin/src/components/main/components/side-menu/side-menu.vue

@@ -65,8 +65,8 @@
       </div>
     </div>
 
-    <div class="menu-collapsed" v-show="collapsed" :list="menuList">
-      <template v-for="item in menuList">
+    <div class="menu-collapsed" v-show="collapsed">
+      <template v-for="item in menusName">
         <collapsed-menu
           v-if="item.children && item.children.length > 0"
           @on-click="collHandleSelect"
@@ -111,12 +111,6 @@ export default {
     siderTrigger,
   },
   props: {
-    menuList: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
     collapsed: {
       type: Boolean,
     },
@@ -150,7 +144,7 @@ export default {
     };
   },
   computed: {
-    ...mapState('menus', ['openMenus']),
+    ...mapState('menus', ['menusName']),
     ...mapState('menu', ['activePath', 'openNames', 'header', 'headerName', 'sider', 'oneMenuName']),
     ...mapGetters('menu', ['filterSider']),
 
@@ -165,12 +159,8 @@ export default {
         this.$refs.childMenu.updateActiveName();
       });
     },
-    oneMenuName() {
-      this.$nextTick(() => {});
-    },
     activePath() {
       this.$nextTick(() => {
-        console.log();
         this.$refs.childMenu.updateOpened();
         this.$refs.childMenu.updateActiveName();
       });
@@ -188,13 +178,10 @@ export default {
   mounted() {},
   methods: {
     handleCollpasedChange(state) {
-      console.log(state);
-      // this.collapsed = state;
       this.$emit('on-coll-change', state);
-      // setCookies('collapsed', state);
     },
     handleSelect(name, type) {
-      this.menuList.map((e) => {
+      this.menusName.map((e) => {
         if (e.path === name) {
           this.turnToPage(this.getChilden(e));
         }
@@ -210,14 +197,6 @@ export default {
     handleChildSelect(name) {
       this.turnToPage(name);
     },
-    jump(data) {
-      if (data[0].children) {
-        this.jump(data[0].children);
-      } else {
-        this.turnToPage(data[0].path);
-      }
-    },
-
     collHandleSelect(name) {
       this.turnToPage(name);
     },
@@ -238,10 +217,7 @@ export default {
         query,
       });
     },
-    openNameData(n) {
-      // this.openedNames = n
-      // this.$store.commit('menus/getopenMenus', n)
-    },
+    openNameData(n) {},
     openChildNameData(e) {},
   },
 };
@@ -382,8 +358,8 @@ export default {
           padding-left: 23px !important;
         }
         .ivu-menu-item {
-        padding-left: 35px !important;
-      }
+          padding-left: 35px !important;
+        }
       }
     }
     .ivu-menu-vertical .ivu-menu-submenu-title {

template/admin/src/components/main/main.vue

@@ -37,7 +37,6 @@
           :active-name="$route.path"
           :collapsed="collapsed"
           @on-select="turnToPage"
-          :menu-list="menuList"
         >
           <!-- 需要放在菜单上面的内容，如Logo，写在side-menu标签内部，如下 -->
         </side-menu>
@@ -145,20 +144,6 @@ export default {
       ];
       return list;
     },
-    menuList() {
-      let menus = this.$store.state.menus.menusName;
-      let newArray = [];
-      menus.forEach((now, index) => {
-        newArray[index] = now;
-        if (newArray[index].children && now.children) {
-          newArray[index].children = now.children.filter((item) => {
-            return !item.auth;
-          });
-        }
-      });
-      return newArray;
-      // return this.$store.state.menus.menusName
-    },
     local() {
       return this.$store.state.app.local;
     },
@@ -237,8 +222,6 @@ export default {
   watch: {
     $route(newRoute) {
       this.headMenuNoShow = this.$route.meta.fullScreen;
-      let openNames = getMenuopen(newRoute, this.menuList);
-      this.$store.commit('menus/setopenMenus', openNames);
       const { name, query, params, meta } = newRoute;
       this.addTag({
         route: { name, query, params, meta },

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/product/productAdd/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="" id="shopp-manager">
-    <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 + '/product/product_list' }"
           ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
         >

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/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

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,11 @@ body {
   background-color: #fff;
   padding: 7px 32px 0 32px;
 }
+.header-title {
+  padding: 10px 16px;
+  border-bottom: 1px solid #f2f2f2;
+  margin-bottom: 10px;
+}
 .ivu-page-header-title {
   display: inline-block;
   color: #17233d;