合并

dist/assets/index-legacy.5124e0f4.js

@@ -0,0 +1,2 @@
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._pagination-container_1x1u9_1{background:transparent;padding:24px 16px 32px;width:100%;display:flex;flex-direction:row;justify-content:center}._pagination-container_1x1u9_1 .el-pagination.is-background .btn-next,._pagination-container_1x1u9_1 .el-pagination.is-background .btn-prev,._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li{border-radius:999px;box-sizing:border-box;border:1px solid #329e8a;background-color:#fff;color:#329e8a}._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li:not(.is-disabled).is-active{border-color:var(--el-color-primary)}._pagination-container_1x1u9_1 .el-input__wrapper{border-radius:99px}._pagination-container_1x1u9_1 .el-input__inner{border-radius:99px;background-color:#fff!important}._pagination-container_1x1u9_1._hidden_1x1u9_28{display:none}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.93f1221e.js','./vendor-legacy.b19481d4.js'],function(exports){'use strict';var scrollAnimation,defineComponent,createVNode,ElPagination;return{setters:[function(module){scrollAnimation=module.u;},function(module){defineComponent=module.d;createVNode=module.c;ElPagination=module.a6;}],execute:function execute(){var hidden="_hidden_1x1u9_28";var styles={"pagination-container":"_pagination-container_1x1u9_1",hidden:hidden};var Pagination=exports('P',defineComponent({name:'pagination',props:{total:{required:true,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},// , jumper
+layout:{type:String,default:'total, sizes, prev, pager, next'},showMuitiple:{type:Number,default:10},hideOnSinglePage:{type:Boolean,default:true},background:{type:Boolean,default:true},autoScroll:{type:Boolean,default:true},hidden:{type:Boolean,default:false},sync:{type:Boolean,default:false},saveKey:{type:String,default:''},pagination:{type:Function,default:function _default(){}}},methods:{handleSizeChange:function handleSizeChange(val){this.$emit('update:page',1);this.$emit('update:limit',val);this.pagination();if(this.autoScroll){var currentY=document.documentElement.scrollTop||document.body.scrollTop;scrollAnimation(currentY,0);}},handleCurrentChange:function handleCurrentChange(val){this.$emit('update:page',val);this.$emit('update:limit',this.limit);this.pagination();if(this.autoScroll){var currentY=document.documentElement.scrollTop||document.body.scrollTop;scrollAnimation(currentY,0);}}},render:function render(){var _this=this;return createVNode("div",{"class":[styles['pagination-container'],this.hidden&&styles.hidden]},[createVNode(ElPagination,{"currentPage":this.page,"pageSize":this.limit,"onUpdate:currentPage":function onUpdateCurrentPage(val){},"onUpdate:pageSize":function onUpdatePageSize(val){_this.handleSizeChange(val);},"pageSizes":this.pageSizes,"total":this.total,"hideOnSinglePage":this.total>this.showMuitiple?false:this.hideOnSinglePage,"background":this.background,"layout":this.layout,"onSise-change":this.handleSizeChange,"onCurrent-change":this.handleCurrentChange},null)]);}}));}};});})();

dist/assets/index.ad90c9ad.js

@@ -0,0 +1 @@
+import{u as a}from"./index.a6f3bbab.js";import{d as o,c as i,a6 as l}from"./vendor.9f3c6e4d.js";const d="_hidden_1x1u9_28";var n={"pagination-container":"_pagination-container_1x1u9_1",hidden:d},u=o({name:"pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},layout:{type:String,default:"total, sizes, prev, pager, next"},showMuitiple:{type:Number,default:10},hideOnSinglePage:{type:Boolean,default:!0},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1},sync:{type:Boolean,default:!1},saveKey:{type:String,default:""},pagination:{type:Function,default:()=>{}}},methods:{handleSizeChange(e){if(this.$emit("update:page",1),this.$emit("update:limit",e),this.pagination(),this.autoScroll){const t=document.documentElement.scrollTop||document.body.scrollTop;a(t,0)}},handleCurrentChange(e){if(this.$emit("update:page",e),this.$emit("update:limit",this.limit),this.pagination(),this.autoScroll){const t=document.documentElement.scrollTop||document.body.scrollTop;a(t,0)}}},render(){return i("div",{class:[n["pagination-container"],this.hidden&&n.hidden]},[i(l,{currentPage:this.page,pageSize:this.limit,"onUpdate:currentPage":e=>{},"onUpdate:pageSize":e=>{this.handleSizeChange(e)},pageSizes:this.pageSizes,total:this.total,hideOnSinglePage:this.total>this.showMuitiple?!1:this.hideOnSinglePage,background:this.background,layout:this.layout,"onSise-change":this.handleSizeChange,"onCurrent-change":this.handleCurrentChange},null)])}});export{u as P};

dist/assets/index.c7c8e27f.js

@@ -0,0 +1 @@
+import{_ as i,a as g,b as n,c as l,d as t,e as m,f as r,g as p,h as c,i as d,j as u,k as b,l as f,m as x,n as v,o as A}from"./music_default.211e2c2b.js";import{_ as D}from"./icon_timer.ca726814.js";import{_ as T,a as j}from"./icon_vip_default.803a2c38.js";import{g as _,z as h,c as w}from"./index.a6f3bbab.js";import{d as E,c as e,a as o}from"./vendor.9f3c6e4d.js";const F=s=>{const a=`../../images/${s}`;return{"../../images/course_bg.png":i,"../../images/entry_active.png":g,"../../images/entry_default.png":n,"../../images/icon_cert.png":l,"../../images/icon_cert_default.png":t,"../../images/icon_king.png":m,"../../images/icon_live.png":r,"../../images/icon_live_default.png":p,"../../images/icon_member.png":c,"../../images/icon_member_default.png":d,"../../images/icon_music.png":u,"../../images/icon_music_default.png":b,"../../images/icon_timer.png":D,"../../images/icon_video.png":f,"../../images/icon_video_default.png":x,"../../images/icon_vip.png":T,"../../images/icon_vip_default.png":j,"../../images/music_active.png":v,"../../images/music_default.png":A}[a].default};var H=E({name:"open-member",render(){return console.log(_()),e("div",null,[e("img",{src:F("icon_king.png"),class:"w-[318px] absolute -top-10 left-1/2 -ml-[158px]"},null),e("div",{class:"text-center text-2xl font-semibold text-[#333] pt-[70px] pb-9"},[o("\u624B\u673A\u626B\u7801\u4E0B\u8F7D"),_()==="STUDENT"?"\u9177\u4E50\u79C0":"\u9177\u4E50\u79C0\u5B66\u9662",o("App")]),_()==="TEACHER"?e("img",{src:h,class:"mx-auto w-[216px] h-[216px] align-middle border-4 border-solid border-[#2DC7AA] rounded-[10px]"},null):e("img",{src:w,class:"mx-auto w-[216px] h-[216px] align-middle border-4 border-solid border-[#2DC7AA] rounded-[10px]"},null),e("p",{class:"text-lg text-center text-[#333] pt-8"},[o("\u6253\u5F00"),_()==="STUDENT"?"\u9177\u4E50\u79C0":"\u9177\u4E50\u79C0\u5B66\u9662",o("App\u5F00\u901A\u4F1A\u5458")])])}});export{H as O};

dist/index.html

@@ -35,17 +35,23 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script>
-      if(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i.test(navigator.userAgent)){
-        if (/(localhost)/ig.test(location.origin)) {
+      if(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i.test(navigator.userAgent) || window.innerWidth < 1000){
+        if (/(localhost|192)/ig.test(location.origin)) {
           location.href = 'https://dev.colexiu.com/mobile'
         } else {
           location.href = location.origin + '/mobile'
         }
       }
     </script>
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/index.1e599b70.js"></script>
     <link rel="modulepreload" href="./assets/vendor.9f3c6e4d.js">
     <link rel="stylesheet" href="./assets/index.68ae0a7c.css">
+=======
+    <script type="module" crossorigin src="./assets/index.a6f3bbab.js"></script>
+    <link rel="modulepreload" href="./assets/vendor.9f3c6e4d.js">
+    <link rel="stylesheet" href="./assets/index.9afa976a.css">
+>>>>>>> online
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
   </head>
 
@@ -54,6 +60,10 @@
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
     <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.86648852.js"></script>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.6dd37006.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.93f1221e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
   </body>
 </html>

index.html

@@ -35,8 +35,8 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script>
-      if(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i.test(navigator.userAgent)){
-        if (/(localhost)/ig.test(location.origin)) {
+      if(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i.test(navigator.userAgent) || window.innerWidth < 1000){
+        if (/(localhost|192)/ig.test(location.origin)) {
           location.href = 'https://dev.colexiu.com/mobile'
         } else {
           location.href = location.origin + '/mobile'

src/components/banner/index.tsx

@@ -55,11 +55,12 @@ export default defineComponent({
     }
     onMounted(() => {
       getBannerList()
-      window.onresize = () => {
+      // window.onresize = () => {
+        // console.log(state.swiper)
         // state.swiper.updateSize()
-        window.location.reload()
+        // window.location.reload()
 
-      }
+      // }
     })
     return () => (
       <>

src/components/col-header/index.css

@@ -174,7 +174,7 @@
   font-size: 20px;
   font-weight: 600;
   display: inline-block;
-
+  white-space: nowrap;
 }
 
 .navWrap {

src/views/user-info/music-operation/index.tsx

@@ -380,7 +380,7 @@ export default defineComponent({
                 <ColUpload
                   v-model:modelValue={this.form.midiUrl}
                   bucket={'cloud-coach'}
-                  accept={'.midi'}
+                  accept={'.midi,.mid'}
                   uploadType={'file'}
                   size={8}
                   extraTips="文件最大不能超过8MB"

yarn.lock

@@ -2898,9 +2898,9 @@
   "resolved" "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
   "version" "0.9.3"
 
-"esbuild-windows-64@0.13.15":
-  "integrity" "sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ=="
-  "resolved" "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz"
+"esbuild-darwin-64@0.13.15":
+  "integrity" "sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ=="
+  "resolved" "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.15.tgz"
   "version" "0.13.15"
 
 "esbuild@^0.13.12":
@@ -3282,6 +3282,11 @@
   "resolved" "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   "version" "1.0.0"
 
+"fsevents@~2.3.2":
+  "integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
+  "resolved" "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz"
+  "version" "2.3.2"
+
 "function-bind@^1.1.1":
   "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
   "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"