Merge pull request '1' (#7) from dengjie into dev

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/7

manifest.json

@@ -50,10 +50,11 @@
 	"quickapp": {},
 	/* 小程序特有相关 */
 	"mp-weixin": {
-        "appid" : "wxcd04cc6e99e18009",
+		"appid": "wx4c2099a19c69664f",
 		"setting": {
 			"urlCheck": false,
-            "es6" : false
+			"es6": false,
+			"postcss": false
 		},
 		"usingComponents": true
 	},

pages.json

@@ -46,7 +46,7 @@
 	"tabBar": {
 		"color": "#CCCCCC",
 		"selectedColor": "#0EBB5B",
-		"borderStyle": "none",
+		"borderStyle": "white",
 		"backgroundColor": "#FFFFFF",
 		"list": [{
 				"pagePath": "pages/index/index",