黄琪勇 há 1 ano atrás
pai
commit
d294dc14e2

+ 10 - 3
src/components/col-header/index.module.less

@@ -2,12 +2,19 @@
   --van-font-weight-bold: 600;
 
   :global {
-
+    .van-nav-bar__left{
+      padding: 0 13px;
+    }
     .van-nav-bar__title,
     .van-icon {
       color: inherit;
     }
-
+    .van-nav-bar__title{
+      font-size: 18px;
+    }
+    .van-icon{
+      font-size: 24px;
+    }
     .van-nav-bar__right {
       &>div {
         line-height: 0;
@@ -27,4 +34,4 @@
   // :global(.van-nav-bar--fixed) {
   //   box-shadow: 10px 10px 10px var(--box-shadow-color);
   // }
-}
+}

+ 2 - 2
src/tenant/music/component/song/index.module.less

@@ -115,7 +115,7 @@
     }
 
     .title {
-      max-width: 165px;
+      max-width: 220px;
       font-size: 16px;
       font-weight: bold;
       color: #1a1a1a;
@@ -271,4 +271,4 @@
   height: 15px;
   margin-right: 5px;
   flex-shrink: 0;
-}
+}

BIN
src/tenant/music/courseList/image/bg.png


+ 2 - 2
src/tenant/music/courseList/index.module.less

@@ -182,7 +182,7 @@
 
 .courseDialog {
   width: 305px;
-
+  box-sizing: border-box;
   :global {
     .van-dialog__header {
       // padding-top: 0;
@@ -300,7 +300,7 @@
   border-color: #dbdbdb;
 }
 .btnRight {
-  background: linear-gradient(270deg, #ff204b 0%, #fe5b71 100%);
+  background: #FE2451;
 }
 .finch {
   width: 150px;

BIN
src/tenant/music/train-tool/images/icon-timer.png


+ 3 - 3
src/tenant/music/train-tool/index.module.less

@@ -202,7 +202,7 @@
   }
 
   .alumTitle {
-    padding: 0 16px;
+    padding: 0 20px;
     padding-bottom: 8px;
     font-size: 16px;
     font-weight: 600;
@@ -261,11 +261,11 @@
   }
 
   .currentPrice {
-    padding: 4px 7px;
+    padding: 3px 7px;
     border-radius: 20px;
     background: #262626;
-
     margin-left: 6px;
+    display: inline-block;
 
     span {
       font-weight: 500;

+ 11 - 10
src/tenant/music/train-tool/index.tsx

@@ -117,7 +117,8 @@ export default defineComponent({
             apiSuffix.value +
             `/tenantGroupAlbum/buyAlbumInfo?tenantGroupAlbumId=${
               route.query.taId || ''
-            }&tenantAlbumId=${state.albumId || ''}`
+            }`
+          //&tenantAlbumId=${state.albumId || ''}
           // if (state.albumId) {
           //   url = url + '?albumId=' + state.albumId
           // }
@@ -125,12 +126,15 @@ export default defineComponent({
           state.albumList = data || []
           if (state.albumList.length > 0) {
             let index = 0
-            toolSubject?.tenantGroupAlbumId &&
-              (index = state.albumList.findIndex(item => {
-                return (
-                  item.tenantGroupAlbumId === toolSubject?.tenantGroupAlbumId
-                )
-              }))
+            // 以缓存为优先 其次 请求头 state.albumId
+            if (toolSubject?.tenantGroupAlbumId || state.albumId) {
+              index = state.albumList.findIndex(item => {
+                return toolSubject?.tenantGroupAlbumId
+                  ? item.tenantGroupAlbumId === toolSubject?.tenantGroupAlbumId
+                  : item.id == state.albumId // 这里不全等 因为state.albumId为字符串 id为number
+              })
+              index < 0 && (index = 0)
+            }
             state.initialSlide = index //默认展示第几个
             state.details = state.albumList[index] // 有缓存  就用缓存里面的数据
           } else {
@@ -184,9 +188,6 @@ export default defineComponent({
       }
     )
     const FetchList = async (hideLoading = false) => {
-      if (state.loading) {
-        return
-      }
       state.loading = true
       state.isError = false
       const tempParams = {