配置页

pages.json

@@ -76,6 +76,12 @@
 				"navigationBarTitleText": "商品详情页",
 				"navigationStyle": "custom"
 			}
+		},{
+			"path": "order/pendGroup",
+			"style": {
+				"navigationBarTitleText": "待成团页",
+				"navigationStyle": "custom"
+			}
 		},{
 			"path": "order/orderDetail",
 			"style": {
@@ -139,8 +145,8 @@
 		},{
 			"path": "myCenter/myMerchant",
 			"style": {
-				"navigationBarTitleText": "商家主页",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "商家注册",
+				"enablePullDownRefresh": false
 			}
 		},{
 			"path": "myCenter/myFriend",
@@ -164,13 +170,13 @@
 			"path": "myCenter/merchantRegister",
 			"style": {
 				"navigationBarTitleText": "商家注册",
-				"navigationStyle": "custom"
+				"enablePullDownRefresh": false
 			}
 		},{
 			"path": "myCenter/addGoods",
 			"style": {
 				"navigationBarTitleText": "新增商品",
-				"navigationStyle": "custom"
+				"enablePullDownRefresh": false
 			}
 		}]
 	}, {