Merge branch 'iteration-20241030-crouseware' into dev

src/components/globalTools/index.module.less

@@ -33,7 +33,7 @@
      // padding: 0 5px;
      background: rgba(0, 0, 0, 0.4);
      border-radius: 200px 0px 0px 200px;
-     border: 2px solid rgba(255, 255, 255, 0.3);
+     border: 1px solid rgba(255, 255, 255, 0.3);
      border-right-width: 0;
      cursor: pointer;
      font-size: 0;

src/views/coursewarePlay/component/tools/pen.tsx

@@ -43,7 +43,7 @@ export default defineComponent({
     const firstRender = ref(true);
     const src = /(localhost|192)/.test(location.host)
       ? 'https://test.lexiaoya.cn/whiteboard-noCollab'
-      : `https://kt.colexiu.com/classroom-whiteboard`;
+      : `https://online.lexiaoya.cn/whiteboard-noCollab`;
 
     const exportImg = (event: MessageEvent) => {
       const data = event.data;
@@ -157,7 +157,10 @@ export default defineComponent({
           </div>
         )}
 
-        <Tips onConfirm={() => props.close()} />
+        <Tips onConfirm={() => {
+          props.close()
+          tipState.show = false
+        }} />
       </div>
     );
   }

src/views/coursewarePlay/component/video-play.tsx

@@ -496,7 +496,7 @@ export default defineComponent({
                 }
               }}></i>
             <Slider
-              min={0.6}
+              min={0.5}
               max={1.5}
               step={0.1}
               v-model={data.defaultSpeed}
@@ -520,7 +520,7 @@ export default defineComponent({
             <i
               class={[styles.iconCut]}
               onClick={() => {
-                if (data.defaultSpeed <= 0.6) {
+                if (data.defaultSpeed <= 0.5) {
                   return;
                 }
                 if (videoItem.value) {

src/views/coursewarePlay/component/video.module.less

@@ -320,8 +320,8 @@
   display: flex;
   align-items: center;
   flex-direction: column;
-  height: 165px;
-  width: 45px;
+  height: 197px;
+  width: 46px;
   padding: 10px 0 15px;
   background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAGaCAMAAAC46aQwAAAAOVBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8dlA9AAAAE3RSTlNaAAxUVwdPRSc7MzYsEEoXGgshjXaABwAAAZBJREFUeNrt1GtO40AQReF77X46tvPY/2IHhiCDA0Ez7pb4cb4FHLVaVSU/isM/i360S5+nnIL+Q0h5On+fXuqoQ8a6fJm+VjVQr4/pEtREKPt0VTP1UzpmNZTjh3RWU3lLn9TY6T1d1Fx5S8eg5kL8m57UwfSaHoI6CIPlSV1MlpO6SNaiThbN6mRWVSdVWZ1kJXWSFNRJEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg9wnqJGhVJ6uyOsmq6qSqqJOiqzq5yqu6WC3P6mK2HEd1MEbLfZ49+zXtpOaS39IXNXe5p13UWPF72ic1dfKW9ql1eUu7tP2NLf3inNREOnuXflFGHTaWrSdvYsk6JJfoXXoTb1PNabwL+kEY71Ku023r7tOPYv5pFJ6Rn5qfj8KRtC+jvjGefSztYdWX1sFH0k82tUY3SPsWtDfZTdJekj4JN7dKO1Z9kBY3ST+er3x10/R2vqrdOO04BUnp4nbpTVwug30g3cwf1jMLKix6VfsAAAAASUVORK5CYII=') no-repeat top center;
   background-size: contain;
@@ -347,17 +347,18 @@
 
   .sliderPoint {
     background: #FFFFFF;
-    box-shadow: 0px 2px 4px 0px rgba(102, 102, 102, 0.77);
-    border-radius: 10px;
+    // box-shadow: 0px 2px 4px 0px rgba(102, 102, 102, 0.77);
+    border-radius: 20px;
     font-size: 14px;
     font-weight: 500;
+    // line-height: 20px;
+    padding: 2px 0 1px;
     color: rgba(1, 193, 181, 1);
     min-width: 35px;
     text-align: center;
     vertical-align: text-bottom;
-
     span {
-      font-size: 12px;
+      font-size: 10px;
     }
   }
 

src/views/coursewarePlay/index.tsx

@@ -40,7 +40,7 @@ import { useInterval, useIntervalFn } from '@vueuse/core';
 import CoursewareType from './component/courseware-type';
 import CoursewareTips from './component/courseware-tips';
 import GlobalTools from '@/components/globalTools';
-import { isPlay, penShow, toolOpen, whitePenShow } from '@/components/globalTools/globalTools';
+import { isHidden, isPlay, penShow, toolOpen, whitePenShow } from '@/components/globalTools/globalTools';
 
 export default defineComponent({
   name: 'CoursewarePlay',
@@ -490,10 +490,11 @@ export default defineComponent({
     }
 
     onMounted(async () => {
+      isHidden.value = true;
       await sysParamConfig();
       await getRefLevel()
       await getDetail();
-     
+      isHidden.value = false;
       // getCourseSchedule();
       window.addEventListener('message', iframeHandle);
 
@@ -1141,8 +1142,8 @@ export default defineComponent({
             class={styles.headerContainer}
             ref={headeRef}
           >
-            <div class={styles.backBtn} onClick={() => goback()}>
-              <Icon name={iconBack} />
+            <div class={styles.backBtn}>
+              <Icon name={iconBack} onClick={() => goback()} />
               <div class={styles.titleSection}>
                 <div class={styles.title}>{popupData.tabName}</div>
                 <div class={styles.titleContent}>