diff --git a/App.vue b/App.vue index 8d4c5da6..1f52c096 100644 --- a/App.vue +++ b/App.vue @@ -2003,31 +2003,6 @@ return false; }, - // 是否站点变灰 - is_app_mourning() { - var is_app = parseInt(this.get_config('plugins_base.mourning.data.is_app', 0)); - if (is_app == 1) { - // 当前时间戳 - var time_current = Date.parse(new Date()); - // 开始时间 - var time_start = this.get_config('plugins_base.mourning.data.time_start') || null; - if (time_start != null) { - if (Date.parse(new Date(time_start)) > time_current) { - return false; - } - } - // 结束时间 - var time_end = this.get_config('plugins_base.mourning.data.time_end') || null; - if (time_end != null) { - if (Date.parse(new Date(time_end)) < time_current) { - return false; - } - } - return true; - } - return false; - }, - // 价格符号 currency_symbol() { return this.get_config('currency_symbol') || this.data.currency_symbol; diff --git a/pages/user/user.vue b/pages/user/user.vue index 22571692..33262b18 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -109,7 +109,7 @@ - + {{ nav_logout_data.name }} @@ -135,7 +135,7 @@ - + {{ nav_logout_data.name }} @@ -189,7 +189,7 @@ user_id: '', nickname: '', message_total: 0, - nav_logout_data: {}, + nav_logout_data: null, // 头部小导航 head_nav_list: [], // 主要的订单+副导航 @@ -246,26 +246,27 @@ methods: { // 资源设置 set_resources_data() { + var old_nav = this.head_nav_list; var head_nav_list = [ { name: this.$t('promotion-order.promotion-order.iwa646'), url: 'user-order', - count: this.head_nav_list.length > 0 ? this.head_nav_list[0].count : 0, + count: old_nav.length > 0 ? old_nav[0].count : 0, }, { name: this.$t('user.user.3q4p8k'), url: 'user-favor', - count: this.head_nav_list.length > 0 ? this.head_nav_list[1].count : 0, + count: old_nav.length > 0 ? old_nav[1].count : 0, }, { name: this.$t('user.user.57xw84'), url: 'user-goods-browse', - count: this.head_nav_list.length > 0 ? this.head_nav_list[2].count : 0, + count: old_nav.length > 0 ? old_nav[2].count : 0, }, { name: this.$t('user.user.k78280'), url: 'user-integral', - count: this.head_nav_list.length > 0 ? this.head_nav_list[3].count : 0, + count: old_nav.length > 0 ? old_nav[3].count : 0, }, ]; var nav_logout_data = { @@ -274,9 +275,9 @@ }; var nickname = this.$t('login.login.6yfr9g'); this.setData({ - head_nav_list, - nav_logout_data, - nickname, + head_nav_list: head_nav_list, + nav_logout_data: nav_logout_data, + nickname: nickname, }); },