Merge branch 'online' into 2023-9-5_简谱和节奏

dist/index.html

@@ -12,7 +12,7 @@
   <script src="./flexible.js"></script>
   <script src="./abc2svg/xml2abc.js"></script>
   <script src="./abc2svg/jquery-1.11.1.min.js"></script>
-  <script type="module" crossorigin src="./assets/index-645f534c.js"></script>
+  <script type="module" crossorigin src="./assets/index-6929d84d.js"></script>
   <link rel="stylesheet" href="./assets/index-e441ae60.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>
@@ -23,7 +23,7 @@
   
   <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-2011adef.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-4f7c13f8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-cc353a9a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

src/pc/App.tsx

@@ -40,19 +40,6 @@ export default defineComponent({
 		};
 		const setUser = async () => {
 			const res = await getUserInfo();
-			// 重新登录
-			if (res.code === 5000) {
-				const browserInfo = browser();
-				showToast(res.message);
-				if (browserInfo.isApp) {
-					postMessage({ api: "login" });
-				} else {
-					window.location.href = `${
-						/(192|localhost)/.test(location.origin) ? "https://test.lexiaoya.cn" : location.origin
-					}/classroom`;
-				}
-				return;
-			}
 			const info = res?.data || {};
 			setUserInfo(info);
 			// console.log("🚀 ~ res:", res);

src/pc/create/index.tsx

@@ -10,6 +10,7 @@ import ABCJS from "abcjs";
 import { usePageVisibility } from "@vant/use";
 import UploadToResources from "../component/upload-to-resources";
 import { getQuery } from "/src/utils/queryString";
+import { browser } from "/src/utils";
 
 export default defineComponent({
 	name: "Create",

src/pc/home/index.tsx

@@ -1561,7 +1561,7 @@ export default defineComponent({
 			console.log("🚀 ~ pngUrl:", pngUrl);
 			try {
 				if (query.id) {
-					await api_musicSheetCreationUpdate({
+					const res = await api_musicSheetCreationUpdate({
 						name: data.musicName || "未命名乐谱",
 						creator: data.creator || "未命名乐谱",
 						creationConfig: renderMeasures(abcData.abc, {

src/utils/request.ts

@@ -50,7 +50,21 @@ request.interceptors.response.use(
 			throw new Error(msg);
 		}
 		const data = await res.clone().json();
-
+		if (data.code === 5000) {
+			// 判断是否在应用中
+			window.parent.postMessage(
+			{
+				api: "onLogin",
+			},
+			"*"
+			);
+			setTimeout(() => {
+				window.location.href = `${
+					/(192|localhost)/.test(location.origin) ? "https://test.lexiaoya.cn" : location.origin
+				}/classroom`;
+			}, 500)
+			return;
+		}
 		if (data.code !== 200 && data.errCode !== 0) {
 			const msg = data.msg || data.message || "处理失败，请重试";
 			if (data.code === 5000){
@@ -61,6 +75,7 @@ request.interceptors.response.use(
 			}
 			throw new Error(msg);
 		}
+		
 		return data;
 	},
 	{ global: false }

vite.config.ts

@@ -48,8 +48,8 @@ export default defineConfig({
 		// https: true,
 		proxy: {
 			"^/edu-app/.*": {
-				// target: "https://test.lexiaoya.cn",
-				target: "https://dev.kt.colexiu.com",
+				target: "https://test.lexiaoya.cn",
+				// target: "https://dev.kt.colexiu.com",
 				changeOrigin: true,
 				// rewrite: (path) => path.replace(/^\/edu-app/, ""),
 			},