Browse Source

投票接口对接完成

FANGLH 7 years ago
parent
commit
0d1a137d6f

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

@@ -123,7 +123,7 @@ export const API = {
     //创建投票单
     voteCreate: _baseURL + '/wxSchool/vote/voteCreate',//投票创建
     voteListStu: _baseURL + "/wxSchool/vote/voteListStu",//教师端投票单列表
-    voteListTeacher: _baseURL + "/wxSchool/vote/voteListForTeacher",//教师端投票单详情
+    voteListTeacher: _baseURL + "/wxSchool/vote/voteListForTeacher",//教师端投票单列表
 
     voteDetailParent: _baseURL + "/wxSchool/vote/voteDetailStu",//家长投票单详情
     voteDetailTeacher: _baseURL + "/wxSchool/vote/voteDetailTeacher",//教师端投票单详情

+ 7 - 6
frontend/wechat-web/src/modules/vote/VoteDetailPage.js

@@ -74,6 +74,7 @@ class VoteDetailPage extends React.Component {
         fetchPost(url_detail, params).then((response) => {
             Toast.hide();
             if (response.data) {
+                console.log("getVoteDetail",response)
                 this.state.data.title = response.data.voteTopicDOS[0].topicName;
                 this.state.data.voter = response.data.teacherName;
 
@@ -242,8 +243,8 @@ class VoteDetailPage extends React.Component {
 
 
     render() {
-        return <div className="container-fluid">
-            <div className="row">
+        return (
+            <div className="common-column-layout">
                 <div className="col-xs-12">
                     <div className="row" id="pager_header">
                         <div className="flex_row">
@@ -309,13 +310,14 @@ class VoteDetailPage extends React.Component {
                                 投票</Button>
                         ) : (
                             <Button className='commonButton'
-                                    block
                                     style={{
+                                        width:350,
+                                        height:35,
                                         backgroundColor: "#9D9D9D",
                                         color: "#ffffff",
                                         border: "1px solid #ffffff",
                                         margin: '30px 10px'
-                                    }} block>已投票</Button>
+                                    }} >已投票</Button>
                         )
                         }
                     </div>
@@ -327,8 +329,7 @@ class VoteDetailPage extends React.Component {
                         </div>
                     </div>)}
                 </div>
-            </div>
-        </div>
+            </div>)
     }
 }
 

+ 6 - 4
frontend/wechat-web/src/modules/vote/VoteListTeacher.jsx

@@ -50,7 +50,7 @@ class VoteListTeacher extends Component {
 
         document.title = '投票助手'
         const that = this
-        console.log(this.props.listState)
+        // console.log(this.props.listState)
 
         this.mySwiper = new Swiper('.swiper-container', {
             autoplay: false,
@@ -162,11 +162,12 @@ class VoteListTeacher extends Component {
         }
 
         fetchPost(API.voteListTeacher, {
-            userId: this.props.userInfo.user.userFunId,
-            voteType: '1',
+            teacherId: this.props.userInfo.user.userFunId,
+            voteType:1,
             pageIndex: mReleaseIndex,
             pageSize: mPageSize
         }).then(response => {
+            console.log('loadReleaseList',response)
             if (response && response.data && response.data.create.length > 0) {
                 response.data.create.forEach((item, index) => {
                     let voteBean = {}
@@ -233,10 +234,11 @@ class VoteListTeacher extends Component {
 
         fetchPost(API.voteListTeacher, {
             teacherId: this.props.userInfo.user.userFunId,
-            voteType: '1',
+            voteType: 1,
             pageIndex: mReceiveIndex,
             pageSize: mPageSize
         }).then(response => {
+            console.log('loadReceiveList',response)
             if (response && response.data && response.data.notify.length > 0) {
                 response.data.notify.forEach((item, index) => {
                     let voteBean = {}