Merge branch 'iteration_1.3.4' into dev

src/helpers/hooks.ts

@@ -5,7 +5,10 @@ import request from './request'
 export const SubjectEnum = {
   SEARCH: 'music-songbook-subject',
   ALBUM: 'music-album-subject',
-  MUSIC: 'music-subject'
+  MUSIC: 'music-subject',
+  LIVE: 'live-subject',
+  VIDEO: 'video-subject',
+  ELEGANT: 'elegant-subject'
 }
 /**
  * 获取声部编号 | 保存声部编号

src/student/teacher-dependent/teacher-elegant.tsx

@@ -12,10 +12,13 @@ import iconTeacher from '@common/images/icon_teacher.png'
 import iconUploadPoster from '@common/images/icon_upload_poster.png'
 import bars from '@common/svg/bars.svg'
 import { useRect } from '@vant/use'
+import { SubjectEnum, useSubjectId } from '@/helpers/hooks'
 
 export default defineComponent({
   data() {
-    const sessionSubjectId = sessionStorage.getItem('elegantSubjectId')
+    // const sessionSubjectId = sessionStorage.getItem('elegantSubjectId')
+    const subjects: any = useSubjectId(SubjectEnum.ELEGANT)
+    const sessionSubjectId = Number(subjects.id)
     return {
       sessionSubjectId,
       searchStatus: false,
@@ -52,7 +55,7 @@ export default defineComponent({
     this.params.subjectName = subjectName || state.user.data?.subjectName || ''
     await this.getList()
     sessionStorage.removeItem('teacherHomeTabs')
-    sessionStorage.removeItem('elegantSubjectId')
+    // sessionStorage.removeItem('elegantSubjectId')
   },
   computed: {
     filterDot() {
@@ -97,6 +100,16 @@ export default defineComponent({
       this.loading = false
       this.finished = false
       this.searchStatus = false
+      if (this.params.subjectId) {
+        useSubjectId(
+          SubjectEnum.ELEGANT,
+          JSON.stringify({
+            id: this.params.subjectId,
+            name: this.params.subjectName
+          }),
+          'set'
+        )
+      }
       this.getList()
     },
     onSearch(_search?: any) {
@@ -104,8 +117,8 @@ export default defineComponent({
       this.onSort()
     },
     onDetail(item: any) {
-      this.params.subjectId &&
-        sessionStorage.setItem('elegantSubjectId', this.params.subjectId)
+      // this.params.subjectId &&
+      //   sessionStorage.setItem('elegantSubjectId', this.params.subjectId)
       this.$router.push({
         path: '/teacherHome',
         query: {

src/views/coupons/item.tsx

@@ -35,6 +35,7 @@ export default defineComponent({
           if (item.disabled) return
           this.onClick(item)
         }}
+        key={item.couponIssueId}
       >
         {/* 可使用的优惠券 & 有选择按钮的 */}
         {item.useState === 'USABLE' && this.isSelect && (

src/views/live-class/index.tsx

@@ -10,13 +10,13 @@ import LiveItem from './live-item'
 import banner from '../video-class/images/banner.png'
 import { state } from '@/state'
 import OrganSearch from '@/student/practice-class/model/organ-search'
+import { SubjectEnum, useSubjectId } from '@/helpers/hooks'
 
 export default defineComponent({
   name: 'liveClass',
   data() {
-    const sessionSubjectId = Number(
-      sessionStorage.getItem('liveClassSubjectId')
-    )
+    const subjects: any = useSubjectId(SubjectEnum.LIVE)
+    const sessionSubjectId = Number(subjects.id)
     const subjectIds = state.user.data?.subjectId || ''
     const subjectId = subjectIds ? Number(subjectIds.split(',')[0]) : null
 
@@ -74,7 +74,6 @@ export default defineComponent({
       this.params.subjectId = (list[0] as any).subjects[0].id
       this.params.subjectName = (list[0] as any).subjects[0].name
     }
-    sessionStorage.removeItem('liveClassSubjectId')
     this.getList()
   },
   methods: {
@@ -85,6 +84,16 @@ export default defineComponent({
       this.loading = false
       this.finished = false
       this.searchStatus = false
+      if (this.params.subjectId) {
+        useSubjectId(
+          SubjectEnum.LIVE,
+          JSON.stringify({
+            id: this.params.subjectId,
+            name: this.params.subjectName
+          }),
+          'set'
+        )
+      }
       this.getList()
     },
     onSearch(value: string) {
@@ -132,8 +141,6 @@ export default defineComponent({
       }
     },
     onDetail(item: any) {
-      this.params.subjectId &&
-        sessionStorage.setItem('liveClassSubjectId', this.params.subjectId)
       const params: any = {
         groupId: item.courseGroupId
       }

src/views/video-class/index.tsx

@@ -10,13 +10,13 @@ import request from '@/helpers/request'
 import ColResult from '@/components/col-result'
 import { state } from '@/state'
 import OrganSearch from '@/student/practice-class/model/organ-search'
+import { SubjectEnum, useSubjectId } from '@/helpers/hooks'
 
 export default defineComponent({
   name: 'VideoClass',
   data() {
-    const sessionSubjectId = Number(
-      sessionStorage.getItem('videoClassSubjectId')
-    )
+    const subjects: any = useSubjectId(SubjectEnum.VIDEO)
+    const sessionSubjectId = Number(subjects.id)
     const subjectIds = state.user.data?.subjectId || ''
     const subjectId = subjectIds ? Number(subjectIds.split(',')[0]) : null
     return {
@@ -70,7 +70,6 @@ export default defineComponent({
       this.params.lessonSubject = (list[0] as any).subjects[0].id
       this.params.subjectName = (list[0] as any).subjects[0].name
     }
-    sessionStorage.removeItem('videoClassSubjectId')
     this.getList()
   },
   methods: {
@@ -120,6 +119,16 @@ export default defineComponent({
       this.loading = false
       this.finished = false
       this.searchStatus = false
+      if (this.params.lessonSubject) {
+        useSubjectId(
+          SubjectEnum.VIDEO,
+          JSON.stringify({
+            id: this.params.lessonSubject,
+            name: this.params.subjectName
+          }),
+          'set'
+        )
+      }
       this.getList()
     },
     onSearch(val: string) {