Merge branch 'iteration-20240618'

package-lock.json

@@ -31,6 +31,7 @@
         "qrcode": "^1.5.1",
         "qrcode.vue": "^3.3.3",
         "query-string": "^7.1.1",
+        "resize-observer-polyfill": "^1.5.1",
         "swiper": "^11.0.5",
         "tcplayer.js": "^4.8.0",
         "umi-request": "^1.4.0",
@@ -7655,6 +7656,11 @@
       "resolved": "https://registry.npmmirror.com/resize-detector/-/resize-detector-0.3.0.tgz",
       "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ=="
     },
+    "node_modules/resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
     "node_modules/resolve": {
       "version": "1.22.0",
       "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.0.tgz",
@@ -15115,6 +15121,11 @@
       "resolved": "https://registry.npmmirror.com/resize-detector/-/resize-detector-0.3.0.tgz",
       "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ=="
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
     "resolve": {
       "version": "1.22.0",
       "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.0.tgz",

package.json

@@ -44,6 +44,7 @@
     "qrcode": "^1.5.1",
     "qrcode.vue": "^3.3.3",
     "query-string": "^7.1.1",
+    "resize-observer-polyfill": "^1.5.1",
     "swiper": "^11.0.5",
     "tcplayer.js": "^4.8.0",
     "umi-request": "^1.4.0",

src/student/main.ts

@@ -15,6 +15,13 @@ import { state } from '@/state'
 import qs from 'query-string'
 import { browser, setAuth } from '@/helpers/utils'
 import request from '@/helpers/request'
+import ResizeObserver from 'resize-observer-polyfill'
+
+// 增加判断如果不支持当前依赖再设置即可
+if (window.ResizeObserver === undefined) {
+  window.ResizeObserver = ResizeObserver;
+}
+
 
 const app = createApp(App)
 

src/teacher/main.ts

@@ -11,6 +11,13 @@ import 'normalize.css'
 import '../styles/index.less'
 import { state } from '@/state'
 import { browser } from '@/helpers/utils'
+import ResizeObserver from 'resize-observer-polyfill'
+
+// 增加判断如果不支持当前依赖再设置即可
+if (window.ResizeObserver === undefined) {
+  window.ResizeObserver = ResizeObserver;
+}
+
 
 const app = createApp(App)
 

src/tenant/main.ts

@@ -12,6 +12,13 @@ import '../styles/index.less'
 import '../styles/tenant.less'
 import { state } from '@/state'
 import { browser, setAuth } from '@/helpers/utils'
+import ResizeObserver from 'resize-observer-polyfill'
+
+// 增加判断如果不支持当前依赖再设置即可
+if (window.ResizeObserver === undefined) {
+  window.ResizeObserver = ResizeObserver;
+}
+
 
 const app = createApp(App)
 

src/tenant/music/music-detail/new-index.tsx

@@ -1161,6 +1161,7 @@ export default defineComponent({
                       }
                       const throttleFn = useThrottleFn(() => {
                         player.value && player.value.stop()
+                        console.log(partColumns.value, 'partColumns.value')
                         const item: any = partColumns.value.find(
                           (c: any) => c.value === staffData.partIndex
                         )
@@ -1169,7 +1170,7 @@ export default defineComponent({
                         //   (i: any) => i.track === item?.track
                         // )
                         musicBuy(musicDetail.value, () => {}, {
-                          'part-index': item.xmlValue || 0,
+                          'part-index': item?.xmlValue || 0,
                           sett: staff.radio,
                           // 1：忽略系统节拍器
                           ignoreSysMetronome:

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

@@ -12,7 +12,7 @@ import umiRequest from 'umi-request'
 import { useRoute, useRouter } from 'vue-router'
 import request from '@/helpers/request'
 import ColHeader from '@/components/col-header'
-
+import { postMessage } from '@/helpers/native-message'
 import {
   Button,
   Cell,
@@ -176,6 +176,21 @@ export default defineComponent({
         nextTick(() => {
           renderStaff()
         })
+
+        if (res.data.auditStatus === 'DOING') {
+          Dialog.confirm({
+            message: '曲目审核中',
+            showConfirmButton: true,
+            showCancelButton: false,
+            confirmButtonColor: 'var(--van-primary)'
+          }).then(() => {
+            if (browser().isApp) {
+              postMessage({ api: 'goBack' })
+            } else {
+              router.back()
+            }
+          })
+        }
       } catch (error) {
         isError.value = true
       }

yarn.lock

@@ -4421,6 +4421,11 @@
   "resolved" "https://registry.npmmirror.com/resize-detector/-/resize-detector-0.3.0.tgz"
   "version" "0.3.0"
 
+"resize-observer-polyfill@^1.5.1":
+  "integrity" "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+  "resolved" "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"
+  "version" "1.5.1"
+
 "resolve-dir@^1.0.0", "resolve-dir@^1.0.1":
   "integrity" "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg=="
   "resolved" "https://registry.npmmirror.com/resolve-dir/-/resolve-dir-1.0.1.tgz"