投票接口

手机号更换
会议状态

frontend/wechat-web/src/components/MeetingSignItem.jsx

@@ -35,7 +35,7 @@ export default class MeetingSignItem extends Component {
                 <div className='signContentlayout'>
                     <div className='titleLayout'>
                         <div className='titleText'>{meetingBean.title}</div>
-                        <div className={meetingBean.meetStatusCode === 3 ? 'meetStatusRed' : 'meetStatusGray'}>
+                        <div className={meetingBean.meetStatusCode === 2 ? 'meetStatusRed' : 'meetStatusGray'}>
                             {meetingBean.meetStatus}
                         </div>
                     </div>
@@ -52,8 +52,8 @@ export default class MeetingSignItem extends Component {
                         <div className='valueText'>{meetingBean.sponsor}</div>
                     </div>
                     <div className='bottomLayout'>
-                        <span className={meetingBean.signStatusCode === 3
-                             ? 'signBtnEnable' : 'signBtnActive'}
+                        <span className={(meetingBean.signStatusCode === 3
+                            || meetingBean.meetStatusCode !== 2) ? 'signBtnEnable' : 'signBtnActive'}
                               onClick={this.onMeetingSign}>
                             {meetingBean.signStatus}
                         </span>
@@ -67,7 +67,7 @@ export default class MeetingSignItem extends Component {
         e.stopPropagation();
         const {meetingBean} = this.state
 
-        if (meetingBean.signStatusCode != 3) {
+        if (meetingBean.signStatusCode != 3 && meetingBean.meetStatusCode === 2) {
             alert('提示', '确定对该会议签到吗？', [
                 {
                     text: '取消', onPress: () => {

frontend/wechat-web/src/modules/meeting/MeetingSignIn.jsx

@@ -111,11 +111,11 @@ class MeetingSignIn extends Component {
                     meetBean.meetId = getIntValue(item, 'meetingId')
                     meetBean.title = getStrValue(item, 'meetingName')
                     meetBean.meetStatusCode = getIntValue(item, 'meetingStatus')
-                    if (meetBean.meetStatusCode === 2) {
+                    if (meetBean.meetStatusCode === 1) {
                         meetBean.meetStatus = '未开始'
-                    } else if (meetBean.meetStatusCode === 3) {
+                    } else if (meetBean.meetStatusCode === 2) {
                         meetBean.meetStatus = '进行中'
-                    } else if (meetBean.meetStatusCode === 4) {
+                    } else if (meetBean.meetStatusCode === 3) {
                         meetBean.meetStatus = '已结束'
                     }
                     meetBean.meetDetail = getStrValue(item, 'meetingDetails')
@@ -176,9 +176,15 @@ class MeetingSignIn extends Component {
             Toast.hide()
             Toast.success('签到成功')
             meetingSignList[index].signStatus = '已签到'
-            meetingSignList[index].signStatusCode = 5
-
-            this.setState({meetingSignList})
+            meetingSignList[index].signStatusCode = 3
+
+            this.setState({meetingSignList},()=>{
+                saveListState({
+                    scrollTop: ReactDOM.findDOMNode(this.container).scrollTop,
+                    listData: this.state.meetingSignList,
+                    pageIndex: mPageIndex,
+                })()
+            })
         }).catch(error => {
             Toast.hide()
 

frontend/wechat-web/src/modules/user/UserInfo.js

@@ -145,7 +145,9 @@ class UserInfo extends Component {
                 <div className="item_flex_1 flex_row_right">
                     <div className='gray-line'
                          style={{height: '34px', background: '#CCCCCC', width: '1px'}}></div>
-                    <text className="margin_left_20" style={{color: "#3680ED"}}>更换</text>
+                    <text className="margin_left_20" style={{color: "#3680ED"}}
+                          onClick={this.onChangePhone}>更换
+                    </text>
                 </div>
             </div>
             <div className='gray-line' style={{height: '1px'}}></div>
@@ -193,6 +195,10 @@ class UserInfo extends Component {
         </div>
     }
 
+    onChangePhone = () => {
+        this.props.history.push('/changephonenumber')
+    }
+
     handlePreview = () => {
         this.setState({
             previewVisible: true,

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

@@ -119,9 +119,9 @@ class VoteListParent extends Component {
                         voteBean.voteEndDate = getStrValue(dataObject, 'voteEndDate')
                         voteBean.voteRemarks = getStrValue(dataObject, 'voteRemarks')
 
-                        const topics = getStrValue(dataObject, 'topics')
+                        const topics = getStrValue(dataObject, 'voteTopicDOS')
                         if (!isObjEmpty(topics)) {
-                            voteBean.options = topics[0].options
+                            voteBean.options = topics[0].voteOptionsDOS
                         }
 
                         voteList.push(voteBean)

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

@@ -185,9 +185,9 @@ class VoteListTeacher extends Component {
                     voteBean.voteEndDate = getStrValue(item, 'voteEndDate')
                     voteBean.voteRemarks = getStrValue(item, 'voteRemarks')
 
-                    const topics = getStrValue(item, 'topics')
+                    const topics = getStrValue(item, 'voteTopicDOS')
                     if (!isObjEmpty(topics)) {
-                        voteBean.options = topics[0].options
+                        voteBean.options = topics[0].voteOptionsDOS
                     }
 
                     releaseList.push(voteBean)
@@ -256,9 +256,9 @@ class VoteListTeacher extends Component {
                     voteBean.voteEndDate = getStrValue(item, 'voteEndDate')
                     voteBean.voteRemarks = getStrValue(item, 'voteRemarks')
 
-                    const topics = getStrValue(item, 'topics')
+                    const topics = getStrValue(item, 'voteTopicDOS')
                     if (!isObjEmpty(topics)) {
-                        voteBean.options = topics[0].options
+                        voteBean.options = topics[0].voteOptionsDOS
                     }
 
                     receiveList.push(voteBean)