修复问题

dev-dist/sw.js

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

public/version.json

@@ -1 +1 @@
-{"version":1706521488441}
+{"version":1706691199878}

src/views/xiaoku-music/index.module.less

@@ -318,6 +318,12 @@
   display: flex;
   justify-content: center;
   min-height: 80px;
+
+  &.showLoading {
+    height: 0;
+    opacity: 0;
+    min-height: 0;
+  }
 }
 
 .musicStaff {

src/views/xiaoku-music/index.tsx

@@ -97,8 +97,10 @@ export default defineComponent({
           resultList.push(item);
         }
       });
-      data.tags = [{ name: '全部', id: 0 }, ...resultList];
-      console.log(data.tags);
+      data.tags = [
+        { name: '全部', id: 0, value: 0, label: '全部' },
+        ...resultList
+      ];
       // }
     };
     const getList = async () => {
@@ -113,10 +115,13 @@ export default defineComponent({
       } catch (error) {
         console.log(error);
       }
+
+      console.log(res, 'data', data.reshing, 'musicSubject');
       if (data.reshing) {
         data.list = [];
         data.reshing = false;
       }
+
       if (res?.code === 200 && Array.isArray(res?.data?.rows)) {
         data.list = [...data.list, ...res.data.rows];
         data.finshed = res.data.rows.length < forms.rows;
@@ -140,7 +145,6 @@ export default defineComponent({
     };
     const spinRef = ref();
     const handleResh = () => {
-      console.log(data.finshed);
       if (data.loading || data.finshed) return;
       forms.page = forms.page + 1;
       getList();
@@ -177,9 +181,7 @@ export default defineComponent({
           handleResh();
         }
       });
-      nextTick(() => {
-        obv.observe(spinRef.value);
-      });
+      obv.observe(spinRef.value);
       window.addEventListener('message', iframeHandle);
     });
     onUnmounted(() => {
@@ -358,19 +360,13 @@ export default defineComponent({
                           onUpdate:value={() => {
                             // onSearch();
                             data.reshing = true;
+                            document
+                              .querySelector('.musicList-container')
+                              .scroll(0, 0);
                             handleGetList();
                           }}
-                          key={item.id}
+                          key={item.value}
                           class={[styles.popSelect]}>
-                          {/* <span
-                            class={[
-                              styles.textBtn,
-                              selectChildObj(item.instruments).selected &&
-                                styles.textBtnActive
-                            ]}>
-                            {selectChildObj(item.instruments).name || item.name}
-                            <i class={styles.iconArrow}></i>
-                          </span> */}
                           <NButton
                             round
                             textColor={
@@ -392,13 +388,7 @@ export default defineComponent({
                               styles.textBtn,
                               selectChildObj(item.instruments).selected &&
                                 styles.textBtnActive
-                            ]}
-                            // onClick={() => {
-                            //   data.tagIndex = item.id;
-                            //   data.reshing = true;
-                            //   handleGetList();
-                            // }}
-                          >
+                            ]}>
                             {selectChildObj(item.instruments).name || item.name}
                             <i class={styles.iconArrow}></i>
                           </NButton>
@@ -407,15 +397,20 @@ export default defineComponent({
                         <NButton
                           round
                           textColor={
-                            data.tagIndex === item.id ? '#fff' : '#000'
+                            data.tagIndex === item.value ? '#fff' : '#000'
+                          }
+                          color={
+                            data.tagIndex === item.value ? '#198CFE' : '#fff'
                           }
-                          color={data.tagIndex === item.id ? '#198CFE' : '#fff'}
                           type={
-                            data.tagIndex === item.id ? 'primary' : 'default'
+                            data.tagIndex === item.value ? 'primary' : 'default'
                           }
                           onClick={() => {
-                            data.tagIndex = item.id;
+                            data.tagIndex = item.value || 0;
                             data.reshing = true;
+                            document
+                              .querySelector('.musicList-container')
+                              .scroll(0, 0);
                             handleGetList();
                           }}>
                           {item.name}
@@ -439,7 +434,7 @@ export default defineComponent({
 
             <div class={styles.contentWrap}>
               <div class={[styles.musicList, 'musicList-container']}>
-                <div class={styles.wrapList}>
+                <div class={[styles.wrapList, 'music-wrap-list']}>
                   {data.list.map((item: IMusicItem, index) => {
                     return (
                       <div class={styles.itemContainer}>
@@ -527,11 +522,16 @@ export default defineComponent({
                       </div>
                     );
                   })}
-                  {!data.finshed && (
-                    <div ref={spinRef} class={styles.loadingWrap}>
-                      <NSpin show={true}></NSpin>
-                    </div>
-                  )}
+
+                  <div
+                    ref={spinRef}
+                    class={[
+                      styles.loadingWrap,
+                      data.finshed && styles.showLoading
+                    ]}>
+                    <NSpin show={true}></NSpin>
+                  </div>
+
                   {!data.loading && data.list.length === 0 && (
                     <div class={styles.empty}>
                       <TheEmpty></TheEmpty>

vite.config.ts

@@ -23,8 +23,8 @@ function resolve(dir: string) {
 }
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
-const proxyUrl = 'https://dev.kt.colexiu.com/';
-// const proxyUrl = 'https://test.lexiaoya.cn';
+// const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.lexiaoya.cn';
 // const proxyUrl = 'http://192.168.3.14:7989';
 const now = new Date().getTime();
 export default defineConfig(() => {