更新逻辑判断

src/student/live-class/index.tsx

@@ -15,7 +15,7 @@ export default defineComponent({
   name: 'liveClass',
   data() {
     const sessionSubjectId = sessionStorage.getItem('liveClassSubjectId')
-    const query = this.$route.query
+
     return {
       list: [],
       dataShow: true, // 判断是否有数据
@@ -27,7 +27,6 @@ export default defineComponent({
       sessionSubjectId,
       params: {
         search: '',
-        version: query.version || '', // 处理ios审核版本
         subjectId: (sessionSubjectId ||
           state.user.data?.subjectId ||
           null) as any,
@@ -71,7 +70,13 @@ export default defineComponent({
     },
     async getList() {
       try {
-        let params = this.params
+        const params: any = {
+          ...this.params
+        }
+        const query = this.$route.query
+        if (query.version) {
+          params.version = query.version || '' // 处理ios审核版本
+        }
         const res = await request.post(
           '/api-student/courseGroup/queryPageCourseGroup',
           {

src/student/live-class/live-item.tsx

@@ -65,10 +65,13 @@ export default defineComponent({
               </div>
               <div class={styles.liPrice}>
                 <p>
-                  <span class={styles.price}>
-                    <i>¥</i>
-                    {this.liveInfo.coursePrice}
-                  </span>
+                  {this.liveInfo.coursePrice && (
+                    <span class={styles.price}>
+                      <i>¥</i>
+                      {this.liveInfo.coursePrice}
+                    </span>
+                  )}
+
                   <span class={styles.classNum}>
                     {this.liveInfo.courseNum}课时
                   </span>

src/student/music/album/index.tsx

@@ -22,11 +22,16 @@ export default defineComponent({
   },
   setup({ hideSearch, defauleParams }, { expose }) {
     const route = useRoute()
+    const tempParams: any = {}
+    const query = route.query
+    if (query.version) {
+      tempParams.version = query.version || '' // 处理ios审核版本
+    }
     const params = reactive({
       search: (route.query.search as string) || '',
       albumTagIds: route.query.tagids || '',
-      version: route.query.version || '', // 处理ios审核版本
       page: 1,
+      ...tempParams,
       ...defauleParams
     })
     const data = ref<any>(null)

src/student/music/list/index.tsx

@@ -34,12 +34,17 @@ export default defineComponent({
   setup({ hideSearch, defauleParams, onItemClick, teacherId }, { expose }) {
     localStorage.setItem('behaviorId', getRandomKey())
     const route = useRoute()
-    const router = useRouter()
+    // const router = useRouter()
+    const tempParams: any = {}
+    const query = route.query
+    if (query.version) {
+      tempParams.version = query.version || '' // 处理ios审核版本
+    }
     const params = reactive({
       search: (route.query.search as string) || '',
       musicTagIds: route.query.tagids || '',
-      version: route.query.version || '', // 处理ios审核版本
       page: 1,
+      ...tempParams,
       ...defauleParams
     })
     const data = ref<any>(null)

src/student/music/songbook/album.tsx

@@ -10,10 +10,15 @@ export default defineComponent({
   name: 'Songbook',
   setup() {
     const route = useRoute()
+    const params: any = {}
+    const query = route.query
+    if (query.version) {
+      params.version = query.version || '' // 处理ios审核版本
+    }
     const { isLoading, state } = useAsyncState(
       request.post('/api-student/music/album/list', {
         data: {
-          version: route.query.version || '' // 处理ios审核版本
+          ...params
         }
       }),
       null

src/student/music/songbook/list.tsx

@@ -13,10 +13,15 @@ export default defineComponent({
   setup() {
     const router = useRouter()
     const route = useRoute()
+    const params: any = {}
+    const query = route.query
+    if (query.version) {
+      params.version = query.version || '' // 处理ios审核版本
+    }
     const { isLoading, state } = useAsyncState(
       request.post('/api-student/music/sheet/list', {
         data: {
-          version: route.query.version || '' // 处理ios审核版本
+          ...params
         }
       }),
       null

src/student/practice-class/practice-item.tsx

@@ -98,7 +98,12 @@ export default defineComponent({
                     <i>{this.item.expTime}</i>节
                   </span>
                   <span class={styles.priceTime}>
-                    <i>¥{this.item.subjectPrice}</i>/{this.item.courseMinutes}
+                    {this.item.subjectPrice && (
+                      <>
+                        <i>¥{this.item.subjectPrice}</i>/
+                      </>
+                    )}
+                    {this.item.courseMinutes}
                     分钟
                   </span>
                 </p>

src/student/teacher-dependent/components/live.tsx

@@ -21,7 +21,6 @@ export default defineComponent({
       params: {
         teacherId: query.teacherId,
         groupStatus: 'APPLY',
-        version: query.version || '', // 处理ios审核版本
         page: 1,
         rows: 20
       }
@@ -40,7 +39,13 @@ export default defineComponent({
     },
     async getList() {
       try {
-        let params = this.params
+        const params: any = {
+          ...this.params
+        }
+        const query = this.$route.query
+        if (query.version) {
+          params.version = query.version || '' // 处理ios审核版本
+        }
         const res = await request.post(
           '/api-student/courseGroup/queryPageCourseGroup',
           {

src/student/teacher-dependent/components/video.tsx

@@ -16,7 +16,6 @@ export default defineComponent({
       finished: false,
       params: {
         teacherId: query.teacherId,
-        version: query.version || '', // 处理ios审核版本
         page: 1,
         rows: 20
       }
@@ -28,7 +27,13 @@ export default defineComponent({
   methods: {
     async getList() {
       try {
-        let params = this.params
+        const params: any = {
+          ...this.params
+        }
+        const query = this.$route.query
+        if (query.version) {
+          params.version = query.version || '' // 处理ios审核版本
+        }
         const res = await request.post('/api-student/videoLesson/selectGroup', {
           data: {
             ...params

src/student/teacher-dependent/model/teacher-header.module.less

@@ -124,6 +124,9 @@
   }
 }
 
+.subjectList::-webkit-scrollbar {
+  display: none; /* Chrome Safari */
+}
 .subjectList {
   overflow: auto;
   width: 255px;

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

@@ -15,7 +15,6 @@ import { useRect } from '@vant/use'
 export default defineComponent({
   data() {
     const sessionSubjectId = sessionStorage.getItem('elegantSubjectId')
-    const query = this.$route.query
     return {
       sessionSubjectId,
       searchStatus: false,
@@ -24,7 +23,6 @@ export default defineComponent({
       params: {
         username: '',
         page: 1,
-        version: query.version || '', // 处理ios审核版本
         subjectId: (sessionSubjectId ||
           state.user.data?.subjectId ||
           null) as any,
@@ -64,7 +62,13 @@ export default defineComponent({
   methods: {
     async getList() {
       try {
-        const params = this.params
+        const params: any = {
+          ...this.params
+        }
+        const query = this.$route.query
+        if (query.version) {
+          params.version = query.version || '' // 处理ios审核版本
+        }
         const res = await request.post('/api-student/teacher/stylePage', {
           data: {
             ...params

src/student/video-class/index.tsx

@@ -15,7 +15,6 @@ export default defineComponent({
   name: 'VideoClass',
   data() {
     const sessionSubjectId = sessionStorage.getItem('videoClassSubjectId')
-    const query = this.$route.query
     return {
       search: '',
       list: [],
@@ -25,7 +24,6 @@ export default defineComponent({
       sessionSubjectId,
       params: {
         search: '',
-        version: query.version || '', // 处理ios审核版本
         lessonSubject: (sessionSubjectId ||
           state.user.data?.subjectId ||
           null) as any,
@@ -57,7 +55,13 @@ export default defineComponent({
   methods: {
     async getList() {
       try {
-        let params = this.params
+        const params: any = {
+          ...this.params
+        }
+        const query = this.$route.query
+        if (query.version) {
+          params.version = query.version || '' // 处理ios审核版本
+        }
         const res = await request.post('/api-student/videoLesson/selectGroup', {
           data: {
             ...params