提交

1

dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.8v4p94jv0c"
+    "revision": "0.01fpdbnlohg"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

src/components/TheQrCode/index.tsx

@@ -174,8 +174,9 @@ export default defineComponent({
       this.render(bgImg, logoImg);
     },
     async render(img: any, logoImg: any, gifBgSrc?: any) {
-      console.log(img, logoImg, gifBgSrc);
-      new AwesomeQR({
+      console.log(img, logoImg, gifBgSrc, 'render====>code');
+
+      const obj = {
         gifBackground: gifBgSrc,
         text: this.text,
         size: this.size,
@@ -185,7 +186,6 @@ export default defineComponent({
         backgroundColor: this.backgroundColor,
         backgroundImage: img,
         backgroundDimming: this.backgroundDimming,
-        logoImage: logoImg ? logoImg + '?' + new Date().getTime() : undefined,
         logoScale: this.logoScale,
         logoBackgroundColor: this.logoBackgroundColor,
         correctLevel: this.correctLevel,
@@ -195,7 +195,11 @@ export default defineComponent({
         dotScale: this.dotScale,
         autoColor: toBoolean(this.autoColor),
         components: this.components
-      })
+      } as any
+      if (logoImg) {
+        obj.logoImg = logoImg + '?' + new Date().getTime()
+      }
+      new AwesomeQR(obj)
         .draw()
         .then((dataUri: any) => {
           console.log('🚀 ~ dataUri:', dataUri);

src/components/layout/index.tsx

@@ -20,7 +20,7 @@ export default defineComponent({
     const directionType = ref('left');
     const showModalBeat = ref(false);
     const showModalTone = ref(false);
-    const showModalTime = ref(true);
+    const showModalTime = ref(false);
     const route = useRoute();
     const isDragIng = ref(false);
     const initMoveable = async () => {
@@ -223,10 +223,6 @@ export default defineComponent({
           <div
             class={styles.modeWrap}
            >
-            {/* <NImage
-              src={beatImage}
-              previewDisabled
-              class={styles.beatImage}></NImage> */}
               <iframe src="https://test.lexiaoya.cn/metronome/"  scrolling='no'  frameborder="0" width='100%'  height={'650px'} ></iframe>
           </div>
         </NModal>

src/views/home/index.tsx

@@ -47,6 +47,7 @@ import { classGroupList, courseSchedulePage } from './api';
 import TheEmpty from '/src/components/TheEmpty';
 import { setTabsCaches } from '/src/hooks/use-async';
 import HomeGuide from '/src/custom-plugins/guide-page/home-guide';
+import TimerMeter from '/src/components/timerMeter';
 export const formatDateToDay = () => {
   const hours = dayjs().hour();
   if (hours < 12) {
@@ -65,6 +66,9 @@ export default defineComponent({
     const message = useMessage();
     const router = useRouter();
     const userStore = useUserStore();
+    const showModalBeat = ref(false);
+    const showModalTone = ref(false);
+    const showModalTime = ref(false);
     const forms = reactive({
       applyClassItem: {} as any, // 选择的内容
       applyStatus: false,
@@ -531,8 +535,8 @@ export default defineComponent({
               </div>
             </div>
             <img src={iconTo} class={styles.iconTo} />
-            <div class={styles.toolFunction} id="home-3">
-              <div class={[styles.toolItem, styles.item1]}>
+            <div class={styles.toolFunction} id="home-3" >
+              <div class={[styles.toolItem, styles.item1]} onClick={()=>{showModalBeat.value = true}}>
                 <img src={t1} />
                 <p class={styles.toolMemo}>提升效率，练习好节奏</p>
                 <NButton class={styles.btn1}>节拍器</NButton>
@@ -542,7 +546,7 @@ export default defineComponent({
                 <p class={styles.toolMemo}>精准调音，一劳永逸</p>
                 <NButton class={styles.btn2}>调音器</NButton>
               </div>
-              <div class={[styles.toolItem, styles.item3]}>
+              <div class={[styles.toolItem, styles.item3]} onClick={()=>{showModalTime.value = true}}>
                 <img src={t3} />
                 <p class={styles.toolMemo}>创造时间，集中注意力</p>
                 <NButton class={styles.btn3}>计时器</NButton>
@@ -688,8 +692,31 @@ export default defineComponent({
             onClose={() => (forms.useStatus = false)}
           />
         </NModal>
+
+        <NModal
+         class={['modalTitle background']}
+          title={'节拍器'}
+          preset="card"
+          v-model:show={showModalBeat.value}  style={{ width: '687px' }}>
+          <div
+            class={styles.modeWrap}
+           >
+              <iframe src="https://test.lexiaoya.cn/metronome/"  scrolling='no'  frameborder="0" width='100%'  height={'650px'} ></iframe>
+          </div>
+        </NModal>
+
+        <NModal v-model:show={showModalTime.value}   class={['modalTitle background']}
+          title={'计时器'}  preset="card" style={{ width: '772px' }}>
+          <div
+           >
+          <TimerMeter></TimerMeter>
+          </div>
+        </NModal>
+
         {forms.showGuide ? <HomeGuide></HomeGuide> : null}
       </div>
+
+
     );
   }
 });

src/views/setting/modal/addteacherModel.tsx

@@ -50,9 +50,13 @@ export default defineComponent({
       const queryStr = `tenantId=${userStore.info.schoolInfos?.[0]?.tenantId}&schoolId=${userStore.info.schoolInfos?.[0]?.id}&schoolName=${userStore.info.schoolInfos?.[0]?.name}`;
       const url =
         `${location.origin}/classroom-app/#/teaher-register?` + queryStr;
-      console.log(url);
+
       return url;
     };
+
+    const queryStr = `tenantId=${userStore.info.schoolInfos?.[0]?.tenantId}&schoolId=${userStore.info.schoolInfos?.[0]?.id}&schoolName=${userStore.info.schoolInfos?.[0]?.name}`;
+    const url =
+      `${location.origin}/classroom-app/#/teaher-register?` + queryStr;
     const imgs = reactive({
       saveLoading: false,
       image: null as any,
@@ -68,6 +72,7 @@ export default defineComponent({
         saveImg();
       } else {
         const container: any = document.getElementById(`preview-container`);
+
         html2canvas(container, {
           allowTaint: true,
           useCORS: true,
@@ -75,10 +80,13 @@ export default defineComponent({
         })
           .then(async canvas => {
             const url = canvas.toDataURL('image/png');
+            console.log(url, 'url===>')
             imgs.image = url;
+
             saveImg();
           })
           .catch(() => {
+            console.log('生成图片失败url===>')
             imgs.saveLoading = false;
           });
       }
@@ -152,7 +160,7 @@ export default defineComponent({
               </p>
               <div class={styles.codewrap}>
                 <img src={codewrap} class={styles.codewrapBg} alt="" />
-                <TheQrCode margin={0} text={registerUrl()} size={119} />
+                <TheQrCode margin={0} text={url} size={119} />
               </div>
               <div class={styles.codewrapSubmit}>
                 <NImage previewDisabled src={btnBg}></NImage>

src/views/studentList/modals/addStudentModel.tsx

@@ -64,6 +64,7 @@ export default defineComponent({
         saveImg();
       } else {
         const container: any = document.getElementById(`preview-container`);
+        console.log(container, 'container=====>')
         html2canvas(container, {
           allowTaint: true,
           useCORS: true,
@@ -149,8 +150,6 @@ export default defineComponent({
                 <img src={codewrap} class={styles.codewrapBg} alt="" />
                 <TheQrCode
                   margin={0}
-                  // logoSrc={logo}
-                  class={styles.codewrapImg}
                   text={url.value}
                   size={119}
                 />