Merge branch 'iteration-20240808-music-score' into iteration-20240816-fire

src/views/natural-resources/components/my-collect/search-group-resources.tsx

@@ -234,31 +234,34 @@ export default defineComponent({
               </NFormItem>
             </div>
           )} */}
-          <NFormItem label="场景：">
-            <NSpace class={styles.spaceSection}>
-              {data.audioPlayTypeList.map((subject: any) => (
-                <span
-                  class={[
-                    styles.textBtn,
+          {forms.type === 'MUSIC' && (
+            <NFormItem label="场景：">
+              <NSpace class={styles.spaceSection}>
+                {data.audioPlayTypeList.map((subject: any) => (
+                  <span
+                    class={[
+                      styles.textBtn,
+
+                      forms.audioPlayTypes === subject.value &&
+                        styles.textBtnActive
+                    ]}
+                    onClick={() => {
+                      forms.audioPlayTypes = subject.value;
+                      // if (subject.value === 'SING') {
+                      //   state.tempSubjectId = null;
+                      //   forms.subjectId = null;
+                      // } else {
+                      //   formatFirstSubject();
+                      // }
+                      onSearch();
+                    }}>
+                    {subject.name}
+                  </span>
+                ))}
+              </NSpace>
+            </NFormItem>
+          )}
 
-                    forms.audioPlayTypes === subject.value &&
-                      styles.textBtnActive
-                  ]}
-                  onClick={() => {
-                    forms.audioPlayTypes = subject.value;
-                    // if (subject.value === 'SING') {
-                    //   state.tempSubjectId = null;
-                    //   forms.subjectId = null;
-                    // } else {
-                    //   formatFirstSubject();
-                    // }
-                    onSearch();
-                  }}>
-                  {subject.name}
-                </span>
-              ))}
-            </NSpace>
-          </NFormItem>
           {forms.audioPlayTypes !== 'SING' && (
             <NFormItem label="乐器：">
               <NSpace class={styles.spaceSection2}>

src/views/natural-resources/components/share-resources/search-group-resources.tsx

@@ -369,31 +369,33 @@ export default defineComponent({
             </>
           )}
 
-          <NFormItem label="场景：">
-            <NSpace class={styles.spaceSection}>
-              {data.audioPlayTypeList.map((subject: any) => (
-                <span
-                  class={[
-                    styles.textBtn,
+          {forms.type === 'MUSIC' && (
+            <NFormItem label="场景：">
+              <NSpace class={styles.spaceSection}>
+                {data.audioPlayTypeList.map((subject: any) => (
+                  <span
+                    class={[
+                      styles.textBtn,
 
-                    forms.audioPlayTypes === subject.value &&
-                      styles.textBtnActive
-                  ]}
-                  onClick={() => {
-                    forms.audioPlayTypes = subject.value;
-                    // if (subject.value === 'SING') {
-                    //   state.tempSubjectId = null;
-                    //   forms.subjectId = null;
-                    // } else {
-                    //   formatFirstSubject();
-                    // }
-                    onSearch();
-                  }}>
-                  {subject.name}
-                </span>
-              ))}
-            </NSpace>
-          </NFormItem>
+                      forms.audioPlayTypes === subject.value &&
+                        styles.textBtnActive
+                    ]}
+                    onClick={() => {
+                      forms.audioPlayTypes = subject.value;
+                      // if (subject.value === 'SING') {
+                      //   state.tempSubjectId = null;
+                      //   forms.subjectId = null;
+                      // } else {
+                      //   formatFirstSubject();
+                      // }
+                      onSearch();
+                    }}>
+                    {subject.name}
+                  </span>
+                ))}
+              </NSpace>
+            </NFormItem>
+          )}
 
           {forms.audioPlayTypes !== 'SING' && (
             <NFormItem label="乐器：">