From 9ac82f855719149747ab6e40a63cae4ff09f6d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E9=A3=9E=E6=B4=8B?= <15778543+xufeiyang6017@user.noreply.gitee.com> Date: Fri, 26 Dec 2025 16:41:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E4=BD=8D=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96tab-bar?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 实现瀑布流布局中的广告位展示 - 添加完整卡片广告(full_card)和半高图片广告(half_image)两种样式 - 修复筛选逻辑确保广告位正常显示 - 优化tab-bar默认显示,移除动态隐藏逻辑 - 添加广告点击事件处理 - 创建统一的广告配置管理 --- custom-tab-bar/index.js | 23 ++------- images/轮播图1.jpg | Bin 0 -> 11404 bytes images/轮播图2.jpg | Bin 0 -> 11404 bytes pages/index/index.js | 102 ++++++++++++++++++++++++++-------------- pages/index/index.wxml | 32 +++++++++++++ pages/index/index.wxss | 48 +++++++++++++++++++ utils/ad-config.js | 38 +++++++++++++++ 7 files changed, 189 insertions(+), 54 deletions(-) create mode 100644 images/轮播图1.jpg create mode 100644 images/轮播图2.jpg create mode 100644 utils/ad-config.js diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index f312d0b..7eb2926 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -10,12 +10,11 @@ Component({ */ data: { selected: 'index', - show: true, // 控制tab-bar显示状态 - badges: {}, // 存储各tab的未读标记 - // 记录tabBar数据,用于匹配 + show: true, + badges: {}, tabBarItems: [ { key: 'index', route: 'pages/index/index' }, - { key: 'chat', route: 'pages/chat/index', badgeKey: 'chat' }, // 消息中心 + { key: 'chat', route: 'pages/chat/index', badgeKey: 'chat' }, { key: 'settlement', route: 'pages/settlement/index' }, { key: 'profile', route: 'pages/profile/index' } ] @@ -261,31 +260,17 @@ Component({ } }, - // 开始监听全局tab-bar显示状态变化 startTabBarStatusListener() { - // 使用定时器定期检查全局状态 this.tabBarStatusTimer = setInterval(() => { try { const app = getApp() if (app && app.globalData) { - // 检查显示状态 - if (typeof app.globalData.showTabBar !== 'undefined') { - const showTabBar = app.globalData.showTabBar - if (this.data.show !== showTabBar) { - this.setData({ - show: showTabBar - }) - console.log('tab-bar显示状态更新:', showTabBar) - } - } - - // 更新未读标记 this.updateBadges() } } catch (e) { console.error('监听tab-bar状态失败:', e) } - }, 100) // 每100ms检查一次,确保响应迅速 + }, 100) } }, diff --git a/images/轮播图1.jpg b/images/轮播图1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..92bf382058a03452c26b4e34176aa94ae99c285c GIT binary patch literal 11404 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 aLo^}z$0~BBF{ZjK0I9!v-K%H*@c;m==|qnJ literal 0 HcmV?d00001 diff --git a/images/轮播图2.jpg b/images/轮播图2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..92bf382058a03452c26b4e34176aa94ae99c285c GIT binary patch literal 11404 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 aLo^}z$0~BBF{ZjK0I9!v-K%H*@c;m==|qnJ literal 0 HcmV?d00001 diff --git a/pages/index/index.js b/pages/index/index.js index 7db2595..c07bc87 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -308,6 +308,10 @@ Page({ newGoods = newGoods.filter(item => (item.status || '').toLowerCase() !== 'hidden') + if (!isLoadMore && newGoods.length > 0) { + newGoods = this.insertAdSlots(newGoods) + } + let updatedGoods = [] if (isLoadMore) { const existingIds = new Set(this.data.goods.map(item => item.id)); @@ -318,7 +322,15 @@ Page({ } const filteredGoods = this.applyFilters(updatedGoods) + console.log('filteredGoods 数量:', filteredGoods.length) + console.log('filteredGoods[0]:', filteredGoods[0]) + console.log('filteredGoods[1]:', filteredGoods[1]) + const { leftColumnGoods, rightColumnGoods } = this.distributeToColumns(filteredGoods) + console.log('leftColumnGoods 数量:', leftColumnGoods.length) + console.log('rightColumnGoods 数量:', rightColumnGoods.length) + console.log('leftColumnGoods[0]:', leftColumnGoods[0]) + console.log('rightColumnGoods[0]:', rightColumnGoods[0]) this.setData({ goods: updatedGoods, @@ -331,24 +343,62 @@ Page({ }) }, - // 瀑布流布局:将商品分配到左右两列实现真正的高度自适应 - distributeToColumns: function(goods) { - if (!goods || goods.length === 0) { - return { leftColumnGoods: [], rightColumnGoods: [] } + // 插入广告位数据 + insertAdSlots: function(goods) { + if (!goods || goods.length === 0) return goods + + console.log('insertAdSlots 被调用,商品数量:', goods.length) + + const adSlot1 = { + id: 'ad_slot_1', + name: '广告位1', + imageUrls: ['/images/轮播图1.jpg'], + price: 0, + adType: 'full_card', + isAd: true } - const leftColumn = [] - const rightColumn = [] + const adSlot2 = { + id: 'ad_slot_2', + name: '广告位2', + imageUrls: ['/images/轮播图1.jpg'], + price: 0, + adType: 'half_image', + isAd: true + } - for (let i = 0; i < goods.length; i++) { - if (i % 2 === 0) { - leftColumn.push(goods[i]) - } else { - rightColumn.push(goods[i]) + const result = [adSlot1, adSlot2, ...goods] + console.log('插入广告后的商品数量:', result.length) + console.log('第一个商品:', result[0]) + console.log('第二个商品:', result[1]) + + return result + }, + + // 广告点击事件处理 + onAdClick: function(e) { + const adData = e.currentTarget.dataset.ad + console.log('广告被点击, 广告ID:', adData ? adData.id : 'unknown') + + if (adData && adData.adType) { + wx.showToast({ + title: '广告位: ' + adData.adType, + icon: 'none', + duration: 2000 + }) + + if (adData.adType === 'full_card') { + console.log('完整卡片广告被点击') + } else if (adData.adType === 'half_image') { + console.log('半高图片广告被点击') } + } else { + wx.showToast({ + title: '广告加载中', + icon: 'loading', + duration: 1500 + }) } - - return { leftColumnGoods: leftColumn, rightColumnGoods: rightColumn } }, // 加载商品数据 - 淘宝风格优化 @@ -419,19 +469,20 @@ Page({ else if (category === '红壳') keyword = '红' else if (category === '白壳') keyword = '白' - filtered = filtered.filter(item => (item.name || '').includes(keyword)) + filtered = filtered.filter(item => item.isAd || (item.name || '').includes(keyword)) } if (this.data.searchKeyword) { const keyword = this.data.searchKeyword.toLowerCase() filtered = filtered.filter(item => + item.isAd || (item.name || '').toLowerCase().includes(keyword) || (item.region || '').toLowerCase().includes(keyword) ) } if (this.data.selectedRegion !== '全国') { - filtered = filtered.filter(item => item.region === this.data.selectedRegion) + filtered = filtered.filter(item => item.isAd || item.region === this.data.selectedRegion) } filtered.sort((a, b) => { @@ -475,10 +526,6 @@ Page({ return { leftColumnGoods: leftColumn, rightColumnGoods: rightColumn } }, - }) - - return filtered - }, // 分组商品用于交错布局(左长右短,左短右长交替) groupGoodsForStaggeredLayout: function(goods) { @@ -725,36 +772,21 @@ Page({ // 滚动事件处理 onScroll: function(e) { - // 获取滚动信息 const { scrollTop, scrollHeight, clientHeight } = e.detail; const distanceToBottom = scrollHeight - scrollTop - clientHeight; - // 获取全局状态 const app = getApp(); if (!app || !app.globalData) { return; } - // 当滚动到底部且没有更多数据时,隐藏tabBar - if (distanceToBottom < 100 && !this.data.hasMoreData) { - app.globalData.showTabBar = false; - } - // 当往上滚动不在底部时,立即重新显示tabBar - else { - app.globalData.showTabBar = true; - } + app.globalData.showTabBar = true; }, // 上拉加载更多 onReachBottom: function() { if (this.data.hasMoreData && !this.data.loadingMore) { this.loadGoods(true) - } else if (!this.data.hasMoreData) { - // 没有更多数据时,隐藏tabBar - const app = getApp(); - if (app && app.globalData) { - app.globalData.showTabBar = false; - } } }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 6180858..83fca64 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -170,12 +170,28 @@ + + + + + 广告 + + + + @@ -215,12 +231,28 @@ + + + + + 广告 + + + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 8ebc967..7fb770c 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1228,6 +1228,54 @@ page { right: 25%; } +/* 广告位样式 */ +.ad-card { + position: relative; + border-radius: 16rpx; + overflow: hidden; + background: #fff; + box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08); +} + +/* 完整卡片广告 */ +.ad-full-card { + width: 100%; + height: 400rpx; +} + +.ad-image { + width: 100%; + height: 400rpx; +} + +/* 半高图片广告 */ +.ad-half-image { + width: 100%; + height: 200rpx; +} + +.ad-image-half { + width: 100%; + height: 200rpx; +} + +/* 广告标签 */ +.ad-badge { + position: absolute; + top: 16rpx; + right: 16rpx; + background: rgba(0, 0, 0, 0.5); + color: #fff; + font-size: 20rpx; + padding: 4rpx 12rpx; + border-radius: 6rpx; +} + +/* 广告点击效果 */ +.ad-card:active { + opacity: 0.85; +} + /* 空商品状态 */ .empty-goods { display: flex; diff --git a/utils/ad-config.js b/utils/ad-config.js new file mode 100644 index 0000000..c436f75 --- /dev/null +++ b/utils/ad-config.js @@ -0,0 +1,38 @@ +const adConfig = { + ads: [ + { + id: 'ad_slot_1', + name: '广告位1', + type: 'full_card', + imageUrl: '/images/轮播图1.jpg', + link: '', + show: true + }, + { + id: 'ad_slot_2', + name: '广告位2', + type: 'half_image', + imageUrl: '/images/轮播图1.jpg', + link: '', + show: true + } + ], + + getAdById(id) { + return this.ads.find(ad => ad.id === id && ad.show) + }, + + getFullCardAd() { + return this.ads.find(ad => ad.type === 'full_card' && ad.show) + }, + + getHalfImageAd() { + return this.ads.find(ad => ad.type === 'half_image' && ad.show) + }, + + getAllAds() { + return this.ads.filter(ad => ad.show) + } +} + +module.exports = adConfig