lex-xin 7 months ago
parent
commit
3acc084c6f

+ 0 - 1
src/teacher/main.ts

@@ -43,7 +43,6 @@ postMessage(
   },
   (res: any) => {
     state.version = res.content.version
-    console.log(res, 'version')
   }
 )
 

+ 2 - 0
src/teacher/statistics/home-statistics-detail/list/index.tsx

@@ -124,6 +124,8 @@ export default defineComponent({
           currentType={'MONTH'}
           onConfirm={(val: any) => {
             // currentType.value = val
+            state.params.page = 1
+            tableList.value = []
             timeRange.value = val
             getDetail()
             getList()

+ 4 - 5
src/teacher/teacher-cert/index.tsx

@@ -29,11 +29,10 @@ export default defineComponent({
       teacherState.authStatus =
         entryStatus === 'DOING' || entryStatus === 'PASS' ? true : false
       // 如果已经认证,则不用获取声部信息
-      // if (teacherState.authStatus) {
-      //   teacherState.active = teacherState.authStatus ? 4 : 1
-      //   return
-      // }
-      teacherState.active = 1
+      if (teacherState.authStatus) {
+        teacherState.active = teacherState.authStatus ? 4 : 1
+        return
+      }
 
       if (teacherState.subjectList.length <= 0) {
         const res = await request.get('/api-teacher/subject/subjectSelect')

+ 3 - 3
src/views/music/list/index.tsx

@@ -171,7 +171,7 @@ export default defineComponent({
       musicSortType: (route.query.type as string) || '',
       // exquisiteFlag: 1,
       musicTagIds: route.query.tagids || '', // 标签
-      changeType: '', // 曲目类型
+      chargeType: '', // 曲目类型
       page: 1,
       ...defauleParams,
       ...tempParams
@@ -640,7 +640,7 @@ export default defineComponent({
                   type="default"
                   onClick={() => {
                     searchObj.tagId = JSON.parse(JSON.stringify(params.musicTagIds))
-                    searchObj.chargeType = JSON.parse(JSON.stringify(params.changeType))
+                    searchObj.chargeType = JSON.parse(JSON.stringify(params.chargeType))
                   }}
                 >
                   重置
@@ -651,7 +651,7 @@ export default defineComponent({
                   type="primary"
                   onClick={() => {
                     params.musicTagIds = JSON.parse(JSON.stringify(searchObj.tagId))
-                    params.changeType = JSON.parse(JSON.stringify(searchObj.chargeType))
+                    params.chargeType = JSON.parse(JSON.stringify(searchObj.chargeType))
                     data.value = null
                     params.page = 1
                     FetchList()

+ 1 - 1
src/views/music/music-detail/index.tsx

@@ -1142,7 +1142,7 @@ export default defineComponent({
                         } else if(staff.radio === 'FIRST') {
                           musicRenderType = 'firstTone'
                         }
-                        let extraParam: any = {
+                        const extraParam: any = {
                           // 'part-index': currentColumn.value.track || 0,
                           'part-name': encodeURIComponent(currentColumn.value?.track?.trim() || ''),
                           musicRenderType,

+ 22 - 10
src/views/music/music.ts

@@ -25,15 +25,27 @@ export const musicBuy = (item: any, callBack?: any, moreQuery = {}) => {
     }
   })
   console.log(url)
-  postMessage({
-    api: 'openAccompanyWebView',
-    content: {
-      url,
-      // url: 'http://192.168.3.13:3000/colexiu.html?id=' + item.id,
-      orientation: 0,
-      isHideTitle: true,
-      statusBarTextColor: false,
-      isOpenLight: true
-    }
+  //   postMessage({
+  //     api: 'openAccompanyWebView',
+  //     content: {
+  //       url,
+  //       // url: 'http://192.168.3.13:3000/colexiu.html?id=' + item.id,
+  //       orientation: 0,
+  //       isHideTitle: true,
+  //       statusBarTextColor: false,
+  //       isOpenLight: true
+  //     }
+  //   })
+  requestAnimationFrame(() => {
+      postMessage({
+      api: 'openAccompanyWebView',
+      content: {
+        url,
+        orientation: 0,
+        isHideTitle: true,
+        statusBarTextColor: false,
+        isOpenLight: true
+      }
+    })
   })
 }