Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_unstable^2
hjm 5 years ago
commit 08c4238838

@ -440,7 +440,7 @@ class SubjectsController < ApplicationController
# 用户进展和获取的标签 # 用户进展和获取的标签
def user_subject_progress challenge_ids def user_subject_progress challenge_ids
pass_games = Game.select(:id, :cost_time, :challenge_id).where(status: 2, user_id: current_user.id, challenge_id: challenge_ids) pass_games = Game.select(:id, :cost_time, :challenge_id).where(status: 2, user_id: current_user.id, challenge_id: challenge_ids) if current_user.logged?
@all_score = Challenge.where(id: challenge_ids).sum(:score) @all_score = Challenge.where(id: challenge_ids).sum(:score)
# 如果没有通关的,没必要再继续统计了 # 如果没有通关的,没必要再继续统计了

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 151 KiB

@ -446,7 +446,7 @@ table.text-file{}
/*-------------------------------实训路径-------------------------------*/ /*-------------------------------实训路径-------------------------------*/
.path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png"); .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
background-color: #131b39; background-color: #000a4f;
/*background-size: cover;*/ /*background-size: cover;*/
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;

@ -448,7 +448,7 @@ table.text-file{}
/*-------------------------------实训路径-------------------------------*/ /*-------------------------------实训路径-------------------------------*/
.path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png"); .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
background-color: #131b39; background-color: #000a4f;
/*background-size: cover;*/ /*background-size: cover;*/
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;

Loading…
Cancel
Save