Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/layout/components/Navbar.vue

@@ -5,7 +5,14 @@
     <!-- <breadcrumb class="breadcrumb-container" /> -->
     <div class="left-menu">
       <i class='el-icon-location-information topIcon'></i>
-      {{ organName }}
+      
+      <el-popover
+        placement="top-start"
+        width="200"
+        trigger="hover"
+        :content="organName">
+        <span slot="reference">{{ organName.length > 10 ? organName.substr(0, 10) + '...' : organName}}</span>
+      </el-popover>
     </div>
     <div class="right-menu">
       <div class="msginfo"

src/views/categroyManager/vipActiveList.vue

@@ -1,6 +1,6 @@
 <template >
   <div class="m-container">
-    <h2>vip活动方案 <div class="squrt"></div>
+    <h2><div class="squrt"></div>vip活动方案 
     </h2>
 
     <div class="m-core">

src/views/categroyManager/vipChargeSeting.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>VIP课程收费设置 <div class="squrt"></div>
+    <h2><div class="squrt"></div>VIP课程收费设置
     </h2>
     <div class="m-core">
       <el-form :inline="true"

src/views/categroyManager/vipNewActive.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <!-- <h2>VIP活动方案新增 <div class="squrt"></div> </h2> -->
+    <!-- <h2><div class="squrt"></div>VIP活动方案新增 </h2> -->
     <h2>
       <el-page-header @back="onCancel"
                       :content="'VIP活动方案' + (pageType == 'create' ? '新增' : '修改')"></el-page-header>

src/views/journal/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>系统日志 <div class="squrt"></div>
+    <h2><div class="squrt"></div>系统日志
     </h2>
     <div class="m-core">
       <el-tabs type="border-card"

src/views/main/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>首页 <div class="squrt"></div>
+    <h2><div class="squrt"></div>首页 
     </h2>
     <div class="m-core">
       <div class="itemWrap">

src/views/teamDetail/components/studentList.vue

@@ -180,7 +180,7 @@
                   @pagination="getList" />
     </div>
     <el-dialog title="学员基本信息"
-               width="640px"
+               width="640px" class="studentInfo"
                :visible.sync="addStudentVisible">
       <el-form :model="maskForm"
                label-position="right"
@@ -188,6 +188,7 @@
                ref='maskForm'
                :rules="maskRules"
                :inline="true">
+        <el-divider>基本信息</el-divider>
         <el-form-item label="联系电话"
                       :rules="[{ required: true, message: '请输入手机号' }, { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }]"
                       prop="phone">
@@ -290,7 +291,7 @@
                     placeholder="请输入声部费用"></el-input>
         </el-form-item>
 
-        <el-divider></el-divider>
+        <el-divider>订单信息</el-divider>
         <el-form-item label="课程"
                       prop="temporaryCourseFee">
           <el-input v-model="maskForm.temporaryCourseFee"
@@ -795,6 +796,12 @@ export default {
     padding-right: 0;
   }
 }
+
+.studentInfo {
+  /deep/.el-dialog__body {
+    padding-top: 0;
+  }
+}
 // .instrList {
 //   display: flex;
 //   /deep/.el-form-item__content {

src/views/timedTask/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>定时任务 <div class="squrt"></div>
+    <h2><div class="squrt"></div>定时任务
     </h2>
     <div class="m-core">
       <div class="tableWrap">