Browse Source

Merge branch 'iteration-20240809' into jenkins-test

lex 8 months ago
parent
commit
85d72b26be

+ 8 - 9
src/views/co-ai/index.module.less

@@ -41,8 +41,8 @@
 
     .van-popover__action {
       padding: 0;
-      --van-line-height-md: 32px;
-      margin-bottom: 6px;
+      --van-line-height-md: 28px;
+      // margin-bottom: 6px;
 
       &:last-child {
         margin-bottom: 0;
@@ -253,8 +253,7 @@
 
       span {
         font-size: 14px;
-        // color: #1CACF1;
-        color: #333333;
+        color: #1CACF1;
         line-height: 20px;
         max-width: 80px;
         text-overflow: ellipsis;
@@ -269,7 +268,7 @@
         border-top: 5px solid transparent;
         border-left: 5px solid transparent;
         border-right: 5px solid transparent;
-        border-bottom: 5px solid #AAAAAA;
+        border-bottom: 5px solid #1CACF1;
         margin-top: 6px;
         margin-left: 5px;
         transform: rotate(180deg);
@@ -473,8 +472,8 @@
       border-radius: 3px;
       border: 1px solid #FFC5C5;
       line-height: 1;
-      margin-right: 3px;
-      transform: scale(0.9);
+      margin-right: 2px;
+      transform: scale(0.85);
 
       .iconFire {
         display: inline-block;
@@ -491,7 +490,7 @@
       border-radius: 3px;
       line-height: 1;
       margin-right: 3px;
-      transform: scale(0.9);
+      transform: scale(0.85);
     }
 
     .iconPlay {
@@ -669,4 +668,4 @@
       font-size: 14px;
     }
   }
-}
+}

+ 11 - 11
src/views/co-ai/index.tsx

@@ -542,7 +542,7 @@ export default defineComponent({
         };
       });
       data.audioPlayTypeList = [
-        { text: '全部', value: '', className: 'selected' },
+        { text: '全部场景', value: '', className: 'selected' },
         ...tempAudio
       ];
       data.audioPlayTypeItem = data.audioPlayTypeList[0];
@@ -631,24 +631,24 @@ export default defineComponent({
                 <div id="coai-0">
                   <MSearch
                     class={[
-                      'searchNotice',
-                      data.searchNoticeShow ? styles.searchNoticeShow : ''
+                      'searchNotice'
+                      // data.searchNoticeShow ? styles.searchNoticeShow : ''
                     ]}
                     shape="round"
                     // background="transparent"
                     clearable={false}
                     placeholder="请输入关键字"
                     modelValue={musicForms.keyword}
-                    onFocus={() => (data.searchNoticeShow = false)}
+                    // onFocus={() => (data.searchNoticeShow = false)}
                     onBlur={val => {
                       musicForms.keyword = val?.trim() || '';
-                      requestAnimationFrame(() => {
-                        requestAnimationFrame(() => {
-                          if (musicForms.keyword) {
-                            data.searchNoticeShow = true;
-                          }
-                        });
-                      });
+                      // requestAnimationFrame(() => {
+                      //   requestAnimationFrame(() => {
+                      //     if (musicForms.keyword) {
+                      //       data.searchNoticeShow = true;
+                      //     }
+                      //   });
+                      // });
                     }}
                     onSearch={val => {
                       if (!data.loading) {

BIN
src/views/courseware-play/image/icon-play-active.png


BIN
src/views/courseware-play/image/icon-play-default.png


BIN
src/views/courseware-play/image/icon-sing-active.png


BIN
src/views/courseware-play/image/icon-sing-default.png


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

@@ -158,8 +158,8 @@
       border-radius: 3px;
       border: 1px solid #FFC5C5;
       line-height: 1;
-      margin-right: 3px;
-      transform: scale(0.9);
+      margin-right: 2px;
+      transform: scale(0.85);
 
       .iconFire {
         display: inline-block;
@@ -176,7 +176,7 @@
       border-radius: 3px;
       line-height: 1;
       margin-right: 3px;
-      transform: scale(0.9);
+      transform: scale(0.85);
     }
 
     .iconPlay {
@@ -331,4 +331,4 @@
       }
     }
   }
-}
+}

+ 1 - 0
src/views/hot-music-more/index.tsx

@@ -172,6 +172,7 @@ export default defineComponent({
         }
       } catch (error) {
         // console.log('🚀 ~ error:', error);
+        state.finished = true;
       }
       state.loading = false;
       isClick = false

+ 1 - 1
vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
-const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [