瀏覽代碼

Merge branch 'master' of http://git.dayaedu.com/lex/orchestra-app

mo 2 年之前
父節點
當前提交
66b0e04feb

+ 5 - 1
src/student/my-orchestra/apply-withdrawal.module.less

@@ -10,12 +10,16 @@
   text-align: center;
   padding-top: 22px;
   .img {
-    padding: 4px;
+    padding: 2px;
     background-color: #fff;
     width: 67px;
     height: 67px;
     border-radius: 50%;
     overflow: hidden;
+    img {
+      border-radius: 50%;
+      overflow: hidden;
+    }
   }
 
   .userName {

+ 1 - 1
src/student/my-orchestra/apply-withdrawal.tsx

@@ -84,7 +84,7 @@ export default defineComponent({
             <Image
               src={forms.dataInfo.studentAvatar || iconStudent}
               class={styles.img}
-              fit="cover"
+              fit="contain"
             />
             <div class={styles.userName}>{forms.dataInfo.studentName} 同学</div>
             <div class={styles.timer}>

+ 12 - 0
src/teacher/screen-projection/index.tsx

@@ -79,6 +79,18 @@ export default defineComponent({
             {data.knowledgePointList.map((item: any) => {
               return (
                 <>
+                    <Cell title='胜强测试' isLink center onClick={() => hanldeOpenPlay({a :1610595720511209474})}>
+                          {{
+                            icon: () => (
+                              <Image
+                                style={{ marginRight: '12px' }}
+                                width={36}
+                                height={36}
+                                src={icons.music}
+                              />
+                            )
+                          }}
+                </Cell>
                   {Array.isArray(item.materialList) &&
                     item.materialList.map((n: any) => {
                       return (

+ 11 - 1
src/views/coursewarePlay/index.module.less

@@ -9,11 +9,12 @@
   left: 0;
   right: 0;
   z-index: 1;
-  padding: 10px 10px 0 40px;
+  padding: 10px 10px 0 10px;
   display: flex;
   align-items: center;
 }
 .backBtn {
+  position: absolute;
   color: #fff;
   width: 40px;
   height: 26px;
@@ -116,6 +117,15 @@
     border-top-right-radius: 0;
   }
 }
+.leftFixedBtns{
+  position: fixed;
+  top: 50%;
+  transform: translateY(-50%);
+  left: 20px;
+  .prePoint{
+    margin-bottom: 8px;
+  }
+}
 .fullBtn {
   width: 38px;
   height: 55px;

+ 8 - 0
src/views/coursewarePlay/index.tsx

@@ -291,6 +291,14 @@ export default defineComponent({
             </>
           )}
         </div>
+        <div class={styles.leftFixedBtns}>
+          <div class={[styles.fullBtn , styles.prePoint]} >
+            <span style={{textAlign: 'center'}}>上一<br />知识点</span>
+          </div>
+          <div class={styles.fullBtn} >
+            <span style={{textAlign: 'center'}}>下一<br />知识点</span>
+          </div>
+        </div>
         <Popup
           class={styles.popup}
           overlayClass={styles.overlayClass}