Merge branch 'feature-tianyong' into ponline

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

@@ -95,7 +95,8 @@ export default defineComponent({
       teacherSubjectId: null as any,
       teacherSubjectName: null as any,
       teacherSubjectIndex: 0,
-      subjectList: [] // 声部列表
+      subjectList: [] as any, // 声部列表
+      instrumentId: '',
     })
     // const params = reactive({
     //   keyword: (route.query.search as string) || '',
@@ -334,6 +335,7 @@ export default defineComponent({
           (item: any) => item.id == state.teacherSubjectId
         )
         state.teacherSubjectIndex = index === -1 ? 0 : index
+        state.instrumentId = index === -1 ? state.subjectList[0]?.instrumentId : state.subjectList[index]?.instrumentId
       } catch (e) {
         console.log(e)
       }
@@ -1050,7 +1052,8 @@ export default defineComponent({
                                 id: item.id,
                                 tenantAlbumId: item.tenantAlbumId,
                                 taId: state.details.tenantGroupAlbumId, // 当通过我的曲目进来的时候 这个值为空
-                                buyStatus: state.hasBuyStatus ? '0' : '1' //默认能购买
+                                buyStatus: state.hasBuyStatus ? '0' : '1', //默认能购买
+                                instrumentId: state.instrumentId
                               }
                             })
                           }}
@@ -1125,7 +1128,7 @@ export default defineComponent({
               params.page = 1
               state.finished = false
               state.list = []
-
+              state.instrumentId = val.instrumentId
               activeTypeParams()
 
               FetchList()

src/views/music/list/index.tsx

@@ -98,6 +98,9 @@ export default defineComponent({
         const subjectName = users.subjectName
           ? users.subjectName.split(',')[0]
           : ''
+        // 存储instrumentId
+        const userInstrumentId = users.instrumentId
+        localStorage.setItem('userInstrumentId', userInstrumentId)
         if (subjectId) {
           useSubjectId(
             SubjectEnum.SEARCH,
@@ -239,6 +242,8 @@ export default defineComponent({
       params.page = 1
       params.subjectIds = item.id
       data.value = null
+      subject.instrumentId = item.instrumentId
+      localStorage.setItem('userInstrumentId', item.instrumentId)
       if (baseState.platformType === 'TEACHER') {
         teacherDetaultSubject.value = {
           name: item.name,
@@ -266,7 +271,8 @@ export default defineComponent({
     const subject = reactive({
       show: false,
       name: getSubject.id ? getSubject.name : '全部声部',
-      id: getSubject.id || ''
+      id: getSubject.id || '',
+      instrumentId: localStorage.getItem('userInstrumentId') || '',
     })
 
     onMounted(async () => {
@@ -431,12 +437,14 @@ export default defineComponent({
                         location.origin +
                         location.pathname +
                         '#/music-detail?id=' +
-                        item.id
+                        item.id + 
+                        '&instrumentId=' + subject.instrumentId
                       openDefaultWebView(url, () => {
                         router.push({
                           path: '/music-detail',
                           query: {
-                            id: item.id
+                            id: item.id,
+                            instrumentId: subject.instrumentId
                           }
                         })
                       })

src/views/music/music-detail/index.tsx

@@ -1170,6 +1170,7 @@ export default defineComponent({
                         let extraParam: any = {
                           'part-index': item?.xmlValue || 0,
                           musicRenderType,
+                          instrumentId: route.query.instrumentId
                         }
                         // 有专辑id
                         if (route.query.tenantAlbumId) {