Merge branch 'share-member' into iteration_1.3.4

src/views/music/album/index.tsx

@@ -24,6 +24,29 @@ export default defineComponent({
     }
   },
   setup({ hideSearch, defauleParams }, { expose }) {
+    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 route = useRoute()
     const tempParams: any = {}
     if (state.version) {

src/views/music/list/index.tsx

@@ -35,6 +35,28 @@ export default defineComponent({
     }
   },
   setup({ hideSearch, defauleParams, onItemClick, teacherId }, { expose }) {
+    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]
+        : ''
+      if (subjectId) {
+        useSubjectId(
+          SubjectEnum.SEARCH,
+          JSON.stringify({
+            id: subjectId,
+            name: subjectName
+          }),
+          'set'
+        )
+      }
+    }
+
     localStorage.setItem('behaviorId', getRandomKey())
     const route = useRoute()
     // const router = useRouter()