dusenyao 3 سال پیش
والد
کامیت
f1f63feaa2
3فایلهای تغییر یافته به همراه12 افزوده شده و 74 حذف شده
  1. 0 73
      src/views/live/student/index.vue
  2. 6 0
      src/views/live/teacher/group.vue
  3. 6 1
      src/views/live/teacher/index.vue

+ 0 - 73
src/views/live/student/index.vue

@@ -648,79 +648,6 @@ $live-bc: #3d3938;
         position: relative;
         background-color: $live-bc;
         overflow: hidden;
-
-        // 设置屏幕画笔
-        .draw-setting {
-          position: absolute;
-          bottom: 13px;
-          left: 22px;
-          z-index: 9999;
-          background-color: #a0a0a0;
-          padding: 6px;
-          border-radius: 40px;
-          height: 40px;
-          width: 275px;
-          line-height: 28px;
-
-          & > span {
-            display: inline-block;
-            text-align: center;
-            margin-right: 10px;
-          }
-
-          & > span.brush-shape {
-            width: 28px;
-            height: 28px;
-            border-radius: 50%;
-            background-color: #fff;
-            cursor: pointer;
-          }
-
-          .draw-color {
-            position: relative;
-            top: 5px;
-            height: 18px;
-            width: 18px;
-            border-radius: 50%;
-            cursor: pointer;
-          }
-
-          .current::after {
-            content: '';
-            position: absolute;
-            bottom: -7px;
-            left: 7px;
-            width: 4px;
-            height: 4px;
-            border-radius: 50%;
-            background-color: #292929;
-          }
-
-          .draw-thickness {
-            height: 18px;
-            width: 18px;
-            cursor: pointer;
-            display: inline-flex;
-            flex-direction: column;
-            justify-content: center;
-            vertical-align: middle;
-            align-items: center;
-
-            > span {
-              border-radius: 50%;
-              background-color: #000;
-            }
-          }
-
-          & > .brush-clear {
-            width: 28px;
-            height: 28px;
-            border-radius: 50%;
-            background-color: #666;
-            cursor: pointer;
-            margin-right: 0;
-          }
-        }
       }
 
       .button-group {

+ 6 - 0
src/views/live/teacher/group.vue

@@ -41,6 +41,7 @@
             <div :id="`group-${i}`" class="group-box"></div>
             <div class="live-wrapper-stream">
               {{ searchStudentName(item.id()) }}
+              <svg-icon :icon-class="item.hasAudio() ? 'mike-on' : ''" />
             </div>
           </div>
 
@@ -514,7 +515,12 @@ $live-bc: #3d3938;
             line-height: 32px;
             text-align: center;
             margin: 0 8px;
+            padding: 0 15px;
             transition: all 300ms ease-in 0s;
+
+            > .svg-icon {
+              margin-left: 12px;
+            }
           }
         }
       }

+ 6 - 1
src/views/live/teacher/index.vue

@@ -674,7 +674,12 @@ export default {
 
     // 画笔变更
     drawChange(action, value) {
-      common.drawChange(action, value);
+      if (action === 'color') {
+        common.drawChange(action, parseInt(Number(value.replace('#', '0x')), 10));
+        this.curColor = value;
+      } else {
+        common.drawChange(action, value);
+      }
       this.isDrawSetting = false;
     },