fix mix require / module.exports and import / export zuiidea#934

src/models/app.js

@@ -6,9 +6,11 @@ import store from 'store'
 import { ROLE_TYPE } from 'utils/constant'
 import { queryLayout, pathMatchRegexp } from 'utils'
 import { CANCEL_REQUEST_MESSAGE } from 'utils/constant'
-import { queryRouteList, logoutUser, queryUserInfo } from 'api'
+import api from 'api'
 import config from 'config'
 
+const { queryRouteList, logoutUser, queryUserInfo } = api
+
 export default {
   namespace: 'app',
   state: {

src/pages/dashboard/model.js

@@ -1,9 +1,11 @@
 import { parse } from 'qs'
 import modelExtend from 'dva-model-extend'
-import { queryDashboard, queryWeather } from 'api'
+import api from 'api'
 import { pathMatchRegexp } from 'utils'
 import { model } from 'utils/model'
 
+const { queryDashboard, queryWeather } = api
+
 export default modelExtend(model, {
   namespace: 'dashboard',
   state: {

src/pages/login/model.js

@@ -1,5 +1,7 @@
 import { router, pathMatchRegexp } from 'utils'
-import { loginUser } from 'api'
+import api from 'api'
+
+const { loginUser } = api
 
 export default {
   namespace: 'login',

src/pages/post/model.js

@@ -1,8 +1,10 @@
 import modelExtend from 'dva-model-extend'
-import { queryPostList } from 'api'
+import api from 'api'
 import { pathMatchRegexp } from 'utils'
 import { pageModel } from 'utils/model'
 
+const { queryPostList } = api
+
 export default modelExtend(pageModel, {
   namespace: 'post',
 

src/pages/user/$id/models/detail.js

@@ -1,5 +1,7 @@
 import { pathMatchRegexp } from 'utils'
-import { queryUser } from 'api'
+import api from 'api'
+
+const { queryUser } = api
 
 export default {
   namespace: 'userDetail',

src/pages/user/model.js

@@ -1,14 +1,16 @@
 /* global window */
 import modelExtend from 'dva-model-extend'
 import { pathMatchRegexp } from 'utils'
-import {
+import api from 'api'
+import { pageModel } from 'utils/model'
+
+const {
   queryUserList,
   createUser,
   removeUser,
   updateUser,
   removeUserList,
-} from 'api'
-import { pageModel } from 'utils/model'
+} = api
 
 export default modelExtend(pageModel, {
   namespace: 'user',

src/services/index.js

@@ -35,4 +35,4 @@ APIFunction.queryWeather = params => {
   })
 }
 
-module.exports = APIFunction
+export default APIFunction

src/utils/city.js

@@ -4052,4 +4052,4 @@ let DICT_FIXED = (function() {
   return tree(fixed)
 })()
 
-module.exports = DICT_FIXED
+export default DICT_FIXED