Merge branch 'iteration-20240809' into jenkins-test

src/components/m-search/index.module.less

@@ -3,6 +3,7 @@
 
   input::placeholder {
     color: var(--k-gray-4);
+    font-size: 13px;
   }
 
   :global {
@@ -83,4 +84,4 @@
       height: 100%;
     }
   }
-}
+}

src/views/co-ai/index.module.less

@@ -663,13 +663,16 @@
 .empty {
   margin: 0 auto;
   width: 60%;
+
   :global {
-    .van-empty{
+    .van-empty {
       padding: 0;
-      .van-empty__bottom{
+
+      .van-empty__bottom {
         margin-top: 0;
       }
     }
+
     .van-empty__image {
       width: 100%;
       height: initial;

src/views/co-ai/index.tsx

@@ -305,10 +305,12 @@ export default defineComponent({
       }
       data.loading = false;
     };
-    const handleReset = () => {
+    const handleReset = async () => {
       musicForms.page = 1;
       data.musics = [];
-      getMusicList();
+      await getMusicList();
+
+      initLoadingObv();
     };
 
     const spinRef = ref();
@@ -557,6 +559,18 @@ export default defineComponent({
         return Number(n.toFixed(1)) + '万';
       }
     };
+
+    const initLoadingObv = () => {
+      const obv = new IntersectionObserver(entries => {
+        if (entries[0].intersectionRatio > 0) {
+          handleResh();
+        }
+      });
+      nextTick(() => {
+        spinRef.value && obv.observe(spinRef.value);
+      });
+    };
+
     onMounted(async () => {
       // 场景
       const tempAudio = Object.keys(audioPlayType).map(key => {
@@ -581,14 +595,7 @@ export default defineComponent({
       await getMusicSheetCategories();
       await getMusicList();
 
-      const obv = new IntersectionObserver(entries => {
-        if (entries[0].intersectionRatio > 0) {
-          handleResh();
-        }
-      });
-      nextTick(() => {
-        spinRef.value && obv.observe(spinRef.value);
-      });
+      initLoadingObv();
 
       const getUserInfo = async () => {
         const res = await request.get('/edu-app/user/getUserInfo', {

src/views/hot-music-more/index.module.less

@@ -180,12 +180,12 @@
     }
 
     .iconPlay {
-      border: 1px solid #15B2FD;
+      border: 0.6px solid #15B2FD;
       color: #15B2FD;
     }
 
     .iconSing {
-      border: 1px solid #CD8613;
+      border: 0.6px solid #CD8613;
       color: #CD8613;
     }
 
@@ -193,6 +193,7 @@
       font-size: 13px;
       color: #777777;
       line-height: 1;
+      padding-top: 1px;
     }
   }
 }
@@ -331,4 +332,4 @@
       }
     }
   }
-}
+}