合并

dist/assets/arrow-left-background.781af018.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>箭头</title>
-    <g id="云教练2版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="云练习2版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="画板" transform="translate(-21.000000, -19.000000)">
             <g id="箭头" transform="translate(21.000000, 19.000000)">
                 <circle id="椭圆形" fill="#01C1B5" cx="16" cy="16" r="16"></circle>

dist/assets/arrow-left-legacy.2edb331d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.2edb331d.js
 !function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.bec7de9b.js"],(function(e){"use strict";var r,c,t,n;return{setters:[function(e){r=e.M},function(e){c=e.d,t=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",c({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return t("div",{onClick:this.onClick,class:i},[t("img",{class:a,src:r},null),t(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?t("img",{class:s,src:"/orchestra-music-score/assets/arrow.c0b252e8.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.fecfe01d.svg")}}}))}();
+========
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.6e4d6664.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.c0b252e8.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.fecfe01d.svg")}}}))}();
+>>>>>>>> iteration-20240513-text:dist/assets/arrow-left-legacy.dee40ffb.js

dist/assets/arrow-left-legacy.dee40ffb.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.2edb331d.js
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.bec7de9b.js"],(function(e){"use strict";var r,c,t,n;return{setters:[function(e){r=e.M},function(e){c=e.d,t=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",c({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return t("div",{onClick:this.onClick,class:i},[t("img",{class:a,src:r},null),t(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?t("img",{class:s,src:"/orchestra-music-score/assets/arrow.c0b252e8.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.fecfe01d.svg")}}}))}();
+========
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.6e4d6664.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.c0b252e8.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.fecfe01d.svg")}}}))}();
+>>>>>>>> iteration-20240513-text:dist/assets/arrow-left-legacy.dee40ffb.js

dist/assets/arrow-left.703b2ec0.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.d305bceb.js
+import{M as e}from"./music.b35eb5be.js";import{d as o,a as t,V as r}from"./App.193ca87e.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.c0b252e8.svg",_=o({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:e},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),v="/orchestra-music-score/assets/arrow-left.fecfe01d.svg";export{v as I,_ as T};
+========
+import{M as e}from"./music.b35eb5be.js";import{d as o,a as t,V as r}from"./App.53266465.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.c0b252e8.svg",_=o({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:e},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),v="/orchestra-music-score/assets/arrow-left.fecfe01d.svg";export{v as I,_ as T};
+>>>>>>>> iteration-20240513-text:dist/assets/arrow-left.703b2ec0.js

dist/assets/arrow-left.d305bceb.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.d305bceb.js
 import{M as e}from"./music.b35eb5be.js";import{d as o,a as t,V as r}from"./App.193ca87e.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.c0b252e8.svg",_=o({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:e},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),v="/orchestra-music-score/assets/arrow-left.fecfe01d.svg";export{v as I,_ as T};
+========
+import{M as e}from"./music.b35eb5be.js";import{d as o,a as t,V as r}from"./App.53266465.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.c0b252e8.svg",_=o({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:e},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),v="/orchestra-music-score/assets/arrow-left.fecfe01d.svg";export{v as I,_ as T};
+>>>>>>>> iteration-20240513-text:dist/assets/arrow-left.703b2ec0.js

dist/assets/arrow-left.fecfe01d.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>返回箭头备份</title>
-    <g id="云教练2版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="云练习2版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="画板" transform="translate(-27.000000, -123.000000)">
             <g id="返回箭头备份" transform="translate(43.000000, 139.000000) scale(-1, 1) translate(-43.000000, -139.000000) translate(27.000000, 123.000000)">
                 <circle id="椭圆形" fill="#FFFFFF" cx="16" cy="16" r="16"></circle>

dist/assets/arrow.c0b252e8.svg

@@ -3,7 +3,7 @@
     <!-- Generator: Sketch 62 (91390) - https://sketch.com -->
     <title>编组</title>
     <desc>Created with Sketch.</desc>
-    <g id="云教练" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="云练习" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="画板备份" transform="translate(-212.000000, -29.000000)" fill="#01C1B5" fill-rule="nonzero">
             <g id="编组-4" transform="translate(51.000000, 17.000000)">
                 <g id="编组" transform="translate(165.333333, 18.000000) rotate(-360.000000) translate(-165.333333, -18.000000) translate(161.000000, 12.000000)">

dist/assets/colexiu-legacy.8c2f2a5a.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.6e4d6664.js","./main-legacy.8916d1c2.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/colexiu.8adb9ed6.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.d850ab64.js
+import"./App.193ca87e.js";import"./main.91bc83fa.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.53266465.js";import"./main.f74ee3b0.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> iteration-20240513-text:dist/assets/colexiu.8adb9ed6.js

dist/assets/colexiu.d850ab64.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.d850ab64.js
 import"./App.193ca87e.js";import"./main.91bc83fa.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.53266465.js";import"./main.f74ee3b0.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> iteration-20240513-text:dist/assets/colexiu.8adb9ed6.js

dist/assets/icon-back.c23f1b59.svg

@@ -33,7 +33,7 @@
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="云教练主界面" transform="translate(-35.000000, -22.000000)">
+        <g id="云练习主界面" transform="translate(-35.000000, -22.000000)">
             <g id="编组-11" transform="translate(35.000000, 22.000000)">
                 <g id="椭圆形">
                     <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>

dist/assets/index-legacy.6eb0dfab.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.6e4d6664.js","./main-legacy.8916d1c2.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/index-legacy.78a1f5d9.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.8c2c7d58.js
+System.register(["./App-legacy.bec7de9b.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));
+========
+System.register(["./App-legacy.6e4d6664.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));
+>>>>>>>> iteration-20240513-text:dist/assets/index-legacy.78a1f5d9.js

dist/assets/index-legacy.8c2c7d58.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.8c2c7d58.js
 System.register(["./App-legacy.bec7de9b.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));
+========
+System.register(["./App-legacy.6e4d6664.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));
+>>>>>>>> iteration-20240513-text:dist/assets/index-legacy.78a1f5d9.js

dist/assets/index-legacy.f0063d4d.js

@@ -0,0 +1,168 @@
+!(function () {
+  function e(e, t) {
+    var r = Object.keys(e)
+    if (Object.getOwnPropertySymbols) {
+      var n = Object.getOwnPropertySymbols(e)
+      t &&
+        (n = n.filter(function (t) {
+          return Object.getOwnPropertyDescriptor(e, t).enumerable
+        })),
+        r.push.apply(r, n)
+    }
+    return r
+  }
+  function t(t) {
+    for (var n = 1; n < arguments.length; n++) {
+      var i = null != arguments[n] ? arguments[n] : {}
+      n % 2
+        ? e(Object(i), !0).forEach(function (e) {
+            r(t, e, i[e])
+          })
+        : Object.getOwnPropertyDescriptors
+        ? Object.defineProperties(t, Object.getOwnPropertyDescriptors(i))
+        : e(Object(i)).forEach(function (e) {
+            Object.defineProperty(t, e, Object.getOwnPropertyDescriptor(i, e))
+          })
+    }
+    return t
+  }
+  function r(e, t, r) {
+    return (
+      t in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : (e[t] = r), e
+    )
+  }
+  function n(e, t, r, n, i, _, o) {
+    try {
+      var c = e[_](o),
+        a = c.value
+    } catch (s) {
+      return void r(s)
+    }
+    c.done ? t(a) : Promise.resolve(a).then(n, i)
+  }
+  var i = document.createElement('style')
+  ;(i.innerHTML =
+    '._container_1rete_1{min-height:100vh;display:flex;flex-direction:column}._container_1rete_1 ._content_1rete_6{flex:1;background-color:#f5f5f5;padding:.32rem}._container_1rete_1 ._content_1rete_6 ._title_1rete_11{color:#333;font-size:.48rem;font-weight:500;display:flex;align-items:center}._container_1rete_1 ._content_1rete_6 ._title_1rete_11:before{content:"";display:block;width:.10667rem;height:.48rem;border-radius:.05333rem;background-color:#01c1b5;margin-right:.16rem}._container_1rete_1 ._content_1rete_6 ._items_1rete_27{display:flex;align-items:center;flex-wrap:wrap}._container_1rete_1 ._content_1rete_6 ._items_1rete_27>div{margin-top:.53333rem;width:33.333%;text-align:center}._container_1rete_1 ._content_1rete_6 ._items_1rete_27>div ._inner_1rete_37{width:2.8rem;margin:0 auto}._container_1rete_1 ._content_1rete_6 ._items_1rete_27>div ._img_1rete_41{margin-top:0}._container_1rete_1 ._content_1rete_6 ._items_1rete_27>div .van-image,._container_1rete_1 ._content_1rete_6 ._items_1rete_27>div .van-image__error,._container_1rete_1 ._content_1rete_6 ._items_1rete_27>div .van-image__loading{width:2.8rem;min-height:3.57333rem}._container_1rete_1 ._content_1rete_6 ._items_1rete_27>div>div{margin-top:.18667rem;font-size:.37333rem;font-weight:500;color:#1a1a1a;line-height:.53333rem}\n'),
+    document.head.appendChild(i),
+    System.register(['./App-legacy.6e4d6664.js', './index-legacy.3df7f968.js'], function (e) {
+      'use strict'
+      var r, i, _, o, c, a, s, u, l
+      return {
+        setters: [
+          function (e) {
+            ;(r = e.d), (i = e.ak), (_ = e.s), (o = e.l), (c = e.H), (a = e.a), (s = e.g), (u = e.b)
+          },
+          function (e) {
+            l = e.I
+          },
+        ],
+        execute: function () {
+          var d = '_container_1rete_1',
+            m = '_content_1rete_6',
+            f = '_title_1rete_11',
+            p = '_items_1rete_27',
+            v = '_inner_1rete_37',
+            g = '_img_1rete_41',
+            h = u()
+          e(
+            'default',
+            r({
+              name: 'classify',
+              data: function () {
+                return { list: [] }
+              },
+              mounted: function () {
+                var e = sessionStorage.getItem('musicScoreList')
+                if (e) {
+                  var t = JSON.parse(e)
+                  this.list = t
+                } else this.$router.replace('/')
+                i(['_trackEvent', '云练习', '切换页面', '分类页面']), (_.subjectId = _.origanSubjectId)
+              },
+              methods: {
+                FetchList: function () {
+                  var e,
+                    t = this
+                  return ((e = regeneratorRuntime.mark(function e() {
+                    var r, n
+                    return regeneratorRuntime.wrap(
+                      function (e) {
+                        for (;;)
+                          switch ((e.prev = e.next)) {
+                            case 0:
+                              return (
+                                (e.prev = 0),
+                                (r = t.$route.query.parentId),
+                                (e.next = 4),
+                                o.get('/sysMusicScoreCategories/queryTree', { params: { parentId: r || 0 } })
+                              )
+                            case 4:
+                              ;(n = e.sent), (t.list = n.data), (e.next = 10)
+                              break
+                            case 8:
+                              ;(e.prev = 8), (e.t0 = e.catch(0))
+                            case 10:
+                            case 'end':
+                              return e.stop()
+                          }
+                      },
+                      e,
+                      null,
+                      [[0, 8]]
+                    )
+                  })),
+                  function () {
+                    var t = this,
+                      r = arguments
+                    return new Promise(function (i, _) {
+                      var o = e.apply(t, r)
+                      function c(e) {
+                        n(o, i, _, c, a, 'next', e)
+                      }
+                      function a(e) {
+                        n(o, i, _, c, a, 'throw', e)
+                      }
+                      c(void 0)
+                    })
+                  })()
+                },
+                onClickLeft: function () {
+                  h.isApp && c({ api: 'back' })
+                },
+                toDetail: function (e) {
+                  this.$router.push({ path: '/list/' + e.id, query: t({}, this.$route.query) })
+                },
+              },
+              render: function () {
+                var e = this
+                return a('div', { class: d }, [
+                  a('div', { class: m }, [
+                    a('div', { class: f }, [s('教材')]),
+                    a('div', { class: p }, [
+                      this.list.map(function (t) {
+                        return a(
+                          'div',
+                          {
+                            key: t.id,
+                            onClick: function () {
+                              return e.toDetail(t)
+                            },
+                          },
+                          [
+                            a('div', { class: v }, [
+                              a(l, { src: t.coverImg, class: g }, null),
+                              a('div', { class: 'van-ellipsis' }, [t.name]),
+                            ]),
+                          ]
+                        )
+                      }),
+                    ]),
+                  ]),
+                ])
+              },
+            })
+          )
+        },
+      }
+    })
+})()

dist/assets/index.03e87fb1.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.324d55fe.js
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.193ca87e.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+========
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.53266465.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+>>>>>>>> iteration-20240513-text:dist/assets/index.03e87fb1.js

dist/assets/index.1f01faa1.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.d65a42ad.js
+import{d as r,a as e,B as t,g as a,K as o}from"./App.193ca87e.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+========
+import{d as r,a as e,B as t,g as a,K as o}from"./App.53266465.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+>>>>>>>> iteration-20240513-text:dist/assets/index.1f01faa1.js

dist/assets/index.2763f1da.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.490cba04.js
+import"./App.193ca87e.js";import"./main.91bc83fa.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.53266465.js";import"./main.f74ee3b0.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> iteration-20240513-text:dist/assets/index.2763f1da.js

dist/assets/index.324d55fe.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.324d55fe.js
 import{r,b as n,d as l,a as t,R as i,U as u}from"./App.193ca87e.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+========
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.53266465.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+>>>>>>>> iteration-20240513-text:dist/assets/index.03e87fb1.js

dist/assets/index.490cba04.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.490cba04.js
 import"./App.193ca87e.js";import"./main.91bc83fa.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.53266465.js";import"./main.f74ee3b0.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> iteration-20240513-text:dist/assets/index.2763f1da.js

dist/assets/index.60c7f05a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.fdfd5094.js
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.193ca87e.js";import{I as u}from"./index.c5bc8f01.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u6559\u7EC3","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+========
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.53266465.js";import{I as u}from"./index.fd397780.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u6559\u7EC3","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+>>>>>>>> iteration-20240513-text:dist/assets/index.60c7f05a.js

dist/assets/index.c5bc8f01.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.c5bc8f01.js
 import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.193ca87e.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+========
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.53266465.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+>>>>>>>> iteration-20240513-text:dist/assets/index.fd397780.js

dist/assets/index.d65a42ad.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.d65a42ad.js
 import{d as r,a as e,B as t,g as a,K as o}from"./App.193ca87e.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+========
+import{d as r,a as e,B as t,g as a,K as o}from"./App.53266465.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+>>>>>>>> iteration-20240513-text:dist/assets/index.1f01faa1.js

dist/assets/index.fd397780.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.c5bc8f01.js
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.193ca87e.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+========
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.53266465.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+>>>>>>>> iteration-20240513-text:dist/assets/index.fd397780.js

dist/assets/index.fdfd5094.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.fdfd5094.js
 import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.193ca87e.js";import{I as u}from"./index.c5bc8f01.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u6559\u7EC3","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+========
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.53266465.js";import{I as u}from"./index.fd397780.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u6559\u7EC3","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+>>>>>>>> iteration-20240513-text:dist/assets/index.60c7f05a.js

dist/assets/main-legacy.8916d1c2.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main-legacy.afafa0a5.js
+System.register(["./App-legacy.bec7de9b.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+========
+System.register(["./App-legacy.6e4d6664.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+>>>>>>>> iteration-20240513-text:dist/assets/main-legacy.8916d1c2.js

dist/assets/main-legacy.afafa0a5.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main-legacy.afafa0a5.js
 System.register(["./App-legacy.bec7de9b.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+========
+System.register(["./App-legacy.6e4d6664.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+>>>>>>>> iteration-20240513-text:dist/assets/main-legacy.8916d1c2.js

dist/assets/main.91bc83fa.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main.91bc83fa.js
 import{s as r,f as t,c as e,A as m}from"./App.193ca87e.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+========
+import{s as r,f as t,c as e,A as m}from"./App.53266465.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+>>>>>>>> iteration-20240513-text:dist/assets/main.f74ee3b0.js

dist/assets/main.f74ee3b0.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main.91bc83fa.js
+import{s as r,f as t,c as e,A as m}from"./App.193ca87e.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+========
+import{s as r,f as t,c as e,A as m}from"./App.53266465.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+>>>>>>>> iteration-20240513-text:dist/assets/main.f74ee3b0.js

dist/assets/model-1.5cdc3b59.svg

@@ -134,7 +134,7 @@
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="云教练主界面" transform="translate(-119.000000, -288.000000)">
+        <g id="云练习主界面" transform="translate(-119.000000, -288.000000)">
             <g id="练习模式" transform="translate(119.000000, 288.000000)">
                 <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="155" height="60" rx="27"></rect>
                 <g id="编组-10">

dist/assets/model-2.aedda1e7.svg

@@ -96,7 +96,7 @@
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="云教练主界面" transform="translate(-539.000000, -288.000000)">
+        <g id="云练习主界面" transform="translate(-539.000000, -288.000000)">
             <g id="评测模式" transform="translate(539.000000, 288.000000)">
                 <rect id="矩形备份-3" fill="url(#linearGradient-1)" x="0" y="0" width="155" height="60" rx="27"></rect>
                 <g id="编组-4">

dist/assets/model-3.f6cc2e96.svg

@@ -120,7 +120,7 @@
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="云教练主界面" transform="translate(-329.000000, -288.000000)">
+        <g id="云练习主界面" transform="translate(-329.000000, -288.000000)">
             <g id="跟练模式" transform="translate(329.000000, 288.000000)">
                 <rect id="矩形备份-4" fill="url(#linearGradient-1)" x="0" y="0" width="155" height="60" rx="27"></rect>
                 <g id="编组-13">

dist/assets/music-list1.16180b5c.svg

@@ -21,7 +21,7 @@
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="云教练主界面" transform="translate(-772.000000, -165.000000)">
+        <g id="云练习主界面" transform="translate(-772.000000, -165.000000)">
             <g id="编组-16" transform="translate(772.000000, 165.000000)">
                 <path d="M10,0 L40,0 L40,0 L40,45 L10,45 C4.4771525,45 6.76353751e-16,40.5228475 0,35 L0,10 C-6.76353751e-16,4.4771525 4.4771525,1.01453063e-15 10,0 Z" id="矩形" fill-opacity="0.25" fill="#000000"></path>
                 <g id="编组-18" transform="translate(9.000000, 8.000000)">

dist/assets/orchestra-legacy.19540972.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.6e4d6664.js","./main-legacy.8916d1c2.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/orchestra.b20b9ef9.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.e0611a00.js
+import"./App.193ca87e.js";import"./main.91bc83fa.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.53266465.js";import"./main.f74ee3b0.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> iteration-20240513-text:dist/assets/orchestra.b20b9ef9.js

dist/assets/orchestra.e0611a00.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.e0611a00.js
 import"./App.193ca87e.js";import"./main.91bc83fa.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.53266465.js";import"./main.f74ee3b0.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> iteration-20240513-text:dist/assets/orchestra.b20b9ef9.js

dist/assets/state-legacy.04c0773a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.04c0773a.js
 !function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.bec7de9b.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+========
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.6e4d6664.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+>>>>>>>> iteration-20240513-text:dist/assets/state-legacy.ddfe6ae8.js

dist/assets/state-legacy.ddfe6ae8.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.04c0773a.js
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.bec7de9b.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+========
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.6e4d6664.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+>>>>>>>> iteration-20240513-text:dist/assets/state-legacy.ddfe6ae8.js

dist/assets/state.01b64022.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.01b64022.js
 import{O as l,w as o,Q as r}from"./App.193ca87e.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+========
+import{O as l,w as o,Q as r}from"./App.53266465.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+>>>>>>>> iteration-20240513-text:dist/assets/state.76edd6b4.js

dist/assets/state.76edd6b4.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.01b64022.js
+import{O as l,w as o,Q as r}from"./App.193ca87e.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+========
+import{O as l,w as o,Q as r}from"./App.53266465.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+>>>>>>>> iteration-20240513-text:dist/assets/state.76edd6b4.js

dist/assets/vip.5fd91dcb.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.bec7cb20.js
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.193ca87e.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+========
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.53266465.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+>>>>>>>> iteration-20240513-text:dist/assets/vip.5fd91dcb.js

dist/assets/vip.bec7cb20.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.bec7cb20.js
 import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.193ca87e.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+========
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.53266465.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+>>>>>>>> iteration-20240513-text:dist/assets/vip.5fd91dcb.js

dist/colexiu-report-share.html

@@ -116,6 +116,7 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.c4c1c36c.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.193ca87e.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -124,6 +125,16 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.324d55fe.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.5e25d513.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.01b64022.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.af890452.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.53266465.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/music.b35eb5be.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/arrow-left.703b2ec0.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.03e87fb1.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.47205853.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.76edd6b4.js">
+>>>>>>> iteration-20240513-text
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/arrow-left.c6e43979.css">
@@ -191,6 +202,10 @@
   
   <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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.9605a8c6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.8a271c43.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 </html>

dist/colexiu-report.html

@@ -80,6 +80,7 @@
       height: 100Px;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.205e178c.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.193ca87e.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -88,6 +89,16 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.324d55fe.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.5e25d513.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.01b64022.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.7348cde3.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.53266465.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/music.b35eb5be.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/arrow-left.703b2ec0.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.03e87fb1.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.47205853.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.76edd6b4.js">
+>>>>>>> iteration-20240513-text
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.34aba1e2.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/arrow-left.c6e43979.css">
@@ -123,7 +134,11 @@
   
   <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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.fea60546.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.07f9a2fd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 
 </html>

dist/colexiu-share.html

@@ -62,11 +62,19 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.c6fc20a8.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.193ca87e.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.c5bc8f01.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.49e9c356.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.53266465.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.fd397780.js">
+>>>>>>> iteration-20240513-text
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-share.8457fad4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
@@ -81,6 +89,10 @@
   
   <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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.8ab703b0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.d02baf0a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 </html>

dist/colexiu.html

@@ -131,10 +131,17 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.d850ab64.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.193ca87e.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/main.91bc83fa.js">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.8adb9ed6.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.53266465.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/main.f74ee3b0.js">
+>>>>>>> iteration-20240513-text
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
     <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
     <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
@@ -221,6 +228,10 @@
     
     <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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.a6825584.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.8c2f2a5a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
   </body>
 </html>

dist/colxiu-website.html

@@ -116,10 +116,17 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.732a58d7.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.193ca87e.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.324d55fe.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.6b243810.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.53266465.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.03e87fb1.js">
+>>>>>>> iteration-20240513-text
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-website.a27d2131.css">
@@ -184,6 +191,10 @@
   
   <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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.15fd7fe4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.f3b2f785.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 </html>

dist/index.html

@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8" />
   <link rel="icon" href="/orchestra-music-score/favicon.ico" />
-  <title>管乐团云教练</title>
+  <title>管乐团云练习</title>
   <meta name="description" content="管乐团APP，器乐学习的不二选择" />
   <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" />
   <script>
@@ -52,13 +52,21 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/index.490cba04.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.193ca87e.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.91bc83fa.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/index.2763f1da.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.53266465.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.f74ee3b0.js">
+>>>>>>> iteration-20240513-text
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
-  <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
-  <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
+  <script type="module">try { import("_").catch(() => 1); } catch (e) { } window.__vite_is_dynamic_import_support = true;</script>
+  <script
+    type="module">!function () { if (window.__vite_is_dynamic_import_support) return; console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
 
 <body>
@@ -82,10 +90,16 @@
       }, 1000)
     })
   </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>!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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.03a48e1e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry"
+    data-src="/orchestra-music-score/assets/index-legacy.6eb0dfab.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 
 </html>

dist/music-sheet.html

@@ -131,8 +131,13 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.4cbd9bf9.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.193ca87e.js">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.b2e5427f.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.53266465.js">
+>>>>>>> iteration-20240513-text
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
     <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
     <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
@@ -219,6 +224,10 @@
     
     <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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.0cb56ba6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.25fa3568.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
   </body>
 </html>

dist/orchestra.html

@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8" />
   <link rel="icon" href="/orchestra-music-score/favicon.ico" />
-  <title>管乐团云教练</title>
+  <title>管乐团云练习</title>
   <meta name="description" content="管乐团APP，器乐学习的不二选择" />
   <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" />
   <script>
@@ -52,13 +52,21 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.e0611a00.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.193ca87e.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.91bc83fa.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.b20b9ef9.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.53266465.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.f74ee3b0.js">
+>>>>>>> iteration-20240513-text
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
-  <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
-  <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
+  <script type="module">try { import("_").catch(() => 1); } catch (e) { } window.__vite_is_dynamic_import_support = true;</script>
+  <script
+    type="module">!function () { if (window.__vite_is_dynamic_import_support) return; console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
 
 <body>
@@ -82,10 +90,16 @@
       }, 1000)
     })
   </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>!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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.4aa45052.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry"
+    data-src="/orchestra-music-score/assets/orchestra-legacy.19540972.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 
 </html>