代码合并冲突解决

pages.json

@@ -70,6 +70,13 @@
 				"navigationBarTitleText": "全部操作"
 			}
 		},
+		{
+			"path": "pages/permission/secondary_page",
+			"pageId": "PAGES_SECONDARY_PAGE",
+			"style": {
+				"navigationBarTitleText": "更多操作"
+			}
+		},
 		{
 			"path": "pages/shopSetUp/decoration",
 			"pageId": "PAGES_DECORATION",
@@ -390,35 +397,35 @@
 		{
 			"root": "pageSalesSummary",
 			"pages": [{
-				"pageId": "PAGES_DATA_SUMMARY",
-				"path": "index",
-				"style": {
-					"navigationBarTitleText": "数据统计"
+					"pageId": "PAGES_DATA_SUMMARY",
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "数据统计"
+					}
+				},
+				{
+					"pageId": "PAGES_SALES_SUMMARY",
+					"path": "sales",
+					"style": {
+						"navigationBarTitleText": "销量统计"
+					}
+				},
+				{
+					"pageId": "PAGES_PRODUCT_SALES_RANKING",
+					"path": "productSalesRanking",
+					"style": {
+						"navigationBarTitleText": "商品销售排行"
+					}
+				},
+				{
+					"pageId": "PAGES_TABLE_SALES_RANKING",
+					"path": "table",
+					"style": {
+						"navigationBarTitleText": "桌台统计"
+					}
 				}
-			},
-			{
-				"pageId": "PAGES_SALES_SUMMARY",
-				"path": "sales",
-				"style": {
-					"navigationBarTitleText": "销量统计"
-				}
-			},
-			{
-				"pageId": "PAGES_PRODUCT_SALES_RANKING",
-				"path": "productSalesRanking",
-				"style": {
-					"navigationBarTitleText": "商品销售排行"
-				}
-			},
-			{
-				"pageId": "PAGES_TABLE_SALES_RANKING",
-				"path": "table",
-				"style": {
-					"navigationBarTitleText": "桌台统计"
-				}
-			}
-			
-		]
+
+			]
 		},
 		{
 			"root": "pageLineUp",
@@ -711,18 +718,6 @@
 						"navigationBarTitleText": "运营余额"
 					}
 				},
-
-
-
-
-
-
-
-
-
-
-
-
 				{
 					"pageId": "PAGES_MARKET_NEW_USER_DISCOUNT",
 					"path": "newUserDiscount/index",
@@ -814,7 +809,7 @@
 						// "navigationBarTitleText": "添加会员等级"
 					}
 				}
-				
+
 
 			]
 		},