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

weapp/pages/diary_detail/diary_detail.js

@@ -1,6 +1,7 @@
+const { withDataCache } = require('../../utils/page-cache');
 const { getLayout } = require('../../utils/layout');
 const { api, getImageUrl } = require('../../utils/request');
-Page({
+Page(withDataCache({
   noop: function() {},
   onResize: function() { this.setData(getLayout()); },
   data: { loadError: false,
@@ -28,10 +29,14 @@ Page({
     this.loadComments();
   },
 
+  onShow: function() {
+    if (this.data.diaryId) { this.loadDiary(); this.loadComments(); }
+  },
+
   loadDiary: async function() {
     if (this._pageLoading) return;
     this._pageLoading = true;
-    this.setData({loading:true, loadError:false});
+    this.setData({loading: !this._hasCachedData, loadError:false});
     try {
       var data = await api.diaryDetail(this.data.diaryId);
       data = this._formatDiary(data);
@@ -68,6 +73,7 @@ Page({
   },
 
   loadComments: async function() {
+    this.setData({ commentsError: false });
     try {
       var data = await api.diaryCommentList({ diary_id: this.data.diaryId });
       if (data && data.length > 0) {
@@ -82,7 +88,7 @@ Page({
         });
       }
       this.setData({ comments: data || [] });
-    } catch (e) { console.error(e); }
+    } catch (e) { this.setData({ commentsError: true }); console.error(e); }
   },
 
   onShareTap: function() {
@@ -226,5 +232,5 @@ Page({
   },
 
   goBack: function() { wx.navigateBack(); },
-  goHome: function() { wx.redirectTo({ url: '/pages/index/index' }); }
-});
+  goHome: function() { wx.switchTab({ url: '/pages/index/index' }); }
+}, {"loadDiary": ["diaryDetail"], "loadComments": ["diaryCommentList"]}));

weapp/pages/diary_detail/diary_detail.wxml

@@ -79,7 +79,7 @@
         <text class="modal-title">{{replyTo ? '回复 @' + replyTo.nickname : '发表评论'}}</text>
         <text class="modal-send" catchtap="submitComment">发送</text>
       </view>
-      <textarea class="modal-input" placeholder="说点什么..." value="{{commentText}}" bindinput="onCommentInput" auto-focus maxlength="500" />
+      <textarea placeholder-class="handwritten-placeholder" class="modal-input" placeholder="说点什么..." value="{{commentText}}" bindinput="onCommentInput" auto-focus maxlength="500" />
     </view>
   </view>
 

weapp/pages/diary_detail/diary_detail.wxss

@@ -15,3 +15,7 @@
 .modal-mask { position:fixed; top:0; left:0; right:0; bottom:0; z-index:1200; display:flex; align-items:flex-end; }.modal-box { width:100%; border-radius:24rpx 24rpx 0 0!important; padding:28rpx 32rpx calc(28rpx + env(safe-area-inset-bottom)); }.modal-top { display:flex; align-items:center; justify-content:space-between; gap:16rpx; margin-bottom:24rpx; }.modal-cancel,.modal-send { padding:12rpx 0; font-size:26rpx; color:#85776D; }.modal-send { color:#B74768; }.modal-title { font-size:28rpx; font-weight:500; color:#352E2A; }.modal-input { width:100%; height:200rpx; background:#FAF5EE; border:1rpx solid #E9DDD0; border-radius:16rpx; padding:20rpx; font-size:27rpx; box-sizing:border-box; }
 .preview-mask { position:fixed; top:0; left:0; right:0; bottom:0; z-index:9999; background:rgba(0,0,0,.95); }.preview-swiper { width:100%; height:100%; }.preview-slide { position:relative; }.preview-img { position:absolute; top:50%; left:50%; transform:translate(-50%,-50%); width:100%; display:block; }.preview-num { position:fixed; bottom:calc(44rpx + env(safe-area-inset-bottom)); left:0; right:0; text-align:center; color:#FFFDF8; font-size:25rpx; }.preview-close { position:fixed; top:var(--nav-height,64px); right:24rpx; width:72rpx; height:72rpx; display:flex; align-items:center; justify-content:center; }.preview-close-icon { width:34rpx; height:34rpx; filter:brightness(0) invert(1); }
 @media (max-width:350px) { .read-page { padding-left:32rpx; padding-right:32rpx; }.bottom-bar { padding-left:32rpx; padding-right:32rpx; } }
+
+@import '../../styles/button-theme.wxss';
+
+@import '../../styles/typography.wxss';