Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

src/manifest.json

 {
-    "name" : "成长树",
+    "name" : "进阶成长树",
     "appid" : "__UNI__C97C820",
     "description" : "甲鹤小程序学生端",
     "versionName" : "1.0.0",

src/pages/login/accountLogin.vue

@@ -178,14 +178,14 @@
 									}
 								}, 1000);
 							}else{
-								
 								data.loading=false
 								Toast.fail("账号类型选择错误，请根据真实身份选择")
 							}
 						}else{
 							data.loading=false
-							methods.getErpStudentBindInfo({Account:msg.Account})
-							//console.log('1111')
+							if(data.userLoginType!=2){
+								methods.getErpStudentBindInfo({Account:msg.Account})
+							}
 						}
 					}).catch(e=>{
 						console.log(e)