From ff2005d26248a70e631d280693f8eab3ab5c9144 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Tue, 17 Jan 2017 22:00:30 +0800 Subject: [PATCH] fix upgrad dva@1.2 --- src/index.js | 2 ++ src/router.js | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index 10240fc..9b5bf8e 100644 --- a/src/index.js +++ b/src/index.js @@ -7,6 +7,8 @@ const app = dva() // 2. Model app.model(require('./models/app')) +app.model(require('./models/dashboard')) +app.model(require('./models/users')) // 3. Router app.router(require('./router')) diff --git a/src/router.js b/src/router.js index 8c7b6e9..1a6d457 100644 --- a/src/router.js +++ b/src/router.js @@ -9,7 +9,6 @@ export default function ({history, app}) { component: App, getIndexRoute (nextState, cb) { require.ensure([], require => { - app.model(require('./models/dashboard')) cb(null, {component: require('./routes/dashboard')}) }) }, @@ -19,7 +18,6 @@ export default function ({history, app}) { name: 'dashboard', getComponent (nextState, cb) { require.ensure([], require => { - app.model(require('./models/dashboard')) cb(null, require('./routes/dashboard')) }) } @@ -28,7 +26,6 @@ export default function ({history, app}) { name: 'users', getComponent (nextState, cb) { require.ensure([], require => { - app.model(require('./models/users')) cb(null, require('./routes/users')) }) }