Merge branch 'xingmaLab20250820' of http://gitlab2.dui88.com/fh/20250528_FHQ1...

Merge branch 'xingmaLab20250820' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into xingmaLab20250820

api/xingmaLab.js

+import requestModule from './request.js';
+const {
+	api
+} = requestModule;
+
+/**
+ * 星妈会藏馆
+ * @returns
+ */
+export const fetchRecordList = () => api.get('/c/lab/record/list');
+
+/**
+ * 我的收藏
+ * @returns
+ */
+export const fetchFavoriteList = () => api.get('/c/lab/favorite/list');
+
+/**
+ * 我的藏品
+ * @returns
+ */
+export const fetchRecordMyrecords = () => api.get('/c/lab/record/myRecords');

pages/xingmaLab/xingmaLab.less

@@ -3,7 +3,7 @@
   min-height: 100vh;
   background-color: #fff;
   position: relative;
-  padding-bottom: 120rpx; // 为底部导航留出空间
+  padding-bottom: 200rpx; // 为底部导航留出空间
 
   // 第一层：顶部导航
   .top-navigation {
@@ -49,13 +49,14 @@
 
   // 第二层：内容区域
   .content-area {
+    height:100%;
     // flex: 1;
     // padding: 20rpx;
 
     // 藏馆内容 - 单列瀑布流
     .cangguang-content {
       position: relative;
-      background-color: #fff;
+      height:1624rpx;
       .banner_content{
         margin-top: 20rpx;
         margin-left: 22.5rpx;
@@ -225,11 +226,15 @@
       }
 
       .sub-tab-content {
-        .waterfall-list.two-column {
+        padding-left:12rpx;
+        .waterfall-list1 {
+          position: absolute;
           display: grid;
-          grid-template-columns: 1fr 1fr;
+          // flex-wrap: wrap;
+          // grid-template-columns: 1fr 1fr;
           gap: 12rpx;
-          padding: 0 12rpx;
+          // padding: 0 12rpx;
+          width:360rpx;
 
           .waterfall-item {
             background-color: #ffffff;
@@ -237,15 +242,19 @@
             overflow: hidden;
             box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
             position: relative;
+            width: 360rpx;
+            height: auto;
             transition: transform 0.3s ease, box-shadow 0.3s ease;
 
-            &:active {
-              transform: scale(0.98);
-              box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.15);
-            }
+            // &:active {
+            //   transform: scale(0.98);
+            //   box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.15);
+            // }
 
             .item-up-content{
               position: relative;
+              width: 100%;
+              height: auto;
               .item-image {
                 width: 100%;
                 height: auto;
@@ -254,15 +263,15 @@
   
               .item-num {
                 position: absolute;
-                background-color: #d3a358;
+                background-color: #fde0a5;
                 width: 212rpx;
                 height: 44rpx;
                 border-radius: 0rpx 12rpx 0rpx 0rpx;
-                top: 0;
+                bottom: 10rpx;
                 left: 0;
                 .badge-num {
                   position: absolute;
-                  color: #ffffff;
+                  color: #b27c1e;
                   font-size: 24rpx;
                   width: 100%;
                   text-align: center;
@@ -312,10 +321,123 @@
                 justify-content: space-between;
                 align-items: center;
 
-                .item-id {
-                  font-size: 22rpx;
-                  color: #999999;
+                .creator-info {
+                  display: flex;
+                  align-items: center;
+                  gap: 6rpx;
+
+                  .creator-name {
+                    font-size: 22rpx;
+                    color: #666666;
+                  }
+
+                  .star-icon {
+                    font-size: 18rpx;
+                    color: #ffd700;
+                  }
                 }
+              }
+            }
+
+
+
+          }
+        }
+
+
+        .waterfall-list2 {
+          display: grid;
+          // flex-wrap: wrap;
+          // grid-template-columns: 1fr 1fr;
+          gap: 12rpx;
+          // padding: 0 12rpx;
+          width:360rpx;
+          margin-left: 372rpx;
+
+          .waterfall-item {
+            background-color: #ffffff;
+            // border-radius: 16rpx;
+            overflow: hidden;
+            box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
+            position: relative;
+            width: 360rpx;
+            height: auto;
+            transition: transform 0.3s ease, box-shadow 0.3s ease;
+
+            // &:active {
+            //   transform: scale(0.98);
+            //   box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.15);
+            // }
+
+            .item-up-content{
+              position: relative;
+              width: 100%;
+              height: auto;
+              .item-image {
+                width: 100%;
+                height: auto;
+                background-color: #f0f0f0;
+              }
+  
+              .item-num {
+                position: absolute;
+                background-color: #fde0a5;
+                width: 212rpx;
+                height: 44rpx;
+                border-radius: 0rpx 12rpx 0rpx 0rpx;
+                bottom: 10rpx;
+                left: 0;
+                .badge-num {
+                  position: absolute;
+                  color: #b27c1e;
+                  font-size: 24rpx;
+                  width: 100%;
+                  text-align: center;
+                  top: 50%;
+                  transform: translateY(-50%);
+                  line-height: 1;
+                }
+              }
+              .item-badge {
+                position: absolute;
+                background-color: #d3a358;
+                width: 114rpx;
+                height: 48rpx;
+                border-radius: 12rpx 0rpx;
+                top: 0;
+                left: 0;
+  
+                .badge-text {
+                  position: absolute;
+                  color: #ffffff;
+                  font-size: 24rpx;
+                  left: 10rpx;
+                  top: 8rpx;
+                }
+              }
+            }
+
+            
+
+            .item-info {
+              padding: 16rpx;
+
+              .item-title {
+                font-size: 28rpx;
+                font-weight: bold;
+                color: #333333;
+                line-height: 1.4;
+                margin-bottom: 12rpx;
+                display: -webkit-box;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                overflow: hidden;
+              }
+
+              .item-meta {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
 
                 .creator-info {
                   display: flex;
@@ -334,6 +456,9 @@
                 }
               }
             }
+
+
+
           }
         }
       }