Merge branch 'iteration-20240618' into jenkins

src/teacher/music/upload/index.module.less

@@ -92,6 +92,10 @@
       --van-field-text-area-min-height: 80px;
     }
 
+    .van-cell:after {
+      --van-padding-md: 12px;
+    }
+
   }
 
   .hideValue {
@@ -249,6 +253,7 @@
 
     span {
       font-size: 14px;
+      padding-left: 4px;
     }
   }
 }
@@ -360,8 +365,8 @@
   height: 28px;
   font-size: 14px;
   color: #00B2A7 !important;
-  padding-top: 0;
-  padding-bottom: 0;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
   border: 1px solid #9FE2DE !important;
 }
 

src/teacher/music/upload/index.tsx

@@ -73,7 +73,7 @@ export default defineComponent({
       playSpeed: '' as any,
       // hasBeat: 0,
       musicCover: '',
-      paymentType: 'CHARGE',
+      paymentType: 'FREE',
       // showFingering: 1,
       // canEvaluate: 1,
       // notation: 1,
@@ -552,7 +552,7 @@ export default defineComponent({
                   </div>
                 ),
                 input: () =>
-                  !browser().isApp ? (
+                  browser().isApp ? (
                     <div class={styles.btnSection}>
                       <Button
                         icon={UploadIcon}
@@ -609,7 +609,7 @@ export default defineComponent({
                   </div>
                 ),
                 input: () =>
-                  !browser().isApp ? (
+                  browser().isApp ? (
                     <div class={styles.btnSection}>
                       <Button
                         icon={UploadIcon}
@@ -668,7 +668,7 @@ export default defineComponent({
                 </div>
               ),
               input: () =>
-                !browser().isApp ? (
+                browser().isApp ? (
                   <div class={styles.btnSection}>
                     <Button
                       icon={UploadIcon}
@@ -750,7 +750,7 @@ export default defineComponent({
                       </div>
                     ),
                     input: () =>
-                      !browser().isApp ? (
+                      browser().isApp ? (
                         <div class={styles.btnSection}>
                           <Button
                             icon={UploadIcon}
@@ -798,7 +798,7 @@ export default defineComponent({
 
           <Field
             label="曲目名称"
-            clearable
+            required
             name="name"
             modelValue={this.name}
             rules={[{ required: true, message: '请输入曲目名称' }]}
@@ -812,7 +812,7 @@ export default defineComponent({
 
           <Field
             label="音乐人"
-            clearable
+            required
             name="composer"
             modelValue={this.composer}
             rules={[{ required: true, message: '请输入音乐人' }]}

src/teacher/music/upload/message-tip/index.module.less

@@ -62,6 +62,7 @@
     color: #777777;
     line-height: 21px;
     padding-bottom: 16px;
+    padding-top: 16px;
 
 
     // &::before {
@@ -78,7 +79,7 @@
       max-height: 300px;
       overflow-x: hidden;
       overflow-y: auto;
-      padding: 16px 20px 0;
+      padding: 0 20px 0;
     }
 
     .cTitle {

src/teacher/music/upload/select-tag/index.module.less

@@ -21,16 +21,16 @@
 
   :global {
     .van-tag {
-      background: #F6F6F6;
+      background: #F6F6F6 !important;
       font-size: 14px;
-      color: #777777;
-      border-color: #F6F6F6;
+      color: #777777 !important;
+      border-color: #F6F6F6 !important;
     }
 
     .van-tag--primary {
-      background: #E9FFF8;
-      border-color: #2DC7AA;
-      color: #14BC9C;
+      background: #E9FFF8 !important;
+      border-color: #2DC7AA !important;
+      color: #14BC9C !important;
     }
   }
 
@@ -92,6 +92,12 @@
 
 .btn {
   width: 164px;
+  font-size: 18px;
+  font-weight: bold;
+
+  &.btnCancel {
+    border-color: #DBDBDB;
+  }
 }
 
 .select {

src/teacher/music/upload/select-tag/index.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
     return () => {
       return (
         <div class={styles.select}>
-          <h4 class={styles.title}>曲谱标签</h4>
+          <h4 class={styles.title}>曲目标签</h4>
           <div class={styles.content}>
             <CheckboxGroup
               class={classNames(styles.childContent, styles['radio-group'])}
@@ -98,7 +98,11 @@ export default defineComponent({
             </CheckboxGroup>
           </div>
           <footer class="van-safe-area-bottom van-hairline--top">
-            <Button class={styles.btn} round onClick={resetTags}>
+            <Button
+              class={[styles.btn, styles.btnCancel]}
+              round
+              onClick={resetTags}
+            >
               重置
             </Button>
             <Button