Procházet zdrojové kódy

个人信息接口调整以及本地对接

RaoMeng před 6 roky
rodič
revize
7566259454

+ 343 - 209
.idea/workspace.xml

@@ -3,6 +3,22 @@
   <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/configs/router.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/configs/router.config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/AccountBind.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/AccountBind.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/BindMenu.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/BindMenu.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/ClassAlbum.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/ClassAlbum.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/PictureList.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/PictureList.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/UploadImage.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/UploadImage.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/announce/AnnounceRelease.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/announce/AnnounceRelease.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/chart/ChartDemo.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/chart/ChartDemo.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/home/AccountPages.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/home/AppHomePage.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/home/HomePage.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/home/HomePage.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardParent.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardParent.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardTeacher.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardTeacher.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/modules/video/WonderMoment.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/modules/video/WonderMoment.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/wechat-web/src/redux/reducers/redUserInfo.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/wechat-web/src/redux/reducers/redUserInfo.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -50,93 +66,103 @@
   <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/wxUtils/Signature.java">
+        <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="110">
-              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+            <state relative-caret-position="218">
+              <caret line="120" column="4" selection-start-line="120" selection-start-column="4" selection-end-line="120" selection-end-column="4" />
+              <folding>
+                <element signature="e#0#47#0" expanded="true" />
+              </folding>
             </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/WXUtil.java">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/announce/AnnounceRelease.jsx">
           <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 relative-caret-position="178">
+              <caret line="253" column="8" selection-start-line="253" selection-start-column="8" selection-end-line="253" selection-end-column="8" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/wxDemo/OrderInfo.java">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/components/TargetSelect.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="110">
-              <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+            <state relative-caret-position="216">
+              <caret line="89" lean-forward="true" selection-start-line="89" selection-end-line="89" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/wxDemo/OrderReturnInfo.java">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardParent.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="110">
-              <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+            <state relative-caret-position="418">
+              <caret line="256" column="31" lean-forward="true" selection-start-line="256" selection-start-column="31" selection-end-line="256" selection-end-column="31" />
+              <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$/applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/wxDemo/SignInfo.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/AccountBind.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="110">
-              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+            <state relative-caret-position="83">
+              <caret line="194" column="38" lean-forward="true" selection-start-line="194" selection-start-column="38" selection-end-line="194" selection-end-column="38" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/base-servers/file/file-api/src/main/java/com/usoftchina/smartschool/file/api/FileApi.java">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/BindMenu.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2486">
-              <caret line="128" column="48" selection-start-line="128" selection-start-column="48" selection-end-line="128" selection-end-column="48" />
+            <state relative-caret-position="172">
+              <caret line="82" column="66" lean-forward="true" selection-start-line="82" selection-start-column="66" selection-end-line="82" selection-end-column="66" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/package.json">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/home/HomePage.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="273">
-              <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
+            <state relative-caret-position="224">
+              <caret line="112" column="27" selection-start-line="112" selection-start-column="27" selection-end-line="112" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/index.js">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/redux/reducers/redUserInfo.js">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="154">
+              <caret line="22" column="14" selection-start-line="22" selection-start-column="8" selection-end-line="22" selection-end-column="14" />
+              <folding>
+                <element signature="e#0#68#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/chart/lineChart.js">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardTeacher.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <element signature="e#0#43#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="353">
+              <caret line="465" column="63" lean-forward="true" selection-start-line="465" selection-start-column="63" selection-end-line="465" selection-end-column="63" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/chart/ChartDemo.jsx">
+      <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="396">
-              <caret line="61" column="13" lean-forward="true" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" />
+            <state relative-caret-position="374">
+              <caret line="107" column="70" lean-forward="true" selection-start-line="107" selection-start-column="70" selection-end-line="107" selection-end-column="70" />
+              <folding>
+                <element signature="e#0#38#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -153,13 +179,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>project.release.version</find>
-      <find>CommonBaseEntity</find>
-      <find>SpringContextListener</find>
-      <find>com.usoftchina.saas.server.context.SpringContextListener</find>
-      <find>ServerAutoConfiguration</find>
-      <find>redis</find>
-      <find>eureka-server</find>
       <find>1.0-SNAPSHOT</find>
       <find>docker-maven-plugin</find>
       <find>com.usoftchina.saas.file.po.FileInfo</find>
@@ -172,11 +191,33 @@
       <find>saas-operation</find>
       <find>saas</find>
       <find>bizgoblin</find>
+      <find>/wxSchool/user/isBinding</find>
+      <find>obtainBindStatus</find>
+      <find>token</find>
+      <find>AppHomePage</find>
+      <find>userHead</find>
+      <find>selectClazzByTeacher</find>
+      <find>uploadf</find>
+      <find>uploadFile</find>
+      <find>新建</find>
+      <find>router</find>
+      <find>校长信箱</find>
+      <find>notifyMessage</find>
+      <find>NOTIFY_LIST_TEACHER</find>
+      <find>userOpenid</find>
+      <find>schoolId</find>
+      <find>teacherDOS</find>
+      <find>userInfo</find>
+      <find>getHomeData</find>
     </findStrings>
     <replaceStrings>
       <replace>smartschool</replace>
       <replace>1.0.0-SNAPSHOT</replace>
+      <replace>parentsDOS</replace>
     </replaceStrings>
+    <dirStrings>
+      <dir>E:\Projects\CompayProjects\smartschool-platform\frontend\wechat-web</dir>
+    </dirStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -189,21 +230,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java" />
-        <option value="$PROJECT_DIR$/applications/school/school-server/src/main/docker/Dockerfile" />
-        <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/controller/FileController.java" />
-        <option value="$PROJECT_DIR$/applications/school/pom.xml" />
-        <option value="$PROJECT_DIR$/applications/school/school-server/pom.xml" />
-        <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/mapper/FileInfoMapper.xml" />
-        <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" />
-        <option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-dev.yml" />
-        <option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml" />
-        <option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-dev.yml" />
-        <option value="$PROJECT_DIR$/applications/websocket/websocket-server/websocket-server.iml" />
         <option value="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-dev.yml" />
         <option value="$PROJECT_DIR$/applications/school/school-dto/pom.xml" />
         <option value="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/application.yml" />
@@ -238,8 +264,23 @@
         <option value="$PROJECT_DIR$/frontend/pc-web/index.html" />
         <option value="$PROJECT_DIR$/frontend/pc-web/app.json" />
         <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/chart/ChartDemo.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/ClassAlbum.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/video/WonderMoment.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/PictureList.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/album/UploadImage.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/package.json" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/configs/router.config.js" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/message/SystemMessage.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardTeacher.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/announce/AnnounceRelease.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/configs/api.config.js" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardParent.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/BindMenu.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/redux/reducers/redUserInfo.js" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/home/HomePage.jsx" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/AccountBind.jsx" />
       </list>
     </option>
   </component>
@@ -274,7 +315,7 @@
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-20" />
     <option name="y" value="245" />
-    <option name="width" value="1348" />
+    <option name="width" value="1350" />
     <option name="height" value="730" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -286,7 +327,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -295,21 +335,74 @@
               <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
               <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
+              <item name="base-servers" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
+              <item name="base-servers" type="462c0819:PsiDirectoryNode" />
+              <item name="gateway-server" 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" />
+            </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" />
+            </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" />
+            </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="modules" 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="modules" type="462c0819:PsiDirectoryNode" />
+              <item name="home" 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>
             <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" />
+              <item name="reducers" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -321,10 +414,10 @@
     <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="1548063285260" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548165086279" />
     <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" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/frontend/wechat-web" />
     <property name="nodejs_interpreter_path" value="node" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Modules" />
@@ -473,7 +566,9 @@
       <workItem from="1547685937807" duration="1100000" />
       <workItem from="1547688698570" duration="10718000" />
       <workItem from="1548055384845" duration="5190000" />
-      <workItem from="1548061693850" duration="1565000" />
+      <workItem from="1548061693850" duration="6536000" />
+      <workItem from="1548119465729" duration="9612000" />
+      <workItem from="1548138654414" duration="19497000" />
     </task>
     <task id="LOCAL-00001" summary="删除编译文件">
       <created>1547633261163</created>
@@ -566,17 +661,32 @@
       <option name="project" value="LOCAL" />
       <updated>1548063262599</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="智慧校园APP网页前端代码上传">
+      <created>1548063302859</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1548063302859</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="36373000" />
+    <option name="totallyTimeSpent" value="70453000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2077748" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.1997319" />
       <window_info id="Structure" order="1" weight="0.25340393" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="3" />
@@ -587,17 +697,17 @@
       <window_info anchor="bottom" id="Inspection Results" order="0" weight="0.32454696" />
       <window_info anchor="bottom" id="Messages" order="1" sideWeight="0.48789713" weight="0.44481054" />
       <window_info anchor="bottom" id="Message" order="2" />
-      <window_info anchor="bottom" id="Find" order="3" weight="0.3294893" />
+      <window_info anchor="bottom" id="Find" order="3" weight="0.1713881" />
       <window_info anchor="bottom" id="Run" order="4" weight="0.42339373" />
       <window_info anchor="bottom" id="Debug" order="5" weight="0.5897858" />
       <window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
       <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" id="TODO" order="9" weight="0.3286119" />
       <window_info anchor="bottom" content_ui="combo" id="Run Dashboard" order="10" sideWeight="0.8774584" visible="true" weight="0.29983526" />
-      <window_info active="true" anchor="bottom" id="Version Control" order="11" sideWeight="0.81240547" visible="true" weight="0.25212464" />
+      <window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.81240547" weight="0.25212464" />
       <window_info anchor="bottom" id="Spring" order="12" weight="0.47116968" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.41076487" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="13" visible="true" weight="0.296034" />
       <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" />
@@ -615,28 +725,31 @@
       <window_info anchor="right" id="Maven" order="11" />
     </layout>
     <layout-to-restore>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23373677" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1997319" />
       <window_info id="Structure" order="1" weight="0.25340393" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="3" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Image Layers" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Inspection Results" order="0" weight="0.32454696" />
       <window_info anchor="bottom" id="Messages" order="1" sideWeight="0.48789713" weight="0.44481054" />
       <window_info anchor="bottom" id="Message" order="2" />
-      <window_info anchor="bottom" id="Find" order="3" weight="0.38879737" />
+      <window_info anchor="bottom" id="Find" order="3" weight="0.1713881" />
       <window_info anchor="bottom" id="Run" order="4" weight="0.42339373" />
       <window_info anchor="bottom" id="Debug" order="5" weight="0.5897858" />
       <window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
       <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" id="TODO" order="9" weight="0.3286119" />
       <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.57990116" />
+      <window_info anchor="bottom" id="Version Control" order="11" sideWeight="0.81240547" weight="0.25212464" />
       <window_info anchor="bottom" id="Spring" order="12" weight="0.47116968" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.14662273" />
+      <window_info anchor="bottom" id="Terminal" order="13" visible="true" weight="0.305949" />
       <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" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -648,6 +761,7 @@
       <window_info anchor="right" id="Palette&#9;" order="8" />
       <window_info anchor="right" id="Coverage" order="9" sideWeight="0.509589" side_tool="true" weight="0.45688352" />
       <window_info anchor="right" id="Bean Validation" order="10" weight="0.32980332" />
+      <window_info anchor="right" id="Maven" order="11" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -709,130 +823,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="智慧校园APP网页前端代码上传" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="11" column="30" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-437">
-          <caret line="439" column="27" selection-start-line="439" selection-start-column="16" selection-end-line="439" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-114">
-          <caret line="6" column="28" lean-forward="true" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="57" column="12" selection-start-line="57" selection-start-column="8" selection-end-line="57" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <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" />
-          <folding />
-        </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" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/runtime/nginx/default.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding />
-        </state>
-      </provider>
-    </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">
-          <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/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="9" column="23" lean-forward="true" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="FIRST">
-          <first_editor relative-caret-position="422">
-            <caret line="116" column="49" selection-start-line="116" selection-start-column="12" selection-end-line="116" selection-end-column="49" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/app/model/cuservice/Feedback.js" />
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/workspace.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-693">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/build.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.json" />
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.jsonp" />
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.css" />
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="1" column="25" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.js" />
     <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all.css" />
     <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_1.css" />
@@ -997,16 +987,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="14">
+        <state relative-caret-position="154">
           <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
         </state>
       </provider>
@@ -1022,8 +1005,159 @@
     </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="396">
-          <caret line="61" column="13" lean-forward="true" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" />
+        <state relative-caret-position="198">
+          <caret line="9" column="54" selection-start-line="9" selection-start-column="54" selection-end-line="9" selection-end-column="54" />
+        </state>
+      </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="2112">
+          <caret line="103" column="22" selection-start-line="103" selection-start-column="22" selection-end-line="103" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/home/AccountPages.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/home/AppHomePage.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="150" column="21" selection-start-line="150" selection-start-column="21" selection-end-line="150" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/config-overrides.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/album/ClassAlbum.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="132" column="25" lean-forward="true" selection-start-line="132" selection-start-column="25" selection-end-line="134" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/video/WonderMoment.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="178" column="25" selection-start-line="178" selection-start-column="25" selection-end-line="178" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/album/PictureList.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="108" column="12" selection-start-line="108" selection-start-column="12" selection-end-line="110" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/album/UploadImage.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="71" column="26" selection-start-line="71" selection-start-column="26" selection-end-line="71" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/package.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="17" column="17" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/message/SystemMessage.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="62" column="26" selection-start-line="62" selection-start-column="26" selection-end-line="62" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/message/UseHelp.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="62" column="25" selection-start-line="62" selection-start-column="25" selection-end-line="62" selection-end-column="25" />
+        </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="374">
+          <caret line="107" column="70" lean-forward="true" selection-start-line="107" selection-start-column="70" selection-end-line="107" selection-end-column="70" />
+          <folding>
+            <element signature="e#0#38#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/announce/AnnounceRelease.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="253" column="8" selection-start-line="253" selection-start-column="8" selection-end-line="253" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/components/TargetSelect.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="216">
+          <caret line="89" lean-forward="true" selection-start-line="89" selection-end-line="89" />
+        </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="218">
+          <caret line="120" column="4" selection-start-line="120" selection-start-column="4" selection-end-line="120" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#47#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardParent.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="256" column="31" lean-forward="true" selection-start-line="256" selection-start-column="31" selection-end-line="256" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#38#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/notificationCenter/NotifyBoardTeacher.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="353">
+          <caret line="465" column="63" lean-forward="true" selection-start-line="465" selection-start-column="63" selection-end-line="465" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/BindMenu.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="172">
+          <caret line="82" column="66" lean-forward="true" selection-start-line="82" selection-start-column="66" selection-end-line="82" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/home/HomePage.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="112" column="27" selection-start-line="112" selection-start-column="27" selection-end-line="112" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/redux/reducers/redUserInfo.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="22" column="14" selection-start-line="22" selection-start-column="8" selection-end-line="22" selection-end-column="14" />
+          <folding>
+            <element signature="e#0#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/src/modules/accountBind/AccountBind.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="83">
+          <caret line="194" column="38" lean-forward="true" selection-start-line="194" selection-start-column="38" selection-end-line="194" selection-end-column="38" />
         </state>
       </provider>
     </entry>

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

@@ -11,32 +11,12 @@ import store from './../redux/store/store'
 // export const _baseURL = 'http://10.1.80.101:8080/school'
 export const _baseURL = 'http://10.1.80.101:9600'
 export const API = {
-    //获取验证码
-    SEND_CODE: _baseURL + '/user/sendCode',
     //获取openId
     GET_OPENID: _baseURL + '/wxPay/getOpenid',
-    //绑定学号
-    BIND_STUDENTID: _baseURL + '/user/bindStudentId',
-    //绑定工号
-    BIND_TEACHERID: _baseURL + '/user/bindTeacherId',
     //3作业发布 4通知公告 5 校长信箱 6会议
     GET_MEETING_LIST: _baseURL + '/notify/getMeetingList',
-    //1系统信息 2使用帮助
-    SYSTEM_MESSAGE: _baseURL + '/notify/systemMessage',
-    //获取班级列表
-    GET_CLASS_LIST: _baseURL + '/school/getClassList',
-    //获取班级相册列表
-    GET_ALBUM_LIST: _baseURL + '/picture/getAlbumList',
-    //获取相册内所有图片
-    GET_PICTURE_LIST: _baseURL + '/picture/getPictureList',
-    //文件上传地址
-    UPLOAD_FILE: _baseURL + '/file/uploadFile',
-    //修改相册
-    UPDATE_ALBUM: _baseURL + '/picture/updateAlbum',
     //删除附件
     DELETE_FILE: _baseURL + '/picture/deleteFile',
-    //新建相册
-    NEW_CLASS_ALBUM: _baseURL + '/picture/newClassAlbum',
     //视频上传
     INSERT_VIDEO: _baseURL + '/picture/insertVideo',
     //作业 /会议/通知等详情
@@ -60,16 +40,12 @@ export const API = {
     //获取班级家长手机号
     GET_PARENT_PHONES: _baseURL + '/user/getParentPhones',
 
-    //校长信箱提交
-    PRINCIPAL_MAILBOX: _baseURL + '/notify/principalMailbox',
     //校园卡充值
     RECHARGE_FORCARD: _baseURL + '/payCard/reChangeForCard',
     //校园卡详情
     CARD_DETAIL: _baseURL + '/payCard/cardDetail',
     //校园卡消费记录/充值记录
     CONSUME_RECODE: _baseURL + '/payRank/consumeRecode',
-    //获取用户是否绑定
-    USER_ISBINDING: _baseURL + '/user/isBinding',
     //获取组织架构
     USER_GETOBJECT: _baseURL + '/user/getObject',
     //删除校长信箱历史投递
@@ -86,8 +62,6 @@ export const API = {
     notifyMessage: _baseURL + '/notify/getMeetingList',
 
 
-    //首页接口
-    homeIndex: _baseURL + "/wxSchool/user/homePage",
     //创建投票单
     voteCreate: _baseURL + '/vote/voteCreate',//投票创建
     voteList: _baseURL + "/vote/voteList",//家长端
@@ -127,19 +101,58 @@ export const API = {
 
     //TODO 接口修改后的
     // 获取抄送老师
-    getAllTeacher:_baseURL + '/wxSchool/user/getAllTeacher',
+    getAllTeacher: _baseURL + '/wxSchool/user/getAllTeacher',
     //创建会议
-    createMeeting:_baseURL + '/wxSchool/meeting/createMeeting',
+    createMeeting: _baseURL + '/wxSchool/meeting/createMeeting',
     //会议列表
-    meetingList:_baseURL + '/wxSchool/meeting/meetingList',
+    meetingList: _baseURL + '/wxSchool/meeting/meetingList',
     //会议详情
-    getMeetingDetails:_baseURL + '/wxSchool/meeting/getMeetingDetails',
+    getMeetingDetails: _baseURL + '/wxSchool/meeting/getMeetingDetails',
     //结束会议
     endMeeting: _baseURL + '/wxSchool/meeting/endMeeting',
     //会议签到
     MEETING_SIGN: _baseURL + '/wxSchool/meeting/meetingSign',
     //删除会议
-    deleteMeeting:_baseURL + '/wxSchool/meeting/deleteMeeting',
+    deleteMeeting: _baseURL + '/wxSchool/meeting/deleteMeeting',
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //获取用户是否绑定
+    USER_ISBINDING: _baseURL + '/wxSchool/user/isBinding',
+    //获取验证码
+    SEND_CODE: _baseURL + '/wxSchool/user/sendCode',
+    // //绑定学号
+    // BIND_STUDENTID: _baseURL + '/user/bindSt/wxSchool/user/isBindingudentId',
+    // //绑定工号
+    // BIND_TEACHERID: _baseURL + '/user/bindTeacherId',
+
+    //绑定微信
+    BIND_OPENID: _baseURL + '/wxSchool/user/bindOpenid',
+
+    //首页接口
+    homeIndex: _baseURL + "/wxSchool/user/homePage",
+    //1系统信息 2使用帮助
+    SYSTEM_MESSAGE: _baseURL + '/wxSchool/notify/selectNotifyListByType',
+
+    //获取班级列表
+    GET_CLASS_LIST: _baseURL + '/wxSchool/clazz/selectClazzByTeacher',
+    //文件上传地址
+    UPLOAD_FILE: _baseURL + '/wxSchool/file/uploadFile',
+    //新建相册
+    NEW_CLASS_ALBUM: _baseURL + '/wxSchool/clazzAlbum/createAlbum',
+    //修改相册
+    UPDATE_ALBUM: _baseURL + '/wxSchool/clazzPicture/savePicture',
+    //获取班级相册列表
+    GET_ALBUM_LIST: _baseURL + '/wxSchool/clazzAlbum/getListPicByClazz',
+    //获取相册内所有图片
+    GET_PICTURE_LIST: _baseURL + '/wxSchool/clazzPicture/getPictureByAlbum',
+
+    //通知公告列表家长端
+    NOTIFY_LIST_PARENT: _baseURL + '/wxSchool/notify/notifyListByParent',
+    //通知公告列表教师端
+    NOTIFY_LIST_TEACHER: _baseURL + '/wxSchool/notify/notifyListByTeacher',
+    //创建通知公告
+    NOTIFY_CREATE: _baseURL + '/wxSchool/notify/createNotify',
 }
 
 

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

@@ -1,6 +1,5 @@
 import React, {Component} from 'react'
 import {BrowserRouter as Router, Route, Redirect} from 'react-router-dom'
-import AppHomePage from "../modules/home/AppHomePage";
 import BindMenu from "../modules/accountBind/BindMenu";
 import AccountBind from "../modules/accountBind/AccountBind";
 import NewAlbum from "../modules/album/NewAlbum";
@@ -78,7 +77,7 @@ export default class RouteConfig extends Component {
                     {/*饶猛*/}
                     <Route path="/homePage" component={HomePage}/>{/*首页*/}
 
-                    <Route path='/bindMenu/:type/:openid?/:token?' component={BindMenu}/>{/*绑定菜单页面*/}
+                    <Route path='/bindMenu/:type/:openid?/' component={BindMenu}/>{/*绑定菜单页面*/}
                     <Route path='/accountBind/:type?' component={AccountBind}/>{/*绑定页面*/}
 
                     <Route path='/newAlbum/:classId/:name?' component={NewAlbum}/>{/*新建相册*/}

+ 78 - 55
frontend/wechat-web/src/modules/accountBind/AccountBind.jsx

@@ -69,10 +69,10 @@ class AccountBind extends Component {
                         <Avatar icon='user' size={65}/> :
                         <Avatar src={userHead} size={65}/>}
                 </div>
-                <Input placeholder={mType == 'parents' ? '学号' : '工号'}
+                {/*<Input placeholder={mType == 'parents' ? '学号' : '工号'}
                        prefix={idIcon} suffix={idClear}
                        ref={input => this.accountInput = input} onChange={this.accountChange}
-                       value={account} type='number' onKeyPress={this.phoneKeyPress}/>
+                       value={account} type='number' onKeyPress={this.phoneKeyPress}/>*/}
                 <Input placeholder='手机号' prefix={phoneIcon} suffix={phoneClear}
                        ref={input => this.phoneInput = input} onChange={this.phoneChange}
                        value={phone} type='number' onKeyPress={this.phoneKeyPress}
@@ -154,14 +154,14 @@ class AccountBind extends Component {
             userPhone: phone
         }).then(response => {
             Toast.hide()
-            if(response.success){
+            if (response.success) {
                 Toast.success('验证码已发送,请注意查收', 2)
                 mSeconds = 60
                 this.setState({
                     obtainText: '剩余' + mSeconds + '秒'
                 })
                 this.countdown()
-            }else {
+            } else {
                 Toast.fail(response.data.message, 2)
             }
         }).catch(error => {
@@ -191,68 +191,91 @@ class AccountBind extends Component {
 
     bindEvent = () => {
         Toast.loading('信息绑定中...')
-        const {account, phone, code, userHead} = this.state
-        if (isObjEmpty(account, phone, code)) {
+        const {phone, code, userHead} = this.state
+        if (isObjEmpty(phone, code)) {
             Toast.fail('请完善所有输入项!')
             return
         }
-        if (mType == 'parents') {
-            fetchPost(API.BIND_STUDENTID, {
-                stuId: account,
-                userPhone: phone,
-                vcode: code,
-                openid: this.props.userInfo.userOpenid,
-                userPhoto: userHead
-            }).then(response => {
-                Toast.hide()
+        fetchPost(API.BIND_OPENID, {
+            userPhone: phone,
+            code: code,
+            openid: this.props.userInfo.parent ? this.props.userInfo.parent.openid : this.props.userInfo.teacher.openid,
+        }).then(response => {
+            Toast.hide()
+            if (mType == 'parents') {
+                switchUser({
+                    role: 1,
+                })
+            } else if (mType == 'teacher') {
                 switchUser({
-                    userId: getIntValue(response.data, 'userId'),
-                    userName: getStrValue(response.data, 'userName'),
-                    userOpenid: getStrValue(response.data, 'userOpenid'),
-                    userPhone: getStrValue(response.data, 'userPhone'),
-                    userAvatar: userHead,
-                    userRole: 1,
-                })()
-                this.props.history.push('/homePage')
-            }).catch(error => {
-                Toast.hide()
+                    role: 2,
+                })
+            }
+
+            if (response && response.data) {
+                if (response.data.teacherDOS) {
+                    const teacherDOS = response.data.teacherDOS[0]
 
-                if (typeof error === 'string') {
-                    Toast.fail(error, 2)
+                    switchUser({
+                        userRole: 2,
+                        teacher: {
+                            teacherId: getIntValue(teacherDOS, 'teacherId'),
+                            userId: getIntValue(teacherDOS, 'userId'),
+                            openid: getStrValue(teacherDOS, 'openid'),
+                            userPhone: getStrValue(teacherDOS, 'userPhone'),
+                            schoolId: getStrValue(teacherDOS, 'schoolId'),
+                            schoolName: getStrValue(teacherDOS, 'schoolName'),
+                            teacherNumber: getStrValue(teacherDOS, 'teacherNumber'),
+                            teacherName: getStrValue(teacherDOS, 'teacherName'),
+                            teacherPhoto: getStrValue(teacherDOS, 'teacherPhoto'),
+                            teacherAddress: getStrValue(teacherDOS, 'teacherAddress'),
+                            teacherEntry: getStrValue(teacherDOS, 'teacherEntry'),
+                            teacherBirthday: getStrValue(teacherDOS, 'teacherBirthday'),
+                            teacherSex: getStrValue(teacherDOS, 'teacherSex'),//1:男,2:女
+                        }
+                    })
                 } else {
-                    Toast.fail('绑定学号失败')
+                    switchUser({
+                        teacher: ''
+                    })
                 }
-            })
-        } else if (mType == 'teacher') {
-            fetchPost(API.BIND_TEACHERID, {
-                userId: account,
-                userPhone: phone,
-                vcode: code,
-                openid: this.props.userInfo.userOpenid,
-                userPhoto: userHead
-            }).then(response => {
-                Toast.hide()
-                switchUser({
-                    userId: getIntValue(response.data, 'userId'),
-                    userName: getStrValue(response.data, 'userName'),
-                    userOpenid: getStrValue(response.data, 'userOpenid'),
-                    userPhone: getStrValue(response.data, 'userPhone'),
-                    userAvatar: userHead,
-                    userRole: 2,
-                })()
-                this.props.history.push('/homePage')
-            }).catch(error => {
-                Toast.hide()
 
-                if (typeof error === 'string') {
-                    Toast.fail(error, 2)
+                if (response.data.parentsDOS) {
+                    const parentsDOS = response.data.parentsDOS[0]
+
+                    switchUser({
+                        userRole: 1,
+                        parent: {
+                            parentId: getIntValue(parentsDOS, 'parentId'),
+                            userId: getIntValue(parentsDOS, 'userId'),
+                            userPhone: getStrValue(parentsDOS, 'userPhone'),
+                            openid: getStrValue(parentsDOS, 'openid'),
+                            schoolId: getIntValue(parentsDOS, 'schoolId'),
+                            schoolName: getStrValue(parentsDOS, 'schoolName'),
+                            parentsName: getStrValue(parentsDOS, 'parentsName'),
+                            parentsBirthday: getStrValue(parentsDOS, 'parentsBirthday'),
+                            parentsSex: getIntValue(parentsDOS, 'parentsSex'),
+                            parentsPhoto: getStrValue(parentsDOS, 'parentsPhoto'),
+                            parentsAddress: getStrValue(parentsDOS, 'parentsAddress'),
+                        }
+                    })
                 } else {
-                    Toast.fail('绑定工号失败')
+                    switchUser({
+                        parent: ''
+                    })
                 }
-            })
-        }
-    }
+            }
+            this.props.history.push('/homePage')
+        }).catch(error => {
+            Toast.hide()
 
+            if (typeof error === 'string') {
+                Toast.fail(error, 2)
+            } else {
+                Toast.fail('绑定失败')
+            }
+        })
+    }
 }
 
 let mapStateToProps = (state) => ({

+ 51 - 20
frontend/wechat-web/src/modules/accountBind/BindMenu.jsx

@@ -54,7 +54,6 @@ export default class BindMenu extends Component {
                 errorMsg: '获取绑定信息中...'
             })
             this.openid = this.paramId
-            this.token = this.props.match.params.token
 
             //清除用户信息
             clearUserInfo()()
@@ -76,28 +75,61 @@ export default class BindMenu extends Component {
 
     obtainBindStatus = () => {
         fetchGet(API.USER_ISBINDING, {
-            userOpenid: this.openid,
+            openid: 'o8lZ9uJjHXWw2oaHBgSXXnP9pwpU',
+            schoolId: 1
         }).then(response => {
             if (response.data) {
-                let role = 1//1:家长2:老师
-                const roles = getStrValue(response.data, 'roles')
-                if (roles.length > 1) {
-                    role = 1
+                if (!isObjEmpty(response.data.teacherDOS)) {
+                    const teacherDOS = response.data.teacherDOS[0]
+
+                    switchUser({
+                        userRole: 2,
+                        teacher: {
+                            teacherId: getIntValue(teacherDOS, 'teacherId'),
+                            userId: getIntValue(teacherDOS, 'userId'),
+                            openid: getStrValue(teacherDOS, 'openid'),
+                            userPhone: getStrValue(teacherDOS, 'userPhone'),
+                            schoolId: getStrValue(teacherDOS, 'schoolId'),
+                            schoolName: getStrValue(teacherDOS, 'schoolName'),
+                            teacherNumber: getStrValue(teacherDOS, 'teacherNumber'),
+                            teacherName: getStrValue(teacherDOS, 'teacherName'),
+                            teacherPhoto: getStrValue(teacherDOS, 'teacherPhoto'),
+                            teacherAddress: getStrValue(teacherDOS, 'teacherAddress'),
+                            teacherEntry: getStrValue(teacherDOS, 'teacherEntry'),
+                            teacherBirthday: getStrValue(teacherDOS, 'teacherBirthday'),
+                            teacherSex: getStrValue(teacherDOS, 'teacherSex'),//1:男,2:女
+                        }
+                    })()
                 } else {
-                    if (roles === '教师') {
-                        role = 2
-                    } else if (roles === '家长') {
-                        role = 1
-                    }
+                    switchUser({
+                        teacher: ''
+                    })()
+                }
+
+                if (!isObjEmpty(response.data.parentsDOS)) {
+                    const parentsDOS = response.data.parentsDOS[0]
+
+                    switchUser({
+                        userRole: 1,
+                        parent: {
+                            parentId: getIntValue(parentsDOS, 'parentId'),
+                            userId: getIntValue(parentsDOS, 'userId'),
+                            userPhone: getStrValue(parentsDOS, 'userPhone'),
+                            openid: getStrValue(parentsDOS, 'openid'),
+                            schoolId: getIntValue(parentsDOS, 'schoolId'),
+                            schoolName: getStrValue(parentsDOS, 'schoolName'),
+                            parentsName: getStrValue(parentsDOS, 'parentsName'),
+                            parentsBirthday: getStrValue(parentsDOS, 'parentsBirthday'),
+                            parentsSex: getIntValue(parentsDOS, 'parentsSex'),
+                            parentsPhoto: getStrValue(parentsDOS, 'parentsPhoto'),
+                            parentsAddress: getStrValue(parentsDOS, 'parentsAddress'),
+                        }
+                    })()
+                } else {
+                    switchUser({
+                        parent: ''
+                    })()
                 }
-                switchUser({
-                    userId: getIntValue(response.data, 'userId'),
-                    userName: getStrValue(response.data, 'userName'),
-                    userOpenid: getStrValue(response.data, 'userOpenid'),
-                    userPhone: getStrValue(response.data, 'userPhone'),
-                    userRole: role,
-                    accessToken: this.token,
-                })()
 
                 this.setState({
                     bindStatus: 2
@@ -105,7 +137,6 @@ export default class BindMenu extends Component {
             } else {
                 switchUser({
                     userOpenid: this.openid,
-                    accessToken: this.token,
                 })()
                 this.setState({
                     bindStatus: 1

+ 5 - 3
frontend/wechat-web/src/modules/album/ClassAlbum.jsx

@@ -128,9 +128,11 @@ class ClassAlbum extends Component {
         this.initAlbumList()
 
         fetchGet(API.GET_ALBUM_LIST, {
-            schId: classBean.schId,
-            picStatus: 2,
-            picType: 1
+            clazzId: classBean.schId,
+            albumStatus: 1,
+            albumType: 1,
+            pageIndex: 1,
+            pageSize: 100,
         }).then(response => {
             Toast.hide()
 

+ 3 - 2
frontend/wechat-web/src/modules/album/PictureList.jsx

@@ -106,8 +106,9 @@ export default class PictureList extends Component {
     getPictureList = albumId => {
 
         fetchGet(API.GET_PICTURE_LIST, {
-            parentId: albumId,
-            picStatus: 2
+            albumId: albumId,
+            pageIndex: 1,
+            pageSize: 100,
         }).then(response => {
             Toast.hide()
 

+ 5 - 4
frontend/wechat-web/src/modules/album/UploadImage.jsx

@@ -67,8 +67,9 @@ export default class UploadImage extends Component {
 
     getPictureList = albumId => {
         fetchGet(API.GET_PICTURE_LIST, {
-            parentId: albumId,
-            picStatus: 2
+            albumId: albumId,
+            pageIndex: 1,
+            pageSize: 100,
         }).then(response => {
             Toast.hide()
 
@@ -155,8 +156,8 @@ export default class UploadImage extends Component {
         console.log(fileUrls)
 
         fetchPost(API.UPDATE_ALBUM, {
-            fileUrls: JSON.stringify(fileUrls),
-            parentId: this.albumId
+            pictureUrls: JSON.stringify(fileUrls),
+            albumId: this.albumId
         }).then(response => {
             Toast.hide()
             Toast.success('更新成功')

+ 6 - 5
frontend/wechat-web/src/modules/announce/AnnounceRelease.jsx

@@ -212,17 +212,18 @@ class AnnounceRelease extends Component {
         }
         console.log(userList)
 
-        fetchPost(API.ISSUE_NOTIFICATION, {
-            notifyName: announceTitle,
-            notifyType: 4,
+        fetchPost(API.NOTIFY_CREATE, {
+            notifyTitle: announceTitle,
+            notifyType: 3,
             notifyDetails: announceContent,
             notifyCreator: this.props.userInfo.userId,
-            notifyStatus: 2,
+            notifyStatus: 1,
             notifyFiles: JSON.stringify(fileUrls),
+            notifyRemarks: '',
             userIds: JSON.stringify(userList)
         }).then(response => {
             Toast.hide()
-            Toast.success('发布成功',1)
+            Toast.success('发布成功', 1)
             clearListState()()
 
             this.setState({

+ 8 - 8
frontend/wechat-web/src/modules/chart/ChartDemo.jsx

@@ -72,21 +72,21 @@ export default class ChartDemo extends Component {
         return (
             <div className='common-flex-column'>
                 <span style={{padding: '10px', color: 'red'}}>折线图</span>
-                <canvas id='lineChart' width='100%' style={{width: '100%', height: '260px'}}></canvas>
+                <canvas id='lineChart' width='100%' style={{width: '100%', height: '260px'}}/>
                 <span style={{padding: '10px', color: 'red'}}>可平移折线图</span>
-                <canvas id='lineChart2' width='100%' style={{width: '100%', height: '260px'}}></canvas>
+                <canvas id='lineChart2' width='100%' style={{width: '100%', height: '260px'}}/>
                 <span style={{padding: '10px', color: 'red'}}>基础柱状图</span>
-                <canvas id='rectChart1' width='100%' style={{width: '100%', height: '260px'}}></canvas>
+                <canvas id='rectChart1' width='100%' style={{width: '100%', height: '260px'}}/>
                 <span style={{padding: '10px', color: 'red'}}>分组柱状图</span>
-                <canvas id='rectChart2' width='100%' style={{width: '100%', height: '260px'}}></canvas>
+                <canvas id='rectChart2' width='100%' style={{width: '100%', height: '260px'}}/>
                 <span style={{padding: '10px', color: 'red'}}>基础饼状图</span>
-                <canvas id='pieChart1' width='100%' style={{width: '100%', height: '260px'}}></canvas>
+                <canvas id='pieChart1' width='100%' style={{width: '100%', height: '260px'}}/>
                 <span style={{padding: '10px', color: 'red'}}>带图例、文本饼状图</span>
-                <canvas id='pieChart2' width='100%' style={{width: '100%', height: '260px'}}></canvas>
+                <canvas id='pieChart2' width='100%' style={{width: '100%', height: '260px'}}/>
                 <span style={{padding: '10px', color: 'red'}}>可选中的饼状图</span>
-                <canvas id='pieChart3' width='100%' style={{width: '100%', height: '260px'}}></canvas>
+                <canvas id='pieChart3' width='100%' style={{width: '100%', height: '260px'}}/>
                 <span style={{padding: '10px', color: 'red'}}>雷达分布图</span>
-                <canvas id='radarChart1' width='100%' style={{width: '100%', height: '260px'}}></canvas>
+                <canvas id='radarChart1' width='100%' style={{width: '100%', height: '260px'}}/>
             </div>
         )
     }

+ 0 - 19
frontend/wechat-web/src/modules/home/AccountPages.js

@@ -1,19 +0,0 @@
-/**
- * Created by Arison on 2018/11/1.
- */
-import React from 'react';
-/**
- * Created by Arison on 2018/11/1.
- */
-class AccountPages extends React.Component{
-       constructor(props){
-        super(props);
-    }
-    render(){
-        return <div>
-            {JSON.stringify(this.props.location.search)}
-        </div>
-    }
-}
-
-export  default AccountPages;

+ 0 - 1172
frontend/wechat-web/src/modules/home/AppHomePage.js

@@ -1,1172 +0,0 @@
-/**
- * Created by Arison on 2018/11/1.
- */
-import React from 'react';
-import 'bootstrap/dist/css/bootstrap.css'
-import 'bootstrap/dist/css/bootstrap.min.css'
-import {Menu, Dropdown, message, Icon, Carousel, List, Avatar} from 'antd';
-import ReactPlayer from 'react-player'
-import "slick-carousel/slick/slick-theme.css"
-import "slick-carousel/slick/slick.css"
-
-import icon_group from '../../style/imgs/icon_group.png'
-import icon_home_menu_dengji from '../../style/imgs/icon_home_menu_dengji.png'
-import icon_home_menu_2 from '../../style/imgs/icon_home_menu_2.png'
-import icon_home_menu_3 from '../../style/imgs/icon_home_menu_3.png'
-import icon_home_menu_4 from '../../style/imgs/icon_home_menu_4.png'
-import icon_home_menu_5 from '../../style/imgs/icon_home_menu_5.png'
-import icon_home_menu_6 from '../../style/imgs/icon_home_menu_6.png'
-import icon_home_menu_7 from '../../style/imgs/icon_home_menu_7.png'
-import icon_home_menu_8 from '../../style/imgs/icon_home_menu_8.png'
-
-
-import icon_home_menu_9 from '../../style/imgs/icon_home_menu_9.png'
-import icon_home_menu_10 from '../../style/imgs/icon_home_menu_10.png'
-import icon_home_menu_11 from '../../style/imgs/icon_home_menu_11.png'
-import icon_home_menu_12 from '../../style/imgs/icon_home_menu_12.png'
-import icon_home_menu_13 from '../../style/imgs/icon_home_menu_13.png'
-import icon_home_menu_14 from '../../style/imgs/icon_home_menu_14.png'
-import icon_home_menu_15 from '../../style/imgs/icon_home_menu_15.png'
-
-
-import icon_home_menu_21 from '../../style/imgs/icon_home_menu21.png'
-import icon_home_menu_22 from '../../style/imgs/icon_home_menu22.png'
-import icon_home_menu_23 from '../../style/imgs/icon_home_menu23.png'
-import icon_home_menu_24 from '../../style/imgs/icon_home_menu24.png'
-import icon_home_menu_25 from '../../style/imgs/icon_home_menu25.png'
-import icon_home_menu_26 from '../../style/imgs/icon_home_menu26.png'
-import icon_home_menu_27 from '../../style/imgs/icon_home_menu27.png'
-import icon_home_menu_28 from '../../style/imgs/icon_home_menu28.png'
-import icon_home_change from '../../style/imgs/icon_home_change.png'
-import icon_home_menu_30 from '../../style/imgs/icon_home_menu30.png'
-import icon_home_menu_31 from '../../style/imgs/icon_home_menu31.png'
-import icon_home_menu_32 from '../../style/imgs/icon_home_menu32.png'
-import icon_home_menu_33 from '../../style/imgs/icon_home_menu33.png'
-import icon_home_menu_34 from '../../style/imgs/icon_home_menu34.png'
-import icon_home_menu_35 from '../../style/imgs/icon_home_menu35.png'
-
-import icon_home_help from '../../style/imgs/icon_home_help.png'
-import icon_home_message from '../../style/imgs/icon_home_message.png'
-import icon_home_oa from '../../style/imgs/icon_home_menu_oa.png'
-
-import {Link} from "react-router-dom";
-import './AppHomePage.css'
-import '../../style/css/app-gloal.css'
-import {switchUser} from '../../redux/actions/userInfo'
-import {connect} from "react-redux";
-import {clearListState} from 'action/listState'
-import {clearClassData} from "../../redux/actions/classData";
-import {fetchPost, fetchGet} from "../../utils/fetchRequest";
-import {API, _baseURL} from "../../configs/api.config";
-import {Toast} from 'antd-mobile'
-import {isObjEmpty} from '../../utils/common'
-
-
-/**
- * Created by Arison on 2018/11/1.
- */
-class AppHomePage extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            userPhoto: '',
-            userId: '',
-            userName: '',
-            userPhone: '',
-            school:'',
-            userOpenid: '',
-            isTeacher: false,
-            pictures: {
-                albums: [],
-                videos: []
-            },
-            roles: ["家长"],
-            studentIndex: 0,
-            students: []
-        }
-    }
-
-    componentWillReceiveProps(nextProps) {
-
-    }
-
-    spliceArrayPicture = (arrays) => {
-        let newArrays = [];
-        if (arrays.length != 0) {
-            let items = [];
-            for (let i = 0; i < arrays.length; i++) {
-                items.push(arrays[i]);
-                if (i % 3 === 2) {
-                    let model = {
-                        index: i,
-                        data: [...items]
-                    };
-                    newArrays.push(model);
-                    items.length = 0;
-                }
-            }
-            if (items.length != 0) {
-                let model = {
-                    index: arrays.length + 1,
-                    data: [...items]
-                };
-                newArrays.push(model);
-            }
-
-        }
-        return newArrays;
-    }
-
-    onChangeRole({key}) {
-        switch (key) {
-            case "2":
-                switchUser({userRole: 2})();
-                this.setState({
-                    isTeacher: true
-                })
-                this.props.location.search = "?role=teacher"
-                break;
-            case "1":
-                switchUser({
-                    userRole: 1
-                })();
-                this.setState({
-                    isTeacher: false
-                })
-                break;
-        }
-    }
-
-
-    componentDidMount() {
-        //清除列表缓存数据
-        clearListState()()
-        clearClassData()()
-
-        document.title = "智慧校园";
-
-        console.log("componentDidMount()", this.props.userInfo);
-        Toast.loading("");
-        //获取首页接口
-        fetchGet(API.homeIndex, {
-            userOpenid: isObjEmpty(this.props.userInfo.userOpenid) ? "1" : this.props.userInfo.userOpenid,
-            userPhone: isObjEmpty(this.props.userInfo.userPhone) ? "13266699268" : this.props.userInfo.userPhone
-        }).then((response) => {
-            console.log("result():" + JSON.stringify(response));
-            Toast.hide();
-            this.state.userId = response.data.userId;
-            this.state.userName = response.data.userName;
-            this.state.school=response.data.schoolName;
-            // response.data.students.splice(1,1,{isSelected:false,...student});
-            console.log("studId():", this.props.userInfo.stuId);
-            if (isObjEmpty(this.props.userInfo.stuId)) {
-                if (!isObjEmpty(response.data.students)) {
-                    let student = response.data.students[0];
-                    let student1 = {isSelected: true, ...student};
-                    response.data.students.splice(0, 1, student1);
-                }
-            } else {
-                if (!isObjEmpty(response.data.students)) {
-                    for (let i = 0; i < response.data.students.length; i++) {
-                        if (this.props.userInfo.stuId === response.data.students[i].stuId) {
-                            response.data.students[i] = {isSelected: true, ...response.data.students[i]};
-                            this.state.studentIndex = i;
-                        } else {
-                            response.data.students[i] = {isSelected: false, ...response.data.students[i]};
-                        }
-                    }
-                }
-            }
-            this.state.students = response.data.students;
-            this.state.pictures = response.data.pictures;
-            this.state.roles = response.data.roles;
-            this.state.userPhoto = response.data.userPhoto;
-            this.state.userOpenid = response.data.userOpenid;
-            this.state.userPhone = response.data.userPhone;
-            if (response.data.roles.length === 1) {
-                if (response.data.roles[0] === "家长") {
-                    this.state.isTeacher = false;
-                }
-                if (response.data.roles[0] === "教师") {
-                    this.state.isTeacher = true;
-                }
-            }
-
-            let stuName = isObjEmpty(response.data.students) ? "" : response.data.students[0].stuName;
-            let stuId = isObjEmpty(response.data.students) ? "" : response.data.students[0].stuId;
-
-            this.setState({
-                userPhoto: this.state.userPhoto,
-                userId: this.state.userId,
-                userName: this.state.userName,
-                userPhone: this.state.userPhone,
-                userOpenid: this.state.userOpenid,
-                pictures: this.state.pictures,
-                roles: this.state.roles,
-                students: this.state.students,
-            })
-
-            switchUser({
-                stuName: isObjEmpty(this.props.userInfo.stuName) ? stuName : this.props.userInfo.stuName,
-                userId: this.state.userId,
-                school:this.state.school,
-                userName: this.state.userName,
-                userOpenid: this.state.userOpenid,
-                userPhone: this.state.userPhone,
-                stuId: isObjEmpty(this.props.userInfo.stuId) ? stuId : this.props.userInfo.stuId,
-                userRole: this.state.isTeacher ? 2 : 1,
-                userAvatar: this.state.userPhoto
-            })();
-        }).catch((error) => {
-            Toast.hide();
-            console.log("error:" + JSON.stringify(error));
-        })
-
-        if (this.props.userInfo.userRole === 2) {//教师
-            this.setState({
-                isTeacher: true
-            })
-        } else {//家长
-            this.setState({
-                isTeacher: false
-            })
-        }
-    }
-
-    onItemClick = (index) => {
-        console.log("onItemClick()", index);
-        for (let i = 0; i < this.state.students.length; i++) {
-            if (i != index) {
-                this.state.students[i].isSelected = false;
-            } else {
-                this.state.students[i].isSelected = true;
-                //更改全局状态
-                switchUser({
-                    stuId: this.state.students[i].stuId,
-                    stuName: this.state.students[i].stuName
-                })()
-                //刷新相册和视频
-                this.state.studentIndex = i;
-            }
-        }
-        console.log("onItemClick()", this.props.userInfo);
-        this.setState({
-            students: this.state.students,
-            studentIndex: this.state.studentIndex
-        });
-    }
-
-
-    render() {
-        let borderLine = {
-            border: "1px solid #f4f4f4"
-        };
-
-        let roleMenu = (
-            <Menu onClick={this.onChangeRole.bind(this)}>
-                <Menu.Item key="1" style={{width: "90px", fontSize: "15px"}}>
-                    <span>家长</span>
-                </Menu.Item>
-                <Menu.Item key="2" style={{width: "90px", fontSize: "15px"}}>
-                    <span>教师</span>
-                </Menu.Item>
-            </Menu>
-        );
-
-        console.log(" render() userRole:", this.props.userInfo);
-        return <div className="container-fluid">
-            {/*顶部Header*/}
-            <div className="row">
-                <div className="col-sm-12">
-                    <div className="row" id="header">
-                        <div className="col-xs-12">
-                            <div className="row">
-                                <div className="col-xs-8 col-sm-8"></div>
-                                <div className="col-xs-4 col-sm-4  flex_row_right">
-                                    <div className="flex_center" style={{
-                                        borderRadius: "4px 0px 0px 4px",
-                                        background: "#BCC8CE",
-                                        marginTop: "20px",
-                                        marginLeft: "0px",
-                                        padding: "2px"
-                                    }}>
-                                        <span style={{
-                                            color: "#2C7CF8",
-                                            margin: "0px",
-                                            fontSize: "13px"
-                                        }}>     {this.state.school}</span>
-                                    </div>
-
-                                </div>
-                            </div>
-                            <div className="row">
-                                <div className="col-xs-3" id="global_row_right"
-                                     style={{marginBottom: "30px", marginTop: "20px"}}>
-                                    {isObjEmpty(this.props.userInfo.userAvatar) ?
-                                        <Avatar size={60} icon='user'/> :
-                                        <img
-                                            src={this.props.userInfo.userAvatar}
-                                            width={60} height={60} className="img-circle"
-                                            style={{border: '3px solid #ffffff'}}/>
-                                    }
-                                </div>
-                                <div className="col-xs-9" id="global-clear">
-                                    <div style={{marginTop: "30px", marginLeft: "0px"}}><span
-                                        style={{fontSize: "16px", color: "black"}}>尊敬的{this.state.userName}
-                                        {
-                                            this.state.isTeacher ? ('老师') : ('家长')
-                                        }
-                                </span>
-                                        {this.state.roles.length === 2 ? (
-                                            <Dropdown overlay={roleMenu} trigger={['click']}>
-                                                <a className="ant-dropdown-link" href="#">
-                                                    {/* <Icon type="down" style={{fontSize:"20px"}}/>*/}
-                                                    <img style={{marginLeft: "5px"}} src={icon_home_change} width={15}
-                                                         height={15}/>
-                                                </a>
-                                            </Dropdown>) : ("")}
-                                    </div>
-
-                                    {/*孩子列表*/}
-                                    {this.state.isTeacher ? ("") : (<div className="margin_top_10 padding_right_10">
-                                        <List
-                                            grid={{gutter: 16, column: 3}}
-                                            locale={{emptyText: ''}}
-                                            dataSource={this.state.students}
-                                            renderItem={(item, index) => (
-                                                <List.Item className="flex clear_margin"
-                                                           onClick={this.onItemClick.bind(this, index)}>
-
-                                                    {item.isSelected === true ? (<div>
-                                                        <img className="border-radius-50-blue"
-                                                             src={"https://upload-images.jianshu.io/upload_images/1131704-eb8f2d63ed00682d.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240"}
-                                                             width={25} height={25}/>
-                                                        <span
-                                                            className="margin_left_5 color_blue text_bold">{item.stuName}</span>
-                                                    </div>) : (<div>
-                                                        <img className="border-radius-50"
-                                                             src={"https://upload-images.jianshu.io/upload_images/1131704-eb8f2d63ed00682d.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240"}
-                                                             width={25} height={25}/>
-                                                        <span className="margin_left_5">{item.stuName}</span>
-                                                    </div>)}
-
-                                                </List.Item>
-                                            )}
-                                        />,
-                                    </div>)}
-
-
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    {/*个人信息*/}
-                    <div className="row" style={borderLine}></div>
-                    <div className="row" style={{backgroundColor: "#F3F3F3"}}>
-                        <div className="col-xs-4">
-                            <div className="margin_top_bottom_10" style={{
-                                display: "flex",
-                                justifyContent: "center",
-                                alignItems: "center",
-                            }}>{
-                                this.state.isTeacher ? (<Link to={"/userInfoPage/1"} id="menu_span_normal">
-                                    <img src={icon_group} style={{marginRight: "10px"}} width={12} height={12}/>
-                                    <span id="span_12">个人信息</span>
-                                </Link>) : (<Link to={"/userInfoPage/2"} id="menu_span_normal">
-                                    <img src={icon_group} style={{marginRight: "10px"}} width={12} height={12}/>
-                                    <span id="span_12">个人信息</span>
-                                </Link>)
-                            }
-
-                            </div>
-                        </div>
-                        <div className="col-xs-4">
-                            <div className="margin_top_bottom_10" style={{
-                                display: "flex",
-                                justifyContent: "center",
-                                alignItems: "center",
-                            }}>
-                                <img src={icon_home_help} style={{marginRight: "10px"}} width={12} height={12}/>
-                                <Link className="flex_column flex_center" to="/useHelp" id="menu_span_normal"> <span
-                                    id="span_12">使用帮助</span></Link>
-                            </div>
-                        </div>
-                        <div className="col-xs-4 ">
-                            <div className="margin_top_bottom_10" style={{
-                                display: "flex",
-                                justifyContent: "center",
-                                alignItems: "center",
-                            }}>
-                                <img src={icon_home_message} style={{marginRight: "10px"}} width={12} height={12}/>
-                                <Link className="flex_column flex_center" to="/systemMessage"
-                                      id="menu_span_normal"><span id="span_12">系统消息</span></Link>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-            {/*固定菜单*/}
-            {this.state.isTeacher ? (<TeacherMenu/>) : (<ParentMenu/>)}
-
-            {this.state.isTeacher ? (
-                <div>
-                    {/*班级相册*/}
-                    <div className="row">
-                        <div className="col-sm-12">
-                            <div className="row">
-                                <div className="col-xs-12" style={{padding: "10px"}}>班级相册</div>
-                            </div>
-                            <div className="row" style={borderLine}></div>
-                            <div className="row">
-                                <div className="col-xs-12" style={{margin: "0px", padding: "0px"}}>
-                                    {isObjEmpty(this.state.pictures.albums) ? ("") : (
-                                        <Carousel autoplay={true} dots={false}>
-                                            {this.spliceArrayPicture(this.state.pictures.albums).map((item, index) => (
-                                                <div>{
-                                                    item.data.map((model, index) => {
-                                                        console.log("imageUrl():", _baseURL + model.picUrl);
-                                                        let image_url = _baseURL + model.picUrl;
-                                                        if (model.picUrl === null) {
-                                                            image_url = "https://ss2.baidu.com/6ONYsjip0QIZ8tyhnq/it/u=54924110,1820388093&fm=173&app=25&f=JPEG?w=218&h=146&s=32809D4D4E6250131F8058B203001012";
-                                                        }
-                                                        return <img
-                                                            src={image_url}
-                                                            style={{margin: "5px 0px 5px 5px", display: "inline"}}
-                                                            width={"31%"}/>
-                                                    })
-                                                }
-                                                </div>
-                                            ))}
-                                        </Carousel>
-                                    )}
-                                </div>
-                            </div>
-
-
-                            <div className="row" style={{background: "#F3F3F3", height: "10px"}}/>
-                        </div>
-                    </div>
-                    {/*精彩瞬间*/}
-                    <div className="row">
-                        <div className="col-sm-12">
-                            <div className="row">
-                                <div className="col-xs-3" style={{padding: "10px"}}>精彩瞬间</div>
-                            </div>
-                            <div className="row" id="page_horizontal_line"></div>
-
-                            {this.state.pictures.videos.length < 3 ? ("") : (
-                                <div className="row flex_row">
-                                    <ReactPlayer
-                                        playing={false}
-                                        className="margin_10 border_normal"
-                                        url={_baseURL + this.state.pictures.videos[0].picUrl}
-                                        controls
-                                        light={true}
-                                        pip={true}
-                                        width={'60%'} height={"254px"}/>
-
-
-                                    <div style={{width: "40%"}} className="padding_right">
-                                        <div className="margin_bottom_10 ">
-                                            <ReactPlayer
-                                                playing={false}
-                                                url={_baseURL + this.state.pictures.videos[1].picUrl}
-                                                className="border_normal padding_left"
-                                                controls
-                                                light={true}
-                                                pip={true}
-                                                width={"100%"} height={"120px"}/></div>
-                                        <div>
-                                            <ReactPlayer
-                                                playing={false}
-                                                url={_baseURL + this.state.pictures.videos[2].picUrl}
-                                                className="border_normal padding_left"
-                                                controls
-                                                light={true}
-                                                pip={true}
-                                                width={"100%"} height={"120px"}/></div>
-                                    </div>
-                                </div>
-                            )}
-
-                            <div className="row" style={{height: "50px"}}></div>
-                        </div>
-                    </div>
-                </div>
-            ) : (
-                <div>
-                    {/*班级相册*/}
-                    <div className="row">
-                        <div className="col-sm-12">
-                            <div className="row">
-                                <div className="col-xs-12" style={{padding: "10px"}}>班级相册</div>
-                            </div>
-                            <div className="row" style={borderLine}></div>
-                            <div className="row">
-                                <div className="col-xs-12" style={{margin: "0px", padding: "0px"}}>
-                                    {isObjEmpty(this.state.students) ? ("") : (
-                                        <Carousel autoplay={true} dots={false}>
-                                            {console.log("相册 render()", this.spliceArrayPicture(this.state.students[this.state.studentIndex].albums))}
-                                            {this.spliceArrayPicture(this.state.students[this.state.studentIndex].albums).map((item, index) => (
-                                                <div>{
-                                                    item.data.map((model, index) => {
-                                                        console.log("imageUrl():", _baseURL + model.picUrl);
-                                                        let image_url = _baseURL + model.picUrl;
-                                                        if (model.picUrl === null) {
-                                                            image_url = "https://ss2.baidu.com/6ONYsjip0QIZ8tyhnq/it/u=54924110,1820388093&fm=173&app=25&f=JPEG?w=218&h=146&s=32809D4D4E6250131F8058B203001012";
-                                                        }
-                                                        return <img
-                                                            src={image_url}
-                                                            style={{margin: "5px 0px 5px 5px", display: "inline"}}
-                                                            width={"31%"}
-                                                            height={100}
-                                                        />
-                                                    })
-                                                }
-                                                </div>
-                                            ))}
-                                        </Carousel>
-                                    )}
-
-
-                                </div>
-                            </div>
-
-
-                            <div className="row" style={{background: "#F3F3F3", height: "10px"}}/>
-                        </div>
-                    </div>
-
-                    {/*精彩瞬间*/}
-                    <div className="row">
-                        <div className="col-sm-12">
-                            <div className="row">
-                                <div className="col-xs-3" style={{padding: "10px"}}>精彩瞬间</div>
-                            </div>
-                            <div className="row" id="page_horizontal_line"></div>
-
-                            {isObjEmpty(this.state.students) ? ("") : (<div>
-                                {isObjEmpty(this.state.students[this.state.studentIndex].videos) ? ("") : (
-                                    <div>
-                                        {this.state.students[this.state.studentIndex].videos.length < 3 ? ("") : (
-                                            <div className="row flex_row">
-                                                <ReactPlayer
-                                                    playing={false}
-                                                    className="margin_10 border_normal"
-                                                    url={_baseURL + this.state.students[this.state.studentIndex].videos[0].picUrl}
-                                                    controls
-                                                    light={true}
-                                                    pip={true}
-                                                    width={'60%'} height={"254px"}/>
-
-
-                                                <div style={{width: "40%"}} className="padding_right">
-                                                    <div className="margin_bottom_10 ">
-                                                        <ReactPlayer
-                                                            playing={false}
-                                                            url={_baseURL + this.state.students[this.state.studentIndex].videos[1].picUrl}
-                                                            className="border_normal padding_left"
-                                                            controls
-                                                            light={true}
-                                                            pip={true}
-                                                            width={"100%"} height={"120px"}/></div>
-                                                    <div>
-                                                        <ReactPlayer
-                                                            playing={false}
-                                                            url={_baseURL + this.state.students[this.state.studentIndex].videos[2].picUrl}
-                                                            className="border_normal padding_left"
-                                                            controls
-                                                            light={true}
-                                                            pip={true}
-                                                            width={"100%"} height={"120px"}/></div>
-                                                </div>
-                                            </div>
-                                        )}
-                                    </div>
-                                )}
-
-                            </div>)}
-
-                            <div className="row" style={{height: "50px"}}></div>
-                        </div>
-                    </div>
-                </div>)}
-        </div>
-    }
-
-
-}
-
-
-function TeacherMenu() {
-    console.log("teacherMenu()");
-    let borderLine = {
-        border: "1px solid #f4f4f4"
-    };
-
-
-    return <div>
-        {/*分割线*/}
-        <div className="row" style={{background: "#ffffff", height: "10px"}}/>
-        {/*家校互动*/}
-        <div className="row">
-            <div className="col-sm-12">
-                <div className="row">
-                    <div className="col-xs-12" style={{padding: "10px"}}>家校互动</div>
-                </div>
-                <div className="row" style={borderLine}></div>
-                {/*横向图文列表*/}
-                <div className="row">
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/notifyBoard/teacher">
-                            <div><img src={icon_home_menu_22} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}>
-                            <span
-                                id="menu_span_normal">通知公告 </span>
-                            </div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/assignmentList/teacher" id="menu_span_normal">
-                            <div><img src={icon_home_menu_3} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/>
-                            </div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}>
-                                作业发布
-                            </div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_center flex_column" to="/classRechargeList" id="menu_span_normal">
-                            <div><img src={icon_home_menu_2} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/>
-                            </div>
-                            <div style={{paddingBottom: "20px"}}><span
-                                style={{fontSize: "12px"}}>班级交费</span></div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/voteListTab" id="menu_span_normal">
-                            <div><img src={icon_home_menu_5} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/>
-                            </div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                                style={{fontSize: "12px"}}>
-                            投票助手
-                        </span></div>
-                        </Link>
-                    </div>
-                    {/*    <div className="col-xs-3" style={{
-                     display: "flex",
-                     flexDirection: "column",
-                     justifyContent: "center",
-                     alignItems: "center"
-                     }}>
-                     <Link  className="flex_column flex_center" to="/phonesList"  id="menu_span_normal">
-                     <div><img src={icon_home_menu_4} style={{margin: "20px 20px 8px 20px"}} width={20} height={20}/>
-                     </div>
-                     <div style={{paddingBottom: "20px", paddingLeft: "0px"}}>
-                     家长通讯录
-                     </div>
-                     </Link>
-                     </div>*/}
-                </div>
-
-                <div className="row">
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/leaveList/teacher" id="menu_span_normal">
-                            <div><img src={icon_home_menu_6} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/>
-                            </div>
-                            <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                           学生请假条
-                        </span></div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/classAlbum/teacher" id="menu_span_normal">
-                            <div><img src={icon_home_menu_7} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/>
-                            </div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                                style={{fontSize: "12px"}}>
-                        班级相册
-                        </span></div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3">
-                        <Link className="flex_column flex_center" to="/wonderMoment/teacher" id="menu_span_normal">
-                            <div><img src={icon_home_menu_8} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}>  <span style={{fontSize: "12px"}}>
-                      精彩瞬间
-                     </span></div>
-                        </Link>
-                    </div>
-                </div>
-            </div>
-        </div>
-        {/*分割线*/}
-        <div className="row" style={{background: "#F3F3F3", height: "10px"}}/>
-        {/*校园服务*/}
-        <div className="row">
-            <div className="col-sm-12">
-                <div className="row">
-                    <div className="col-xs-12" style={{padding: "10px"}}>校园服务</div>
-                </div>
-                <div className="row" style={borderLine}></div>
-                {/*横向图文列表*/}
-                <div className="row">
-
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/approvel" id="menu_span_normal">
-                            <div><img src={icon_home_oa} style={{margin: "20px 20px 8px 20px"}} width={20} height={20}/>
-                            </div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                                style={{fontSize: "12px"}}>
-                          我的审批
-                        </span></div>
-                        </Link>
-                    </div>
-
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/meetingSignIn" id="menu_span_normal">
-                            <div><img src={icon_home_menu_9} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/>
-                            </div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                                style={{fontSize: "12px"}}>
-                          会议管理
-                        </span></div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/leaveAddC" id="menu_span_normal">
-                            <div><img src={icon_home_menu_10} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px"}}><span
-                                style={{fontSize: "12px"}}>
-
-                           请假申请
-                        </span></div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/field-trip" id="menu_span_normal">
-                            <div><img src={icon_home_menu_11} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                           出差申请
-                        </span></div>
-                        </Link>
-                    </div>
-
-
-                </div>
-
-                <div className="row">
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/res_apply" id="menu_span_normal">
-                            <div><img src={icon_home_menu_12} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                          用品申请
-                        </span></div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/phonesSelect" id="menu_span_normal">
-                            <div><img src={icon_home_menu_13} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px"}}><span style={{margin: "5px", fontSize: "12px"}}>
-
-                             通讯录
-                        </span>
-                            </div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/campusCardRecharge/teacher"
-                              id="menu_span_normal">
-                            <div><img src={icon_home_menu_14} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                            校园卡
-                        </span></div>
-                        </Link>
-                    </div>
-                    <Link className="flex_column flex_center" to="/class-schedule" id="menu_span_normal">
-                        <div><img src={icon_home_menu_30} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/></div>
-                        <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                           课表查询
-                        </span></div>
-                    </Link>
-
-                    {/*</div>*/}
-                </div>
-                <div className="row" style={{background: "#F3F3F3", height: "10px"}}/>
-            </div>
-        </div>
-    </div>
-}
-
-function ParentMenu() {
-    let borderLine = {
-        border: "1px solid #f4f4f4"
-    };
-    return <div>
-        {/*分割线*/}
-        <div className="row" style={{background: "#ffffff", height: "10px"}}/>
-        {/*家校互动*/}
-        <div className="row">
-            <div className="col-sm-12">
-                <div className="row">
-                    <div className="col-xs-12" style={{padding: "10px"}}>家校互动</div>
-                </div>
-                <div className="row" style={borderLine}></div>
-                {/*横向图文列表*/}
-                <div className="row">
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/access-notice" id="menu_span_normal">
-                        <div><img src={icon_home_menu_21} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/></div>
-                        <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-                           出入校通知
-                        </span></div>
-                    </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/notifyBoard/parent" id="menu_span_normal">
-                        <div><img src={icon_home_menu_22} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/>
-                        </div>
-                        <div style={{paddingBottom: "20px"}}>
-                            通知公告
-                        </div>
-                    </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/score-inquiry" id="menu_span_normal">
-                        <div><img src={icon_home_menu_23} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/>
-                        </div>
-                        <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                            成绩通知
-                        </span></div>
-                    </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/assignmentList/parent" id="menu_span_normal">
-                        <div><img src={icon_home_menu_24} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/>
-                        </div>
-                        <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                           作业通知
-                        </span></div>
-                    </Link>
-                    </div>
-                </div>
-
-                <div className="row">
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/rechargeList" id="menu_span_normal">
-                            <div><img src={icon_home_menu_25} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/>
-                            </div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                                style={{fontSize: "12px"}}>交费通知</span></div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/leaveList/parent" id="menu_span_normal">
-                        <div><img src={icon_home_menu_26} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/>
-                        </div>
-                        <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                            style={{fontSize: "12px"}}>
-                            学生请假条
-                        </span></div>
-                    </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/voteList" id="menu_span_normal">
-                        <div><img src={icon_home_menu_27} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/>
-                        </div>
-                        <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                            投票助手
-                        </span></div>
-                    </Link>
-                    </div>
-                    <div className="col-xs-3" id="row_center_align">
-                        <Link className="flex_column flex_center" to="/phonesList/parent" id="menu_span_normal">
-                            <div><img src={icon_home_menu_28} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                                style={{fontSize: "12px"}}>
-
-                          老师通讯录
-                        </span></div>
-                        </Link>
-                    </div>
-                </div>
-            </div>
-        </div>
-        {/*分割线*/}
-        <div className="row" style={{background: "#F3F3F3", height: "10px"}}/>
-        {/*校园服务*/}
-        <div className="row">
-            <div className="col-sm-12">
-                <div className="row">
-                    <div className="col-xs-12" style={{padding: "10px"}}>校园服务</div>
-                </div>
-                <div className="row" style={borderLine}></div>
-                {/*横向图文列表*/}
-                <div className="row">
-
-                    {/*      <div className="col-xs-3" style={{
-                     display: "flex",
-                     flexDirection: "column",
-                     justifyContent: "center",
-                     alignItems: "center"
-                     }}>
-                     <Link className="flex_column flex_center" to="/rechargeList" id="menu_span_normal">
-                     <div><img src={icon_home_menu_29} style={{margin: "20px 20px 8px 20px"}} width={20} height={20}/>
-                     </div>
-                     <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                     style={{fontSize: "12px"}}>
-
-                     充值缴费
-                     </span></div>
-                     </Link>
-                     </div>*/}
-                    {/*  <div className="col-xs-3" style={{
-                     display: "flex",
-                     flexDirection: "column",
-                     justifyContent: "center",
-                     alignItems: "center"
-                     }}>
-                     <div><img src={icon_home_menu_dengji} style={{margin: "20px 20px 8px 20px"}} width={20}
-                     height={20}/></div>
-                     <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                     style={{fontSize: "12px"}}>入校登记</span></div>
-                     </div>*/}
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/class-schedule" id="menu_span_normal">
-                        <div><img src={icon_home_menu_30} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/></div>
-                        <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                           课表查询
-                        </span></div>
-                    </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/score-inquiry" id="menu_span_normal">
-                        <div><img src={icon_home_menu_31} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/></div>
-                        <div style={{paddingBottom: "20px"}}><span style={{margin: "5px", fontSize: "12px"}}>
-
-                           成绩查询
-                        </span>
-                        </div>
-                    </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_column flex_center" to="/campusCardRecharge/parent" id="menu_span_normal">
-                            <div><img src={icon_home_menu_14} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                      height={20}/></div>
-                            <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                            校园卡
-                        </span></div>
-                        </Link>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}><Link className="flex_column flex_center" to="/classAlbum/parent" id="menu_span_normal">
-                        <div><img src={icon_home_menu_33} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/></div>
-                        <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                             班级相册
-                        </span></div>
-                    </Link>
-                    </div>
-                </div>
-
-                <div className="row">
-
-
-                    <div className="col-xs-3" id="row_center_align">
-                        <div><img src={icon_home_menu_34} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                  height={20}/></div>
-                        <div style={{paddingBottom: "20px", paddingLeft: "0px"}}><span
-                            style={{fontSize: "12px"}}>  <Link className="flex_column flex_center"
-                                                               to="/wonderMoment/parent"
-                                                               id="menu_span_normal">精彩瞬间</Link></span></div>
-                    </div>
-                    <div className="col-xs-3" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "center",
-                        alignItems: "center"
-                    }}>
-                        <Link className="flex_center flex_column" to="/principalMailbox" id="menu_span_normal">
-                            <div>
-                                <img src={icon_home_menu_35} style={{margin: "20px 20px 8px 20px"}} width={20}
-                                     height={20}/></div>
-                            <div style={{paddingBottom: "20px"}}><span style={{fontSize: "12px"}}>
-
-                           校长信箱
-                        </span></div>
-                        </Link>
-                    </div>
-                    {/*  <div className="col-xs-3" id="row_center_align">
-                     <div><img src={icon_menu} style={{margin: "20px 20px 8px 20px"}} width={20} height={20}/></div>
-                     <div style={{paddingBottom: "20px",paddingLeft: "0px"}}><span
-                     style={{fontSize: "12px"}} id="menu_span_normal">问卷调查</span></div>
-                     </div>*/}
-                    {/*   <div className="col-xs-3" style={borderLine}>
-                     <div> <img src={icon_menu} style={{margin:"20px 20px 8px 20px"}}  width={30} height={30} /></div>
-                     <div style={{paddingBottom:"20px",paddingLeft:"0px"}}>  <span style={{fontSize:"12px"}}>通讯录</span></div>
-                     </div>*/}
-                </div>
-                <div className="row" style={{background: "#F3F3F3", height: "10px"}}/>
-            </div>
-        </div>
-    </div>
-}
-
-
-let mapStateToProps = (state) => ({
-    userInfo: {...state.redUserInfo}
-})
-
-let mapDispatchToProps = (dispatch) => {
-    return {switchUser: () => dispatch(switchUser())}
-}
-
-
-export default connect(mapStateToProps, mapDispatchToProps)(AppHomePage)

+ 101 - 37
frontend/wechat-web/src/modules/home/HomePage.jsx

@@ -15,7 +15,7 @@ import {clearListState} from 'action/listState'
 import {clearClassData} from "action/classData";
 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 {getIntValue, getStrValue, isObjEmpty} from "../../utils/common";
 import 'css/home-page.css'
 import {fetchGet, fetchPost} from "../../utils/fetchRequest";
 import {_baseURL, API} from "../../configs/api.config";
@@ -80,6 +80,7 @@ class HomePage extends Component {
                 }
             })
         }
+
         this.getHomeData()
     }
 
@@ -108,28 +109,43 @@ class HomePage extends Component {
 
         const studentList = []
 
-        if (!isObjEmpty(userInfo.students) && userInfo.userRole === 1) {
-            userInfo.students.forEach((item, index) => {
+        if (!isObjEmpty(userInfo.parent) && !isObjEmpty(userInfo.parent.students) && userInfo.userRole === 1) {
+            userInfo.parent.students.forEach((item, index) => {
                 studentList.push(<StuItem isSelect={studentIndex === index} stuObj={item}
                                           stuIndex={index} onStuSwitch={this.onStuSwitch}/>)
             })
         }
 
+        let schoolName = '', userAvatar = '', userName = ''
+        if (userInfo.userRole === 1) {
+            if (userInfo.parent) {
+                schoolName = userInfo.parent.schoolName
+                userAvatar = userInfo.parent.parentsPhoto
+                userName = userInfo.parent.parentsName
+            }
+        } else if (userInfo.userRole === 2) {
+            if (userInfo.teacher) {
+                schoolName = userInfo.teacher.schoolName
+                userAvatar = userInfo.teacher.teacherPhoto
+                userName = userInfo.teacher.teacherName
+            }
+        }
+
         return (
             <div className='home-page-root'>
                 <div className='home-top-layout-root'>
-                    <div className='home-top-school-text'>{userInfo.school}</div>
+                    <div className='home-top-school-text'>{schoolName}</div>
                     <div className='home-top-msg-root'>
-                        {isObjEmpty(userInfo.userAvatar) ?
+                        {isObjEmpty(userAvatar) ?
                             <Avatar size={50} icon='user'/> :
                             <img
-                                src={this.props.userInfo.userAvatar}
+                                src={userAvatar}
                                 width={50} height={50} className="img-circle"
                                 style={{border: '3px solid #ffffff'}}/>
                         }
                         <span
-                            className='home-top-msg-text'>尊敬的{userInfo.userName + (userInfo.userRole === 1 ? '家长' : '老师')}</span>
-                        {userInfo.userRoles.length > 1 ?
+                            className='home-top-msg-text'>尊敬的{userName + (userInfo.userRole === 1 ? '家长' : '老师')}</span>
+                        {(userInfo.teacher && userInfo.parent) ?
                             <img style={{marginLeft: "5px"}} src={icon_home_change} width={16}
                                  height={16} onClick={this.onIdentitySwitch}/> : ''}
 
@@ -165,58 +181,106 @@ class HomePage extends Component {
         const {userInfo} = this.props
         let {studentIndex} = this.state
 
+        let openId, schoolId
+        if (userInfo.userRole === 1) {
+            if (userInfo.parent) {
+                openId = userInfo.parent.openid
+                schoolId = userInfo.parent.schoolId
+            }
+        } else if (userInfo.userRole === 2) {
+            if (userInfo.teacher) {
+                openId = userInfo.teacher.openid
+                schoolId = userInfo.teacher.schoolId
+            }
+        }
+
         //获取首页接口
         fetchPost(API.homeIndex, {
-            openid: userInfo.userOpenid,
-            // schoolId: userInfo.userPhone
-            schoolId:1
+            openid: openId,
+            schoolId: schoolId
         }).then((response) => {
             Toast.hide();
             if (response && response.data) {
-                const homeData = response.data
+                if (!isObjEmpty(response.data.teacher)) {
+                    const teacherDOS = response.data.teacher
+
+                    switchUser({
+                        teacher: {
+                            teacherId: getIntValue(teacherDOS, 'teacherId'),
+                            userId: getIntValue(teacherDOS, 'userId'),
+                            openid: getStrValue(teacherDOS, 'openid'),
+                            userPhone: getStrValue(teacherDOS, 'userPhone'),
+                            schoolId: getStrValue(teacherDOS, 'schoolId'),
+                            schoolName: getStrValue(teacherDOS, 'schoolName'),
+                            teacherNumber: getStrValue(teacherDOS, 'teacherNumber'),
+                            teacherName: getStrValue(teacherDOS, 'teacherName'),
+                            teacherPhoto: getStrValue(teacherDOS, 'teacherPhoto'),
+                            teacherAddress: getStrValue(teacherDOS, 'teacherAddress'),
+                            teacherEntry: getStrValue(teacherDOS, 'teacherEntry'),
+                            teacherBirthday: getStrValue(teacherDOS, 'teacherBirthday'),
+                            teacherSex: getStrValue(teacherDOS, 'teacherSex'),//1:男,2:女
+                        }
+                    })()
+                } else {
+                    switchUser({
+                        teacher: ''
+                    })()
+                }
+
+                if (!isObjEmpty(response.data.parents)) {
+                    const parentsDOS = response.data.parents
+
+                    switchUser({
+                        parent: {
+                            parentId: getIntValue(parentsDOS, 'parentId'),
+                            userId: getIntValue(parentsDOS, 'userId'),
+                            userPhone: getStrValue(parentsDOS, 'userPhone'),
+                            openid: getStrValue(parentsDOS, 'openid'),
+                            schoolId: getIntValue(parentsDOS, 'schoolId'),
+                            schoolName: getStrValue(parentsDOS, 'schoolName'),
+                            parentsName: getStrValue(parentsDOS, 'parentsName'),
+                            parentsBirthday: getStrValue(parentsDOS, 'parentsBirthday'),
+                            parentsSex: getIntValue(parentsDOS, 'parentsSex'),
+                            parentsPhoto: getStrValue(parentsDOS, 'parentsPhoto'),
+                            parentsAddress: getStrValue(parentsDOS, 'parentsAddress'),
+                            students: getStrValue(parentsDOS, 'studentDOs'),
+                            student: isObjEmpty(userInfo.parent.student) ? getStrValue(parentsDOS, 'studentDOs')[0] : userInfo.parent.student,
+                        }
+                    })()
+                } else {
+                    switchUser({
+                        parent: ''
+                    })()
+                }
 
                 let userRole = userInfo.userRole
-                if (homeData.roles.length === 1) {
-                    if (homeData.roles[0] === "家长") {
-                        userRole = 1
-                    }
-                    if (homeData.roles[0] === "教师") {
+                if (!isObjEmpty(response.data.teacher)) {
+                    if (isObjEmpty(response.data.parents)) {
                         userRole = 2
                     }
-                } else if (userRole <= 0) {
+                } else if (!isObjEmpty(response.data.parents)) {
                     userRole = 1
                 }
 
                 this.setState({
-                    albums: homeData.pictures ? homeData.pictures.albums : [],
-                    videos: homeData.pictures ? homeData.pictures.videos : []
+                    albums: [],
+                    videos: []
                 })
 
                 switchUser({
-                    stuName: userInfo.stuName || getStrValue(homeData.students, 0).stuName,
-                    userId: homeData.userId,
-                    school: homeData.schoolName,
-                    students: homeData.students,
-                    userName: homeData.userName,
-                    userOpenid: homeData.userOpenid,
-                    userPhone: homeData.userPhone,
-                    stuId: userInfo.stuId || getStrValue(homeData.students, 0).stuId,
-                    student: isObjEmpty(userInfo.student) ? homeData.students[0] : userInfo.student,
                     userRole: userRole,
-                    userRoles: homeData.roles,
-                    userAvatar: homeData.userPhoto,
-                    userSex: homeData.userSex
                 })()
 
-                if (!isObjEmpty(userInfo.students)) {
-                    userInfo.students.forEach((item, index) => {
-                        if (userInfo.stuId == item.stuId) {
+                if (!isObjEmpty(userInfo.parent) && !isObjEmpty(userInfo.parent.students)) {
+                    userInfo.parent.students.forEach((item, index) => {
+                        if (userInfo.parent.student.stuId == item.stuId) {
                             studentIndex = index
                         }
                     })
 
                     this.setState({studentIndex})
                 }
+
                 this.mySwiper.init()
             }
         }).catch((error) => {
@@ -258,9 +322,9 @@ class HomePage extends Component {
 
     getBottomLayout = () => {
         return (
-            <div className='common-flex-row-x-y-center' style={{padding:28}}>
+            <div className='common-flex-row-x-y-center' style={{padding: 28}}>
                 <div style={{background: '#cccccc', width: '60px', height: '1px'}}></div>
-                <span style={{color: '#999999', fontSize: '12px',padding:'6px'}}>已经到底了</span>
+                <span style={{color: '#999999', fontSize: '12px', padding: '6px'}}>已经到底了</span>
                 <div style={{background: '#cccccc', width: '60px', height: '1px'}}></div>
             </div>
         )

+ 3 - 3
frontend/wechat-web/src/modules/notificationCenter/NotifyBoardParent.jsx

@@ -250,9 +250,9 @@ class NotifyBoardParent extends Component {
             notifyList.length = 0
         }
 
-        fetchPost(API.notifyMessage, {
-            userId: this.props.userInfo.userId,
-            notifyType: 4,
+        fetchPost(API.NOTIFY_LIST_PARENT, {
+            parentId: this.props.userInfo.userId,
+            notifyStatus: 1,
             pageIndex: mPageIndex,
             pageSize: mPageSize
         }).then(response => {

+ 6 - 6
frontend/wechat-web/src/modules/notificationCenter/NotifyBoardTeacher.jsx

@@ -383,9 +383,9 @@ class NotifyBoardTeacher extends Component {
             releaseList.length = 0
         }
 
-        fetchPost(API.notifyMessage, {
-            userId: this.props.userInfo.userId,
-            notifyType: 4,
+        fetchPost(API.NOTIFY_LIST_TEACHER, {
+            teacherId: this.props.userInfo.userId,
+            notifyStatus: 1,
             pageIndex: mReleaseIndex,
             pageSize: mPageSize
         }).then(response => {
@@ -456,9 +456,9 @@ class NotifyBoardTeacher extends Component {
             receiveList.length = 0
         }
 
-        fetchPost(API.notifyMessage, {
-            userId: this.props.userInfo.userId,
-            notifyType: 4,
+        fetchPost(API.NOTIFY_LIST_TEACHER, {
+            teacherId: this.props.userInfo.userId,
+            notifyStatus: 1,
             pageIndex: mReceiveIndex,
             pageSize: mPageSize
         }).then(response => {

+ 5 - 3
frontend/wechat-web/src/modules/video/WonderMoment.jsx

@@ -174,9 +174,11 @@ class WonderMoment extends Component {
         videoList.length = 0
 
         fetchGet(API.GET_ALBUM_LIST, {
-            schId: classBean.schId,
-            picStatus: 2,
-            picType: 2
+            clazzId: classBean.schId,
+            albumStatus: 1,
+            albumType: 2,
+            pageIndex: 1,
+            pageSize: 100,
         }).then(response => {
             Toast.hide()
 

+ 38 - 2
frontend/wechat-web/src/redux/reducers/redUserInfo.js

@@ -1,9 +1,41 @@
 import {USER_INFO, CLEAR_USER_INFO} from "../constants/actionTypes";
 import {getVisibleObj} from "../../utils/common";
 
+/*teacher: {
+    teacherId: 0,
+        userId: 0,
+        openid: '',
+        userPhone: '',
+        schoolId: 0,
+        schoolName: '',
+        teacherNumber: '',
+        teacherName: '',
+        teacherPhoto: '',
+        teacherAddress: '',
+        teacherEntry: '',
+        teacherBirthday: '',
+        teacherSex: 0,//1:男,2:女
+},
+parent: {
+    parentId: 0,
+        userId: 0,
+        userPhone: '',
+        openid: '',
+        schoolId: 0,
+        schoolName: '',
+        parentsName: '',
+        parentsBirthday: '',
+        parentsSex: 0,
+        parentsPhoto: '',
+        parentsAddress: '',
+        students:'',
+        student:''
+}*/
+
 const initListState = {
-    userId: 10003,
+    /*userId: 10003,
     school: '',
+    schoolId: 1,
     userName: '',
     students: [],
     stuName: '',
@@ -15,7 +47,11 @@ const initListState = {
     userRoles: [],
     accessToken: '17_2JV4JY47Ht5gTNCVHPQ3ya6ov9GPmtz_0JACss95_KdxnCVOWhrkmcLqBb27KmnEsYtLaWHxAT_bV_K44hRKD9A1yFib9IFYSkAdrVGtY-A',
     userAvatar: '',
-    userSex: 0
+    userSex: 0,*/
+
+    userRole: 0,
+    teacher: '',
+    parent: '',
 }
 
 const redUserInfo = (state = initListState, action) => {