lc
fb3bc6c045
Root cause: WXSS compiler resolves var(--primary) at compile time
against page{} declarations in app.wxss. The orange defaults
(--primary:#FF6B35 etc.) were being baked into compiled WXSS,
so the inline style theme override on .container was ignored.
Records and settings pages always rendered orange regardless of
the user's theme choice.
Fix:
1. Remove --primary, --primary-light, --primary-bg, --primary-rgb
from page{} in app.wxss, forcing WXSS to resolve var() at
runtime from inline style on .container
2. Expand BASE_VARS in theme.js to include default orange theme
vars, so the initial render (before onLoad) still has valid
CSS custom properties — no flash of unstyled content
3. Export BASE_VARS from theme.js
4. Change all 4 pages + custom-tab-bar initial data.themeStyle
from '' to themeMod.BASE_VARS, eliminating the empty-string
gap between first render and onLoad
121 lines
2.9 KiB
JavaScript
121 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 _lastNavColor = ''
|
|
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 (_lastNavColor === primary) return
|
|
_lastNavColor = 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
|
|
}
|