Merge branch 'v3' of http://git.jihengcc.cn/starfire/spark-coach into v3

config/api.js

@@ -4,7 +4,7 @@
 //const API_BASE = 'http://www.jihengcc.cn:17080/newApi'
 
 //const API_BASE = 'http://192.168.1.117:8089'
-//const API_BASE = 'http://192.168.1.109/newApi'
+// const API_BASE = 'http://192.168.1.109/newApi'
 const API_BASE = 'http://192.168.1.145/newApi'
 // const API_BASE = 'http://192.168.1.126:30000'
 //const API_BASE = 'http://192.168.1.117:8089'

manifest.json

@@ -104,7 +104,6 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        /* 小程序特有相关 */
         "appid" : "wxeb29362c7f2e9e48",
         "setting" : {
             "urlCheck" : false,

pages.json

@@ -136,7 +136,7 @@
 	"globalStyle": {
 		"navigationStyle": "default",
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "星火纵横销售端",
+		"navigationBarTitleText": "星火纵横教练端",
 		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#F8F8F8"
 	},