Browse Source

Merge branch 'iteration-20240926-tag' into jenkins-test

lex-xin 9 tháng trước cách đây
mục cha
commit
8bf68f4be2

+ 1 - 1
src/views/hot-music-more/index.module.less

@@ -14,7 +14,7 @@
     }
   }
 
-  .mSearch {
+  .mSearch11 {
     padding-top: 8px;
     :global {
       .van-search__content {

+ 16 - 5
src/views/hot-music-more/index.tsx

@@ -122,6 +122,7 @@ export default defineComponent({
       searchPopup: false,
       musicDetailPopup: false,
       showVip: false,
+      vipMember: baseState.user.data.vipMember,
       tabActive: '' as any,
       newTags: [] as any,
       isTagExpand: false,
@@ -317,8 +318,7 @@ export default defineComponent({
       showMusicImg: string,
       selectMusicInstrumentIndex: number
     ) => {
-      const vipMember = baseState.user.data.vipMember;
-      if (!vipMember && item?.paymentType === 'VIP') {
+      if (!state.vipMember && item?.paymentType === 'VIP') {
         state.showVip = true;
         return;
       }
@@ -347,6 +347,17 @@ export default defineComponent({
       });
     };
 
+    const getUserInfo = async () => {
+      const res = await request.get('/edu-app/user/getUserInfo', {
+        initRequest: true, // 初始化接口
+        requestType: 'form',
+        hideLoading: true
+      });
+      if (res?.code === 200) {
+        state.vipMember = res.data.vipMember;
+      }
+    };
+
     onMounted(async () => {
       if (route.query.type) {
         state.tabActive = route.query.type;
@@ -362,7 +373,7 @@ export default defineComponent({
       state.audioPlayTypeList = [{ name: '全部', id: '' }, ...tempAudio];
 
       state.loading = true;
-
+      getUserInfo()
       await getTags();
       await getMusicTagTree();
       getMusicList();
@@ -382,7 +393,7 @@ export default defineComponent({
                     onClick={() => {
                       if (browser().isApp) {
                         postMessage({
-                          api: 'goBack'
+                          api: 'back'
                         });
                       } else {
                         router.back();
@@ -441,7 +452,7 @@ export default defineComponent({
             v-model:modelValue={searchValue.value}
             background={'transparent'}
             inputBackground="transparent"
-            class={styles.mSearch}
+            class={styles.mSearch11}
             onSearch={(val: any) => {
               if (state.tabActive === 'RECOMMEND') {
                 state.recommendSearch.name = val;

+ 6 - 0
src/views/hot-music-more/music-detail/index.module.less

@@ -66,6 +66,12 @@
       font-size: 18px;
       color: #131415;
       line-height: 25px;
+
+      :global {
+        .van-notice-bar__wrap {
+          justify-content: center;
+        }
+      }
     }
 
     .staff {