Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -133,6 +133,12 @@ body,
 .el-drawer__wrapper .drawerTop .icon-guanbi{
     display: none !important;
 }
+.el-tabs__item.is-active{
+    color:var(--q-color-primary) !important;
+}
+.el-tabs__active-bar{
+    background-color:var(--q-color-primary) !important;
+}
 .page-body{
     padding:15px !important;
     min-height: calc(100% - 30px);

src/pages/Index.vue

 <template>
-  <div class="home" >
+  <div class="home flex column" style="height:calc(100vh - 101px);margin:0px !important">
     <!-- <img alt="Quasar logo" src="~assets/quasar-logo-full.svg"> -->
     <div class="box" v-if="AccountType==2 || ispower==true">
       <div style="margin: 0 auto;width: 130px;">
@@ -7,12 +7,11 @@
           <el-tab-pane :label="item.label" :name="item.value" :key="item.value" v-for="(item, index) in options"></el-tab-pane>
         </el-tabs>
       </div>
-
     </div>
-    <div v-if="model=='one'" class="flex flex-center" style="flex: 1;min-height: 750px">
+    <div v-if="model=='one'" class="flex flex-center col" style="flex: 1;min-height: 750px">
           <img style="width:250px;" alt="Quasar logo" src="../assets/images/logo.png" />
     </div>
-    <div v-if="model=='two'" style="height: 750px;overflow: auto">
+    <div v-if="model=='two'" class="col" style="height: 750px;overflow: auto">
       <teachplan></teachplan>
     </div>
   </div>
@@ -76,12 +75,12 @@
 
 </script>
 <style>
-  .home .box{
+  .homebx .box{
     width: 100%;
     height: 50px;
 
   }
-  .home {
+  .homebx {
     margin: 0;
   }
   ::-webkit-scrollbar {

src/pages/course/teacherLesson.vue

@@ -211,13 +211,13 @@
           {{tMonth}}
         </div>
       </div>
-      <div class="Cal_List">
+      <div class="Cal_List flex">
         <div class="Cal_Qiehuan" @click="getBeforeMonth()">
           <div class="Cal_Icon">
             <i class="el-icon-arrow-left"></i></div> <div>上个月
           </div>
         </div>
-        <div class="Cal_Content">
+        <div class="Cal_Content col">
           <div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}" @click="getItem(item)">
               {{item}}
             <div class="beikeStatus beike1"  v-if="getLessonStatus(item)=='未备课'">