更新

dist/teacher.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.bc17b75e.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/teacher.700cd90e.js"></script>
+>>>>>>> iteration-20240822-subject
   <link rel="modulepreload" href="./assets/ResizeObserver.es.2ba57d2a.js">
   <link rel="modulepreload" href="./assets/routes-common.914c0f82.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.ea6352ab.css">
@@ -65,7 +69,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.d15f7bf4.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.037e1acf.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.a82c8a1b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240822-subject
 </body>
 
 </html>

dist/tenant.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.106b499b.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/tenant.f3485411.js"></script>
+>>>>>>> iteration-20240822-subject
   <link rel="modulepreload" href="./assets/ResizeObserver.es.2ba57d2a.js">
   <link rel="modulepreload" href="./assets/auth.89fe7068.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.ea6352ab.css">
@@ -67,7 +71,11 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.d15f7bf4.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.8c4619bb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.d210ccb0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240822-subject
 </body>
 
 </html>

src/tenant/music/component/song/index.tsx

@@ -118,15 +118,18 @@ export default defineComponent({
                   )}
 
                   <div class={styles.tags}>
-                    {n.subjectNames
-                      ? n.subjectNames
-                          ?.split(',')
-                          .map((name: any) => <span>{name}</span>)
-                      : n.musicSubjectName &&
-                        n.musicSubjectName
-                          ?.split(',')
-                          .map((name: any) => <span>{name}</span>)}
-                    {n.musicSheetType === 'CONCERT' && <span>合奏</span>}
+                    {n.musicSheetType === 'CONCERT' ? (
+                      <span>合奏</span>
+                    ) : n.subjectNames ? (
+                      n.subjectNames
+                        ?.split(',')
+                        .map((name: any) => <span>{name}</span>)
+                    ) : (
+                      n.musicSubjectName &&
+                      n.musicSubjectName
+                        ?.split(',')
+                        .map((name: any) => <span>{name}</span>)
+                    )}
                   </div>
 
                   <span class={[styles.name]}>

src/tenant/music/courseList/index.module.less

@@ -23,7 +23,7 @@
     background-size: 100% 100%;
     flex-shrink: 0;
 
-    & > img {
+    &>img {
       display: block;
       width: 100%;
       height: 100%;
@@ -36,8 +36,7 @@
       .van-image__loading {
         position: relative;
         height: 100%;
-        animation: van-skeleton-blink var(--van-skeleton-duration) ease-in-out
-          infinite;
+        animation: van-skeleton-blink var(--van-skeleton-duration) ease-in-out infinite;
       }
     }
 
@@ -47,11 +46,9 @@
       left: 5px;
       width: 5px;
       height: 100%;
-      background: linear-gradient(
-        270deg,
-        rgba(0, 0, 0, 0.25) 0%,
-        rgba(0, 0, 0, 0.03) 100%
-      );
+      background: linear-gradient(270deg,
+          rgba(0, 0, 0, 0.25) 0%,
+          rgba(0, 0, 0, 0.03) 100%);
       box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.2);
       z-index: 1;
     }
@@ -155,6 +152,7 @@
   width: 24px;
   height: 24px;
   position: relative;
+
   .basePlay {
     width: 20px;
     height: 20px;
@@ -163,6 +161,7 @@
     top: 50%;
     transform: translate(-50%, -50%);
   }
+
   :global {
     .van-circle {
       position: absolute;
@@ -171,8 +170,11 @@
       transform: translate(-50%, -50%);
       width: 20px;
       height: 20px;
+      padding-bottom: 2px;
+      padding-right: 2px;
     }
   }
+
   .tips {
     position: absolute;
     left: 50%;
@@ -184,6 +186,7 @@
     border-radius: 1px;
   }
 }
+
 .periodItem {
   width: 36px;
   height: 40px;
@@ -201,6 +204,7 @@
 .courseDialog {
   width: 305px;
   box-sizing: border-box;
+
   :global {
     .van-dialog__header {
       // padding-top: 0;
@@ -302,7 +306,7 @@
     display: flex;
     align-items: center;
 
-    & > button {
+    &>button {
       height: 40px;
       flex: 1;
       font-weight: 400;
@@ -314,14 +318,17 @@
     }
   }
 }
+
 .btnLeft {
   color: #333;
   border-color: #dbdbdb;
 }
+
 .btnRight {
   background: #fe2451;
   border-color: #fe2451;
 }
+
 .finch {
   width: 150px;
   margin: 140px auto 0;
@@ -334,6 +341,7 @@
   margin-top: 4px;
   margin-bottom: 120px;
 }
+
 .footers {
   padding: 0 25px 20px; // height: 45px;
 
@@ -343,14 +351,13 @@
       font-weight: 500;
       color: #ffffff;
       line-height: 25px;
+
       &.van-button--disabled {
         opacity: initial;
-        background: linear-gradient(
-          270deg,
-          #ff7a93 0%,
-          #ff9daa 100%
-        ) !important;
+        background: linear-gradient(270deg,
+            #ff7a93 0%,
+            #ff9daa 100%) !important;
       }
     }
   }
-}
+}

src/tenant/music/lessonCourseware/index.module.less

@@ -25,22 +25,31 @@
       }
     }
 
+
+    .van-search {
+      padding-bottom: 0;
+      align-items: flex-start;
+    }
+
     .van-dropdown-menu__bar {
       background-color: transparent;
       box-shadow: none;
       padding-right: 15px;
+      padding-bottom: 10px;
       height: 36px;
     }
 
     .van-dropdown-menu__title {
       padding-left: 0;
       color: #131415;
+
       &:after {
-        border-color: transparent transparent rgba(0, 0, 0, 0.4)
-          rgba(0, 0, 0, 0.4);
+        border-color: transparent transparent rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
       }
+
       &.van-dropdown-menu__title--active {
         color: #fe2451;
+
         &:after {
           border-color: transparent transparent #fe2451 #fe2451;
         }
@@ -48,8 +57,7 @@
     }
 
     .van-dropdown-menu__title:after {
-      border-color: transparent transparent rgba(0, 0, 0, 0.4)
-        rgba(0, 0, 0, 0.4);
+      border-color: transparent transparent rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
     }
 
     .van-dropdown-item__content {
@@ -60,45 +68,54 @@
       opacity: 1 !important;
     }
   }
+
   .dropdownMenuSub {
     :global {
       .van-popup {
         box-sizing: border-box;
         padding: 12px;
       }
+
       .van-cell {
         padding: 0;
         height: 50px;
         line-height: 50px;
         color: #333333;
+
         &:after {
           display: none;
         }
+
         &.van-dropdown-item__option--active {
           background-color: rgba(254, 36, 81, 0.08);
           border-radius: 10px;
           color: #fe2451;
+
           .van-cell__title {
             font-weight: 600;
           }
         }
+
         .van-cell__title {
           font-weight: 400;
           font-size: 16px;
           text-align: center;
         }
+
         .van-cell__value {
           display: none;
         }
       }
     }
   }
+
   .titleActive {
     :global(.van-ellipsis) {
       max-width: 62px;
     }
   }
 }
+
 .search {
   :global {
     .van-search {
@@ -106,6 +123,7 @@
     }
   }
 }
+
 .bgImg {
   position: fixed;
   top: 0;
@@ -118,25 +136,30 @@
 
 .alumnList {
   min-height: 40vh;
+
   :global {
     .van-list__loading {
       display: none;
     }
   }
+
   .courseItem {
     background: initial;
     border: initial;
     padding: 0 4px 20px;
+
     :global {
       .courseItem:nth-child(1) {
         margin-top: 6px !important;
       }
+
       .courseItem:nth-child(2) {
         margin-top: 6px !important;
       }
+
       .courseItem:nth-child(3) {
         margin-top: 6px !important;
       }
     }
   }
-}
+}

src/tenant/music/train-list/index.module.less

@@ -25,27 +25,40 @@
       }
     }
 
+    .van-search {
+      padding-bottom: 0;
+      align-items: flex-start;
+    }
+
+    // .van-dropdown-menu {
+    //   padding-bottom: 10px;
+    // }
+
     .van-dropdown-menu__bar {
       background-color: transparent;
       box-shadow: none;
       padding-right: 15px;
+      padding-bottom: 10px;
       height: 36px;
     }
 
     .van-dropdown-menu__title {
       padding-left: 0;
       color: #131415;
+
       &:after {
-        border-color: transparent transparent rgba(0, 0, 0, 0.4)
-          rgba(0, 0, 0, 0.4);
+        border-color: transparent transparent rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
       }
+
       &.van-dropdown-menu__title--active {
         color: #fe2451;
+
         &:after {
           border-color: transparent transparent #fe2451 #fe2451;
         }
       }
     }
+
     .van-dropdown-item__content {
       border-radius: 0px 0px 20px 20px;
     }
@@ -59,6 +72,7 @@
   //   color: #fe2451;
   // }
 }
+
 .search {
   :global {
     .van-search {
@@ -66,6 +80,7 @@
     }
   }
 }
+
 .albumSearchSection {
   :global {
     .van-dropdown-menu__bar {
@@ -81,7 +96,7 @@
   padding: 2px 21px 0 8px !important;
   border-radius: 30px !important;
 
-  & > div {
+  &>div {
     max-width: 70px;
   }
 
@@ -170,6 +185,7 @@
   color: #131415;
 
   :global {
+
     .van-list__loading,
     .van-list__finished-text,
     .van-list__error-text {
@@ -188,6 +204,7 @@
   background-color: #fff;
   margin: 6px 12px 0px 12px;
   min-height: 90vh;
+
   :global {
     .van-list__loading {
       display: none;
@@ -338,10 +355,12 @@
     }
   }
 }
+
 .resetting {
   border-color: #dbdbdb !important;
   color: #333333 !important;
 }
+
 .confirm,
 .resetting {
   :global {

src/tenant/music/train-list/index.tsx

@@ -303,6 +303,8 @@ export default defineComponent({
                     isSearchStatus.value && (
                       <DropdownMenu>
                         <DropdownItem
+                          class="searchOther"
+                          // teleport="body"
                           titleClass={
                             params.subjectId || params.type || params.level
                               ? styles.titleActive

src/tenant/music/train-tool/index.tsx

@@ -61,6 +61,7 @@ export default defineComponent({
     const background = ref<string>('rgba(55, 205, 177, 0)')
     const color = ref<string>('#fff')
     const state = reactive({
+      userId: '',
       details: {} as any,
       buy: route.query.buy as any,
       albumId: route.query.albumId || null,
@@ -247,7 +248,7 @@ export default defineComponent({
     const getSubjectList = async () => {
       try {
         const res = await request.get('/api-tenant/open/subject/queryPage', {
-          data: { page: 1, rows: 9999 }
+          params: { page: 1, rows: 9999, queryType: 'list' }
         })
         const result = res.data.rows || []
         result.forEach((item: any) => {
@@ -266,7 +267,11 @@ export default defineComponent({
     /** 设置声部 */
     const operatoinCatchSubjectInfo = (
       type: 'set' | 'get',
-      params?: { defaultSubject: string; defaultSubjectName: string }
+      params?: {
+        defaultSubject: string
+        defaultSubjectName: string
+        userId: string | number
+      }
     ) => {
       if (type === 'set') {
         localStorage.setItem(
@@ -292,8 +297,9 @@ export default defineComponent({
       // 老师端默认查询声部
       if (baseState.platformType === 'TEACHER') {
         const users = baseState.user.data
+        state.userId = users.userId
         const catchSubject = operatoinCatchSubjectInfo('get')
-        if (catchSubject) {
+        if (catchSubject && users.userId === catchSubject.userId) {
           state.teacherSubjectId = catchSubject.defaultSubject || null
           state.teacherSubjectName = catchSubject.defaultSubjectName || null
         } else {
@@ -303,7 +309,8 @@ export default defineComponent({
 
         operatoinCatchSubjectInfo('set', {
           defaultSubject: state.teacherSubjectId,
-          defaultSubjectName: state.teacherSubjectName
+          defaultSubjectName: state.teacherSubjectName,
+          userId: state.userId
         })
       }
 
@@ -428,8 +435,7 @@ export default defineComponent({
               class={styles.theSticky}
               position="top"
               onBarHeight={(height: any) => {
-                console.log(height, 'height', height)
-                state.heightV = height
+                state.heightV = Math.floor(height)
               }}
             >
               <ColHeader border={false} isFixed={false} />
@@ -458,7 +464,7 @@ export default defineComponent({
                 class={styles.theSticky}
                 position="top"
                 onBarHeight={(height: any) => {
-                  state.heightV = height
+                  state.heightV = Math.floor(height)
                 }}
               >
                 <ColHeader
@@ -759,6 +765,7 @@ export default defineComponent({
           <Picker
             defaultIndex={state.teacherSubjectIndex}
             columns={state.subjectList}
+            confirmButtonText="确定"
             onCancel={() => {
               state.subjectStatus = false
             }}
@@ -773,7 +780,8 @@ export default defineComponent({
 
               operatoinCatchSubjectInfo('set', {
                 defaultSubject: state.teacherSubjectId,
-                defaultSubjectName: state.teacherSubjectName
+                defaultSubjectName: state.teacherSubjectName,
+                userId: state.userId
               })
             }}
           ></Picker>

src/views/music/component/song/index.tsx

@@ -104,11 +104,14 @@ export default defineComponent({
                       : `作曲：${n.composer}`}
                   </span>
                   <div class={styles.tags}>
-                    {n?.subjectNames &&
+                    {n.musicSheetType === 'CONCERT' ? (
+                      <span>合奏</span>
+                    ) : (
+                      n?.subjectNames &&
                       n?.subjectNames
                         .split(',')
-                        .map((name: any) => <span>{name}</span>)}
-                    {n.musicSheetType === 'CONCERT' && <span>合奏</span>}
+                        .map((name: any) => <span>{name}</span>)
+                    )}
                   </div>
                 </div>
               </div>