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

app/controllers/admins/subject_settings_controller.rb

@@ -8,16 +8,15 @@ class Admins::SubjectSettingsController < Admins::BaseController
   end
 
   def update
-    if params[:sub_disciplines]
+    sub_discipline_ids = params[:sub_disciplines] || []
-      sub_ids = params[:sub_disciplines].reject(&:blank?).map(&:to_i)
+    sub_ids = sub_discipline_ids.reject(&:blank?).map(&:to_i)
-      old_sub_ids = current_subject.sub_discipline_containers.pluck(:sub_discipline_id)
+    old_sub_ids = current_subject.sub_discipline_containers.pluck(:sub_discipline_id)
-      new_ids = sub_ids - old_sub_ids
+    new_ids = sub_ids - old_sub_ids
-      delete_ids = old_sub_ids - sub_ids
+    delete_ids = old_sub_ids - sub_ids
-      sub_params = new_ids.map{|sub| {sub_discipline_id: sub}}
+    sub_params = new_ids.map{|sub| {sub_discipline_id: sub}}
-      ActiveRecord::Base.transaction do
+    ActiveRecord::Base.transaction do
-        current_subject.sub_discipline_containers.where(sub_discipline_id: delete_ids).destroy_all
+      current_subject.sub_discipline_containers.where(sub_discipline_id: delete_ids).destroy_all
-        current_subject.sub_discipline_containers.create!(sub_params)
+      current_subject.sub_discipline_containers.create!(sub_params)
-      end
     end
   end
 

app/controllers/courses_controller.rb

@@ -1157,8 +1157,8 @@ class CoursesController < ApplicationController
 
             CourseAddStudentCreateWorksJob.perform_later(course.id, [current_user.id])
             StudentJoinCourseNotifyJob.perform_later(current_user.id, course.id)
+            student_role = 1
           end
-          student_role = 1
         end
 
         # 创建教师身份
@@ -1195,9 +1195,9 @@ class CoursesController < ApplicationController
           teacher_role = 1
         end
 
-        if teacher_role && student_role
+        if (teacher_role && student_role) || message.to_s == "您已是课堂成员"
           render json: { status: 0, message: message, course_id: course.id}
-        elsif student_role
+        elsif student_role.to_i == 1
           render json: { status: 0, message: "加入成功", course_id: course.id}
         else
           normal_status(message)

app/views/weapps/subjects/index.json.jbuilder

@@ -1,6 +1,7 @@
 json.subjects @subjects do |subject|
   json.(subject, :id, :excellent, :name, :stages_count, :shixuns_count)
-  json.myshixuns_count subject.member_count
+  json.myshixuns_count subject.excellent ? subject.member_count : subject.myshixuns_count
+  json.challenges_count subject.subject_challenge_count
   json.image_url url_to_avatar(subject)
   json.allow_visit subject.status > 1 || User.current.manager_of_subject?(subject) || User.current.admin?
 end

app/views/weapps/subjects/show.json.jbuilder

@@ -2,6 +2,7 @@ json.subject do
   json.name @subject.name
   json.description @subject.description
   json.shixuns_count @subject.shixuns_count
+  json.challenges_count @subject.subject_challenge_count
   json.member_count @subject.member_count
   json.subject_score @subject.all_score
   json.learning_notes @subject.learning_notes

public/react/public/index.html

@@ -17,7 +17,7 @@
     <meta name=”Description” Content=”EduCoder翻转课堂教学模式，颠覆了传统教学模式，让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生，使学生可个性化化学，学生的学习主体得到了彰显。”>
     <meta name=”Description” Content=”EduCoder实训项目为单个知识点关卡实践训练，帮助学生巩固单一弱点，强化学习。 ”>
     <meta name=”Description” Content=”EduCoder实践教学平台，各类大赛为进一步提高各类学生综合运用高级语言程序设计能力，培养创新意识和实践探索精神，发掘优秀软件人才。 ”>
-    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3">
+    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3, user-scalable=no">
 
 
     <meta name="theme-color" content="#000000">
@@ -202,5 +202,11 @@
     <script type="text/javascript" src="/js/create_kindeditor.js"></script>
     <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/educoder/edu_application.js"></script> -->
     <script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script>
+
+    <script>
+      document.body.addEventListener('touchmove', function (e) {
+        e.preventDefault(); //阻止默认的处理方式(阻止下拉滑动的效果)
+      }, {passive: false});  
+    </script>
   </body>
 </html>