Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

pages.json

@@ -1237,8 +1237,7 @@
 					"pageId": "PAGES_ORDER_INDEX",
 					"path": "index/index",
 					"style": {
-						"navigationBarTitleText": "订单管理",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "订单管理"
 					}
 				},
 				{
@@ -1247,20 +1246,6 @@
 					"style": {
 						"navigationBarTitleText": "订单详情"
 					}
-				},
-				{
-					"pageId": "PAGES_ORDER_PAY",
-					"path": "pay-order/pay-order",
-					"style": {
-						"navigationBarTitleText": "结账"
-					}
-				},
-				{
-					"pageId": "PAGES_ORDER_TUIKUAN",
-					"path": "tuikuan/tuikuan",
-					"style": {
-						"navigationBarTitleText": "退款"
-					}
 				}
 
 			]
@@ -1296,7 +1281,6 @@
 						"navigationBarTitleText": "商品销售排行"
 					}
 				}
-
 			]
 		},
 		{
@@ -1315,7 +1299,22 @@
 				}
 			}]
 		},
-
+		{
+			"root": "pageStaff",
+			"pages": [{
+				"pageId": "PAGES_STAFF",
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "员工管理"
+				}
+			}, {
+				"pageId": "PAGES_ADD_STAFF",
+				"path": "addstaff",
+				"style": {
+					"navigationBarTitleText": "新增员工"
+				}
+			}]
+		},
 		{
 			"root": "pageConsumables",
 			"pages": [{
@@ -1358,8 +1357,8 @@
 					"pageId": "PAGES_PRINTER_ADD",
 					"path": "add-printer/add-printer",
 					"style": {
-						// "navigationBarTitleText" : "添加/编辑云打印机"
-						"navigationBarTitleText": ""
+						"navigationBarTitleText" : "添加/编辑云打印机"
+						// "navigationBarTitleText": ""
 					}
 				},
 				{