Merge branch 'master' of https://git.yuzhankeji.cn/TmOct5/ZhHealth into master

pages.json

@@ -95,27 +95,35 @@
 		"path": "pages/address/index",
 		"name": "Address",
 		"style": {
-			"navigationBarTitleText": "地址"
+			"navigationBarTitleText": "收货地址"
 		}
 	}, {
 		"path": "pages/address/edit",
 		"name": "AddressEdit",
 		"style": {
-			"navigationBarTitleText": "编辑",
+			"navigationBarTitleText": "编辑",
 			"enablePullDownRefresh": false
 		}
 	}, {
-		"path": "pages/pay/pay",
+		"path": "pages/pay/pay",
 		"name": "Pay",
 		"style": {
 			"navigationBarTitleText": "收银台",
 			"navigationBarBackgroundColor": "#FFFFFF"
 		}
 	}, {
-		"path": "pages/store/list",
+		"path": "pages/store/list",
 		"name": "StoreList",
 		"style": {
-			"navigationBarTitleText": "列表",
+			"navigationBarTitleText": "商品",
+			"navigationBarBackgroundColor": "#FFFFFF",
+			"enablePullDownRefresh": true
+		}
+	}, {
+		"path": "pages/store/meals",
+		"name": "StoreMeals",
+		"style": {
+			"navigationBarTitleText": "套餐",
 			"navigationBarBackgroundColor": "#FFFFFF",
 			"enablePullDownRefresh": true
 		}