Merge branch 'share-member' into iteration_1.3.4

src/views/live-class/index.tsx

@@ -14,7 +14,9 @@ import OrganSearch from '@/student/practice-class/model/organ-search'
 export default defineComponent({
   name: 'liveClass',
   data() {
-    const sessionSubjectId = sessionStorage.getItem('liveClassSubjectId')
+    const sessionSubjectId = Number(
+      sessionStorage.getItem('liveClassSubjectId')
+    )
     const subjectIds = state.user.data?.subjectId || ''
     const subjectId = subjectIds ? Number(subjectIds.split(',')[0]) : null
 
@@ -59,8 +61,7 @@ export default defineComponent({
     for (let i = 0; i < list.length; i++) {
       const subjects = (list[i] as any).subjects || []
       for (let j = 0; j < subjects.length; j++) {
-        if (userSubjectId.includes(subjects[j].id + '')) {
-          console.log('true')
+        if (userSubjectId.includes(subjects[j].id)) {
           this.params.subjectId = subjects[j].id
           this.params.subjectName = subjects[j].name
           isRest = false
@@ -68,7 +69,7 @@ export default defineComponent({
         }
       }
     }
-    console.log(isRest, 'isRest')
+    // console.log(isRest, 'isRest')
     if (isRest && list.length && (list[0] as any).subjects) {
       this.params.subjectId = (list[0] as any).subjects[0].id
       this.params.subjectName = (list[0] as any).subjects[0].name

src/views/music/search/header.tsx

@@ -15,6 +15,7 @@ import SelectTag from './select-tag'
 import { getRandomKey, musicBuy } from '../music'
 import SelectSubject from './select-subject'
 import { SubjectEnum, useSubjectId } from '@/helpers/hooks'
+import { state } from '@/state'
 
 export const mitter = mitt()
 
@@ -23,6 +24,30 @@ const selectTagRef = ref()
 export default defineComponent({
   name: 'MusicSearchHeader',
   setup() {
+    console.log(state.user.data, 'music-search-header')
+    const subjects: any = useSubjectId(SubjectEnum.SEARCH)
+    // 判断是否已有数据
+    if (!subjects.id) {
+      const users = state.user.data
+      const subjectId = users.subjectId
+        ? Number(users.subjectId.split(',')[0])
+        : ''
+      const subjectName = users.subjectName
+        ? users.subjectName.split(',')[0]
+        : ''
+      console.log(subjectName, subjectId, subjects)
+      if (subjectId) {
+        useSubjectId(
+          SubjectEnum.SEARCH,
+          JSON.stringify({
+            id: subjectId,
+            name: subjectName
+          }),
+          'set'
+        )
+      }
+    }
+
     const searchInputRef = ref()
     localStorage.setItem('behaviorId', getRandomKey())
     const router = useRouter()

src/views/music/songbook/list.tsx

@@ -14,23 +14,23 @@ export default defineComponent({
   name: 'Songbook',
   setup() {
     const router = useRouter()
-    const route = useRoute()
-    const params: any = {}
+    const params: any = {
+      myself: false
+    }
     // 学生端才会有version
     if (tempState.version) {
       params.version = tempState.version || '' // 处理ios审核版本
       params.platform =
         tempState.platformType === 'STUDENT' ? 'ios-student' : 'ios-teacher'
     }
-    const apiSuffix =
-      tempState.platformType === 'STUDENT' ? '/api-student' : '/api-teacher'
-    // if (tempState.platformType === 'TEACHER') {
-    params.myself = false
-    // }
+    console.log('music-list')
     const getSubject: any = useSubjectId(SubjectEnum.SEARCH)
     if (getSubject) {
       params.subjectIds = getSubject.id
     }
+
+    const apiSuffix =
+      tempState.platformType === 'STUDENT' ? '/api-student' : '/api-teacher'
     const { isLoading, state } = useAsyncState(
       request.post(`${apiSuffix}/music/sheet/list`, {
         data: {

src/views/video-class/index.tsx

@@ -14,7 +14,9 @@ import OrganSearch from '@/student/practice-class/model/organ-search'
 export default defineComponent({
   name: 'VideoClass',
   data() {
-    const sessionSubjectId = sessionStorage.getItem('videoClassSubjectId')
+    const sessionSubjectId = Number(
+      sessionStorage.getItem('videoClassSubjectId')
+    )
     const subjectIds = state.user.data?.subjectId || ''
     const subjectId = subjectIds ? Number(subjectIds.split(',')[0]) : null
     return {
@@ -25,7 +27,6 @@ export default defineComponent({
       dataShow: true, // 判断是否有数据
       loading: false,
       finished: false,
-      sessionSubjectId,
       params: {
         search: '',
         lessonSubject: (sessionSubjectId || subjectId || null) as any,
@@ -57,7 +58,7 @@ export default defineComponent({
     for (let i = 0; i < list.length; i++) {
       const subjects = (list[i] as any).subjects || []
       for (let j = 0; j < subjects.length; j++) {
-        if (userSubjectId.includes(subjects[j].id + '')) {
+        if (userSubjectId.includes(subjects[j].id)) {
           this.params.lessonSubject = subjects[j].id
           this.params.subjectName = subjects[j].name
           isRest = false