登录页100%+首页95%+列表页100%

src/components/login-form/login-form.vue

@@ -84,15 +84,18 @@ export default {
   background-size: 20px 20px;
   background-position: 15px;
   height: 40px;
+
 }
 #password{
   background: url(../../assets/img/Key.png) no-repeat left center;
   background-size: 20px 20px;
   background-position: 15px;
+
 }
 .formLine{
   .formElement{
-    border:1px solid rgba(223, 223, 223, 1);
+    // background:rgba(1,167,193,1);
+        border:0.5px solid #DFDFDF;
     width: 295px;
     height: 40px;
     display: flex;
@@ -104,6 +107,14 @@ export default {
       height: 40px;
     }
   }
+  .ivu-btn-primary{
+    height: 40px;
+    font-size:18px;
+    font-family:'Microsoft YaHei';
+    font-weight:400;
+    color:rgba(255,255,255,1);
+    line-height:13px;
+  }
   .formOther{
     margin-bottom: 15px;
   }

src/components/main/components/navbar/index.vue

@@ -29,7 +29,7 @@
                 </Dropdown-menu>
           </Dropdown>
         </div>
-        <a href="#"  name="logout">退出</a>
+        <a href="#" @click="logout">退出</a>
       </div>
     </div>
   </div>
@@ -49,6 +49,7 @@ export default {
       'handleLogOut'
     ]),
     logout () {
+      this.$Message.error('您已被登出！')
       this.handleLogOut().then(() => {
         this.$router.push({
           name: 'login'
@@ -83,15 +84,17 @@ export default {
     }
   }
   .center{
-    flex:5;
-    color: white;
-    font-size: 16px;
+    flex:6;
+    font-size:15px;
+    font-family:'Microsoft YaHei';
+    font-weight:600;
+    color:rgba(255,255,255,1);
     line-height: 50px;
-    margin-left: 20px;
   }
   .right{
     flex:1;
     display: flex;
+    height: 50px;
     // justify-content:center;
     align-items: center;
     img{

src/components/main/components/side-menu/collapsed-menu.vue

@@ -1,6 +1,6 @@
 <template>
   <Dropdown ref="dropdown" @on-click="handleClick" :class="hideTitle ? '' : 'collased-menu-dropdown'" :transfer="hideTitle" :placement="placement">
-    <a class="drop-menu-a" type="text" @mouseover="handleMousemove($event, children)" :style="{textAlign: !hideTitle ? 'left' : ''}"><common-icon :size="rootIconSize" :color="textColor" :type="parentItem.icon"/><span class="menu-title" v-if="!hideTitle">{{ showTitle(parentItem) }}</span><Icon style="float: right;" v-if="!hideTitle" type="ios-arrow-forward" :size="16"/></a>
+    <a class="drop-menu-a" type="text" @mouseover="handleMousemove($event, children)" :style="{textAlign: !hideTitle ? 'left' : ''}"><common-icon :size="rootIconSize" :color="textColor" :type="parentItem.icon"/><span class="menu-title" v-if="!hideTitle" >{{ showTitle(parentItem) }}</span><Icon style="float: right;" v-if="!hideTitle" type="ios-arrow-forward" :size="16"/></a>
     <DropdownMenu ref="dropdown" slot="list">
       <template v-for="child in children">
         <collapsed-menu v-if="showChildren(child)" :icon-size="iconSize" :parent-item="child" :key="`drop-${child.name}`"></collapsed-menu>

src/components/main/components/side-menu/side-menu.less

@@ -1,11 +1,22 @@
 .side-menu-wrapper{
   user-select: none;
   // ---------------------------------------------------------------
-
   padding:10px 30px;
+  .ivu-menu-item,.ivu-menu-submenu{
+    color: #3D8EFE;
+  }
+  .ivu-menu-submenu>.ivu-menu>.ivu-menu-item{
+    color: grey;
+  }
   // .ivu-menu-item{
   //   padding-left: 10px!important;
   // }
+  .ivu-menu-submenu>.ivu-menu>.ivu-menu-item-selected::before{
+    content:'';
+    border-left: 3px solid #3D8EFE;
+    margin-left: -56px;
+    margin-right: 56px;
+  }
   .ivu-menu-item-selected{
     background: #3D8EFE;
     border-radius: 10px;
@@ -13,12 +24,12 @@
     margin: 10px 0;
     color: white;
     padding-left: 5px;
-    border-left: 2px solid #3D8EFE;
   }
-  .side-menu-wrapper .ivu-menu-light.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu){
-    background: #3D8EFE;
-    border-radius: 10px;
-    color: white;
+  .ivu-menu-item-selected::before{
+    content:'';
+    border-left: 3px solid #3D8EFE;
+    margin-left: -42px;
+    margin-right: 42px;
   }
   .ivu-menu-light.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu){
     background: #3D8EFE;
@@ -32,6 +43,12 @@
     padding-left: 8px!important;
     margin-left: 20px;
   }
+  .ivu-menu-vertical>.ivu-menu-submenu>.ivu-menu-item-selected::before{
+        content:'';
+        border-left: 3px solid #3D8EFE;
+        margin-left: -50px;
+        margin-right: 50px;
+  }
   .ivu-menu-light.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu):after{
     background: none;
   }
@@ -39,18 +56,9 @@
     padding: 8px 13px;
     margin: 10px 0;
   }
-// .ivu-menu-submenu > .ivu-menu {
-//   padding: 10px!important;
-// }
-// .ivu-menu-submenu > .ivu-menu > .ivu-menu-item
-// .ivu-menu-light.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu) {
-//   background: #3D8EFE;
-//   border-radius: 10px;
-// }
 // ---------------------------------------------------------------
   .menu-collapsed{
     padding-top: 10px;
-
     .ivu-dropdown{
       width: 100%;
       .ivu-dropdown-rel a{
@@ -65,7 +73,7 @@
       .ivu-tooltip-popper .ivu-tooltip-content{
         .ivu-tooltip-arrow{
           // border-right-color: #fff;
-          border-right-color:blue;
+          // border-right-color:blue;
         }
         .ivu-tooltip-inner{
           background: #fff;

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

@@ -5,8 +5,9 @@
     <Menu ref="menu" v-show="!collapsed" :active-name="activeName" :open-names="openedNames" :accordion="accordion" :theme="theme" width="auto" @on-select="handleSelect">
       <template v-for="item in menuList">
         <template v-if="item.children && item.children.length === 1">
-          <side-menu-item v-if="showChildren(item)" :key="`menu-${item.name}`" :parent-item="item"></side-menu-item>
-          <menu-item v-else :name="getNameOrHref(item, true)" :key="`menu-${item.children[0].name}`"><common-icon :type="item.children[0].icon || ''"/><span>{{ showTitle(item.children[0]) }}</span></menu-item>
+            <side-menu-item v-if="showChildren(item)" :key="`menu-${item.name}`" :parent-item="item"></side-menu-item>
+            <menu-item v-else :name="getNameOrHref(item, true)" :key="`menu-${item.children[0].name}`"><common-icon :type="item.children[0].icon || ''"/><span
+            >{{ showTitle(item.children[0]) }}</span></menu-item>
         </template>
         <template v-else>
           <side-menu-item v-if="showChildren(item)" :key="`menu-${item.name}`" :parent-item="item"></side-menu-item>

src/components/main/main.less

@@ -55,6 +55,8 @@
     .ivu-layout-sider-children{
       width: 210px;
       // overflow-y: scroll;
+      overflow-y: auto;
+      // padding: 0 0.1rem;
       // margin-right: -18px;
     }
   }

src/index.less

@@ -1,11 +1,6 @@
 @import '~iview/src/styles/index.less';
 
 @menu-dark-title: #001529;
-// @menu-dark-title: white;
 @menu-dark-active-bg: #000c17;
-// @menu-dark-active-bg: rgba(61,142,254,1);;
-
-// @layout-sider-background: #001529;
-// @layout-sider-background: rgba(61,142,254,1);
 @layout-sider-background: white;
 

src/locale/lang/zh-CN.js

@@ -24,9 +24,9 @@ export default {
   level_2_2: 'Level-2-2',
   level_2_2_1: 'Level-2-2-1',
   level_2_2_2: 'Level-2-2-2',
-  excel: 'Excel',
-  'upload-excel': '上传excel',
-  'export-excel': '导出excel',
+  excel: '统计信息',
+  'upload-excel': '月报',
+  'export-excel': '日报',
   tools_methods_page: '工具函数',
   drag_list_page: '拖拽列表',
   i18n_page: '多语言',

src/router/routers.js

@@ -1,5 +1,5 @@
 import Main from '@/components/main'
-import parentView from '@/components/parent-view'
+// import parentView from '@/components/parent-view'
 
 /**
  * iview-admin中meta除了原生参数外可配置的参数:
@@ -50,26 +50,6 @@ export default [
       }
     ]
   },
-  // {
-  //   path: '/BasicInfo',
-  //   name: 'BasicInfo',
-  //   meta: {
-  //     icon: 'md-home',
-  //     title: '基本信息'
-  //   },
-  //   component: Main,
-  //   children: [
-  //     {
-  //       path: 'Student_management',
-  //       name: 'Student_management',
-  //       meta: {
-  //         icon: 'logo-buffer',
-  //         title: '学员管理'
-  //       },
-  //       component: () => import('@/view/manager/student.vue')
-  //     }
-  //   ]
-  // },
   {
     path: '/message',
     name: 'message',
@@ -218,41 +198,41 @@ export default [
       // }
     ]
   },
-  {
-    path: '/update',
-    name: 'update',
-    meta: {
-      icon: 'md-cloud-upload',
-      title: '数据上传'
-    },
-    component: Main,
-    children: [
-      {
-        path: 'update_table_page',
-        name: 'update_table_page',
-        meta: {
-          icon: 'ios-document',
-          title: '上传Csv'
-        },
-        component: () => import('@/view/update/update-table.vue')
-      },
-      {
-        path: 'update_paste_page',
-        name: 'update_paste_page',
-        meta: {
-          icon: 'md-clipboard',
-          title: '粘贴表格数据'
-        },
-        component: () => import('@/view/update/update-paste.vue')
-      }
-    ]
-  },
+  // {
+  //   path: '/update',
+  //   name: 'update',
+  //   meta: {
+  //     icon: 'md-cloud-upload',
+  //     title: '数据上传'
+  //   },
+  //   component: Main,
+  //   children: [
+  //     {
+  //       path: 'update_table_page',
+  //       name: 'update_table_page',
+  //       meta: {
+  //         icon: 'ios-document',
+  //         title: '上传Csv'
+  //       },
+  //       component: () => import('@/view/update/update-table.vue')
+  //     },
+  //     {
+  //       path: 'update_paste_page',
+  //       name: 'update_paste_page',
+  //       meta: {
+  //         icon: 'md-clipboard',
+  //         title: '粘贴表格数据'
+  //       },
+  //       component: () => import('@/view/update/update-paste.vue')
+  //     }
+  //   ]
+  // },
   {
     path: '/excel',
     name: 'excel',
     meta: {
       icon: 'ios-stats',
-      title: 'EXCEL导入导出'
+      title: '统计信息'
     },
     component: Main,
     children: [
@@ -261,7 +241,7 @@ export default [
         name: 'upload-excel',
         meta: {
           icon: 'md-add',
-          title: '导入EXCEL'
+          title: '月报'
         },
         component: () => import('@/view/excel/upload-excel.vue')
       },
@@ -270,7 +250,7 @@ export default [
         name: 'export-excel',
         meta: {
           icon: 'md-download',
-          title: '导出EXCEL'
+          title: '日报'
         },
         component: () => import('@/view/excel/export-excel.vue')
       }
@@ -373,66 +353,66 @@ export default [
       }
     ]
   },
-  {
-    path: '/multilevel',
-    name: 'multilevel',
-    meta: {
-      icon: 'md-menu',
-      title: '多级菜单'
-    },
-    component: Main,
-    children: [
-      {
-        path: 'level_2_1',
-        name: 'level_2_1',
-        meta: {
-          icon: 'md-funnel',
-          title: '二级-1'
-        },
-        component: () => import('@/view/multilevel/level-2-1.vue')
-      },
-      {
-        path: 'level_2_2',
-        name: 'level_2_2',
-        meta: {
-          access: ['super_admin'],
-          icon: 'md-funnel',
-          showAlways: true,
-          title: '二级-2'
-        },
-        component: parentView,
-        children: [
-          {
-            path: 'level_2_2_1',
-            name: 'level_2_2_1',
-            meta: {
-              icon: 'md-funnel',
-              title: '三级'
-            },
-            component: () => import('@/view/multilevel/level-2-2/level-2-2-1.vue')
-          },
-          {
-            path: 'level_2_2_2',
-            name: 'level_2_2_2',
-            meta: {
-              icon: 'md-funnel',
-              title: '三级'
-            },
-            component: () => import('@/view/multilevel/level-2-2/level-2-2-2.vue')
-          }
-        ]
-      },
-      {
-        path: 'level_2_3',
-        name: 'level_2_3',
-        meta: {
-          icon: 'md-funnel',
-          title: '二级-3'
-        },
-        component: () => import('@/view/multilevel/level-2-3.vue')
-      }
-    ]
-  },
+  // {
+  //   path: '/multilevel',
+  //   name: 'multilevel',
+  //   meta: {
+  //     icon: 'md-menu',
+  //     title: '多级菜单'
+  //   },
+  //   component: Main,
+  //   children: [
+  //     {
+  //       path: 'level_2_1',
+  //       name: 'level_2_1',
+  //       meta: {
+  //         icon: 'md-funnel',
+  //         title: '二级-1'
+  //       },
+  //       component: () => import('@/view/multilevel/level-2-1.vue')
+  //     },
+  //     {
+  //       path: 'level_2_2',
+  //       name: 'level_2_2',
+  //       meta: {
+  //         access: ['super_admin'],
+  //         icon: 'md-funnel',
+  //         showAlways: true,
+  //         title: '二级-2'
+  //       },
+  //       component: parentView,
+  //       children: [
+  //         {
+  //           path: 'level_2_2_1',
+  //           name: 'level_2_2_1',
+  //           meta: {
+  //             icon: 'md-funnel',
+  //             title: '三级'
+  //           },
+  //           component: () => import('@/view/multilevel/level-2-2/level-2-2-1.vue')
+  //         },
+  //         {
+  //           path: 'level_2_2_2',
+  //           name: 'level_2_2_2',
+  //           meta: {
+  //             icon: 'md-funnel',
+  //             title: '三级'
+  //           },
+  //           component: () => import('@/view/multilevel/level-2-2/level-2-2-2.vue')
+  //         }
+  //       ]
+  //     },
+  //     {
+  //       path: 'level_2_3',
+  //       name: 'level_2_3',
+  //       meta: {
+  //         icon: 'md-funnel',
+  //         title: '二级-3'
+  //       },
+  //       component: () => import('@/view/multilevel/level-2-3.vue')
+  //     }
+  //   ]
+  // },
   {
     path: '/argu',
     name: 'argu',

src/view/login/login.less

@@ -44,5 +44,7 @@
   .ivu-card{
     width: 329px;
     height: 300px;
+    border-radius: 10px;
+    
   }
 }

src/view/login/login.vue

@@ -6,7 +6,7 @@
    <div class="login">
       <h1>欢迎，登陆青鸽管家！</h1>
     <div class="login-con">
-      <Card :bordered="false">
+      <Card shadow  :bordered="false">
         <div class="form-con">
           <login-form @on-success-valid="handleSubmit"></login-form>
           <p class="login-tip"></p>

src/view/manager/student.vue

@@ -3,9 +3,7 @@
      <i-form :model="formItem" inline>
        <Form-item props='grade'>
             <i-select v-model="formItem.grade" placeholder="请选择">
-                <i-option value="beijing">一年级</i-option>
-                <i-option value="shanghai">二年级</i-option>
-                <i-option value="shenzhen">三年级</i-option>
+              <i-option v-for="item in gradeList" :key="item.id" :value="item.id">{{ item.grade }}</i-option>
             </i-select>
         </Form-item>
         <Form-item props='name'>
@@ -31,10 +29,23 @@ export default {
   data () {
     return {
       formItem: {
-        grade: '',
+        grade: 1,
         name: ''
-
       },
+      gradeList: [
+        {
+          id: 1,
+          grade: '一年级'
+        },
+        {
+          id: 2,
+          grade: '二年级'
+        },
+        {
+          id: 3,
+          grade: '三年级'
+        }
+      ],
       columns1: [
         {
           title: '序号',
@@ -209,13 +220,14 @@ export default {
 </script>
 
 <style lang='less' scoped>
+  .ivu-btn-text:hover {
+    background-color: transparent!important;
+  }
 .wrap{
   background: white;
   padding: 20px;
   // position: relative;
-  .ivu-btn-text:hover {
-    background: transparent;
-  }
+
   .ivu-form{
     .add{
       float:right;

src/view/single-page/home/home.vue

@@ -11,7 +11,7 @@
           </row>
           </Form-item>
           <Form-item>
-            <i-button type="primary">提交</i-button>
+            <i-button type="primary" >提交</i-button>
         </Form-item>
       </i-form>
       <div class="info">
@@ -75,12 +75,12 @@
     <!-- 内容下部 -->
     <div class="contentBottom">
       <div class="info">
-        <h4>应用缴费情况</h4>
+        <h3>应用缴费情况</h3>
         <a href="#">详情</a>
       </div>
       <div class="money">
          <Row type='flex' justify='center'>
-            <i-col span="14">
+            <i-col span="12">
               <h1>￥<span>{{totalMoney+'.00'}}</span></h1>
               <h3>缴费总金额</h3>
               <div class="moneyBottom" >
@@ -103,12 +103,11 @@
               </div>
               </div>
             </i-col>
-            <i-col span="10">
-               <h1>￥<span>{{totalMoney+'.00'}}</span></h1>
-              <h3>缴费总金额</h3>
-              <div class="moneyInfo" style="margin-left:140px">
+            <i-col span="12">
+               <h1>￥<span>{{RefundMoney+'.00'}}</span></h1>
+              <h3>退费总金额</h3>
+              <div class="moneyInfo">
                 <img src="../../../assets/img/user2.png" style="width:30px" alt="">
-
                  <div class="moneyNum">
                    <span>{{newStu}}</span>
                    <h4>新学员人数</h4>
@@ -133,6 +132,7 @@ export default {
       shouldPerson: 45,
       reallyPerson: 30,
       totalMoney: 12360.00,
+      RefundMoney: 3600,
       newStu: 38,
       submitPerson: 60,
       form: {
@@ -203,7 +203,7 @@ export default {
   height: 70px;
   background:rgba(255,255,255,1);
   border:1px solid rgba(215, 214, 219, 1);
-  box-shadow:0px 0px 5px 0px rgba(30,30,30,0.71);
+  box-shadow:0px 0px 5px 0px #D7D6DB;
   border-radius:3px;
   margin: 20px;
   display: flex;
@@ -212,13 +212,13 @@ export default {
   p{
     font-size:20px;
     font-family:'Microsoft YaHei';
-    font-weight:600;
+    font-weight:400;
     color:rgba(0,0,0,1);
     line-height:56px;
     span{
       font-size:29px;
       font-family:'FZZhengHeiS-EB-GB';
-      font-weight:400;
+      font-weight:600;
       line-height:56px;
       padding-left: 20px;
     }
@@ -260,6 +260,7 @@ export default {
   padding: 10px;
 }
 .contentTop{
+  margin-bottom: 40px;
   // #myChart{
   //   float: left;
   // }
@@ -273,7 +274,7 @@ export default {
     display: flex;
     align-items: center;
     flex-direction: column;
-    margin-top: 70px;
+    margin-top: 90px;
     p{
       font-size: 20px;
       font-family: "MicrosoftYaHeiLight";
@@ -282,6 +283,7 @@ export default {
         padding-left: 10px;
         color: #4597FF;
         font-size: 30px;
+        font-weight: 600;
         font-family: "FZZDHJW--GB1-0";
       }
 
@@ -289,8 +291,9 @@ export default {
   }
    }
 .contentCenter{
+  // margin: 30px 0;
   .teacher{
-    padding: 20px 0;
+    padding: 30px 0;
     .ivu-col {
       display: flex;
       // justify-content: center;
@@ -338,20 +341,27 @@ export default {
       line-height:52px;
     }
   }
-  h3{
+  .ivu-col-span-12{
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+  }
+  .moneyBottom{
+    // margin-top:30px;
+    h3{
     text-align: center;
     font-size:16px;
-    font-family:Microsoft YaHei;
+    font-family:'Microsoft YaHei';
     font-weight:400;
     color:rgba(0,0,0,1);
     line-height:52px;
-  }
-  .moneyBottom{
-    margin-left:120px;
+    }
   }
   .moneyInfo{
     float: left;
     margin-left: 20px;
+    margin-top: 30px;
     padding-left: 20px;
     width: 162px;
     height: 71px;
@@ -359,7 +369,7 @@ export default {
     justify-content: center;
     align-items: center;
     background: white;
-    box-shadow: 0 0 10px grey;
+    box-shadow: 0 0 10px #D7D6DB;
     .studentNum{
       flex: 1;
       display: flex;
@@ -375,7 +385,7 @@ export default {
         margin-left: 10px;
         span{
           font-size:20px;
-          font-family:FZZhengHeiS-EB-GB;
+          font-family:'FZZhengHeiS-EB-GB';
           font-weight:600;
           color:rgba(253,117,60,1);
           line-height:33px;