首頁 探索 說明
登入
liushengqiang
/
music-score
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch '2023-8-10_文案修改'

liushengqiang 2 年之前
父節點
6b4fb951aa 2e57a3e958
當前提交
fcfabfc3e4
共有 13 個文件被更改，包括 48 次插入 和 4 次删除
分割檢視 顯示文件統計
  1. 1 0
      dist/assets/polyfills-0bd9780b.js
  2. 1 0
      dist/assets/polyfills-e458eda9.js
  3. 1 0
      dist/assets/polyfills-legacy-2933613d.js
  4. 1 0
      dist/assets/polyfills-legacy-8afe76b4.js
  5. 8 0
      dist/colexiu.html
  6. 8 0
      dist/index.html
  7. 8 0
      dist/instrument.html
  8. 8 0
      dist/orchestra.html
  9. 8 0
      dist/report-share.html
  10. 二進制
      src/page-instrument/custom-plugins/guide-page/images/aiTeacher1.png
  11. 1 1
      src/page-instrument/custom-plugins/guide-page/index.module.less
  12. 2 2
      src/page-instrument/custom-plugins/guide-page/teacher-top.tsx
  13. 1 1
      src/page-instrument/custom-plugins/the-vip/index.tsx

File diff suppressed because it is too large
+ 1 - 0
dist/assets/polyfills-0bd9780b.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/polyfills-e458eda9.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/polyfills-legacy-2933613d.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/polyfills-legacy-8afe76b4.js


+ 8 - 0
dist/colexiu.html
查看文件 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
 
   <meta charset="UTF-8" />
 
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
 
@@ -57,7 +61,11 @@
 
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
 
   
   <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>
 
+<<<<<<< HEAD
 
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2933613d.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-8afe76b4.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-653708f3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

+ 8 - 0
dist/index.html
查看文件 

@@ -2,7 +2,11 @@
 
 <html lang="ZH-cn">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
 
   <meta charset="UTF-8">
 
   <link rel="icon" href="./favicon.ico" />
 
@@ -100,7 +104,11 @@
 
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
 
   
   <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>
 
+<<<<<<< HEAD
 
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2933613d.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-8afe76b4.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-23013145.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

+ 8 - 0
dist/instrument.html
查看文件 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -56,7 +60,11 @@
 
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
 
   
   <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>
 
+<<<<<<< HEAD
 
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2933613d.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-8afe76b4.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-879a2a29.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

+ 8 - 0
dist/orchestra.html
查看文件 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -72,7 +76,11 @@
 
   </script>
 
   
   <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>
 
+<<<<<<< HEAD
 
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2933613d.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-8afe76b4.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-be1718f8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

+ 8 - 0
dist/report-share.html
查看文件 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -51,7 +55,11 @@
 
   </script>
 
   
   <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>
 
+<<<<<<< HEAD
 
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-2933613d.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-8afe76b4.js"></script>
 
+>>>>>>> 2023-8-10_文案修改
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-8c7fcec3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

二進制
src/page-instrument/custom-plugins/guide-page/images/aiTeacher1.png
查看文件


+ 1 - 1
src/page-instrument/custom-plugins/guide-page/index.module.less
查看文件 

@@ -138,7 +138,7 @@
 
         cursor: pointer;
 
         text-align: center;
 
         color: #fff;
 
-        margin-right: 20px;
 
+        margin-right: 10px;
 
         &:hover {
 
           opacity: .8;
 
         }

+ 2 - 2
src/page-instrument/custom-plugins/guide-page/teacher-top.tsx
查看文件 

@@ -119,11 +119,11 @@ export default defineComponent({
 
             top: "1.32rem",
 
             width:'4.01rem',
 
             height:'2.28rem',
 
-            left:'-3.2rem'
 
+            left:'-3.4rem'
 
           },
 
           btnsStyle: {
 
             top: "2.8rem",
 
-            left:'-1.65rem'
 
+            left:'-2rem'
 
           },
 
         },
 
       ],

+ 1 - 1
src/page-instrument/custom-plugins/the-vip/index.tsx
查看文件 

@@ -25,7 +25,7 @@ export default defineComponent({
 
 					<img class={styles.close} src={icon_close} onClick={close} />
 
 					<img class={styles.title} src={icon_title} />
 
 					<div class={styles.content}>
 
-						您还未领取<span style={{ color: "#FF5A56" }}>“小酷AI”</span>
 
+						您还未领取<span style={{ color: "#FF5A56" }}>“AI学练”</span>
 
 						哦，如需继续使用，请领取～
 
 					</div>
 
 					<div class={styles.btns}>

Some files were not shown because too many files changed in this diff