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

app/controllers/courses_controller.rb

@@ -103,7 +103,10 @@ class CoursesController < ApplicationController
 
   def course_videos
     videos = @course.videos
+    @video_module = @course.course_modules.find_by(module_type: "video")
     if params[:category_id].present? && params[:category_id].to_i != 0
+      @category = @video_module&.course_second_categories.find_by(id: params[:category_id])
+      tip_exception("子目录id有误") if !@category.present?
       videos = videos.where(course_videos: {course_second_category_id: params[:category_id].to_i})
     end
 

app/controllers/weapps/course_member_attendances_controller.rb

@@ -29,23 +29,18 @@ class Weapps::CourseMemberAttendancesController < ApplicationController
 
   def create
     tip_exception("签到码不能为空") if params[:code].blank?
-    tip_exception("attendance_mode参数不对") unless ["NUMBER", "QRCODE", "QUICK"].include?(params[:attendance_mode])
+    tip_exception("attendance_mode参数不对") unless ["NUMBER", "QRCODE"].include?(params[:attendance_mode])
 
-    if params[:attendance_mode] == "QUICK"
+    attendance = CourseAttendance.find_by(attendance_code: params[:code])
-      attendance = CourseAttendance.find_by(id: params[:attendance_id])
+    tip_exception("签到码输入有误") if attendance.blank? || attendance.course.blank?
-    else
-      attendance = CourseAttendance.find_by(attendance_code: params[:code])
-    end
-    tip_exception("该签到不存在") if attendance.blank? || attendance.course.blank?
 
     member = attendance.course.students.find_by(user_id: current_user.id)
-    tip_exception("该签到不存在") if member.blank?
+    tip_exception("签到码输入有误") if member.blank?
 
     tip_exception("不在签到时间内") unless attendance.current_attendance?
 
-    tip_exception("只支持数字签到") if attendance.mode != "ALL" && attendance.mode == "NUMBER" && params[:attendance_mode] != "NUMBER"
+    tip_exception("只支持数字签到") if attendance.mode != "ALL" && attendance.mode == "NUMBER" && params[:attendance_mode] == "QRCODE"
-    tip_exception("只支持二维码签到") if attendance.mode != "ALL" && attendance.mode == "QRCODE" && params[:attendance_mode] != "QRCODE"
+    tip_exception("只支持二维码签到") if attendance.mode != "ALL" && attendance.mode == "QRCODE" && params[:attendance_mode] == "NUMBER"
-    tip_exception("只支持快捷签到") if attendance.mode == "QUICK" && params[:attendance_mode] != "QUICK"
 
     current_attendance = attendance.course_member_attendances.find_by(user_id: current_user.id)
     if current_attendance.present?

app/views/courses/course_videos.json.jbuilder

@@ -1,3 +1,8 @@
 json.count @count
 json.videos @videos, partial: 'users/videos/video', as: :video
-json.course_id @course.id
+json.course_id @course.id
+if @category.present?
+  json.category_id @category.id
+  json.category_name @category.name
+end
+json.course_module_id @video_module&.id

public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx

@@ -91,7 +91,7 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
                     <div className="clearfix mb20 shaiContent">
                         <span className="shaiTitle fl">方向：</span>
                         <div className="fl pr shaiAllItem">
-                            <a className={searchValue === "a" ? "shaiItem shixun_repertoire active" : "shaiItem shixun_repertoire"} value="a" onClick={onSearchAll}>全部</a>
+                            <li className={searchValue === "a" ? "shaiItem shixun_repertoire active" : "shaiItem shixun_repertoire"} value="a" onClick={onSearchAll}>全部</li>
                             {
                                 navs.map((item, key) => {
                                     return (