fix competition error && add user result at weapp

dev_sync_trustie
p31729568 5 years ago
parent 7dbf9eab15
commit 99e4793fa4

@ -30,7 +30,7 @@ class Weapps::CodeSessionsController < Weapps::BaseController
set_session_openid(result['openid'])
set_weapp_session_key(result['session_key']) # weapp session_key写入缓存 后续解密需要
render_ok(openid: result['openid'], logged: logged)
render_ok(openid: result['openid'], logged: logged) unless logged
rescue Wechat::Error => ex
render_error(ex.message)
end

@ -19,6 +19,5 @@ class Weapps::SessionsController < Weapps::BaseController
OpenUsers::Wechat.create!(user: user, uid: session_unionid) if user.wechat_open_user.blank?
successful_authentication(user)
render_ok
end
end

@ -28,7 +28,7 @@ class CompetitionTeam < ApplicationRecord
while self.class.exists?(invite_code: code)
code = CODE_CHARS.sample(6).join
end
self.code = code
self.invite_code = code
code
end

@ -0,0 +1,3 @@
json.user do
json.partial! 'weapps/shared/user', locals: { user: current_user }
end

@ -0,0 +1,3 @@
json.user do
json.partial! 'weapps/shared/user', locals: { user: current_user }
end

@ -0,0 +1,14 @@
json.username user.full_name
json.real_name user.real_name
json.login user.login
json.user_id user.id
json.image_url url_to_avatar(user)
json.admin user.admin?
json.business user.business?
json.is_teacher user.user_extension&.teacher?
json.user_identity user.identity
json.tidding_count 0
json.user_phone_binded user.phone.present?
json.phone user.phone
json.profile_completed user.profile_completed?
json.professional_certification user.professional_certification
Loading…
Cancel
Save