Merge branch 'master' into develop

.github/issue_template.md

@@ -0,0 +1,8 @@
+> 请酌情提供细节，并保持issue精简便于查阅
+> 1. 功能需求 => 详细说明
+> 2. Bug反馈  
+> 2.1 简单描述下报错  
+> 2.2 你期望什么结果  
+> 2.3 如何操作导致的  
+> 2.4 可提供运行环境信息  
+> 3. 代码求助 => 可以提，未必及时答复

package.json

@@ -11,7 +11,7 @@
     "draftjs-to-markdown": "^0.5.0",
     "dva": "2.1.0",
     "dva-loading": "^1.0.4",
-    "echarts": "^3.7.2",
+    "echarts": "^4.0.0",
     "echarts-for-react": "^2.0.0",
     "echarts-gl": "^1.0.0-beta.5",
     "echarts-liquidfill": "^1.1.0",

src/routes/user/index.js

@@ -41,6 +41,9 @@ const User = ({
         type: `user/${modalType}`,
         payload: data,
       })
+        .then(() => {
+          handleRefresh()
+        })
     },
     onCancel () {
       dispatch({
@@ -80,7 +83,6 @@ const User = ({
           currentItem: item,
         },
       })
-        .then(() => handleRefresh)
     },
     rowSelection: {
       selectedRowKeys,
@@ -113,7 +115,6 @@ const User = ({
           modalType: 'create',
         },
       })
-        .then(() => handleRefresh)
     },
     switchIsMotion () {
       dispatch({ type: 'user/switchIsMotion' })

src/services/app.js

@@ -3,7 +3,7 @@ import { request, config } from 'utils'
 const { api } = config
 const { user, userLogout, userLogin } = api
 
-export async function login (params) {
+export function login (params) {
   return request({
     url: userLogin,
     method: 'post',
@@ -11,7 +11,7 @@ export async function login (params) {
   })
 }
 
-export async function logout (params) {
+export function logout (params) {
   return request({
     url: userLogout,
     method: 'get',
@@ -19,7 +19,7 @@ export async function logout (params) {
   })
 }
 
-export async function query (params) {
+export function query (params) {
   return request({
     url: user.replace('/:id', ''),
     method: 'get',

src/services/dashboard.js

@@ -3,7 +3,7 @@ import { request, config } from 'utils'
 const { api } = config
 const { dashboard } = api
 
-export async function query (params) {
+export function query (params) {
   return request({
     url: dashboard,
     method: 'get',

src/services/login.js

@@ -3,7 +3,7 @@ import { request, config } from 'utils'
 const { api } = config
 const { userLogin } = api
 
-export async function login (data) {
+export function login (data) {
   return request({
     url: userLogin,
     method: 'post',

src/services/menus.js

@@ -3,7 +3,7 @@ import { request, config } from 'utils'
 const { api } = config
 const { menus } = api
 
-export async function query (params) {
+export function query (params) {
   return request({
     url: menus,
     method: 'get',

src/services/posts.js

@@ -3,7 +3,7 @@ import { request, config } from 'utils'
 const { api } = config
 const { posts } = api
 
-export async function query (params) {
+export function query (params) {
   return request({
     url: posts,
     method: 'get',

src/services/user.js

@@ -3,7 +3,7 @@ import { request, config } from 'utils'
 const { api } = config
 const { user } = api
 
-export async function query (params) {
+export function query (params) {
   return request({
     url: user,
     method: 'get',
@@ -11,7 +11,7 @@ export async function query (params) {
   })
 }
 
-export async function create (params) {
+export function create (params) {
   return request({
     url: user.replace('/:id', ''),
     method: 'post',
@@ -19,7 +19,7 @@ export async function create (params) {
   })
 }
 
-export async function remove (params) {
+export function remove (params) {
   return request({
     url: user,
     method: 'delete',
@@ -27,7 +27,7 @@ export async function remove (params) {
   })
 }
 
-export async function update (params) {
+export function update (params) {
   return request({
     url: user,
     method: 'patch',

src/services/users.js

@@ -3,7 +3,7 @@ import { request, config } from 'utils'
 const { api } = config
 const { users } = api
 
-export async function query (params) {
+export function query (params) {
   return request({
     url: users,
     method: 'get',
@@ -11,7 +11,7 @@ export async function query (params) {
   })
 }
 
-export async function remove (params) {
+export function remove (params) {
   return request({
     url: users,
     method: 'delete',

src/services/weather.js

@@ -2,7 +2,7 @@ import { request, config } from 'utils'
 
 const { APIV1 } = config
 
-export async function query (params) {
+export function query (params) {
   params.key = 'i7sau1babuzwhycn'
   return request({
     url: `${APIV1}/weather/now.json`,