Add server and mini-program pagination for shared lists

weapp/pages/punch/punch.js

@@ -1,8 +1,9 @@
+const { itemsOf, startList, applyList, failList, finishList, withListPagination } = require('../../utils/list-pagination');
 const { withDataCache } = require('../../utils/page-cache');
 const { getLayout } = require('../../utils/layout');
 // pages/punch/punch.js - 情侣打卡
 const { api, getImageUrl } = require('../../utils/request');
-Page(withDataCache({
+Page(withDataCache(withListPagination({
   onResize: function() { this.setData(getLayout()); },
   data: { loadError: false,
     checkins: [],
@@ -54,16 +55,15 @@ Page(withDataCache({
     });
   },
 
-  loadData: async function() {
-    if (this._pageLoading) return;
-    this._pageLoading = true;
-    this.setData({loading: !this._hasCachedData, loadError:false});
+  loadData: async function(page) {
+    const ticket = startList(this, page);
+    if (!ticket) return;
     try {
       const [res, stats] = await Promise.all([
-        api.checkinList(),
+        api.checkinList({page:ticket.page,page_size:20}),
         api.checkinStats().catch(() => ({}))
       ]);
-      const list = (res.items || res || []).map(function(item) {
+      const list = itemsOf(res).map(function(item) {
         item.type = item.type || 'both';
         var typeLabels = { both: '双方', first: '第一视角', her: '她打卡' };
         item.type_label = typeLabels[item.type] || '双方';
@@ -89,10 +89,11 @@ Page(withDataCache({
         todayPartner: stats.today_partner_count || 0,
         loading: false
       };
-      this.setData(data);
+      delete data.checkins;
+      applyList(this, ticket, res, list, 'checkins', data);
     } catch(e) {
-      this.setData({loadError:true}); console.error(e); this.setData({ loading: false }); }
-    finally { this._pageLoading = false; this.setData({loading:false}); }
+      failList(this,ticket); console.error(e); this.setData({ loading: false }); }
+    finally { finishList(this,ticket); }
   },
 
   // ===== 点击卡片 → 详情弹窗 =====
@@ -119,4 +120,4 @@ Page(withDataCache({
   goBack: function() { wx.navigateBack(); },
   goHome: function() { wx.switchTab({ url: '/pages/index/index' }); },
   goProfile: function() { wx.switchTab({ url: '/pages/profile/profile' }); }
-}, {"loadData": ["checkinList", "checkinStats", "coupleInfo"]}));
+}, 'loadData'), {"loadData": ["checkinList", "checkinStats", "coupleInfo"]}));

weapp/pages/punch/punch.wxml

@@ -3,7 +3,7 @@
 <!-- pages/punch/punch.wxml - 情侣打卡 -->
 <app-nav title="打卡" back="{{true}}" />
 
-<scroll-view class="page-bg" scroll-y show-scrollbar="{{false}}" bounces="{{true}}">
+<scroll-view class="page-bg" scroll-y bindscrolltolower="loadMore" lower-threshold="120" show-scrollbar="{{false}}" bounces="{{true}}">
   <view class="c-body"><view class="c-heading j-row"><view><text class="j-eyebrow">LITTLE PROMISES</text><text class="j-page-title">把约定变成习惯</text></view><button class="j-button j-button-small" bindtap="showAddModal">＋ 添加</button></view>
 <page-state wx:if="{{loading}}" kind="loading" title="正在加载" /><page-state wx:elif="{{loadError}}" kind="error" title="加载失败" description="请检查网络后重新加载" action="重试" bind:action="loadData" />
     <!-- 顶部 Banner - 卡片式 -->
@@ -83,6 +83,7 @@
     <page-state wx:if="{{!loading && !loadError && !checkins.length}}" title="从一个小约定开始" description="一起运动、按时吃饭，也可以成为日常仪式" action="添加打卡" bind:action="showAddModal" />
   </view>
   
+<view class="j-pagination" wx:if="{{!loading && !loadError && total > 0}}"><text wx:if="{{loadingMore}}">正在加载…</text><text wx:elif="{{moreError}}" bindtap="loadMore">加载失败，点击重试</text><text wx:elif="{{hasMore}}" bindtap="loadMore">加载更多</text><text wx:else>已加载全部</text></view>
 </scroll-view>
 
 <!-- 浮动按钮 -->