lex-xin 3 months ago
parent
commit
7a29e1bd65

+ 8 - 4
src/views/activation-code/activation-register/index.tsx

@@ -1509,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;
@@ -1516,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>
             )}
 

+ 11 - 3
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 () => {

+ 2 - 2
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: [