diff --git a/App.vue b/App.vue index 36c1cff..5067e3d 100644 --- a/App.vue +++ b/App.vue @@ -15,4 +15,7 @@ diff --git a/component/Tabbar/Tabbar.vue b/component/Tabbar/Tabbar.vue new file mode 100644 index 0000000..b2140e5 --- /dev/null +++ b/component/Tabbar/Tabbar.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/pages.json b/pages.json index 4df6e10..43aae8b 100644 --- a/pages.json +++ b/pages.json @@ -8,27 +8,73 @@ "style": { "navigationStyle": "custom" } - } - ], - "subPackages": [{ - "root": "package_sub", - "pages": [{ - "path": "pages/index/index", + }, + { + "path": "pages/order/order", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/me/me", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true + } + }, + { + "path": "component/Tabbar/Tabbar", "style": { - "navigationBarTitleText": "分包页面sub_index" + "navigationBarTitleText": "", + "enablePullDownRefresh": true } - }] - }], + } + ], + "subPackages": [ + { + "root": "package_sub", + "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "分包页面sub_index" + } + } + ] + } + ], "preloadRule": { - "package_sub/pages/index/index": { - "network": "all", - "packages": ["__APP__"] - } + "package_sub/pages/index/index": { + "network": "all", + "packages": [ + "__APP__" + ] + } }, "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8" + }, + "tabBar": { + "list": [ + { + "pagePath": "pages/index/index", + "text": "首页" + }, + { + "pagePath": "pages/order/order", + "text": "订单" + }, + { + "pagePath": "pages/me/me", + "text": "我的" + } + ], + "color": "", + "selectedColor": "", + "backgroundColor": "" } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 2ffa4f2..189af8c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,23 +1,555 @@ - diff --git a/pages/me/me.vue b/pages/me/me.vue new file mode 100644 index 0000000..167ea91 --- /dev/null +++ b/pages/me/me.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/pages/order/order.vue b/pages/order/order.vue new file mode 100644 index 0000000..4a60ca6 --- /dev/null +++ b/pages/order/order.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/static/index/ask-png.png b/static/index/ask-png.png new file mode 100644 index 0000000..e8a11db Binary files /dev/null and b/static/index/ask-png.png differ diff --git a/static/index/block1.png b/static/index/block1.png new file mode 100644 index 0000000..ccff24c Binary files /dev/null and b/static/index/block1.png differ diff --git a/static/index/block2.png b/static/index/block2.png new file mode 100644 index 0000000..564536d Binary files /dev/null and b/static/index/block2.png differ diff --git a/static/index/block3.png b/static/index/block3.png new file mode 100644 index 0000000..902f0f0 Binary files /dev/null and b/static/index/block3.png differ diff --git a/static/index/block4.png b/static/index/block4.png new file mode 100644 index 0000000..61e11cd Binary files /dev/null and b/static/index/block4.png differ diff --git a/static/index/bottom.png b/static/index/bottom.png new file mode 100644 index 0000000..9f1a3ec Binary files /dev/null and b/static/index/bottom.png differ diff --git a/static/index/honor-title.png b/static/index/honor-title.png new file mode 100644 index 0000000..710d055 Binary files /dev/null and b/static/index/honor-title.png differ diff --git a/static/index/icon.png b/static/index/icon.png new file mode 100644 index 0000000..fa54a9f Binary files /dev/null and b/static/index/icon.png differ diff --git a/static/index/jiuyifuwu.png b/static/index/jiuyifuwu.png new file mode 100644 index 0000000..2f22d63 Binary files /dev/null and b/static/index/jiuyifuwu.png differ diff --git a/static/index/jujiazhaohu.png b/static/index/jujiazhaohu.png new file mode 100644 index 0000000..625f1e2 Binary files /dev/null and b/static/index/jujiazhaohu.png differ diff --git a/static/index/peizhenfuwu.png b/static/index/peizhenfuwu.png new file mode 100644 index 0000000..3f76ab2 Binary files /dev/null and b/static/index/peizhenfuwu.png differ diff --git a/static/index/shangchengfuwu.png b/static/index/shangchengfuwu.png new file mode 100644 index 0000000..5db6902 Binary files /dev/null and b/static/index/shangchengfuwu.png differ diff --git a/static/index/top-bkg.png b/static/index/top-bkg.png new file mode 100644 index 0000000..c4ff91d Binary files /dev/null and b/static/index/top-bkg.png differ diff --git a/static/index/yiyuanpeihu.png b/static/index/yiyuanpeihu.png new file mode 100644 index 0000000..d130bb6 Binary files /dev/null and b/static/index/yiyuanpeihu.png differ diff --git a/static/tabbar/active-bkg.svg b/static/tabbar/active-bkg.svg new file mode 100644 index 0000000..ed8eede --- /dev/null +++ b/static/tabbar/active-bkg.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/static/tabbar/home.svg b/static/tabbar/home.svg new file mode 100644 index 0000000..aa51b6c --- /dev/null +++ b/static/tabbar/home.svg @@ -0,0 +1 @@ + diff --git a/static/tabbar/me.svg b/static/tabbar/me.svg new file mode 100644 index 0000000..61a870b --- /dev/null +++ b/static/tabbar/me.svg @@ -0,0 +1 @@ + diff --git a/static/tabbar/order.svg b/static/tabbar/order.svg new file mode 100644 index 0000000..6812958 --- /dev/null +++ b/static/tabbar/order.svg @@ -0,0 +1 @@ +