diff --git a/app.js b/app.js index bb220e0..248db54 100644 --- a/app.js +++ b/app.js @@ -44,34 +44,34 @@ App({ "backgroundColor": "#ffffff", "list": [ { - "pagePath": "/pages/index/index", - "text": "首页", - "iconPath": "/components/tabbarComponent/icon/home.png", - "selectedIconPath": "/component/tabbarComponent/icon/homeSel.png" + "pagePath": "pages/index/index", + "iconPath": "/components/tabbarComponent/icons/home.png", + "selectedIconPath": "/components/tabbarComponent/icons/homeActive.png", + "text": "首页" }, { "pagePath": "pages/insight/index", - "text": "服务", - "iconPath": "/components/tabbarComponent/icon/service.png", - "selectedIconPath": "/component/tabbarComponent/icon/serviceSel.png" + "iconPath": "/components/tabbarComponent/icons/insight.png", + "selectedIconPath": "/components/tabbarComponent/icons/insightActive.png", + "text": "洞察" }, { "pagePath": "pages/brandSearch/index", - "text": "导航", - "iconPath": "/components/tabbarComponent/icon/navagati.png", - "isSpecial": true, + "iconPath": "/components/tabbarComponent/icons/appSearch.png", + "selectedIconPath": "/components/tabbarComponent/icons/appSearchActive.png", + "text": "品牌搜索" }, { "pagePath": "pages/varComm/index", - "text": "订单", - "iconPath": "/components/tabbarComponent/icon/order.png", - "selectedIconPath": "/component/tabbarComponent/icon/orderSel.png" + "iconPath": "/components/tabbarComponent/icons/varComm.png", + "selectedIconPath": "/components/tabbarComponent/icons/varCommActive.png", + "text": "对比" }, { "pagePath": "pages/mine/index", - "text": "我的", - "iconPath": "/components/tabbarComponent/icon/my.png", - "selectedIconPath": "/component/tabbarComponent/icon/mySel.png" + "iconPath": "/components/tabbarComponent/icons/mine.png", + "selectedIconPath": "/components/tabbarComponent/icons/mineActive.png", + "text": "我的" } ] } diff --git a/app.json b/app.json index 91733b0..2b82fab 100644 --- a/app.json +++ b/app.json @@ -17,32 +17,32 @@ "tabBar": { "list": [{ "pagePath": "pages/index/index", - "iconPath": "icons/home.png", - "selectedIconPath": "icons/homeActive.png", + "iconPath": "/components/tabbarComponent/icons/home.png", + "selectedIconPath": "/components/tabbarComponent/icons/homeActive.png", "text": "首页" }, { "pagePath": "pages/insight/index", - "iconPath": "icons/insight.png", - "selectedIconPath": "icons/insightActive.png", + "iconPath": "/components/tabbarComponent/icons/insight.png", + "selectedIconPath": "/components/tabbarComponent/icons/insightActive.png", "text": "洞察" }, { "pagePath": "pages/brandSearch/index", - "iconPath": "icons/appSearch.png", - "selectedIconPath": "icons/appSearchActive.png", + "iconPath": "/components/tabbarComponent/icons/appSearch.png", + "selectedIconPath": "/components/tabbarComponent/icons/appSearchActive.png", "text": "品牌搜索" }, { "pagePath": "pages/varComm/index", - "iconPath": "icons/varComm.png", - "selectedIconPath": "icons/varCommActive.png", + "iconPath": "/components/tabbarComponent/icons/varComm.png", + "selectedIconPath": "/components/tabbarComponent/icons/varCommActive.png", "text": "对比" }, { "pagePath": "pages/mine/index", - "iconPath": "icons/mine.png", - "selectedIconPath": "icons/mineActive.png", + "iconPath": "/components/tabbarComponent/icons/mine.png", + "selectedIconPath": "/components/tabbarComponent/icons/mineActive.png", "text": "我的" } ] diff --git a/icons/appSearch.png b/components/tabbarComponent/icons/appSearch.png similarity index 100% rename from icons/appSearch.png rename to components/tabbarComponent/icons/appSearch.png diff --git a/icons/appSearchActive.png b/components/tabbarComponent/icons/appSearchActive.png similarity index 100% rename from icons/appSearchActive.png rename to components/tabbarComponent/icons/appSearchActive.png diff --git a/icons/home.png b/components/tabbarComponent/icons/home.png similarity index 100% rename from icons/home.png rename to components/tabbarComponent/icons/home.png diff --git a/icons/homeActive.png b/components/tabbarComponent/icons/homeActive.png similarity index 100% rename from icons/homeActive.png rename to components/tabbarComponent/icons/homeActive.png diff --git a/icons/insight.png b/components/tabbarComponent/icons/insight.png similarity index 100% rename from icons/insight.png rename to components/tabbarComponent/icons/insight.png diff --git a/icons/insightActive.png b/components/tabbarComponent/icons/insightActive.png similarity index 100% rename from icons/insightActive.png rename to components/tabbarComponent/icons/insightActive.png diff --git a/icons/mine.png b/components/tabbarComponent/icons/mine.png similarity index 100% rename from icons/mine.png rename to components/tabbarComponent/icons/mine.png diff --git a/icons/mineActive.png b/components/tabbarComponent/icons/mineActive.png similarity index 100% rename from icons/mineActive.png rename to components/tabbarComponent/icons/mineActive.png diff --git a/icons/varComm.png b/components/tabbarComponent/icons/varComm.png similarity index 100% rename from icons/varComm.png rename to components/tabbarComponent/icons/varComm.png diff --git a/icons/varCommActive.png b/components/tabbarComponent/icons/varCommActive.png similarity index 100% rename from icons/varCommActive.png rename to components/tabbarComponent/icons/varCommActive.png diff --git a/icons/路径.png b/components/tabbarComponent/icons/路径.png similarity index 100% rename from icons/路径.png rename to components/tabbarComponent/icons/路径.png diff --git a/components/tabbarComponent/tabbar.js b/components/tabbarComponent/tabbar.js index d08d77e..ef13b7e 100644 --- a/components/tabbarComponent/tabbar.js +++ b/components/tabbarComponent/tabbar.js @@ -13,22 +13,35 @@ Component({ "selectedColor": "#1c1c1b", "list": [ { - "pagePath": "/pages/index/index", - "iconPath": "icon/icon_home.png", - "selectedIconPath": "icon/icon_home_HL.png", - "text": "首页" + "pagePath": "pages/index/index", + "text": "首页", + "iconPath": "icons/home.png", + "selectedIconPath": "icons/homeActive.png", }, { - "pagePath": "/pages/middle/middle", - "iconPath": "icon/icon_release.png", + "pagePath": "pages/insight/index", + "text": "洞查", + "iconPath": "icons/insight.png", + "selectedIconPath": "icons/insightActive.png", + }, + { + "pagePath": "pages/brandSearch/index", + "text": "导航", + "iconPath": "icons/appSearch.png", + "selectedIconPath": "icons/appSearchActive.png", "isSpecial": true, - "text": "发布" }, { - "pagePath": "/pages/mine/mine", - "iconPath": "icon/icon_mine.png", - "selectedIconPath": "icon/icon_mine_HL.png", - "text": "我的" + "pagePath": "pages/varComm/index", + "text": "对比", + "iconPath": "icons/varComm.png", + "selectedIconPath": "icons/varCommActive.png", + }, + { + "pagePath": "pages/mine/index", + "text": "我的", + "iconPath": "icons/mine.png", + "selectedIconPath": "icons/mineActive.png", } ] } diff --git a/components/tabbarComponent/tabbar.wxml b/components/tabbarComponent/tabbar.wxml index 595b360..8a41c80 100644 --- a/components/tabbarComponent/tabbar.wxml +++ b/components/tabbarComponent/tabbar.wxml @@ -1,12 +1,12 @@ - - - + + + {{item.text}} - - + + {{item.text}} diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 1a19c4f..903bcb5 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,7 +1,7 @@ - {{item}} + {{item}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 73e0dc1..bda7405 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -23,26 +23,6 @@ font-weight: bold; color: #027AFF; background: #F0F5FF; } -/* .condition{ - height: 50rpx; - background-color: #027AFF; - margin: 32rpx 32rpx 48rpx 32rpx; - display: grid; - grid-template-columns: repeat(4,1fr); - grid-gap: 32rpx; -} */ -.condition text{ - text-align: center; - background: #FAFBFD; - border-radius: 4rpx; - font-size: 10px; - color: #333333; - padding: 16rpx 24rpx; -} -.condition .active{ - color: #027AFF; -} - .top { /* background-color: #006BFF; */ height: 556rpx;