智慧校园APP网页前端代码上传

.idea/workspace.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="库文件下拉">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="智慧校园APP网页前端代码上传">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/Readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/Readme.md" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -51,24 +49,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/utils/SendNote.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="88">
-              <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/wxUtils/HttpRequest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="88">
-              <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/wxUtils/Signature.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -132,18 +112,35 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="278">
-              <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+            <state relative-caret-position="14">
+              <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/chart/lineChart.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
               <folding>
-                <element signature="e#0#26#0" expanded="true" />
+                <element signature="e#0#43#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/chart/ChartDemo.jsx">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="286">
+              <caret line="56" column="34" lean-forward="true" selection-start-line="56" selection-start-column="34" selection-end-line="56" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -324,7 +321,7 @@
     <property name="RequestMappingsPanelWidth2" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548062575544" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548063179986" />
     <property name="jdk.selected.JAVA_MODULE" value="1.8" />
     <property name="last_directory_selection" value="$PROJECT_DIR$/framework/server-starter/src/main/java/com/usoftchina/smartschool/server" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/frontend/wechat-web/node_modules" />
@@ -476,7 +473,7 @@
       <workItem from="1547685937807" duration="1100000" />
       <workItem from="1547688698570" duration="10718000" />
       <workItem from="1548055384845" duration="5190000" />
-      <workItem from="1548061693850" duration="679000" />
+      <workItem from="1548061693850" duration="1320000" />
     </task>
     <task id="LOCAL-00001" summary="删除编译文件">
       <created>1547633261163</created>
@@ -555,14 +552,22 @@
       <option name="project" value="LOCAL" />
       <updated>1548058212922</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="智慧校园APP网页前端代码上传">
+      <created>1548062720987</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1548062720987</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="35487000" />
+    <option name="totallyTimeSpent" value="36128000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
+    <editor active="true" />
     <layout>
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2077748" />
       <window_info id="Structure" order="1" weight="0.25340393" />
@@ -583,9 +588,9 @@
       <window_info anchor="bottom" id="Java Enterprise" order="8" side_tool="true" />
       <window_info anchor="bottom" id="TODO" order="9" weight="0.3294893" />
       <window_info anchor="bottom" content_ui="combo" id="Run Dashboard" order="10" sideWeight="0.8774584" visible="true" weight="0.29983526" />
-      <window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.81240547" weight="0.25212464" />
+      <window_info active="true" anchor="bottom" id="Version Control" order="11" sideWeight="0.81240547" visible="true" weight="0.25212464" />
       <window_info anchor="bottom" id="Spring" order="12" weight="0.47116968" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="13" visible="true" weight="0.41076487" />
+      <window_info anchor="bottom" id="Terminal" order="13" weight="0.41076487" />
       <window_info anchor="bottom" id="Event Log" order="14" sideWeight="0.18759455" side_tool="true" weight="0.57990116" />
       <window_info anchor="bottom" id="Docker" order="15" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="16" />
@@ -693,25 +698,10 @@
     <MESSAGE value="README文档" />
     <MESSAGE value="prod配置文件修改" />
     <MESSAGE value="库文件下拉" />
-    <option name="LAST_COMMIT_MESSAGE" value="库文件下拉" />
+    <MESSAGE value="智慧校园APP网页前端代码上传" />
+    <option name="LAST_COMMIT_MESSAGE" value="智慧校园APP网页前端代码上传" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/docker/Dockerfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/docker/Dockerfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="33" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
@@ -1009,14 +999,27 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="278">
-          <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        <state relative-caret-position="14">
+          <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/chart/lineChart.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
           <folding>
-            <element signature="e#0#26#0" expanded="true" />
+            <element signature="e#0#43#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/chart/ChartDemo.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="56" column="34" lean-forward="true" selection-start-line="56" selection-start-column="34" selection-end-line="56" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -52,8 +52,8 @@ export default class MeetingSignItem extends Component {
                         <div className='valueText'>{meetingBean.sponsor}</div>
                     </div>
                     <div className='bottomLayout'>
-                        <span className={(meetingBean.signStatusCode === 1
-                            && meetingBean.meetStatusCode === 3) ? 'signBtnActive' : 'signBtnEnable'}
+                        <span className={meetingBean.signStatusCode === 3
+                             ? '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 === 1) {
+        if (meetingBean.signStatusCode != 3) {
             alert('提示', '确定对该会议签到吗？', [
                 {
                     text: '取消', onPress: () => {

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

@@ -87,7 +87,7 @@ export const API = {
 
 
     //首页接口
-    homeIndex: _baseURL + "/user/homePage",
+    homeIndex: _baseURL + "/wxSchool/user/homePage",
     //创建投票单
     voteCreate: _baseURL + '/vote/voteCreate',//投票创建
     voteList: _baseURL + "/vote/voteList",//家长端

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

@@ -16,19 +16,10 @@ class AccessNoticeDetail extends Component{
         this.state = {
 
         }
-    }
-     render(){
-        return(
-            <div>
-                Hello AccessNoticeDetail
-            </div>
-        )
     }
     componentWillMount() {
-        console.log('Component WILL MOUNT!')
     }
     componentDidMount() {
-        console.log('Component DID MOUNT!')
         getWeixinInfo()
         let stuId = this.props.match.params.stuId
         let role = this.props.match.params.role
@@ -37,7 +28,14 @@ class AccessNoticeDetail extends Component{
             this.getleaveDetail(stuId)
         }
     }
-
+     render(){
+        return(
+            <div>
+                Hello AccessNoticeDetail
+                <div id="c1"></div>
+            </div>
+        )
+    }
 }
 
 

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

@@ -19,7 +19,7 @@ function SignItem(props) {
     return(
         <div style={{display:'flex',flexDirection:'column',margin:8,textAlign:"center"}}>
             <div> <img src={props.itemdata.userPhoto == "" || props.itemdata.userPhoto == null ? hi0_img : props.itemdata.userPhoto} alt="" style={{width:40,height:40,borderRadius:25}}/></div>
-            <div  style={{fontSize:12,color:'#333333',marginTop:10}}> <span>{props.itemdata.userName}</span></div>
+            <div  style={{fontSize:12,color:'#333333',marginTop:10}}> <span>{props.itemdata.teacherName}</span></div>
         </div>
     )
 }
@@ -88,7 +88,7 @@ class MeetDetail extends Component {
                 <div style={{marginTop: 10, marginLeft: 20, display: 'flex', flexDirection: 'row', flexWrap: 'wrap'}}>
                     {this.state.unsignList.map((itemdata, index) => <SignItem itemdata={itemdata}></SignItem>)}
                 </div>
-                    {this.state.notifyStatus == 4 ? <div style={{textAlign:'center',marginTop:20}}>
+                    {this.state.notifyStatus == 3 ? <div style={{textAlign:'center',marginTop:20}}>
                         <Button  className='end_sty' style={{color:'#FFFFFF',backgroundColor:'#929292'}}>已结束</Button>
                     </div> : <div style={{textAlign:'center',marginTop:20,marginBottom:20}}>
                         {this.state.showEndBtn == true ? <Button type="primary"  className='end_sty ' onClick={this.EndMeetting}>结束会议</Button> : ""}
@@ -98,7 +98,7 @@ class MeetDetail extends Component {
     }
 
     EndMeetting = () => {
-        fetchGet(API.endMeeting, {
+        fetchPost(API.endMeeting, {
             teacherId:this.props.userInfo.userId,
             meetingId: this.state.meetId
         }, {}).then((response) => {
@@ -133,6 +133,7 @@ class MeetDetail extends Component {
         if (meetId == null || meetId == '') {
             return
         }
+        console.log("teacherId:",this.props.userInfo.userId)
         console.log('meetId', this.props.match.params.meetId)
         let meetBean = new MeetingBean()
         meetBean.createTime = ''
@@ -149,36 +150,36 @@ class MeetDetail extends Component {
 
         let params = {
             teacherId:this.props.userInfo.userId,
-            meetingId: this.state.meetId
+            meetingId: meetId
         }
-        fetchGet(API.homeWorkDetail, params, {})
+        fetchPost(API.getMeetingDetails, params, {})
             .then((response) => {
                 if (response.success && response.data) {
                     let meetBean1 = new MeetingBean()
-                    meetBean1.createTime = response.data.creatDate
-                    meetBean1.title = response.data.notifyName
-                    meetBean1.meetStatus = response.data.signStatus
+                    meetBean1.createTime = response.data.createDate
+                    meetBean1.title = response.data.meetingName
+                    meetBean1.meetStatus = response.data.meetingSign
                     meetBean1.startTime = response.data.startDate
                     meetBean1.endTime = response.data.endDate
-                    meetBean1.address = response.data.notifyAddress
-                    meetBean1.sponsor = response.data.notifyCreatorName
-                    let status = response.data.notifyStatus
-                    if (status === 2) {
+                    meetBean1.address = response.data.meetingAddress
+                    meetBean1.sponsor = response.data.teacherName
+                    let status = response.data.meetingStatus
+                    if (status === 1) {
                         meetBean1.meetStatus = '未开始'
-                    } else if (status === 3) {
+                    } else if (status === 2) {
                         meetBean1.meetStatus = '进行中'
-                    } else if (status === 4) {
+                    } else if (status === 3) {
                         meetBean1.meetStatus = '已结束'
                     }
                     this.setState({
-                        notifyId: response.data.notifyId,
+                        notifyId: response.data.meetingId,
                         meetingSignData: meetBean1,
-                        signList: response.data.notifyRecords.signs,
-                        unsignList: response.data.notifyRecords.unSigns,
-                        notifyStatus: response.data.notifyStatus
+                        signList: response.data.sign,
+                        unsignList: response.data.unSign,
+                        notifyStatus: response.data.meetingStatus
                     })
                     this.setState({
-                        showEndBtn: this.props.userInfo.userId == "" ? false : this.props.userInfo.userId == response.data.notifyCreator ? true : false
+                        showEndBtn: this.props.userInfo.userId == "" ? false : this.props.userInfo.userId == response.data.meetingCreator ? true : false
                     }, function () {
                         console.log('showEndBtn', this.state.showEndBtn)
                     })

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

@@ -30,7 +30,6 @@ class SendMeet extends Component {
 
     componentWillUnmount() {
         Toast.hide()
-
         clearTimeout(this.backTask)
     }
 
@@ -45,18 +44,18 @@ class SendMeet extends Component {
             const {targetData} = this.state
             targetData.length = 0
             if (response && response.data) {
-                const schoolArray = response.data.schools
-                const teacherArray = response.data.teachers
+                // const schoolArray = response.data.schools
+                const teacherArray = response.data
 
                 if (!isObjEmpty(teacherArray)) {
                     const teacherData = []
                     teacherArray.forEach((teacherObj, index) => {
                         if (teacherObj) {
                             teacherData.push({
-                                title: getStrValue(teacherObj, 'userName'),
-                                userId: getIntValue(teacherObj, 'userId'),
+                                title: getStrValue(teacherObj, 'teacherName'),
+                                userId: getIntValue(teacherObj, 'teacherId'),
                                 userPhone: getStrValue(teacherObj, 'userPhone'),
-                                value: getStrValue(teacherObj, 'userName') + `-1-${index}`,
+                                value: getStrValue(teacherObj, 'teacherName') + `-1-${index}`,
                                 key: `1-${index}`,
                             })
                         }
@@ -69,43 +68,6 @@ class SendMeet extends Component {
                         children: teacherData,
                     })
                 }
-
-                if (!isObjEmpty(schoolArray)) {
-                    const classData = []
-
-                    schoolArray.forEach((schoolObj, sIndex) => {
-                        if (schoolObj) {
-                            const parentArray = schoolObj.parents
-
-                            const parentData = []
-                            if (!isObjEmpty(parentArray)) {
-                                parentArray.forEach((parentObj, pIndex) => {
-                                    parentData.push({
-                                        title: getStrValue(parentObj, 'userName'),
-                                        userId: getIntValue(parentObj, 'userId'),
-                                        userPhone: getStrValue(parentObj, 'userPhone'),
-                                        value: getStrValue(parentObj, 'userName') + `-0-${sIndex}-${pIndex}`,
-                                        key: `0-${sIndex}-${pIndex}`,
-                                    })
-                                })
-
-                                classData.push({
-                                    title: getStrValue(schoolObj, 'parentName') + getStrValue(schoolObj, 'schName'),
-                                    value: getStrValue(schoolObj, 'parentName') + getStrValue(schoolObj, 'schName') + `-0-${sIndex}`,
-                                    key: `0-${sIndex}`,
-                                    children: parentData,
-                                })
-                            }
-                        }
-                    })
-
-                    targetData.push({
-                        title: `全体家长`,
-                        value: `0`,
-                        key: `0`,
-                        children: classData,
-                    })
-                }
             }
 
             console.log('targetData', targetData)
@@ -235,15 +197,15 @@ class SendMeet extends Component {
             Toast.fail('请填写会议地址...')
             return
         }
-        if (this.state.startValue == null || this.state.startValue.trim().length == 0) {
+        if (this.state.startValue == null ) {
             Toast.fail('请选择开始时间...')
             return
         }
-        if (this.state.endValue == null || this.state.endValue.trim().length == 0) {
+        if (this.state.endValue == null ) {
             Toast.fail('请选择结束时间...')
             return
         }
-        if (this.state.earlyTime == null || this.state.earlyTime.trim().length == 0){
+        if (this.state.earlyTime == null ){
             Toast.fail('请选择提醒时间...')
             return
         }
@@ -276,25 +238,30 @@ class SendMeet extends Component {
             })
         }
         var noticeT = startT - this.state.earlyTime * 1000 * 60
-        // console.log('this.state.earlyTime*1000*60',this.state.earlyTime*1000*60)
         console.log('noticeT', noticeT)
         console.log('noticeT', new Date(noticeT))
+
         let params = {
-            meetingCreator: this.props.userInfo.userId,
-            notifyType: 6,
-            meetingStatus: 2,
+            // meetingCreator: this.props.userInfo.userId,
+            meetingCreator:this.props.userInfo.userId,
+            meetingStatus: 1,
             meetingName: this.state.titleValue,
             meetingAddress: this.state.meetAddress,
             startDate: moment(this.state.startValue).format('YYYY-MM-DD HH:mm:ss'),
             endDate: moment(this.state.endValue).format('YYYY-MM-DD HH:mm:ss'),
             reminderDate: moment(new Date(noticeT)).format('YYYY-MM-DD HH:mm:ss'),
-            meetingNotifier: JSON.stringify(userList)
+            meetingNotifier: JSON.stringify(userList),
+            meetingRemarks: "会议备注",
+            meetingFiles:"[]",
+            meetingDetails: "一定要参加",
         }
 
         console.log('params', params)
 
         Toast.loading("会议创建中...", 0)
-        fetchPost(API.createMeeting, params, {})
+        fetchPost(API.createMeeting, {
+            jsonMeeting:JSON.stringify(params)
+        }, {})
             .then((response) => {
                 Toast.hide()
                 console.log('response', response)

frontend/wechat-web/src/modules/home/HomePage.jsx

@@ -17,7 +17,7 @@ import {connect} from "react-redux";
 import {CONFIG_TEACHER_MENU, CONFIG_PARENT_MENU, CONFIG_HOME_TOP_MENU} from "../../utils/homePage.constants";
 import {getStrValue, isObjEmpty} from "../../utils/common";
 import 'css/home-page.css'
-import {fetchGet} from "../../utils/fetchRequest";
+import {fetchGet, fetchPost} from "../../utils/fetchRequest";
 import {_baseURL, API} from "../../configs/api.config";
 import icon_home_change from "../../style/imgs/icon_home_change.png";
 import {getWeixinInfo} from '../../utils/api.request'
@@ -166,9 +166,10 @@ class HomePage extends Component {
         let {studentIndex} = this.state
 
         //获取首页接口
-        fetchGet(API.homeIndex, {
-            userOpenid: userInfo.userOpenid,
-            userPhone: userInfo.userPhone
+        fetchPost(API.homeIndex, {
+            openid: userInfo.userOpenid,
+            // schoolId: userInfo.userPhone
+            schoolId:1
         }).then((response) => {
             Toast.hide();
             if (response && response.data) {

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

@@ -95,12 +95,11 @@ class MeetingSignIn extends Component {
 
         fetchPost(API.meetingList, {
             teacherId: this.props.userInfo.userId,
-            meetingStatus: 1,
+            // meetingStatus: 1,
             pageIndex: mPageIndex,
             pageSize: mPageSize
         }).then(response => {
             Toast.hide()
-
             if (isObjEmpty(response, response.data, response.data.notify)) {
                 if (mPageIndex > 1) {
                     mPageIndex--
@@ -109,9 +108,9 @@ class MeetingSignIn extends Component {
                 response.data.notify.forEach((item, index) => {
                     let meetBean = new MeetingBean()
 
-                    meetBean.meetId = getIntValue(item, 'notifyId')
-                    meetBean.title = getStrValue(item, 'notifyName')
-                    meetBean.meetStatusCode = getIntValue(item, 'notifyStatus')
+                    meetBean.meetId = getIntValue(item, 'meetingId')
+                    meetBean.title = getStrValue(item, 'meetingName')
+                    meetBean.meetStatusCode = getIntValue(item, 'meetingStatus')
                     if (meetBean.meetStatusCode === 2) {
                         meetBean.meetStatus = '未开始'
                     } else if (meetBean.meetStatusCode === 3) {
@@ -119,24 +118,21 @@ class MeetingSignIn extends Component {
                     } else if (meetBean.meetStatusCode === 4) {
                         meetBean.meetStatus = '已结束'
                     }
-                    meetBean.meetDetail = getStrValue(item, 'notifyDetails')
-                    meetBean.createTime = getStrValue(item, 'creatDate')
+                    meetBean.meetDetail = getStrValue(item, 'meetingDetails')
+                    meetBean.createTime = getStrValue(item, 'createDate')
                     meetBean.startTime = getStrValue(item, 'startDate')
                     meetBean.endTime = getStrValue(item, 'endDate')
                     meetBean.remainTime = getStrValue(item, 'reminderDate')
-                    meetBean.address = getStrValue(item, 'notifyAddress')
-                    meetBean.sponsor = getStrValue(item, 'notifyCreatorName')
-                    meetBean.sponsorId = getIntValue(item, 'notifyCreator')
-                    meetBean.signStatusCode = getIntValue(item, 'signStatus')
-                    if (meetBean.signStatusCode === 1) {
+                    meetBean.address = getStrValue(item, 'meetingAddress')
+                    meetBean.sponsor = getStrValue(item, 'teacherName')
+                    meetBean.sponsorId = getIntValue(item, 'meetingCreator')
+                    meetBean.signStatusCode = getIntValue(item, 'meetingSign')
+                    if (meetBean.signStatusCode === 1 || meetBean.signStatusCode === 2) { //3.已签到
                         meetBean.signStatus = '签到'
-                    } else if (meetBean.signStatusCode === 5) {
+                    } else if (meetBean.signStatusCode === 3) {
                         meetBean.signStatus = '已签到'
-                    } else {
-                        meetBean.signStatusCode = 1
-                        meetBean.signStatus = '签到'
                     }
-                    meetBean.remarks = getStrValue(item, 'notifyRemarks')
+                    meetBean.remarks = getStrValue(item, 'meetingRemarks')
 
                     meetingSignList.push(meetBean)
 
@@ -171,7 +167,9 @@ class MeetingSignIn extends Component {
         const {meetingSignList} = this.state
 
         Toast.loading('', 0)
-        fetchGet(API.MEETING_SIGN, {
+        console.log("teacherId:",this.props.userInfo.userId)
+        console.log("meetingId:",meetingSignList[index].meetId)
+        fetchPost(API.MEETING_SIGN, {
             teacherId: this.props.userInfo.userId,
             meetingId: meetingSignList[index].meetId,
         }).then(response => {
@@ -193,6 +191,7 @@ class MeetingSignIn extends Component {
     }
 
     onAddMeet = () => {
+        console.log("onAddMeet")
         saveListState({
             scrollTop: ReactDOM.findDOMNode(this.container).scrollTop,
             listData: this.state.meetingSignList,

frontend/wechat-web/src/redux/reducers/redUserInfo.js

@@ -2,7 +2,7 @@ import {USER_INFO, CLEAR_USER_INFO} from "../constants/actionTypes";
 import {getVisibleObj} from "../../utils/common";
 
 const initListState = {
-    userId: 10001,
+    userId: 10003,
     school: '',
     userName: '',
     students: [],
@@ -10,7 +10,7 @@ const initListState = {
     stuId: '',
     student: '',
     userOpenid: 'o8lZ9uJjHXWw2oaHBgSXXnP9pwpU',
-    userPhone: '13641490964',
+    userPhone: '18130506086',
     userRole: 0,
     userRoles: [],
     accessToken: '17_2JV4JY47Ht5gTNCVHPQ3ya6ov9GPmtz_0JACss95_KdxnCVOWhrkmcLqBb27KmnEsYtLaWHxAT_bV_K44hRKD9A1yFib9IFYSkAdrVGtY-A',