lc
a5c591eaf3
Root cause: _setNavBarColor used _lastNavColor (a module-level cache) to skip wx.setNavigationBarColor when the color appeared unchanged. But wx.setNavigationBarColor is per-page — each tab page has its own navigation bar and needs an explicit call. The cache prevented subsequent pages from ever receiving the call. Example trace: index onShow → _setNavBarColor(#FF6B35) → _lastNavColor=#FF6B35 ✓ settings onShow → _setNavBarColor(#FF6B35) → cache hit, return ✗ User picks green → setTheme → _setNavBarColor(#43A047) ✓ index onShow → _setNavBarColor(#43A047) → cache hit, return ✗ → Index still shows orange! Fix: remove _lastNavColor guard entirely. Keep setTimeout debounce.
118 lines
2.9 KiB
JavaScript
118 lines
2.9 KiB
JavaScript
const THEMES = [
|
|
{
|
|
id: 'orange',
|
|
name: '活力橙',
|
|
primary: '#FF6B35',
|
|
primaryLight: '#FF8C5A',
|
|
primaryBg: '#FFF3ED',
|
|
primaryRgb: '255,107,53'
|
|
},
|
|
{
|
|
id: 'blue',
|
|
name: '深海蓝',
|
|
primary: '#2979FF',
|
|
primaryLight: '#5C9CFF',
|
|
primaryBg: '#EDF4FF',
|
|
primaryRgb: '41,121,255'
|
|
},
|
|
{
|
|
id: 'green',
|
|
name: '森林绿',
|
|
primary: '#43A047',
|
|
primaryLight: '#6EC072',
|
|
primaryBg: '#EDF7EE',
|
|
primaryRgb: '67,160,71'
|
|
},
|
|
{
|
|
id: 'purple',
|
|
name: '优雅紫',
|
|
primary: '#7E57C2',
|
|
primaryLight: '#A08AD6',
|
|
primaryBg: '#F5F0FA',
|
|
primaryRgb: '126,87,194'
|
|
},
|
|
{
|
|
id: 'pink',
|
|
name: '樱花粉',
|
|
primary: '#EC407A',
|
|
primaryLight: '#F06A9A',
|
|
primaryBg: '#FDEEF3',
|
|
primaryRgb: '236,64,122'
|
|
}
|
|
]
|
|
|
|
const BASE_VARS = '--text:#333;--text-secondary:#999;--bg:#F5F5F5;--card-bg:#FFFFFF;--border:#EEE;--success:#4CAF50;--primary:#FF6B35;--primary-light:#FF8C5A;--primary-bg:#FFF3ED;--primary-rgb:255,107,53;'
|
|
const DEFAULT_THEME_ID = 'orange'
|
|
const THEME_KEY = 'app_theme'
|
|
let _navColorTimer = null
|
|
|
|
const getThemeById = (id) => THEMES.find(t => t.id === id) || THEMES[0]
|
|
|
|
const getCurrentTheme = () => {
|
|
let id = wx.getStorageSync(THEME_KEY)
|
|
if (!id) {
|
|
// fallback: try recovering from user_settings backup
|
|
try {
|
|
const s = wx.getStorageSync('user_settings')
|
|
if (s && s.themeId) id = s.themeId
|
|
} catch (e) {}
|
|
}
|
|
return getThemeById(id || DEFAULT_THEME_ID)
|
|
}
|
|
|
|
const _setNavBarColor = (primary) => {
|
|
if (_navColorTimer) clearTimeout(_navColorTimer)
|
|
_navColorTimer = setTimeout(() => {
|
|
try {
|
|
wx.setNavigationBarColor({
|
|
frontColor: '#ffffff',
|
|
backgroundColor: primary
|
|
})
|
|
} catch (e) {}
|
|
}, 50)
|
|
}
|
|
|
|
const setTheme = (id) => {
|
|
try {
|
|
wx.setStorageSync(THEME_KEY, id)
|
|
// redundant backup in user_settings
|
|
try {
|
|
const s = wx.getStorageSync('user_settings') || {}
|
|
s.themeId = id
|
|
wx.setStorageSync('user_settings', s)
|
|
} catch (e) {}
|
|
} catch (e) {
|
|
console.error('Failed to save theme:', e)
|
|
}
|
|
const theme = getThemeById(id)
|
|
_setNavBarColor(theme.primary)
|
|
const app = getApp()
|
|
if (app && app.globalData) app.globalData.theme = theme
|
|
return theme
|
|
}
|
|
|
|
const applyThemeToPage = (self) => {
|
|
const theme = getCurrentTheme()
|
|
self.setData({
|
|
theme,
|
|
themeStyle: `${BASE_VARS}--primary:${theme.primary};--primary-light:${theme.primaryLight};--primary-bg:${theme.primaryBg};--primary-rgb:${theme.primaryRgb};`
|
|
})
|
|
_setNavBarColor(theme.primary)
|
|
}
|
|
|
|
const getThemeStyle = (theme) => {
|
|
const t = theme || getCurrentTheme()
|
|
return `${BASE_VARS}--primary:${t.primary};--primary-light:${t.primaryLight};--primary-bg:${t.primaryBg};--primary-rgb:${t.primaryRgb};`
|
|
}
|
|
|
|
module.exports = {
|
|
THEMES,
|
|
DEFAULT_THEME_ID,
|
|
BASE_VARS,
|
|
getThemeById,
|
|
getCurrentTheme,
|
|
setTheme,
|
|
applyThemeToPage,
|
|
getThemeStyle
|
|
}
|