diff --git a/App.vue b/App.vue index 15c55df1..22532d99 100644 --- a/App.vue +++ b/App.vue @@ -1071,7 +1071,7 @@ this.set_theme_value(data.plugins_themestyle_data); // 设置底部菜单 - this.set_tabbar(); + this.set_tabbar(data.plugins_themestyle_data); // 用户自动登录处理 this.user_auto_login_handle(); @@ -1986,7 +1986,7 @@ // 获取主题色值 // is_light 是否获取浅主色(false, true) - get_theme_color(is_light = false) { + get_theme_color(theme, is_light = false) { let color_obj = { // 主色 red: '#ff0036', // 红色 @@ -2008,7 +2008,10 @@ brown_light: '#eadcd2', // 棕色 purple_light: '#d6cbfb', // 紫色 }; - var theme = this.get_theme_value(); + // 当前主题 + if((theme || null) == null) { + theme = this.get_theme_value(); + } if (is_light) { theme += '_light'; } @@ -2041,13 +2044,15 @@ }, // 底部菜单设置 - set_tabbar() { + set_tabbar(theme) { // 当前主题 - var theme = this.get_theme_value(); + if((theme || null) == null) { + theme = this.get_theme_value(); + } // 整体样式 uni.setTabBarStyle({ - selectedColor: this.get_theme_color(), + selectedColor: this.get_theme_color(theme), }); // 菜单 diff --git a/manifest.json b/manifest.json index 51b9289e..4018b636 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "shopxo", + "name" : "ShopXO", "appid" : "__UNI__50E3C11", "description" : "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求", "versionName" : "1.0.0", diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue index efb00a03..fcc30c6b 100644 --- a/pages/user-address-save/user-address-save.vue +++ b/pages/user-address-save/user-address-save.vue @@ -164,7 +164,7 @@ var common_static_url = app.globalData.get_static_url('common'); const theme_color = app.globalData.get_theme_color(); - const theme_color_light = app.globalData.get_theme_color(true); + const theme_color_light = app.globalData.get_theme_color(null, true); export default { data() { return { @@ -218,7 +218,7 @@ this.setData({ params: params, }); - }, + }, onReady: function () { uni.setNavigationBarTitle({ @@ -235,15 +235,15 @@ this.init(); }, - onShow() { - // 先解绑自定义事件 - uni.$off('refresh'); - // 监听自定义事件并进行页面刷新操作 -     uni.$on('refresh', (data) => { - // 初始位置数据 -         if((data.location_success || false) == true) { - this.user_location_init(); -         } + onShow() { + // 先解绑自定义事件 + uni.$off('refresh'); + // 监听自定义事件并进行页面刷新操作 +     uni.$on('refresh', (data) => { + // 初始位置数据 +         if((data.location_success || false) == true) { + this.user_location_init(); +         }     }); // 分享菜单处理 diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue index 9a1d267b..d1cff5c5 100644 --- a/pages/user-address/user-address.vue +++ b/pages/user-address/user-address.vue @@ -57,7 +57,7 @@ import componentNoData from '../../components/no-data/no-data'; import componentBottomLine from '../../components/bottom-line/bottom-line'; const theme_color = app.globalData.get_theme_color(); - const theme_color_light = app.globalData.get_theme_color(true); + const theme_color_light = app.globalData.get_theme_color(null, true); var common_static_url = app.globalData.get_static_url('common'); export default {