From b6448966e6a43a0441701c779f5a45a1ab910398 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 27 Aug 2018 09:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly 0313b6b30ba57c3d746d55bae04ce0155150d983 [formerly c444a9dc9809f2e3c4aaa2263543f39a1d889ad8]]]]]
Former-commit-id: 2c176d51cf5f5c5b733b82c59c914aa1be4c1ea6
Former-commit-id: 96c28290eee4242d69f78109a03f535929d09b18
Former-commit-id: 5eea3eceaac422cf969bb4faac466572d3d92b0a [formerly 5beed5d7fbf4023c37aec42826e39309c76b8663]
Former-commit-id: eae4a65099c92ab9894db31bfbc98030022db2d9
Former-commit-id: 7760cadd99b92c032504897d62bfba3d2c1f5632
Former-commit-id: 942e214e53bee6c3142c6dfa490c972a6abbed8d
Former-commit-id: 1cd6734220f665448f4fd295fe7ca28e9eed361c
Former-commit-id: a0386b7bf1cfdf9aca4cbfee42518a4b485f42ea
---
 src/mock/api/demo/business/table/1/index.js  | 28 ++++++++++++--------
 src/mock/api/demo/plugins/mock/ajax/index.js | 24 ++++++++++-------
 src/mock/api/sys/login/index.js              |  3 ++-
 src/plugin/axios/index.js                    | 13 ++++++++-
 src/store/modules/d2admin/modules/account.js |  6 ++---
 5 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/mock/api/demo/business/table/1/index.js b/src/mock/api/demo/business/table/1/index.js
index 7c8d2621..ff02e4c7 100644
--- a/src/mock/api/demo/business/table/1/index.js
+++ b/src/mock/api/demo/business/table/1/index.js
@@ -7,17 +7,23 @@ Mock.mock('/api/demo/business/table/1', ({ body }) => {
   page.total = 1000
   return Mock.mock(
     {
-      page,
-      'list|20': [{
-        'key': '@guid',
-        'value|1': [10, 100, 200, 500],
-        'type': '@boolean',
-        'admin': '@cname',
-        'adminNote': '@cparagraph(0.5)',
-        'dateTimeCreat': '@datetime',
-        'used': '@boolean',
-        'dateTimeUse': '@datetime'
-      }]
+      code: 0,
+      msg: '获取数据成功',
+      data: {
+        page,
+        'list|20': [
+          {
+            'key': '@guid',
+            'value|1': [10, 100, 200, 500],
+            'type': '@boolean',
+            'admin': '@cname',
+            'adminNote': '@cparagraph(0.5)',
+            'dateTimeCreat': '@datetime',
+            'used': '@boolean',
+            'dateTimeUse': '@datetime'
+          }
+        ]
+      }
     }
   )
 })
diff --git a/src/mock/api/demo/plugins/mock/ajax/index.js b/src/mock/api/demo/plugins/mock/ajax/index.js
index fa5a4ce5..0e696322 100644
--- a/src/mock/api/demo/plugins/mock/ajax/index.js
+++ b/src/mock/api/demo/plugins/mock/ajax/index.js
@@ -1,13 +1,19 @@
 import Mock from 'mockjs'
 
 Mock.mock('/api/demo/plugins/mock/ajax', {
-  'list|4-10': [{
-    'id|+1': 1,
-    'name': '@CNAME',
-    'star|1-5': '★',
-    'delFlag|1': [0, 1],
-    'creatDate': '@DATE',
-    'address': '@CITY',
-    'zip': '@ZIP'
-  }]
+  code: 0,
+  msg: '获取数据成功',
+  data: {
+    'list|4-10': [
+      {
+        'id|+1': 1,
+        'name': '@CNAME',
+        'star|1-5': '★',
+        'delFlag|1': [0, 1],
+        'creatDate': '@DATE',
+        'address': '@CITY',
+        'zip': '@ZIP'
+      }
+    ]
+  }
 })
diff --git a/src/mock/api/sys/login/index.js b/src/mock/api/sys/login/index.js
index aadcdfda..36662ce7 100644
--- a/src/mock/api/sys/login/index.js
+++ b/src/mock/api/sys/login/index.js
@@ -36,7 +36,8 @@ Mock.mock('/api/login', 'post', ({url, type, body}) => {
   } else {
     return {
       code: 401,
-      msg: '用户名或密码错误'
+      msg: '用户名或密码错误',
+      data: {}
     }
   }
 })
diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index 483f1517..64965012 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -31,7 +31,18 @@ service.interceptors.request.use(
 // 响应拦截器
 service.interceptors.response.use(
   response => {
-    return response.data
+    // dataAxios 是 axios 返回数据中的 data
+    const dataAxios = response.data
+    // 这个状态码是和后端约定的
+    const { code } = dataAxios
+    // 根据 code 进行判断
+    if (code === undefined) {
+      // 如果没有 code 代表这不是后端返回的数据（例如请求 D2Admin 最新版本）
+      return dataAxios
+    } else {
+      // 有 code 代表这是一个后端接口
+      return dataAxios.data
+    }
   },
   error => {
     util.log.danger('>>>>>> Error >>>>>>')
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 795c9e3b..aafbf581 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -23,11 +23,11 @@ export default {
           // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
           // token 代表用户当前登录状态 建议在网络请求中携带 token
           // 如有必要 token 需要定时更新，默认保存一天
-          util.cookies.set('uuid', res.data.uuid)
-          util.cookies.set('token', res.data.token)
+          util.cookies.set('uuid', res.uuid)
+          util.cookies.set('token', res.token)
           // 设置 vuex 用户信息
           commit('d2admin/user/set', {
-            name: res.data.name
+            name: res.name
           }, { root: true })
           // 用户登陆后从持久化数据加载一系列的设置
           commit('load')