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

app/helpers/myshixuns_helper.rb

@@ -12,7 +12,7 @@ module MyshixunsHelper
     end
   end
 
-  def view_answer_time game, user_id
+  def view_answer_time game
-    game.game_answers.where(user_id: user_id).last&.view_time
+    game.game_answers.where(user_id: game.user_id).last&.view_time
   end
 end

app/views/myshixuns/challenges.json.jbuilder

@@ -6,6 +6,6 @@ json.array! @games do |game|
   json.identifier get_game_identifier(@shixun.task_pass, game, @identity)
   json.get_gold game.user_get_gold_and_experience(@shixun.status, challenge)[0]
   json.get_experience game.user_get_gold_and_experience(@shixun.status, challenge)[1]
-  json.view_answer_time  view_answer_time(game, current_user.id)
+  json.view_answer_time  view_answer_time(game)
   json.finished_time game.end_time
 end

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

@@ -305,7 +305,8 @@ class LeftViewContainer extends Component {
 								id: item.answer_id,
 								name: item.answer_name,
 								score: item.answer_score,
-								contents: item.answer_contents
+								contents: item.answer_contents,
+								view_time: item.view_time
 							}
 						})
 				    	newAnswers.forEach((item, index) => {
@@ -558,7 +559,7 @@ class LeftViewContainer extends Component {
 //  /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
   	render() {
   		const { challenge } = this.props
-  		const { tabIndex } = this.state;
+			const { tabIndex } = this.state;
 	    return (
 	    	<React.Fragment>
             <ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>