电量信息与评测分数重叠

dist/colexiu.html

@@ -54,7 +54,7 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-5f0dbea5.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ed79c49f.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-c1c97dcf.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/index.html

@@ -73,7 +73,7 @@
       }
     })
   </script>
-  <script type="module" crossorigin src="./assets/index-6edd926d.js"></script>
+  <script type="module" crossorigin src="./assets/index-73bcbe33.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0d0a2db9.js">
   <link rel="modulepreload" crossorigin href="./assets/index-ebf10efe.js">
   <link rel="modulepreload" crossorigin href="./assets/index-8e77d46f.js">
@@ -96,8 +96,8 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-5f0dbea5.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-c20510f6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ed79c49f.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-f837d07d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/orchestra.html

@@ -68,7 +68,7 @@
   </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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-5f0dbea5.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ed79c49f.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-cbf1971a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/report-share.html

@@ -49,7 +49,7 @@
   </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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-5f0dbea5.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ed79c49f.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-62418f46.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/page-gym/api.ts

@@ -66,5 +66,5 @@ export const lessonExaminationGetDetail = (params: any) => {
 };
 /** 添加进度评测记录 */
 export const lessonExaminationSubmit = (data: any) => {
-	return request.post(`/lessonExamination/submit`, { data });
+	return request.post(`/lessonExamination/submit`, { data, requestType: 'form' });
 };

src/report-share/gym-share/index.module.less

@@ -19,7 +19,7 @@
 
   .headHeight {
     width: 100%;
-    height: var(--header-height);
+    height: calc(var(--header-height) + var(--android-height, 0));
     transition: margin .3s;
     z-index: 10;
 
@@ -30,7 +30,7 @@
 
   .container {
     position: relative;
-    height: calc(100vh - var(--header-height) - 15px);
+    height: calc(100vh - var(--header-height) - 15px - var(--android-height, 0));
     border-radius: 10px;
     margin: 0 15px;
     overflow-x: hidden;
@@ -123,4 +123,7 @@
     fill: #CC75FF;
     stroke: #CC75FF;
   }
+}
+.android{
+  --android-height: 14px;
 }

src/report-share/gym-share/index.tsx

@@ -2,7 +2,7 @@ import { Skeleton } from "vant";
 import { defineComponent, onBeforeMount, onBeforeUnmount, onMounted, reactive, Transition } from "vue";
 import { formateTimes } from "../../helpers/formateMusic";
 import state, { isRhythmicExercises } from "../../state";
-import { setGlobalData } from "../../utils";
+import { browser, setGlobalData } from "../../utils";
 import MusicScore, { resetMusicScore } from "../../view/music-score";
 import styles from "./index.module.less";
 import { api_cloudLoading, api_setStatusBarVisibility, isSpecialShapedScreen } from "/src/helpers/communication";
@@ -26,6 +26,7 @@ const colorsClass: any = {
 export default defineComponent({
 	name: "music-list",
 	setup() {
+		const browserInfo = browser()
 		const query: any = getQuery();
 		const route = useRoute()
 		const paramsId = route.params.id as string;
@@ -161,7 +162,7 @@ export default defineComponent({
 		});
 
 		return () => (
-			<div class={[styles.shareBox, styles.detail, state.setting.eyeProtection && "eyeProtection"]} style={{ paddingLeft: detailData.paddingLeft }}>
+			<div class={[styles.shareBox, styles.detail, state.setting.eyeProtection && "eyeProtection", browserInfo.android && styles.android]} style={{ paddingLeft: detailData.paddingLeft }}>
 				{!state.musicRendered && (
 					<div class={styles.skeleton}>
 						<Skeleton class={styles.skeleton} row={8} />

src/report-share/gym-share/share-top/index.module.less

@@ -7,7 +7,7 @@
     flex-shrink: 0;
     padding: 8px 10px;
     padding-bottom: 0;
-
+    padding-top: var(--android-height, 8px);
 }
 
 .back {
@@ -42,7 +42,6 @@
             font-size: 12px;
             color: #fff;
             line-height: 14px;
-            margin-bottom: 6px;
             font-weight: bold;
         }
 

src/report-share/gym-share/share-top/index.tsx

@@ -11,6 +11,7 @@ import videobg from "./image/videobg.png";
 import "plyr/dist/plyr.css";
 import Plyr from "plyr";
 import { nextTick } from "vue";
+import { browser } from "/src/utils";
 
 type IItemType = "intonation" | "cadence" | "integrity";