合并

dist/index.html

@@ -66,7 +66,11 @@
   <div id="app"></div>
   
   <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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f056efe.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.7cb49db8.js"></script>
+>>>>>>> iteration-20250108-loadingFix
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.08d35fee.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/school.html

@@ -66,7 +66,11 @@
   <div id="app"></div>
   
   <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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f056efe.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.7cb49db8.js"></script>
+>>>>>>> iteration-20250108-loadingFix
   <script nomodule id="vite-legacy-entry" data-src="./assets/school-legacy.a2e5e7c5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/teacher.html

@@ -66,7 +66,11 @@
   <div id="app"></div>
   
   <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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f056efe.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.7cb49db8.js"></script>
+>>>>>>> iteration-20250108-loadingFix
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.962fde92.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/views/coursewarePlay/index.tsx

@@ -424,6 +424,7 @@ export default defineComponent({
 
     /** 从搜索页面来的 */
     const getSearchDetail = async (params: { type?: string, id?: any, search?: string }) => {
+      data.searchLoading = true
       try {
         const res = await request.post(
           state.platformApi +
@@ -584,6 +585,8 @@ export default defineComponent({
         return true
       } catch (error) {
         console.log(error);
+      } finally {
+        data.searchLoading = false
       }
     }
 
@@ -1627,6 +1630,18 @@ export default defineComponent({
                 open={popupData.open}
                 onHandleSelect={(res: any) => {
                   if(data.source !== "search") {
+                    const tempList: any[] = []
+                    detailTempSearchList.value?.forEach((item: any) => {
+                      if(Array.isArray(item.list)) {
+                        tempList.push(...item.list)
+                      }
+                    })
+                    const item = tempList.find((n: any) => n.id == res.itemActive)
+                    const parentItem = detailTempSearchList.value?.find((n: any) => n.lessonCoursewareDetailId == item?.lessonCoursewareDetailId)
+                    if(String(parentItem?.accessScope) === '1') {
+                      const hasVip = handleCheckVip(false)
+                      if (!hasVip) return
+                    }
                     if (browser().isApp) {
                       postMessage({
                         api: 'openWebView',
@@ -1683,7 +1698,6 @@ export default defineComponent({
                   popupData.open = false;
                 }}
                 onHandleSearch={async (val: any) => {
-                  data.searchLoading = true
                   detailTempSearchList.value = []
                   if(data.source === 'search') {
                     await getSearchDetail({
@@ -1698,7 +1712,6 @@ export default defineComponent({
                     })
                   }
                   data.searchTemp = val.search;
-                  data.searchLoading = false
                 }} /> :
                 <Points
                 data={data.knowledgePointList}