21:30

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

@@ -61,12 +61,7 @@ export const API = {
     notifyMessage: _baseURL + '/notify/getMeetingList',
 
 
-    //创建投票单
-    voteCreate: _baseURL + '/wxSchool/vote/voteCreate',//投票创建
-    voteList: _baseURL + "/wxSchool/vote/voteListParent",//家长端
-    voteListTeacher: _baseURL + "/wxSchool/vote/voteListForTeacher",//教师端
-    voteDetail: _baseURL + "/vote/voteDetail",//投票详情
-    voteAction: _baseURL + "/vote/voteAction",//投票
+
     //发布作业
     homeWorkAdd: _baseURL + "/notify/issueNotification",
     homeWorkList: _baseURL + "/notify/getMeetingList",
@@ -130,7 +125,14 @@ export const API = {
     leaveReply: _baseURL + "/wxSchool/oaLeave/lvReply",
     //查询学生出入校记录
     RecordOutgoingList: _baseURL + '/wxSchool/outInRecord/getOutgoingList',
+    //创建投票单
+    voteCreate: _baseURL + '/wxSchool/vote/voteCreate',//投票创建
+    voteList: _baseURL + "/wxSchool/vote/voteListParent",//家长端
+    voteListTeacher: _baseURL + "/wxSchool/vote/voteListForTeacher",//教师端
+    voteDetailParent: _baseURL + "/wxSchool/vote/voteDetailParent",//家长投票单详情
+    voteDetailTeacher: _baseURL + "/wxSchool/vote/voteDetailTeacher",//教师端投票单详情
 
+    voteAction: _baseURL + "/wxSchool/vote/voteActionParent",//投票
 
 
 

frontend/wechat-web/src/modules/vote/VoteDetailPage.js

@@ -48,9 +48,9 @@ class VoteDetailPage extends React.Component {
 
     getVoteDetail() {
         Toast.loading("", 0)
-        fetchGet(API.voteDetail, {
+        fetchGet(API.voteDetailParent, {
             voteId: this.state.id,
-            userId: this.props.userInfo.userId
+            teacherId: this.props.userInfo.user.userFunId,
         }).then((response) => {
             Toast.hide();
             if (response.data) {

frontend/wechat-web/src/modules/vote/VoteListParent.jsx

@@ -92,7 +92,7 @@ class VoteListParent extends Component {
         }
 
         fetchGet(API.voteList, {
-            userId: this.props.userInfo.userId,
+            userId: this.props.userInfo.user.userFunId,
             pageIndex: mPageIndex,
             pageSize: mPageSize,
             voteType: '1',

frontend/wechat-web/src/modules/vote/VoteListTeacher.jsx

@@ -162,7 +162,7 @@ class VoteListTeacher extends Component {
         }
 
         fetchGet(API.voteListTeacher, {
-            userId: this.props.userInfo.userId,
+            userId: this.props.userInfo.user.userFunId,
             voteType: '1',
             pageIndex: mReleaseIndex,
             pageSize: mPageSize
@@ -232,7 +232,7 @@ class VoteListTeacher extends Component {
         }
 
         fetchGet(API.voteListTeacher, {
-            userId: this.props.userInfo.userId,
+            userId: this.props.userInfo.user.userFunId,
             voteType: '1',
             pageIndex: mReceiveIndex,
             pageSize: mPageSize