diff --git a/src/pages.json b/src/pages.json index 153210d..386a3d4 100644 --- a/src/pages.json +++ b/src/pages.json @@ -18,24 +18,84 @@ "needLogin": true }, { - "path": "pages/tab/home/index", + "path": "pages/tab/banquet/index", "style": { - "navigationBarTitleText": "菜单分类", + "navigationBarTitleText": "首页", "navigationStyle": "custom" }, "needLogin": true }, { - "path": "pages/tab/list/index", + "path": "pages/tab/banquet/cook", "style": { - "navigationBarTitleText": "食谱清单", + "navigationBarTitleText": "选厨师", "navigationStyle": "custom" }, "needLogin": true }, - + { + "path": "pages/tab/banquet/hotel", + "style": { + "navigationBarTitleText": "选酒店", + "navigationStyle": "custom" + }, + "needLogin": true + } ], "subPackages": [ + { + "root": "pages/banquet", + "pages": [ + { + "path": "cook/detail", + "style": { + "navigationBarTitleText": "厨师详情", + "navigationStyle": "custom" + }, + "needLogin": true + }, + { + "path": "hotel/detail", + "style": { + "navigationBarTitleText": "酒店详情", + "navigationStyle": "custom" + }, + "needLogin": true + }, + { + "path": "combo/index", + "style": { + "navigationBarTitleText": "餐标选择", + "navigationStyle": "custom" + }, + "needLogin": true + }, + { + "path": "combo/detail", + "style": { + "navigationBarTitleText": "订单详情", + "navigationStyle": "custom" + }, + "needLogin": true + }, + { + "path": "order/detail", + "style": { + "navigationBarTitleText": "订单详情", + "navigationStyle": "custom" + }, + "needLogin": true + }, + { + "path": "order/list", + "style": { + "navigationBarTitleText": "付款列表", + "navigationStyle": "custom" + }, + "needLogin": true + } + ] + }, { "root": "pages/common", "pages": [ @@ -60,7 +120,6 @@ "navigationStyle": "custom" } }, - { "path": "webview/index", "style": { @@ -96,7 +155,7 @@ "navigationBarTitleText": "订单详情", "navigationStyle": "custom" }, - "needLogin": true + "needLogin": true }, { "path": "goods/order_detail", @@ -106,98 +165,14 @@ }, "needLogin": true } - - - ] - }, - { - "root": "pages/banquet", - "pages": [ - - { - "path": "home/index", - "style": { - "navigationBarTitleText": "首页", - "navigationStyle": "custom" - }, - "needLogin": true - }, - - { - "path": "cook/list", - "style": { - "navigationBarTitleText": "厨师", - "navigationStyle": "custom" - }, - "needLogin": true - }, - { - "path": "cook/detail", - "style": { - "navigationBarTitleText": "厨师详情", - "navigationStyle": "custom" - }, - "needLogin": true - }, - - { - "path": "hotel/list", - "style": { - "navigationBarTitleText": "酒店", - "navigationStyle": "custom" - }, - "needLogin": true - }, - { - "path": "hotel/detail", - "style": { - "navigationBarTitleText": "酒店详情", - "navigationStyle": "custom" - }, - "needLogin": true - }, - - { - "path": "combo/index", - "style": { - "navigationBarTitleText": "餐标选择", - "navigationStyle": "custom" - }, - "needLogin": true - }, - { - "path": "combo/detail", - "style": { - "navigationBarTitleText": "订单详情", - "navigationStyle": "custom" - }, - "needLogin": true - }, - { - "path": "order/detail", - "style": { - "navigationBarTitleText": "订单详情", - "navigationStyle": "custom" - }, - "needLogin": true - }, - { - "path": "order/list", - "style": { - "navigationBarTitleText": "付款列表", - "navigationStyle": "custom" - }, - "needLogin": true - } - - ] } + ], "preloadRule": { - "pages/tab/home/index": { + "pages/tab/banquet/index": { "network": "all", - "packages": ["pages/common"] + "packages":["pages/common","pages/banquet"] } }, "tabBar": { @@ -206,43 +181,43 @@ "borderStyle": "black", "backgroundColor": "#ffffff", "list": [ - { - "iconPath": "static/images/tabbar/shouye.png", - "selectedIconPath": "static/images/tabbar/shouye_selected.png", - "pagePath": "pages/banquet/home/index", - "text": "首页" - }, - { - "iconPath": "static/images/tabbar/shouye.png", - "selectedIconPath": "static/images/tabbar/shouye_selected.png", - "pagePath": "pages/banquet/cook/list", - "text": "选厨师" - }, - { - "iconPath": "static/images/tabbar/bofang.png", - "selectedIconPath": "static/images/tabbar/bofang_selected.png", - "pagePath": "pages/banquet/hotel/list", - "text": "选酒店" - }, - - // { - // "iconPath": "static/images/tabbar/shouye.png", - // "selectedIconPath": "static/images/tabbar/shouye_selected.png", - // "pagePath": "pages/tab/home/index", - // "text": "菜单分类" - // }, - // { - // "iconPath": "static/images/tabbar/bofang.png", - // "selectedIconPath": "static/images/tabbar/bofang_selected.png", - // "pagePath": "pages/tab/list/index", - // "text": "食谱清单" - // }, - { - "iconPath": "static/images/tabbar/wode.png", - "selectedIconPath": "static/images/tabbar/wode_selected.png", - "pagePath": "pages/tab/user/index", - "text": "我的" - }] + { + "iconPath": "static/images/tabbar/shouye.png", + "selectedIconPath": "static/images/tabbar/shouye_selected.png", + "pagePath": "pages/tab/banquet/index", + "text": "首页" + }, + { + "iconPath": "static/images/tabbar/shouye.png", + "selectedIconPath": "static/images/tabbar/shouye_selected.png", + "pagePath": "pages/tab/banquet/cook", + "text": "选厨师" + }, + { + "iconPath": "static/images/tabbar/bofang.png", + "selectedIconPath": "static/images/tabbar/bofang_selected.png", + "pagePath": "pages/tab/banquet/hotel", + "text": "选酒店" + }, + // { + // "iconPath": "static/images/tabbar/shouye.png", + // "selectedIconPath": "static/images/tabbar/shouye_selected.png", + // "pagePath": "pages/tab/home/index", + // "text": "菜单分类" + // }, + // { + // "iconPath": "static/images/tabbar/bofang.png", + // "selectedIconPath": "static/images/tabbar/bofang_selected.png", + // "pagePath": "pages/tab/list/index", + // "text": "食谱清单" + // }, + { + "iconPath": "static/images/tabbar/wode.png", + "selectedIconPath": "static/images/tabbar/wode_selected.png", + "pagePath": "pages/tab/user/index", + "text": "我的" + } + ] }, "globalStyle": { "navigationBarTextStyle": "black", @@ -250,4 +225,4 @@ "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8" } -} +} \ No newline at end of file diff --git a/src/pages/banquet/cook/list.vue b/src/pages/tab/banquet/cook.vue similarity index 100% rename from src/pages/banquet/cook/list.vue rename to src/pages/tab/banquet/cook.vue diff --git a/src/pages/banquet/hotel/list.vue b/src/pages/tab/banquet/hotel.vue similarity index 100% rename from src/pages/banquet/hotel/list.vue rename to src/pages/tab/banquet/hotel.vue diff --git a/src/pages/banquet/home/index.vue b/src/pages/tab/banquet/index.vue similarity index 100% rename from src/pages/banquet/home/index.vue rename to src/pages/tab/banquet/index.vue