今日bug修复

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

@@ -137,6 +137,8 @@ export const API = {
     NOTIFY_DELETEMAIL: _baseURL + '/wxSchool/principalMailbox/deleteMailParent',
     //出入校单次记录详情
 
+    //更改手机号是获取验证码
+    SEND_CODEUPDATE:_baseURL +'/wxSchool/user/sendCodeUpdate',
 
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //获取用户是否绑定

frontend/wechat-web/src/modules/hiPages/LeaveDetail/LeaveDetail.js

@@ -10,12 +10,11 @@ import {fetchPost, fetchGet, fetchGetNoSession} from '../../../utils/fetchReques
 import {API, _baseURL} from '../../../configs/api.config';
 import ImageGrid from "../../../components/image/ImageGrid";
 import {Button, Icon, Input, List} from 'antd';
-import {isObjEmpty, getIntValue, getStrValue} from '../../../utils/common';
 import {CSSTransition, TransitionGroup} from 'react-transition-group'
 import LazyLoad from 'react-lazyload';
 import ImagesViewer from '../../../components/imagesVIewer/index';
 import {Toast} from 'antd-mobile';
-
+import {getIntValue, getStrValue, isObjEmpty,getSearchParams} from "../../../utils/common";
 
 class LeaveDetail extends Component {
     constructor(props) {
@@ -38,6 +37,13 @@ class LeaveDetail extends Component {
     }
 
     componentDidMount() {
+        this.searchParams = getSearchParams(this.props.location.search)
+
+        this.teacherId = this.props.userInfo.user.userFunId
+        if (this.searchParams && this.searchParams.teacherId) {
+            this.teacherId = this.searchParams.teacherId
+        }
+
         let lvId = this.props.match.params.lvId
         let role = this.props.match.params.role
         let isshowfoot = true
@@ -164,7 +170,7 @@ class LeaveDetail extends Component {
         const params = {
             replyTitle: '请假单回复',
             replyContent: this.state.messageContent,
-            teacherId: this.props.userInfo.user.userFunId,
+            teacherId: this.teacherId,
             lvId: this.state.itemdetail.lvId,
 
         }

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

@@ -12,6 +12,7 @@ import {Toast} from 'antd-mobile';
 import {connect} from 'react-redux';
 import ItemComp from './ItemComp';
 import {Avatar} from 'antd'
+import {getIntValue, getStrValue, isObjEmpty,getSearchParams} from "../../../utils/common";
 
 class AccessNotice extends Component {
     componentWillMount() {
@@ -29,9 +30,10 @@ class AccessNotice extends Component {
     }
 
     componentDidMount() {
-        let stuId = this.props.match.params.stuId
-        if (stuId == null || stuId.length == 0) {
-            stuId = this.props.userInfo.user.student.stuId
+        this.searchParams = getSearchParams(this.props.location.search)
+        let stuId = this.props.userInfo.user.student.stuId
+        if (this.searchParams && this.searchParams.stuId) {
+            stuId = this.searchParams.stuId
         }
         this.setState({
             studentName: this.props.userInfo.user.student.stuName,

frontend/wechat-web/src/modules/hiPages/accessnoticedetail/AccessNoticeDetail.js

@@ -30,6 +30,7 @@ class AccessNoticeDetail extends Component {
         let stuId = this.props.match.params.stuId
         let role = this.props.match.params.role
         let anId = this.props.match.params.anId
+
         console.log("stuId", stuId)
         if (!isObjEmpty(stuId)) {
             this.getANDetail(stuId, anId)

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

@@ -7,7 +7,7 @@ import React,{Component} from 'react';
 import './ApprovelDetail.css';
 import hi1_img from '../../../style/imgs/ic_head1.png';
 import DetailItem from './DetailItem';
-import {isObjEmpty} from "../../../utils/common";
+import {isObjEmpty,getSearchParams} from "../../../utils/common";
 import {CSSTransition, TransitionGroup} from 'react-transition-group'
 import LazyLoad from 'react-lazyload';
 import ItemApprovel from './ItemApprovel';
@@ -169,7 +169,7 @@ class ApprovelDetail extends Component{
             return
         }
         let params = {
-            teacherId:this.props.userInfo.user.userFunId,
+            teacherId:this.teacherId,
             approveId:this.state.approveId,
             status:this.state.handleStatus,
             approveOpinion:this.state.approveOpinion
@@ -209,6 +209,12 @@ class ApprovelDetail extends Component{
         clearTimeout(this.backTask)
     }
     componentDidMount() {
+        this.searchParams = getSearchParams(this.props.location.search)
+         this.teacherId = this.props.userInfo.user.userFunId
+        if (this.searchParams && this.searchParams.teacherId) {
+            this.teacherId  = this.searchParams.teacherId
+        }
+
         this.node.scrollIntoView();
         this.setState({
             approveId:this.props.match.params.approveId,

frontend/wechat-web/src/modules/hiPages/changephonenumber/ChangePhoneNumber.js

@@ -105,9 +105,11 @@ let mSeconds = 0;
          })
 
          var params = {
-             userPhone:this.state.phoneNumber.trim()
+             userPhone:this.state.phoneNumber.trim(),
+             openid: this.props.userInfo.user.userOpenid,
+             schoolId:this.props.userInfo.user.schoolId
          }
-         fetchGet(API.SEND_CODE, params).then(response => {
+         fetchGet(API.SEND_CODEUPDATE, params).then(response => {
              Toast.hide()
              if (response.success){
                  Toast.success('验证码已发送，请注意查收', 2)

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

@@ -132,6 +132,13 @@ class MeetDetail extends Component {
         if (meetId == null || meetId == '') {
             return
         }
+        this.searchParams = getSearchParams(this.props.location.search)
+
+        let teacherId = this.props.userInfo.user.userFunId
+        if (this.searchParams && this.searchParams.teacherId) {
+            teacherId = this.searchParams.teacherId
+        }
+        
         console.log("teacherId:",this.props.userInfo.user.userFunId)
         console.log('meetId', this.props.match.params.meetId)
         let meetBean = new MeetingBean()
@@ -149,7 +156,7 @@ class MeetDetail extends Component {
         var urlObject = getSearchParams(this.props.location.search)
 
         let params = {
-            teacherId:this.props.userInfo.user.userFunId,
+            teacherId:teacherId,
             meetingId: meetId
         }
         fetchPost(API.getMeetingDetails, params, {})

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

@@ -49,6 +49,14 @@ export default class UserItem extends Component{
         console.log('itemnumber%1 === 0',itemnumber%1 == 0)
         if(itemnumber.length > 0){
             if(itemnumber%1 == 0 && itemnumber > 0){
+                if(itemnumber.length > 3){
+                    Toast.show('可申请数量有限',1)
+                    this.props.handelRItem({
+                        artName:itemuser,
+                        artCount:''
+                    },this.props.index)
+                    return
+                }
                 this.props.handelRItem({
                     artName:itemuser,
                     artCount:itemnumber

frontend/wechat-web/src/modules/hiPages/score-inquiry/ScoreInquiry.js

@@ -10,6 +10,8 @@ import {fetchPost,fetchGet,fetchGetNoSession} from '../../../utils/fetchRequest'
 import {API} from '../../../configs/api.config';
 import {Toast,Picker,List} from 'antd-mobile';
 import {connect} from 'react-redux';
+import {getIntValue, getStrValue, isObjEmpty,getSearchParams} from "../../../utils/common";
+
 
 const Option = Select.Option;
 function OptionS(props) {
@@ -102,7 +104,7 @@ class ScoreInquiry extends Component{
     }
     getScoreData =(selectClas,selectTime)=>{
         let params = {
-            stuId:this.props.userInfo.user.student.stuId,
+            stuId: this.stuId,
             // stuId:10003,
             scoreType:selectTime,
             scoreName:selectClas
@@ -152,8 +154,13 @@ class ScoreInquiry extends Component{
         document.title = '成绩查询'
     }
     componentDidMount() {
+        this.searchParams = getSearchParams(this.props.location.search)
+        this.stuId = this.props.userInfo.user.student.stuId
+        if (this.searchParams && this.searchParams.stuId) {
+            this.stuId = this.searchParams.stuId
+        }
         let params = {
-            stuId:this.props.userInfo.user.student.stuId
+            stuId: this.stuId
             // stuId:10003,
         }
         fetchGet(API.getCurr,params,{})