合并

dist/assets/vuedraggable.umd-dd63d9d8.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/vuedraggable.umd-dd63d9d8.js
 import{ar as it,as as Dn,at as Kn,ao as Vn}from"./index-a4fb7fa6.js";var Xn={};/*!
+========
+import{ar as it,as as Dn,at as Kn,ao as Vn}from"./index-fb664b37.js";var Xn={};/*!
+>>>>>>>> iteration-20241115:dist/assets/vuedraggable.umd-c5fbfb01.js
  *  howler.js v2.2.3
  *  howlerjs.com
  *

dist/assets/vuedraggable.umd-legacy-ca9738c6.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/vuedraggable.umd-legacy-ca9738c6.js
 System.register(["./index-legacy-ba65061b.js"],(function(e,t){"use strict";var n,r,o,i;return{setters:[e=>{n=e.ar,r=e.as,o=e.at,i=e.ao}],execute:function(){
+========
+System.register(["./index-legacy-e068f72d.js"],(function(e,t){"use strict";var n,r,o,i;return{setters:[e=>{n=e.ar,r=e.as,o=e.at,i=e.ao}],execute:function(){
+>>>>>>>> iteration-20241115:dist/assets/vuedraggable.umd-legacy-62822d99.js
 /*!
        *  howler.js v2.2.3
        *  howlerjs.com

dist/index.html

@@ -37,7 +37,11 @@
   <meta name="referrer" content="no-referrer" />
   <title>音乐数字课堂</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-a4fb7fa6.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-fb664b37.js"></script>
+>>>>>>> iteration-20241115
   <link rel="stylesheet" href="./assets/index-b38ef88c.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>
@@ -58,7 +62,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>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-a0da8b1b.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-ba65061b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-e068f72d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20241115
 </body>
 
 </html>

src/router/router-root.ts

@@ -124,7 +124,7 @@ export default [
     name: 'download',
     component: () => import('@/views/download/index'),
     meta: {
-      title: '下载酷乐秀音乐数字课堂'
+      title: '下载音乐数字课堂'
     }
   },
   {
@@ -132,7 +132,7 @@ export default [
     name: 'transfer',
     component: () => import('@/views/download/transfer'),
     meta: {
-      title: '下载酷乐秀音乐数字课堂'
+      title: '下载音乐数字课堂'
     }
   },
   {

src/router/routes-common.ts

@@ -233,7 +233,7 @@ export default [
         path: '/activationCode',
         component: () => import('@/views/activation-code'),
         meta: {
-          title: '互通码'
+          title: '激活码'
         }
       },
       {

src/views/activation-code/activation-register/index.module.less

@@ -1,7 +1,8 @@
 .student-register {
   min-height: 100vh;
   // background: #FFF4E2;
-  background: linear-gradient(180deg, #C9EDFD 0%, #CCF0FF 100%);
+  // background: linear-gradient(180deg, #C9EDFD 0%, #CCF0FF 100%);
+  background: linear-gradient( 180deg, #81DEFE 0%, #82DEFE 100%);
   overflow: hidden;
   position: relative;
 
@@ -45,7 +46,7 @@
 
 .paymentContainer {
   font-size: 14px;
-  padding: 12px 25px calc(12px + env(safe-area-inset-bottom)) 25px;
+  padding: 12px 25px 20px 25px;
   // background: #FFFFFF;
   // box-shadow: 0px -1px 0px 0px #F2F2F2, inset 0px 1px 3px 0px #FFFFFF;
   // border-radius: 18px 18px 0px 0px;
@@ -206,7 +207,7 @@
     height: 44px;
     left: 50%;
     margin-left: -100px;
-    top: -6px;
+    top: -8px;
     position: absolute;
     z-index: 1;
   }
@@ -222,6 +223,12 @@
     background-color: #fff;
     border-radius: 12px;
   }
+  .studentName {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    padding-left: 20px;
+  }
   :global {
     .van-cell {
       padding: 10px 0;

src/views/activation-code/activation-register/index.tsx

@@ -1445,6 +1445,7 @@ export default defineComponent({
               <Cell
                 border={false}
                 title="学生姓名"
+                valueClass={styles.studentName}
                 value={studentInfo.extra.nickname}></Cell>
               <Cell
                 border={false}
@@ -1508,6 +1509,10 @@ export default defineComponent({
                 forms.reslutPopupType === 'ACTIVATING' ||
                 forms.reslutPopupType === 'ACTIVATING-TWO'
               ) {
+                let url = '/download'
+                if(route.query.wx === 'wx_lite') {
+                  url += '?wx=wx_lite'
+                }
                 router.push('/download');
               } else {
                 forms.showResultPopup = false;
@@ -1515,16 +1520,16 @@ export default defineComponent({
             }}>
             {forms.reslutPopupType === 'ACTIVATING' && (
               <p>
-                请下载
-                <span style={{ color: '#2B85FF' }}>【音乐数字课堂App】</span>
-                ，使用手机号激活，实现音乐课堂互通互联
+                您已成功登录激活码，下载
+                <span style={{ color: '#2B85FF' }}>【音乐数字课堂】</span>
+                App并登录后正式激活
               </p>
             )}
             {forms.reslutPopupType === 'ACTIVATING-TWO' && (
               <p>
                 您已使用该激活码，请勿重复提交，请下载
                 <span style={{ color: '#2B85FF' }}>【音乐数字课堂】</span>
-                实现互通互联
+                App并登录后正式激活
               </p>
             )}
 

src/views/activation-code/index.tsx

@@ -36,7 +36,7 @@ export default defineComponent({
 
     const onSubmit = async () => {
       if (!state.activeCodeRecordCode) {
-        showToast('请输入互通码');
+        showToast('请输入激活码');
         return;
       }
       state.loading = true;
@@ -141,7 +141,7 @@ export default defineComponent({
                   class={styles.input}
                   leftIcon={iconKey}
                   v-model={state.activeCodeRecordCode}
-                  placeholder="请输入您的互通码"
+                  placeholder="请输入您的激活码"
                   clearable
                 />
 
@@ -160,23 +160,23 @@ export default defineComponent({
                 </div>
               </div>
               <div class={styles.tipCotnent}>
-                <h2>互通码使用须知：</h2>
+                <h2>激活码使用须知：</h2>
                 <div class={styles.tips}>
                   <p>
                     <img src={num1} class={styles.num} />
-                    互通码只可使用一次，不能重复使用；
+                    激活码只可使用一次，不能重复使用；
                   </p>
                   <p>
                     <img src={num2} class={styles.num} />
-                    为确保安全，请勿将互通码泄露，以免造成不必要的损失；
+                    为确保安全，请勿将激活码泄露，以免造成不必要的损失；
                   </p>
                   <p>
                     <img src={num3} class={styles.num} />
-                    互通码请尽快激活使用，避免互通码过期；
+                    激活码请尽快激活使用，避免激活码过期；
                   </p>
                   <p>
                     <img src={num4} class={styles.num} />
-                    互通码内容以实际购买页面内容为准。
+                    激活码内容以实际购买页面内容为准。
                   </p>
                 </div>
               </div>
@@ -197,14 +197,15 @@ export default defineComponent({
             }}>
             {state.reslutPopupType === 'ACTIVATED' && (
               <p>
-                您已成功激活{state.successInfo?.times}
+                {state.successInfo?.times >= 99 && state.successInfo?.type === 'YEAR' ? '您已成功激活乐器AI学练工具，永久有效' : <>您已成功激活{state.successInfo?.times}
                 {vipGiftPeriodType[state.successInfo?.type]}
                 乐器AI学练工具，有效期至
                 <span style={{ color: '#2B85FF' }}>
                   {dayjs(state.successInfo.membershipEndTime).format(
                     'YYYY-MM-DD'
                   )}
-                </span>
+                </span></>}
+                
               </p>
             )}
 

src/views/activation-code/modal/code-dialog/index.module.less

@@ -75,6 +75,7 @@
     .imgBtn {
       width: 148px;
       height: 48px;
+      margin-bottom: -8px;
     }
 
     :global {

src/views/activation-code/record.tsx

@@ -113,7 +113,7 @@ export default defineComponent({
               <MSearch
                 inputBackground="white"
                 shape="round"
-                placeholder="请输入互通码"
+                placeholder="请输入激活码"
                 onSearch={(val: any) => {
                   forms.code = val;
                   forms.page = 1;
@@ -152,11 +152,10 @@ export default defineComponent({
               state.list.map((item: any) => (
                 <div class={styles.sectionItem}>
                   <div class={styles.itemTop}>
-                    <div class={styles.itemTitle}>
+                    <div class={styles.itemTitle}>  
                       <img src={recordItemBg} class={styles.recordItemBg} />
                       <div class={styles.text}>
-                        乐器AI学练工具{item.times}
-                        {vipGiftPeriodType[item.type]}
+                        乐器AI学练工具{item.times >= 99 && item.type ==='YEAR' ? '永久' : item.times + vipGiftPeriodType[item.type] }
                       </div>
                     </div>
                     <div class={styles.itemCode}>{item.code}</div>

src/views/download/index.tsx

@@ -5,18 +5,20 @@ import wxBg from './images/wx_bg.png';
 import { browser } from '@/helpers/utils';
 import student from './images/student-center.png';
 import request from '@/helpers/request';
+import { useRoute } from 'vue-router';
 
 // 唤起前缀
 export default defineComponent({
   name: 'download',
   setup() {
+    const route = useRoute()
     const state = reactive({
       wxStatus: false,
       androidUrl: ''
     });
 
     const onDownload = () => {
-      if (browser().weixin) {
+      if (browser().weixin && route.query.wx !== 'wx_lite') {
         state.wxStatus = true;
         return;
       }
@@ -28,7 +30,8 @@ export default defineComponent({
           'https://apps.apple.com/us/app/%E9%9F%B3%E4%B9%90%E6%95%B0%E5%AD%97%E8%AF%BE%E5%A0%82/id6452725878';
         urlAndroid = state.androidUrl; //'https://oss.dayaedu.com/appstore/kt_cooleshow_student.apk';
       } else {
-        urlIos = 'https://www.pgyer.com/dzRRNN';
+        // urlIos = 'https://www.pgyer.com/dzRRNN';
+        urlIos = 'https://apps.apple.com/us/app/%E9%9F%B3%E4%B9%90%E6%95%B0%E5%AD%97%E8%AF%BE%E5%A0%82/id6452725878'
         urlAndroid = state.androidUrl; //'https://www.pgyer.com/2meenh';
       }
 
@@ -38,7 +41,12 @@ export default defineComponent({
       ) {
         urlIos && (window.location.href = urlIos);
       } else {
-        window.location.href = urlAndroid;
+        // 判断是否用微信小程打开的
+        if(route.query.wx === 'wx_lite') {
+          window.postMessage({action: 'download', url: 'urlAndroid'}, '*')
+        } else {
+          window.location.href = urlAndroid;
+        }
       }
     };
     onMounted(async () => {

vite.config.ts

@@ -14,9 +14,9 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://test.lexiaoya.cn/';
-// const proxyUrl = 'https://kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
-const proxyUrl = 'https://dev.kt.colexiu.com/';
+// const proxyUrl = 'https://dev.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [