合并

dist/index.html

@@ -68,7 +68,11 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.e2059479.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.4049d960.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.d131b7b3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 
 </html>

dist/teacher.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.dbb65359.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/teacher.ef6bf9f3.js"></script>
+>>>>>>> iteration-20240513-text
   <link rel="modulepreload" href="./assets/index.3bfa6a0e.js">
   <link rel="modulepreload" href="./assets/routes-common.fec36607.js">
   <link rel="stylesheet" href="./assets/index.d06f6378.css">
@@ -65,7 +69,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.e2059479.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.2bc9195d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.503a8aab.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 
 </html>

src/tenant/music/train-list/index.tsx

@@ -17,6 +17,7 @@ import {
   Radio,
   RadioGroup
 } from 'vant'
+import { postMessage } from '@/helpers/native-message'
 import Search from '@/components/col-search'
 import request from '@/helpers/request'
 import { useRoute, useRouter } from 'vue-router'
@@ -30,6 +31,7 @@ import ColHeader from '@/components/col-header'
 import bgImg from '../../images/bg.png'
 import TheSticky from '@/components/the-sticky'
 import dayjs from 'dayjs'
+import { browser } from '@/helpers/utils'
 
 const noop = () => {
   //
@@ -477,14 +479,26 @@ export default defineComponent({
                   showTitleImg
                   list={data.value.rows}
                   onDetail={(item: any) => {
-                    router.push({
-                      path: '/music-detail',
-                      query: {
-                        subjectType,
-                        id: item.id,
-                        tenantAlbumId: item.tenantAlbumId
-                      }
-                    })
+                    if (browser().isApp) {
+                      const url = `${location.origin}/tenant/#/music-detail?id=${item.id}&subjectType=${subjectType}&tenantAlbumId=${item.tenantAlbumId}`
+                      postMessage({
+                        api: 'openWebView',
+                        content: {
+                          url,
+                          orientation: 1,
+                          isHideTitle: false
+                        }
+                      })
+                    } else {
+                      router.push({
+                        path: '/music-detail',
+                        query: {
+                          subjectType,
+                          id: item.id,
+                          tenantAlbumId: item.tenantAlbumId
+                        }
+                      })
+                    }
                   }}
                 />
               ) : (