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

frontend/wechat-web/src/modules/hiPages/access-notice/AccessNotice.css

@@ -1,6 +1,6 @@
 .header_sty1{position: fixed;top: 0px;width: 100%;}
-.header_sty{  position: fixed;top: 0px;height: 97px;width: 100%;background-color:#E7EDF6;align-content: center;display: flex;flex-direction: row;  }
-.header{height: 60px;width: 60px;margin: 10px 10px 0 80px;}
+.header_sty{  position: fixed;top: 0px;height: 90px;width: 100%;background-color:#E7EDF6;align-content: center;display: flex;flex-direction: row;  }
+.header{height: 60px;width: 60px;margin: 20px 10px 0 80px;}
 .timeList_sty{height: auto;display: flex;flex-direction: row;align-items: center}
 .out_in{height: 38px;width: 38px;padding-top: 0px;border: none;}
 .lineimg_sty{height: 24px;width: 2px;margin-left: 18px;}

frontend/wechat-web/src/modules/hiPages/access-notice/AccessNotice.js

@@ -97,7 +97,7 @@ class AccessNotice extends Component {
                             <Avatar size={50} icon='user'/>
                         </div>}
 
-                    <div style={{marginTop: 20, marginLeft: 10}}>
+                    <div style={{marginTop: 20}}>
                         <div style={{color: "#4087DC", fontSize: 18}}>{this.state.studentName}</div>
                         <div style={{color: "#666666", fontSize: 12, marginTop: 5}}>{this.state.studentGrade}</div>
                     </div>

frontend/wechat-web/src/modules/hiPages/access-notice/ItemComp.js

@@ -15,7 +15,7 @@ export default class ItemComp extends Component{
    constructor(props){
         super(props);
         this.state = {
-            showTime1:this.props.itemdata.inDate==null ? this.props.itemdata.outDate : this.props.itemdata.inDate,
+            showTime1:(this.props.itemdata.inDate==''||this.props.itemdata.inDate==null) ? this.props.itemdata.outDate : this.props.itemdata.inDate,
         }
     }
      render(){
@@ -28,7 +28,7 @@ export default class ItemComp extends Component{
                          style={{height: '100%', justifyContent: 'center', alignItems: 'center'}}>
                         {this.props.isFirst ? <div style={{flex: 1}}></div>
                             : <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}
-                        {this.props.itemdata.inDate == null ? <img className="mg-circle out_in" src={exit_img} alt=""/> :
+                        {(this.props.itemdata.inDate==''||this.props.itemdata.inDate==null) ? <img className="mg-circle out_in" src={exit_img} alt=""/> :
                             <img className="mg-circle out_in" src={enter_img} alt=""/>
                         }
                         {this.props.isLast ? <div style={{flex: 1}}></div>

frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js

@@ -129,7 +129,7 @@ class ApprovelDetail extends Component{
                     cancelText={'取消'}
                     onCancel={this.doApprovel.bind(this,0)}>
                     <div onChange={this.handelValueCom}>
-                        <textarea autoFocus="autoFocus" ref='approveOpinion' className="form-control" rows="5" placeholder="填写意见说明（非必填）" ></textarea>
+                        <textarea autoFocus="autoFocus" ref='approveOpinion' className="form-control" rows="5" placeholder="填写意见说明（非必填）"  maxLength={50}></textarea>
                     </div>
                 </Modal>
                 {this.state.previewVisible ?

frontend/wechat-web/src/modules/hiPages/approvel-detail/ItemApprovel.js

@@ -22,7 +22,7 @@ export default class ItemApprovel extends Component{
                     <img className="img-circle out_in" src={hi2_img} alt=""/>
                     <div style={{marginLeft:30,width:"62%"}}>
                         <div style={{color:'#666666',fontSize:12}}>{this.props.approveDate}</div>
-                        <div style={{color:"#666666",fontSize:15,marginTop:5}}>{this.props.itemdata.value }<span>{this.props.suggest.value==null?"":"("+this.props.suggest.value+")"}</span></div>
+                        <div style={{color:"#666666",fontSize:15,marginTop:5,wordWrap:'break-word'}}>{this.props.itemdata.value }<span>{this.props.suggest.value==null?"":"("+this.props.suggest.value+")"}</span></div>
                     </div>
                     <div style={{fontSize:12,textAlign:'right'}} className={this.props.approveStatus == 1?'doing':'done'}>
                         {this.props.approveStatus == 1 ? '待审批' : (this.props.approveStatus == 2 ? '已审批' : '已拒绝')}</div>