浏览代码

Merge branch 'iteration-20231220' into jenkins

lex 1 年之前
父节点
当前提交
43cc668ee9
共有 3 个文件被更改,包括 6 次插入12 次删除
  1. 1 9
      dev-dist/sw.js
  2. 2 0
      src/views/login/index.tsx
  3. 3 3
      src/views/notation/index.tsx

+ 1 - 9
dev-dist/sw.js

@@ -82,15 +82,7 @@ define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "revision": "0.k7bsiovsl3g"
-=======
-    "revision": "0.20pddlvkgi"
->>>>>>> iteration-beat-one
-=======
-    "revision": "0.36fmohjk2ko"
->>>>>>> iteration-20231220
+    "revision": "0.9thjqef35d8"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

+ 2 - 0
src/views/login/index.tsx

@@ -99,6 +99,8 @@ export default defineComponent({
     });
 
     onMounted(async () => {
+      // 删除打谱里面上传记录
+      sessionStorage.removeItem('task-upload-music');
       // const relatedApps = await navigator?.getInstalledRelatedApps();
       //
     });

+ 3 - 3
src/views/notation/index.tsx

@@ -23,9 +23,9 @@ export default defineComponent({
     const data = reactive({
       src: `${
         /(192|localhost)/.test(location.origin)
-          ? // ?
-            'https://test.lexiaoya.cn'
-          : // 'http://localhost:3050'
+          ? // 'https://test.lexiaoya.cn'
+            'http://localhost:3050'
+          : //
             location.origin
       }/notation/#/create?v=${Date.now()}&Authorization=${Authorization}${openCreateUrl}`
       //   src: `http://localhost:3050/#/create?Authorization=${Authorization}`