dever 4 years ago
parent
commit
9f0b943461
2 changed files with 11 additions and 1 deletions
  1. 7 1
      front/page/user.py
  2. 4 0
      front/static/pc/js/main.js

+ 7 - 1
front/page/user.py

@@ -21,7 +21,13 @@ class login_path(Load):
 				temp = user['password'].split('_')
 				if Demeter.md5(password, temp[1]) == user['password']:
 					self.set_secure_cookie('user', str(user['id']))
-					self.out('yes', {'id':user['id']})
+					farm = self.service('common').one('farm', id=user['farm_id'])
+					if 'eros_status' in farm and farm['eros_status'] == 1 and farm['eros_server']:
+						url = 'http://' + farm['eros_server'] + ':8081/user/login?username='+mobile+'&password='+temp[0]
+						#self.redirect(url)
+						self.out('yes', {'id':user['id'],'url':url})
+					else:
+						self.out('yes', {'id':user['id']})
 					return
 		self.out('手机号或安全码错误,登录失败')
 

+ 4 - 0
front/static/pc/js/main.js

@@ -205,6 +205,10 @@ var Farm =
 		} else if(value.data == 'reload') {
 			this.Jump('');
 		} else {
+			if (value.data.url) {
+				this.Jump(value.data.url);
+				return;
+			}
 			if($("#url").length) {
 				url = $("#url").val();
 			} else {