''

51944cef · wangxuelai · a4943e47 · 51944cef · 51944cef · 51944cef
Commit 51944cef authored Dec 30, 2019 by wangxuelai
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

index.html index.html +1 -1

schoollist.js src/models/schoollist.js +3 -3

SjdIndex.js src/pages/SjdIndex.js +0 -1

index.js src/utils/index.js +1 -1

No files found.
--- a/index.html
+++ b/index.html
@@ -18,6 +18,6 @@
 </head>
 <body>
  <div id="root"></div>
-  <script src="dist/main.js?1577688646861" charset="utf-8"></script>
+  <script src="dist/main.js?1577691544208" charset="utf-8"></script>
 </body>
 </html>
\ No newline at end of file
--- a/src/models/schoollist.js
+++ b/src/models/schoollist.js
@@ -64,7 +64,7 @@ export default {
    },
    * goSchoolSystem({ payload }, { call, put, select }) {
      const { school, sid, type } = payload;
-      LocalStorage.setItem('sid', sid || school.id);
+      LocalStorage.setItem('sid', school.school_teacher.school_id);
      LocalStorage.setItem('role', school.school_teacher ? school.school_teacher.type : 5);
      if (school.school_teacher) {
        LocalStorage.setItem('rootMap', rootMap.rootMap);
@@ -75,7 +75,7 @@ export default {
        type: 'webapp/updateState',
        payload: {
          sid: school.id,
-          role: school.school_teacher ? school.school_teacher.type : '',
+          role: school.school_teacher ? school.school_teacher.type : 5,
        },
      });
      yield call(commonAjax.schoolLoginTime, {
@@ -86,7 +86,7 @@ export default {
        yield put({
          type: 'permissionget',
          payload: {
-            sid: school.id,
+            sid: school.school_id,
          },
        });
      } else {

--- a/src/pages/SjdIndex.js
+++ b/src/pages/SjdIndex.js
@@ -179,7 +179,6 @@ class SjdIndex extends React.Component {
      localStorage.clear();
      mainDom = redirectLogin;
    } else {
-      console.log(role, rootMap, sid, 'dasdasdas');
      if (!role || !rootMap || !sid) {
        mainDom = redirectSchoolList;
      }

--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -936,7 +936,7 @@ function btnPermission(menus, btnId) {
  const role = LocalStorage.getItem('role');
  if (role == 2) {
    flag = true;
-  } if (role == 5) {
+  } else if (role == 5) {
    flag = true;
  } else if (menus.indexOf(btnId) == -1) {
    flag = false;