添加

dist/assets/index-8311081c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-8311081c.js
 import{M as s,a as n}from"./index-74ab7d08.js";import{d as l,c as a,a as t}from"./index-c8146fd5.js";const e={banner:"_banner_12yz4_1",bannerImg:"_bannerImg_12yz4_6",title:"_title_12yz4_11",content:"_content_12yz4_34",section1:"_section1_12yz4_41",section2:"_section2_12yz4_57"},c=""+new URL("img2-f3e7eaac.png",import.meta.url).href,i=l({name:"about-us",setup:()=>()=>a("div",{"class":e.aboutUs},[a(s,null,null),a("div",{"class":e.banner},[a("img",{"class":e.bannerImg,src:"https://oss.dayaedu.com/klx/1699436923197banner.png"},null)]),a("div",{"class":e.section1},[a("div",{"class":[e.title]},[a("span",null,[t("关于酷乐秀")])]),a("img",{src:"https://oss.dayaedu.com/klx/1699519075644%E7%BC%96%E7%BB%84_14_2.png","class":"w100"},null),a("div",{"class":e.content},[a("p",null,[t("我们是一家专注于音乐教育创新的企业，深度融合新技术，为广大音乐爱好者和机构、学校提供高质量的音乐教育服务。")]),a("p",null,[t("未来数字化音乐教学将更加注重与人工智能、虚拟现实等新技术的深度融合，为音乐教学提供更加智能化、个性化的解决方案。我们深知数字化音乐课堂的重要性，因此积极布局数字化教育领域，现已拥有一系列成熟的音乐教学软件、教学团队及硬件供应链，助力音乐教育迈向新高峰。")])])]),a("div",{"class":e.section2},[a("div",{"class":[e.title]},[a("span",null,[t("选择我们你将得到")])]),a("img",{src:c,"class":"w100"},null)]),a(n,null,null)])});export{i as default};
+========
+import{M as s,a as n}from"./index-2da35654.js";import{d as l,c as a,a as t}from"./index-386a6905.js";const e={banner:"_banner_12yz4_1",bannerImg:"_bannerImg_12yz4_6",title:"_title_12yz4_11",content:"_content_12yz4_34",section1:"_section1_12yz4_41",section2:"_section2_12yz4_57"},c=""+new URL("img2-f3e7eaac.png",import.meta.url).href,i=l({name:"about-us",setup:()=>()=>a("div",{"class":e.aboutUs},[a(s,null,null),a("div",{"class":e.banner},[a("img",{"class":e.bannerImg,src:"https://oss.dayaedu.com/klx/1699436923197banner.png"},null)]),a("div",{"class":e.section1},[a("div",{"class":[e.title]},[a("span",null,[t("关于酷乐秀")])]),a("img",{src:"https://oss.dayaedu.com/klx/1699519075644%E7%BC%96%E7%BB%84_14_2.png","class":"w100"},null),a("div",{"class":e.content},[a("p",null,[t("我们是一家专注于音乐教育创新的企业，深度融合新技术，为广大音乐爱好者和机构、学校提供高质量的音乐教育服务。")]),a("p",null,[t("未来数字化音乐教学将更加注重与人工智能、虚拟现实等新技术的深度融合，为音乐教学提供更加智能化、个性化的解决方案。我们深知数字化音乐课堂的重要性，因此积极布局数字化教育领域，现已拥有一系列成熟的音乐教学软件、教学团队及硬件供应链，助力音乐教育迈向新高峰。")])])]),a("div",{"class":e.section2},[a("div",{"class":[e.title]},[a("span",null,[t("选择我们你将得到")])]),a("img",{src:c,"class":"w100"},null)]),a(n,null,null)])});export{i as default};
+>>>>>>>> iteration-20240102:dist/assets/index-bc4796be.js

dist/assets/index-bc4796be.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-8311081c.js
+import{M as s,a as n}from"./index-74ab7d08.js";import{d as l,c as a,a as t}from"./index-c8146fd5.js";const e={banner:"_banner_12yz4_1",bannerImg:"_bannerImg_12yz4_6",title:"_title_12yz4_11",content:"_content_12yz4_34",section1:"_section1_12yz4_41",section2:"_section2_12yz4_57"},c=""+new URL("img2-f3e7eaac.png",import.meta.url).href,i=l({name:"about-us",setup:()=>()=>a("div",{"class":e.aboutUs},[a(s,null,null),a("div",{"class":e.banner},[a("img",{"class":e.bannerImg,src:"https://oss.dayaedu.com/klx/1699436923197banner.png"},null)]),a("div",{"class":e.section1},[a("div",{"class":[e.title]},[a("span",null,[t("关于酷乐秀")])]),a("img",{src:"https://oss.dayaedu.com/klx/1699519075644%E7%BC%96%E7%BB%84_14_2.png","class":"w100"},null),a("div",{"class":e.content},[a("p",null,[t("我们是一家专注于音乐教育创新的企业，深度融合新技术，为广大音乐爱好者和机构、学校提供高质量的音乐教育服务。")]),a("p",null,[t("未来数字化音乐教学将更加注重与人工智能、虚拟现实等新技术的深度融合，为音乐教学提供更加智能化、个性化的解决方案。我们深知数字化音乐课堂的重要性，因此积极布局数字化教育领域，现已拥有一系列成熟的音乐教学软件、教学团队及硬件供应链，助力音乐教育迈向新高峰。")])])]),a("div",{"class":e.section2},[a("div",{"class":[e.title]},[a("span",null,[t("选择我们你将得到")])]),a("img",{src:c,"class":"w100"},null)]),a(n,null,null)])});export{i as default};
+========
+import{M as s,a as n}from"./index-2da35654.js";import{d as l,c as a,a as t}from"./index-386a6905.js";const e={banner:"_banner_12yz4_1",bannerImg:"_bannerImg_12yz4_6",title:"_title_12yz4_11",content:"_content_12yz4_34",section1:"_section1_12yz4_41",section2:"_section2_12yz4_57"},c=""+new URL("img2-f3e7eaac.png",import.meta.url).href,i=l({name:"about-us",setup:()=>()=>a("div",{"class":e.aboutUs},[a(s,null,null),a("div",{"class":e.banner},[a("img",{"class":e.bannerImg,src:"https://oss.dayaedu.com/klx/1699436923197banner.png"},null)]),a("div",{"class":e.section1},[a("div",{"class":[e.title]},[a("span",null,[t("关于酷乐秀")])]),a("img",{src:"https://oss.dayaedu.com/klx/1699519075644%E7%BC%96%E7%BB%84_14_2.png","class":"w100"},null),a("div",{"class":e.content},[a("p",null,[t("我们是一家专注于音乐教育创新的企业，深度融合新技术，为广大音乐爱好者和机构、学校提供高质量的音乐教育服务。")]),a("p",null,[t("未来数字化音乐教学将更加注重与人工智能、虚拟现实等新技术的深度融合，为音乐教学提供更加智能化、个性化的解决方案。我们深知数字化音乐课堂的重要性，因此积极布局数字化教育领域，现已拥有一系列成熟的音乐教学软件、教学团队及硬件供应链，助力音乐教育迈向新高峰。")])])]),a("div",{"class":e.section2},[a("div",{"class":[e.title]},[a("span",null,[t("选择我们你将得到")])]),a("img",{src:c,"class":"w100"},null)]),a(n,null,null)])});export{i as default};
+>>>>>>>> iteration-20240102:dist/assets/index-bc4796be.js

dist/index.html

@@ -15,7 +15,11 @@
   <meta name="HandheldFriendly" content="true" />
   <title>酷乐秀官网</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-c8146fd5.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-386a6905.js"></script>
+>>>>>>> iteration-20240102
   <link rel="stylesheet" href="./assets/index-cc7b827c.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -26,7 +30,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-9f17e47e.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-7983c377.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-b3d7e78c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240102
 </body>
 
 </html>

src/components/m-footer/index.module.less

@@ -56,6 +56,10 @@
     color: rgba(255, 255, 255, 0.5);
     padding: 16px 0 calc(20px);
     text-align: center;
+
+    a {
+      color: rgba(255, 255, 255, 0.5);
+    }
   }
 
   .logoUrl {

src/components/m-footer/index.tsx

@@ -45,8 +45,19 @@ export default defineComponent({
         </div>
 
         <div class={styles.copyright}>
+          <a target="_blank" href="https://beian.miit.gov.cn/">
+            网站备案：鄂ICP备2021020787号-1
+          </a>
+          <br />
+          增值电信业务经营许可证：鄂B2-20231246
+          <br />
+          教育移动互联网应用备案：教APP备4200224号
+          <br />
+          网络安全等级保护备案号：42010043158-24001 <br />
+          Copyright © 2024 武汉酷乐秀网络科技有限公司 版权所有
+          {/* <br />
           Copyright © 2022 武汉酷乐秀网络科技有限公司 <br />
-          All Rights Reserved.鄂ICP备2021020787号-1
+          All Rights Reserved.鄂ICP备2021020787号-1 */}
         </div>
       </div>
     );

src/components/m-img-code/index.tsx

@@ -123,6 +123,7 @@ export default defineComponent({
                 v-model={this.code}
                 class={styles.field}
                 autocomplete="off"
+                maxlength={4}
               />
             </Col>
             <Col span="10" class={styles.img}>

src/views/about-us/index.module.less

@@ -72,4 +72,86 @@
   img {
     padding-top: 19px;
   }
+}
+
+.section3 {
+  padding: 27px 0 48px;
+  // background-color: #fff;
+  background: linear-gradient(180deg, #EDFDFF 0%, #FFFFFF 13%, #FFFFFF 92%, #DDF0F2 100%);
+
+  .title {
+    padding-bottom: 16px;
+
+    span {
+      &::before {
+        content: '';
+        position: absolute;
+        bottom: -6px;
+        right: -15px;
+        width: 89px;
+        height: 39px;
+        background: url('./images/title-2.png') no-repeat center;
+        background-size: contain;
+        z-index: -1;
+      }
+    }
+  }
+
+  .imgGroup {
+    // height: 260px;
+    // width: 273px;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+
+    // .z1 {
+    //   width: 182px;
+    //   height: 261px;
+    // }
+
+    // .z2 {
+    //   height: 250px;
+    //   width: 171px;
+    // }
+
+    // .z3 {
+    //   width: 273px;
+    //   height: 170px;
+    // }
+
+    // .z4 {
+    //   width: 170px;
+    //   height: 229px;
+    // }
+    img {
+      width: 310px;
+      height: 268px;
+      pointer-events: none;
+      user-select: none;
+    }
+
+    p {
+      padding-top: 6px;
+      font-size: 14px;
+      color: #000000;
+      line-height: 20px;
+      padding-bottom: 56px;
+    }
+  }
+
+  --van-swipe-indicator-inactive-background: #C6E2E6;
+
+  :global {
+    .van-swipe__indicators {
+      bottom: 0;
+    }
+
+    .van-swipe__indicator--active {
+      background: linear-gradient(124deg, #008FAD 0%, #00AEA5 100%), #0088C5;
+      width: 12px;
+      border-radius: 10px;
+    }
+  }
 }

src/views/about-us/index.tsx

@@ -1,7 +1,12 @@
 import { defineComponent } from 'vue';
+import { Swipe, SwipeItem } from 'vant';
 import styles from './index.module.less';
 import MHeader from '@/components/m-header';
 import MFooter from '@/components/m-footer';
+import z1 from './images/1.png';
+import z2 from './images/2.png';
+import z3 from './images/3.png';
+import z4 from './images/4.png';
 
 import img2 from './images/img2.png';
 
@@ -38,6 +43,63 @@ export default defineComponent({
           </div>
         </div>
 
+        <div class={styles.section3}>
+          <div class={[styles.title]}>
+            <span>资质认证</span>
+          </div>
+
+          <Swipe loop={false}>
+            <SwipeItem>
+              <div class={styles.imgGroup}>
+                <img
+                  src={z1}
+                  class={styles.z1}
+                  onTouchstart={(e: TouchEvent) => e.preventDefault()}
+                  onContextmenu={(e: MouseEvent) => e.preventDefault()}
+                  onDragstart={(e: DragEvent) => e.preventDefault()}
+                />
+                <p>增值电信业务经营许可证</p>
+              </div>
+            </SwipeItem>
+            <SwipeItem>
+              <div class={styles.imgGroup}>
+                <img
+                  src={z2}
+                  class={styles.z2}
+                  onTouchstart={(e: TouchEvent) => e.preventDefault()}
+                  onContextmenu={(e: MouseEvent) => e.preventDefault()}
+                  onDragstart={(e: DragEvent) => e.preventDefault()}
+                />
+                <p>网络文化经营许可证</p>
+              </div>
+            </SwipeItem>
+            <SwipeItem>
+              <div class={styles.imgGroup}>
+                <img
+                  src={z3}
+                  class={styles.z3}
+                  onTouchstart={(e: TouchEvent) => e.preventDefault()}
+                  onContextmenu={(e: MouseEvent) => e.preventDefault()}
+                  onDragstart={(e: DragEvent) => e.preventDefault()}
+                />
+                <p>信息系统安全等级保护备案证明</p>
+              </div>
+            </SwipeItem>
+            <SwipeItem>
+              <div class={styles.imgGroup}>
+                <img
+                  src={z4}
+                  class={styles.z4}
+                  onTouchstart={(e: TouchEvent) => e.preventDefault()}
+                  onContextmenu={(e: MouseEvent) => e.preventDefault()}
+                  onDragstart={(e: DragEvent) => e.preventDefault()}
+                />
+                <p>计算机软件著作权登记证书</p>
+              </div>
+            </SwipeItem>
+          </Swipe>
+        </div>
+
         <div class={styles.section2}>
           <div class={[styles.title]}>
             <span>选择我们你将得到</span>