Merge branches 'courseware' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into courseware

app/controllers/challenges_controller.rb

@@ -164,7 +164,11 @@ class ChallengesController < ApplicationController
 
     @challenges = @shixun.challenges.joins(join_sql).select(base_columns).uniq
 
-    @shixun_modify = (@challenges.select{|c| c.status.present? }.size == @challenges.size)
+    @shixun_modify = (@challenges.select{|c| !c.status.nil? }.size != @challenges.size)
+
+    logger.info("########shixun_modify：#{@shixun_modify}")
+    logger.info("########challenges.size：#{@challenges.size}")
+    logger.info("########challenge_inspect：#{@challenges.inspect}")
 
     #@challenges = @shixun.challenges.fields_for_list
     @editable = @shixun.status == 0 # before_action：有判断权限，如果没发布，则肯定是管理人员

public/react/src/modules/user/usersInfo/InfosShixun.js

@@ -243,7 +243,7 @@ class InfosShixun extends Component{
             <li className={category == "collect" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
               onClick={() => this.changeCategory("collect")}
               href="javascript:void(0)"
-              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}学习的</a></li>
+              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}收藏的</a></li>
           </div>
           <style>
             {