1

1

dev-dist/sw.js

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

src/components/layout/index.tsx

@@ -17,6 +17,7 @@ import TimerMeter from '../timerMeter';
 import { useRoute } from 'vue-router';
 import { vaildUrl } from '/src/utils/urlUtils';
 import ChioseModal from '/src/views/home/modals/chioseModal';
+import {px2vw,px2vwH} from '@/utils/index'
 export default defineComponent({
   name: 'layoutView',
   setup() {
@@ -383,7 +384,7 @@ export default defineComponent({
           class={['modalTitle background']}
           title={'计时器'}
           preset="card"
-          style={{ width: '772px' }}>
+          style={{ width: px2vw(772) }}>
           <div>
             <TimerMeter></TimerMeter>
           </div>

src/components/timerMeter/components/positive.tsx

@@ -159,6 +159,7 @@ export default defineComponent({
                 <h4 class={styles.dotTop}></h4>
                 <div class={styles.dot}></div>
                 <div class={styles.dot}></div>
+
               </div>
               <div class={styles.timerItemTopCore}>
                 <h4> 秒</h4>

src/components/timerMeter/index.module.less

@@ -36,7 +36,6 @@
 // 计时器
 .timerItemInfo {
   width: 692px;
-
   background: #A6D1FF;
   box-shadow: 0px 9px 0px 0px #CBD6DF;
   border-radius: 46px;
@@ -45,12 +44,14 @@
   padding: 10px;
 
   .timerItemInset {
+    min-height: 339px;
     border-radius: 28px 28px 38px 38px;
     background: #D8ECFE;
   }
 
   .timerItemInfoTop {
     width: 100%;
+
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -68,7 +69,7 @@
     .dotTop {
 
       width: 10px;
-      height: 70px;
+      height: 64px;
     }
 
     .timerItemTopCore {
@@ -90,7 +91,10 @@
 }
 
 .nowTimerWrap {
-  margin-top: 20px;
+  margin: 14px 0 26px;
+  width: 174px;
+  line-height: 45px;
+  height: 45px;
   width: 100%;
   text-align: center;
   font-size: 24px;
@@ -98,7 +102,7 @@
   font-weight: 400;
   color: rgba(19, 20, 21, .5);
   line-height: 33px;
-  padding-bottom: 20px;
+  // padding-bottom: 20px;
 }
 
 .btnGroupModal {
@@ -151,7 +155,7 @@
 .dotBtm {
   width: 100%;
 
-  height: 16px;
+  height: 20px;
 }
 
 .chioseWrap {

src/custom-plugins/guide-page/home-guide.tsx

@@ -97,7 +97,7 @@ export default defineComponent({
           },
           btnsStyle: {
             bottom: '30px',
-            left:px2vw(450)
+            left:px2vw(445)
           },
           boxStyle:{
             borderRadius: '20px'
@@ -125,6 +125,7 @@ export default defineComponent({
           },
           btnsStyle: {
             bottom: '30px',
+            left:px2vw(-147)
           },
           eleRectPadding:{
             left:7,

src/views/attend-class/index.tsx

@@ -1104,7 +1104,7 @@ export default defineComponent({
           class={['modalTitle background']}
           title={'计时器'}
           preset="card"
-          style={{ width: '772px' }}>
+          style={{ width: px2vw(772) }}>
           <div>
             <TimerMeter></TimerMeter>
           </div>

src/views/home/index.tsx

@@ -50,6 +50,7 @@ import HomeGuide from '/src/custom-plugins/guide-page/home-guide';
 import TimerMeter from '/src/components/timerMeter';
 import { vaildUrl } from '/src/utils/urlUtils';
 import toneImage from '@/components/layout/images/toneImage.png';
+import { px2vw } from '/src/utils';
 export const formatDateToDay = () => {
   const hours = dayjs().hour();
   if (hours < 12) {
@@ -743,7 +744,7 @@ export default defineComponent({
           class={['modalTitle background']}
           title={'计时器'}
           preset="card"
-          style={{ width: '772px' }}>
+          style={{ width: px2vw(772) }}>
           <div>
             <TimerMeter></TimerMeter>
           </div>

src/views/login/index.tsx

@@ -15,7 +15,7 @@ export default defineComponent({
     const NavsValue = ref('pwdLogin');
     const pwdLoginRef = ref();
     const forgotPasswordRef = ref();
-    const popEvent = ref()
+    const popEvent = ref();
     const dialog = useDialog();
     const showModalMask = ref()
     const checkInstall = async (event: any) => {
@@ -47,21 +47,23 @@ export default defineComponent({
           console.log(btn)
           if(btn){
             btn.addEventListener('click', () => {
+
               console.log(popEvent.value )
               if( !popEvent.value ) {
                 return;
               }
 
               popEvent.value.prompt();
+
               popEvent.value.userChoice.then( (choiceResult:any) => {
                 if (choiceResult.outcome === 'accepted') {
                   console.log('用户已同意添加到桌面')
-                  showModalMask.value = false;
                 } else {
                   console.log('用户已取消添加到桌面')
-                  showModalMask.value = false;
+                  // showModalMask.value = false;
                 }
               })
+              showModalMask.value = false;
             })
           }
         },500)

vite.config.ts

@@ -64,7 +64,7 @@ export default defineConfig({
       manifest: {
         name: '酷乐秀-音乐数字课堂',
         short_name: '音乐数字课堂',
-        theme_color: '#fff',
+        theme_color: '#E8EAED',
         icons: [
           {
             src: './logo.png',