Merge branch 'feature-3.8'

src/helpers/utils.ts

@@ -5,7 +5,7 @@ import qs from 'query-string';
 export function vaildMusicScoreUrl() {
   const url: string = window.location.href;
   let returnUrl = '';
-  if (/test/.test(url)) {
+  if (/test/.test(url) || /192/.test(url) || /localhost/.test(url)) {
     // test 环境
     returnUrl = 'https://test.kt.colexiu.com';
   } else if (/dev/.test(url)) {

src/views/co-ai/index.tsx

@@ -499,9 +499,9 @@ export default defineComponent({
           data.vipMember = res.data.vipMember;
         }
       };
-      analyzeXml();
+      // await analyzeXml();
       listenerMessage('webViewOnResume', () => {
-        console.log('页面显示');
+        console.log('页面显示',data.iframeSrc);
         getUserInfo();
         data.typeIndex = 0;
         data.musicIndex = 0;
@@ -705,9 +705,11 @@ export default defineComponent({
                           width: '100%'
                           // opacity: loading.value ? 0 : 1
                         }}
-                        // src={data.iframeSrc}
-                        // onLoad={musicIframeLoad}
-                      ></iframe>
+                        src={data.iframeSrc}
+                        onLoad={async () => {
+                          await analyzeXml();
+                          musicIframeLoad();
+                        }}></iframe>
                       {/* <OsmdPreview ref={osmdPreviewRef} /> */}
                     </>
                   </div>

src/views/download/index.module.less

@@ -3,7 +3,7 @@
   background: url('./images/download_bg.png') no-repeat top center;
   background-size: cover;
   min-height: 100vh;
-  padding: 0 8px 0 23px;
+  padding: 0 15px 0 23px;
   text-align: center;
 
   :global {
@@ -15,7 +15,7 @@
 
 .buttonGroup {
   text-align: center;
-  margin: 15px 0;
+  margin: 15px 0 15px -8px;
 }
 
 .btn {

src/views/student-register/register-new/index.tsx

@@ -178,6 +178,7 @@ export default defineComponent({
               forms.gradeNumText = i.text;
             }
           });
+
         }
       } catch {
         //
@@ -289,7 +290,7 @@ export default defineComponent({
             forms.showButton = false;
           }
         } else {
-          forms.showTips = true;
+          // forms.showTips = true;
         }
       } catch {}
     };
@@ -520,6 +521,7 @@ export default defineComponent({
           <Picker
             showToolbar
             columns={gradeList.value as any}
+            modelValue={[studentInfo.extra.currentGradeNum]}
             onCancel={() => (forms.gradeStatus = false)}
             onConfirm={(val: any) => {
               const selectedOption = val.selectedOptions[0];
@@ -538,6 +540,7 @@ export default defineComponent({
           <Picker
             showToolbar
             columns={classList}
+            modelValue={[studentInfo.extra.currentClass]}
             onCancel={() => (forms.classStatus = false)}
             onConfirm={(val: any) => {
               const selectedOption = val.selectedOptions[0];

vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7989/';
-const proxyUrl = 'https://kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [