Jelajahi Sumber

Merge branch 'hqyDev' of http://git.dayaedu.com/lex/h5-colexiu

黄琪勇 1 tahun lalu
induk
melakukan
72a8b04336

+ 2 - 2
src/tenant/music/courseList/index.module.less

@@ -346,8 +346,8 @@
         opacity: initial;
         background: linear-gradient(
           270deg,
-          #ff9daa 0%,
-          #ff7a93 100%
+          #ff7a93 0%,
+          #ff9daa 100%
         ) !important;
       }
     }

+ 2 - 2
src/tenant/music/music-detail/new-index.module.less

@@ -435,8 +435,8 @@
         opacity: initial;
         background: linear-gradient(
           270deg,
-          #ff9daa 0%,
-          #ff7a93 100%
+          #ff7a93 0%,
+          #ff9daa 100%
         ) !important;
       }
     }

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

@@ -187,7 +187,7 @@
   border-radius: 18px;
   background-color: #fff;
   margin: 6px 12px 0px 12px;
-  min-height: 40vh;
+  min-height: 90vh;
   :global {
     .van-list__loading {
       display: none;

+ 8 - 0
src/tenant/music/train-tool/index.module.less

@@ -381,6 +381,14 @@
     .van-button {
       font-size: 18px;
       font-weight: 500;
+      &.van-button--disabled {
+        opacity: initial;
+        background: linear-gradient(
+          270deg,
+          #ff7a93 0%,
+          #ff9daa 100%
+        ) !important;
+      }
     }
   }
 }

+ 10 - 0
src/tenant/music/train-tool/index.tsx

@@ -319,6 +319,16 @@ export default defineComponent({
     }
     const routerTo = () => {
       const album = state.details
+      sessionStorage.setItem(
+        'tool-subject-type',
+        JSON.stringify({
+          activeTab: state.activeTab,
+          tenantGroupAlbumId:
+            baseState.platformType === 'STUDENT'
+              ? state.details.tenantGroupAlbumId
+              : state.details.id // 老师用专辑id当唯一值
+        })
+      )
       router.push({
         path: '/orderDetail',
         query: {