Merge branch 'dev_chen' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_chen

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

@@ -1,15 +1,4 @@
 json.count @count
 json.videos @videos do |video|
-    #json.partial! 'users/videos/video', locals: { video: video }
-  json.extract! video, :id, :title, :cover_url, :file_url, :play_url, :vv, :user_id, :transcoded
-  #json.play_url url_base64_encode(video.play_url)
-  #json.file_url url_base64_encode(video.file_url)
-  json.play_duration video.video_play_duration
-  json.published_at video.display_published_at
-  json.created_at video.display_created_at
-  json.updated_at video.display_updated_at
-  user = video.user
-  json.user_name user&.real_name
-  json.user_img url_to_avatar(user)
-  json.user_login user&.login
+    json.partial! 'users/videos/video', locals: { video: video }
 end

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -137,7 +137,7 @@ class AccountBasic extends Component {
 
   handleSubmit = () => {
     this.props.form.validateFieldsAndScroll({ force: true }, (err, values) => {
-      console.log(values);
+
       let {basicInfo}=this.props;
       if(!err ){
         if (!this.state.school_id) {
@@ -283,7 +283,7 @@ class AccountBasic extends Component {
 
   getDepartments=(e,flag)=>{
     let arr=this.state.schoolList.filter(function(item){
-      if(item.name.indexOf(e) > -1){
+      if(item.name===e){
         return item.name;
       }
     });

public/react/src/modules/user/account/AccountBasicEditItem.js

@@ -142,7 +142,7 @@ class AccountBasicEditItem extends Component {
             <AutoComplete width={400} showSearch onSearch={this.props.filterList} onChange={this.props.changeList} disabled={professionalFlag}>
               {
                 filterSchoolList && filterSchoolList.map((item,key)=>{
-                  return(<Option value={item.name} key={item.id}>{item.name}</Option>)
+                  return(<Option value={item.name} key={key} id={item.id}>{item.name}</Option>)
                 })
               }
             </AutoComplete>