登录

api/api.js

@@ -5,11 +5,9 @@ const apiService = {
 	 /**
 	  * 登录
 	  */
-	login(passWord,phone) {
-		console.log(passWord,phone,888888888);
-		
+	login(passWord,username) {
 		// return http.get('/merchant/app/loginPassWord',params)	
-		return http.get('/merchant/app/loginPassWord?passWord='+passWord+'&phone='+phone +'&userType=2')	
+		return http.get('/merchant/app/loginPassWord?password='+passWord+'&username='+username +'&userType=2')	
 	},
 	/**
 	  * 手机号码登录