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

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

@@ -17,7 +17,7 @@ export default class LeaveItem extends Component{
         const {item}  = this.state;
         return(
             <div>
-                <Link to={'/leavedetail/' +'/'+this.props.role +item.lvId}>
+                <Link to={'/leavedetail/' +this.props.role +'/'+item.lvId}>
                     <div className="col-xs-12 " style={{backgroundColor:'#FFF',width:'53vh'}} >
                         <div className="row flex" >
                             <div id="global_page_title"  style={{fontSize:15,color:"#333333"}}>  {item.title}</div>

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

@@ -256,7 +256,7 @@ class LeaveListPage extends React.Component{
     }
     onItemOnClick=(index,item)=>{
         console.log("onItemOnClick()",JSON.stringify(item));
-        this.props.history.push('/leavedetail/' +'/'+this.state.role +item.lvId)
+        this.props.history.push('/leavedetail/' +this.state.role +'/'+ item.lvId)
         return;
         this.setState({
             detailVisible: true,