diff --git a/pages.json b/pages.json index e0af25f..897e25b 100644 --- a/pages.json +++ b/pages.json @@ -74,24 +74,24 @@ }, "tabBar": { "color": "#999999", - "selectedColor": "#7DBB9D", - "backgroundColor": "#f6f1ec", - "iconWidth": "8px", + "selectedColor": "#ff3b30", + "backgroundColor": "#ffffff", + "iconWidth": "24px", "list": [ { - "text": "祝福", + "text": "首页", "pagePath": "pages/index/index", "iconPath": "static/images/tabBar/home.png", "selectedIconPath": "static/images/tabBar/home_s.png" }, { - "text": "制作", + "text": "定制贺卡", "pagePath": "pages/make/index", - "iconPath": "static/images/tabBar/message.png", - "selectedIconPath": "static/images/tabBar/message_s.png" + "iconPath": "static/images/tabBar/creation.png", + "selectedIconPath": "static/images/tabBar/creation_s.png" }, { - "text": "个人中心", + "text": "我的", "pagePath": "pages/mine/mine", "iconPath": "static/images/tabBar/me.png", "selectedIconPath": "static/images/tabBar/me_s.png" diff --git a/pages/index/index.vue b/pages/index/index.vue index 5bf0294..48184d8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -127,10 +127,10 @@ const features = ref([ type: "card", }, { - title: "红包封面", - subtitle: "获取新年红包封面", - icon: "/static/icon/hongbao.png", - type: "video", + title: "新年运势", + subtitle: "抽取新年关键词", + icon: "/static/icon/yunshi.png", + type: "fortune", }, { title: "新春头像", @@ -139,10 +139,10 @@ const features = ref([ type: "avatar_decor", }, { - title: "新年运势", - subtitle: "抽取新年关键词", - icon: "/static/icon/yunshi.png", - type: "fortune", + title: "精美壁纸", + subtitle: "获取精美壁纸", + icon: "/static/icon/bizhi.png", + type: "video", }, ]); @@ -178,16 +178,16 @@ const popularCards = ref([ ]); const onFeatureTap = (item) => { - if (item.type === "avatar_decor" || item.type === "avatar_frame") { - uni.navigateTo({ url: "/pages/avatar/index" }); - return; - } if (item.type === "fortune") { uni.navigateTo({ url: "/pages/fortune/index" }); return; } if (item.type === "card") { - uni.navigateTo({ url: "/pages/make/index" }); + uni.switchTab({ url: "/pages/make/index" }); + return; + } + if (item.type === "avatar_decor" || item.type === "avatar_frame") { + uni.navigateTo({ url: "/pages/avatar/index" }); return; } uni.showToast({ title: `进入:${item.title}`, icon: "none" }); diff --git a/static/icon/bizhi.png b/static/icon/bizhi.png new file mode 100644 index 0000000..90228d9 Binary files /dev/null and b/static/icon/bizhi.png differ diff --git a/static/images/tabBar/creation.png b/static/images/tabBar/creation.png new file mode 100644 index 0000000..e2203fc Binary files /dev/null and b/static/images/tabBar/creation.png differ diff --git a/static/images/tabBar/creation_s.png b/static/images/tabBar/creation_s.png new file mode 100644 index 0000000..42dc189 Binary files /dev/null and b/static/images/tabBar/creation_s.png differ diff --git a/static/images/tabBar/home.png b/static/images/tabBar/home.png index ad2a147..36e857b 100644 Binary files a/static/images/tabBar/home.png and b/static/images/tabBar/home.png differ diff --git a/static/images/tabBar/home_old.png b/static/images/tabBar/home_old.png new file mode 100644 index 0000000..ad2a147 Binary files /dev/null and b/static/images/tabBar/home_old.png differ diff --git a/static/images/tabBar/home_s.png b/static/images/tabBar/home_s.png index babf3d4..68e9952 100644 Binary files a/static/images/tabBar/home_s.png and b/static/images/tabBar/home_s.png differ diff --git a/static/images/tabBar/home_s_old.png b/static/images/tabBar/home_s_old.png new file mode 100644 index 0000000..babf3d4 Binary files /dev/null and b/static/images/tabBar/home_s_old.png differ diff --git a/static/images/tabBar/me.png b/static/images/tabBar/me.png index 8c8e736..c7b4b9a 100644 Binary files a/static/images/tabBar/me.png and b/static/images/tabBar/me.png differ diff --git a/static/images/tabBar/me_old.png b/static/images/tabBar/me_old.png new file mode 100644 index 0000000..8c8e736 Binary files /dev/null and b/static/images/tabBar/me_old.png differ diff --git a/static/images/tabBar/me_s.png b/static/images/tabBar/me_s.png index 5fad5ad..760765d 100644 Binary files a/static/images/tabBar/me_s.png and b/static/images/tabBar/me_s.png differ diff --git a/static/images/tabBar/me_s_old.png b/static/images/tabBar/me_s_old.png new file mode 100644 index 0000000..5fad5ad Binary files /dev/null and b/static/images/tabBar/me_s_old.png differ