liushengqiang 2 years ago
parent
commit
ca15da2c5c

File diff suppressed because it is too large
+ 0 - 0
dist/assets/colexiu-5bdb7d5a.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/colexiu-legacy-ed782b75.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-21a88d2d.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-47514c6d.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-487abad7.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-62526fe3.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-93e6cba1.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-c1bb6d4e.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy-12060657.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy-9280a8eb.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy-c2b00c77.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/orchestra-6ee9a738.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/orchestra-legacy-fe57726b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/polyfills-legacy-2e109892.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/report-share-b0082f0b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/report-share-legacy-1f23aac5.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/vue3-lottie.es-d017246f.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/vue3-lottie.es-legacy-eec57aea.js


+ 6 - 6
dist/colexiu.html

@@ -38,10 +38,10 @@
       },
     })
   </script>
-  <script type="module" crossorigin src="./assets/colexiu-2bca0639.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-8d1a6eb6.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-e9a7b81d.js">
-  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-8ef8a36c.js">
+  <script type="module" crossorigin src="./assets/colexiu-5bdb7d5a.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-487abad7.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-93e6cba1.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d017246f.js">
   <link rel="stylesheet" href="./assets/index-27e2d8d2.css">
   <link rel="stylesheet" href="./assets/index-fc8404d2.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -54,8 +54,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-ff5e52b9.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-a0b4dc2d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2e109892.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-ed782b75.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 6 - 6
dist/index.html

@@ -73,12 +73,12 @@
       }
     })
   </script>
-  <script type="module" crossorigin src="./assets/index-62526fe3.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-8d1a6eb6.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-e9a7b81d.js">
+  <script type="module" crossorigin src="./assets/index-47514c6d.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-487abad7.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-93e6cba1.js">
   <link rel="stylesheet" href="./assets/index-27e2d8d2.css">
   <link rel="stylesheet" href="./assets/index-fc8404d2.css">
-  <link rel="stylesheet" href="./assets/index-c1bb6d4e.css">
+  <link rel="stylesheet" href="./assets/index-21a88d2d.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -92,8 +92,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-ff5e52b9.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-07283914.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2e109892.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-c2b00c77.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 6 - 6
dist/orchestra.html

@@ -39,10 +39,10 @@
       transition: opacity .3s;
     }
   </style>
-  <script type="module" crossorigin src="./assets/orchestra-9fbc587d.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-8d1a6eb6.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-e9a7b81d.js">
-  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-8ef8a36c.js">
+  <script type="module" crossorigin src="./assets/orchestra-6ee9a738.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-487abad7.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-93e6cba1.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d017246f.js">
   <link rel="stylesheet" href="./assets/index-27e2d8d2.css">
   <link rel="stylesheet" href="./assets/index-fc8404d2.css">
   <link rel="stylesheet" href="./assets/orchestra-2d26b0c9.css">
@@ -66,8 +66,8 @@
   </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-ff5e52b9.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-f191bd0b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2e109892.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-fe57726b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 4 - 4
dist/report-share.html

@@ -23,8 +23,8 @@
       transition: opacity .3s;
     }
   </style>
-  <script type="module" crossorigin src="./assets/report-share-17a43c64.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-8d1a6eb6.js">
+  <script type="module" crossorigin src="./assets/report-share-b0082f0b.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-487abad7.js">
   <link rel="stylesheet" href="./assets/index-27e2d8d2.css">
   <link rel="stylesheet" href="./assets/report-share-c00bfd89.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
@@ -47,8 +47,8 @@
   </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-ff5e52b9.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-c035b99c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2e109892.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-1f23aac5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 1 - 2
src/page-gym/evaluat-model/index.tsx

@@ -33,7 +33,6 @@ export default defineComponent({
 		const evaluatModel = reactive({
 			tips: true,
 			evaluatUpdateAudio: false,
-			isSaveVideo: state.setting.camera && state.setting.saveToAlbum,
 			shareMode: false,
 		});
 		/**
@@ -184,7 +183,7 @@ export default defineComponent({
 				return;
 			}
 			let res = null;
-			if (evaluatModel.isSaveVideo) {
+			if (state.setting.camera && state.setting.saveToAlbum) {
 				res = await api_videoUpdate();
 			}
 			api_proxyServiceMessage({

+ 2 - 5
src/page-gym/header-top/index.module.less

@@ -53,9 +53,6 @@
             width: 20px;
             height: 20px;
         }
-        &.disabled{
-            opacity: .8;
-        }
     }
     .badge{
         :global{
@@ -69,7 +66,7 @@
     }
 }
 
-.disable{
-    pointer-events: none;
+.disabled{
+    pointer-events: none !important;
     opacity: .6;
 }

+ 23 - 6
src/page-gym/header-top/index.tsx

@@ -33,6 +33,21 @@ export default defineComponent({
 		const toggleEvaluat = () => {
 			handleStartEvaluat();
 		};
+
+		/** 原声按钮 */
+		const originBtn = computed(() => {
+			// 评测开始 禁用
+			if (state.modeType === "evaluating") return { display: true, disabled: true };
+			// 原声, 伴奏 少一个,就不能切换
+			if (!state.music || !state.accompany) return { display: true, disabled: true}
+
+			return {
+				disabled: false,
+				display: true,
+			};
+		});
+
+
 		/** 退出 */
 		const handleBack = () => {
 			handleNoEndExit()
@@ -53,21 +68,23 @@ export default defineComponent({
 						<img class={styles.iconBtn} src={state.modeType === "evaluating" ? icons.evaluating2 : icons.evaluating} />
 						<span>评测</span>
 					</div>
-					<div class={[styles.btn, disabledList.includes(state.modeType) && styles.disable]} id="tips-step-4" onClick={() => handleChangeSection()}>
+					<div class={[styles.btn, disabledList.includes(state.modeType) && styles.disabled]} id="tips-step-4" onClick={() => handleChangeSection()}>
 						<img class={styles.iconBtn} src={headImg(`section${state.section.length}.svg`)} />
 						{/* <Button class={styles.button} icon={Icons["section" + state.section.length]} color="#01C1B5" disabled={runtime.isFirstPlay || runtime.evaluatingStatus || isHomework} onClick={this.authBefore("excerpts", RuntimeUtils.sectionChange)} /> */}
 						<span>选段</span>
 					</div>
-					<div class={[styles.btn, disabledList.includes(state.modeType) && styles.disable]} id="tips-step-5" onClick={() => togglePlay()}>
+					<div class={[styles.btn, disabledList.includes(state.modeType) && styles.disabled]} id="tips-step-5" onClick={() => togglePlay()}>
 						<div class={styles.btnWrap}>
 							<img style={{ marginTop: "-1px" }} class={styles.iconBtn} src={state.playState === "paused" ? icons.play : icons.pause} />
 							<Circle class={styles.progress} stroke-width={80} currentRate={state.playProgress} rate={100} layerColor="#01C1B5" color="#FFC830" />
 						</div>
 						<span>{state.playState === "play" ? "暂停" : "播放"}</span>
 					</div>
+
+					{/* 原声 伴奏 */}
 					<div
-						class={[styles.btn, disabledList.includes(state.modeType) && styles.disable]}
 						id="tips-step-6"
+						class={[styles.btn, originBtn.value.disabled && styles.disabled]}
 						onClick={() => {
 							state.playSource = state.playSource === "music" ? "background" : "music";
 						}}
@@ -95,7 +112,7 @@ export default defineComponent({
 						<img style={{ display: !metronomeData.disable ? "block" : "none" }} class={styles.iconBtn} src={headImg("tickon.png")} />
 						<span style={{ whiteSpace: "nowrap" }}>节拍器</span>
 					</div>
-					<div class={[styles.btn, disabledList.includes(state.modeType) && styles.disable]} id="tips-step-7" onClick={() => handleResetPlay()}>
+					<div class={[styles.btn, disabledList.includes(state.modeType) && styles.disabled]} id="tips-step-7" onClick={() => handleResetPlay()}>
 						<img class={styles.iconBtn} src={headImg("replay.svg")} />
 						<span>重播</span>
 					</div>
@@ -105,7 +122,7 @@ export default defineComponent({
 							reference: () => (
 								<div
 									id="tips-step-8"
-									class={[styles.btn, disabledList.includes(state.modeType) && styles.disable]}
+									class={[styles.btn, disabledList.includes(state.modeType) && styles.disabled]}
 									onClick={(e: Event) => {
 										e.stopPropagation();
 										headData.speedShow = !headData.speedShow;
@@ -120,7 +137,7 @@ export default defineComponent({
 							default: () => <Speed />,
 						}}
 					</Popover>
-					<div class={[styles.btn, disabledList.includes(state.modeType) && styles.disable]} onClick={() => (headerData.settingMode = true)}>
+					<div class={[styles.btn, disabledList.includes(state.modeType) && styles.disabled]} onClick={() => (headerData.settingMode = true)}>
 						<img class={styles.iconBtn} src={headImg("menu.svg")} />
 						<span>设置</span>
 					</div>

Some files were not shown because too many files changed in this diff