更新最新代码

.gitignore

@@ -0,0 +1,18 @@
+# IDE
+.idea/
+
+# 运行产物
+run/
+*.log
+
+# 本地配置（含密钥，不入库）
+config.yaml
+
+# 依赖与构建产物
+node_modules/
+dist/
+dist-ssr/
+
+# 系统文件
+.DS_Store
+Thumbs.db

.idea/.gitignore

@@ -1,10 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Ignored default folder with query files
-/queries/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/go.imports.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GoImports">
-    <option name="excludedPackages">
-      <array>
-        <option value="golang.org/x/net/context" />
-      </array>
-    </option>
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/past-go.iml" filepath="$PROJECT_DIR$/.idea/past-go.iml" />
-    </modules>
-  </component>
-</project>

.idea/past-go.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

past-go/web/admin/public/favicon.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <text x="50%" y="50%" dominant-baseline="central" text-anchor="middle" font-size="52">💗</text>
+  <text x="50%" y="50%" dominant-baseline="central" text-anchor="middle" font-size="52">💗</text>
-</svg>
+</svg>

weapp/images/back.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
-  <path d="M15 18l-6-6 6-6"/>
+  <path d="M15 18l-6-6 6-6"/>
-</svg>
+</svg>

weapp/images/close.svg

@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M18 6L6 18" stroke="#FF6B81" stroke-width="2.5" stroke-linecap="round"/>
+  <path d="M18 6L6 18" stroke="#FF6B81" stroke-width="2.5" stroke-linecap="round"/>
-  <path d="M6 6L18 18" stroke="#FF6B81" stroke-width="2.5" stroke-linecap="round"/>
+  <path d="M6 6L18 18" stroke="#FF6B81" stroke-width="2.5" stroke-linecap="round"/>
-</svg>
+</svg>

weapp/images/comment.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#999" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#999" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-  <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/>
+  <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/>
 </svg>

weapp/images/delete.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#ff4d4f">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#ff4d4f">
-  <path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/>
+  <path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/>
 </svg>

weapp/images/edit.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#666">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#666">
-  <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
+  <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
 </svg>

weapp/images/plus.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#FFFFFF" stroke-width="2.8" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#FFFFFF" stroke-width="2.8" stroke-linecap="round" stroke-linejoin="round">
-  <line x1="12" y1="6" x2="12" y2="18"/>
+  <line x1="12" y1="6" x2="12" y2="18"/>
-  <line x1="6" y1="12" x2="18" y2="12"/>
+  <line x1="6" y1="12" x2="18" y2="12"/>
-</svg>
+</svg>

weapp/pages/punch/punch.js

@@ -12,15 +12,23 @@ Page(withDataCache(withListPagination({
     myName: '我', partnerName: 'TA',
     weekBoth: 0, weekMy: 0, weekPartner: 0,
     todayMy: 0, todayPartner: 0,
+    smokingVisible: true,
     loading: true
   },
 
   onLoad: function() {
     this.setData(getLayout());
+    this.refreshSmokingVisible();
     this.loadCoupleInfo();
     this.loadData();
   },
-  onShow: function() { this.loadCoupleInfo(); this.loadData(); },
+  onShow: function() { this.refreshSmokingVisible(); this.loadCoupleInfo(); this.loadData(); },
+
+  // 读取本地设置：抽烟打卡默认事件是否显示（默认显示）
+  refreshSmokingVisible: function() {
+    var v = wx.getStorageSync('smokingVisible');
+    this.setData({ smokingVisible: (v === '' || v == null) ? true : !!v });
+  },
 
   onSmokingUpdated: function() { this.loadData(); },
 

weapp/pages/punch/punch.wxml

@@ -25,7 +25,7 @@
       </view>
     </view>
 
-    <smoking-card id="smoking" bind:updated="onSmokingUpdated" />
+    <smoking-card id="smoking" wx:if="{{smokingVisible}}" bind:updated="onSmokingUpdated" />
 
     <!-- 打卡列表 -->
     <view class="checkin-cards" wx:if="{{!loading && !loadError && checkins.length > 0}}">

weapp/pages/settings/settings.js

@@ -25,6 +25,9 @@ Page({
     subscribeItems: [],
     subscribeLoading: false,
 
+    // 打卡：抽烟打卡默认事件是否显示
+    smokingVisible: true,
+
     // 我们past
     showAboutModal: false,
     // 联系我们
@@ -32,13 +35,15 @@ Page({
   },
 
   onLoad: function() {
-    this.setData(getLayout());},
+    this.setData(getLayout());
+    this.refreshSmokingVisible();},
 
   onPullDownRefresh: function() {
     wx.stopPullDownRefresh();
   },
 
   onShow: async function() {
+    this.refreshSmokingVisible();
     this.setData({ bindingKnown: false, bindingError:false });
     try {
       var info = await api.coupleInfo();
@@ -81,6 +86,18 @@ Page({
 
   noop: function() {},
 
+  // ===== 抽烟打卡默认事件显示开关 =====
+  refreshSmokingVisible: function() {
+    var v = wx.getStorageSync('smokingVisible');
+    this.setData({ smokingVisible: (v === '' || v == null) ? true : !!v });
+  },
+  toggleSmoking: function(e) {
+    var visible = !!e.detail.value;
+    this.setData({ smokingVisible: visible });
+    wx.setStorageSync('smokingVisible', visible);
+    wx.showToast({ title: visible ? '已显示抽烟打卡' : '已隐藏抽烟打卡', icon: 'none' });
+  },
+
   // ===== 消息通知管理（统一使用一个模板） =====
   showSubscribeModal: async function() {
     this.setData({ showSubscribeModal: true, subscribeLoading: true });

weapp/pages/settings/settings.wxml

@@ -24,6 +24,15 @@
       <text class="j-link">›</text>
     </view>
 
+    <!-- 抽烟打卡默认事件 -->
+    <view class="j-profile-setting">
+      <view class="setting-info">
+        <view class="j-small-title">抽烟打卡</view>
+        <view class="j-caption">在打卡页显示「抽烟记录」默认事件</view>
+      </view>
+      <switch checked="{{smokingVisible}}" bindchange="toggleSmoking" color="#B74768" style="transform:scale(0.75);" />
+    </view>
+
     <view class="section-heading">关系与账号</view>
     <!-- 操作记录 -->
     <view class="j-profile-setting" bindtap="goToHistory">

weapp/project.config.json

@@ -1,68 +1,68 @@
-{
+{
-  "compileType": "miniprogram",
+  "compileType": "miniprogram",
-  "appid": "wxdc40d0c51cf8fe1e",
+  "appid": "wxdc40d0c51cf8fe1e",
-  "projectname": "couple-space",
+  "projectname": "couple-space",
-  "description": "情侣空间小程序",
+  "description": "情侣空间小程序",
-  "setting": {
+  "setting": {
-    "urlCheck": false,
+    "urlCheck": false,
-    "es6": true,
+    "es6": true,
-    "enhance": true,
+    "enhance": true,
-    "postcss": true,
+    "postcss": true,
-    "preloadBackgroundData": false,
+    "preloadBackgroundData": false,
-    "minified": true,
+    "minified": true,
-    "newFeature": true,
+    "newFeature": true,
-    "coverView": true,
+    "coverView": true,
-    "nodeModules": false,
+    "nodeModules": false,
-    "autoAudits": false,
+    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
+    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
+    "scopeDataCheck": false,
-    "uglifyFileName": false,
+    "uglifyFileName": false,
-    "checkInvalidKey": true,
+    "checkInvalidKey": true,
-    "checkSiteMap": true,
+    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
+    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
+    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
+    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
+    "useMultiFrameRuntime": true,
-    "useApiHook": true,
+    "useApiHook": true,
-    "useApiHostProcess": true,
+    "useApiHostProcess": true,
-    "babelSetting": {
+    "babelSetting": {
-      "ignore": [],
+      "ignore": [],
-      "disablePlugins": [],
+      "disablePlugins": [],
-      "outputPath": ""
+      "outputPath": ""
-    },
+    },
-    "bundle": false,
+    "bundle": false,
-    "useIsolateContext": true,
+    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
+    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
+    "packNpmManually": false,
-    "packNpmRelationList": [],
+    "packNpmRelationList": [],
-    "minifyWXSS": true,
+    "minifyWXSS": true,
-    "compileWorklet": false,
+    "compileWorklet": false,
-    "minifyWXML": true,
+    "minifyWXML": true,
-    "localPlugins": false,
+    "localPlugins": false,
-    "disableUseStrict": false,
+    "disableUseStrict": false,
-    "useCompilerPlugins": false,
+    "useCompilerPlugins": false,
-    "condition": false,
+    "condition": false,
-    "swc": false,
+    "swc": false,
-    "disableSWC": true
+    "disableSWC": true
-  },
+  },
-  "condition": {
+  "condition": {
-    "miniprogram": {
+    "miniprogram": {
-      "list": []
+      "list": []
-    }
+    }
-  },
+  },
-  "editorSetting": {
+  "editorSetting": {
-    "tabIndent": "auto",
+    "tabIndent": "auto",
-    "tabSize": 2
+    "tabSize": 2
-  },
+  },
-  "libVersion": "3.16.0",
+  "libVersion": "3.16.0",
-  "simulatorPluginLibVersion": {},
+  "simulatorPluginLibVersion": {},
-  "packOptions": {
+  "packOptions": {
-    "ignore": [
+    "ignore": [
-      {
+      {
-        "value": "tests",
+        "value": "tests",
-        "type": "folder"
+        "type": "folder"
-      }
+      }
-    ],
+    ],
-    "include": []
+    "include": []
-  }
+  }
 }

weapp/project.private.config.json

@@ -1,24 +1,24 @@
-{
+{
-  "libVersion": "3.16.0",
+  "libVersion": "3.16.0",
-  "projectname": "couple-space",
+  "projectname": "couple-space",
-  "condition": {},
+  "condition": {},
-  "setting": {
+  "setting": {
-    "urlCheck": false,
+    "urlCheck": false,
-    "coverView": true,
+    "coverView": true,
-    "lazyloadPlaceholderEnable": false,
+    "lazyloadPlaceholderEnable": false,
-    "skylineRenderEnable": false,
+    "skylineRenderEnable": false,
-    "preloadBackgroundData": false,
+    "preloadBackgroundData": false,
-    "autoAudits": false,
+    "autoAudits": false,
-    "useApiHook": true,
+    "useApiHook": true,
-    "showShadowRootInWxmlPanel": true,
+    "showShadowRootInWxmlPanel": true,
-    "useStaticServer": false,
+    "useStaticServer": false,
-    "useLanDebug": false,
+    "useLanDebug": false,
-    "showES6CompileOption": false,
+    "showES6CompileOption": false,
-    "compileHotReLoad": true,
+    "compileHotReLoad": true,
-    "useGlassEaselForWxml": false,
+    "useGlassEaselForWxml": false,
-    "checkInvalidKey": true,
+    "checkInvalidKey": true,
-    "ignoreDevUnusedFiles": true,
+    "ignoreDevUnusedFiles": true,
-    "bigPackageSizeSupport": false,
+    "bigPackageSizeSupport": false,
-    "useIsolateContext": true
+    "useIsolateContext": true
-  }
+  }
 }