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

weapp/pages/albums/albums.js

@@ -1,7 +1,8 @@
+const { withDataCache } = require('../../utils/page-cache');
 const { getLayout } = require('../../utils/layout');
 // pages/albums/albums.js
 const { api, getImageUrl } = require('../../utils/request');
-Page({
+Page(withDataCache({
   onResize: function() { this.setData(getLayout()); },
   data: {
     loading: true, loadError: false,
@@ -49,7 +50,7 @@ Page({
   loadAlbums: async function() {
     if (this._loading) return;
     this._loading = true;
-    this.setData({ loading: true, loadError: false });
+    this.setData({ loading: !this._hasCachedData, loadError: false });
     try {
       var list = await api.albumList(null, 'GET', true);
       list = (list || []).map(function(a) {
@@ -170,7 +171,7 @@ Page({
     });
   },  goToPublish: function() { wx.navigateTo({ url: '/pages/publish/publish?type=album' }); },
 
-  goHome: function() { wx.redirectTo({ url: '/pages/index/index' }); },
+  goHome: function() { wx.switchTab({ url: '/pages/index/index' }); },
   goBack: function() { wx.navigateBack(); },
-  goToProfile: function() { wx.redirectTo({ url: '/pages/profile/profile' }); }
-  });
+  goToProfile: function() { wx.switchTab({ url: '/pages/profile/profile' }); }
+  }, {"loadAlbums": ["albumList"]}));

weapp/pages/albums/albums.wxml

@@ -31,11 +31,11 @@
       <text class="title">编辑相册</text>
       <view class="input-group">
         <label>相册标题</label>
-        <input class="input" placeholder="例如：旅行记录" value="{{editForm.title}}" bindinput="onEditTitleInput" />
+        <input placeholder-class="handwritten-placeholder" class="input" placeholder="例如：旅行记录" value="{{editForm.title}}" bindinput="onEditTitleInput" />
       </view>
       <view class="input-group">
         <label>描述（选填）</label>
-        <input class="input" placeholder="简单描述这个相册" value="{{editForm.desc}}" bindinput="onEditDescInput" />
+        <input placeholder-class="handwritten-placeholder" class="input" placeholder="简单描述这个相册" value="{{editForm.desc}}" bindinput="onEditDescInput" />
       </view>
       <button class="btn btn-primary" bindtap="saveAlbumEdit" hover-class="none">保存</button>
     </view>

weapp/pages/albums/albums.wxss

@@ -1,6 +1,6 @@
 /* pages/albums/albums.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; }
 
 
@@ -126,3 +126,7 @@ scroll-view.page-bg { height: 100vh; overflow-y: scroll; -webkit-overflow-scroll
 @import '../../styles/design.wxss';
 
 @import '../../styles/journal.wxss';
+
+@import '../../styles/button-theme.wxss';
+
+@import '../../styles/typography.wxss';