bug修复

frontend/wechat-web/src/modules/album/PictureList.jsx

@@ -122,7 +122,12 @@ export default class PictureList extends Component {
                     this.setState({
                         description: getStrValue(dataObject, 'albumRemarks')
                     })
-
+                    console.log('dataObject.albumTitle',dataObject.albumTitle)
+                    if(dataObject.albumTitle != null &&
+                        dataObject.albumTitle != '' &&
+                        dataObject.albumTitle.length > 0){
+                        document.title(dataObject.albumTitle)
+                    }
                     const pictures = dataObject.clazzPictureDOS
                     if (pictures) {
                         pictures.forEach((picture, index) => {

frontend/wechat-web/src/modules/leave/LeaveAddPage.js

@@ -36,6 +36,7 @@ class LeaveAddPage extends Component{
     componentDidMount() {
         this.node.scrollIntoView();
         this.getOrganization()
+        // console.log('this.props.userInfo.parent',this.props.userInfo)
     }
      render(){
          const targetProps = {
@@ -63,12 +64,12 @@ class LeaveAddPage extends Component{
                 <div id="padding10">
                     <img class="img-circle" id="margin_top_bottom_15"
                          src={ (
-                             this.props.userInfo.parent.student.avatar  == '' ||
-                             this.props.userInfo.parent.student.avatar == null ||
-                             this.props.userInfo.parent.student.avatar == undefined ||
-                             this.props.userInfo.parent.student.avatar.length == 0
+                             this.props.userInfo.parent.student.stuPhoto  == '' ||
+                             this.props.userInfo.parent.student.stuPhoto == null ||
+                             this.props.userInfo.parent.student.stuPhoto == undefined ||
+                             this.props.userInfo.parent.student.stuPhoto.length == 0
                          ) ?  "http://img5.imgtn.bdimg.com/it/u=1494163297,265276102&fm=26&gp=0.jpg"
-                             : this.props.userInfo.parent.student.avatar} width={60}
+                             : this.props.userInfo.parent.student.stuPhoto} width={60}
                          height={60}/>
                     <span class="span_17 text_bold " id="row_margin">{this.props.userInfo.user.student.stuName}的请假条</span>
                 </div>

frontend/wechat-web/src/modules/notificationCenter/NotifyBoardParent.jsx

@@ -273,10 +273,10 @@ class NotifyBoardParent extends Component {
                     notifyBoBean.noIssue = getStrValue(item, 'teacherName')
                     notifyBoBean.noTime = getStrValue(item, 'createDate')
 
-                    if (getIntValue(item, 'isRead') == 1) {
-                        notifyBoBean.noStatu = '未读'
-                    } else {
+                    if (getIntValue(item, 'isRead') == 2) {
                         notifyBoBean.noStatu = '已读'
+                    } else {
+                        notifyBoBean.noStatu = '未读'
                     }
 
                     notifyList.push(notifyBoBean)

frontend/wechat-web/src/modules/notificationCenter/NotifyBoardTeacher.jsx

@@ -405,11 +405,11 @@ class NotifyBoardTeacher extends Component {
                     notifyBoBean.noIssue = getStrValue(item, 'teacherName')
                     notifyBoBean.noTime = getStrValue(item, 'createDate')
 
-                    /*if (getIntValue(item, 'isRead') == 1) {
-                        notifyBoBean.noStatu = '未读'
-                    } else {
+                   if (getIntValue(item, 'isRead') ==2) {
                         notifyBoBean.noStatu = '已读'
-                    }*/
+                    } else {
+                        notifyBoBean.noStatu = '未读'
+                    }
 
                     releaseList.push(notifyBoBean)
                 })
@@ -477,10 +477,10 @@ class NotifyBoardTeacher extends Component {
                     notifyBoBean.noIssue = getStrValue(item, 'teacherName')
                     notifyBoBean.noTime = getStrValue(item, 'createDate')
 
-                    if (getIntValue(item, 'isRead') == 1) {
-                        notifyBoBean.noStatu = '未读'
-                    } else {
+                    if (getIntValue(item, 'isRead') == 2) {
                         notifyBoBean.noStatu = '已读'
+                    } else {
+                        notifyBoBean.noStatu = '未读'
                     }
 
                     receiveList.push(notifyBoBean)