冲突解决

pages.json

@@ -961,70 +961,70 @@
 			]
 		},
 		{
-				"root": "pages/news1/",
+			"root": "pages/news1/",
-				"pages": [{
+			"pages": [{
-						"path": "logistics",
+					"path": "logistics",
-						"style": {
+					"style": {
-							"navigationStyle": "default",
+						"navigationStyle": "default",
-							"navigationBarTextStyle": "black",
+						"navigationBarTextStyle": "black",
-							"navigationBarTitleText": "物流问题"
+						"navigationBarTitleText": "物流问题"
-						}
+					}
-					},
+				},
-					{
+				{
-						"path": "help",
+					"path": "help",
-						"style": {
+					"style": {
-							// "enablePullDownRefresh": true,
+						// "enablePullDownRefresh": true,
-							"navigationStyle": "default",
+						"navigationStyle": "default",
-							"navigationBarTextStyle": "black",
+						"navigationBarTextStyle": "black",
-							"navigationBarTitleText": "帮助与客服"
+						"navigationBarTitleText": "帮助与客服"
-						}
-					},
-					{
-						"path": "jinqun",
-						"style": {
-							// "enablePullDownRefresh": true,
-							"navigationStyle": "default",
-							"navigationBarTextStyle": "black",
-							"navigationBarTitleText": "进社群享更多福利"
-						}
-					}, {
-						"path": "wallet",
-						"style": {
-							// "enablePullDownRefresh": true,
-							"navigationStyle": "custom",
-							"navigationBarTextStyle": "black",
-							"navigationBarTitleText": "我的钱包"
-						}
-					},
-					{
-						"path": "huoyuan",
-						"style": {
-							// "enablePullDownRefresh": true,
-							"navigationStyle": "custom",
-							"navigationBarTextStyle": "black",
-							"navigationBarTitleText": "我要货源"
-						}
-					},
-					{
-						"path": "feedback",
-						"style": {
-							// "enablePullDownRefresh": true,
-							"navigationStyle": "default",
-							"navigationBarTextStyle": "black",
-							"navigationBarTitleText": "我要反馈"
-						}
-					},
-					{
-						"path": "MerchantSettlement",
-						"style": {
-							"navigationStyle": "default",
-							"navigationBarTextStyle": "black",
-							"navigationBarTitleText": "商家入驻"
-						}
 					}
+				},
+				{
+					"path": "jinqun",
+					"style": {
+						// "enablePullDownRefresh": true,
+						"navigationStyle": "default",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "进社群享更多福利"
+					}
+				}, {
+					"path": "wallet",
+					"style": {
+						// "enablePullDownRefresh": true,
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "我的钱包"
+					}
+				},
+				{
+					"path": "huoyuan",
+					"style": {
+						// "enablePullDownRefresh": true,
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "我要货源"
+					}
+				},
+				{
+					"path": "feedback",
+					"style": {
+						// "enablePullDownRefresh": true,
+						"navigationStyle": "default",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "我要反馈"
+					}
+				},
+				{
+					"path": "MerchantSettlement",
+					"style": {
+						"navigationStyle": "default",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "商家入驻"
+					}
+				}
 	
-				]
+			]
-			}
+		}
 	],
 	"globalStyle": {
 		// #ifdef H5