Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js

@@ -228,16 +228,10 @@ class ResApply extends Component{
             return
         }
         var approveFiles = []
-        for(let i=0;i<this.state.fileList.length;i++){
-            if(this.state.fileList[i].response && this.state.fileList[i].response.success){
-                approveFiles.push(this.state.fileList[i].response.data)
-                if(i==this.state.fileList.length-1){
-                    this.setState({
-                        approveFiles:approveFiles
-                    })
-                    console.log('approveFiles',approveFiles)
-                }
-            }
+        if (this.state.fileList) {
+            this.state.fileList.forEach((value, index) => {
+                approveFiles.push(value.picUrl)
+            })
         }
         var params = {
             approveTitle: this.state.resUser,

frontend/wechat-web/src/modules/homework/AssignmentDetailPage.js

@@ -106,6 +106,7 @@ class AssignmentDetailPage extends React.Component {
                 }
 
                 this.setState({
+                    teacherPhoto:response.data.teacherPhoto,
                     teachName: response.data.teacherName,
                     endTime: response.data.endDate,
                     headerUrl: response.data.teacherPhoto,
@@ -198,7 +199,7 @@ class AssignmentDetailPage extends React.Component {
                     {isObjEmpty(userInfo.userAvatar) ?
                         <Avatar size={55} icon='user'/> :
                         <img className="img-circle"
-                             src={userInfo.userAvatar}
+                             src={this.state.teacherPhoto}
                              width={55} height={55}/>
                     }
                     <div className='common-flex-column-y-center' style={{paddingLeft: '14px'}}>