合并

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-aa7687e0.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-ea51bba4.js"></script>
+>>>>>>> online
   <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-8d738336.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-5146ab0a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

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

@@ -137,7 +137,8 @@
       font-size: 14px;
       color: #000000;
       line-height: 20px;
-      padding-bottom: 56px;
+      padding-bottom: 27px;
+      text-align: center;
     }
   }
 

src/views/about-us/index.tsx

@@ -7,6 +7,8 @@ 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 z5 from './images/5.png';
+import z6 from './images/6.png';
 
 import img2 from './images/img2.png';
 
@@ -94,7 +96,42 @@ export default defineComponent({
                   onContextmenu={(e: MouseEvent) => e.preventDefault()}
                   onDragstart={(e: DragEvent) => e.preventDefault()}
                 />
-                <p>计算机软件著作权登记证书</p>
+                <p>
+                  计算机软件著作权登记证书
+                  <br />
+                  （酷乐秀）
+                </p>
+              </div>
+            </SwipeItem>
+            <SwipeItem>
+              <div class={styles.imgGroup}>
+                <img
+                  src={z5}
+                  class={styles.z5}
+                  onTouchstart={(e: TouchEvent) => e.preventDefault()}
+                  onContextmenu={(e: MouseEvent) => e.preventDefault()}
+                  onDragstart={(e: DragEvent) => e.preventDefault()}
+                />
+                <p>
+                  计算机软件著作权登记证书
+                  <br />
+                  （酷乐秀学院）
+                </p>
+              </div>
+            </SwipeItem>
+            <SwipeItem>
+              <div class={styles.imgGroup}>
+                <img
+                  src={z6}
+                  class={styles.z6}
+                  onTouchstart={(e: TouchEvent) => e.preventDefault()}
+                  onContextmenu={(e: MouseEvent) => e.preventDefault()}
+                  onDragstart={(e: DragEvent) => e.preventDefault()}
+                />
+                <p>
+                  计算机软件著作权登记证书 <br />
+                  （音乐数字课堂）
+                </p>
               </div>
             </SwipeItem>
           </Swipe>