Explorar o código

Merge branch 'iteration-20241007-tag' into jenkins

lex-xin hai 9 meses
pai
achega
aac9ca8a65

+ 3 - 3
src/views/xiaoku-list/detail.module.less

@@ -32,7 +32,7 @@
 
     .n-tabs-tab {
       color: #8b8d98;
-      font-size: max(20px, 14px);
+      font-size: max(20px, 15Px);
       padding-top: 8px;
       padding-bottom: 8px;
       line-height: 28px;
@@ -103,7 +103,7 @@
 }
 
 .searchGroup {
-  background: #f7f8f9;
+  background: #f5f6f7;
   border-radius: 12px;
   padding: 20px 24px 30px;
   position: relative;
@@ -403,7 +403,7 @@
   padding: 20px;
   border-radius: 12px;
   width: 402px;
-  background: #f7f8f9;
+  background: #f5f6f7;
   cursor: pointer;
   transition: all .2s ease;
   border: 2px solid #f7f8f9;

+ 5 - 4
src/views/xiaoku-list/detail.tsx

@@ -234,7 +234,7 @@ export default defineComponent({
     };
 
     const iframeHandle = (ev: MessageEvent) => {
-      if (ev.data?.api === 'onAttendToggleMenu') {
+      if (ev.data?.api === 'back') {
         exitFullscreen();
         state.previewModal = !state.previewModal;
       }
@@ -268,9 +268,10 @@ export default defineComponent({
               state.finshed = false;
               state.reshing = true;
               state.list = [];
-              getList();
-
-              __initSpin();
+              if(musicalInstrumentId.value) {
+                getList();
+                __initSpin();
+              }
             }}
             v-slots={{
               suffix: () => (

BIN=BIN
src/views/xiaoku-list/images/search-bg.png


+ 2 - 1
src/views/xiaoku-list/index.tsx

@@ -191,7 +191,8 @@ export default defineComponent({
     };
 
     const iframeHandle = (ev: MessageEvent) => {
-      if (ev.data?.api === 'onAttendToggleMenu') {
+      console.log(ev.data)
+      if (ev.data?.api === 'back') {
         exitFullscreen();
         state.previewModal = !state.previewModal;
       }

+ 7 - 0
src/views/xiaoku-list/search-group-resources.tsx

@@ -160,6 +160,13 @@ export default defineComponent({
       }
     );
 
+    watch(() => props.type, () => {
+      if(!props.musicalInstrumentId) {
+        formatFirstSubject();
+        onSearch()
+      }
+    })
+
     // 是否显示声部
     const isShowInstrument = computed(() => {
       if (props.type) {