mo há 1 ano atrás
pai
commit
19257623ed
80 ficheiros alterados com 421 adições e 12 exclusões
  1. 161 0
      dist/assets/Slider-002b384c.js
  2. 4 0
      dist/assets/Slider-cadd428a.js
  3. 1 0
      dist/assets/Slider-legacy-74103787.js
  4. 1 0
      dist/assets/Slider-legacy-ac85d774.js
  5. 8 0
      dist/assets/catchData-1d154424.js
  6. 0 0
      dist/assets/catchData-legacy-cb48b5cc.js
  7. 39 0
      dist/assets/icon-custom-8a139608.svg
  8. 30 0
      dist/assets/icon-upload-bg-dfa56eac.svg
  9. 0 0
      dist/assets/index-14a4832f.js
  10. 1 0
      dist/assets/index-2536a650.js
  11. 1 0
      dist/assets/index-26d38dae.js
  12. 1 0
      dist/assets/index-2b4bd400.js
  13. 1 0
      dist/assets/index-3688f7fe.js
  14. 0 0
      dist/assets/index-3709028b.js
  15. 4 0
      dist/assets/index-3f86fa94.js
  16. 1 0
      dist/assets/index-41a61b37.css
  17. 0 0
      dist/assets/index-42ba9cf4.css
  18. 1 0
      dist/assets/index-5eefcdee.js
  19. 0 0
      dist/assets/index-63159baf.js
  20. 1 0
      dist/assets/index-66807381.js
  21. 0 0
      dist/assets/index-67762f55.js
  22. 1 0
      dist/assets/index-6863b482.js
  23. 1 0
      dist/assets/index-6d2637e4.js
  24. 0 0
      dist/assets/index-7fd21e38.js
  25. 1 0
      dist/assets/index-849274e6.js
  26. 5 0
      dist/assets/index-87894a38.js
  27. 5 0
      dist/assets/index-8b2dbf88.js
  28. 0 0
      dist/assets/index-8e35a2d1.js
  29. 1 0
      dist/assets/index-91cc50ac.js
  30. 4 0
      dist/assets/index-9695e379.js
  31. 1 0
      dist/assets/index-ac854630.js
  32. 28 0
      dist/assets/index-b293af25.js
  33. 1 0
      dist/assets/index-b545fd40.js
  34. 0 0
      dist/assets/index-c0f2c76b.css
  35. 0 0
      dist/assets/index-c1c3d696.js
  36. 0 0
      dist/assets/index-c5f8f785.js
  37. 1 0
      dist/assets/index-c7ce9be3.js
  38. 1 0
      dist/assets/index-e0509c65.js
  39. 0 0
      dist/assets/index-e218e5a6.js
  40. 1 0
      dist/assets/index-legacy-008da16a.js
  41. 5 0
      dist/assets/index-legacy-0eb8dfdc.js
  42. 1 0
      dist/assets/index-legacy-179b76ca.js
  43. 4 0
      dist/assets/index-legacy-2242b871.js
  44. 0 0
      dist/assets/index-legacy-27047478.js
  45. 1 0
      dist/assets/index-legacy-3662e240.js
  46. 1 0
      dist/assets/index-legacy-3ee2abe3.js
  47. 1 0
      dist/assets/index-legacy-457c774d.js
  48. 0 0
      dist/assets/index-legacy-46570595.js
  49. 4 0
      dist/assets/index-legacy-47c404cf.js
  50. 1 0
      dist/assets/index-legacy-51aedfda.js
  51. 0 0
      dist/assets/index-legacy-5b0efb5e.js
  52. 4 0
      dist/assets/index-legacy-5c27fc60.js
  53. 1 0
      dist/assets/index-legacy-69f05915.js
  54. 0 0
      dist/assets/index-legacy-6cde4ce5.js
  55. 0 0
      dist/assets/index-legacy-8642ce4f.js
  56. 5 0
      dist/assets/index-legacy-89505d2d.js
  57. 0 0
      dist/assets/index-legacy-96796d44.js
  58. 1 0
      dist/assets/index-legacy-a4319f6a.js
  59. 1 0
      dist/assets/index-legacy-ab154845.js
  60. 0 0
      dist/assets/index-legacy-b66ad429.js
  61. 0 0
      dist/assets/index-legacy-b74205fc.js
  62. 1 0
      dist/assets/index-legacy-b7ceba7a.js
  63. 1 0
      dist/assets/index-legacy-bafc313a.js
  64. 1 0
      dist/assets/index-legacy-c31dd03a.js
  65. 1 0
      dist/assets/index-legacy-cc9efb5d.js
  66. 1 0
      dist/assets/index-legacy-d4444c64.js
  67. 0 0
      dist/assets/index-legacy-d7c8985b.js
  68. 1 0
      dist/assets/index-legacy-dc0ba24a.js
  69. 5 0
      dist/assets/index-legacy-f0f955af.js
  70. 1 0
      dist/assets/index-legacy-f3d01eef.js
  71. 1 0
      dist/assets/tick-02194837.js
  72. 1 0
      dist/assets/tick-18785756.js
  73. 1 0
      dist/assets/tick-legacy-4ce4f06e.js
  74. 1 0
      dist/assets/tick-legacy-e8b9964a.js
  75. 9 0
      dist/index.html
  76. 12 1
      src/components/card-type/index.tsx
  77. 0 1
      src/components/layout/layoutSilder.tsx
  78. 11 1
      src/store/modules/prepareLessons.ts
  79. 18 0
      src/views/prepare-lessons/components/resource-main/index.module.less
  80. 19 9
      src/views/prepare-lessons/components/resource-main/index.tsx

Diff do ficheiro suprimidas por serem muito extensas
+ 161 - 0
dist/assets/Slider-002b384c.js


+ 4 - 0
dist/assets/Slider-cadd428a.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/Slider-cadd428a.js
 import{aE as Ye,b as x,aF as Ge,aG as M,ai as n,aH as m,aj as j,aI as ue,aJ as Je,aK as Qe,d as qe,ak as Ze,al as ge,aL as eo,G as w,a9 as oo,aM as ao,w as he,aN as to,an as ve,aO as no,aP as Z,ao as v,aQ as ro,aR as lo,aS as io,aT as so,T as co,aU as O,aV as U,O as q,aW as fe}from"./index-4d5fd859.js";const uo={railHeight:"4px",railWidthVertical:"4px",handleSize:"18px",dotHeight:"8px",dotWidth:"8px",dotBorderRadius:"4px"},ho=t=>{const l="rgba(0, 0, 0, .85)",y="0 2px 8px 0 rgba(0, 0, 0, 0.12)",{railColor:f,primaryColor:s,baseColor:d,cardColor:z,modalColor:R,popoverColor:L,borderRadius:_,fontSize:B,opacityDisabled:$}=t;return Object.assign(Object.assign({},uo),{fontSize:B,markFontSize:B,railColor:f,railColorHover:f,fillColor:s,fillColorHover:s,opacityDisabled:$,handleColor:"#FFF",dotColor:z,dotColorModal:R,dotColorPopover:L,handleBoxShadow:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowHover:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowActive:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowFocus:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",indicatorColor:l,indicatorBoxShadow:y,indicatorTextColor:d,indicatorBorderRadius:_,dotBorder:`2px solid ${f}`,dotBorderActive:`2px solid ${s}`,dotBoxShadow:""})},vo={name:"Slider",common:Ye,self:ho},fo=vo;function me(t){return window.TouchEvent&&t instanceof window.TouchEvent}function be(){const t=x(new Map),l=y=>f=>{t.value.set(y,f)};return Ge(()=>{t.value.clear()}),[t,l]}const mo=M([n("slider",`
+========
+import{aE as Ye,b as x,aF as Ge,aG as M,ai as n,aH as m,aj as j,aI as ue,aJ as Je,aK as Qe,d as qe,ak as Ze,al as ge,aL as eo,G as w,a9 as oo,aM as ao,w as he,aN as to,an as ve,aO as no,aP as Z,ao as v,aQ as ro,aR as lo,aS as io,aT as so,T as co,aU as O,aV as U,O as q,aW as fe}from"./index-8e35a2d1.js";const uo={railHeight:"4px",railWidthVertical:"4px",handleSize:"18px",dotHeight:"8px",dotWidth:"8px",dotBorderRadius:"4px"},ho=t=>{const l="rgba(0, 0, 0, .85)",y="0 2px 8px 0 rgba(0, 0, 0, 0.12)",{railColor:f,primaryColor:s,baseColor:d,cardColor:z,modalColor:R,popoverColor:L,borderRadius:_,fontSize:B,opacityDisabled:$}=t;return Object.assign(Object.assign({},uo),{fontSize:B,markFontSize:B,railColor:f,railColorHover:f,fillColor:s,fillColorHover:s,opacityDisabled:$,handleColor:"#FFF",dotColor:z,dotColorModal:R,dotColorPopover:L,handleBoxShadow:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowHover:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowActive:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowFocus:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",indicatorColor:l,indicatorBoxShadow:y,indicatorTextColor:d,indicatorBorderRadius:_,dotBorder:`2px solid ${f}`,dotBorderActive:`2px solid ${s}`,dotBoxShadow:""})},vo={name:"Slider",common:Ye,self:ho},fo=vo;function me(t){return window.TouchEvent&&t instanceof window.TouchEvent}function be(){const t=x(new Map),l=y=>f=>{t.value.set(y,f)};return Ge(()=>{t.value.clear()}),[t,l]}const mo=M([n("slider",`
+>>>>>>>> test:dist/assets/Slider-002b384c.js
  display: block;
  padding: calc((var(--n-handle-size) - var(--n-rail-height)) / 2) 0;
  position: relative;

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/Slider-legacy-74103787.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/Slider-legacy-ac85d774.js


Diff do ficheiro suprimidas por serem muito extensas
+ 8 - 0
dist/assets/catchData-1d154424.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/catchData-legacy-cb48b5cc.js


+ 39 - 0
dist/assets/icon-custom-8a139608.svg

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="82px" viewBox="0 0 80 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 6</title>
+    <defs>
+        <linearGradient x1="16.0585307%" y1="48.1812553%" x2="88.7815146%" y2="51.655599%" id="linearGradient-1">
+            <stop stop-color="#308AFF" offset="0%"></stop>
+            <stop stop-color="#60A9FF" offset="100%"></stop>
+        </linearGradient>
+        <path d="M26.1421356,-9.86533591e-13 L77.8578644,-9.86533591e-13 C80.5100293,-9.92349856e-13 83.0535684,1.0535684 84.9289322,2.92893219 L104,22 L104,22 L-8.56952355e-13,22 L19.0710678,2.92893219 C20.9464316,1.0535684 23.4899707,-9.86046396e-13 26.1421356,-9.86533591e-13 Z" id="path-2"></path>
+        <linearGradient x1="50%" y1="13.692199%" x2="50%" y2="69.4941756%" id="linearGradient-4">
+            <stop stop-color="#FFFFFF" stop-opacity="0.404392483" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="所有页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="46、选择教材" transform="translate(-1010.000000, -322.000000)">
+            <g id="编组-4" transform="translate(385.000000, 127.000000)">
+                <g id="编组-2备份-2" transform="translate(605.000000, 179.703907)">
+                    <g id="编组-6" transform="translate(3.703907, 0.000000)">
+                        <g id="编组-5" transform="translate(48.777762, 48.777762) rotate(-45.000000) translate(-48.777762, -48.777762) translate(-4.075266, 32.648617)">
+                            <path d="M0.577507392,31.6130682 L-1.44486575e-13,24.5356078 L-1.44486575e-13,24.5356078 C0.150435792,23.0883 1.1854755,22.0762681 3.10511912,21.4995122 C5.02476274,20.9227562 7.59556321,20.1716791 10.8175205,19.2462809 L11.1122213,21.7991185 L1.08841361,31.8010336 C0.971128318,31.9180628 0.781178938,31.9178551 0.664149799,31.8005698 C0.613985136,31.7502954 0.583283393,31.6838541 0.577507392,31.6130682 Z" id="路径-33" fill="#1E3DCC"></path>
+                            <path d="M95.1713422,31.6130682 L94.5938348,24.5356078 L94.5938348,24.5356078 C94.7442706,23.0883 95.7793103,22.0762681 97.698954,21.4995122 C99.6185976,20.9227562 102.189398,20.1716791 105.411355,19.2462809 L105.706056,21.7991185 L95.6822485,31.8010336 C95.5649632,31.9180628 95.3750138,31.9178551 95.2579846,31.8005698 C95.20782,31.7502954 95.1771182,31.6838541 95.1713422,31.6130682 Z" id="路径-33备份" fill="#1E3DCC" transform="translate(100.149945, 25.752285) scale(-1, 1) translate(-100.149945, -25.752285) "></path>
+                            <g id="矩形" transform="translate(0.845434, 0.711632)">
+                                <mask id="mask-3" fill="white">
+                                    <use xlink:href="#path-2"></use>
+                                </mask>
+                                <use id="蒙版" fill="url(#linearGradient-1)" transform="translate(52.000000, 11.000000) rotate(-360.000000) translate(-52.000000, -11.000000) " xlink:href="#path-2"></use>
+                                <rect fill="url(#linearGradient-4)" mask="url(#mask-3)" transform="translate(30.713441, 12.039373) rotate(-315.000000) translate(-30.713441, -12.039373) " x="24.713441" y="-13.960627" width="12" height="52"></rect>
+                            </g>
+                            <text id="自定义" transform="translate(52.499475, 11.000000) rotate(-360.000000) translate(-52.499475, -11.000000) " font-family="PingFangSC-Semibold, PingFang SC" font-size="16" font-weight="500" letter-spacing="1" fill="#FFFFFF">
+                                <tspan x="26.9994747" y="17">自定义</tspan>
+                            </text>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

+ 30 - 0
dist/assets/icon-upload-bg-dfa56eac.svg

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="158px" height="224px" viewBox="0 0 158 224" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 7</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="158" height="224"></rect>
+    </defs>
+    <g id="所有页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="46、选择教材" transform="translate(-470.000000, -330.000000)">
+            <g id="编组-4" transform="translate(385.000000, 127.000000)">
+                <g id="编组-2" transform="translate(57.000000, 203.000000)">
+                    <g id="编组-7" transform="translate(28.000000, 0.000000)">
+                        <mask id="mask-2" fill="white">
+                            <use xlink:href="#path-1"></use>
+                        </mask>
+                        <use id="蒙版" fill="#F8F9FB" xlink:href="#path-1"></use>
+                        <g id="编组" mask="url(#mask-2)" fill="#859BD4">
+                            <g transform="translate(54.000000, 65.000000)" id="矩形">
+                                <rect x="0" y="21" width="50" height="8" rx="4"></rect>
+                                <rect transform="translate(25.000000, 25.000000) rotate(-270.000000) translate(-25.000000, -25.000000) " x="-5.45696821e-12" y="21" width="50" height="8" rx="4"></rect>
+                            </g>
+                        </g>
+                        <text id="添加自定义教材" mask="url(#mask-2)" font-family="PingFangSC-Regular, PingFang SC" font-size="18" font-weight="normal" fill="#859BD4">
+                            <tspan x="16" y="154">添加自定义教材</tspan>
+                        </text>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-14a4832f.js


+ 1 - 0
dist/assets/index-2536a650.js

@@ -0,0 +1 @@
+import{d as l,g as e,i as p,J as o,b as r,S as u,p as c,F as I}from"./index-8e35a2d1.js";const g="_searchInput_1cmht_1",S="_searchIcon_1cmht_9",m={searchInput:g,searchIcon:S},E=l({name:"student-studentList",props:["searchWord"],emits:["changeValue"],setup(t,{emit:n,attrs:A}){return()=>e("div",null,[e(p,o(A,{clearable:!0,class:m.searchInput,value:t.searchWord,onInput:a=>{n("changeValue",a)}}),{prefix:()=>e("span",{class:"icon-search-input"},null)})])}}),h="_arrow_fei3f_1",C="_CSelectWrap_fei3f_5",J="_CSelectInitWrap_fei3f_21",s={arrow:h,CSelectWrap:C,CSelectInitWrap:J},w="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAaCAYAAACtv5zzAAAAAXNSR0IArs4c6QAAANtJREFUSEvt0zFOAkEYQOFv7eEi9iba0GLlDextKNUbECmpuIItFSWNmnANPIEWtoZkJ5LJDv9AQuVOs8Vm3tt5/2zjzKs5M18vCAv/r0TXmLdNJvgI+1B9i26wwqCFfuMWb5GkZgY5PDGrJJGgBK+WHBJ0wZ9a8stemoMnKQlK8FkLfkQuGeM9n0mXIIInRpUkF9TCqyX7gmPhVZIkGGKL3TOt3UBT8+i657m+cInPJBhhfSK8dJI7LJPgAq+4whSL6JML7x/wjA3u8RP9aCd6/rb1gjBhnyhM9As5gjEbhIMMwQAAAABJRU5ErkJggg==",B="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAaCAYAAACtv5zzAAAAAXNSR0IArs4c6QAAASlJREFUSEvtlDFOxDAQRWecigJOAMegABpKFI3TcgUqShZusFDScIA9AbJltt0mSPQcI83SJjMo0S7KBmM7xTYoaT3zn+f/cRD2/OGe9WECRB3+JxaVZXlQVdUCAE4RcU5EL9HZPQXGmBsAeACADyK6RkTuLLLWFsz8uu1BxJnW+mkMxFo7Y+Z5r+eyKIpVB3DOHTdN8ykiR9sCpdQ9ET2mQIbiiLjOsuwkz/P1T8jW2nNmXgLA4ZhJjDF3ItK/yJdS6oqIylZnZ4vGQmLivwCbPJImSRH3AlIgqeJ/AkKQ9izk+XApgi/ZOXdR1/VbP/iBwE6gvo2L/ip8wW+EouJBi/q38UCSxJMBbaEx5kxEnrsmxFut9XvKI4xalCISqpkAUQcni6IWfQOwkaYb9TFYBgAAAABJRU5ErkJggg==",W=l({props:{inline:{type:Boolean,default:!1}},name:"CSelect",setup(t,{emit:n,attrs:A}){r(null);const a=r(!1);return()=>e(I,null,[e("div",{class:[s.CSelectWrap,t.inline?s.CSelectInitWrap:null]},[e(u,o({"show-checkmark":!1},A,{"onUpdate:show":i=>{a.value=i}}),{arrow:()=>a.value?e(c,{class:s.arrow,src:w},null):e(c,{class:s.arrow,src:B},null)})])])}});export{W as C,E as S};

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-26d38dae.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-2b4bd400.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-3688f7fe.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-3709028b.js


+ 4 - 0
dist/assets/index-3f86fa94.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-3f86fa94.js
 import{d as t,g as e,ae as u,k as a,l as p}from"./index-4d5fd859.js";const r=t({name:"404-page",setup(){return()=>e("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[e(u,{description:"你访问的页面不见了,你还可以",size:"large"},null),e(a,{type:"primary",text:!0},{default:()=>[p("返回上一页")]})])}});export{r as default};
+========
+import{d as t,g as e,ae as u,k as a,l as p}from"./index-8e35a2d1.js";const r=t({name:"404-page",setup(){return()=>e("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[e(u,{description:"你访问的页面不见了,你还可以",size:"large"},null),e(a,{type:"primary",text:!0},{default:()=>[p("返回上一页")]})])}});export{r as default};
+>>>>>>>> test:dist/assets/index-8b2dbf88.js

+ 1 - 0
dist/assets/index-41a61b37.css

@@ -0,0 +1 @@
+._selectMusic_1akyv_1 .n-tabs-tab-pad{width:1.25vw!important}._selectMusic_1akyv_1 .n-tabs-nav{padding:.625vw 1.04167vw 1.25vw}._selectMusic_1akyv_1 .n-tabs-tab{color:#8b8d98;font-size:1.14583vw;padding-top:.625vw;padding-bottom:.3125vw;line-height:1.14583vw}._selectMusic_1akyv_1 .n-tabs-tab.n-tabs-tab--active{font-weight:600!important;color:#131415!important}._selectMusic_1akyv_1 .n-tabs-tab__label{z-index:10}._selectMusic_1akyv_1 .n-tabs-bar{height:.52083vw;background:linear-gradient(90deg,#77BBFF 0%,rgba(163,231,255,.22) 100%);z-index:0;bottom:.10417vw}._selectMusic_1akyv_1 .n-tab-pane{padding-top:0!important}._selectMusic_1akyv_1 ._close_1akyv_30{padding:0}._selectMusic_1akyv_1 ._close_1akyv_30 .n-icon{font-size:var(--n-close-size);color:var(--n-close-icon-color)}._listContainer_1akyv_37{margin-bottom:1.04167vw;max-height:50vh}._list_1akyv_37{margin-top:.52083vw;padding:0 2.08333vw;margin-bottom:.625vw;display:flex;flex-flow:row wrap;justify-content:flex-start;gap:1.14583vw}._searchGroup_1akyv_50{position:relative;padding:0 2.08333vw}._searchGroup_1akyv_50 .n-form .n-form-item .n-form-item-label{font-size:.88542vw;font-weight:600;color:#131415;line-height:1.25vw}._searchGroup_1akyv_50 .n-form .n-button{height:1.66667vw;font-size:.88542vw;border-radius:.41667vw;color:rgba(0,0,0,.6)}._searchGroup_1akyv_50 .n-form .n-button--primary-type{color:#131415}._searchGroup_1akyv_50 .n-form .n-form-item-feedback-wrapper{min-height:.72917vw}._searchGroup_1akyv_50 ._inputSearch_1akyv_72{position:absolute;top:.20833vw;right:2.08333vw;width:18.75vw;height:2.1875vw;font-size:.83333vw}._searchGroup_1akyv_50 ._inputSearch_1akyv_72 img{width:.9375vw;height:.9375vw}._searchGroup_1akyv_50 ._inputSearch_1akyv_72 .n-input-wrapper{padding-left:.625vw;padding-right:.20833vw;height:2.1875vw!important}._searchGroup_1akyv_50 ._inputSearch_1akyv_72 .n-button{height:1.77083vw;font-size:.78125vw;font-weight:500;width:auto}

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-42ba9cf4.css


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-5eefcdee.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-63159baf.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-66807381.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-67762f55.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-6863b482.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-6d2637e4.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-7fd21e38.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-849274e6.js


+ 5 - 0
dist/assets/index-87894a38.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-9695e379.js
+import{Z as y,_ as F,U as P,$ as C,K as b}from"./index-4d5fd859.js";function U(e){return y()?(F(e),!0):!1}function w(e){return typeof e=="function"?e():b(e)}const g=typeof window<"u",m=()=>{};function D(e,i){function n(...t){return new Promise((o,r)=>{Promise.resolve(e(()=>i.apply(this,t),{fn:i,thisArg:this,args:t})).then(o).catch(r)})}return n}function j(e,i={}){let n,t,o=m;const r=u=>{clearTimeout(u),o(),o=m};return u=>{const a=w(e),s=w(i.maxWait);return n&&r(n),a<=0||s!==void 0&&s<=0?(t&&(r(t),t=null),Promise.resolve(u())):new Promise((c,p)=>{o=i.rejectOnCancel?p:c,s&&!t&&(t=setTimeout(()=>{n&&r(n),t=null,c(u())},s)),n=setTimeout(()=>{t&&r(t),t=null,c(u())},a)})}}function O(e,i=!0,n=!0,t=!1){let o=0,r,l=!0,u=m,a;const s=()=>{r&&(clearTimeout(r),r=void 0,u(),u=m)};return p=>{const f=w(e),T=Date.now()-o,d=()=>a=p();return s(),f<=0?(o=Date.now(),d()):(T>f&&(n||!l)?(o=Date.now(),d()):i&&(a=new Promise((h,x)=>{u=t?x:h,r=setTimeout(()=>{o=Date.now(),l=!0,h(d()),s()},Math.max(0,f-T))})),!n&&!r&&(r=setTimeout(()=>l=!0,f)),l=!1,a)}}function R(e,i=200,n={}){return D(j(i,n),e)}function V(e,i=200,n=!1,t=!0,o=!1){return D(O(i,n,t,o),e)}function W(e){P()&&C(e)}export{V as a,U as b,w as c,g as i,W as t,R as u};
+========
+import{Z as y,_ as F,U as P,$ as C,K as b}from"./index-8e35a2d1.js";function U(e){return y()?(F(e),!0):!1}function w(e){return typeof e=="function"?e():b(e)}const g=typeof window<"u",m=()=>{};function D(e,i){function n(...t){return new Promise((o,r)=>{Promise.resolve(e(()=>i.apply(this,t),{fn:i,thisArg:this,args:t})).then(o).catch(r)})}return n}function j(e,i={}){let n,t,o=m;const r=u=>{clearTimeout(u),o(),o=m};return u=>{const a=w(e),s=w(i.maxWait);return n&&r(n),a<=0||s!==void 0&&s<=0?(t&&(r(t),t=null),Promise.resolve(u())):new Promise((c,p)=>{o=i.rejectOnCancel?p:c,s&&!t&&(t=setTimeout(()=>{n&&r(n),t=null,c(u())},s)),n=setTimeout(()=>{t&&r(t),t=null,c(u())},a)})}}function O(e,i=!0,n=!0,t=!1){let o=0,r,l=!0,u=m,a;const s=()=>{r&&(clearTimeout(r),r=void 0,u(),u=m)};return p=>{const f=w(e),T=Date.now()-o,d=()=>a=p();return s(),f<=0?(o=Date.now(),d()):(T>f&&(n||!l)?(o=Date.now(),d()):i&&(a=new Promise((h,x)=>{u=t?x:h,r=setTimeout(()=>{o=Date.now(),l=!0,h(d()),s()},Math.max(0,f-T))})),!n&&!r&&(r=setTimeout(()=>l=!0,f)),l=!1,a)}}function R(e,i=200,n={}){return D(j(i,n),e)}function V(e,i=200,n=!1,t=!0,o=!1){return D(O(i,n,t,o),e)}function W(e){P()&&C(e)}export{V as a,U as b,w as c,g as i,W as t,R as u};
+>>>>>>>> test:dist/assets/index-87894a38.js

+ 5 - 0
dist/assets/index-8b2dbf88.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-3f86fa94.js
+import{d as t,g as e,ae as u,k as a,l as p}from"./index-4d5fd859.js";const r=t({name:"404-page",setup(){return()=>e("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[e(u,{description:"你访问的页面不见了,你还可以",size:"large"},null),e(a,{type:"primary",text:!0},{default:()=>[p("返回上一页")]})])}});export{r as default};
+========
+import{d as t,g as e,ae as u,k as a,l as p}from"./index-8e35a2d1.js";const r=t({name:"404-page",setup(){return()=>e("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[e(u,{description:"你访问的页面不见了,你还可以",size:"large"},null),e(a,{type:"primary",text:!0},{default:()=>[p("返回上一页")]})])}});export{r as default};
+>>>>>>>> test:dist/assets/index-8b2dbf88.js

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-8e35a2d1.js


+ 1 - 0
dist/assets/index-91cc50ac.js

@@ -0,0 +1 @@
+import{d as u,f as n,g as e,i as l,F as o,k as i,l as h}from"./index-8e35a2d1.js";const d="_TheSearch_18qen_1",f="_active_18qen_15",t={TheSearch:d,active:f,default:"_default_18qen_21"},v=""+new URL("icon_search-8a6ade17.svg",import.meta.url).href,m=""+new URL("icon_searchActive-bf7fd0c6.svg",import.meta.url).href,_=u({name:"TheSearch",props:{round:{type:Boolean,default:!1}},emits:["search"],setup(c,{emit:r}){const a=n({value:""});return()=>e(l,{class:t.TheSearch,round:c.round,placeholder:"请输入搜索关键词",value:a.value,"onUpdate:value":s=>a.value=s},{prefix:()=>e(o,null,[e("img",{class:t.default,src:v},null),e("img",{class:t.active,src:m},null)]),suffix:()=>e(i,{size:"small",round:!0,type:"primary",onClick:()=>r("search",a.value?a.value.trim():"")},{default:()=>[h("搜索")]})})}});export{_ as T};

+ 4 - 0
dist/assets/index-9695e379.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-9695e379.js
 import{Z as y,_ as F,U as P,$ as C,K as b}from"./index-4d5fd859.js";function U(e){return y()?(F(e),!0):!1}function w(e){return typeof e=="function"?e():b(e)}const g=typeof window<"u",m=()=>{};function D(e,i){function n(...t){return new Promise((o,r)=>{Promise.resolve(e(()=>i.apply(this,t),{fn:i,thisArg:this,args:t})).then(o).catch(r)})}return n}function j(e,i={}){let n,t,o=m;const r=u=>{clearTimeout(u),o(),o=m};return u=>{const a=w(e),s=w(i.maxWait);return n&&r(n),a<=0||s!==void 0&&s<=0?(t&&(r(t),t=null),Promise.resolve(u())):new Promise((c,p)=>{o=i.rejectOnCancel?p:c,s&&!t&&(t=setTimeout(()=>{n&&r(n),t=null,c(u())},s)),n=setTimeout(()=>{t&&r(t),t=null,c(u())},a)})}}function O(e,i=!0,n=!0,t=!1){let o=0,r,l=!0,u=m,a;const s=()=>{r&&(clearTimeout(r),r=void 0,u(),u=m)};return p=>{const f=w(e),T=Date.now()-o,d=()=>a=p();return s(),f<=0?(o=Date.now(),d()):(T>f&&(n||!l)?(o=Date.now(),d()):i&&(a=new Promise((h,x)=>{u=t?x:h,r=setTimeout(()=>{o=Date.now(),l=!0,h(d()),s()},Math.max(0,f-T))})),!n&&!r&&(r=setTimeout(()=>l=!0,f)),l=!1,a)}}function R(e,i=200,n={}){return D(j(i,n),e)}function V(e,i=200,n=!1,t=!0,o=!1){return D(O(i,n,t,o),e)}function W(e){P()&&C(e)}export{V as a,U as b,w as c,g as i,W as t,R as u};
+========
+import{Z as y,_ as F,U as P,$ as C,K as b}from"./index-8e35a2d1.js";function U(e){return y()?(F(e),!0):!1}function w(e){return typeof e=="function"?e():b(e)}const g=typeof window<"u",m=()=>{};function D(e,i){function n(...t){return new Promise((o,r)=>{Promise.resolve(e(()=>i.apply(this,t),{fn:i,thisArg:this,args:t})).then(o).catch(r)})}return n}function j(e,i={}){let n,t,o=m;const r=u=>{clearTimeout(u),o(),o=m};return u=>{const a=w(e),s=w(i.maxWait);return n&&r(n),a<=0||s!==void 0&&s<=0?(t&&(r(t),t=null),Promise.resolve(u())):new Promise((c,p)=>{o=i.rejectOnCancel?p:c,s&&!t&&(t=setTimeout(()=>{n&&r(n),t=null,c(u())},s)),n=setTimeout(()=>{t&&r(t),t=null,c(u())},a)})}}function O(e,i=!0,n=!0,t=!1){let o=0,r,l=!0,u=m,a;const s=()=>{r&&(clearTimeout(r),r=void 0,u(),u=m)};return p=>{const f=w(e),T=Date.now()-o,d=()=>a=p();return s(),f<=0?(o=Date.now(),d()):(T>f&&(n||!l)?(o=Date.now(),d()):i&&(a=new Promise((h,x)=>{u=t?x:h,r=setTimeout(()=>{o=Date.now(),l=!0,h(d()),s()},Math.max(0,f-T))})),!n&&!r&&(r=setTimeout(()=>l=!0,f)),l=!1,a)}}function R(e,i=200,n={}){return D(j(i,n),e)}function V(e,i=200,n=!1,t=!0,o=!1){return D(O(i,n,t,o),e)}function W(e){P()&&C(e)}export{V as a,U as b,w as c,g as i,W as t,R as u};
+>>>>>>>> test:dist/assets/index-87894a38.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-ac854630.js


Diff do ficheiro suprimidas por serem muito extensas
+ 28 - 0
dist/assets/index-b293af25.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-b545fd40.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-c0f2c76b.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-c1c3d696.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-c5f8f785.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-c7ce9be3.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-e0509c65.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-e218e5a6.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-008da16a.js


+ 5 - 0
dist/assets/index-legacy-0eb8dfdc.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-47c404cf.js
+System.register(["./index-legacy-ea062ad6.js"],(function(e,t){"use strict";var i,n,r,a,p;return{setters:[e=>{i=e.d,n=e.g,r=e.ae,a=e.k,p=e.l}],execute:function(){e("default",i({name:"404-page",setup:()=>()=>n("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[n(r,{description:"你访问的页面不见了,你还可以",size:"large"},null),n(a,{type:"primary",text:!0},{default:()=>[p("返回上一页")]})])}))}}}));
+========
+System.register(["./index-legacy-27047478.js"],(function(e,t){"use strict";var i,n,r,a,p;return{setters:[e=>{i=e.d,n=e.g,r=e.ae,a=e.k,p=e.l}],execute:function(){e("default",i({name:"404-page",setup:()=>()=>n("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[n(r,{description:"你访问的页面不见了,你还可以",size:"large"},null),n(a,{type:"primary",text:!0},{default:()=>[p("返回上一页")]})])}))}}}));
+>>>>>>>> test:dist/assets/index-legacy-0eb8dfdc.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-179b76ca.js


+ 4 - 0
dist/assets/index-legacy-2242b871.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-2242b871.js
 System.register(["./index-legacy-ea062ad6.js"],(function(t,e){"use strict";var n,o,r,u,i;return{setters:[t=>{n=t.Z,o=t._,r=t.U,u=t.$,i=t.K}],execute:function(){function e(t){return"function"==typeof t?t():i(t)}t({a:function(t,n=200,o=!1,r=!0,u=!1){return s(function(t,n=!0,o=!0,r=!1){let u,i,s=0,a=!0,f=c;const l=()=>{u&&(clearTimeout(u),u=void 0,f(),f=c)},m=c=>{const m=e(t),w=Date.now()-s,d=()=>i=c();return l(),m<=0?(s=Date.now(),d()):(w>m&&(o||!a)?(s=Date.now(),d()):n&&(i=new Promise(((t,e)=>{f=r?e:t,u=setTimeout((()=>{s=Date.now(),a=!0,t(d()),l()}),Math.max(0,m-w))}))),o||u||(u=setTimeout((()=>a=!0),m)),a=!1,i)};return m}(n,o,r,u),t)},b:function(t){return!!n()&&(o(t),!0)},c:e,t:function(t){r()&&u(t)},u:function(t,n=200,o={}){return s(function(t,n={}){let o,r,u=c;const i=t=>{clearTimeout(t),u(),u=c},s=c=>{const s=e(t),a=e(n.maxWait);return o&&i(o),s<=0||void 0!==a&&a<=0?(r&&(i(r),r=null),Promise.resolve(c())):new Promise(((t,e)=>{u=n.rejectOnCancel?e:t,a&&!r&&(r=setTimeout((()=>{o&&i(o),r=null,t(c())}),a)),o=setTimeout((()=>{r&&i(r),r=null,t(c())}),s)}))};return s}(n,o),t)}}),t("i","undefined"!=typeof window);const c=()=>{};function s(t,e){return function(...n){return new Promise(((o,r)=>{Promise.resolve(t((()=>e.apply(this,n)),{fn:e,thisArg:this,args:n})).then(o).catch(r)}))}}}}}));
+========
+System.register(["./index-legacy-27047478.js"],(function(t,e){"use strict";var n,o,r,u,i;return{setters:[t=>{n=t.Z,o=t._,r=t.U,u=t.$,i=t.K}],execute:function(){function e(t){return"function"==typeof t?t():i(t)}t({a:function(t,n=200,o=!1,r=!0,u=!1){return s(function(t,n=!0,o=!0,r=!1){let u,i,s=0,a=!0,f=c;const l=()=>{u&&(clearTimeout(u),u=void 0,f(),f=c)},m=c=>{const m=e(t),w=Date.now()-s,d=()=>i=c();return l(),m<=0?(s=Date.now(),d()):(w>m&&(o||!a)?(s=Date.now(),d()):n&&(i=new Promise(((t,e)=>{f=r?e:t,u=setTimeout((()=>{s=Date.now(),a=!0,t(d()),l()}),Math.max(0,m-w))}))),o||u||(u=setTimeout((()=>a=!0),m)),a=!1,i)};return m}(n,o,r,u),t)},b:function(t){return!!n()&&(o(t),!0)},c:e,t:function(t){r()&&u(t)},u:function(t,n=200,o={}){return s(function(t,n={}){let o,r,u=c;const i=t=>{clearTimeout(t),u(),u=c},s=c=>{const s=e(t),a=e(n.maxWait);return o&&i(o),s<=0||void 0!==a&&a<=0?(r&&(i(r),r=null),Promise.resolve(c())):new Promise(((t,e)=>{u=n.rejectOnCancel?e:t,a&&!r&&(r=setTimeout((()=>{o&&i(o),r=null,t(c())}),a)),o=setTimeout((()=>{r&&i(r),r=null,t(c())}),s)}))};return s}(n,o),t)}}),t("i","undefined"!=typeof window);const c=()=>{};function s(t,e){return function(...n){return new Promise(((o,r)=>{Promise.resolve(t((()=>e.apply(this,n)),{fn:e,thisArg:this,args:n})).then(o).catch(r)}))}}}}}));
+>>>>>>>> test:dist/assets/index-legacy-89505d2d.js

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-27047478.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-3662e240.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-3ee2abe3.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-457c774d.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-46570595.js


+ 4 - 0
dist/assets/index-legacy-47c404cf.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-47c404cf.js
 System.register(["./index-legacy-ea062ad6.js"],(function(e,t){"use strict";var i,n,r,a,p;return{setters:[e=>{i=e.d,n=e.g,r=e.ae,a=e.k,p=e.l}],execute:function(){e("default",i({name:"404-page",setup:()=>()=>n("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[n(r,{description:"你访问的页面不见了,你还可以",size:"large"},null),n(a,{type:"primary",text:!0},{default:()=>[p("返回上一页")]})])}))}}}));
+========
+System.register(["./index-legacy-27047478.js"],(function(e,t){"use strict";var i,n,r,a,p;return{setters:[e=>{i=e.d,n=e.g,r=e.ae,a=e.k,p=e.l}],execute:function(){e("default",i({name:"404-page",setup:()=>()=>n("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[n(r,{description:"你访问的页面不见了,你还可以",size:"large"},null),n(a,{type:"primary",text:!0},{default:()=>[p("返回上一页")]})])}))}}}));
+>>>>>>>> test:dist/assets/index-legacy-0eb8dfdc.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-51aedfda.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-5b0efb5e.js


+ 4 - 0
dist/assets/index-legacy-5c27fc60.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-5c27fc60.js
 System.register(["./index-legacy-ea062ad6.js"],(function(e,n){"use strict";var t,a,r,c,i,u,_;return{setters:[e=>{t=e.d,a=e.f,r=e.g,c=e.i,i=e.F,u=e.k,_=e.l}],execute:function(){var l=document.createElement("style");l.textContent="._TheSearch_18qen_1{border-radius:1.04167vw!important}._TheSearch_18qen_1 .n-input-wrapper{padding-left:.625vw;padding-right:.20833vw;height:2.1875vw!important}._TheSearch_18qen_1 .n-button{height:1.77083vw;font-size:.78125vw;font-weight:500;width:auto}._TheSearch_18qen_1 ._active_18qen_15{display:none}._TheSearch_18qen_1.n-input--focus ._active_18qen_15{display:block}._TheSearch_18qen_1.n-input--focus ._default_18qen_21{display:none}._TheSearch_18qen_1.n-input--focus .n-button{opacity:1}\n",document.head.appendChild(l);const s="_TheSearch_18qen_1",h="_active_18qen_15",o="_default_18qen_21",d=""+new URL("icon_search-cda46378.svg",n.meta.url).href,p=""+new URL("icon_searchActive-80477bdc.svg",n.meta.url).href;e("T",t({name:"TheSearch",props:{round:{type:Boolean,default:!1}},emits:["search"],setup(e,{emit:n}){const t=a({value:""});return()=>r(c,{class:s,round:e.round,placeholder:"请输入搜索关键词",value:t.value,"onUpdate:value":e=>t.value=e},{prefix:()=>r(i,null,[r("img",{class:o,src:d},null),r("img",{class:h,src:p},null)]),suffix:()=>r(u,{size:"small",round:!0,type:"primary",onClick:()=>n("search",t.value?t.value.trim():"")},{default:()=>[_("搜索")]})})}}))}}}));
+========
+System.register(["./index-legacy-27047478.js"],(function(e,n){"use strict";var t,a,r,c,i,u,_;return{setters:[e=>{t=e.d,a=e.f,r=e.g,c=e.i,i=e.F,u=e.k,_=e.l}],execute:function(){var l=document.createElement("style");l.textContent="._TheSearch_18qen_1{border-radius:1.04167vw!important}._TheSearch_18qen_1 .n-input-wrapper{padding-left:.625vw;padding-right:.20833vw;height:2.1875vw!important}._TheSearch_18qen_1 .n-button{height:1.77083vw;font-size:.78125vw;font-weight:500;width:auto}._TheSearch_18qen_1 ._active_18qen_15{display:none}._TheSearch_18qen_1.n-input--focus ._active_18qen_15{display:block}._TheSearch_18qen_1.n-input--focus ._default_18qen_21{display:none}._TheSearch_18qen_1.n-input--focus .n-button{opacity:1}\n",document.head.appendChild(l);const s="_TheSearch_18qen_1",h="_active_18qen_15",o="_default_18qen_21",d=""+new URL("icon_search-8a6ade17.svg",n.meta.url).href,p=""+new URL("icon_searchActive-bf7fd0c6.svg",n.meta.url).href;e("T",t({name:"TheSearch",props:{round:{type:Boolean,default:!1}},emits:["search"],setup(e,{emit:n}){const t=a({value:""});return()=>r(c,{class:s,round:e.round,placeholder:"请输入搜索关键词",value:t.value,"onUpdate:value":e=>t.value=e},{prefix:()=>r(i,null,[r("img",{class:o,src:d},null),r("img",{class:h,src:p},null)]),suffix:()=>r(u,{size:"small",round:!0,type:"primary",onClick:()=>n("search",t.value?t.value.trim():"")},{default:()=>[_("搜索")]})})}}))}}}));
+>>>>>>>> test:dist/assets/index-legacy-f0f955af.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-69f05915.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-6cde4ce5.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-8642ce4f.js


+ 5 - 0
dist/assets/index-legacy-89505d2d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-2242b871.js
+System.register(["./index-legacy-ea062ad6.js"],(function(t,e){"use strict";var n,o,r,u,i;return{setters:[t=>{n=t.Z,o=t._,r=t.U,u=t.$,i=t.K}],execute:function(){function e(t){return"function"==typeof t?t():i(t)}t({a:function(t,n=200,o=!1,r=!0,u=!1){return s(function(t,n=!0,o=!0,r=!1){let u,i,s=0,a=!0,f=c;const l=()=>{u&&(clearTimeout(u),u=void 0,f(),f=c)},m=c=>{const m=e(t),w=Date.now()-s,d=()=>i=c();return l(),m<=0?(s=Date.now(),d()):(w>m&&(o||!a)?(s=Date.now(),d()):n&&(i=new Promise(((t,e)=>{f=r?e:t,u=setTimeout((()=>{s=Date.now(),a=!0,t(d()),l()}),Math.max(0,m-w))}))),o||u||(u=setTimeout((()=>a=!0),m)),a=!1,i)};return m}(n,o,r,u),t)},b:function(t){return!!n()&&(o(t),!0)},c:e,t:function(t){r()&&u(t)},u:function(t,n=200,o={}){return s(function(t,n={}){let o,r,u=c;const i=t=>{clearTimeout(t),u(),u=c},s=c=>{const s=e(t),a=e(n.maxWait);return o&&i(o),s<=0||void 0!==a&&a<=0?(r&&(i(r),r=null),Promise.resolve(c())):new Promise(((t,e)=>{u=n.rejectOnCancel?e:t,a&&!r&&(r=setTimeout((()=>{o&&i(o),r=null,t(c())}),a)),o=setTimeout((()=>{r&&i(r),r=null,t(c())}),s)}))};return s}(n,o),t)}}),t("i","undefined"!=typeof window);const c=()=>{};function s(t,e){return function(...n){return new Promise(((o,r)=>{Promise.resolve(t((()=>e.apply(this,n)),{fn:e,thisArg:this,args:n})).then(o).catch(r)}))}}}}}));
+========
+System.register(["./index-legacy-27047478.js"],(function(t,e){"use strict";var n,o,r,u,i;return{setters:[t=>{n=t.Z,o=t._,r=t.U,u=t.$,i=t.K}],execute:function(){function e(t){return"function"==typeof t?t():i(t)}t({a:function(t,n=200,o=!1,r=!0,u=!1){return s(function(t,n=!0,o=!0,r=!1){let u,i,s=0,a=!0,f=c;const l=()=>{u&&(clearTimeout(u),u=void 0,f(),f=c)},m=c=>{const m=e(t),w=Date.now()-s,d=()=>i=c();return l(),m<=0?(s=Date.now(),d()):(w>m&&(o||!a)?(s=Date.now(),d()):n&&(i=new Promise(((t,e)=>{f=r?e:t,u=setTimeout((()=>{s=Date.now(),a=!0,t(d()),l()}),Math.max(0,m-w))}))),o||u||(u=setTimeout((()=>a=!0),m)),a=!1,i)};return m}(n,o,r,u),t)},b:function(t){return!!n()&&(o(t),!0)},c:e,t:function(t){r()&&u(t)},u:function(t,n=200,o={}){return s(function(t,n={}){let o,r,u=c;const i=t=>{clearTimeout(t),u(),u=c},s=c=>{const s=e(t),a=e(n.maxWait);return o&&i(o),s<=0||void 0!==a&&a<=0?(r&&(i(r),r=null),Promise.resolve(c())):new Promise(((t,e)=>{u=n.rejectOnCancel?e:t,a&&!r&&(r=setTimeout((()=>{o&&i(o),r=null,t(c())}),a)),o=setTimeout((()=>{r&&i(r),r=null,t(c())}),s)}))};return s}(n,o),t)}}),t("i","undefined"!=typeof window);const c=()=>{};function s(t,e){return function(...n){return new Promise(((o,r)=>{Promise.resolve(t((()=>e.apply(this,n)),{fn:e,thisArg:this,args:n})).then(o).catch(r)}))}}}}}));
+>>>>>>>> test:dist/assets/index-legacy-89505d2d.js

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-96796d44.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-a4319f6a.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-ab154845.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-b66ad429.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-b74205fc.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-b7ceba7a.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-bafc313a.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-c31dd03a.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-cc9efb5d.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-d4444c64.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy-d7c8985b.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-dc0ba24a.js


+ 5 - 0
dist/assets/index-legacy-f0f955af.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-5c27fc60.js
+System.register(["./index-legacy-ea062ad6.js"],(function(e,n){"use strict";var t,a,r,c,i,u,_;return{setters:[e=>{t=e.d,a=e.f,r=e.g,c=e.i,i=e.F,u=e.k,_=e.l}],execute:function(){var l=document.createElement("style");l.textContent="._TheSearch_18qen_1{border-radius:1.04167vw!important}._TheSearch_18qen_1 .n-input-wrapper{padding-left:.625vw;padding-right:.20833vw;height:2.1875vw!important}._TheSearch_18qen_1 .n-button{height:1.77083vw;font-size:.78125vw;font-weight:500;width:auto}._TheSearch_18qen_1 ._active_18qen_15{display:none}._TheSearch_18qen_1.n-input--focus ._active_18qen_15{display:block}._TheSearch_18qen_1.n-input--focus ._default_18qen_21{display:none}._TheSearch_18qen_1.n-input--focus .n-button{opacity:1}\n",document.head.appendChild(l);const s="_TheSearch_18qen_1",h="_active_18qen_15",o="_default_18qen_21",d=""+new URL("icon_search-cda46378.svg",n.meta.url).href,p=""+new URL("icon_searchActive-80477bdc.svg",n.meta.url).href;e("T",t({name:"TheSearch",props:{round:{type:Boolean,default:!1}},emits:["search"],setup(e,{emit:n}){const t=a({value:""});return()=>r(c,{class:s,round:e.round,placeholder:"请输入搜索关键词",value:t.value,"onUpdate:value":e=>t.value=e},{prefix:()=>r(i,null,[r("img",{class:o,src:d},null),r("img",{class:h,src:p},null)]),suffix:()=>r(u,{size:"small",round:!0,type:"primary",onClick:()=>n("search",t.value?t.value.trim():"")},{default:()=>[_("搜索")]})})}}))}}}));
+========
+System.register(["./index-legacy-27047478.js"],(function(e,n){"use strict";var t,a,r,c,i,u,_;return{setters:[e=>{t=e.d,a=e.f,r=e.g,c=e.i,i=e.F,u=e.k,_=e.l}],execute:function(){var l=document.createElement("style");l.textContent="._TheSearch_18qen_1{border-radius:1.04167vw!important}._TheSearch_18qen_1 .n-input-wrapper{padding-left:.625vw;padding-right:.20833vw;height:2.1875vw!important}._TheSearch_18qen_1 .n-button{height:1.77083vw;font-size:.78125vw;font-weight:500;width:auto}._TheSearch_18qen_1 ._active_18qen_15{display:none}._TheSearch_18qen_1.n-input--focus ._active_18qen_15{display:block}._TheSearch_18qen_1.n-input--focus ._default_18qen_21{display:none}._TheSearch_18qen_1.n-input--focus .n-button{opacity:1}\n",document.head.appendChild(l);const s="_TheSearch_18qen_1",h="_active_18qen_15",o="_default_18qen_21",d=""+new URL("icon_search-8a6ade17.svg",n.meta.url).href,p=""+new URL("icon_searchActive-bf7fd0c6.svg",n.meta.url).href;e("T",t({name:"TheSearch",props:{round:{type:Boolean,default:!1}},emits:["search"],setup(e,{emit:n}){const t=a({value:""});return()=>r(c,{class:s,round:e.round,placeholder:"请输入搜索关键词",value:t.value,"onUpdate:value":e=>t.value=e},{prefix:()=>r(i,null,[r("img",{class:o,src:d},null),r("img",{class:h,src:p},null)]),suffix:()=>r(u,{size:"small",round:!0,type:"primary",onClick:()=>n("search",t.value?t.value.trim():"")},{default:()=>[_("搜索")]})})}}))}}}));
+>>>>>>>> test:dist/assets/index-legacy-f0f955af.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-legacy-f3d01eef.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/tick-02194837.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/tick-18785756.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/tick-legacy-4ce4f06e.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/tick-legacy-e8b9964a.js


+ 9 - 0
dist/index.html

@@ -197,8 +197,13 @@
 
     })(window);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-4d5fd859.js"></script>
   <link rel="stylesheet" href="./assets/index-5bfc8761.css">
+=======
+  <script type="module" crossorigin src="./assets/index-8e35a2d1.js"></script>
+  <link rel="stylesheet" href="./assets/index-e55a9a7b.css">
+>>>>>>> test
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){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>
@@ -213,7 +218,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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-fb1ae481.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-ea062ad6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-27047478.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> test
 </body>
 
 </html>

+ 12 - 1
src/components/card-type/index.tsx

@@ -105,7 +105,8 @@ export default defineComponent({
           {{
             cover: () => (
               <>
-                {['IMG', 'MUSIC'].includes(props.item.type) && (
+                {/* 图片 */}
+                {props.item.type === 'IMG' && (
                   <NImage
                     class={[styles.cover, styles.image]}
                     lazy
@@ -114,6 +115,16 @@ export default defineComponent({
                     src={props.item.coverImg}
                   />
                 )}
+                {/* 乐谱 */}
+                {props.item.type === 'MUSIC' && (
+                  <NImage
+                    class={[styles.cover, styles.image]}
+                    lazy
+                    previewDisabled={true}
+                    objectFit="cover"
+                    src={props.item.coverImg}
+                  />
+                )}
                 {/* 音频 */}
                 {props.item.type === 'SONG' && (
                   <AudioPlayer

+ 0 - 1
src/components/layout/layoutSilder.tsx

@@ -95,7 +95,6 @@ export default defineComponent({
     };
 
     onBeforeRouteUpdate((to: any) => {
-      console.log(to, 'to');
       checkPathChange(to.path);
     });
 

+ 11 - 1
src/store/modules/prepareLessons.ts

@@ -8,7 +8,9 @@ export const usePrepareStore = defineStore('prepare-lessons-store', {
     lessonCoursewareId: '', // 哪个教材分类
     lessonCoursewareDetailId: '', // 哪个教材详情
     treeList: [] as any[], // 左边教学课件列表
-    coursewareList: [] as any[] // 课件信息
+    coursewareList: [] as any[], // 课件信息
+    tabType: '', // 备课 - 课件 | 训练 类型切换
+    coursewareFullScreen: false as boolean // 课件资源是否全屏
   }),
   getters: {
     /** 获取基础教学课件 */
@@ -34,6 +36,10 @@ export const usePrepareStore = defineStore('prepare-lessons-store', {
     /** 获取课件列表 */
     getCoursewareList(): any[] {
       return this.coursewareList;
+    },
+    /** 获取课件是否全屏 */
+    getCoursewareFullScreen(): boolean {
+      return this.coursewareFullScreen;
     }
   },
   actions: {
@@ -60,6 +66,10 @@ export const usePrepareStore = defineStore('prepare-lessons-store', {
     /** 设置课件列表 */
     setCoursewareList(list: any[]) {
       this.coursewareList = list;
+    },
+    /** 设置课件是否全屏 */
+    setCoursewareFullScreen(status: boolean) {
+      this.coursewareFullScreen = status;
     }
   }
 });

+ 18 - 0
src/views/prepare-lessons/components/resource-main/index.module.less

@@ -47,4 +47,22 @@
     height: 18px;
     cursor: pointer;
   }
+}
+
+.selectMusicModal {
+  position: relative;
+  width: 1352px;
+
+  :global {
+    .n-card-header {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+
+      .n-card-header__main {
+        color: #fff;
+      }
+    }
+  }
 }

+ 19 - 9
src/views/prepare-lessons/components/resource-main/index.tsx

@@ -1,19 +1,19 @@
-import { defineComponent } from 'vue';
+import { defineComponent, reactive } from 'vue';
 import styles from './index.module.less';
-import { NTabs, NTabPane } from 'naive-ui';
+import { NTabs, NTabPane, NModal } from 'naive-ui';
 import ShareResources from './components/share-resources';
 import MyResources from './components/my-resources';
 import MyCollect from './components/my-collect';
+import { usePrepareStore } from '/src/store/modules/prepareLessons';
+import SelectMusic from '../../model/select-music';
 
 export default defineComponent({
   name: 'resource-main',
-  props: {
-    selectionHeight: {
-      type: String,
-      default: '100%'
-    }
-  },
   setup() {
+    const prePareStore = usePrepareStore();
+    const forms = reactive({
+      selectMusicStatus: false
+    });
     return () => (
       <div class={styles['resource-main']}>
         <NTabs
@@ -23,7 +23,9 @@ export default defineComponent({
           paneWrapperClass={styles.paneWrapperContainer}>
           {{
             suffix: () => (
-              <div class={styles.iconScreen}>
+              <div
+                class={styles.iconScreen}
+                onClick={() => (prePareStore.coursewareFullScreen = true)}>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
                   <g fill="none">
                     <path
@@ -57,6 +59,14 @@ export default defineComponent({
             )
           }}
         </NTabs>
+
+        <NModal
+          v-model:show={forms.selectMusicStatus}
+          class={['modalTitle', styles.selectMusicModal]}
+          preset="card"
+          title={'选择曲目'}>
+          <SelectMusic />
+        </NModal>
       </div>
     );
   }

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff