15:35

.idea/workspace.xml

@@ -3,6 +3,8 @@
   <component name="ChangeListManager">
     <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/src/configs/api.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/configs/api.config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -54,9 +56,10 @@
           <entry key="project.open.time.32" value="1" />
           <entry key="project.open.time.34" value="1" />
           <entry key="project.open.time.36" value="1" />
+          <entry key="project.open.time.45" value="1" />
           <entry key="project.open.time.46" value="1" />
           <entry key="project.open.time.47" value="1" />
-          <entry key="project.opened" value="5" />
+          <entry key="project.opened" value="6" />
         </counts>
       </usages-collector>
     </session>
@@ -66,8 +69,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/configs/api.config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2574">
-              <caret line="146" selection-start-line="146" selection-end-line="146" />
+            <state relative-caret-position="523">
+              <caret line="148" lean-forward="true" selection-start-line="148" selection-end-line="148" />
               <folding>
                 <element signature="e#0#47#0" expanded="true" />
               </folding>
@@ -78,56 +81,17 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="103" column="16" selection-start-line="103" selection-start-column="16" selection-end-line="103" selection-end-column="16" />
+            <state relative-caret-position="1495">
+              <caret line="142" column="78" selection-start-line="142" selection-start-column="78" selection-end-line="142" selection-end-column="78" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/changephonenumber/ChangePhoneNumber.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6138">
-              <caret line="351" column="69" selection-start-line="351" selection-start-column="69" selection-end-line="351" selection-end-column="69" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4662">
-              <caret line="272" column="75" selection-start-line="272" selection-start-column="75" selection-end-line="272" selection-end-column="75" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4536">
-              <caret line="267" selection-start-line="267" selection-end-line="267" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/configs/router.config.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1386">
-              <caret line="141" column="55" selection-start-line="141" selection-start-column="55" selection-end-line="141" selection-end-column="55" />
-              <folding>
-                <element signature="e#0#38#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6084">
-              <caret line="350" column="16" selection-start-line="350" selection-start-column="16" selection-end-line="350" selection-end-column="16" />
+            <state relative-caret-position="18">
+              <caret line="17" column="21" lean-forward="true" selection-end-line="165" selection-end-column="78" />
             </state>
           </provider>
         </entry>
@@ -180,8 +144,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/applications/wechat/wechat-server/pom.xml" />
-        <option value="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java" />
         <option value="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-dev.yml" />
@@ -225,12 +187,14 @@
         <option value="$PROJECT_DIR$/frontend/pc-web/app/view/main/Main.js" />
         <option value="$PROJECT_DIR$/frontend/wechat-web/package.json" />
         <option value="$PROJECT_DIR$/frontend/wechat-web/src/index.js" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js" />
         <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js" />
         <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/ApprovelItem.js" />
         <option value="$PROJECT_DIR$/frontend/wechat-web/src/configs/api.config.js" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/changephonenumber/ChangePhoneNumber.js" />
         <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js" />
-        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js" />
-        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js" />
       </list>
     </option>
   </component>
@@ -268,7 +232,7 @@
       <select />
     </treeState>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="35" />
     <option name="y" value="20" />
     <option name="width" value="1346" />
@@ -283,8 +247,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -337,19 +299,13 @@
               <item name="hiPages" type="462c0819:PsiDirectoryNode" />
               <item name="scorenotification" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
-              <item name="frontend" type="462c0819:PsiDirectoryNode" />
-              <item name="wechat-web" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="redux" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -519,6 +475,7 @@
       <workItem from="1548124343719" duration="993000" />
       <workItem from="1548130857837" duration="602000" />
       <workItem from="1548134210359" duration="1768000" />
+      <workItem from="1548138058886" duration="1981000" />
     </task>
     <task id="LOCAL-00001" summary="删除编译文件">
       <created>1547633261163</created>
@@ -615,12 +572,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="44332000" />
+    <option name="totallyTimeSpent" value="46313000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.22083981" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.2708018" />
       <window_info id="Structure" order="1" weight="0.25340393" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="3" />
@@ -742,23 +700,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="智慧校园APP网页前端代码上传" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="55">
-          <caret line="62" column="12" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="62" column="12" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/runtime/nginx/default.conf">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="277">
@@ -987,58 +928,77 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/configs/api.config.js">
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2574">
-          <caret line="146" selection-start-line="146" selection-end-line="146" />
-          <folding>
-            <element signature="e#0#47#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="6138">
+          <caret line="351" column="69" selection-start-line="351" selection-start-column="69" selection-end-line="351" selection-end-column="69" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js">
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6138">
-          <caret line="351" column="69" selection-start-line="351" selection-start-column="69" selection-end-line="351" selection-end-column="69" />
+        <state relative-caret-position="6084">
+          <caret line="350" column="16" selection-start-line="350" selection-start-column="16" selection-end-line="350" selection-end-column="16" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4662">
-          <caret line="272" column="75" selection-start-line="272" selection-start-column="75" selection-end-line="272" selection-end-column="75" />
+        <state relative-caret-position="437">
+          <caret line="265" column="75" selection-start-line="265" selection-start-column="75" selection-end-line="265" selection-end-column="75" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4536">
-          <caret line="267" selection-start-line="267" selection-end-line="267" />
+        <state relative-caret-position="523">
+          <caret line="266" lean-forward="true" selection-start-line="266" selection-end-line="266" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/approvel/ApprovelItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="847">
+          <caret line="65" column="1" selection-start-line="65" selection-start-column="1" selection-end-line="65" selection-end-column="1" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/configs/router.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1386">
-          <caret line="141" column="55" selection-start-line="141" selection-start-column="55" selection-end-line="141" selection-end-column="55" />
+        <state relative-caret-position="271">
+          <caret line="127" column="50" selection-start-line="127" selection-start-column="50" selection-end-line="127" selection-end-column="50" />
           <folding>
             <element signature="e#0#38#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/leave/LeaveAddCPage.js">
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/changephonenumber/ChangePhoneNumber.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6084">
-          <caret line="350" column="16" selection-start-line="350" selection-start-column="16" selection-end-line="350" selection-end-column="16" />
+        <state relative-caret-position="-162" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/changephonenumber/ChangePhoneNumber.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="18">
+          <caret line="17" column="21" lean-forward="true" selection-end-line="165" selection-end-column="78" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/configs/api.config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="523">
+          <caret line="148" lean-forward="true" selection-start-line="148" selection-end-line="148" />
+          <folding>
+            <element signature="e#0#47#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/hiPages/scorenotification/ScoreNotification.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="103" column="16" selection-start-line="103" selection-start-column="16" selection-end-line="103" selection-end-column="16" />
+        <state relative-caret-position="1495">
+          <caret line="142" column="78" selection-start-line="142" selection-start-column="78" selection-end-line="142" selection-end-column="78" />
         </state>
       </provider>
     </entry>

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

@@ -12,7 +12,7 @@ import store from './../redux/store/store'
 export const _baseURL = 'http://10.1.80.101:9600'
 export const API = {
     //获取验证码
-    SEND_CODE: _baseURL + '/user/sendCode',
+    SEND_CODE: _baseURL + '/wxSchool/user/sendCode',
     //获取openId
     GET_OPENID: _baseURL + '/wxPay/getOpenid',
     //绑定学号
@@ -119,7 +119,7 @@ export const API = {
     //审批操作
     doapprove: _baseURL + '/wxSchool/oaApprove/approve',
     //审批单详情
-    oaDetails: _baseURL + '/wxSchool/oaApprovee/oaDetails',
+    oaDetails: _baseURL + '/wxSchool/oaApprove/oaDetails',
 
     //获取分值条件
     getCurr: _baseURL + '/score/getCurr',
@@ -140,6 +140,12 @@ export const API = {
     MEETING_SIGN: _baseURL + '/wxSchool/meeting/meetingSign',
     //删除会议
     deleteMeeting:_baseURL + '/wxSchool/meeting/deleteMeeting',
+    //通过验证码修改手机号
+    updatePhone: _baseURL + '/wxSchool/user/updatePhone',
+    //成绩通知
+    getScoreByStu: _baseURL + '/wxSchool/stuScore/getScoreByStu',
+    //获取家长和老师所有对象
+    getClazzByTeacherId:_baseURL + '/wxSchool/user/getClazzByTeacherId',
 }
 
 

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

@@ -12,6 +12,7 @@ import {Toast,Picker} from 'antd-mobile';
 import {connect} from 'react-redux';
 import RefreshLayout from "../../../components/RefreshLayout";
 import {Button,Icon,Input,List,Skeleton} from 'antd';
+import {getIntValue, getStrValue, isObjEmpty} from "../../../utils/common";
 
 let pageIndex = 0
 let pageSize = 10
@@ -20,6 +21,7 @@ class ScoreNotification extends Component{
     constructor(){
         super();
         this.state = {
+            stuId:null,
             selectClass:null,
             selectTime:null,
             ScoreDataList:[
@@ -31,6 +33,24 @@ class ScoreNotification extends Component{
             isLoading: true,
         }
     }
+
+    componentWillMount() {
+        document.title = '成绩通知'
+    }
+    componentDidMount() {
+        let stuId
+        if (this.props.match.params.stuId == null){
+            stuId = this.props.userInfo.stuId
+        }else {
+            stuId = this.props.match.params.stuId
+        }
+        this.setState({
+            stuId:stuId
+        },function () {
+            this.getScoreData()
+            console.log("stuId",stuId)
+        })
+    }
     render(){
         return(
             <div className="this_contaior" >
@@ -55,6 +75,9 @@ class ScoreNotification extends Component{
         )
     }
     getScoreData =()=>{
+        if(this.state.stuId == null || this.state.stuId.trim().length == 0){
+            return
+        }
         try {
             this.setState({
                 isRefreshing: true
@@ -63,17 +86,25 @@ class ScoreNotification extends Component{
         }
         pageIndex++
         let params = {
-            stuId:this.props.userInfo.stuId,
+            stuId:this.state.stuId,
             pageIndex: pageIndex,
             pageSize: pageSize
         }
-        fetchGet(API.getScoreByStuId,params,{})
+        console.log('params',params)
+        fetchPost(API.getScoreByStu,params,{})
             .then((response)=>{
                 console.log('response',response)
                 if(response.success && response.data[0].schoolAverage !=  "NaN"){
-                    this.setState({
-                        ScoreDataList:response.data
-                    })
+                    if (pageIndex == 1){
+                        this.setState({
+                            ScoreDataList:response.data
+                        })
+                    }else {
+                        this.setState({
+                            ScoreDataList:this.state.ScoreDataList.push(response.data)
+                        })
+                    }
+
                 }else {
                     Toast.fail('暂无数据', 2)
                     this.setState({
@@ -101,12 +132,6 @@ class ScoreNotification extends Component{
         })
     }
 
-    componentWillMount() {
-        document.title = '成绩通知'
-    }
-    componentDidMount() {
-        this.getScoreData()
-    }
 }
 
 let mapStateToProps = (state) => ({