Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/subjects_controller.rb

@@ -440,7 +440,7 @@ class SubjectsController < ApplicationController
 
   # 用户进展和获取的标签
   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)
 
     # 如果没有通关的，没必要再继续统计了

public/react/src/modules/page/main/ActionView.js

@@ -93,7 +93,7 @@ class ActionView extends Component {
 	      		<span className="mt10 -flex c_grey ml15" id="time-consuming">
 				  	{!!time_limit && 
 					  <span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}
-					  	<span className="spliter"></span>
+					  	{record && <span className="spliter"></span>}
 					  </span>} 
 	      			{!gameBuilding && record ? 
 	      				// <Tooltip title={ "本次评测耗时(编译、运行总时间)" }></Tooltip>