diff --git a/App.vue b/App.vue index 1bf2f5dd..bcf98632 100644 --- a/App.vue +++ b/App.vue @@ -1000,17 +1000,41 @@ */ is_tabbar_pages_handle(pages, url = null) { var value = (url == null) ? '/'+this.current_page() : url; - if ((value || null) == null) { - return false; + if ((value || null) != null) { + if(pages.indexOf(value) != -1) { + return true; + } else { + // 存在参数,去掉参数再检索是否存在页面的tabbar + if(value.indexOf('?') != -1) { + var temp = value.split('?'); + if(pages.indexOf(temp[0]) != -1) { + return true; + } + } + } } - if(pages.indexOf(value) != -1) { - return true; - } else { - // 存在参数,去掉参数再检索是否存在页面的tabbar - if(value.indexOf('?') != -1) { - var temp = value.split('?'); - if(pages.indexOf(temp[0]) != -1) { + return false; + }, + + /** + * 当前地址是否存为首页 + * url url地址 + */ + is_tabbar_home(url = null) { + var pages = this.app_tabbar_pages() || []; + if(pages.length > 0) { + var value = (url == null) ? '/'+this.current_page() : url; + if ((value || null) != null) { + if(pages[0] == value) { return true; + } else { + // 存在参数,去掉参数再检索是否存在页面的tabbar + if(value.indexOf('?') != -1) { + var temp = value.split('?'); + if(pages[0] == temp[0]) { + return true; + } + } } } } diff --git a/components/common/common.vue b/components/common/common.vue index d12dc0e0..6b0811bb 100644 --- a/components/common/common.vue +++ b/components/common/common.vue @@ -37,6 +37,9 @@ + + + + \ No newline at end of file diff --git a/pages/index/index.css b/pages/index/index.css index 3db744d8..8e944b06 100644 --- a/pages/index/index.css +++ b/pages/index/index.css @@ -165,31 +165,4 @@ } .plugins-homemiddleadv .item { flex: 1 1 calc(50% - 20rpx); -} - -/** - * 弹屏广告 - 插件 - */ -.plugins-popupscreen { - position: fixed; - left: 0; - top: 0; - z-index: 20; - background-color: rgb(0 0 0 / 0.3); -} -.plugins-popupscreen .close { - right: 10%; - top: 0; - z-index: 1; - width: 46rpx; - height: 46rpx; - line-height: 46rpx; - background-color: rgb(4 4 4 / 0.3); - border: solid 1px #a9a9a9; -} -.plugins-popupscreen .content { - margin-top: calc(50vh - 200rpx) !important; -} -.plugins-popupscreen .content image { - width: 600rpx; } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 19938310..1d5048a5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -261,16 +261,6 @@ - - - - - - - - - - @@ -392,11 +382,6 @@ plugins_label_data: null, // 首页中间广告插件 plugins_homemiddleadv_data: null, - // 弹屏广告、这里设置一天后可以再次显示 - plugins_popupscreen_data: null, - plugins_popupscreen_status: 0, - plugins_popupscreen_cache_key: 'plugins_popupscreen_cache_key', - plugins_popupscreen_timer: null, // 哀悼灰度插件 plugins_mourning_data_is_app: app.globalData.is_app_mourning(), // 标签插件 @@ -554,7 +539,6 @@ plugins_activity_data: (data.plugins_activity_data || null) == null || data.plugins_activity_data.length <= 0 ? null : data.plugins_activity_data, plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data, plugins_homemiddleadv_data: (data.plugins_homemiddleadv_data || null) == null || data.plugins_homemiddleadv_data.length <= 0 ? null : data.plugins_homemiddleadv_data, - plugins_popupscreen_data: data.plugins_popupscreen_data || null, plugins_mourning_data_is_app: parseInt(data.plugins_mourning_data || 0) == 1, plugins_blog_data: data.plugins_blog_data || null, plugins_realstore_data: data.plugins_realstore_data || null, @@ -574,9 +558,6 @@ // 设置顶部导航的默认颜色 this.set_navigation_bar_color(); - // 弹屏广告插件处理 - this.plugins_popupscreen_handle(); - // 是否需要重新加载数据 if (parseInt(data.is_result_data_cache || 0) == 1) { this.init({ is_cache: 0 }); @@ -661,48 +642,6 @@ app.globalData.url_event(e); }, - // 弹屏广告插件处理 - plugins_popupscreen_handle() { - if (this.plugins_popupscreen_data != null) { - // 不存在关闭缓存或者超过间隔时间则显示 - var cv = parseInt(uni.getStorageSync(this.plugins_popupscreen_cache_key)) || 0; - var pv = parseInt(this.plugins_popupscreen_data.interval_time) || 86400; - if (cv == 0 || cv + pv < app.globalData.get_timestamp()) { - // 是否开启自动关闭 - var timer = null; - var ct = parseInt(this.plugins_popupscreen_data.close_time) || 0; - if (ct > 0) { - var self = this; - timer = setTimeout(function () { - self.setData({ - plugins_popupscreen_status: 0, - }); - uni.setStorage({ - key: self.plugins_popupscreen_cache_key, - data: app.globalData.get_timestamp(), - }); - }, ct * 1000); - } - this.setData({ - plugins_popupscreen_status: 1, - plugins_popupscreen_timer: timer, - }); - } - } - }, - - // 弹屏广告 - 插件 关闭事件 - plugins_popupscreen_close_event(e) { - this.setData({ - plugins_popupscreen_status: 0, - }); - uni.setStorage({ - key: this.plugins_popupscreen_cache_key, - data: app.globalData.get_timestamp(), - }); - clearInterval(this.plugins_popupscreen_timer); - }, - // 轮播改变、背景色处理 change_banner(color) { if ((color || null) == null) {