Merge branch 'master' of http://39.96.27.29/zhengxiuming/shop_mobile_uni

pages.json

@@ -11,6 +11,6 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#fbfbfb"
 	}
-}
+}