Browse Source

修改样式与问题

lex-xin 4 months ago
parent
commit
8986a59d4c

+ 2 - 0
src/components/o-guide/index.module.less

@@ -26,6 +26,8 @@
     .van-tabs__line{
     .van-tabs__line{
       bottom: .5rem;
       bottom: .5rem;
       background: linear-gradient( 135deg, #79FECA 0%, #06CEC1 100%);
       background: linear-gradient( 135deg, #79FECA 0%, #06CEC1 100%);
+      width: 16px;
+      height: 4px;
     }
     }
   }
   }
   .content {
   .content {

+ 1 - 1
src/views/courseList/index.module.less

@@ -17,7 +17,7 @@
     margin-right: 30px;
     margin-right: 30px;
     border-radius: 2px;
     border-radius: 2px;
     overflow: hidden;
     overflow: hidden;
-    box-shadow: 0px 2px 6px 0px rgba(221, 168, 133, 0.67);
+    box-shadow: 0px 2px 6px 0px rgba(168, 168, 168, .7);
     overflow: hidden;
     overflow: hidden;
     background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAMAAAAPdrEwAAABOFBMVEUAAAC0tLTT09PU1NTt7e3////T09P////T09P////T09P////X19f////U1NTU1NTT09PT09PU1NTU1NTV1dXT09PU1NTU1NTV1dXZ2dn+/v7R0dH////////KysrIyMjT09O0tLTU1NS0tLTU1NS0tLTT09PT09PT09PU1NTU1NTU1NTT09O2trbU1NTV1dXV1dXW1tbV1dXW1tbV1dXJycm4uLj///+0tLT///+0tLT////p6em0tLT4+Pj///+2trb///+1tbX///+0tLT////T09P5+fn+/v63t7e8vLz8/Pzl5eXW1tbBwcH39/fw8PDs7Ozb29v7+/vg4ODOzs65ubny8vLJycnp6enGxsbFxcW+vr62trb09PTY2NjLy8vCwsLn5+fi4uLS0tLu7u7Q0NDd3d02Mu/gAAAARHRSTlMAnPwvBfv07ODdw5AbGezmyrirl5B4aT0kDZyclTwsIPj48+Ta1tPS0LGhiIaEcGJgV05FNhMS7++8vKyslZRzc1ZWJRSpe/cAAALfSURBVFjD7djXcuIwGAVg1pTQAiT0Ekiy6b1v7whsA6b3EGAJu+//BstaiWNiCYGlXGTG55KBDzH6j2xjMmJET5ZdDivQFavDtTxLXlsCFFlam7HmiUxl49ftApRxYWkHLe3A0lZa2oqlAXUMGk/fHG9vpCnSk/pZNJ18m6aOWELRN1CmtbMI+jjNJH0Evc2GlhD0Bhu6h6DTjPIq6Pqonb8XXoCWmjKSHTCnpccp5ges6bHCZAW2dBc8JcOWLqjoPFu6oqLLr2bVQxX9h/GElBWmKDCmxSKAyXWYt1GE677rLtLGejsLcuOCQMI7lVFlsMjxJJUeW3bP+OSTskBJqcuSFppAFT4vsqMrYDrVAitazMHV8kBJs8WGzsPmNoRCFSj5fcuA7vJKvcQ8UJKrCNT0WH0mdEpASbFOSdfhyClvzagGsSzR0D14LHTSSho1/mkQaw39dB9u2vThCU8KQj1JtFiVt+z5ONSLmnoSaeszuia/+lfzAaGS09STQDum6SH/cOXX5rY9Xz0Rj6Sqy0YmjUzrbp56ah6kIT2AH8Pe4M5TT83jP6ThsnALmq+eiD8tlIt/G8POWU8FVNMNuXc8rnH4epJpOHg1jIivJ5mWcvLg4ZqMryeZhnOLm1hyPfF0C95R9PAcvp4jcSYNL7UDHEWuJ56GO46FyPXE0+/+/7Lhgs+ffU093yPoDwCAEcki1/Mjgv4BQFUkSeR6/jQh8gn0SQy5np9NqFi+CgSDWE9rwmJCJ/X9yxt9iSdisVji2y+TESNGXjiW6LU7FYkkzQ9JRiIp93XUoodyX12cBg/9qyvOHbvXxmUw4Wxe+45zZdV/GDy9uHJbZqPhk7jTjrTI4ezO+EkY8wUBW4Y6tgCSPvNxtDLnOzOhEw2HAvt7Hj2oZ28/EApHyRtpvjwPBY/8B5Ot9O1u2b2eTds6x8nr4tZtmx6vfWvXN9nCA/9RMHR+aZ5sohEji+YfnN0/51L6d+cAAAAASUVORK5CYII=');
     background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAMAAAAPdrEwAAABOFBMVEUAAAC0tLTT09PU1NTt7e3////T09P////T09P////T09P////X19f////U1NTU1NTT09PT09PU1NTU1NTV1dXT09PU1NTU1NTV1dXZ2dn+/v7R0dH////////KysrIyMjT09O0tLTU1NS0tLTU1NS0tLTT09PT09PT09PU1NTU1NTU1NTT09O2trbU1NTV1dXV1dXW1tbV1dXW1tbV1dXJycm4uLj///+0tLT///+0tLT////p6em0tLT4+Pj///+2trb///+1tbX///+0tLT////T09P5+fn+/v63t7e8vLz8/Pzl5eXW1tbBwcH39/fw8PDs7Ozb29v7+/vg4ODOzs65ubny8vLJycnp6enGxsbFxcW+vr62trb09PTY2NjLy8vCwsLn5+fi4uLS0tLu7u7Q0NDd3d02Mu/gAAAARHRSTlMAnPwvBfv07ODdw5AbGezmyrirl5B4aT0kDZyclTwsIPj48+Ta1tPS0LGhiIaEcGJgV05FNhMS7++8vKyslZRzc1ZWJRSpe/cAAALfSURBVFjD7djXcuIwGAVg1pTQAiT0Ekiy6b1v7whsA6b3EGAJu+//BstaiWNiCYGlXGTG55KBDzH6j2xjMmJET5ZdDivQFavDtTxLXlsCFFlam7HmiUxl49ftApRxYWkHLe3A0lZa2oqlAXUMGk/fHG9vpCnSk/pZNJ18m6aOWELRN1CmtbMI+jjNJH0Evc2GlhD0Bhu6h6DTjPIq6Pqonb8XXoCWmjKSHTCnpccp5ges6bHCZAW2dBc8JcOWLqjoPFu6oqLLr2bVQxX9h/GElBWmKDCmxSKAyXWYt1GE677rLtLGejsLcuOCQMI7lVFlsMjxJJUeW3bP+OSTskBJqcuSFppAFT4vsqMrYDrVAitazMHV8kBJs8WGzsPmNoRCFSj5fcuA7vJKvcQ8UJKrCNT0WH0mdEpASbFOSdfhyClvzagGsSzR0D14LHTSSho1/mkQaw39dB9u2vThCU8KQj1JtFiVt+z5ONSLmnoSaeszuia/+lfzAaGS09STQDum6SH/cOXX5rY9Xz0Rj6Sqy0YmjUzrbp56ah6kIT2AH8Pe4M5TT83jP6ThsnALmq+eiD8tlIt/G8POWU8FVNMNuXc8rnH4epJpOHg1jIivJ5mWcvLg4ZqMryeZhnOLm1hyPfF0C95R9PAcvp4jcSYNL7UDHEWuJ56GO46FyPXE0+/+/7Lhgs+ffU093yPoDwCAEcki1/Mjgv4BQFUkSeR6/jQh8gn0SQy5np9NqFi+CgSDWE9rwmJCJ/X9yxt9iSdisVji2y+TESNGXjiW6LU7FYkkzQ9JRiIp93XUoodyX12cBg/9qyvOHbvXxmUw4Wxe+45zZdV/GDy9uHJbZqPhk7jTjrTI4ezO+EkY8wUBW4Y6tgCSPvNxtDLnOzOhEw2HAvt7Hj2oZ28/EApHyRtpvjwPBY/8B5Ot9O1u2b2eTds6x8nr4tZtmx6vfWvXN9nCA/9RMHR+aZ5sohEji+YfnN0/51L6d+cAAAAASUVORK5CYII=');
     background-repeat: no-repeat;
     background-repeat: no-repeat;

+ 15 - 1
src/views/coursewarePlay/component/courseware-tips/index.module.less

@@ -1,11 +1,25 @@
 .container {
 .container {
+  position: relative;
   width: 453px;
   width: 453px;
-  height: 302px;
+  height: 80vh;
+  max-height: 302px;
   background: url('../../image/tips-bg.png') top center no-repeat #fff;
   background: url('../../image/tips-bg.png') top center no-repeat #fff;
   background-size: contain;
   background-size: contain;
   border-radius: 20px;
   border-radius: 20px;
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
+  overflow: hidden;
+
+  .iconClose {
+    width: 18px;
+    height: 19px;
+    position: absolute;
+    top: 14px;
+    right: 20px;
+    z-index: 9;
+    background: url('../tips/icon-close.png') no-repeat center;
+    background-size: contain;
+  }
 
 
   .title {
   .title {
     font-weight: 600;
     font-weight: 600;

+ 5 - 1
src/views/coursewarePlay/component/courseware-tips/index.tsx

@@ -13,8 +13,12 @@ export default defineComponent({
       default: ''
       default: ''
     }
     }
   },
   },
-  setup(props) {
+  emits: ['close'],
+  setup(props, { emit }) {
     return () => <div class={styles.container}>
     return () => <div class={styles.container}>
+      <i
+          class={styles.iconClose}
+          onClick={() => (emit("close"))}></i>
       <div class={styles.title}>
       <div class={styles.title}>
         {props.titleName}
         {props.titleName}
       </div>
       </div>

+ 1 - 1
src/views/coursewarePlay/component/courseware-type/index.tsx

@@ -17,7 +17,7 @@ export default defineComponent({
       <div class={styles.container}>
       <div class={styles.container}>
         <div class={styles.pointHead}>
         <div class={styles.pointHead}>
           <img src={iconMenucw} />
           <img src={iconMenucw} />
-          课类型
+          课类型
         </div>
         </div>
         <div class={styles.content}>
         <div class={styles.content}>
           {props.list.map((item: any) => <div class={styles.item} onClick={() => emit("confirm", item)}>
           {props.list.map((item: any) => <div class={styles.item} onClick={() => emit("confirm", item)}>

+ 2 - 0
src/views/coursewarePlay/component/tips/index.module.less

@@ -6,6 +6,8 @@
   background: url('./top-bg.png') no-repeat top center #fff !important;
   background: url('./top-bg.png') no-repeat top center #fff !important;
   background-size: contain !important;
   background-size: contain !important;
   overflow: hidden;
   overflow: hidden;
+  border-radius: 20px !important;
+  overflow: hidden;
 
 
   .iconClose {
   .iconClose {
     width: 18px;
     width: 18px;

File diff suppressed because it is too large
+ 0 - 1
src/views/coursewarePlay/component/video.module.less


+ 5 - 0
src/views/coursewarePlay/index.module.less

@@ -37,6 +37,7 @@
   background: linear-gradient(180deg, rgba(0, 0, 0, 0.6), transparent);
   background: linear-gradient(180deg, rgba(0, 0, 0, 0.6), transparent);
   transition: transform 0.5s;
   transition: transform 0.5s;
   box-sizing: border-box;
   box-sizing: border-box;
+  pointer-events: none;
 
 
   div {
   div {
     box-sizing: border-box;
     box-sizing: border-box;
@@ -55,6 +56,7 @@
   :global {
   :global {
     .van-icon {
     .van-icon {
       margin-right: 8px;
       margin-right: 8px;
+      pointer-events: auto;
     }
     }
   }
   }
 
 
@@ -85,6 +87,7 @@
       border: 1px solid rgba(255, 255, 255, 0.7);
       border: 1px solid rgba(255, 255, 255, 0.7);
       padding: 2px 8px;
       padding: 2px 8px;
       box-sizing: content-box;
       box-sizing: content-box;
+      pointer-events: auto;
     }
     }
   }
   }
 }
 }
@@ -98,6 +101,7 @@
   height: 100%;
   height: 100%;
   padding-right: 40px;
   padding-right: 40px;
   padding-top: 12px;
   padding-top: 12px;
+  pointer-events: auto;
 
 
   .pointBtn {
   .pointBtn {
     font-weight: 600;
     font-weight: 600;
@@ -300,6 +304,7 @@
   background: rgba(0, 0, 0, 0.8) !important;
   background: rgba(0, 0, 0, 0.8) !important;
   box-shadow: -6px 0px 20px 0px rgba(0,0,0,0.3) !important;
   box-shadow: -6px 0px 20px 0px rgba(0,0,0,0.3) !important;
   border-radius: 16px 0px 0px 16px !important;
   border-radius: 16px 0px 0px 16px !important;
+  backdrop-filter: blur(12px);
 }
 }
 .popupPoint {
 .popupPoint {
   :global {
   :global {

+ 38 - 34
src/views/coursewarePlay/index.tsx

@@ -25,7 +25,7 @@ import MusicScore from './component/musicScore';
 // import iconDian from './image/icon-dian.svg';
 // import iconDian from './image/icon-dian.svg';
 // import iconPoint from './image/icon-point.svg';
 // import iconPoint from './image/icon-point.svg';
 // import qs from 'query-string';
 // import qs from 'query-string';
-import { iconUp, iconDown, iconPen, iconTouping, iconMenu, iconCourseType } from './image/icons.json';
+import { iconUp, iconDown, iconTouping, iconMenu, iconCourseType } from './image/icons.json';
 import Points from './component/points';
 import Points from './component/points';
 import { browser } from '@/helpers/utils';
 import { browser } from '@/helpers/utils';
 import { Vue3Lottie } from 'vue3-lottie';
 import { Vue3Lottie } from 'vue3-lottie';
@@ -60,17 +60,17 @@ export default defineComponent({
     const parentContainer = reactive({
     const parentContainer = reactive({
       width: '100vw'
       width: '100vw'
     });
     });
-    const setContainer = () => {
-      const min = Math.min(screen.width, screen.height);
-      const max = Math.max(screen.width, screen.height);
-      const width = min * (16 / 9);
-      if (width > max) {
-        parentContainer.width = '100vw';
-        return;
-      } else {
-        parentContainer.width = width + 'px';
-      }
-    };
+    // const setContainer = () => {
+    //   const min = Math.min(screen.width, screen.height);
+    //   const max = Math.max(screen.width, screen.height);
+    //   const width = min * (16 / 9);
+    //   if (width > max) {
+    //     parentContainer.width = '100vw';
+    //     return;
+    //   } else {
+    //     parentContainer.width = width + 'px';
+    //   }
+    // };
     const handleInit = (type = 0) => {
     const handleInit = (type = 0) => {
       //设置容器16:9
       //设置容器16:9
       // setContainer();
       // setContainer();
@@ -358,6 +358,7 @@ export default defineComponent({
           );
           );
           getItemList();
           getItemList();
         }
         }
+        return true
       } catch (error) {
       } catch (error) {
         console.log(error);
         console.log(error);
       }
       }
@@ -368,9 +369,9 @@ export default defineComponent({
       popupData.pointOpen = true
       popupData.pointOpen = true
       popupData.pointContent = text
       popupData.pointContent = text
       if(type === "checkItem") {
       if(type === "checkItem") {
-        popupData.pointTitle = '阶段目标'
-      } else if(type === "phaseGoals") {
         popupData.pointTitle = '检查事项'
         popupData.pointTitle = '检查事项'
+      } else if(type === "phaseGoals") {
+        popupData.pointTitle = '阶段目标'
       }
       }
     }
     }
 
 
@@ -470,8 +471,8 @@ export default defineComponent({
             lessonCoursewareDetailId: id || route.query.id
             lessonCoursewareDetailId: id || route.query.id
           }
           }
         })
         })
-        console.log(res.data, '1212')
         data.refLevelList = res.data || []
         data.refLevelList = res.data || []
+        return true
       } catch {
       } catch {
         // 
         // 
       }
       }
@@ -592,15 +593,11 @@ export default defineComponent({
       }, 4000);
       }, 4000);
     };
     };
     /** 立即收起所有的模态框 */
     /** 立即收起所有的模态框 */
-    const clearModel = () => {
-      clearTimeout(activeData.timer);
-      closeToast();
-      activeData.model = false;
-    };
-    const toggleModel = (type = true) => {
-      activeData.model = type;
-    };
-
+    // const clearModel = () => {
+    //   clearTimeout(activeData.timer);
+    //   closeToast();
+    //   activeData.model = false;
+    // };
 
 
     // 双击
     // 双击
     const handleDbClick = () => {
     const handleDbClick = () => {
@@ -1146,7 +1143,10 @@ export default defineComponent({
             ref={headeRef}
             ref={headeRef}
           >
           >
             <div class={styles.backBtn}>
             <div class={styles.backBtn}>
-              <Icon name={iconBack} onClick={() => goback()} />
+              <Icon name={iconBack} onClick={() => {
+                console.log('back')
+                goback()
+              }} />
               <div class={styles.titleSection}>
               <div class={styles.titleSection}>
                 <div class={styles.title}>{popupData.tabName}</div>
                 <div class={styles.title}>{popupData.tabName}</div>
                 <div class={styles.titleContent}>
                 <div class={styles.titleContent}>
@@ -1208,13 +1208,15 @@ export default defineComponent({
                 return
                 return
               }
               }
               data.currentId = item.id;
               data.currentId = item.id;
-              await getDetail(item.id);
-              await getRefLevel(item.id);
-              popupData.coursewareOpen = false;
-              popupData.activeIndex = 0;
-              nextTick(() => {
-                popupData.open = true
-              })
+              const n = await getDetail(item.id);
+              const s = await getRefLevel(item.id);
+              if(n && s) {
+                popupData.coursewareOpen = false;
+                popupData.activeIndex = 0;
+                nextTick(() => {
+                  popupData.open = true
+                })
+              }
             }} />
             }} />
         </Popup>
         </Popup>
 
 
@@ -1231,10 +1233,12 @@ export default defineComponent({
         <Popup
         <Popup
           class={[styles.popup, styles.popupCoursewarePlay, styles.popupPoint]}
           class={[styles.popup, styles.popupCoursewarePlay, styles.popupPoint]}
           round
           round
-          closeable
+          style={{ background: 'transparent !important' }}
           v-model:show={popupData.pointOpen}
           v-model:show={popupData.pointOpen}
           onClose={handleClosePopup}>
           onClose={handleClosePopup}>
-          <CoursewareTips content={popupData.pointContent} titleName={popupData.pointTitle} />
+          <CoursewareTips onClose={() => {
+            popupData.pointOpen = false
+          }} content={popupData.pointContent} titleName={popupData.pointTitle} />
         </Popup>
         </Popup>
 
 
         <GlobalTools />
         <GlobalTools />

Some files were not shown because too many files changed in this diff