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

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

manifest.json

@@ -1,28 +1,28 @@
 {
-    "name" : "shitong-app",
-    "appid" : "",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
+	"name": "shitong-app",
+	"appid": "",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
 	/* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
 		},
 		/* 模块配置 */
-        "modules" : {},
+		"modules": {},
 		/* 应用发布信息 */
-        "distribute" : {
+		"distribute": {
 			/* android打包配置 */
-            "android" : {
-                "permissions" : [
+			"android": {
+				"permissions": [
 					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
 					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
 					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -41,33 +41,34 @@
 				]
 			},
 			/* ios打包配置 */
-            "ios" : {},
+			"ios": {},
 			/* SDK配置 */
-            "sdkConfigs" : {}
+			"sdkConfigs": {}
 		}
 	},
 	/* 快应用特有相关 */
-    "quickapp" : {},
+	"quickapp": {},
 	/* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wxcd04cc6e99e18009",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : false
+	"mp-weixin": {
+		"appid": "wx4c2099a19c69664f",
+		"setting": {
+			"urlCheck": false,
+			"es6": false,
+			"postcss": false
 		},
-        "usingComponents" : true
+		"usingComponents": true
 	},
-    "mp-alipay" : {
-        "usingComponents" : true
+	"mp-alipay": {
+		"usingComponents": true
 	},
-    "mp-baidu" : {
-        "usingComponents" : true
+	"mp-baidu": {
+		"usingComponents": true
 	},
-    "mp-toutiao" : {
-        "usingComponents" : true
+	"mp-toutiao": {
+		"usingComponents": true
 	},
-    "uniStatistics" : {
-        "enable" : false
+	"uniStatistics": {
+		"enable": false
 	},
-    "vueVersion" : "2"
+	"vueVersion": "2"
 }

pages.json

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