Merge branch 'develop' into dev_aliyun

app/services/duplicate_course_service.rb

@@ -130,7 +130,7 @@ class DuplicateCourseService < ApplicationService
   def copy_attachments!
     origin_course.attachments.each do |origin_attachment|
       attachment = origin_attachment.copy
-      attachment.tag_list.add(origin_attachment.tag_list) # tag关联
+      # attachment.tag_list.add(origin_attachment.tag_list) # tag关联
       attachment.container = course
       attachment.created_on = Time.now
       attachment.publish_time = nil

public/react/config/webpack.config.dev.js

@@ -29,7 +29,8 @@ const env = getClientEnvironment(publicUrl);
 module.exports = {
   // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
-	devtool: "cheap-module-eval-source-map",  // 开启调试
+	devtool: "cheap-module-eval-source-map",
+	// 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.

public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js

@@ -40,7 +40,7 @@ class DetailCardsEditAndAdd extends Component{
       page:1,
       ChooseShixunList:undefined,
       hometypepvisible:true,
-      shixuns_listedit:undefined,
+      shixuns_listedit:[],
       shixuns_listeditlist:[],
       patheditarry:[],
       stage_descriptions:undefined,
@@ -75,8 +75,9 @@ class DetailCardsEditAndAdd extends Component{
   }
   clickShixunchoose=()=>{
 
-    let{patheditarry,shixuns_listeditlist}=this.state
-    let newshixuns_listedit=[];
+    let{patheditarry,shixuns_listeditlist,shixuns_listedit}=this.state
+
+    let newshixuns_listedit=shixuns_listedit;
     let list=shixuns_listeditlist
 
     if(patheditarry.length===0){
@@ -129,7 +130,7 @@ class DetailCardsEditAndAdd extends Component{
       stage_names:undefined,
       stage_descriptions:undefined,
       shixuns_listeditlist:[],
-      shixuns_listedit:undefined
+      shixuns_listedit:[]
     })
     this.props.getPathCardsLists();
   }
@@ -241,6 +242,7 @@ class DetailCardsEditAndAdd extends Component{
 
   //保存
   clickShixunsaves=()=>{
+  	debugger
     let{stage_names,stage_descriptions,shixuns_listeditlist}=this.state;
     let newstage_descriptions=stage_descriptions;
 
@@ -572,7 +574,7 @@ class DetailCardsEditAndAdd extends Component{
 
                                  <span className="subject_stage_shixun_index">
 
-                                   <span className="subject_stage_shixun_index">{this.props.sum+1}</span>-{key+1}&nbsp;&nbsp;{item.shixun_name}
+                                   <span className="subject_stage_shixun_index">{this.props.sum}</span>-{key+1}&nbsp;&nbsp;{item.shixun_name}
 
                                  </span>