支付宝兼容，排队预约修改，订单逻辑修改

pages.json

@@ -127,13 +127,6 @@
 				"navigationBarTitleText": "订单列表"
 			}
 		},
-		
-		{
-			"path": "pages/order/order_detail",
-			"style": {
-				"navigationBarTitleText": "订单详情"
-			}
-		},
 	
 		{
 			"path": "pages/order/successful",
@@ -227,13 +220,6 @@
 				}
 			}
 		},
-		 {
-			"path": "pages/order_food/confirm_order",
-			"style": {
-				"navigationBarTitleText": "确认订单",
-				"navigationBarBackgroundColor": "#E8AD7B"
-			}
-		 },
 		{
 			"path": "pages/make/list",
 			"style": {
@@ -363,6 +349,30 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "pagesOrder",
+			"pages": [
+				{
+					"path": "orderAMeal/index",
+					"style": {
+						"navigationBarTitleText": "点单"
+					}
+				},
+				{
+					"path": "confirm_order/index",
+					"style": {
+						"navigationBarTitleText": "确认订单",
+						"navigationBarBackgroundColor": "#E8AD7B"
+					}
+				},
+				{
+					"path": "order_detail/index",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {