更新

dist/assets/index-legacy.23c78ca8.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.49e7b7eb.js','./vendor-legacy.7f609859.js'],function(exports){'use strict';var scrollAnimation,defineComponent,createVNode,ElPagination;return{setters:[function(module){scrollAnimation=module.d;},function(module){defineComponent=module.d;createVNode=module.c;ElPagination=module.a3;}],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.66ba6f27.js

@@ -0,0 +1 @@
+import{d as a}from"./index.7166cff1.js";import{d as o,c as i,a3 as l}from"./vendor.af53403a.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.e4dd8422.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,e as w}from"./index.7166cff1.js";import{d as E,c as e,a as o}from"./vendor.af53403a.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

@@ -43,7 +43,11 @@
       }
     }
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.23cbaddc.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index.7166cff1.js"></script>
+>>>>>>> iteration-20240513-text
   <link rel="modulepreload" href="./assets/vendor.af53403a.js">
   <link rel="stylesheet" href="./assets/index.f760cddd.css">
   <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>
@@ -54,7 +58,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.18b7db76.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.3882edbd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.49e7b7eb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 
 </html>

src/components/col-header/index.tsx

@@ -19,7 +19,7 @@ export default defineComponent({
         { name: '专辑', href: '/albumibrary', current: false },
         { name: '曲谱', href: '/musicLibrary', current: false },
         // { name: '视频课', href: '/videoDetailList', current: false },
-        // { name: '云教练', href: '#', current: false },
+        // { name: '云练习', href: '#', current: false },
         // { name: '社区', href: '#', current: false },
         { name: '下载', href: '/downLoad', current: false }
       ],

src/views/downLoad/index.tsx

@@ -11,87 +11,81 @@ import teacherCode from '@/common/images/teacherCode.png'
 import joinUs from './images/joinUs.png'
 import { Vue3Lottie } from 'vue3-lottie'
 import 'vue3-lottie/dist/style.css'
-import AstronautJSON  from '@/common/animate/kulexiuyunjiaolian.json'
+import AstronautJSON from '@/common/animate/kulexiuyunjiaolian.json'
 export default defineComponent({
   name: 'downLoad',
-  components:{
+  components: {
     Vue3Lottie
   },
-  setup(){
-
-  },
+  setup() {},
   render() {
     return (
-    <div>
-      <div class={styles.wall}></div>
-      <div class={styles.bgWhite}>
-
-        <div class={styles.container}>
-        <div class={styles.textWrap}>
-            <h4>下载酷乐秀APP</h4>
-            <p class={styles.subtitle}>
-              <span class={styles.dot}></span>
-              <p> 酷乐秀学院：器乐教学平台，课程信息一目了然,专业网络教室</p>
-
-            </p>
-            <p class={styles.subtitle}>
-              <span class={styles.dot}></span>
-              <p>酷乐秀：您的学习好帮手，专业教师一对一，器乐练习云教练</p>
-
-            </p>
-            <div class={styles.codeList}>
-              <div class={styles.codeItem}>
-                <h5>酷乐秀</h5>
-                <div class={styles.code}>
-                  <img src={studentCode} alt="" />
-                </div>
-                <div class={styles.iconWrap}>
-                  <div
-                    class={styles.iconItem}
-                    style="margin-right:20px;margin-left:6px;"
-                  >
-                    <img src={ios} alt="" />
-                    <span>ios</span>
+      <div>
+        <div class={styles.wall}></div>
+        <div class={styles.bgWhite}>
+          <div class={styles.container}>
+            <div class={styles.textWrap}>
+              <h4>下载酷乐秀APP</h4>
+              <p class={styles.subtitle}>
+                <span class={styles.dot}></span>
+                <p> 酷乐秀学院：器乐教学平台，课程信息一目了然,专业网络教室</p>
+              </p>
+              <p class={styles.subtitle}>
+                <span class={styles.dot}></span>
+                <p>酷乐秀：您的学习好帮手，专业教师一对一，器乐练习云练习</p>
+              </p>
+              <div class={styles.codeList}>
+                <div class={styles.codeItem}>
+                  <h5>酷乐秀</h5>
+                  <div class={styles.code}>
+                    <img src={studentCode} alt="" />
                   </div>
-                  <div class={styles.iconItem}>
-                    <img src={andIcon} alt="" />
-                    <span>Android</span>
+                  <div class={styles.iconWrap}>
+                    <div
+                      class={styles.iconItem}
+                      style="margin-right:20px;margin-left:6px;"
+                    >
+                      <img src={ios} alt="" />
+                      <span>ios</span>
+                    </div>
+                    <div class={styles.iconItem}>
+                      <img src={andIcon} alt="" />
+                      <span>Android</span>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div class={styles.codeItem}>
-                <h5>酷乐秀学院</h5>
-                <div class={styles.code}>
-                <img src={teacherCode} alt="" />
-                </div>
-                <div class={styles.iconWrap}>
-                  <div
-                    class={styles.iconItem}
-                    style="margin-right:20px;margin-left:6px;"
-                  >
-                    <img src={ios} alt="" />
-                    <span>ios</span>
+                <div class={styles.codeItem}>
+                  <h5>酷乐秀学院</h5>
+                  <div class={styles.code}>
+                    <img src={teacherCode} alt="" />
                   </div>
-                  <div class={styles.iconItem}>
-                    <img src={andIcon} alt="" />
-                    <span>Android</span>
+                  <div class={styles.iconWrap}>
+                    <div
+                      class={styles.iconItem}
+                      style="margin-right:20px;margin-left:6px;"
+                    >
+                      <img src={ios} alt="" />
+                      <span>ios</span>
+                    </div>
+                    <div class={styles.iconItem}>
+                      <img src={andIcon} alt="" />
+                      <span>Android</span>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
+            <div class={styles.imgWrap}>
+              {/* <img src={demo} class={styles.demo} alt="" /> */}
+              <Vue3Lottie animationData={AstronautJSON} class={styles.finch} />
+            </div>
           </div>
-          <div class={styles.imgWrap}>
-            {/* <img src={demo} class={styles.demo} alt="" /> */}
-            <Vue3Lottie animationData={AstronautJSON} class={styles.finch}/>
+          <div style={{ height: '110px' }}></div>
+          <div class={styles.joinWrap}>
+            <img src={joinUs} alt="" />
           </div>
-
-        </div>
-        <div style={{'height':'110px'}}></div>
-        <div class={styles.joinWrap}>
-          <img src={joinUs} alt="" />
         </div>
       </div>
-      </div>
     )
   }
 })