feat: ui update

miniprogram/pages/closet-share/closet-share.ts

@@ -2,8 +2,9 @@ import { request, redirectToLogin } from '../../utils/request'
 import * as auth from '../../utils/auth'
 import { PagedResult, ClosetShareItem, OutfitShareItem } from '../../types/models'
 import { ShareStatus, ShareType } from '../../utils/config'
-import { normalizePaged, mergePaged, hasMorePaged } from '../../utils/paged'
+import { normalizePaged } from '../../utils/paged'
 import { setTabBarSelected } from '../../utils/tabbar'
+import { navScroll } from '../../utils/nav'
 import { logger } from '../../utils/logger'
 
 // 日志模块名
@@ -37,8 +38,13 @@ Page({
     page: 1,
     pageSize: 20,
     hasMore: true,
+    // 滚动收缩：由 utils/nav.ts 的共享 handler 驱动
+    navScrolled: false,
   },
 
+  // scroll-view 滚动 → 导航收缩为玻璃小标题
+  onNavScroll: navScroll,
+
   onShow() {
     this.syncTabBar()
     // 未登录直接回登录页（幂等跳转），不再发出必然 401 的请求
@@ -82,30 +88,36 @@ Page({
     return this.fetchMine(page)
   },
 
-  // 我的分享：仅衣柜分享
+  // 我的分享：衣柜分享 + 穿搭分享并行拉取后按时间倒序合并
   fetchMine(page: number) {
     // 请求序号：切 tab 时旧响应可能后到，序号不匹配直接丢弃
     const seq = ((this as any).reqSeq || 0) + 1
     ;(this as any).reqSeq = seq
     if (page > 1) this.setData({ loadingMore: true })
 
-    request<PagedResult<ClosetShareItem>>({
-      url: '/closet-share',
-      data: { page, page_size: this.data.pageSize },
-    })
-      .then((res) => {
+    Promise.all([
+      request<PagedResult<ClosetShareItem>>({
+        url: '/closet-share',
+        data: { page, page_size: this.data.pageSize },
+      }),
+      request<PagedResult<OutfitShareItem>>({
+        url: '/outfit-share',
+        data: { page, page_size: this.data.pageSize },
+      }),
+    ])
+      .then(([closetRes, outfitRes]) => {
         if ((this as any).reqSeq !== seq) return
-        const { list: raw, total } = normalizePaged<ClosetShareItem>(res)
-        logger.debug(LOG, '我的分享加载成功, page=', page, '条数=', raw && raw.length)
-        const list = raw.map((it) => this.decorateCloset(it))
-        const merged = mergePaged(this.data.list, list, page === 1)
-        this.setData({
-          list: merged,
-          hasMore: hasMorePaged(merged, total, this.data.pageSize),
-          loading: false,
-          loadingMore: false,
-          page,
-        })
+        const closetList = normalizePaged<ClosetShareItem>(closetRes).list.map((it) => this.decorateCloset(it))
+        const outfitList = normalizePaged<OutfitShareItem>(outfitRes).list.map((it) => this.decorateOutfit(it))
+        logger.debug(LOG, '我的分享加载成功, page=', page, '衣柜=', closetList.length, '穿搭=', outfitList.length)
+        const prev = page === 1 ? [] : this.data.list
+        const merged = prev
+          .concat(closetList, outfitList)
+          .sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
+        // 任一侧仍返回满页则认为还有更多
+        const hasMore =
+          closetList.length >= this.data.pageSize || outfitList.length >= this.data.pageSize
+        this.setData({ list: merged, hasMore, loading: false, loadingMore: false, page })
       })
       .catch((e: any) => {
         if ((this as any).reqSeq !== seq) return