diff --git a/app/controllers/weapps/challenges_controller.rb b/app/controllers/weapps/challenges_controller.rb index e29f16f28..24bd4baeb 100644 --- a/app/controllers/weapps/challenges_controller.rb +++ b/app/controllers/weapps/challenges_controller.rb @@ -6,10 +6,10 @@ class Weapps::ChallengesController < Weapps::BaseController # 关卡有展示效果 || 选择题 || jupyter实训 || vnc || 隐藏代码窗口 || html+css实训 # @challenge.show_type != -1 || @challenge.st == 1 || @shixun.is_jupyter? || @shixun.vnc || # @shixun.hide_code? || (@shixun.small_mirror_name & ["Css", "Html", "Web"]).present? - play = @challenge.st == 1 || @shixun.is_jupyter? || @shixun.vnc || + play = @shixun.is_jupyter? || @shixun.vnc || @shixun.hide_code? || (@shixun.small_mirror_name & ["Css", "Html", "Web"]).present? - if play + if @challenge.st != 1 && play normal_status(-5, "该关卡暂不支持小程序") else render_ok diff --git a/app/forms/users/update_account_form.rb b/app/forms/users/update_account_form.rb index 0eae399d8..3c90b3271 100644 --- a/app/forms/users/update_account_form.rb +++ b/app/forms/users/update_account_form.rb @@ -14,6 +14,7 @@ class Users::UpdateAccountForm validates :technical_title, presence: true, unless: -> { identity.to_s == 'student' } validates :student_id, presence: true, if: -> { identity.to_s == 'student' } validates :school_id, presence: true + validates :department_id, presence: true validate :check_school_exist def check_school_exist diff --git a/public/images/educoder/xcx/newpathsbanner.png b/public/images/educoder/xcx/newpathsbanner.png new file mode 100644 index 000000000..43e8bf1d1 Binary files /dev/null and b/public/images/educoder/xcx/newpathsbanner.png differ diff --git a/public/images/educoder/xcx/pathsbanner.png b/public/images/educoder/xcx/pathsbanner.png index 1023b49d5..43e8bf1d1 100644 Binary files a/public/images/educoder/xcx/pathsbanner.png and b/public/images/educoder/xcx/pathsbanner.png differ