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

app/controllers/weapps/courses_controller.rb

@@ -1,6 +1,6 @@
 class Weapps::CoursesController < Weapps::BaseController
   # before_action :require_wechat_login!
-  before_action :teacher_allowed, except: [:create, :show]
+  before_action :teacher_allowed, except: [:create, :show, :shixun_homework_category]
 
   def create
     return render_error("只有老师身份才能创建课堂") unless current_user.is_teacher?
@@ -26,6 +26,10 @@ class Weapps::CoursesController < Weapps::BaseController
     @current_user = current_user
   end
 
+  def shixun_homework_category
+    @categories = current_course.shixun_course_modules.first&.course_second_categories
+  end
+
   private
 
   def course_params

app/views/weapps/courses/shixun_homework_category.json.jbuilder

@@ -0,0 +1,3 @@
+json.categories @categories.each do |category|
+  json.(category, :id, :name)
+end

config/routes.rb

@@ -880,7 +880,11 @@ Rails.application.routes.draw do
         post :cancel_sticky, on: :collection
       end
 
-      resources :courses, only: [:create, :update, :edit, :show]
+      resources :courses, only: [:create, :update, :edit, :show] do
+        member do
+          get :shixun_homework_category
+        end
+      end
     end
 
     resources :users_for_partners, only: [:index]

public/react/src/modules/courses/exercise/Exercisesetting.js

@@ -368,7 +368,6 @@ class Exercisesetting extends Component{
 			if(result.validate==false){
 				return;
 			}
-
 			this.commitSetting((result)=>{
 				console.log(result)
 				if(result.status==200){

public/react/src/modules/courses/poll/PollDetailTabForthRules.js

@@ -244,13 +244,13 @@ class PollDetailTabForthRules extends Component{
     for(var i=0;i<myRules.length;i++){
       let arr=Object.assign({}, myRules[parseInt(i)]);
       if(arr.poll_status < 2){
-        if(arr.course_group_id==undefined || arr.course_group_id.length==0){
+        if(arr.course_group_id===undefined || arr.course_group_id.length==0){
           arr.class_flag="请选择分班"
           flag1=false;
         }else{
           flag1=true;
         }
-        if(arr.publish_time==undefined){
+        if(arr.publish_time===undefined||arr.publish_time===null||arr.publish_time===""){
           arr.publish_flag="请选择发布时间"
           flag1=false;
         }
@@ -258,7 +258,7 @@ class PollDetailTabForthRules extends Component{
           arr.publish_flag="发布时间不能早于当前时间"
           flag1=false;
         }
-        if(arr.end_time==undefined){
+        if(arr.end_time===undefined||arr.end_time===null||arr.end_time===""){
           arr.end_flag="请选择截止时间"
           flag1=false;
         }
@@ -293,7 +293,7 @@ class PollDetailTabForthRules extends Component{
 		for(var i=0;i<myRules.length;i++){
 		let arr=Object.assign({}, this.state.rules[parseInt(i)]);
 				if(arr.poll_status < 2){
-						if(arr.course_group_id==undefined || arr.course_group_id.length==0){
+						if(arr.course_group_id===undefined || arr.course_group_id.length===0){
 								arr.class_flag="请选择分班"
 								flag=false;
 						}else{
@@ -301,7 +301,7 @@ class PollDetailTabForthRules extends Component{
 						}
 
 
-						if(arr.publish_time==undefined){
+						if(arr.publish_time==undefined||arr.publish_time===null||arr.publish_time===""){
 								arr.publish_flag="请选择发布时间"
 								flag1=false;
 						}
@@ -309,7 +309,7 @@ class PollDetailTabForthRules extends Component{
 								arr.publish_flag="发布时间不能早于当前时间"
 								flag1=false;
 						}
-						if(arr.end_time==undefined){
+						if(arr.end_time===undefined||arr.end_time===null||arr.end_time===""){
 								arr.end_flag="请选择截止时间"
 								flag2=false;
 						}
@@ -325,7 +325,7 @@ class PollDetailTabForthRules extends Component{
 					myRules[i]=arr
 				}
 		}
-		if(flag==false ||flag1==false ||flag2==false){
+		if(flag===false ||flag1===false ||flag2===false){
 			return {
 				validate: false,
 				rules: myRules