''

src/models/deployschool.js

@@ -21,7 +21,8 @@ export default {
   },
   effects: {
     * developSchool({ payload }, { call, put, select }) {
-      const { deployType, schoolId } = yield select(state => state.newregister);
+      const { deployType } = yield select(state => state.deployschool);
+      const { schoolId } = yield select(state => state.newregister);
       const { sid } = yield select(state => state.webapp);
       const data = yield call(newregister.deploySchool, {
         school_id: schoolId || sid,

src/models/newregister.js

@@ -23,8 +23,6 @@ export default {
     protocolData: '',
     timer: null,
     location_address: '',
-    deployType: 3, // 类型 1-口才 2-美术 3-书法 4-跆拳道 5-通用
-    schoolId: 0,
   },
   subscriptions: {
     setup({ dispatch, history }) {  // eslint-disable-line
@@ -145,49 +143,6 @@ export default {
         pathname: '/userinfo',
       }));
     },
-    * developSchool({ payload }, { call, put, select }) {
-      const { deployType, schoolId } = yield select(state => state.newregister);
-      const { sid } = yield select(state => state.webapp);
-      const data = yield call(newregister.deploySchool, {
-        school_id: schoolId || sid,
-        type: deployType,
-      });
-      if (data.code == 200) {
-        yield put({
-          type: 'updateState',
-          payload: {
-            deployType: 3,
-          },
-        });
-      } else {
-        yield put({
-          type: 'webapp/errorrequestresolve',
-          payload: {
-            data,
-          },
-        });
-      }
-    },
-    * developSkip({ payload }, { call, put, select }) {
-      const { schoolId } = yield select(state => state.newregister);
-      const { sid } = yield select(state => state.webapp);
-      const data = yield call(newregister.deploySchool, {
-        school_id: schoolId || sid,
-        type: 6,
-      });
-      if (data.code == 200) {
-        yield put(routerRedux.push({
-          pathname: '/sjd/indexstaic',
-        }));
-      } else {
-        yield put({
-          type: 'webapp/errorrequestresolve',
-          payload: {
-            data,
-          },
-        });
-      }
-    },
     * goHome({ payload }, { put }) {
       yield put(routerRedux.push({
         pathname: '/sjd/indexstaic',
@@ -322,7 +277,6 @@ export default {
           protocolData: '',
           timer: null,
           location_address: '',
-          deployType: 3,
         },
       });
     },

src/pages/SjdIndex.js

@@ -169,6 +169,9 @@ class SjdIndex extends React.Component {
     const role = LocalStorage.getItem('role');
     const rootMap = LocalStorage.getItem('rootMap');
     const sid = LocalStorage.getItem('sid');
+    console.log(rootMap, 'rootMap');
+    console.log(role, 'role');
+    console.log(sid, 'sid');
     let userUserful = true;
     if (!user || !user.token || (new Date()).getTime() > user.expiresDateTime * 1000) {
       userUserful = false;