merge:首页周活跃人数统计merge to rc

src/modules/home/Home.less

@@ -2,35 +2,41 @@
   // padding: 0 16px 16px;
   min-width: 1100px;
   position: relative;
-  z-index:3;
+  z-index: 3;
   .g2-tooltip-marker {
     border-radius: 50% !important;
   }
   .home-title {
     color: #333;
-    padding-left:28px;
-    font-size:16px;
-    font-weight:bold;
+    padding-left: 28px;
+    font-size: 16px;
+    font-weight: bold;
     position: relative;
-    padding-top:16px;
-    &::before{
-      width:4px;
-      height:12px;
-      content:'';
-      background-image: linear-gradient(#2966FF 83.5%, #0ACCA4 16.5%);
-      display:inline-block;
+    padding-top: 16px;
+    &::before {
+      width: 4px;
+      height: 12px;
+      content: '';
+      background-image: linear-gradient(#2966ff 83.5%, #0acca4 16.5%);
+      display: inline-block;
       position: absolute;
-      left:16px;
-      top:22px;
+      left: 16px;
+      top: 22px;
     }
   }
   @font-face {
     font-family: 'number';
     src: url('https://image.xiaomaiketang.com/xm/n2sADd2jY6.TTF');
   }
+<<<<<<< HEAD
 
   .data-wrap{
     background: #FFF;
+=======
+  .data-wrap {
+    background: #fff;
+    padding-bottom: 25px;
+>>>>>>> feature/pangguoming/20210701/active_students_number
     .data-box {
       display: flex;
       justify-content: space-between;
@@ -42,7 +48,7 @@
         width: ~'calc(16.67% - 8px)';
         padding: 16px;
         &.course-data {
-          width: ~'calc(50% - 24px)';
+          width: ~'calc(33% - 24px)';
         }
         .header {
           display: flex;
@@ -56,7 +62,7 @@
             font-size: 14px;
             line-height: 18px;
             color: #333;
-            font-weight:500;
+            font-weight: 500;
           }
         }
         .data-number {
@@ -75,7 +81,7 @@
           .iconfont {
             font-size: 12px;
             margin-right: 4px;
-            color: #EC4B35;
+            color: #ec4b35;
           }
           .footer-number {
             font-size: 12px;
@@ -84,17 +90,17 @@
         }
         .course-box {
           border-radius: 4px;
-          background: #FAFAFA;
+          background: #fafafa;
           height: 124px;
-          width: 66%;
+          width: 55%;
           position: absolute;
           right: 16px;
-          top: 16px;
-          padding: 8px 24px 0;
+          top: 28px;
+          padding: 8px 0 0;
           .course-item {
             display: inline-block;
             width: 50%;
-            padding: 4px 0 12px;
+            padding: 4px 24px 12px;
             .course-title {
               font-size: 12px;
               color: #999;
@@ -115,7 +121,7 @@
               .iconfont {
                 font-size: 12px;
                 margin-right: 4px;
-                color: #EC4B35;
+                color: #ec4b35;
               }
               .add-number {
                 font-size: 12px;
@@ -127,9 +133,9 @@
       }
     }
   }
-  .study-wrap{
-    background: #FFF;
-    margin-top:16px;
+  .study-wrap {
+    background: #fff;
+    margin-top: 16px;
     .study-box {
       display: flex;
       justify-content: space-between;
@@ -149,7 +155,7 @@
           margin-bottom: 12px;
           .iconfont {
             font-size: 14px;
-            color: #BFBFBF;
+            color: #bfbfbf;
             margin-left: 4px;
           }
           .tip {
@@ -170,13 +176,13 @@
               color: #666;
               cursor: pointer;
               &.selected {
-                color: #2966FF;
+                color: #2966ff;
                 &::after {
                   position: absolute;
                   width: 24px;
                   height: 2px;
                   content: '';
-                  background: #2966FF;
+                  background: #2966ff;
                   border-radius: 1px;
                   left: 9px;
                   bottom: -4px;
@@ -197,7 +203,7 @@
           display: flex;
           align-items: center;
           &.odd {
-            background: #FAFAFA;
+            background: #fafafa;
           }
           .table-image {
             width: 24px;
@@ -258,7 +264,7 @@
             width: 204px;
             height: 204px;
             border-radius: 102px;
-            background: #F1F3F6;
+            background: #f1f3f6;
             margin-top: -20px;
             .small-circle {
               display: flex;
@@ -281,13 +287,13 @@
           &.unfinished {
             top: 152px;
             .spot {
-              background: #2966FF;
+              background: #2966ff;
             }
           }
           &.finished {
             top: 232px;
             .spot {
-              background: #FFBB54;
+              background: #ffbb54;
             }
           }
           .spot {
@@ -310,7 +316,7 @@
       }
     }
   }
-  
+
   .study-chart {
     width: 100%;
     height: 432px;
@@ -353,14 +359,14 @@
         align-items: center;
         color: #666;
         .student-dot {
-          background: #2966FF;
+          background: #2966ff;
           height: 8px;
           width: 8px;
           border-radius: 50%;
           margin-right: 8px;
         }
         .time-dot {
-          background: #FEB613;
+          background: #feb613;
           height: 8px;
           width: 8px;
           border-radius: 50%;
@@ -383,7 +389,8 @@
     font-size: 14px;
   }
   .g2-tooltip-list {
-    li,span {
+    li,
+    span {
       display: flex;
       align-items: center;
       font-size: 14px;