fix

src/views/accompany/music-list.tsx

@@ -58,18 +58,7 @@ export default defineComponent({
           state.platformApi + '/musicSheetCategories/queryTree?enable=true'
         )
         if (Array.isArray(res?.data)) {
-          data.musicTree = res.data.map((n: any, index: number) => {
-            return {
-              ...n,
-              id: n.id,
-              icon: n.coverImg,
-              btnIcon: getImage('b2.svg'),
-              color: '#9881FF',
-              title: n.name,
-              subtitle: '',
-              btnText: 'GO >'
-            }
-          })
+          data.musicTree = res.data
         }
         getList()
       } catch (error) {
@@ -85,7 +74,6 @@ export default defineComponent({
     }
     const option1 = computed(() => {
       const v1: any = data.musicTree.find((n: any) => n.id == route.query.categorieid)
-      //   console.log('🚀 ~ v1', v1)
       if (Array.isArray(v1?.musicSheetCategoriesList)) {
         const list = v1.musicSheetCategoriesList.map((m: any) => {
           if (!data.value1) {
@@ -102,8 +90,7 @@ export default defineComponent({
       return []
     })
     const option2 = computed(() => {
-      const v1: any = props.musicTree.find((n: any) => n.id == route.query.categorieid)
-      //   console.log('🚀 ~ v1', v1)
+      const v1: any = data.musicTree.find((n: any) => n.id == route.query.categorieid)
       if (Array.isArray(v1?.musicSheetCategoriesList)) {
         const v2: any = v1.musicSheetCategoriesList.find((n: any) => n.id == data.value1)
         if (Array.isArray(v2?.musicSheetCategoriesList)) {
@@ -131,7 +118,7 @@ export default defineComponent({
             keyword: data.keyword,
             musicSheetCategoriesId: data.value2 || data.value1
           },
-          hideLoading: false
+          hideLoading: true
         })
         if (Array.isArray(res?.data?.rows)) {
           data.list = [].concat(data.list, res.data.rows)
@@ -146,22 +133,11 @@ export default defineComponent({
       data.loading = false
       data.refreshing = false
     }
-    const onRefresh = () => {
-      console.log('下拉刷新')
-      // 清空列表数据
-      data.pagenation.page = 1
-      data.finished = false
-      data.loading = false
-      data.list = []
-      // 重新加载数据
-      getList()
-    }
     // 重置搜索
     const onSearch = () => {
       data.pagenation.page = 1
       data.list = []
       data.finished = false
-      data.loading = false
       data.list = []
       getList()
     }
@@ -170,29 +146,29 @@ export default defineComponent({
       // 学生端验证
       if (state.platformType == 'STUDENT') {
         //学生有待激活会员
-      if (!userInfo.value.membershipDays && userInfo.value.purchaseMemberRecord) {
-        showConfirmDialog({
-          message: '您的团练宝暂未激活，请激活后使用'
-        }).then(() => {
-          router.push({
-            path: '/memberCenter'
+        if (!userInfo.value.membershipDays && userInfo.value.purchaseMemberRecord) {
+          showConfirmDialog({
+            message: '您的团练宝暂未激活，请激活后使用'
+          }).then(() => {
+            router.push({
+              path: '/memberCenter'
+            })
           })
-        })
-        return
-      }
-      //学生没有会员
-      if (!userInfo.value.vipMember) {
-        showConfirmDialog({
-          message: '您暂未开通团练宝，请开通后使用'
-        }).then(() => {
-          router.push({
-            path: '/memberCenter'
+          return
+        }
+        //学生没有会员
+        if (!userInfo.value.vipMember) {
+          showConfirmDialog({
+            message: '您暂未开通团练宝，请开通后使用'
+          }).then(() => {
+            router.push({
+              path: '/memberCenter'
+            })
           })
-        })
-        return
-      }
+          return
+        }
       }
-      
+
       let src = `${location.origin}/orchestra-music-score/?id=${item.id}`
       console.log('🚀 ~ 去云教练的src', src)
       postMessage({
@@ -268,41 +244,39 @@ export default defineComponent({
         </OSticky>
         <OFullRefresh
           v-model:modelValue={data.refreshing}
-          onRefresh={onRefresh}
+          onRefresh={onSearch}
           style="min-height: calc(100vh - var(--header-height))"
         >
-          {!!data.list.length && (
-            <List
-              loading-text=" "
-              immediateCheck={false}
-              loading={data.loading}
-              v-model:finished={data.finished}
-              finishedText="没有更多了"
-              onLoad={() => {
-                getList()
-              }}
-            >
-              <CellGroup inset>
-                {data.list.map((item: any) => {
-                  return (
-                    <Cell
-                      size="large"
-                      center
-                      title={item.musicSheetName}
-                      isLink
-                      onClick={() => openView(item)}
-                    >
-                      {{
-                        icon: () => (
-                          <Icon style={{ marginRight: '12px' }} size={40} name={imgDefault} />
-                        )
-                      }}
-                    </Cell>
-                  )
-                })}
-              </CellGroup>
-            </List>
-          )}
+          <List
+            loading-text=" "
+            immediateCheck={false}
+            loading={data.loading}
+            v-model:finished={data.finished}
+            finishedText="没有更多了"
+            onLoad={() => {
+              getList()
+            }}
+          >
+            <CellGroup inset>
+              {data.list.map((item: any) => {
+                return (
+                  <Cell
+                    size="large"
+                    center
+                    title={item.musicSheetName}
+                    isLink
+                    onClick={() => openView(item)}
+                  >
+                    {{
+                      icon: () => (
+                        <Icon style={{ marginRight: '12px' }} size={40} name={imgDefault} />
+                      )
+                    }}
+                  </Cell>
+                )
+              })}
+            </CellGroup>
+          </List>
           {!data.loading && !data.list.length && <OEmpty tips="暂无曲谱" />}
         </OFullRefresh>
       </div>