合并

dist/index.html

@@ -67,7 +67,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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.5fcf6b6f.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f87b3bc.js"></script>
+>>>>>>> iteration-20250107-url
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.648ab9d3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/teacher.html

@@ -64,7 +64,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.5fcf6b6f.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f87b3bc.js"></script>
+>>>>>>> iteration-20250107-url
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.e478c46e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/tenant.html

@@ -66,7 +66,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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.5fcf6b6f.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f87b3bc.js"></script>
+>>>>>>> iteration-20250107-url
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.69203f61.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/teacher/statistics/home-statistics/index.tsx

@@ -35,6 +35,7 @@ import dayjs from 'dayjs'
 import { listenerMessage, postMessage } from '@/helpers/native-message'
 import { browser, getHttpOrigin } from '@/helpers/utils'
 import { useRouter } from 'vue-router'
+import { state } from '@/state'
 
 // 注册必须的组件
 echarts.use([
@@ -255,7 +256,25 @@ export default defineComponent({
       myChart = echarts.init(
         document.getElementById('eChart') as HTMLDivElement
       )
-      getHeight()
+      // 为了处理苹果审核版本
+      if (browser().ios) {
+        request
+          .post('/api-teacher/open/appVersion', {
+            data: {
+              platform: 'ios-teacher',
+              version: state.version
+            }
+          })
+          .then(res => {
+            const checked = res.data.checked ? true : false
+            if (!checked) {
+              getHeight()
+            }
+          })
+      } else {
+        getHeight()
+      }
+
       getDetail()
     })
 
@@ -368,7 +387,9 @@ export default defineComponent({
         postMessage({
           api: 'openWebView',
           content: {
-            url: `${getHttpOrigin()}/teacher/#/home-statistics-detail?currentType=${currentType.value}`,
+            url: `${getHttpOrigin()}/teacher/#/home-statistics-detail?currentType=${
+              currentType.value
+            }`,
             orientation: 1,
             isHideTitle: false
           }
@@ -385,9 +406,6 @@ export default defineComponent({
 
     // 监听页面返回
     listenerMessage('webViewOnResume', () => {
-      // if (!isNotifyHeight.value) {
-      //   getHeight()
-      // }
       getDetail()
     })
     return () => (
@@ -408,7 +426,7 @@ export default defineComponent({
           <div class={styles.eChartTitle}>
             <div class={styles.left}>
               {/* {statisticCounts.value.time && ( */}
-                <div class={styles.time}>{statisticCounts.value.time}</div>
+              <div class={styles.time}>{statisticCounts.value.time}</div>
               {/* )} */}
 
               <div class={styles.twoItem}>