Merge branch 'y_dev' of e.coding.net:g-cphe0354/new-cashier/new-cashier into dwb

jeepay-ui-uapp-merchant/pages.json

@@ -999,6 +999,14 @@
 					"style": {
 						"navigationBarTitleText": "订单详情"
 					}
+				},
+				{
+					"pageId": "PAGES_CRESATE_ORDER_PAY",
+					"path" : "pay-order/pay-order",
+					"style" : 
+					{
+						"navigationBarTitleText" : "结账"
+					}
 				}
 
 			]
@@ -1206,6 +1214,27 @@
 					"navigationBarTitleText": "添加折扣券"
 				}
 			}]
+		},{
+			"root": "pagePrinter",
+			"pages": [{
+				"pageId": "PAGES_PRINTER_INDEX",
+				"path" : "index/index",
+				"style" : 
+				{
+					"navigationBarTitleText" : "打印机"
+				}
+			},
+			{
+				"pageId": "PAGES_PRINTER_ADD",
+				"path" : "add-printer/add-printer",
+				"style" : 
+				{
+					// "navigationBarTitleText" : "添加/编辑云打印机"
+					"navigationBarTitleText" : ""
+				}
+			}
+				
+			]
 		}
 	],
 	"globalStyle": {