合并

public/version.json

@@ -1 +1 @@
-{"version":1693981261395}
+{"version":1694069021002}

src/components/timerMeter/components/countdown.tsx

@@ -228,25 +228,26 @@ export default defineComponent({
         if (lastStr[i] === str[i]) {
           continue;
         }
+      }
     };
-    const updateSecond = (e:any) => {
-      let targetCount =parseInt(e.target.value);
-      if(Number.isNaN(targetCount) ){
-        targetCount = 0
+    const updateSecond = (e: any) => {
+      let targetCount = parseInt(e.target.value);
+      if (Number.isNaN(targetCount)) {
+        targetCount = 0;
       }
-      if(targetCount > 59){
-        targetCount = 59
+      if (targetCount > 59) {
+        targetCount = 59;
       }
-      second.value = targetCount
-        const lastStr = getSecond(count.value);
-        count.value = mine.value * 60 + second.value;
-        const str = getSecond(count.value);
-        for (let i = 0; i < flipObjs.value.length; i++) {
-          if (lastStr[i] === str[i]) {
-            continue;
-          }
-          flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
+      second.value = targetCount;
+      const lastStr = getSecond(count.value);
+      count.value = mine.value * 60 + second.value;
+      const str = getSecond(count.value);
+      for (let i = 0; i < flipObjs.value.length; i++) {
+        if (lastStr[i] === str[i]) {
+          continue;
         }
+        flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
+      }
     };
 
     watch(

vite.config.ts

@@ -23,103 +23,6 @@ function resolve(dir: string) {
 }
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
-<<<<<<< HEAD
-const proxyUrl = 'https://dev.kt.colexiu.com/';
-// const proxyUrl = 'https://test.lexiaoya.cn';
-export default defineConfig({
-  base: './',
-  plugins: [
-    vue(),
-    vueJsx(),
-    // viteESLint(),
-    Components({
-      dts: true,
-      resolvers: [NaiveUiResolver()]
-    }),
-    legacyPlugin({
-      targets: ['defaults', 'not IE 11'],
-      additionalLegacyPolyfills: ['regenerator-runtime/runtime'],
-      renderLegacyChunks: true,
-      polyfills: [
-        'es.symbol',
-        'es.promise',
-        'es.promise.finally',
-        'es/map',
-        'es/set',
-        'es.array.filter',
-        'es.array.for-each',
-        'es.array.flat-map',
-        'es.object.define-properties',
-        'es.object.define-property',
-        'es.object.get-own-property-descriptor',
-        'es.object.get-own-property-descriptors',
-        'es.object.keys',
-        'es.object.to-string',
-        'web.dom-collections.for-each',
-        'esnext.global-this',
-        'esnext.string.match-all'
-      ]
-    }),
-    VitePWA({
-      registerType: 'autoUpdate',
-      includeAssets: ['./logo.png'],
-      workbox: {
-        skipWaiting: true
-        // runtimeCaching: [
-        //   {
-        //     urlPattern: /(.*?)\.(js|css|ts|tsx|html)/, // js /css /ts静态资源缓存
-        //     handler: 'NetworkOnly',
-        //     options: {
-        //       cacheName: 'js-css-cache'
-        //     }
-        //   },
-        //   {
-        //     urlPattern: /.*\.html.*/,
-        //     handler: 'NetworkOnly',
-        //     options: {
-        //       cacheName: 'wisbayar-html',
-        //       expiration: {
-        //         maxEntries: 20,
-        //         maxAgeSeconds: 30 * 24 * 60 * 60
-        //       },
-        //       cacheableResponse: {
-        //         statuses: [200]
-        //       }
-        //     }
-        //   }
-        // ]
-      },
-      manifest: {
-        name: '酷乐秀-音乐数字课堂',
-        short_name: '音乐数字课堂',
-        theme_color: '#E8EAED',
-        display: 'fullscreen',
-        icons: [
-          {
-            src: './logo.png',
-            sizes: '192x192',
-            type: 'image/png'
-          },
-          {
-            src: './logo.png',
-            sizes: '512x512',
-            type: 'image/png'
-          },
-          {
-            src: './logo.png',
-            sizes: '512x512',
-            type: 'image/png',
-            purpose: 'any maskable'
-          }
-        ],
-        prefer_related_applications: false,
-        related_applications: [
-          {
-            platform: 'webapp',
-            id: '1.0.0',
-            url: './manifest.webmanifest'
-          }
-=======
 // const proxyUrl = 'https://dev.kt.colexiu.com/';
 const proxyUrl = 'https://test.lexiaoya.cn';
 const now = new Date().getTime();
@@ -156,7 +59,6 @@ export default defineConfig(() => {
           'web.dom-collections.for-each',
           'esnext.global-this',
           'esnext.string.match-all'
->>>>>>> startLogin
         ]
       }),
       VitePWA({