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

weapp/pages/album/album.js

@@ -1,11 +1,16 @@
+const { currentUserLocation } = require('../../utils/user-location');
+const { photoForm, metadataRows } = require('../../utils/photo-metadata');
+const { withDataCache } = require('../../utils/page-cache');
 const { getLayout } = require('../../utils/layout');
 // pages/album/album.js - 日记式分组相册
 const { api, getImageUrl, API_BASE, uploadFileCompat } = require('../../utils/request');
 const { requestSubscribeAfterAction } = require('../../utils/subscribe');
-Page({
+Page(withDataCache({
   onResize: function() { this.setData(getLayout()); },
   data: { loading: true, loadError: false,
     batches: [],
+    showPhotoEditor: false, editPhotos: [], editPhotoIdx: 0, editBatchId: '',
+    editForm: { taken_at: '', location: '', activity: '' }, savingPhoto: false, currentAddress: '',
     albumId: null,
     showUploadModal: false,
     uploadFilePaths: [],
@@ -27,6 +32,67 @@ Page({
   onShow: function() { this._visible = true; this.loadData(); },
   onHide: function() { this._visible = false; },
 
+  openPhotoEditor: function(e) {
+    const batch = this.data.batches[Number(e.currentTarget.dataset.batch)];
+    if (!batch || !batch.photos.length) return;
+    this.setData({ showPhotoEditor: true, editBatchId: batch.batch_id, editPhotos: batch.photos, editPhotoIdx: 0, editForm: photoForm(batch.photos[0]) });
+    this._loadCurrentAddress();
+  },
+  _loadCurrentAddress: function() {
+    return currentUserLocation().then(location => { this.setData({ currentAddress: location.location }); return location; });
+  },
+  onEditPhotoInput: function(e) {
+    const field = e.currentTarget.dataset.field;
+    if (['taken_at', 'location', 'activity'].indexOf(field) < 0 || this.data.savingPhoto) return;
+    this.setData({ editForm: { ...this.data.editForm, [field]: e.detail.value } });
+  },
+  clearPhotoDate: function() {
+    if (!this.data.savingPhoto) this.setData({ editForm: { ...this.data.editForm, taken_at: '' } });
+  },
+  _confirmPhotoDiscard: function(next) {
+    if (this.data.savingPhoto) return;
+    const original = photoForm(this.data.editPhotos[this.data.editPhotoIdx] || {});
+    if (JSON.stringify(original) === JSON.stringify(this.data.editForm)) { next(); return; }
+    wx.showModal({ title: '放弃本次修改？', content: '当前照片的信息还没有保存。', confirmText: '放弃修改', success: res => { if (res.confirm && !this.data.savingPhoto) next(); } });
+  },
+  selectEditPhoto: function(e) {
+    const index = Number(e.currentTarget.dataset.index);
+    if (index === this.data.editPhotoIdx || !this.data.editPhotos[index]) return;
+    this._confirmPhotoDiscard(() => this.setData({ editPhotoIdx: index, editForm: photoForm(this.data.editPhotos[index]) }));
+  },
+  closePhotoEditor: function() {
+    this._confirmPhotoDiscard(() => this.setData({ showPhotoEditor: false }));
+  },
+  toggleMetadata: function(e) {
+    const index = Number(e.currentTarget.dataset.batch);
+    if (!this.data.batches[index]) return;
+    this.setData({ ['batches[' + index + '].metadataExpanded']: !this.data.batches[index].metadataExpanded });
+  },
+  preventEditorMove: function() {},
+  savePhotoInfo: async function() {
+    if (this.data.savingPhoto) return;
+    const photo = this.data.editPhotos[this.data.editPhotoIdx];
+    if (!photo || !photo.id) return;
+    const form = { taken_at: this.data.editForm.taken_at, location: this.data.editForm.location.trim(), activity: this.data.editForm.activity.trim() };
+    this.setData({ savingPhoto: true });
+    try {
+      if (!form.location) Object.assign(form, await currentUserLocation());
+      const result = await api.photoUpdate({ id: photo.id, lat: 0, lng: 0, ...form });
+      if (result && result.success && result.location !== undefined) form.location = result.location;
+      if (!result || !result.success) throw result || { error: '保存失败' };
+      // 就地更新卡片和预览，不重载列表，不改变滚动位置。
+      const batches = this.data.batches.map(batch => {
+        const photos = batch.photos.map(item => String(item.id) === String(photo.id) ? { ...item, ...form } : item);
+        return { ...batch, photos, metadata: metadataRows(photos) };
+      });
+      const previewImages = this.data.previewImages.map(item => String(item.id) === String(photo.id) ? { ...item, ...form } : item);
+      this.setData({ batches, previewImages, showPhotoEditor: false });
+      wx.showToast({ title: '照片信息已保存', icon: 'success' });
+    } catch (error) {
+      wx.showToast({ title: (error && (error.error || error.message)) || '保存失败，请重试', icon: 'none' });
+    } finally { this.setData({ savingPhoto: false }); }
+  },
+
   // 左滑返回相册列表
   touchStartX: 0, touchStartY: 0,
   onTouchStart: function(e) {
@@ -66,7 +132,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 {
       var self = this;
       var albumId = this.data.albumId;
@@ -78,8 +144,8 @@ Page({
         }
       }
       if (albumId) {
-        // 使用 noCache 禁用缓存，确保获取最新数据
-        var photos = await api.photos(albumId, null, 'GET', true);
+        // 共享内存缓存；写操作成功后自动失效。
+        var photos = await api.photos(albumId);
         // 根据 batch_id 分组
         var batchMap = {};
         var myUid = wx.getStorageSync('userId');
@@ -115,6 +181,7 @@ Page({
         // 按时间排序（最新的在最前）
         var batches = Object.values(batchMap);
         batches.sort(function(a, b) { return b.created_at > a.created_at ? 1 : -1; });
+        batches.forEach(function(batch) { batch.metadata = metadataRows(batch.photos); });
         this.setData({ batches: batches });
       } else { this.setData({batches:[]}); }
     } catch (e) {
@@ -142,6 +209,7 @@ Page({
           wx.showToast({ title: '请选择照片', icon: 'none' });
           return;
         }
+        self._loadCurrentAddress();
         var formList = paths.map(function() { return { taken_at: '', location: '', activity: '' }; });
         self.setData({
           showUploadModal: true,
@@ -152,6 +220,8 @@ Page({
         });
       },
       fail: function(err) {
+        // 微信选图器关闭时也会触发 fail，主动取消无需提示错误。
+        if (/cancel/i.test(String(err && err.errMsg || ''))) return;
         console.error('Choose image failed:', err);
         wx.showToast({ title: '选择照片失败', icon: 'none' });
       }
@@ -263,17 +333,7 @@ Page({
 
       // 自动定位：为未填写位置的照片自动获取地理位置（发布后自动显示）
       var autoLoc = null;
-      var needLoc = formList.some(function(x) { return !(x.location && x.location.trim()); });
-      if (needLoc) {
-        try {
-          autoLoc = await new Promise(function(resolve) {
-            wx.getFuzzyLocation({
-              success: function(res) { resolve({ lat: res.latitude, lng: res.longitude }); },
-              fail: function() { resolve(null); }
-            });
-          });
-        } catch (e) { autoLoc = null; }
-      }
+      if (formList.some(function(x) { return !String(x.location || '').trim(); })) autoLoc = await currentUserLocation();
 
       for (var i = 0; i < paths.length; i++) {
         wx.showLoading({ title: '上传中 ' + (i + 1) + '/' + paths.length, mask: true });
@@ -293,7 +353,7 @@ Page({
               album_id: String(albumId),
               path: uploadedPath,
               taken_at: f.taken_at || '',
-              location: f.location || '',
+              location: String(f.location || '').trim() || (autoLoc ? autoLoc.location : ''),
               activity: f.activity || '',
               batch_id: batchId,
               // 未手动填写位置时，自动定位并记录经纬度（发布后自动显示地址）
@@ -426,11 +486,7 @@ Page({
     if (!batch || !batch.photos || !batch.photos[imgIdx]) return;
     var allImages = [];
     batch.photos.forEach(function(p) {
-      // 经纬度为0（定位失败）时不显示位置信息
-      var hasCoord = p.lat && p.lng && parseFloat(p.lat) !== 0 && parseFloat(p.lng) !== 0;
-      var loc = p.location;
-      if (!hasCoord) loc = '';
-      allImages.push({ url: p.url, taken_at: p.taken_at, location: loc, activity: p.activity });
+      allImages.push({ id: p.id, url: p.url, taken_at: p.taken_at, location: p.location || '', activity: p.activity });
     });
     this.setData({ showPreview: true, previewImages: allImages, previewIndex: imgIdx });
   },
@@ -464,6 +520,6 @@ Page({
   },
 
   goToAlbums: 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": ["photos", "albumList"]}));

weapp/pages/album/album.wxml

@@ -18,13 +18,38 @@
           <view class="moments-name-row">
             <text class="moments-name">{{item.creator_name || '情侣'}}</text>
             <text class="moments-count">{{item.photos.length}}张</text>
-            <text class="moments-time">{{item.created_time}}</text>
+            <view class="moments-more" data-batch="{{index}}" catchtap="openPhotoEditor" hover-class="moments-more-pressed" aria-role="button" aria-label="编辑照片信息"><text>•••</text></view>
           </view>
+          <text class="moments-time moments-upload-time">上传于 {{item.created_time}}</text>
           <view class="moments-images">
             <view class="album-img-wrap" wx:for="{{item.photos}}" wx:key="id" wx:for-index="imgIdx" data-batch="{{index}}" data-index="{{imgIdx}}" bindtap="onPhotoTap" bindlongpress="onPhotoLongPress">
               <image src="{{item.url}}" mode="aspectFill" class="album-img" />
             </view>
           </view>
+          <view class="moments-metadata {{item.metadataExpanded ? 'is-expanded' : ''}}" wx:if="{{item.metadata.length}}">
+            <block wx:for="{{item.metadata}}" wx:for-item="note" wx:for-index="noteIndex" wx:key="id">
+              <view class="moment-note" wx:if="{{item.metadataExpanded || noteIndex === 0}}">
+                <block wx:if="{{item.metadataExpanded}}">
+                  <text class="moment-photo-label" wx:if="{{note.label}}">{{note.label}}</text>
+                  <view class="moment-meta-row" wx:if="{{note.taken_at}}"><text class="moment-meta-label">拍摄</text><text class="moment-meta-value">{{note.taken_at}}</text></view>
+                  <view class="moment-meta-row" wx:if="{{note.location}}"><text class="moment-meta-label">地点</text><text class="moment-meta-value">{{note.location}}</text></view>
+                  <view class="moment-meta-row" wx:if="{{note.activity}}"><text class="moment-meta-label">故事</text><text class="moment-meta-value moment-story">{{note.activity}}</text></view>
+                </block>
+                <block wx:else>
+                  <view class="moment-summary-line" wx:if="{{note.label || note.taken_at || note.location}}">
+                    <text class="moment-summary-badge" wx:if="{{note.label}}">{{note.label}}</text>
+                    <text class="moment-summary-date" wx:if="{{note.taken_at}}">{{note.taken_at}}</text>
+                    <text class="moment-summary-location" wx:if="{{note.location}}">{{note.location}}</text>
+                  </view>
+                  <text class="moment-summary-story" wx:if="{{note.activity}}">{{note.activity}}</text>
+                </block>
+              </view>
+            </block>
+            <view class="moment-metadata-toggle" data-batch="{{index}}" catchtap="toggleMetadata" aria-role="button" aria-label="{{item.metadataExpanded ? '收起照片信息' : '展开照片信息'}}">
+              <text>{{item.metadataExpanded ? '收起详情' : (item.metadata.length > 1 ? '还有 ' + (item.metadata.length - 1) + ' 张照片信息 · 展开' : '展开详情')}}</text><text>{{item.metadataExpanded ? '⌃' : '⌄'}}</text>
+            </view>
+          </view>
+          <view class="moment-add-note" wx:else data-batch="{{index}}" catchtap="openPhotoEditor">＋ 补充拍摄时间、地点和故事</view>
         </view>
       </view>
     </view>
@@ -117,11 +142,11 @@
       </view>
       <view class="input-group">
         <label>地点</label>
-        <input class="input" placeholder="例如：北京颐和园" value="{{uploadForm.location}}" bindinput="onUploadInput" data-field="location" />
+        <input placeholder-class="handwritten-placeholder" class="input" placeholder="{{currentAddress || '留空自动使用当前地址'}}" value="{{uploadForm.location}}" bindinput="onUploadInput" data-field="location" />
       </view>
       <view class="input-group">
         <label>在做什么</label>
-        <input class="input" placeholder="例如：第一次一起看日落" value="{{uploadForm.activity}}" bindinput="onUploadInput" data-field="activity" />
+        <input placeholder-class="handwritten-placeholder" class="input" placeholder="例如：第一次一起看日落" value="{{uploadForm.activity}}" bindinput="onUploadInput" data-field="activity" />
       </view>
     </view>
 
@@ -137,4 +162,23 @@
   </view>
 </view>
 
+<!-- 照片信息编辑面板 -->
+<view class="photo-editor-mask" wx:if="{{showPhotoEditor}}" catchtouchmove="preventEditorMove">
+  <view class="photo-editor-backdrop" catchtap="closePhotoEditor" />
+  <view class="photo-editor-sheet">
+    <view class="photo-editor-grip" />
+    <view class="photo-editor-head"><view><text class="photo-editor-title">给照片补一段故事</text><text class="photo-editor-caption">{{editPhotos.length > 1 ? '选择照片，分别记录它的时刻' : '留住这一天，也留住当时的心情'}}</text></view><view class="photo-editor-close" catchtap="closePhotoEditor" aria-role="button" aria-label="关闭">×</view></view>
+    <scroll-view class="photo-editor-body" scroll-y show-scrollbar="{{false}}">
+      <scroll-view class="photo-editor-picker" scroll-x show-scrollbar="{{false}}" wx:if="{{editPhotos.length > 1}}">
+        <view class="photo-editor-thumbs"><view wx:for="{{editPhotos}}" wx:key="id" class="photo-editor-thumb {{editPhotoIdx === index ? 'photo-editor-selected' : ''}}" data-index="{{index}}" catchtap="selectEditPhoto"><image src="{{item.url}}" mode="aspectFill" /><text>第 {{index + 1}} 张</text></view></view>
+      </scroll-view>
+      <view class="photo-editor-single" wx:else><image src="{{editPhotos[0].url}}" mode="aspectFill" /><text>编辑这张照片的信息</text></view>
+      <view class="photo-editor-field"><view class="photo-editor-label"><text>拍摄时间</text><text class="photo-editor-clear" wx:if="{{editForm.taken_at}}" catchtap="clearPhotoDate">清除</text></view><picker mode="date" value="{{editForm.taken_at}}" disabled="{{savingPhoto}}" bindchange="onEditPhotoInput" data-field="taken_at"><view class="photo-editor-input {{!editForm.taken_at ? 'photo-editor-placeholder' : ''}}">{{editForm.taken_at || '选择拍摄日期'}}<text>⌄</text></view></picker></view>
+      <view class="photo-editor-field"><text class="photo-editor-label">地点 · 留空使用当前地址</text><input class="photo-editor-input" placeholder="{{currentAddress || '留空自动使用当前地址'}}" placeholder-class="photo-editor-placeholder handwritten-placeholder" maxlength="200" value="{{editForm.location}}" disabled="{{savingPhoto}}" bindinput="onEditPhotoInput" data-field="location" /></view>
+      <view class="photo-editor-field"><text class="photo-editor-label">在做什么</text><textarea class="photo-editor-story" placeholder="例如：第一次一起看日落" placeholder-class="photo-editor-placeholder handwritten-placeholder" maxlength="200" value="{{editForm.activity}}" disabled="{{savingPhoto}}" bindinput="onEditPhotoInput" data-field="activity" fixed="{{true}}" adjust-position="{{true}}" /></view>
+    </scroll-view>
+    <view class="photo-editor-actions"><button class="photo-editor-cancel" bindtap="closePhotoEditor" disabled="{{savingPhoto}}">取消</button><button class="j-button photo-editor-save" bindtap="savePhotoInfo" loading="{{savingPhoto}}" disabled="{{savingPhoto}}">保存这张照片</button></view>
+  </view>
+</view>
+
 </view>

weapp/pages/album/album.wxss

@@ -1,6 +1,6 @@
 /* pages/album/album.wxss - 日记式分组相册 */
 @import '../../styles/common.wxss';
-page { background: linear-gradient(180deg, #F4E2E3 0%, #FAF5EE 55%, #FAF5EE 100%); height: 100vh; overflow: hidden; }
+page { background: linear-gradient(180deg, #FDE4EC 0%, #FFF0F5 48%, #FFF7FA 100%); height: 100vh; overflow: hidden; }
 scroll-view.page-bg { height: 100vh; overflow-y: scroll; -webkit-overflow-scrolling: touch; }
 
 .upload-root {
@@ -329,3 +329,74 @@ scroll-view.page-bg { height: 100vh; overflow-y: scroll; -webkit-overflow-scroll
 @import '../../styles/design.wxss';
 
 @import '../../styles/journal.wxss';
+
+/* 卡片上的照片故事与编辑入口。 */
+.moments-name-row { align-items:center; gap:14rpx; margin-bottom:0; }
+.moments-name { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
+.moments-count { flex-shrink:0; }
+.moments-more { margin-left:auto; flex-shrink:0; width:88rpx; height:88rpx; display:flex; align-items:center; justify-content:center; border-radius:50%; color:#85776D; font-size:28rpx; letter-spacing:3rpx; }
+.moments-more-pressed { background:#FFF0F5; }
+.moments-upload-time { display:block; margin:0 0 20rpx; font-size:20rpx; color:#A39386; }
+.moments-images { margin-top:20rpx; }
+.moments-metadata { margin-top:18rpx; padding:16rpx 20rpx; border-radius:20rpx; background:#FFF5F8; }
+.moment-note + .moment-note { border-top:1rpx solid #F1DCE4; margin-top:18rpx; padding-top:18rpx; }
+.moment-photo-label { display:block; font-size:20rpx; color:#B74768; margin-bottom:12rpx; }
+.moment-meta-row { display:flex; align-items:flex-start; gap:18rpx; margin-top:8rpx; font-size:24rpx; line-height:1.6; }
+.moment-meta-label { flex-shrink:0; color:#A39386; font-size:21rpx; padding-top:2rpx; }
+.moment-meta-value { color:#62504F; overflow-wrap:break-word; min-width:0; white-space:pre-wrap; }
+.moment-story { color:#352E2A; }
+.moment-add-note { margin-top:22rpx; padding:16rpx 0 2rpx; border-top:1rpx dashed #F1DCE4; color:#B74768; font-size:22rpx; line-height:1.6; }
+.photo-editor-mask { position:fixed; inset:0; z-index:1300; display:flex; align-items:flex-end; }
+.photo-editor-backdrop { position:absolute; inset:0; background:rgba(53,46,42,.35); }
+.photo-editor-sheet { position:relative; width:100%; max-height:90vh; display:flex; flex-direction:column; background:#FFFCFD; border-radius:40rpx 40rpx 0 0; padding:16rpx 32rpx calc(24rpx + env(safe-area-inset-bottom)); box-sizing:border-box; }
+.photo-editor-grip { width:64rpx; height:7rpx; border-radius:8rpx; background:#EBD5DE; margin:0 auto 26rpx; }
+.photo-editor-head { display:flex; align-items:flex-start; gap:20rpx; margin-bottom:24rpx; }
+.photo-editor-head > view:first-child { flex:1; min-width:0; }
+.photo-editor-title { display:block; font-size:33rpx; font-weight:600; color:#352E2A; }
+.photo-editor-caption { display:block; margin-top:10rpx; font-size:23rpx; color:#A39386; }
+.photo-editor-close { width:64rpx; height:64rpx; display:flex; align-items:center; justify-content:center; border-radius:50%; background:#FFF0F5; color:#85776D; font-size:40rpx; }
+.photo-editor-body { flex:none; height:760rpx; max-height:60vh; }
+.photo-editor-picker { width:100%; white-space:nowrap; margin-bottom:28rpx; }
+.photo-editor-thumbs { display:flex; gap:16rpx; padding:4rpx; }
+.photo-editor-thumb { flex-shrink:0; padding:6rpx; border:2rpx solid transparent; border-radius:20rpx; text-align:center; }
+.photo-editor-thumb image { display:block; width:104rpx; height:104rpx; border-radius:14rpx; }
+.photo-editor-thumb text { display:block; font-size:20rpx; color:#A39386; margin-top:8rpx; }
+.photo-editor-selected { border-color:#B74768; background:#FFF0F5; }.photo-editor-selected text { color:#B74768; }
+.photo-editor-single { display:flex; align-items:center; gap:20rpx; margin-bottom:28rpx; font-size:24rpx; color:#85776D; }.photo-editor-single image { width:100rpx; height:100rpx; border-radius:18rpx; }
+.photo-editor-field { margin-bottom:24rpx; }
+.photo-editor-label { display:flex; align-items:center; justify-content:space-between; color:#62504F; font-size:25rpx; margin-bottom:12rpx; }
+.photo-editor-clear { color:#B74768; font-size:22rpx; padding:4rpx 12rpx; }
+.photo-editor-input { display:flex; align-items:center; justify-content:space-between; width:100%; height:88rpx; padding:0 24rpx; border:1rpx solid #F1DCE4; border-radius:18rpx; background:#FFF5F8; color:#352E2A; font-size:26rpx; box-sizing:border-box; }
+.photo-editor-placeholder { color:#B4A3A6; }
+.photo-editor-story { width:100%; height:160rpx; padding:22rpx 24rpx; border:1rpx solid #F1DCE4; border-radius:18rpx; background:#FFF5F8; color:#352E2A; font-size:26rpx; line-height:1.6; box-sizing:border-box; }
+.photo-editor-actions { display:flex; align-items:stretch; gap:20rpx; padding-top:20rpx; }
+.photo-editor-cancel { flex:1; margin:0; border:1rpx solid #F1DCE4; border-radius:26rpx; background:#FFFCFD; font-size:26rpx; color:#85776D; line-height:88rpx; }
+.photo-editor-save { flex:2; }
+.photo-editor-actions .photo-editor-save,
+.photo-editor-actions .photo-editor-cancel {
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  height:96rpx;
+  min-height:96rpx;
+  padding:0;
+  margin:0;
+  line-height:normal;
+  font-size:27rpx;
+  box-sizing:border-box;
+}
+.photo-editor-cancel::after { border:0; }
+
+/* 默认只显示首张照片的两行摘要，完整信息由用户展开。 */
+.moment-summary-line { display:flex; align-items:center; gap:12rpx; min-width:0; font-size:22rpx; line-height:1.5; color:#85776D; }
+.moment-summary-badge { flex-shrink:0; font-size:19rpx; color:#B74768; }
+.moment-summary-date { flex-shrink:0; }
+.moment-summary-location { flex:1; min-width:0; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
+.moment-summary-story { display:block; margin-top:6rpx; font-size:24rpx; line-height:1.5; color:#62504F; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
+.moment-metadata-toggle { display:flex; align-items:center; justify-content:space-between; gap:12rpx; min-height:44rpx; padding-top:8rpx; color:#B74768; font-size:21rpx; line-height:1.5; }
+.moments-metadata.is-expanded { padding:20rpx; }
+.moments-metadata.is-expanded .moment-metadata-toggle { margin-top:10rpx; border-top:1rpx solid #F1DCE4; padding-top:14rpx; }
+
+@import '../../styles/button-theme.wxss';
+
+@import '../../styles/typography.wxss';