diff --git a/src/pages.json b/src/pages.json index dd9cbea8..d9904c5b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -89,6 +89,13 @@ // "group": "商城" // } // }, + { + "path": "pages/wechat-tabbar/index", + "style": { + "navigationBarTitleText": "邀请福利", + "navigationStyle": "custom" + } + }, { "path": "pages/home/home", "style": { @@ -313,13 +320,6 @@ { "root": "pages/wechat", "pages": [ - { - "path": "index", - "style": { - "navigationBarTitleText": "邀请福利", - "navigationStyle": "custom" - } - }, { "path": "pages/gift/index", "style": { @@ -960,6 +960,23 @@ "selectedColor": "#D29E52", "backgroundColor": "#222222", "borderStyle": "black", + /* #ifdef MP-WEIXIN */ + "list": [ + { + "pagePath": "pages/wechat-tabbar/index", + "text": "邀请福利", + "iconPath": "static/tabbar/moments.png", + "selectedIconPath": "static/tabbar/moments-active.png" + }, + { + "pagePath": "pages/profile/profile", + "text": "我的", + "iconPath": "static/tabbar/profile.png", + "selectedIconPath": "static/tabbar/profile-active.png" + } + ], + /* #endif MP-WEIXIN */ + /* #ifndef MP-WEIXIN */ "list": [ { "pagePath": "pages/home/home", @@ -986,5 +1003,6 @@ "selectedIconPath": "static/tabbar/profile-active.png" } ] + /* #endif MP-WEIXIN */ } -} +} \ No newline at end of file diff --git a/src/pages/wechat/index.vue b/src/pages/wechat-tabbar/index.vue similarity index 100% rename from src/pages/wechat/index.vue rename to src/pages/wechat-tabbar/index.vue diff --git a/src/sheep/components/scroll-list/scroll-list.vue b/src/sheep/components/scroll-list/scroll-list.vue index b3c295b3..06df7c7c 100644 --- a/src/sheep/components/scroll-list/scroll-list.vue +++ b/src/sheep/components/scroll-list/scroll-list.vue @@ -1,75 +1,61 @@