From 10f8e3e8eff255efa82c2a60062185a39968d7f0 Mon Sep 17 00:00:00 2001
From: Baorong Li <superlbr@126.com>
Date: Tue, 8 Jan 2019 23:30:18 +0800
Subject: [PATCH] fix mix require / module.exports and import / export #934

---
 src/models/app.js                   | 4 +++-
 src/pages/dashboard/model.js        | 4 +++-
 src/pages/login/model.js            | 4 +++-
 src/pages/post/model.js             | 4 +++-
 src/pages/user/$id/models/detail.js | 4 +++-
 src/pages/user/model.js             | 8 +++++---
 src/services/index.js               | 2 +-
 src/utils/city.js                   | 2 +-
 8 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/models/app.js b/src/models/app.js
index 3e15a8d..7be3314 100644
--- a/src/models/app.js
+++ b/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: {
diff --git a/src/pages/dashboard/model.js b/src/pages/dashboard/model.js
index 071f264..2b1930f 100644
--- a/src/pages/dashboard/model.js
+++ b/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: {
diff --git a/src/pages/login/model.js b/src/pages/login/model.js
index 416b974..dbbab85 100644
--- a/src/pages/login/model.js
+++ b/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',
diff --git a/src/pages/post/model.js b/src/pages/post/model.js
index eb9ef47..73f22e0 100644
--- a/src/pages/post/model.js
+++ b/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',
 
diff --git a/src/pages/user/$id/models/detail.js b/src/pages/user/$id/models/detail.js
index b4403ce..7bbcfb1 100644
--- a/src/pages/user/$id/models/detail.js
+++ b/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',
diff --git a/src/pages/user/model.js b/src/pages/user/model.js
index a2c0b12..7c27989 100644
--- a/src/pages/user/model.js
+++ b/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',
diff --git a/src/services/index.js b/src/services/index.js
index bca2e33..67236ea 100644
--- a/src/services/index.js
+++ b/src/services/index.js
@@ -35,4 +35,4 @@ APIFunction.queryWeather = params => {
   })
 }
 
-module.exports = APIFunction
+export default APIFunction
diff --git a/src/utils/city.js b/src/utils/city.js
index 580644c..25900d3 100644
--- a/src/utils/city.js
+++ b/src/utils/city.js
@@ -4052,4 +4052,4 @@ let DICT_FIXED = (function() {
   return tree(fixed)
 })()
 
-module.exports = DICT_FIXED
+export default DICT_FIXED