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

src/router/index-student.ts

@@ -6,7 +6,10 @@ import { postMessage } from '@/helpers/native-message'
 import routes from './routes-student'
 const router: Router = createRouter({
   history: createWebHashHistory(),
-  routes
+  routes,
+  scrollBehavior() {
+    return { left: 0, top: 0 }
+  }
 })
 
 router.beforeEach((to, from, next) => {

src/router/index-tenant.ts

@@ -6,7 +6,10 @@ import { postMessage } from '@/helpers/native-message'
 import routes from './routes-tenant'
 const router: Router = createRouter({
   history: createWebHashHistory(),
-  routes
+  routes,
+  scrollBehavior() {
+    return { left: 0, top: 0 }
+  }
 })
 
 router.beforeEach((to, from, next) => {

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

@@ -428,14 +428,14 @@ export default defineComponent({
                             state.details?.musicCounts <= 0 ? false : true
                           state.coursewareCounts =
                             state.details?.coursewareCounts <= 0 ? false : true
-                          if (state.subjectCounts) {
+                          if (state.coursewareCounts) {
+                            state.activeTab = 'COURSEWARE'
+                          } else if (state.subjectCounts) {
                             state.activeTab = 'SUBJECT'
                           } else if (state.musicCounts) {
                             state.activeTab = 'MUSIC'
                           } else if (state.ensembleCounts) {
                             state.activeTab = 'ENSEMBLE'
-                          } else if (state.coursewareCounts) {
-                            state.activeTab = 'COURSEWARE'
                           }
                           params.page = 1
                           state.list = []
@@ -522,6 +522,9 @@ export default defineComponent({
                       FetchList()
                     }}
                   >
+                    {state.coursewareCounts && (
+                      <Tab title="云教程" name="COURSEWARE"></Tab>
+                    )}
                     {state.subjectCounts && (
                       <Tab title="声部练习" name="SUBJECT"></Tab>
                     )}
@@ -531,9 +534,6 @@ export default defineComponent({
                     {state.ensembleCounts && (
                       <Tab title="合奏练习" name="ENSEMBLE"></Tab>
                     )}
-                    {state.coursewareCounts && (
-                      <Tab title="云教程" name="COURSEWARE"></Tab>
-                    )}
                   </Tabs>
                 </Sticky>
 
@@ -557,12 +557,16 @@ export default defineComponent({
                             }
                           })}
                           onItemClick={row => {
+                            sessionStorage.setItem(
+                              'tool-subject-type',
+                              state.activeTab as any
+                            )
                             router.push({
                               path: '/courseList',
                               query: {
                                 id: row.id,
                                 albumId: state.details.id,
-                                taId: state.details.tenantGroupAlbumId  // 当通过专辑查看时候 这个值为空
+                                taId: state.details.tenantGroupAlbumId // 当通过专辑查看时候 这个值为空
                               }
                             })
                           }}
@@ -605,9 +609,7 @@ export default defineComponent({
                     <Button
                       round
                       block
-                      disabled={
-                        state.details?.musicNum <= 0 || !state.hasBuyStatus
-                      }
+                      disabled={!state.hasBuyStatus}
                       color="linear-gradient(270deg, #FF204B 0%, #FE5B71 100%)"
                       onClick={onSubmit}
                     >