Browse Source

添加版本号

lex 2 years ago
parent
commit
caed9c02db

+ 2 - 0
src/student/live-class/index.tsx

@@ -15,6 +15,7 @@ export default defineComponent({
   name: 'liveClass',
   data() {
     const sessionSubjectId = sessionStorage.getItem('liveClassSubjectId')
+    const query = this.$route.query
     return {
       list: [],
       dataShow: true, // 判断是否有数据
@@ -26,6 +27,7 @@ export default defineComponent({
       sessionSubjectId,
       params: {
         search: '',
+        version: query.version || '', // 处理ios审核版本
         subjectId: (sessionSubjectId ||
           state.user.data?.subjectId ||
           null) as any,

+ 3 - 1
src/student/live-class/live-detail.tsx

@@ -72,11 +72,13 @@ export default defineComponent({
       const coursePlanList = this.live.planList || []
       const tempObj = {
         status: false,
+        liveStatus: 0,
         roomUid: ''
       }
       coursePlanList.forEach((item: any) => {
         if (item.courseId === Number(this.courseId)) {
           tempObj.status = true
+          tempObj.liveStatus = item.liveStatus
           tempObj.roomUid = item.roomUid
         }
       })
@@ -252,7 +254,7 @@ export default defineComponent({
           </Sticky>
         )}
 
-        {this.joinRoom == '1' && this.courseInfo.length > 0 && (
+        {this.joinRoom == '1' && this.liveStatus.liveStatus !== 2 && (
           <Sticky offsetBottom={0} position="bottom">
             <div class={['btnGroup']} style={{ paddingTop: '12px' }}>
               <Button block round type="primary" onClick={this.onJoinRoom}>

+ 1 - 0
src/student/music/album/index.tsx

@@ -25,6 +25,7 @@ export default defineComponent({
     const params = reactive({
       search: (route.query.search as string) || '',
       albumTagIds: route.query.tagids || '',
+      version: route.query.version || '', // 处理ios审核版本
       page: 1,
       ...defauleParams
     })

+ 1 - 0
src/student/music/list/index.tsx

@@ -38,6 +38,7 @@ export default defineComponent({
     const params = reactive({
       search: (route.query.search as string) || '',
       musicTagIds: route.query.tagids || '',
+      version: route.query.version || '', // 处理ios审核版本
       page: 1,
       ...defauleParams
     })

+ 5 - 2
src/student/music/songbook/album.tsx

@@ -4,14 +4,17 @@ import request from '@/helpers/request'
 import { useAsyncState } from '@vueuse/core'
 import styles from './index.module.less'
 import classNames from 'classnames'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 
 export default defineComponent({
   name: 'Songbook',
   setup() {
+    const route = useRoute()
     const { isLoading, state } = useAsyncState(
       request.post('/api-student/music/album/list', {
-        data: {}
+        data: {
+          version: route.query.version || '' // 处理ios审核版本
+        }
       }),
       null
     )

+ 5 - 2
src/student/music/songbook/list.tsx

@@ -5,16 +5,19 @@ import { useAsyncState } from '@vueuse/core'
 import Item from '../list/item'
 import styles from './index.module.less'
 import { musicBuy } from '../music'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import ColResult from '@/components/col-result'
 
 export default defineComponent({
   name: 'Songbook',
   setup() {
     const router = useRouter()
+    const route = useRoute()
     const { isLoading, state } = useAsyncState(
       request.post('/api-student/music/sheet/list', {
-        data: {}
+        data: {
+          version: route.query.version || '' // 处理ios审核版本
+        }
       }),
       null
     )

+ 1 - 0
src/student/teacher-dependent/components/live.tsx

@@ -21,6 +21,7 @@ export default defineComponent({
       params: {
         teacherId: query.teacherId,
         groupStatus: 'APPLY',
+        version: query.version || '', // 处理ios审核版本
         page: 1,
         rows: 20
       }

+ 1 - 0
src/student/teacher-dependent/components/video.tsx

@@ -16,6 +16,7 @@ export default defineComponent({
       finished: false,
       params: {
         teacherId: query.teacherId,
+        version: query.version || '', // 处理ios审核版本
         page: 1,
         rows: 20
       }

+ 2 - 0
src/student/teacher-dependent/teacher-elegant.tsx

@@ -15,6 +15,7 @@ import { useRect } from '@vant/use'
 export default defineComponent({
   data() {
     const sessionSubjectId = sessionStorage.getItem('elegantSubjectId')
+    const query = this.$route.query
     return {
       sessionSubjectId,
       searchStatus: false,
@@ -23,6 +24,7 @@ export default defineComponent({
       params: {
         username: '',
         page: 1,
+        version: query.version || '', // 处理ios审核版本
         subjectId: (sessionSubjectId ||
           state.user.data?.subjectId ||
           null) as any,

+ 2 - 0
src/student/video-class/index.tsx

@@ -15,6 +15,7 @@ export default defineComponent({
   name: 'VideoClass',
   data() {
     const sessionSubjectId = sessionStorage.getItem('videoClassSubjectId')
+    const query = this.$route.query
     return {
       search: '',
       list: [],
@@ -24,6 +25,7 @@ export default defineComponent({
       sessionSubjectId,
       params: {
         search: '',
+        version: query.version || '', // 处理ios审核版本
         lessonSubject: (sessionSubjectId ||
           state.user.data?.subjectId ||
           null) as any,

+ 3 - 1
src/teacher/live-class/live-detail.tsx

@@ -69,11 +69,13 @@ export default defineComponent({
       const coursePlanList = this.live.planList || []
       const tempObj = {
         status: false,
+        liveStatus: 0,
         roomUid: ''
       }
       coursePlanList.forEach((item: any) => {
         if (item.courseId === Number(this.courseId)) {
           tempObj.status = true
+          tempObj.liveStatus = item.liveStatus
           tempObj.roomUid = item.roomUid
         }
       })
@@ -223,7 +225,7 @@ export default defineComponent({
           </Sticky>
         )}
 
-        {this.joinRoom == '1' && this.courseInfo.length > 0 && (
+        {this.joinRoom == '1' && this.liveStatus.liveStatus !== 2 && (
           <Sticky offsetBottom={0} position="bottom">
             <div class={['btnGroup']} style={{ paddingTop: '12px' }}>
               <Button block round type="primary" onClick={this.onJoinRoom}>

+ 2 - 1
src/teacher/music/list/index.tsx

@@ -57,7 +57,8 @@ export default defineComponent({
           loading={this.loading}
           error={this.error}
           finished={this.finished}
-          onLoad={this.FetchList}>
+          onLoad={this.FetchList}
+        >
           {this.list.map(item => (
             <MusicListItem data={item} />
           ))}