修改this.props.userInfo.user.userFunId

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

@@ -137,12 +137,10 @@ export default class RouteConfig extends Component {
                     <Route path="/scorenotification/:stuId?" component={ScoreNotification}/> {/*成绩通知*/}
                     {/*<Route path="/accessnoticedetail/:stuId?" component={AccessNoticeDetail}/>     /!*出入校通知详情*!/*/}
                     <Route path="/accessnoticedetail" component={AccessNoticeDetail}/> {/*出入校通知详情*/}
-
                     <Route path='/leaveAddC' component={LeaveAddCPage}/>{/*老师请假*/}
                     <Route path='/leaveAdd' component={LeaveAddPage}/>   {/*学生请假*/}
                     <Route path='/leaveList/:role' component={LeaveListPage}/>{/*学生请假列表*/}
 
-
                     {/*刘杰*/}
                     <Route path={"/MobileUploadDemo"} component={MobileUploadDemo}/>
                     <Route path={"/MobileUpload"} component={MobileUpload}/>
@@ -150,7 +148,6 @@ export default class RouteConfig extends Component {
                     <Route path={"/TestImagesViewer"} component={TestImagesViewer}/>
                     <Route path={'/picturesWall'} component={PicturesWallItem}/>
                     <Route path='/leaveApproval' component={LeaveApprovalPage}/>
-
                 </div>
             </Router>
         );

frontend/wechat-web/src/modules/accountBind/BindMenu.jsx

@@ -75,7 +75,7 @@ export default class BindMenu extends Component {
 
     obtainBindStatus = () => {
         fetchGet(API.USER_ISBINDING, {
-            openid: 'o8lZ9uJjHXWw2oaHBgSXXnP9pwpU',
+            openid: 'fanglonghai',
             schoolId: 1
         }).then(response => {
             if (response.data) {

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

@@ -29,10 +29,10 @@ class AccessNotice extends Component{
     componentDidMount() {
         let stuId = this.props.match.params.stuId
         if(stuId == null|| stuId.length == 0){
-            stuId = this.props.userInfo.stuId
+            stuId = this.props.userInfo.user.student.stuId
         }
         this.setState({
-            studentName:this.props.userInfo.stuName,
+            studentName:this.props.userInfo.user.student.stuName,
         })
         fetchPost(API.RecordOutgoingList,{
             stuId:stuId,

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

@@ -169,7 +169,7 @@ class ApprovelDetail extends Component{
             return
         }
         let params = {
-            teacherId:this.props.userInfo.userId,
+            teacherId:this.props.userInfo.user.userFunId,
             approveId:this.state.approveId,
             status:this.state.handleStatus,
             approveOpinion:this.state.approveOpinion

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

@@ -166,7 +166,7 @@ class Approvel extends Component {
         }
 
         fetchGet(API.oaApproveList, {
-            teacherId: this.props.userInfo.userId,
+            teacherId: this.props.userInfo.user.userFunId,
             pageIndex: myApplypageIndex,
             pageSize: mPageSize
         }, {}).then((response) => {
@@ -213,7 +213,7 @@ class Approvel extends Component {
         // Toast.loading("获取数据中...", 0)
         // Toast.hide()
         fetchGet(API.oaApproveList, {
-            teacherId: this.props.userInfo.userId,
+            teacherId: this.props.userInfo.user.userFunId,
             pageIndex: myApprovepageIndex,
             pageSize: mPageSize
         }, {}).then((response) => {

frontend/wechat-web/src/modules/hiPages/class-schedule/ClassSchedule.js

@@ -108,8 +108,8 @@ class ClassSchedule extends Component{
     }
     componentDidMount() {
         fetchGet(API.curriculumListByStuId,{
-            // stuId:this.props.userInfo.stuId,
-            stuId:10003,
+            stuId:this.props.userInfo.user.student.stuId,
+            // stuId:10003,
             curStatus:1
         },{}).then((response)=>{
             if(response.success && response.data){

frontend/wechat-web/src/modules/hiPages/field-trip/FieldTrip.js

@@ -249,7 +249,7 @@ class FieldTrip extends Component {
             approveTitle: this.state.tripType[0] == 1 ? "外出申请":"出差申请",
             approveDetails: this.state.tripsReason,
             approveType: 1,
-            proposer: this.props.userInfo.userId,
+            proposer: this.props.userInfo.user.userFunId,
             approveStatus:1,
             approver: this.state.votePerson[0],
             startDate: moment(this.state.startValue).format('YYYY-MM-DD HH:mm:ss'),
@@ -284,8 +284,8 @@ class FieldTrip extends Component {
         Toast.loading('', 0)
 
         fetchGet(API.getAllTeacher, {
-            // schoolId: this.props.userInfo.schoolId,
-            schoolId:1
+            schoolId: this.props.userInfo.user.schoolId,
+            // schoolId:1
         }).then(response => {
             Toast.hide()
             const {targetData} = this.state

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

@@ -99,7 +99,7 @@ class MeetDetail extends Component {
 
     EndMeetting = () => {
         fetchPost(API.endMeeting, {
-            teacherId:this.props.userInfo.userId,
+            teacherId:this.props.userInfo.user.userFunId,
             meetingId: this.state.meetId
         }, {}).then((response) => {
             console.log('response', response)
@@ -133,7 +133,7 @@ class MeetDetail extends Component {
         if (meetId == null || meetId == '') {
             return
         }
-        console.log("teacherId:",this.props.userInfo.userId)
+        console.log("teacherId:",this.props.userInfo.user.userFunId)
         console.log('meetId', this.props.match.params.meetId)
         let meetBean = new MeetingBean()
         meetBean.createTime = ''
@@ -149,7 +149,7 @@ class MeetDetail extends Component {
         })
 
         let params = {
-            teacherId:this.props.userInfo.userId,
+            teacherId:this.props.userInfo.user.userFunId,
             meetingId: meetId
         }
         fetchPost(API.getMeetingDetails, params, {})
@@ -179,7 +179,7 @@ class MeetDetail extends Component {
                         notifyStatus: response.data.meetingStatus
                     })
                     this.setState({
-                        showEndBtn: this.props.userInfo.userId == "" ? false : this.props.userInfo.userId == response.data.meetingCreator ? true : false
+                        showEndBtn: this.props.userInfo.user.userFunId == "" ? false : this.props.userInfo.user.userFunId == response.data.meetingCreator ? true : false
                     }, function () {
                         console.log('showEndBtn', this.state.showEndBtn)
                     })

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

@@ -158,8 +158,8 @@ class ResApply extends Component{
         Toast.loading('', 0)
 
         fetchGet(API.getAllTeacher, {
-            // schoolId: this.props.userInfo.schoolId,
-            schoolId:1
+            schoolId: this.props.userInfo.user.schoolId,
+            // schoolId:1
         }).then(response => {
             Toast.hide()
             const {targetData} = this.state
@@ -264,7 +264,7 @@ class ResApply extends Component{
             approveDetails:this.state.receivingSays,
             approveType: 2,
             appType:1,
-            proposer: this.props.userInfo.userId,
+            proposer: this.props.userInfo.user.userFunId,
             approveStatus:1,
             approver: this.state.votePerson[0],
             approveFiles:approveFiles,

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

@@ -102,8 +102,8 @@ class ScoreInquiry extends Component{
     }
     getScoreData =(selectClas,selectTime)=>{
         let params = {
-            // stuId:this.props.userInfo.stuId,
-            stuId:10003,
+            stuId:this.props.userInfo.user.student.stuId,
+            // stuId:10003,
             scoreType:selectTime,
             scoreName:selectClas
         }
@@ -153,7 +153,7 @@ class ScoreInquiry extends Component{
     }
     componentDidMount() {
         let params = {
-            stuId:this.props.userInfo.stuId
+            stuId:this.props.userInfo.user.student.stuId
             // stuId:10003,
         }
         fetchGet(API.getCurr,params,{})

frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js

@@ -40,7 +40,7 @@ class ScoreNotification extends Component{
     componentDidMount() {
         let stuId
         if (this.props.match.params.stuId == null){
-            stuId = this.props.userInfo.stuId
+            stuId = this.props.userInfo.user.student.stuId
         }else {
             stuId = this.props.match.params.stuId
         }

frontend/wechat-web/src/modules/hiPages/sendMeetting/SendMeet.js

@@ -37,8 +37,7 @@ class SendMeet extends Component {
         Toast.loading('', 0)
 
         fetchGet(API.getAllTeacher, {
-            // schoolId: this.props.userInfo.schoolId,
-            schoolId:1
+            schoolId: this.props.userInfo.user.schoolId,
         }).then(response => {
             Toast.hide()
             const {targetData} = this.state
@@ -242,8 +241,7 @@ class SendMeet extends Component {
         console.log('noticeT', new Date(noticeT))
 
         let params = {
-            // meetingCreator: this.props.userInfo.userId,
-            meetingCreator:this.props.userInfo.userId,
+            meetingCreator:this.props.userInfo.user.userFunId,
             meetingStatus: 1,
             meetingName: this.state.titleValue,
             meetingAddress: this.state.meetAddress,

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

@@ -198,7 +198,7 @@ class LeaveAddCPage extends Component {
             approveTitle: this.state.leaveName,
             appType: this.state.leaveType[0],
             approveDetails: this.state.leaveReason,
-            proposer: this.props.userInfo.userId,
+            proposer: this.props.userInfo.user.userFunId,
             approveStatus:1,
             approver: JSON.stringify(this.state.votePerson[0]),
             approveFiles: approveFiles,
@@ -232,8 +232,8 @@ class LeaveAddCPage extends Component {
         Toast.loading('', 0)
 
         fetchGet(API.getAllTeacher, {
-            // schoolId: this.props.userInfo.schoolId,
-            schoolId:1
+            schoolId: this.props.userInfo.user.userFunId,
+            // schoolId:1
         }).then(response => {
             Toast.hide()
             const {targetData} = this.state