Merge branch 'iteration-20231201' into jenkins

src/router/routes/index.ts

@@ -183,7 +183,7 @@ export const constantRoutes: RouteRecordRaw[] = [
         name: 'content-music',
         component: () => import('@/views/content-information/content-music'),
         meta: {
-          title: '曲目鉴赏'
+          title: '名曲鉴赏'
         }
       },
       {

src/views/content-information/content-instrument/detail.module.less

@@ -357,7 +357,8 @@
     display: flex;
     align-items: center;
 
-    .icon1 {
+    .icon1,
+    .icon3 {
       display: inline-block;
       width: 23px;
       height: 23px;
@@ -365,6 +366,11 @@
       background: url('../images/icon-1.png') no-repeat center;
       background-size: contain;
     }
+
+    .icon3 {
+      background: url('../images/icon-3.png') no-repeat center;
+      background-size: contain;
+    }
   }
 
   .musicContent {

src/views/content-information/content-instrument/detail.tsx

@@ -260,7 +260,11 @@ export default defineComponent({
 
               <div class={styles.musicStaff}>
                 <div class={styles.musicTitle}>
-                  <i class={styles.icon1}></i>乐器简介
+                  <i
+                    class={
+                      forms.type === 'MUSICIAN' ? styles.icon3 : styles.icon1
+                    }></i>
+                  {forms.type === 'MUSICIAN' ? '个人简介' : '乐器简介'}
                 </div>
                 <div
                   class={styles.musicContent}

src/views/content-information/content-music/components/list/index.module.less

@@ -90,6 +90,7 @@
     padding-bottom: calc(100% / 3 * 0.1957894);
     position: relative;
     height: 0;
+    cursor: pointer;
 
     .itemWrapBox {
       position: absolute;
@@ -103,7 +104,7 @@
 
   .itemCard {
     position: relative;
-    // cursor: pointer;
+    cursor: pointer;
     height: 100%;
     background: #F4F4F4;
     border-radius: 13px;

src/views/content-information/content-music/components/list/index.tsx

@@ -81,7 +81,17 @@ export default defineComponent({
         <NSpin v-model:show={state.loading} style={{ 'min-height': '50vh' }}>
           <div class={styles.list}>
             {state.tableList.map((item: any) => (
-              <div class={styles.itemWrap}>
+              <div
+                class={styles.itemWrap}
+                onClick={() => {
+                  router.push({
+                    path: '/content-music-detail',
+                    query: {
+                      id: item.id,
+                      name: item.name
+                    }
+                  });
+                }}>
                 <div class={styles.itemWrapBox}>
                   <div class={styles.itemCard}>
                     <div class={styles.itemName}>
@@ -93,19 +103,7 @@ export default defineComponent({
                       <span class={styles.name}>{item.name}</span>
                     </div>
 
-                    <NButton
-                      class={styles.btn}
-                      round
-                      type={'primary'}
-                      onClick={() => {
-                        router.push({
-                          path: '/content-music-detail',
-                          query: {
-                            id: item.id,
-                            name: item.name
-                          }
-                        });
-                      }}>
+                    <NButton class={styles.btn} round type={'primary'}>
                       播放<i class={styles.iconArrow}></i>
                     </NButton>
                   </div>

src/views/content-information/content-music/detail.module.less

@@ -549,6 +549,7 @@
     color: #131415;
     line-height: 25px;
     padding-bottom: 8px;
+    max-width: 220px;
   }
 
   .c {

src/views/content-information/content-music/detail.tsx

@@ -172,7 +172,13 @@ export default defineComponent({
                     </div>
 
                     <div class={styles.info}>
-                      <div class={styles.name}>{data.details.name}</div>
+                      <div class={styles.name}>
+                        <TheNoticeBar
+                          text={data.details.name}
+                          style={{ marginRight: '0' }}
+                        />
+                        {/* {data.details.name} */}
+                      </div>
                       <div class={styles.c}>
                         {data.details.composers ? (
                           <div>