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

frontend/wechat-web/src/configs/router.config.js

@@ -132,7 +132,7 @@ class RouteConfig extends Component {
                         <Route path='/class-schedule' component={ClassSchedule}/> {/*//课程表*/}
                         <Route path='/score-inquiry' component={ScoreInquiry}/> {/*//成绩查询*/}
                         <Route path='/approvel' component={Approvel}/>{/*我的审批*/}
-                        <Route path='/approvel-detail/:approveId/:isMyApply' component={ApprovelDetail}/> {/*审批详情*/}
+                        <Route path='/approvel-detail/:isMyApply/:approveId' component={ApprovelDetail}/> {/*审批详情*/}
                         <Route path='/meet-detail/:meetId?' component={MeetDetail}/> {/*会议签到详情 meetingSignIn*/}
                         <Route path='/leavedetail/:role/:lvId' component={LeaveDetail}/> {/*学生请假详情*/}
                         <Route path="/changephonenumber" component={ChangePhoneNumber}/> {/*更换手机号码*/}

frontend/wechat-web/src/modules/hiPages/approvel/ApprovelItem.js

@@ -37,7 +37,7 @@ export default class ApprovelItem extends Component{
         const {itemdata,isMyApply,approveId} = this.state
         return(
                     <div style={{padding:10}}>
-                        <Link to={"/approvel-detail/" + approveId +"/"+isMyApply}>
+                        <Link to={"/approvel-detail/" + isMyApply +"/"+ approveId }>
                             <div className="item-Style" onClick={this.ItemClick.bind(this,isMyApply,itemdata,this.props.index)}>
                                 <div style={{width:'20%'}}>
                                     <div style={{width:76,height:'100%'}}>

frontend/wechat-web/src/modules/hiPages/meet-detail/MeetDetail.js

@@ -12,7 +12,7 @@ import {fetchPost, fetchGet, fetchGetNoSession} from '../../../utils/fetchReques
 import {API} from '../../../configs/api.config';
 import {Toast} from 'antd-mobile'
 import {connect} from 'react-redux';
-import {isObjEmpty} from "../../../utils/common";
+import {isObjEmpty,getSearchParams} from "../../../utils/common";
 import {saveListState} from "../../../redux/actions/listState";
 
 function SignItem(props) {
@@ -146,6 +146,7 @@ class MeetDetail extends Component {
             meetingSignData: meetBean,
             meetId:meetId
         })
+        var urlObject = getSearchParams(this.props.location.search)
 
         let params = {
             teacherId:this.props.userInfo.user.userFunId,