Merge branch 'iteration-classroom' into jenkins

src/views/content-information/content-instrument/components/list/search-group-resources.tsx

@@ -73,7 +73,7 @@ export default defineComponent({
           </NSpace>
           <TheSearch
             class={styles.inputSearch}
-            placeholder="请输入乐器关键词"
+            placeholder="请输入乐器名称"
             round
             onSearch={(val: string) => {
               forms.keyword = val;

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

@@ -287,6 +287,7 @@ export default defineComponent({
                 />
                 <NSlider
                   v-model:value={data.fontSize}
+                  placement="left"
                   vertical
                   min={12}
                   max={32}

src/views/content-information/content-music/components/list/search-group-resources.tsx

@@ -142,7 +142,7 @@ export default defineComponent({
           </NSpace>
           <TheSearch
             class={styles.inputSearch}
-            placeholder="请输入名曲鉴赏关键词"
+            placeholder="请输入曲目名称"
             round
             onSearch={(val: string) => {
               forms.keyword = val;

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

@@ -310,6 +310,7 @@ export default defineComponent({
                 />
                 <NSlider
                   v-model:value={data.fontSize}
+                  placement="left"
                   vertical
                   min={12}
                   max={32}

src/views/content-information/content-musician/components/list/search-group-resources.tsx

@@ -73,7 +73,7 @@ export default defineComponent({
           </NSpace>
           <TheSearch
             class={styles.inputSearch}
-            placeholder="请输入音乐家关键词"
+            placeholder="请输入音乐家名称"
             round
             onSearch={(val: string) => {
               forms.keyword = val;

src/views/prepare-lessons/model/source-instrument/components/list/search-group-resources.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
           </NSpace>
           <TheSearch
             class={styles.inputSearch}
-            placeholder="请输入乐器关键词"
+            placeholder="请输入乐器名称"
             round
             onSearch={(val: string) => {
               forms.keyword = val;

src/views/prepare-lessons/model/source-instrument/detail.module.less

@@ -76,9 +76,9 @@
   position: relative;
   flex: 1;
   display: flex;
-  padding: 20px 50px 20px 26px;
+  padding: 20px 55px 20px 30px;
   overflow: hidden;
-  gap: 0 32px;
+  gap: 0 20px;
 }
 
 .musicList {
@@ -320,7 +320,7 @@
   display: flex;
   flex-direction: column;
   position: relative;
-  left: -8px;
+  left: 0;
   flex: 1;
   background-color: #fff;
   border-radius: 16px;

src/views/prepare-lessons/model/source-music/components/list/search-group-resources.tsx

@@ -242,7 +242,7 @@ export default defineComponent({
           </NSpace>
           <TheSearch
             class={styles.inputSearch}
-            placeholder="请输入名曲鉴赏关键词"
+            placeholder="请输入曲目名称"
             round
             onSearch={(val: string) => {
               forms.keyword = val;

src/views/prepare-lessons/model/source-musician/components/list/search-group-resources.tsx

@@ -163,7 +163,7 @@ export default defineComponent({
           </NSpace>
           <TheSearch
             class={styles.inputSearch}
-            placeholder="请输入音乐家关键词"
+            placeholder="请输入音乐家名称"
             round
             onSearch={(val: string) => {
               forms.keyword = val;