lex 3 년 전
부모
커밋
59f2ca2a13
100개의 변경된 파일183개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      dist/assets/after-sale-legacy.ab12d59b.js
  2. 1 0
      dist/assets/after-sale-legacy.c6f4a9ef.js
  3. 0 0
      dist/assets/after-sale.2d6d1be5.js
  4. 1 0
      dist/assets/cart-legacy.1bc87a94.js
  5. 1 0
      dist/assets/cart-legacy.c8d45537.js
  6. 4 0
      dist/assets/cart.3327eb0a.js
  7. 5 0
      dist/assets/cart.801f5ba9.js
  8. 1 0
      dist/assets/create-legacy.2aff8c29.js
  9. 1 0
      dist/assets/create-legacy.5ccdea74.js
  10. 1 0
      dist/assets/create-legacy.65cce9a8.js
  11. 1 0
      dist/assets/create-legacy.b6f13492.js
  12. 1 0
      dist/assets/create.013a0f06.js
  13. 1 0
      dist/assets/create.23e8832f.js
  14. 1 0
      dist/assets/create.2a45f21c.js
  15. 1 0
      dist/assets/create.808d6285.js
  16. 5 0
      dist/assets/detail-legacy.95e6087f.js
  17. 4 0
      dist/assets/detail-legacy.b92585e4.js
  18. 5 0
      dist/assets/detail.0c2a5b68.js
  19. 4 0
      dist/assets/detail.4129e9c8.js
  20. 4 0
      dist/assets/download-legacy.5edee8a1.js
  21. 9 0
      dist/assets/download-legacy.c63a2fdb.js
  22. 1 0
      dist/assets/download.2e9dc0af.js
  23. 1 0
      dist/assets/footer-legacy.0fd8153e.js
  24. 1 0
      dist/assets/footer-legacy.3a15fdba.js
  25. 1 0
      dist/assets/footer.7078ade8.js
  26. 1 0
      dist/assets/guide-legacy.2a157ab9.js
  27. 1 0
      dist/assets/guide-legacy.fa53c900.js
  28. 1 0
      dist/assets/guide.52dc54a1.js
  29. 1 0
      dist/assets/guide.f7d3de47.js
  30. 1 0
      dist/assets/header-legacy.2a30a7e5.js
  31. 1 0
      dist/assets/header-legacy.723e2dc0.js
  32. 1 0
      dist/assets/header.a03997b3.js
  33. 1 0
      dist/assets/header.d4cbdb54.js
  34. 1 0
      dist/assets/help-center-detail-legacy.4b4ca3d5.js
  35. 1 0
      dist/assets/help-center-detail-legacy.6a7f58b3.js
  36. 4 0
      dist/assets/help-center-detail.7f3108a0.js
  37. 5 0
      dist/assets/help-center-detail.7fba42ee.js
  38. 1 0
      dist/assets/help-center-legacy.8c0df3b8.js
  39. 1 0
      dist/assets/help-center-legacy.b017f8c8.js
  40. 1 0
      dist/assets/help-center.39e84934.js
  41. 1 0
      dist/assets/help-center.f4af0205.js
  42. 1 0
      dist/assets/index-legacy.0167b189.js
  43. 1 0
      dist/assets/index-legacy.061fb115.js
  44. 1 0
      dist/assets/index-legacy.0700c999.js
  45. 0 0
      dist/assets/index-legacy.0767eda9.js
  46. 1 0
      dist/assets/index-legacy.07f0fb94.js
  47. 1 0
      dist/assets/index-legacy.084ddb96.js
  48. 0 0
      dist/assets/index-legacy.109be24d.js
  49. 1 0
      dist/assets/index-legacy.11276784.js
  50. 1 0
      dist/assets/index-legacy.16cd3cd5.js
  51. 1 0
      dist/assets/index-legacy.1802f110.js
  52. 1 0
      dist/assets/index-legacy.195482c5.js
  53. 1 0
      dist/assets/index-legacy.1b6bdc02.js
  54. 1 0
      dist/assets/index-legacy.1cc4348e.js
  55. 1 0
      dist/assets/index-legacy.1d74e859.js
  56. 1 0
      dist/assets/index-legacy.1f3453ab.js
  57. 1 0
      dist/assets/index-legacy.20b4f68c.js
  58. 1 0
      dist/assets/index-legacy.215c60c0.js
  59. 4 0
      dist/assets/index-legacy.24801d0d.js
  60. 1 0
      dist/assets/index-legacy.24c3cd65.js
  61. 1 0
      dist/assets/index-legacy.24fd25de.js
  62. 5 0
      dist/assets/index-legacy.29177ddb.js
  63. 1 0
      dist/assets/index-legacy.29690f4b.js
  64. 1 0
      dist/assets/index-legacy.2ee63a31.js
  65. 0 0
      dist/assets/index-legacy.2fb95a21.js
  66. 1 0
      dist/assets/index-legacy.30d9603b.js
  67. 1 0
      dist/assets/index-legacy.3257e1af.js
  68. 5 0
      dist/assets/index-legacy.32d562af.js
  69. 1 0
      dist/assets/index-legacy.3704d634.js
  70. 11 0
      dist/assets/index-legacy.38551efd.js
  71. 1 0
      dist/assets/index-legacy.3898dc4a.js
  72. 1 0
      dist/assets/index-legacy.40a65125.js
  73. 1 0
      dist/assets/index-legacy.4182abc7.js
  74. 0 0
      dist/assets/index-legacy.4436108b.js
  75. 1 0
      dist/assets/index-legacy.453dd275.js
  76. 1 0
      dist/assets/index-legacy.47956d94.js
  77. 1 0
      dist/assets/index-legacy.48d58170.js
  78. 0 0
      dist/assets/index-legacy.48e6e578.js
  79. 1 0
      dist/assets/index-legacy.4c3ed013.js
  80. 1 0
      dist/assets/index-legacy.4e7b8b8d.js
  81. 1 0
      dist/assets/index-legacy.4f17c310.js
  82. 1 0
      dist/assets/index-legacy.52881464.js
  83. 1 0
      dist/assets/index-legacy.53210676.js
  84. 1 0
      dist/assets/index-legacy.53567dd4.js
  85. 4 0
      dist/assets/index-legacy.5680014a.js
  86. 1 0
      dist/assets/index-legacy.58f04d24.js
  87. 1 0
      dist/assets/index-legacy.5eaa30c4.js
  88. 1 0
      dist/assets/index-legacy.60f19f56.js
  89. 14 0
      dist/assets/index-legacy.625a53ee.js
  90. 1 0
      dist/assets/index-legacy.644668ae.js
  91. 1 0
      dist/assets/index-legacy.6994747a.js
  92. 6 0
      dist/assets/index-legacy.6dc45e63.js
  93. 1 0
      dist/assets/index-legacy.7049163e.js
  94. 4 0
      dist/assets/index-legacy.7295d59f.js
  95. 1 0
      dist/assets/index-legacy.76786718.js
  96. 1 0
      dist/assets/index-legacy.7be66721.js
  97. 0 0
      dist/assets/index-legacy.7d9b9af3.js
  98. 1 0
      dist/assets/index-legacy.7f50dc29.js
  99. 4 0
      dist/assets/index-legacy.7f57eea6.js
  100. 4 0
      dist/assets/index-legacy.808a82b3.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/after-sale-legacy.ab12d59b.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/after-sale-legacy.c6f4a9ef.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/after-sale.2d6d1be5.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/cart-legacy.1bc87a94.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/cart-legacy.c8d45537.js


+ 4 - 0
dist/assets/cart.3327eb0a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/cart.3327eb0a.js
 import{h as o}from"./vendor.ecb10a79.js";const c=o({calcAmount:{},cartPromotionItemList:[],memberReceiveAddressList:[],orderInfo:{}}),i=a=>{let r=null;try{r=JSON.parse(a)}catch{}if(Array.isArray(r)){let e="",t;for(t of r)e+=`${t.key}: ${t.value} `;return e}return a};export{c,i as f};
+========
+import{h as o}from"./vendor.2a9b556f.js";const c=o({calcAmount:{},cartPromotionItemList:[],memberReceiveAddressList:[],orderInfo:{}}),i=a=>{let r=null;try{r=JSON.parse(a)}catch{}if(Array.isArray(r)){let e="",t;for(t of r)e+=`${t.key}: ${t.value} `;return e}return a};export{c,i as f};
+>>>>>>>> online:dist/assets/cart.801f5ba9.js

+ 5 - 0
dist/assets/cart.801f5ba9.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/cart.3327eb0a.js
+import{h as o}from"./vendor.ecb10a79.js";const c=o({calcAmount:{},cartPromotionItemList:[],memberReceiveAddressList:[],orderInfo:{}}),i=a=>{let r=null;try{r=JSON.parse(a)}catch{}if(Array.isArray(r)){let e="",t;for(t of r)e+=`${t.key}: ${t.value} `;return e}return a};export{c,i as f};
+========
+import{h as o}from"./vendor.2a9b556f.js";const c=o({calcAmount:{},cartPromotionItemList:[],memberReceiveAddressList:[],orderInfo:{}}),i=a=>{let r=null;try{r=JSON.parse(a)}catch{}if(Array.isArray(r)){let e="",t;for(t of r)e+=`${t.key}: ${t.value} `;return e}return a};export{c,i as f};
+>>>>>>>> online:dist/assets/cart.801f5ba9.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/create-legacy.2aff8c29.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/create-legacy.5ccdea74.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/create-legacy.65cce9a8.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/create-legacy.b6f13492.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/create.013a0f06.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/create.23e8832f.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/create.2a45f21c.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/create.808d6285.js


+ 5 - 0
dist/assets/detail-legacy.95e6087f.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/detail-legacy.b92585e4.js
+;(function(){System.register(['./vendor-legacy.c77bef97.js','./index-legacy.f25f109a2.js','./index-legacy.f25f109a3.js','./index-legacy.f25f109a.js'],function(exports){'use strict';var defineComponent,ref,useRoute,createVNode,CellGroup,Field;return{setters:[function(module){defineComponent=module.d;ref=module.V;useRoute=module._;createVNode=module.a;CellGroup=module.C;Field=module.m;},function(){},function(){},function(){}],execute:function execute(){var detail=exports('default',defineComponent({name:'ReviewListDetail',setup:function setup(){ref({});var route=useRoute();return function(){console.log(route.params.id,route);return createVNode(CellGroup,null,{default:function _default(){return[createVNode(Field,{"value":'12321',"label":"曲目名称"},null)];}});};}}));}};});})();
+========
+;(function(){System.register(['./vendor-legacy.4b936a17.js','./index-legacy.f25f109a2.js','./index-legacy.f25f109a3.js','./index-legacy.f25f109a.js'],function(exports){'use strict';var defineComponent,ref,useRoute,createVNode,CellGroup,Field;return{setters:[function(module){defineComponent=module.d;ref=module.V;useRoute=module._;createVNode=module.a;CellGroup=module.C;Field=module.m;},function(){},function(){},function(){}],execute:function execute(){var detail=exports('default',defineComponent({name:'ReviewListDetail',setup:function setup(){ref({});var route=useRoute();return function(){console.log(route.params.id,route);return createVNode(CellGroup,null,{default:function _default(){return[createVNode(Field,{"value":'12321',"label":"曲目名称"},null)];}});};}}));}};});})();
+>>>>>>>> online:dist/assets/detail-legacy.95e6087f.js

+ 4 - 0
dist/assets/detail-legacy.b92585e4.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/detail-legacy.b92585e4.js
 ;(function(){System.register(['./vendor-legacy.c77bef97.js','./index-legacy.f25f109a2.js','./index-legacy.f25f109a3.js','./index-legacy.f25f109a.js'],function(exports){'use strict';var defineComponent,ref,useRoute,createVNode,CellGroup,Field;return{setters:[function(module){defineComponent=module.d;ref=module.V;useRoute=module._;createVNode=module.a;CellGroup=module.C;Field=module.m;},function(){},function(){},function(){}],execute:function execute(){var detail=exports('default',defineComponent({name:'ReviewListDetail',setup:function setup(){ref({});var route=useRoute();return function(){console.log(route.params.id,route);return createVNode(CellGroup,null,{default:function _default(){return[createVNode(Field,{"value":'12321',"label":"曲目名称"},null)];}});};}}));}};});})();
+========
+;(function(){System.register(['./vendor-legacy.4b936a17.js','./index-legacy.f25f109a2.js','./index-legacy.f25f109a3.js','./index-legacy.f25f109a.js'],function(exports){'use strict';var defineComponent,ref,useRoute,createVNode,CellGroup,Field;return{setters:[function(module){defineComponent=module.d;ref=module.V;useRoute=module._;createVNode=module.a;CellGroup=module.C;Field=module.m;},function(){},function(){},function(){}],execute:function execute(){var detail=exports('default',defineComponent({name:'ReviewListDetail',setup:function setup(){ref({});var route=useRoute();return function(){console.log(route.params.id,route);return createVNode(CellGroup,null,{default:function _default(){return[createVNode(Field,{"value":'12321',"label":"曲目名称"},null)];}});};}}));}};});})();
+>>>>>>>> online:dist/assets/detail-legacy.95e6087f.js

+ 5 - 0
dist/assets/detail.0c2a5b68.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/detail.4129e9c8.js
+import{d as t,V as o,_ as r,a,C as s,m as l}from"./vendor.ecb10a79.js";/* empty css               *//* empty css               *//* empty css              */var m=t({name:"ReviewListDetail",setup(){o({});const e=r();return()=>(console.log(e.params.id,e),a(s,null,{default:()=>[a(l,{value:"12321",label:"\u66F2\u76EE\u540D\u79F0"},null)]}))}});export{m as default};
+========
+import{d as t,V as o,_ as r,a,C as s,m as l}from"./vendor.2a9b556f.js";/* empty css               *//* empty css               *//* empty css              */var m=t({name:"ReviewListDetail",setup(){o({});const e=r();return()=>(console.log(e.params.id,e),a(s,null,{default:()=>[a(l,{value:"12321",label:"\u66F2\u76EE\u540D\u79F0"},null)]}))}});export{m as default};
+>>>>>>>> online:dist/assets/detail.0c2a5b68.js

+ 4 - 0
dist/assets/detail.4129e9c8.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/detail.4129e9c8.js
 import{d as t,V as o,_ as r,a,C as s,m as l}from"./vendor.ecb10a79.js";/* empty css               *//* empty css               *//* empty css              */var m=t({name:"ReviewListDetail",setup(){o({});const e=r();return()=>(console.log(e.params.id,e),a(s,null,{default:()=>[a(l,{value:"12321",label:"\u66F2\u76EE\u540D\u79F0"},null)]}))}});export{m as default};
+========
+import{d as t,V as o,_ as r,a,C as s,m as l}from"./vendor.2a9b556f.js";/* empty css               *//* empty css               *//* empty css              */var m=t({name:"ReviewListDetail",setup(){o({});const e=r();return()=>(console.log(e.params.id,e),a(s,null,{default:()=>[a(l,{value:"12321",label:"\u66F2\u76EE\u540D\u79F0"},null)]}))}});export{m as default};
+>>>>>>>> online:dist/assets/detail.0c2a5b68.js

+ 4 - 0
dist/assets/download-legacy.5edee8a1.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/download-legacy.5edee8a1.js
 ;(function(){System.register(['./index.module-legacy.7b7b06f4.js','./wx_bg-legacy.105835c9.js','./index-legacy.b813903f.js','./vendor-legacy.c77bef97.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.e;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀学院下载';}else if(this.type==='teacher'){document.title='酷乐秀下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// https://itunes.apple.com/cn/app/id1626971149?mt=8   学院
+========
+;(function(){System.register(['./index.module-legacy.7b7b06f4.js','./wx_bg-legacy.105835c9.js','./index-legacy.9aea25aa.js','./vendor-legacy.4b936a17.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.e;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀学院下载';}else if(this.type==='teacher'){document.title='酷乐秀下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// https://itunes.apple.com/cn/app/id1626971149?mt=8   学院
+>>>>>>>> online:dist/assets/download-legacy.c63a2fdb.js
 // https://itunes.apple.com/cn/app/id1626971695?mt=8   酷乐秀
 // clx-teacher-domain.apk
 // clx-student-domain.apk

+ 9 - 0
dist/assets/download-legacy.c63a2fdb.js

@@ -0,0 +1,9 @@
+<<<<<<<< HEAD:dist/assets/download-legacy.5edee8a1.js
+;(function(){System.register(['./index.module-legacy.7b7b06f4.js','./wx_bg-legacy.105835c9.js','./index-legacy.b813903f.js','./vendor-legacy.c77bef97.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.e;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀学院下载';}else if(this.type==='teacher'){document.title='酷乐秀下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// https://itunes.apple.com/cn/app/id1626971149?mt=8   学院
+========
+;(function(){System.register(['./index.module-legacy.7b7b06f4.js','./wx_bg-legacy.105835c9.js','./index-legacy.9aea25aa.js','./vendor-legacy.4b936a17.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.e;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀学院下载';}else if(this.type==='teacher'){document.title='酷乐秀下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// https://itunes.apple.com/cn/app/id1626971149?mt=8   学院
+>>>>>>>> online:dist/assets/download-legacy.c63a2fdb.js
+// https://itunes.apple.com/cn/app/id1626971695?mt=8   酷乐秀
+// clx-teacher-domain.apk
+// clx-student-domain.apk
+if(browser().ios||/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)){if(this.type=='student'){window.location.href='https://itunes.apple.com/cn/app/id1626971695?mt=8';}else if(this.type=='teacher'){window.location.href='https://itunes.apple.com/cn/app/id1626971149?mt=8';}}else if(/(Android)/i.test(navigator.userAgent)){if(this.type=='student'){window.location.href='https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk';}else if(this.type=='teacher'){window.location.href='https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk';}}else{this.$toast('请用手机或移动设备打开');}}},render:function render(){var _this=this;return createVNode("div",{"class":styles.downContainer},[createVNode("div",{"class":styles.logo},[this.type==='student'?createVNode("img",{"src":getAssetsHomeFile('logo.png'),"alt":""},null):createVNode("img",{"src":getAssetsHomeFile('teacher_logo.png'),"alt":""},null)]),createVNode("div",{"class":styles.down},[createVNode(Button,{"type":"primary","round":true,"plain":true,"onClick":this.downLoadApp},{default:function _default(){return[createTextVNode("\u70B9\u51FB\u4E0B\u8F7DApp")];}})]),createVNode("div",{"class":styles.mainImg},[this.type==='student'?createVNode("img",{"src":getAssetsHomeFile('student_bg.png'),"alt":""},null):createVNode("img",{"src":getAssetsHomeFile('teacher_bg.png'),"alt":""},null)]),this.wxStatus&&createVNode("div",{"class":styles.wxpopup,"onClick":function onClick(){_this.wxStatus=false;}},[createVNode("img",{"src":getAssetsHomeFile('wx_bg.png'),"alt":""},null)])]);}}));}};});})();

+ 1 - 0
dist/assets/download.2e9dc0af.js

@@ -0,0 +1 @@
+import{s as e,_ as n,a as l,b as r,c as p,d}from"./index.module.f2f46766.js";import{_ as u}from"./wx_bg.993c33e7.js";import{e as i}from"./index.2567832c.js";import{d as g,a as t,B as c,j as m}from"./vendor.2a9b556f.js";const s=o=>{const a=`./images/${o}`;return{"./images/bg.png":n,"./images/logo.png":l,"./images/student_bg.png":r,"./images/teacher_bg.png":p,"./images/teacher_logo.png":d,"./images/wx_bg.png":u}[a].default};var y=g({name:"download",data(){return{type:this.$route.query.type||"student",wxStatus:!1}},mounted(){this.type==="student"?document.title="\u9177\u4E50\u79C0\u5B66\u9662\u4E0B\u8F7D":this.type==="teacher"&&(document.title="\u9177\u4E50\u79C0\u4E0B\u8F7D")},methods:{downLoadApp(){if(i().weixin){this.wxStatus=!0;return}i().ios||/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)?this.type=="student"?window.location.href="https://itunes.apple.com/cn/app/id1626971695?mt=8":this.type=="teacher"&&(window.location.href="https://itunes.apple.com/cn/app/id1626971149?mt=8"):/(Android)/i.test(navigator.userAgent)?this.type=="student"?window.location.href="https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk":this.type=="teacher"&&(window.location.href="https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk"):this.$toast("\u8BF7\u7528\u624B\u673A\u6216\u79FB\u52A8\u8BBE\u5907\u6253\u5F00")}},render(){return t("div",{class:e.downContainer},[t("div",{class:e.logo},[this.type==="student"?t("img",{src:s("logo.png"),alt:""},null):t("img",{src:s("teacher_logo.png"),alt:""},null)]),t("div",{class:e.down},[t(c,{type:"primary",round:!0,plain:!0,onClick:this.downLoadApp},{default:()=>[m("\u70B9\u51FB\u4E0B\u8F7DApp")]})]),t("div",{class:e.mainImg},[this.type==="student"?t("img",{src:s("student_bg.png"),alt:""},null):t("img",{src:s("teacher_bg.png"),alt:""},null)]),this.wxStatus&&t("div",{class:e.wxpopup,onClick:()=>{this.wxStatus=!1}},[t("img",{src:s("wx_bg.png"),alt:""},null)])])}});export{y as default,s as getAssetsHomeFile};

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/footer-legacy.0fd8153e.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/footer-legacy.3a15fdba.js


+ 1 - 0
dist/assets/footer.7078ade8.js

@@ -0,0 +1 @@
+import{d as r,a6 as c,a as o,u as t,j as n}from"./vendor.2a9b556f.js";import{F as l}from"./favorite.9bdf4305.js";var m="./assets/count.0cae50a7.svg";const i="_album_1p0vw_1",v="_img_1p0vw_8",p="_content_1p0vw_31",_="_footer_1p0vw_48",f="_icon_1p0vw_60";var e={album:i,img:v,content:p,footer:_,icon:f},F=r({name:"AlbumFooter",props:{musicSheetCount:{type:Number,default:0},albumFavoriteCount:{type:Number,default:0}},setup(a){const{musicSheetCount:s,albumFavoriteCount:u}=c(a);return()=>o("footer",{class:e.footer},[o("div",null,[o(t,{class:e.icon,name:m},null),o("span",null,[s.value,n("\u9996")])]),o("div",null,[o(t,{class:e.icon,name:l},null),o("span",null,[u.value,n("\u4EBA\u6536\u85CF")])])])}});export{F,e as s};

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/guide-legacy.2a157ab9.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/guide-legacy.fa53c900.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/guide.52dc54a1.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/guide.f7d3de47.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/header-legacy.2a30a7e5.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/header-legacy.723e2dc0.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/header.a03997b3.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/header.d4cbdb54.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/help-center-detail-legacy.4b4ca3d5.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/help-center-detail-legacy.6a7f58b3.js


+ 4 - 0
dist/assets/help-center-detail.7f3108a0.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/help-center-detail.7f3108a0.js
 import{r as d}from"./index.ad636332.js";import{d as u,g as c,ai as p,a as t,N as h,j as g}from"./vendor.ecb10a79.js";/* empty css               *//* empty css               *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.bdc7eed4.js";var v=u({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await d.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:l,createTime:o,content:i,catalogId:r}=s.data;this.detail={title:a,createTime:r==2?c(l).format("YYYY-MM-DD HH:mm:ss"):c(o).format("YYYY-MM-DD HH:mm:ss"),content:i};const m=r==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const l=document.querySelectorAll(".msgWrap img");let o=Array.from(l).map((i,r)=>(e.srcElement==i&&(a=r),i.src));p({images:o,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(h,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[g("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],onClick:this.onShowImg,innerHTML:this.detail.content},null)])}});export{v as default};
+========
+import{r as d}from"./index.2567832c.js";import{d as u,g as c,ap as p,a as t,N as h,j as g}from"./vendor.2a9b556f.js";/* empty css               *//* empty css               *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.bdc7eed4.js";var v=u({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await d.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:l,createTime:o,content:i,catalogId:r}=s.data;this.detail={title:a,createTime:r==2?c(l).format("YYYY-MM-DD HH:mm:ss"):c(o).format("YYYY-MM-DD HH:mm:ss"),content:i};const m=r==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const l=document.querySelectorAll(".msgWrap img");let o=Array.from(l).map((i,r)=>(e.srcElement==i&&(a=r),i.src));p({images:o,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(h,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[g("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],onClick:this.onShowImg,innerHTML:this.detail.content},null)])}});export{v as default};
+>>>>>>>> online:dist/assets/help-center-detail.7fba42ee.js

+ 5 - 0
dist/assets/help-center-detail.7fba42ee.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/help-center-detail.7f3108a0.js
+import{r as d}from"./index.ad636332.js";import{d as u,g as c,ai as p,a as t,N as h,j as g}from"./vendor.ecb10a79.js";/* empty css               *//* empty css               *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.bdc7eed4.js";var v=u({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await d.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:l,createTime:o,content:i,catalogId:r}=s.data;this.detail={title:a,createTime:r==2?c(l).format("YYYY-MM-DD HH:mm:ss"):c(o).format("YYYY-MM-DD HH:mm:ss"),content:i};const m=r==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const l=document.querySelectorAll(".msgWrap img");let o=Array.from(l).map((i,r)=>(e.srcElement==i&&(a=r),i.src));p({images:o,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(h,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[g("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],onClick:this.onShowImg,innerHTML:this.detail.content},null)])}});export{v as default};
+========
+import{r as d}from"./index.2567832c.js";import{d as u,g as c,ap as p,a as t,N as h,j as g}from"./vendor.2a9b556f.js";/* empty css               *//* empty css               *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.bdc7eed4.js";var v=u({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await d.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:l,createTime:o,content:i,catalogId:r}=s.data;this.detail={title:a,createTime:r==2?c(l).format("YYYY-MM-DD HH:mm:ss"):c(o).format("YYYY-MM-DD HH:mm:ss"),content:i};const m=r==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const l=document.querySelectorAll(".msgWrap img");let o=Array.from(l).map((i,r)=>(e.srcElement==i&&(a=r),i.src));p({images:o,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(h,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[g("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],onClick:this.onShowImg,innerHTML:this.detail.content},null)])}});export{v as default};
+>>>>>>>> online:dist/assets/help-center-detail.7fba42ee.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/help-center-legacy.8c0df3b8.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/help-center-legacy.b017f8c8.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/help-center.39e84934.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/help-center.f4af0205.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.0167b189.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.061fb115.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.0700c999.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy.0767eda9.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.07f0fb94.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.084ddb96.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy.109be24d.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.11276784.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.16cd3cd5.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.1802f110.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.195482c5.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.1b6bdc02.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.1cc4348e.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.1d74e859.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.1f3453ab.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.20b4f68c.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.215c60c0.js


+ 4 - 0
dist/assets/index-legacy.24801d0d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.24801d0d.js
 ;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._title_1amjj_1{font-size:.53333rem;color:red}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.c77bef97.js'],function(exports){'use strict';var defineComponent,createVNode,Fragment,createTextVNode,Button;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;createTextVNode=module.j;Button=module.B;}],execute:function execute(){var title="_title_1amjj_1";var styles={title:title};var index=exports('default',defineComponent({name:'home',render:function render(){return createVNode(Fragment,null,[createVNode("div",{"class":styles.title},[createTextVNode("\u6807\u9898")]),createVNode(Button,null,{default:function _default(){return[createTextVNode("\u9996\u9875")];}})]);}}));}};});})();
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._title_1amjj_1{font-size:.53333rem;color:red}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.4b936a17.js'],function(exports){'use strict';var defineComponent,createVNode,Fragment,createTextVNode,Button;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;createTextVNode=module.j;Button=module.B;}],execute:function execute(){var title="_title_1amjj_1";var styles={title:title};var index=exports('default',defineComponent({name:'home',render:function render(){return createVNode(Fragment,null,[createVNode("div",{"class":styles.title},[createTextVNode("\u6807\u9898")]),createVNode(Button,null,{default:function _default(){return[createTextVNode("\u9996\u9875")];}})]);}}));}};});})();
+>>>>>>>> online:dist/assets/index-legacy.29177ddb.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.24c3cd65.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.24fd25de.js


+ 5 - 0
dist/assets/index-legacy.29177ddb.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.24801d0d.js
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._title_1amjj_1{font-size:.53333rem;color:red}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.c77bef97.js'],function(exports){'use strict';var defineComponent,createVNode,Fragment,createTextVNode,Button;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;createTextVNode=module.j;Button=module.B;}],execute:function execute(){var title="_title_1amjj_1";var styles={title:title};var index=exports('default',defineComponent({name:'home',render:function render(){return createVNode(Fragment,null,[createVNode("div",{"class":styles.title},[createTextVNode("\u6807\u9898")]),createVNode(Button,null,{default:function _default(){return[createTextVNode("\u9996\u9875")];}})]);}}));}};});})();
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._title_1amjj_1{font-size:.53333rem;color:red}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.4b936a17.js'],function(exports){'use strict';var defineComponent,createVNode,Fragment,createTextVNode,Button;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;createTextVNode=module.j;Button=module.B;}],execute:function execute(){var title="_title_1amjj_1";var styles={title:title};var index=exports('default',defineComponent({name:'home',render:function render(){return createVNode(Fragment,null,[createVNode("div",{"class":styles.title},[createTextVNode("\u6807\u9898")]),createVNode(Button,null,{default:function _default(){return[createTextVNode("\u9996\u9875")];}})]);}}));}};});})();
+>>>>>>>> online:dist/assets/index-legacy.29177ddb.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.29690f4b.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.2ee63a31.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy.2fb95a21.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.30d9603b.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.3257e1af.js


+ 5 - 0
dist/assets/index-legacy.32d562af.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.808a82b3.js
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._user-detail_1e2p6_1{display:flex;align-items:center;justify-content:space-between;font-size:.42667rem;line-height:.58667rem;color:#1a1a1a}._user-detail_1e2p6_1 ._user-names_1e2p6_9{display:flex;align-items:center}._user-detail_1e2p6_1 ._user-logo_1e2p6_13{width:1.06667rem;height:1.06667rem;border-radius:50%;overflow:hidden;margin-right:.21333rem}._user-detail_1e2p6_1 ._user-time_1e2p6_20{font-size:.37333rem;color:#999;line-height:.53333rem}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.c77bef97.js','./index-legacy.f25f109a4.js','./icon_student-legacy.45be2fa9.js'],function(exports){'use strict';var defineComponent,createVNode,Image,iconStudent;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.I;},function(){},function(module){iconStudent=module.i;}],execute:function execute(){var styles={"user-detail":"_user-detail_1e2p6_1","user-names":"_user-names_1e2p6_9","user-logo":"_user-logo_1e2p6_13","user-time":"_user-time_1e2p6_20"};var UserList=exports('U',defineComponent({name:'UserDetail',props:{users:{type:Object,default:{}}},render:function render(){return createVNode("div",{"class":styles['user-detail']},[createVNode("div",{"class":styles['user-names']},[createVNode(Image,{"class":styles['user-logo'],"src":this.users.avatar||iconStudent,"fit":"cover"},null),this.users.studentName||"\u6E38\u5BA2".concat(this.users.studentId||'')]),createVNode("span",{"class":styles['user-time']},[this.users.createTime])]);}}));}};});})();
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._user-detail_1e2p6_1{display:flex;align-items:center;justify-content:space-between;font-size:.42667rem;line-height:.58667rem;color:#1a1a1a}._user-detail_1e2p6_1 ._user-names_1e2p6_9{display:flex;align-items:center}._user-detail_1e2p6_1 ._user-logo_1e2p6_13{width:1.06667rem;height:1.06667rem;border-radius:50%;overflow:hidden;margin-right:.21333rem}._user-detail_1e2p6_1 ._user-time_1e2p6_20{font-size:.37333rem;color:#999;line-height:.53333rem}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.4b936a17.js','./index-legacy.f25f109a4.js','./icon_student-legacy.45be2fa9.js'],function(exports){'use strict';var defineComponent,createVNode,Image,iconStudent;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.I;},function(){},function(module){iconStudent=module.i;}],execute:function execute(){var styles={"user-detail":"_user-detail_1e2p6_1","user-names":"_user-names_1e2p6_9","user-logo":"_user-logo_1e2p6_13","user-time":"_user-time_1e2p6_20"};var UserList=exports('U',defineComponent({name:'UserDetail',props:{users:{type:Object,default:{}}},render:function render(){return createVNode("div",{"class":styles['user-detail']},[createVNode("div",{"class":styles['user-names']},[createVNode(Image,{"class":styles['user-logo'],"src":this.users.avatar||iconStudent,"fit":"cover"},null),this.users.studentName||"\u6E38\u5BA2".concat(this.users.studentId||'')]),createVNode("span",{"class":styles['user-time']},[this.users.createTime])]);}}));}};});})();
+>>>>>>>> online:dist/assets/index-legacy.32d562af.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.3704d634.js


+ 11 - 0
dist/assets/index-legacy.38551efd.js

@@ -0,0 +1,11 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.cbb3b918.js
+;(function(){function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._cashProtocol_ifi2b_1{position:relative}._cashProtocol_ifi2b_1 ._submit_ifi2b_4{width:90%;margin-left:5%;margin-bottom:.4rem;position:absolute;bottom:0;z-index:99}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.b813903f.js','./vendor-legacy.c77bef97.js','./index-legacy.cc22c4ec.js','./index-legacy.bd3f8607.js','./index-legacy.637f3556.js','./index-legacy.5680014a.js','./index-legacy.f25f109a8.js','./index-legacy.f25f109a2.js','./index-legacy.f25f109a3.js'],function(exports){'use strict';var state,request,postMessage,defineComponent,Toast,createVNode,Fragment,Button,createTextVNode,UserAuth;return{setters:[function(module){state=module.s;request=module.r;postMessage=module.p;},function(module){defineComponent=module.d;Toast=module.T;createVNode=module.a;Fragment=module.F;Button=module.B;createTextVNode=module.j;},function(module){UserAuth=module.U;},function(){},function(){},function(){},function(){},function(){},function(){}],execute:function execute(){var cashProtocol="_cashProtocol_ifi2b_1";var submit="_submit_ifi2b_4";var styles={cashProtocol:cashProtocol,submit:submit};var index=exports('default',defineComponent({name:'cash-protocol',data:function data(){return{realStatus:true,// 是否已经实名认证
+========
+;(function(){function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._cashProtocol_ifi2b_1{position:relative}._cashProtocol_ifi2b_1 ._submit_ifi2b_4{width:90%;margin-left:5%;margin-bottom:.4rem;position:absolute;bottom:0;z-index:99}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.9aea25aa.js','./vendor-legacy.4b936a17.js','./index-legacy.af770aee.js','./index-legacy.e35bf952.js','./index-legacy.637f3556.js','./index-legacy.625a53ee.js','./index-legacy.f25f109a8.js','./index-legacy.f25f109a2.js','./index-legacy.f25f109a3.js'],function(exports){'use strict';var state,request,postMessage,defineComponent,Toast,createVNode,Fragment,Button,createTextVNode,UserAuth;return{setters:[function(module){state=module.s;request=module.r;postMessage=module.p;},function(module){defineComponent=module.d;Toast=module.T;createVNode=module.a;Fragment=module.F;Button=module.B;createTextVNode=module.j;},function(module){UserAuth=module.U;},function(){},function(){},function(){},function(){},function(){},function(){}],execute:function execute(){var cashProtocol="_cashProtocol_ifi2b_1";var submit="_submit_ifi2b_4";var styles={cashProtocol:cashProtocol,submit:submit};var index=exports('default',defineComponent({name:'cash-protocol',data:function data(){return{realStatus:true,// 是否已经实名认证
+>>>>>>>> online:dist/assets/index-legacy.38551efd.js
+url:''};},mounted:function mounted(){var _this=this;return _asyncToGenerator(/*#__PURE__*/regeneratorRuntime.mark(function _callee(){var user;return regeneratorRuntime.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:try{// 先实名认证
+console.log(state.user);user=state.user.data;if(!user.realName||!user.idCardNo){_this.realStatus=false;}else{_this.getDetail();}}catch(_unused){}case 1:case"end":return _context.stop();}}},_callee);}))();},methods:{getDetail:function getDetail(){var _this2=this;return _asyncToGenerator(/*#__PURE__*/regeneratorRuntime.mark(function _callee2(){var res;return regeneratorRuntime.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:_context2.prev=0;_context2.next=3;return request.get('/api-teacher/sysUserContractRecord/queryLatestContractTemplate',{params:{contractType:'WITHDRAW'}});case 3:res=_context2.sent;_this2.url=window.location.origin+window.location.pathname+'/pdf/web/viewer.html?file='+// encodeURIComponent(
+//   'http://daya.ks3-cn-beijing.ksyun.com/202207/TAxRhc6.pdf'
+// ) +
+encodeURIComponent(res.data.origanalFileUrl)+'&btn=1';_context2.next=9;break;case 7:_context2.prev=7;_context2.t0=_context2["catch"](0);case 9:case"end":return _context2.stop();}}},_callee2,null,[[0,7]]);}))();},onSubmit:function onSubmit(){return _asyncToGenerator(/*#__PURE__*/regeneratorRuntime.mark(function _callee3(){return regeneratorRuntime.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:_context3.prev=0;_context3.next=3;return request.get('/api-teacher/sysUserContractRecord/sign',{params:{contractType:'WITHDRAW'}});case 3:setTimeout(function(){Toast('签署成功');},100);setTimeout(function(){postMessage({api:'openPageSuccess',content:{page:'WITHDRAW'}});},1000);_context3.next=9;break;case 7:_context3.prev=7;_context3.t0=_context3["catch"](0);case 9:case"end":return _context3.stop();}}},_callee3,null,[[0,7]]);}))();},onSuccess:function onSuccess(){// 实名成功
+this.realStatus=true;this.getDetail();}},render:function render(){return createVNode("div",{"class":styles.cashProtocol},[this.realStatus?createVNode(Fragment,null,[createVNode("iframe",{"src":this.url,"frameborder":"0","style":{width:'100%',height:'100vh',border:'none'}},null),createVNode(Button,{"type":"primary","size":"large","block":true,"round":true,"class":styles.submit,"onClick":this.onSubmit},{default:function _default(){return[createTextVNode("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")];}})]):createVNode(UserAuth,{"onSuccess":this.onSuccess},null)]);}}));}};});})();

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.3898dc4a.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.40a65125.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.4182abc7.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy.4436108b.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.453dd275.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.47956d94.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.48d58170.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy.48e6e578.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.4c3ed013.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.4e7b8b8d.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.4f17c310.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.52881464.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.53210676.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.53567dd4.js


+ 4 - 0
dist/assets/index-legacy.5680014a.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.5680014a.js
 ;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._colHeader_1ruqc_1 .van-nav-bar__title,._colHeader_1ruqc_1 .van-icon{color:inherit}._colHeader_1ruqc_1 .van-nav-bar__right>div{line-height:0}._colHeader_1ruqc_1._transparent_1ruqc_8{background-color:transparent}._headerSection_1ruqc_11{position:relative}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.b813903f.js','./vendor-legacy.c77bef97.js','./index-legacy.f25f109a8.js'],function(exports){'use strict';var postMessage,browser,defineComponent,createVNode,Fragment,NavBar;return{setters:[function(module){postMessage=module.p;browser=module.e;},function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;NavBar=module.N;},function(){}],execute:function execute(){var colHeader="_colHeader_1ruqc_1";var transparent="_transparent_1ruqc_8";var headerSection="_headerSection_1ruqc_11";var styles={colHeader:colHeader,transparent:transparent,headerSection:headerSection};var ColHeader=exports('C',defineComponent({name:'col-header',props:{title:String,isBack:{type:Boolean,default:false},backIconColor:{// 返回按钮颜色
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._colHeader_1ruqc_1 .van-nav-bar__title,._colHeader_1ruqc_1 .van-icon{color:inherit}._colHeader_1ruqc_1 .van-nav-bar__right>div{line-height:0}._colHeader_1ruqc_1._transparent_1ruqc_8{background-color:transparent}._headerSection_1ruqc_11{position:relative}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.9aea25aa.js','./vendor-legacy.4b936a17.js','./index-legacy.f25f109a8.js'],function(exports){'use strict';var postMessage,browser,defineComponent,createVNode,Fragment,NavBar;return{setters:[function(module){postMessage=module.p;browser=module.e;},function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;NavBar=module.N;},function(){}],execute:function execute(){var colHeader="_colHeader_1ruqc_1";var transparent="_transparent_1ruqc_8";var headerSection="_headerSection_1ruqc_11";var styles={colHeader:colHeader,transparent:transparent,headerSection:headerSection};var ColHeader=exports('C',defineComponent({name:'col-header',props:{title:String,isBack:{type:Boolean,default:false},backIconColor:{// 返回按钮颜色
+>>>>>>>> online:dist/assets/index-legacy.625a53ee.js
 type:String,default:'black'},isFixed:{type:Boolean,default:true},styleName:{type:Object,default:function _default(){return{};}},titleClass:String,background:{type:String,default:'white'},color:{type:String,default:'#323233'},rightText:String,onClickRight:{type:Function,default:function _default(){}},border:{type:Boolean,default:true},onHeaderBack:{// 头部高度设置后返回
 type:Function,default:function _default(){}}},data:function data(){return{headerTitle:null,navBarHeight:0,// 顶部导航栏高度
 titleHeight:44// 顶部导航高度(默认44px)

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.58f04d24.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.5eaa30c4.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.60f19f56.js


+ 14 - 0
dist/assets/index-legacy.625a53ee.js

@@ -0,0 +1,14 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.5680014a.js
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._colHeader_1ruqc_1 .van-nav-bar__title,._colHeader_1ruqc_1 .van-icon{color:inherit}._colHeader_1ruqc_1 .van-nav-bar__right>div{line-height:0}._colHeader_1ruqc_1._transparent_1ruqc_8{background-color:transparent}._headerSection_1ruqc_11{position:relative}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.b813903f.js','./vendor-legacy.c77bef97.js','./index-legacy.f25f109a8.js'],function(exports){'use strict';var postMessage,browser,defineComponent,createVNode,Fragment,NavBar;return{setters:[function(module){postMessage=module.p;browser=module.e;},function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;NavBar=module.N;},function(){}],execute:function execute(){var colHeader="_colHeader_1ruqc_1";var transparent="_transparent_1ruqc_8";var headerSection="_headerSection_1ruqc_11";var styles={colHeader:colHeader,transparent:transparent,headerSection:headerSection};var ColHeader=exports('C',defineComponent({name:'col-header',props:{title:String,isBack:{type:Boolean,default:false},backIconColor:{// 返回按钮颜色
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._colHeader_1ruqc_1 .van-nav-bar__title,._colHeader_1ruqc_1 .van-icon{color:inherit}._colHeader_1ruqc_1 .van-nav-bar__right>div{line-height:0}._colHeader_1ruqc_1._transparent_1ruqc_8{background-color:transparent}._headerSection_1ruqc_11{position:relative}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.9aea25aa.js','./vendor-legacy.4b936a17.js','./index-legacy.f25f109a8.js'],function(exports){'use strict';var postMessage,browser,defineComponent,createVNode,Fragment,NavBar;return{setters:[function(module){postMessage=module.p;browser=module.e;},function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;NavBar=module.N;},function(){}],execute:function execute(){var colHeader="_colHeader_1ruqc_1";var transparent="_transparent_1ruqc_8";var headerSection="_headerSection_1ruqc_11";var styles={colHeader:colHeader,transparent:transparent,headerSection:headerSection};var ColHeader=exports('C',defineComponent({name:'col-header',props:{title:String,isBack:{type:Boolean,default:false},backIconColor:{// 返回按钮颜色
+>>>>>>>> online:dist/assets/index-legacy.625a53ee.js
+type:String,default:'black'},isFixed:{type:Boolean,default:true},styleName:{type:Object,default:function _default(){return{};}},titleClass:String,background:{type:String,default:'white'},color:{type:String,default:'#323233'},rightText:String,onClickRight:{type:Function,default:function _default(){}},border:{type:Boolean,default:true},onHeaderBack:{// 头部高度设置后返回
+type:Function,default:function _default(){}}},data:function data(){return{headerTitle:null,navBarHeight:0,// 顶部导航栏高度
+titleHeight:44// 顶部导航高度(默认44px)
+};},mounted:function mounted(){var _this=this;this.headerTitle=this.title||this.$route.meta.title;this.navBarInit(function(){_this.onHeaderBack&&_this.onHeaderBack();});},unmounted:function unmounted(){// 设置是否显示导航栏 0 显示 1 不显示
+postMessage({api:'setBarStatus',content:{status:1}});// 设置返回按钮颜色
+postMessage({api:'backIconChange',content:{iconStyle:'black'}});},methods:{navBarInit:function navBarInit(callBack){var _this2=this;// 设置是否显示导航栏 0 显示 1 不显示
+postMessage({api:'setBarStatus',content:{status:0}});// 设置返回按钮颜色
+postMessage({api:'backIconChange',content:{iconStyle:this.backIconColor||'black'}});var sNavHeight=sessionStorage.getItem('navHeight');var sTitleHeight=sessionStorage.getItem('titleHeight');if(sNavHeight&&sTitleHeight){this.navBarHeight=Number(sNavHeight);callBack&&callBack();}else{postMessage({api:'getNavHeight'},function(res){var content=res.content;var dpi=content.dpi||2;if(content.navHeight){var navHeight=content.navHeight/dpi;sessionStorage.setItem('navHeight',String(navHeight));_this2.navBarHeight=navHeight;}if(content.titleHeight){// 导航栏的高度
+var titleHeight=content.titleHeight/dpi;sessionStorage.setItem('titleHeight',String(titleHeight));_this2.titleHeight=titleHeight;}callBack&&callBack();});}!browser().isApp&&callBack&&callBack();},onClickLeft:function onClickLeft(){this.$router.back();},clickRight:function clickRight(){this.onClickRight&&this.onClickRight();}},render:function render(){var _this3=this;return createVNode("div",null,[this.$slots.content?createVNode("div",{"style":{paddingTop:"".concat(this.navBarHeight,"px")},"class":styles.headerSection},[this.$slots.content(this.navBarHeight)]):createVNode(Fragment,null,[createVNode("div",{"style":{minHeight:"calc(var(--van-nav-bar-height) + ".concat(this.navBarHeight,"px)")},"class":styles.headerSection},[createVNode(NavBar,{"title":this.headerTitle,"class":[styles.colHeader],"style":{background:this.background,color:this.color,paddingTop:"".concat(this.navBarHeight,"px"),zIndex:99},"left-arrow":this.isBack,"rightText":this.rightText,"fixed":this.isFixed,"border":this.border,"onClick-right":this.clickRight,"onClick-left":this.onClickLeft},{right:function right(){return _this3.$slots.right&&_this3.$slots.right()||_this3.rightText;}})]),this.$slots.default?this.$slots.default():null])]);}}));}};});})();

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.644668ae.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.6994747a.js


+ 6 - 0
dist/assets/index-legacy.6dc45e63.js

@@ -0,0 +1,6 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.7295d59f.js
+;(function(){System.register(['./vendor-legacy.c77bef97.js','./index-legacy.c75fe8a2.js'],function(exports){'use strict';var defineComponent,createVNode,Popup,qs;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Popup=module.P;},function(module){qs=module.q;}],execute:function execute(){var ColPopup=exports('C',defineComponent({name:'col-popup',props:{height:{type:String,default:'100%'},destroy:{type:Boolean,default:false},modelValue:{type:Boolean,default:false},position:{type:String,default:'bottom'}},data:function data(){return{popupShow:false,isDestroy:false};},watch:{modelValue:function modelValue(val){this.hashState();}},mounted:function mounted(){this.destroy&&(this.isDestroy=false);window.addEventListener('hashchange',this.onHash,false);},unmounted:function unmounted(){window.removeEventListener('hashchange',this.onHash,false);},methods:{onHash:function onHash(){this.$emit('update:modelValue',false);this.isDestroy=false;},onPopupClose:function onPopupClose(val){this.$emit('update:modelValue',val);this.hashState();},hashState:function hashState(){// 打开弹窗
+========
+;(function(){System.register(['./vendor-legacy.4b936a17.js','./index-legacy.c75fe8a2.js'],function(exports){'use strict';var defineComponent,createVNode,Popup,qs;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Popup=module.P;},function(module){qs=module.q;}],execute:function execute(){var ColPopup=exports('C',defineComponent({name:'col-popup',props:{height:{type:String,default:'100%'},destroy:{type:Boolean,default:false},modelValue:{type:Boolean,default:false},position:{type:String,default:'bottom'}},data:function data(){return{popupShow:false,isDestroy:false};},watch:{modelValue:function modelValue(val){this.hashState();}},mounted:function mounted(){this.destroy&&(this.isDestroy=false);window.addEventListener('hashchange',this.onHash,false);},unmounted:function unmounted(){window.removeEventListener('hashchange',this.onHash,false);},methods:{onHash:function onHash(){this.$emit('update:modelValue',false);this.isDestroy=false;},onPopupClose:function onPopupClose(val){this.$emit('update:modelValue',val);this.hashState();},hashState:function hashState(){// 打开弹窗
+>>>>>>>> online:dist/assets/index-legacy.6dc45e63.js
+if(this.modelValue){this.isDestroy=false;var splitUrl=window.location.hash.slice(1).split('?');var query=qs.parse(splitUrl[1]);var times=0;for(var key in query){times++;}var origin=window.location.href;var url=times>0?'&cPop='+ +new Date():'?cPop='+ +new Date();history.pushState('','',"".concat(origin).concat(url));}else{var _splitUrl=window.location.hash.slice(1).split('?');var _query=qs.parse(_splitUrl[1]);if(_query.cPop){window.history.go(-1);}}if(this.$refs.protocolPopup){this.$refs.protocolPopup.scrollTop=0;}}},render:function render(){var _this=this;return createVNode(Popup,{"ref":"protocolPopup","show":this.modelValue,"transitionAppear":true,"position":this.position,"style":{height:this.height},"onClosed":function onClosed(){if(_this.destroy){_this.isDestroy=true;}}},{default:function _default(){return[_this.$slots.default&&!_this.isDestroy&&_this.$slots.default()];}});}}));}};});})();

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.7049163e.js


+ 4 - 0
dist/assets/index-legacy.7295d59f.js

@@ -1,2 +1,6 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.7295d59f.js
 ;(function(){System.register(['./vendor-legacy.c77bef97.js','./index-legacy.c75fe8a2.js'],function(exports){'use strict';var defineComponent,createVNode,Popup,qs;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Popup=module.P;},function(module){qs=module.q;}],execute:function execute(){var ColPopup=exports('C',defineComponent({name:'col-popup',props:{height:{type:String,default:'100%'},destroy:{type:Boolean,default:false},modelValue:{type:Boolean,default:false},position:{type:String,default:'bottom'}},data:function data(){return{popupShow:false,isDestroy:false};},watch:{modelValue:function modelValue(val){this.hashState();}},mounted:function mounted(){this.destroy&&(this.isDestroy=false);window.addEventListener('hashchange',this.onHash,false);},unmounted:function unmounted(){window.removeEventListener('hashchange',this.onHash,false);},methods:{onHash:function onHash(){this.$emit('update:modelValue',false);this.isDestroy=false;},onPopupClose:function onPopupClose(val){this.$emit('update:modelValue',val);this.hashState();},hashState:function hashState(){// 打开弹窗
+========
+;(function(){System.register(['./vendor-legacy.4b936a17.js','./index-legacy.c75fe8a2.js'],function(exports){'use strict';var defineComponent,createVNode,Popup,qs;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Popup=module.P;},function(module){qs=module.q;}],execute:function execute(){var ColPopup=exports('C',defineComponent({name:'col-popup',props:{height:{type:String,default:'100%'},destroy:{type:Boolean,default:false},modelValue:{type:Boolean,default:false},position:{type:String,default:'bottom'}},data:function data(){return{popupShow:false,isDestroy:false};},watch:{modelValue:function modelValue(val){this.hashState();}},mounted:function mounted(){this.destroy&&(this.isDestroy=false);window.addEventListener('hashchange',this.onHash,false);},unmounted:function unmounted(){window.removeEventListener('hashchange',this.onHash,false);},methods:{onHash:function onHash(){this.$emit('update:modelValue',false);this.isDestroy=false;},onPopupClose:function onPopupClose(val){this.$emit('update:modelValue',val);this.hashState();},hashState:function hashState(){// 打开弹窗
+>>>>>>>> online:dist/assets/index-legacy.6dc45e63.js
 if(this.modelValue){this.isDestroy=false;var splitUrl=window.location.hash.slice(1).split('?');var query=qs.parse(splitUrl[1]);var times=0;for(var key in query){times++;}var origin=window.location.href;var url=times>0?'&cPop='+ +new Date():'?cPop='+ +new Date();history.pushState('','',"".concat(origin).concat(url));}else{var _splitUrl=window.location.hash.slice(1).split('?');var _query=qs.parse(_splitUrl[1]);if(_query.cPop){window.history.go(-1);}}if(this.$refs.protocolPopup){this.$refs.protocolPopup.scrollTop=0;}}},render:function render(){var _this=this;return createVNode(Popup,{"ref":"protocolPopup","show":this.modelValue,"transitionAppear":true,"position":this.position,"style":{height:this.height},"onClosed":function onClosed(){if(_this.destroy){_this.isDestroy=true;}}},{default:function _default(){return[_this.$slots.default&&!_this.isDestroy&&_this.$slots.default()];}});}}));}};});})();

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.76786718.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.7be66721.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy.7d9b9af3.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy.7f50dc29.js


+ 4 - 0
dist/assets/index-legacy.7f57eea6.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.7f57eea6.js
 ;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._title_1amjj_1{font-size:.53333rem;color:red}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.c77bef97.js'],function(exports){'use strict';var defineComponent,createVNode,Fragment,createTextVNode,Button;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;createTextVNode=module.j;Button=module.B;}],execute:function execute(){var title="_title_1amjj_1";var styles={title:title};var index=exports('default',defineComponent({name:'home',render:function render(){return createVNode(Fragment,null,[createVNode("div",{"class":styles.title},[createTextVNode("\u6807\u9898")]),createVNode(Button,null,{default:function _default(){return[createTextVNode("\u9996\u9875")];}})]);}}));}};});})();
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._title_1amjj_1{font-size:.53333rem;color:red}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.4b936a17.js'],function(exports){'use strict';var defineComponent,createVNode,Fragment,createTextVNode,Button;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;createTextVNode=module.j;Button=module.B;}],execute:function execute(){var title="_title_1amjj_1";var styles={title:title};var index=exports('default',defineComponent({name:'home',render:function render(){return createVNode(Fragment,null,[createVNode("div",{"class":styles.title},[createTextVNode("\u6807\u9898")]),createVNode(Button,null,{default:function _default(){return[createTextVNode("\u9996\u9875")];}})]);}}));}};});})();
+>>>>>>>> online:dist/assets/index-legacy.b05eb5c3.js

+ 4 - 0
dist/assets/index-legacy.808a82b3.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.808a82b3.js
 ;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._user-detail_1e2p6_1{display:flex;align-items:center;justify-content:space-between;font-size:.42667rem;line-height:.58667rem;color:#1a1a1a}._user-detail_1e2p6_1 ._user-names_1e2p6_9{display:flex;align-items:center}._user-detail_1e2p6_1 ._user-logo_1e2p6_13{width:1.06667rem;height:1.06667rem;border-radius:50%;overflow:hidden;margin-right:.21333rem}._user-detail_1e2p6_1 ._user-time_1e2p6_20{font-size:.37333rem;color:#999;line-height:.53333rem}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.c77bef97.js','./index-legacy.f25f109a4.js','./icon_student-legacy.45be2fa9.js'],function(exports){'use strict';var defineComponent,createVNode,Image,iconStudent;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.I;},function(){},function(module){iconStudent=module.i;}],execute:function execute(){var styles={"user-detail":"_user-detail_1e2p6_1","user-names":"_user-names_1e2p6_9","user-logo":"_user-logo_1e2p6_13","user-time":"_user-time_1e2p6_20"};var UserList=exports('U',defineComponent({name:'UserDetail',props:{users:{type:Object,default:{}}},render:function render(){return createVNode("div",{"class":styles['user-detail']},[createVNode("div",{"class":styles['user-names']},[createVNode(Image,{"class":styles['user-logo'],"src":this.users.avatar||iconStudent,"fit":"cover"},null),this.users.studentName||"\u6E38\u5BA2".concat(this.users.studentId||'')]),createVNode("span",{"class":styles['user-time']},[this.users.createTime])]);}}));}};});})();
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._user-detail_1e2p6_1{display:flex;align-items:center;justify-content:space-between;font-size:.42667rem;line-height:.58667rem;color:#1a1a1a}._user-detail_1e2p6_1 ._user-names_1e2p6_9{display:flex;align-items:center}._user-detail_1e2p6_1 ._user-logo_1e2p6_13{width:1.06667rem;height:1.06667rem;border-radius:50%;overflow:hidden;margin-right:.21333rem}._user-detail_1e2p6_1 ._user-time_1e2p6_20{font-size:.37333rem;color:#999;line-height:.53333rem}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.4b936a17.js','./index-legacy.f25f109a4.js','./icon_student-legacy.45be2fa9.js'],function(exports){'use strict';var defineComponent,createVNode,Image,iconStudent;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.I;},function(){},function(module){iconStudent=module.i;}],execute:function execute(){var styles={"user-detail":"_user-detail_1e2p6_1","user-names":"_user-names_1e2p6_9","user-logo":"_user-logo_1e2p6_13","user-time":"_user-time_1e2p6_20"};var UserList=exports('U',defineComponent({name:'UserDetail',props:{users:{type:Object,default:{}}},render:function render(){return createVNode("div",{"class":styles['user-detail']},[createVNode("div",{"class":styles['user-names']},[createVNode(Image,{"class":styles['user-logo'],"src":this.users.avatar||iconStudent,"fit":"cover"},null),this.users.studentName||"\u6E38\u5BA2".concat(this.users.studentId||'')]),createVNode("span",{"class":styles['user-time']},[this.users.createTime])]);}}));}};});})();
+>>>>>>>> online:dist/assets/index-legacy.32d562af.js

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.