合并代码

jeepay-ui-uapp-merchant/pages.json

@@ -2,8 +2,8 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
-		"^my-(.*)":"@/components/my-components/my-$1.vue",
-		"^u-(.*)": "@/components/my-components/u-$1/u-$1.vue"
+			"^my-(.*)": "@/components/my-components/my-$1.vue",
+			"^u-(.*)": "@/components/my-components/u-$1/u-$1.vue"
 		}
 	},
 	"pages": [{
@@ -875,18 +875,16 @@
 				},
 				{
 					"pageId": "PAGES_PRODUCT_INVOICING_LIST",
-					"path" : "invoicing-list/invoicing-list",
-					"style" : 
-					{
-						"navigationBarTitleText" : "库存记录"
+					"path": "invoicing-list/invoicing-list",
+					"style": {
+						"navigationBarTitleText": "库存记录"
 					}
 				},
 				{
 					"pageId": "PAGES_PRODUCT_INVOICING_CHECK",
-					"path" : "invoicing-check/invoicing-check",
-					"style" : 
-					{
-						"navigationBarTitleText" : "库存盘点"
+					"path": "invoicing-check/invoicing-check",
+					"style": {
+						"navigationBarTitleText": "库存盘点"
 					}
 				}
 
@@ -997,10 +995,9 @@
 				},
 				{
 					"pageId": "PAGES_CRESATE_ORDER_DETAIL",
-					"path" : "order-detail/order-detail",
-					"style" : 
-					{
-						"navigationBarTitleText" : "订单详情"
+					"path": "order-detail/order-detail",
+					"style": {
+						"navigationBarTitleText": "订单详情"
 					}
 				}
 
@@ -1172,26 +1169,41 @@
 		{
 			"root": "pageStoringWine",
 			"pages": [{
-				"pageId": "PAGES_STORING_WINE_INDEX",
-				"path": "index/index",
+					"pageId": "PAGES_STORING_WINE_INDEX",
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "存酒管理"
+					}
+				},
+				{
+					"pageId": "PAGES_STORING_WINE_EDIT",
+					"path": "storing-wine/storing-wine",
+					"style": {
+						"navigationBarTitleText": "存酒"
+					}
+				},
+				{
+					"pageId": "PAGES_STORING_WINE_RECORD_DETAIL",
+					"path": "record-details/record-details",
+					"style": {
+						"navigationBarTitleText": "记录详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pageCoupon",
+			"pages": [{
+				"pageId": "PAGES_COUPON_INDEX",
+				"path": "index",
 				"style": {
-					"navigationBarTitleText": "存酒管理"
+					"navigationBarTitleText": "优惠券管理"
 				}
-			},
-			{
-				"pageId": "PAGES_STORING_WINE_EDIT",
-				"path" : "storing-wine/storing-wine",
-				"style" : 
-				{
-					"navigationBarTitleText" : "存酒"
-				}
-			},
-			{
-				"pageId": "PAGES_STORING_WINE_RECORD_DETAIL",
-				"path" : "record-details/record-details",
-				"style" : 
-				{
-					"navigationBarTitleText" : "记录详情"
+			}, {
+				"pageId": "PAGES_COUPON_DISCOUNTCOUPONS",
+				"path": "discountCoupons",
+				"style": {
+					"navigationBarTitleText": "添加折扣券"
 				}
 			}]
 		}