Merge branch 'master' into jenkins

src/views/accompany/music-list.tsx

@@ -15,6 +15,7 @@ import {
   Popover,
   PullRefresh,
   Search,
+  showConfirmDialog,
   Sticky
 } from 'vant'
 import { defineComponent, reactive, ref, onMounted, nextTick, computed } from 'vue'
@@ -33,6 +34,7 @@ export default defineComponent({
   },
   setup(props, ctx) {
     const route = useRoute()
+    const router = useRouter()
     const imgDefault = getImage('icon-music.svg')
     const data = reactive({
       loading: false,
@@ -157,6 +159,17 @@ export default defineComponent({
     }
     //进入云教练
     const openView = (item: any) => {
+      if (!state.user.data.vipMember && state.platformType == 'STUDENT') {
+        showConfirmDialog({
+          message: '您暂未开通团练宝，请开通后使用'
+        })
+        .then(() => {
+          router.push({
+            path: '/memberCenter'
+          })
+        })
+        return
+      }
       let src = `${location.origin}/orchestra-music-score/?id=${item.id}`
       console.log('🚀 ~ 去云教练的src', src)
       postMessage({
@@ -176,7 +189,7 @@ export default defineComponent({
     return () => (
       <div class={styles['accompany-music-list']}>
         <OSticky
-          mode='sticky'
+          mode="sticky"
           class={styles.heade}
           onGetHeight={(height: number) => {
             document.documentElement.style.setProperty('--header-height', height + 'px')

src/views/mine-orchestra/my-class/index.tsx

@@ -32,7 +32,15 @@ export default defineComponent({
       })
     }
     const openClassDetail = (item: any) => {
-      openDefaultWebView(`/classDetail?classId=${item.id}`)
+      postMessage({
+        api: 'open_app_page',
+        content: {
+          action: 'app',
+          pageTag: 'classDetail',
+          url: '',
+          params: JSON.stringify({ classId: item.id })
+        }
+      })
     }
     const { list } = toRefs(props)
     return () => (

src/views/mine-orchestra/photo-list/index.tsx

@@ -36,7 +36,7 @@ export default defineComponent({
         const res = await request.post(`${state.platformApi}/orchestraPhotoAlbum/page`, {
           data: {
             ...data.pages,
-            orchestraId: props.orchestraId,
+            orchestraId: props.orchestraId || route.query.orchestraId,
             parentId: route.query.id
           }
         })