feat: v1.5 — plan editor, voice prompts, UI polish
Major features: - Training plan editor: edit preset days/duration per plan (in-place override via custom_plans storage; preset ids preserved so existing records stay valid) - Voice prompts at 4 fixed points during training (halfway / 30s / 10s / done) via Tencent Cloud TTS (cloudfunctions/tts + utils/voice.js) - Free-training button: switched from outline (transparent) to ghost variant (theme-tinted) for visual weight Bug fixes: - 4 functional pages: SVG data URIs failed to render in WeChat because '\#' in colors was parsed as a data-URI fragment delimiter. encode the whole SVG via encodeURIComponent in utils/icons.js build(). - Old records (saved before id field was added) could not be deleted (data-id was empty, triggered defensive guard). Backfill stable legacy-<month>-<index>-<duration> ids in getRecords() and persist. - settings.js plan-row editor button event was bubbling up to the row's bindtap (which also fired onSelectPlan). Wrapped in catch:tap. UI: - Settings page: 3 hardcoded plans replaced with dynamic buildPlansList that overlays custom_plans on top of presets - Plan editor: bottom-sheet modal in settings page (regular view, not ui-modal — WeChat custom component root element drops position:fixed in this runtime) - Free-training button: rounded pill style, full-width, 24rpx gap from primary action; bottom sheet uses max-height: 88vh + internal scroll - Version bumped to v1.5, last updated 2026-06-10 Removed: - Daily reminder section (dailyReminder / reminderTime) — replaced by the 4 voice prompts which cover the same user need without requiring long-term scheduling that WeChat mini-programs can't actually do Misc: - utils/plan.js refactored to formula-driven: presets declare totalDays/startTarget/increment/cycleDays, days[] is generated. Same formula applies to custom plans. - Timer _remind() guards each prompt on minimum duration so short free-mode sessions don't fire 'last30' at the start - Cloud storage cloud_plans field added to data push payload; restored on first install via _restoreFromCloud - .gitignore added for local AI tool caches (.reasonix/, reasonix.toml, .codegraph/daemon.pid)
This commit is contained in:
+53
-6
@@ -1,22 +1,70 @@
|
||||
const themeMod = require('../utils/theme')
|
||||
|
||||
// Resolve the active theme synchronously at module load so the first paint
|
||||
// already has the correct CSS variables — avoids a flash of the default theme.
|
||||
const _initialTheme = themeMod.getCurrentTheme()
|
||||
const _initialThemeStyle = themeMod.getThemeStyle(_initialTheme)
|
||||
|
||||
// SVG icons as data URIs. We use two variants per icon:
|
||||
// - *Fill*: solid filled (active state, theme color baked in at module load)
|
||||
// - *Line*: outlined (inactive state, neutral gray)
|
||||
// Themes are 5 fixed colors so we can bake the active color in at module init.
|
||||
// If the user changes theme, the component re-renders via pageLifetimes.show.
|
||||
|
||||
// Solid (active) color from current theme
|
||||
const _activeColor = _initialTheme.primary
|
||||
// Inactive color
|
||||
const _inactiveColor = '#999999'
|
||||
|
||||
const _svg = (path, fill) =>
|
||||
'data:image/svg+xml,' + encodeURIComponent(
|
||||
'<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="' + fill + '">' +
|
||||
path + '</svg>'
|
||||
)
|
||||
|
||||
// 24x24 Material-style paths
|
||||
const PATH_HOME = '<path d="M12 3l9 8h-3v9h-5v-6h-2v6H6v-9H3l9-8z"/>'
|
||||
const PATH_HOME_LINE = '<path d="M12 5.2L5.5 11H7v8h2v-6h6v6h2v-8h1.5L12 5.2M12 3l9 8h-3v9h-5v-6h-2v6H6v-9H3l9-8z" fill-rule="evenodd"/>'
|
||||
const PATH_CALENDAR = '<path d="M19 4h-2V2h-2v2H9V2H7v2H5C3.9 4 3 4.9 3 6v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 16H5V10h14v10zm0-12H5V6h14v2z"/><path d="M7 12h5v5H7z"/>'
|
||||
const PATH_CALENDAR_LINE = '<path d="M19 4h-2V2h-2v2H9V2H7v2H5C3.9 4 3 4.9 3 6v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 16H5V10h14v10zm0-12H5V6h14v2z" fill-rule="evenodd"/>'
|
||||
const PATH_RANK = '<path d="M7.5 21H2V9h5.5v12zm7.25-14h-5.5v14h5.5V7zM22 11h-5.5v10H22V11z"/>'
|
||||
const PATH_RANK_LINE = '<path d="M7.5 21H2V9h5.5v12zm7.25-14h-5.5v14h5.5V7zM22 11h-5.5v10H22V11z" fill-rule="evenodd"/>'
|
||||
const PATH_SETTINGS = '<path d="M19.14 12.94c.04-.3.06-.61.06-.94 0-.32-.02-.64-.07-.94l2.03-1.58a.49.49 0 00.12-.61l-1.92-3.32a.49.49 0 00-.59-.22l-2.39.96c-.5-.38-1.03-.7-1.62-.94l-.36-2.54a.484.484 0 00-.48-.41h-3.84c-.24 0-.43.17-.47.41l-.36 2.54c-.59.24-1.13.57-1.62.94l-2.39-.96a.49.49 0 00-.59.22L2.74 8.87c-.12.21-.08.47.12.61l2.03 1.58c-.05.3-.07.62-.07.94s.02.64.07.94l-2.03 1.58a.49.49 0 00-.12.61l1.92 3.32c.12.22.37.29.59.22l2.39-.96c.5.38 1.03.7 1.62.94l.36 2.54c.05.24.24.41.48.41h3.84c.24 0 .44-.17.47-.41l.36-2.54c.59-.24 1.13-.56 1.62-.94l2.39.96c.22.08.47 0 .59-.22l1.92-3.32c.12-.22.07-.47-.12-.61l-2.01-1.58zM12 15.6c-1.98 0-3.6-1.62-3.6-3.6s1.62-3.6 3.6-3.6 3.6 1.62 3.6 3.6-1.62 3.6-3.6 3.6z"/>'
|
||||
const PATH_SETTINGS_LINE = '<path d="M19.14 12.94c.04-.3.06-.61.06-.94 0-.32-.02-.64-.07-.94l2.03-1.58a.49.49 0 00.12-.61l-1.92-3.32a.49.49 0 00-.59-.22l-2.39.96c-.5-.38-1.03-.7-1.62-.94l-.36-2.54a.484.484 0 00-.48-.41h-3.84c-.24 0-.43.17-.47.41l-.36 2.54c-.59.24-1.13.57-1.62.94l-2.39-.96a.49.49 0 00-.59.22L2.74 8.87c-.12.21-.08.47.12.61l2.03 1.58c-.05.3-.07.62-.07.94s.02.64.07.94l-2.03 1.58a.49.49 0 00-.12.61l1.92 3.32c.12.22.37.29.59.22l2.39-.96c.5.38 1.03.7 1.62.94l.36 2.54c.05.24.24.41.48.41h3.84c.24 0 .44-.17.47-.41l.36-2.54c.59-.24 1.13-.56 1.62-.94l2.39.96c.22.08.47 0 .59-.22l1.92-3.32c.12-.22.07-.47-.12-.61l-2.01-1.58zM12 15.6c-1.98 0-3.6-1.62-3.6-3.6s1.62-3.6 3.6-3.6 3.6 1.62 3.6 3.6-1.62 3.6-3.6 3.6z" fill-rule="evenodd"/>'
|
||||
|
||||
const _buildIcons = (activeHex) => {
|
||||
const a = activeHex
|
||||
return {
|
||||
home: _svg(PATH_HOME_LINE, _inactiveColor),
|
||||
homeFill: _svg(PATH_HOME, a),
|
||||
calendar: _svg(PATH_CALENDAR_LINE, _inactiveColor),
|
||||
calendarFill: _svg(PATH_CALENDAR, a),
|
||||
rank: _svg(PATH_RANK_LINE, _inactiveColor),
|
||||
rankFill: _svg(PATH_RANK, a),
|
||||
settings: _svg(PATH_SETTINGS_LINE, _inactiveColor),
|
||||
settingsFill: _svg(PATH_SETTINGS, a)
|
||||
}
|
||||
}
|
||||
|
||||
Component({
|
||||
data: {
|
||||
selected: 0,
|
||||
themeStyle: themeMod.BASE_VARS
|
||||
theme: _initialTheme,
|
||||
themeStyle: _initialThemeStyle,
|
||||
svgIcons: _buildIcons(_initialTheme.primary)
|
||||
},
|
||||
|
||||
lifetimes: {
|
||||
attached() {
|
||||
const theme = themeMod.getCurrentTheme()
|
||||
this.setData({ themeStyle: themeMod.getThemeStyle(theme) })
|
||||
themeMod.applyThemeToPage(this)
|
||||
}
|
||||
},
|
||||
|
||||
pageLifetimes: {
|
||||
show() {
|
||||
themeMod.applyThemeToPage(this)
|
||||
const theme = themeMod.getCurrentTheme()
|
||||
this.setData({ themeStyle: themeMod.getThemeStyle(theme) })
|
||||
this.setData({ svgIcons: _buildIcons(theme.primary) })
|
||||
}
|
||||
},
|
||||
|
||||
@@ -26,11 +74,10 @@ Component({
|
||||
const pages = [
|
||||
'/pages/index/index',
|
||||
'/pages/records/records',
|
||||
'/pages/leaderboard/leaderboard',
|
||||
'/pages/settings/settings'
|
||||
]
|
||||
|
||||
if (index === this.data.selected) return
|
||||
|
||||
wx.switchTab({ url: pages[index] })
|
||||
}
|
||||
}
|
||||
|
||||
+12
-19
@@ -4,12 +4,7 @@
|
||||
data-index="0"
|
||||
bindtap="switchTab"
|
||||
>
|
||||
<view class="tab-icon">
|
||||
<view class="icon-home {{selected === 0 ? 'active' : ''}}">
|
||||
<view class="home-roof"></view>
|
||||
<view class="home-body"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tab-icon" style="background-image: url({{selected === 0 ? svgIcons.homeFill : svgIcons.home}})"></view>
|
||||
<text class="tab-text">训练</text>
|
||||
</view>
|
||||
|
||||
@@ -18,13 +13,7 @@
|
||||
data-index="1"
|
||||
bindtap="switchTab"
|
||||
>
|
||||
<view class="tab-icon">
|
||||
<view class="icon-records {{selected === 1 ? 'active' : ''}}">
|
||||
<view class="bar bar1"></view>
|
||||
<view class="bar bar2"></view>
|
||||
<view class="bar bar3"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tab-icon" style="background-image: url({{selected === 1 ? svgIcons.calendarFill : svgIcons.calendar}})"></view>
|
||||
<text class="tab-text">记录</text>
|
||||
</view>
|
||||
|
||||
@@ -33,12 +22,16 @@
|
||||
data-index="2"
|
||||
bindtap="switchTab"
|
||||
>
|
||||
<view class="tab-icon">
|
||||
<view class="icon-settings {{selected === 2 ? 'active' : ''}}">
|
||||
<view class="gear-outer"></view>
|
||||
<view class="gear-center"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tab-icon" style="background-image: url({{selected === 2 ? svgIcons.rankFill : svgIcons.rank}})"></view>
|
||||
<text class="tab-text">排行</text>
|
||||
</view>
|
||||
|
||||
<view
|
||||
class="tab-item {{selected === 3 ? 'active' : ''}}"
|
||||
data-index="3"
|
||||
bindtap="switchTab"
|
||||
>
|
||||
<view class="tab-icon" style="background-image: url({{selected === 3 ? svgIcons.settingsFill : svgIcons.settings}})"></view>
|
||||
<text class="tab-text">设置</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
+20
-112
@@ -3,7 +3,7 @@
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: 110rpx;
|
||||
height: calc(110rpx + env(safe-area-inset-bottom));
|
||||
background: #FFFFFF;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -11,6 +11,8 @@
|
||||
border-top: 1rpx solid rgba(0, 0, 0, 0.06);
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
z-index: 999;
|
||||
box-sizing: border-box;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.tab-item {
|
||||
@@ -18,129 +20,35 @@
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 6rpx 0;
|
||||
padding: 4rpx 0;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
height: 100%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.tab-item:active {
|
||||
transform: scale(0.9);
|
||||
transform: scale(0.92);
|
||||
}
|
||||
|
||||
.tab-icon {
|
||||
width: 44rpx;
|
||||
height: 44rpx;
|
||||
background-size: contain;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
margin-bottom: 4rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.tab-text {
|
||||
font-size: 24rpx;
|
||||
font-size: 22rpx;
|
||||
color: var(--text-secondary);
|
||||
margin-top: 8rpx;
|
||||
line-height: 1;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.tab-item.active .tab-text {
|
||||
color: var(--primary);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* ---- icon: home ---- */
|
||||
.icon-home {
|
||||
position: relative;
|
||||
width: 44rpx;
|
||||
height: 40rpx;
|
||||
}
|
||||
|
||||
.tab-item.active .icon-home {
|
||||
animation: bounceSoft 0.5s ease;
|
||||
}
|
||||
|
||||
.home-roof {
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-left: 22rpx solid transparent;
|
||||
border-right: 22rpx solid transparent;
|
||||
border-bottom: 18rpx solid var(--text-secondary);
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.tab-item.active .home-roof {
|
||||
border-bottom-color: var(--primary);
|
||||
}
|
||||
|
||||
.home-body {
|
||||
width: 22rpx;
|
||||
height: 20rpx;
|
||||
background: var(--text-secondary);
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 11rpx;
|
||||
border-radius: 2rpx 2rpx 0 0;
|
||||
}
|
||||
|
||||
.tab-item.active .home-body {
|
||||
background: var(--primary);
|
||||
}
|
||||
|
||||
/* ---- icon: records (3 bars) ---- */
|
||||
.icon-records {
|
||||
width: 40rpx;
|
||||
height: 34rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-end;
|
||||
gap: 6rpx;
|
||||
}
|
||||
|
||||
.tab-item.active .icon-records {
|
||||
animation: bounceSoft 0.5s ease;
|
||||
}
|
||||
|
||||
.bar {
|
||||
height: 6rpx;
|
||||
background: var(--text-secondary);
|
||||
border-radius: 3rpx;
|
||||
}
|
||||
|
||||
.bar1 { width: 100%; }
|
||||
.bar2 { width: 65%; }
|
||||
.bar3 { width: 80%; }
|
||||
|
||||
.tab-item.active .bar {
|
||||
background: var(--primary);
|
||||
}
|
||||
|
||||
/* ---- icon: settings (gear) ---- */
|
||||
.icon-settings {
|
||||
position: relative;
|
||||
width: 42rpx;
|
||||
height: 42rpx;
|
||||
}
|
||||
|
||||
.tab-item.active .icon-settings {
|
||||
animation: bounceSoft 0.5s ease;
|
||||
}
|
||||
|
||||
.gear-outer {
|
||||
width: 36rpx;
|
||||
height: 36rpx;
|
||||
border: 5rpx solid var(--text-secondary);
|
||||
border-radius: 50%;
|
||||
position: absolute;
|
||||
top: 3rpx;
|
||||
left: 3rpx;
|
||||
}
|
||||
|
||||
.tab-item.active .gear-outer {
|
||||
border-color: var(--primary);
|
||||
}
|
||||
|
||||
.gear-center {
|
||||
width: 12rpx;
|
||||
height: 12rpx;
|
||||
background: var(--text-secondary);
|
||||
border-radius: 50%;
|
||||
position: absolute;
|
||||
top: 15rpx;
|
||||
left: 15rpx;
|
||||
}
|
||||
|
||||
.tab-item.active .gear-center {
|
||||
background: var(--primary);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user