同步小程序与管理端更新，完善抽烟记录和解绑冷静期

weapp/pages/punch/punch.js

@@ -1,7 +1,8 @@
+const { withDataCache } = require('../../utils/page-cache');
 const { getLayout } = require('../../utils/layout');
 // pages/punch/punch.js - 情侣打卡
 const { api, getImageUrl } = require('../../utils/request');
-Page({
+Page(withDataCache({
   onResize: function() { this.setData(getLayout()); },
   data: { loadError: false,
     checkins: [],
@@ -20,7 +21,11 @@ Page({
   },
   onShow: function() { this.loadCoupleInfo(); this.loadData(); },
 
+  onSmokingUpdated: function() { this.loadData(); },
+
   onPullDownRefresh: async function() {
+    const smoking = this.selectComponent && this.selectComponent("#smoking");
+    if (smoking) await smoking.load(true);
     await this.loadCoupleInfo();
     await this.loadData();
     wx.stopPullDownRefresh();
@@ -29,7 +34,7 @@ Page({
   // 从接口加载情侣头像和名称
   loadCoupleInfo: function() {
     var self = this;
-    api.coupleInfo().then(function(info) {
+    return api.coupleInfo().then(function(info) {
       self._applyCoupleInfo(info);
     }).catch(function(e) { console.error(e); });
   },
@@ -52,7 +57,7 @@ Page({
   loadData: async function() {
     if (this._pageLoading) return;
     this._pageLoading = true;
-    this.setData({loading:true, loadError:false});
+    this.setData({loading: !this._hasCachedData, loadError:false});
     try {
       const [res, stats] = await Promise.all([
         api.checkinList(),
@@ -112,6 +117,6 @@ Page({
   },
 
   goBack: function() { wx.navigateBack(); },
-  goHome: function() { wx.redirectTo({ url: '/pages/index/index' }); },
-  goProfile: function() { wx.redirectTo({ url: '/pages/profile/profile' }); }
-});
+  goHome: function() { wx.switchTab({ url: '/pages/index/index' }); },
+  goProfile: function() { wx.switchTab({ url: '/pages/profile/profile' }); }
+}, {"loadData": ["checkinList", "checkinStats", "coupleInfo"]}));

weapp/pages/punch/punch.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": true,
   "usingComponents": {
     "app-nav": "/components/app-nav/app-nav",
-    "page-state": "/components/page-state/page-state"
+    "page-state": "/components/page-state/page-state",
+    "smoking-card": "/components/smoking-card/smoking-card"
   }
 }

weapp/pages/punch/punch.wxml

@@ -25,6 +25,8 @@
       </view>
     </view>
 
+    <smoking-card id="smoking" bind:updated="onSmokingUpdated" />
+
     <!-- 打卡列表 -->
     <view class="checkin-cards" wx:if="{{!loading && !loadError && checkins.length > 0}}">
       <view class="checkin-card" wx:for="{{checkins}}" wx:key="id" bindtap="openDetail" data-index="{{index}}" bindlongpress="deleteCheckin" data-id="{{item.id}}">

weapp/pages/punch/punch.wxss

@@ -2,10 +2,14 @@
 @import '../../styles/design.wxss';
 @import '../../styles/journal.wxss';
 @import '../../styles/companion.wxss';
-.punch-banner-card { background:#F1EBE2; border:1rpx solid #E9DDD0; padding:28rpx; border-radius:16rpx; margin-bottom:32rpx; }
+.punch-banner-card { background:#FFF7FA; border:1rpx solid #F1DCE4; padding:28rpx; border-radius:16rpx; margin-bottom:32rpx; }
 .promise-summary-head { display:flex; justify-content:space-between; align-items:center; gap:16rpx; margin-bottom:24rpx; }
-.promise-avatars { display:flex; padding-right:8rpx; }.banner-avatar-circle { width:44rpx; height:44rpx; border-radius:50%; overflow:hidden; border:3rpx solid #F1EBE2; background:#F4E2E3; color:#943C58; font-size:20rpx; display:flex; align-items:center; justify-content:center; }.banner-avatar-circle + .banner-avatar-circle { margin-left:-8rpx; }.banner-avatar-circle image { width:100%; height:100%; }
-.banner-stat-grid { display:flex; gap:10rpx; }.banner-stat-card { flex:1; display:flex; flex-direction:column; align-items:flex-start; border-right:1rpx solid #DFD2C3; padding-left:20rpx; }.banner-stat-card:first-child { padding-left:0; }.banner-stat-card:last-child { border:0; }
+.promise-avatars { display:flex; padding-right:8rpx; }.banner-avatar-circle { width:44rpx; height:44rpx; border-radius:50%; overflow:hidden; border:3rpx solid #FFF7FA; background:#F4E2E3; color:#943C58; font-size:20rpx; display:flex; align-items:center; justify-content:center; }.banner-avatar-circle + .banner-avatar-circle { margin-left:-8rpx; }.banner-avatar-circle image { width:100%; height:100%; }
+.banner-stat-grid { display:flex; gap:10rpx; }.banner-stat-card { flex:1; display:flex; flex-direction:column; align-items:flex-start; border-right:1rpx solid #F1DCE4; padding-left:20rpx; }.banner-stat-card:first-child { padding-left:0; }.banner-stat-card:last-child { border:0; }
 .stat-num { font-size:44rpx; line-height:1.2; font-weight:500; color:#943C58; }.stat-label { color:#85776D; font-size:21rpx; line-height:1.5; margin-top:8rpx; }
 .checkin-cards { display:flex; flex-direction:column; gap:20rpx; }
 .checkin-card:active { opacity:.8; }
+
+@import '../../styles/button-theme.wxss';
+
+@import '../../styles/typography.wxss';