diff --git a/src/App.vue b/src/App.vue
index 1a4c900..96dfa59 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,6 +9,7 @@
 <script>
 import { domTitle, setDocumentTitle } from '@/utils/domUtil'
 import { i18nRender } from '@/locales'
+import { mapActions } from 'vuex'
 
 export default {
   data () {
@@ -22,6 +23,12 @@ export default {
       title && (setDocumentTitle(`${i18nRender(title)} - ${domTitle}`))
       return this.$i18n.getLocaleMessage(this.$store.getters.lang).antLocale
     }
+  },
+  methods: {
+    ...mapActions(['InitAccessToken'])
+  },
+  mounted () {
+    this.InitAccessToken()
   }
 }
 </script>
diff --git a/src/api/bms/brand.js b/src/api/bms/brand.js
deleted file mode 100644
index 1fa46ec..0000000
--- a/src/api/bms/brand.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-const brandApi = {
-  add: '/bms/brand/add',
-  get: '/bms/brand/get',
-  update: '/bms/brand/update',
-  del: '/bms/brand/delete',
-  page: '/bms/brand/page',
-  list: '/bms/brand/listByCategory',
-  updateStatus: '/bms/brand/updateStatus'
-}
-
-export function brandAdd (params) {
-  return request({
-    url: brandApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function brandGet (params) {
-  return request({
-    url: brandApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function brandUpdate (params) {
-  return request({
-    url: brandApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function brandDelete (params) {
-  return request({
-    url: brandApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function brandPage (params) {
-  return request({
-    url: brandApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function brandList (params) {
-  return request({
-    url: brandApi.list,
-    method: 'post',
-    data: params
-  })
-}
-export function brandUpdateStatus (params) {
-  return request({
-    url: brandApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/businessModel.js b/src/api/bms/businessModel.js
deleted file mode 100644
index 799152f..0000000
--- a/src/api/bms/businessModel.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import request from '@/utils/request'
-const businessModelApi = {
-  add: '/bms/businessModel/save',
-  get: '/bms/businessModel/get',
-  update: '/bms/businessModel/update',
-  del: '/bms/businessModel/delete',
-  page: '/bms/businessModel/page',
-  list: '/bms/businessModel/list'
-}
-
-export function add (params) {
-  return request({
-    url: businessModelApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function get (params) {
-  return request({
-    url: businessModelApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function update (params) {
-  return request({
-    url: businessModelApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function del (params) {
-  return request({
-    url: businessModelApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function list (params) {
-  return request({
-    url: businessModelApi.list,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/catalog.js b/src/api/bms/catalog.js
deleted file mode 100644
index 106712a..0000000
--- a/src/api/bms/catalog.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-const catalogApi = {
-  add: '/bms/catalog/add',
-  update: '/bms/catalog/update',
-  del: '/bms/catalog/delete',
-  page: '/bms/catalog/page',
-  get: '/bms/catalog/get'
-}
-
-export function catalogAdd (params) {
-  return request({
-    url: catalogApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function catalogUpdate (params) {
-  return request({
-    url: catalogApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function catalogDel (params) {
-  return request({
-    url: catalogApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function catalogPage (params) {
-  return request({
-    url: catalogApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function catalogGet (params) {
-  return request({
-    url: catalogApi.get,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/category.js b/src/api/bms/category.js
deleted file mode 100644
index 817fe3c..0000000
--- a/src/api/bms/category.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-const api = {
-  listStoreCategory: '/bms/category/listStoreCategory',
-  add: '/bms/category/add',
-  update: '/bms/category/update',
-  delete: '/bms/category/delete',
-  page: '/bms/category/pageCategory',
-  get: '/bms/category/get',
-  updateStatus: '/bms/category/updateStatus'
-}
-export function listStoreCategory (params) {
-  return request({
-    url: api.listStoreCategory,
-    method: 'post',
-    data: params
-  })
-}
-export function addCategory (params) {
-  return request({
-    url: api.add,
-    method: 'post',
-    data: params
-  })
-}
-export function updateCategory (params) {
-  return request({
-    url: api.update,
-    method: 'post',
-    data: params
-  })
-}
-export function deleteCategory (params) {
-  return request({
-    url: api.delete,
-    method: 'post',
-    data: params
-  })
-}
-export function pageCategory (params) {
-  return request({
-    url: api.page,
-    method: 'post',
-    data: params
-  })
-}
-export function getCategory (params) {
-  return request({
-    url: api.get,
-    method: 'post',
-    data: params
-  })
-}
-export function updateStatusCategory (params) {
-  return request({
-    url: api.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/corporation.js b/src/api/bms/corporation.js
deleted file mode 100644
index 8e7b3df..0000000
--- a/src/api/bms/corporation.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-const CorporationApi = {
-  add: '/bms/corporation/add',
-  get: '/bms/corporation/get',
-  update: '/bms/corporation/update',
-  del: '/bms/corporation/delete',
-  page: '/bms/corporation/page',
-  list: '/bms/corporation/list',
-  updateStatus: '/bms/corporation/updateStatus'
-}
-export function corporationAdd (params) {
-  return request({
-    url: CorporationApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function corporationPage (params) {
-  return request({
-    url: CorporationApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function corporationUpdate (params) {
-  return request({
-    url: CorporationApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function corporationDelete (params) {
-  return request({
-    url: CorporationApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function corporationList (params) {
-  return request({
-    url: CorporationApi.list,
-    method: 'post',
-    data: params
-  })
-}
-export function corporationGet (params) {
-  return request({
-    url: CorporationApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function updateStatus (params) {
-  return request({
-    url: CorporationApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/deliverMethod.js b/src/api/bms/deliverMethod.js
deleted file mode 100644
index 5e24f3d..0000000
--- a/src/api/bms/deliverMethod.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import request from '@/utils/request'
-const deliverMethodApi = {
-  list: '/bms/deliverMethod/list'
-}
-export function listDeliverMethod (params) {
-  return request({
-    url: deliverMethodApi.list,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/division.js b/src/api/bms/division.js
deleted file mode 100644
index 53ac6e9..0000000
--- a/src/api/bms/division.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-const divisionApi = {
-  add: '/bms/division/save',
-  get: '/bms/division/get',
-  update: '/bms/division/update',
-  del: '/bms/division/delete',
-  listDivision: '/bms/division/listByParentCode'
-}
-export function divisionAdd (params) {
-  return request({
-    url: divisionApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function divisionGet (params) {
-  return request({
-    url: divisionApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function divisionUpdate (params) {
-  return request({
-    url: divisionApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function divisionDelete (params) {
-  return request({
-    url: divisionApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function listDivision (params) {
-  return request({
-    url: divisionApi.listDivision,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/mall.js b/src/api/bms/mall.js
deleted file mode 100644
index 4d7824d..0000000
--- a/src/api/bms/mall.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import request from '@/utils/request'
-
-const api = {
-  add: '/bms/mall/save',
-  get: '/bms/mall/get',
-  update: '/bms/mall/update',
-  del: '/bms/mall/delete',
-  page: '/bms/mall/page',
-  list: '/bms/mall/list',
-  updateStatus: '/bms/mall/updateStatus',
-  corporationList: '/bms/corporation/list',
-  listByUserType: '/bms/mall/listByUserType'
-}
-export function add (params) {
-  return request({
-    url: api.add,
-    method: 'post',
-    data: params
-  })
-}
-export function get (params) {
-  return request({
-    url: api.get,
-    method: 'post',
-    data: params
-  })
-}
-export function update (params) {
-  return request({
-    url: api.update,
-    method: 'post',
-    data: params
-  })
-}
-export function del (params) {
-  return request({
-    url: api.del,
-    method: 'post',
-    data: params
-  })
-}
-export function page (params) {
-  return request({
-    url: api.page,
-    method: 'post',
-    data: params
-  })
-}
-export function list (params) {
-  return request({
-    url: api.list,
-    method: 'post',
-    data: params
-  })
-}
-export function updateStatus (params) {
-  return request({
-    url: api.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
-
-export function corporationList (params) {
-  return request({
-    url: api.corporationList,
-    method: 'post',
-    data: params
-  })
-}
-
-export function listByUserType (params) {
-  return request({
-    url: api.listByUserType,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/org.js b/src/api/bms/org.js
deleted file mode 100644
index 36ada2f..0000000
--- a/src/api/bms/org.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import request from '@/utils/request'
-
-const orgApi = {
-  orgTreeGet: '/bms/org/getOrgTree',
-  orgByUserType: '/bms/org/getByUserType'
-}
-export function orgTreeGet (params) {
-  return request({
-    url: orgApi.orgTreeGet,
-    method: 'post',
-    data: params
-  })
-}
-export function orgByUserType (params) {
-  return request({
-    url: orgApi.orgByUserType,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/payMethod.js b/src/api/bms/payMethod.js
deleted file mode 100644
index 775a3fd..0000000
--- a/src/api/bms/payMethod.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-const payMethodApi = {
-  add: '/bms/storePayMethod/add',
-  get: '/bms/storePayMethod/getById',
-  update: '/bms/storePayMethod/update',
-  del: '/bms/storePayMethod/delete',
-  list: '/bms/storePayMethod/list',
-  page: '/bms/storePayMethod/page'
-}
-
-export function storePayMethodAdd (params) {
-  return request({
-    url: payMethodApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function storePayMethodPage (params) {
-  return request({
-    url: payMethodApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function storePayMethodGet (params) {
-  return request({
-    url: payMethodApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function storePayMethodUpdate (params) {
-  return request({
-    url: payMethodApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function storePayMethodDelete (params) {
-  return request({
-    url: payMethodApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function storePayMethodList (params) {
-  return request({
-    url: payMethodApi.list,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/settlementAccount.js b/src/api/bms/settlementAccount.js
deleted file mode 100644
index 97e1f53..0000000
--- a/src/api/bms/settlementAccount.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-const settlementAccountApi = {
-  add: '/bms/storeSettlementAccount/add',
-  get: '/bms/storeSettlementAccount/getById',
-  update: '/bms/storeSettlementAccount/update',
-  del: '/bms/storeSettlementAccount/delete',
-  list: '/bms/storeSettlementAccount/list',
-  page: '/bms/storeSettlementAccount/page'
-}
-
-export function settlementAccountAdd (params) {
-  return request({
-    url: settlementAccountApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function settlementAccountPage (params) {
-  return request({
-    url: settlementAccountApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function settlementAccountGet (params) {
-  return request({
-    url: settlementAccountApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function settlementAccountUpdate (params) {
-  return request({
-    url: settlementAccountApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function settlementAccountDelete (params) {
-  return request({
-    url: settlementAccountApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function settlementAccountList (params) {
-  return request({
-    url: settlementAccountApi.list,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/bms/store.js b/src/api/bms/store.js
deleted file mode 100644
index afc38f5..0000000
--- a/src/api/bms/store.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-const api = {
-  add: '/bms/store/add',
-  get: '/bms/store/get',
-  update: '/bms/store/update',
-  del: '/bms/store/delete',
-  page: '/bms/store/page',
-  list: '/bms/store/list',
-  updateStatus: '/bms/store/updateStatus'
-}
-export function storeAdd (params) {
-  return request({
-    url: api.add,
-    method: 'post',
-    data: params
-  })
-}
-export function storeGet (params) {
-  return request({
-    url: api.get,
-    method: 'post',
-    data: params
-  })
-}
-export function storeUpdate (params) {
-  return request({
-    url: api.update,
-    method: 'post',
-    data: params
-  })
-}
-export function storeDel (params) {
-  return request({
-    url: api.del,
-    method: 'post',
-    data: params
-  })
-}
-export function storePage (params) {
-  return request({
-    url: api.page,
-    method: 'post',
-    data: params
-  })
-}
-export function storeList (params) {
-  return request({
-    url: api.list,
-    method: 'post',
-    data: params
-  })
-}
-export function storeUpdateStatus (params) {
-  return request({
-    url: api.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/customer/customer.js b/src/api/customer/customer.js
deleted file mode 100644
index 41cbab4..0000000
--- a/src/api/customer/customer.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import request from '@/utils/request'
-const customerApi = {
-  page: '/customer/customer/pageByNameAndMobile',
-  del: '/customer/customer/delete',
-  add: '/customer/customer/add',
-  update: '/customer/customer/update',
-  get: '/customer/customer/getById',
-  updateStatus: '/customer/customer/updateStatus',
-  getCategoryList: '/customer/customerCategory/listCategoryByName',
-  listCustomer: '/customer/customer/listByNameAndMobile'
-}
-
-export function customerAdd (params) {
-  return request({
-    url: customerApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function customerGet (params) {
-  return request({
-    url: customerApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function customerUpdate (params) {
-  return request({
-    url: customerApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function customerDelete (params) {
-  return request({
-    url: customerApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function customerPage (params) {
-  return request({
-    url: customerApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function customerUpdateStatus (params) {
-  return request({
-    url: customerApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
-export function categoryTypeList (params) {
-  return request({
-    url: customerApi.getCategoryList,
-    method: 'post',
-    data: params
-  })
-}
-export const genderMap = {
-  'MALE': '男',
-  'FEMALE': '女'
-}
-export const deliverTypeMap = {
-  'SELF': '自提',
-  'LOGISTICS': '发物流',
-  'DESIGNATED_PLACE': '送指定点',
-  'AUTO_CAR': '送车'
-}
-export function listCustomer (params) {
-  return request({
-    url: customerApi.listCustomer,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/dashboard/dashboard.js b/src/api/dashboard/dashboard.js
deleted file mode 100644
index 99807db..0000000
--- a/src/api/dashboard/dashboard.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import request from '@/utils/request'
-const dashboardApi = {
-  get: '/security/dashboard/data'
-}
-
-export function dashboardGet (params) {
-  return request({
-    url: dashboardApi.get,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/file/file.js b/src/api/file/file.js
deleted file mode 100644
index 1cac0ba..0000000
--- a/src/api/file/file.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { axios } from '@/utils/request'
-const fileApi = {
-  add: '/file/file/add',
-  del: '/file/file/delete',
-  get: '/file/file/get',
-  upload: '/file/file/uploadFile'
-}
-export function fileUpload (formData) {
-  return axios.post(fileApi.upload, formData, {
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
-  })
-}
diff --git a/src/api/gms/goods.js b/src/api/gms/goods.js
deleted file mode 100644
index 8f8ee28..0000000
--- a/src/api/gms/goods.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import request from '@/utils/request'
-const goodsApi = {
-  add: '/gms/goods/save',
-  get: '/gms/goods/getGoodsById',
-  update: '/gms/goods/update',
-  del: '/gms/goods/delete',
-  page: '/gms/goods/page',
-  list: '/gms/goods/list',
-  updateStatus: '/gms/goods/updateGoodsStatus',
-  checkGoodsCode: '/gms/goods/checkGoodsGoodsCodeUnique',
-  checkGoodsBarCode: '/gms/goods/checkGoodsGoodsBarCodeUnique',
-  goodsCount: '/gms/goods/countGoodsInfo',
-  detail: '/gms/goods/get',
-  listByStoreId: '/gms/goods/listByStoreId'
-}
-
-export function goodsAdd (params) {
-  return request({
-    url: goodsApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsGet (params) {
-  return request({
-    url: goodsApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsUpdate (params) {
-  return request({
-    url: goodsApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsDelete (params) {
-  return request({
-    url: goodsApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsPage (params) {
-  return request({
-    url: goodsApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsList (params) {
-  return request({
-    url: goodsApi.list,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsUpdateStatus (params) {
-  return request({
-    url: goodsApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsCheckGoodsCode (params) {
-  return request({
-    url: goodsApi.checkGoodsCode,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsCheckGoodsBarCode (params) {
-  return request({
-    url: goodsApi.checkGoodsBarCode,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsCount (params) {
-  return request({
-    url: goodsApi.goodsCount,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsDetail (params) {
-  return request({
-    url: goodsApi.detail,
-    method: 'post',
-    data: params
-  })
-}
-export function getGoodsListByStoreId (params) {
-  return request({
-    url: goodsApi.listByStoreId,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/gms/goodsCategory.js b/src/api/gms/goodsCategory.js
deleted file mode 100644
index 86ae1de..0000000
--- a/src/api/gms/goodsCategory.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-const goodsCategoryApi = {
-  add: '/gms/goodsCategory/save',
-  get: '/gms/goodsCategory/get',
-  update: '/gms/goodsCategory/update',
-  del: '/gms/goodsCategory/delete',
-  list: '/gms/goodsCategory/listGoodsCategory',
-  updateStatus: '/gms/goodsCategory/updategoodsCategoryStatus'
-}
-
-export function goodsCategoryAdd (params) {
-  return request({
-    url: goodsCategoryApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsCategoryGet (params) {
-  return request({
-    url: goodsCategoryApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsCategoryUpdate (params) {
-  return request({
-    url: goodsCategoryApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsCategoryDelete (params) {
-  return request({
-    url: goodsCategoryApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsCategoryList (params) {
-  return request({
-    url: goodsCategoryApi.list,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsCategoryUpdateStatus (params) {
-  return request({
-    url: goodsCategoryApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/gms/goodsStock.js b/src/api/gms/goodsStock.js
deleted file mode 100644
index f3319d7..0000000
--- a/src/api/gms/goodsStock.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import request from '@/utils/request'
-const skuApi = {
-  page: '/gms/goods/pageGoodsStock',
-  exportExcel: '/gms/goods/exportGoodsStock'
-}
-export function pageGoodsStock (params) {
-  return request({
-    url: skuApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function exportStockExcel (params) {
-  return request({
-    url: skuApi.exportExcel,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/gms/goodsUnit.js b/src/api/gms/goodsUnit.js
deleted file mode 100644
index 8497df1..0000000
--- a/src/api/gms/goodsUnit.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-const goodsUnitApi = {
-  add: '/gms/goodsUnit/save',
-  get: '/gms/goodsUnit/get',
-  update: '/gms/goodsUnit/update',
-  del: '/gms/goodsUnit/delete',
-  page: '/gms/goodsUnit/page',
-  list: '/gms/goodsUnit/list',
-  updateStatus: '/gms/goodsUnit/updategoodsUnitStatus'
-}
-
-export function goodsUnitAdd (params) {
-  return request({
-    url: goodsUnitApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsUnitGet (params) {
-  return request({
-    url: goodsUnitApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsUnitUpdate (params) {
-  return request({
-    url: goodsUnitApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsUnitDelete (params) {
-  return request({
-    url: goodsUnitApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsUnitPage (params) {
-  return request({
-    url: goodsUnitApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsUnitList (params) {
-  return request({
-    url: goodsUnitApi.list,
-    method: 'post',
-    data: params
-  })
-}
-export function goodsUnitUpdateStatus (params) {
-  return request({
-    url: goodsUnitApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/gms/salesProp.js b/src/api/gms/salesProp.js
deleted file mode 100644
index 0a6f2b5..0000000
--- a/src/api/gms/salesProp.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-const salesPropApi = {
-  add: '/gms/salesProp/add',
-  get: '/gms/salesProp/get',
-  update: '/gms/salesProp/update',
-  del: '/gms/salesProp/delete',
-  page: '/gms/salesProp/page',
-  list: '/gms/salesProp/list'
-}
-
-export function salesPropAdd (params) {
-  return request({
-    url: salesPropApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropGet (params) {
-  return request({
-    url: salesPropApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropUpdate (params) {
-  return request({
-    url: salesPropApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropDelete (params) {
-  return request({
-    url: salesPropApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropPage (params) {
-  return request({
-    url: salesPropApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropList (params) {
-  return request({
-    url: salesPropApi.list,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/gms/salesPropValue.js b/src/api/gms/salesPropValue.js
deleted file mode 100644
index 86f77c1..0000000
--- a/src/api/gms/salesPropValue.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-const salesPropValueApi = {
-  add: '/gms/salesPropValue/add',
-  get: '/gms/salesPropValue/get',
-  update: '/gms/salesPropValue/update',
-  del: '/gms/salesPropValue/delete',
-  page: '/gms/salesPropValue/page',
-  list: '/gms/salesPropValue/list'
-}
-
-export function salesPropValueAdd (params) {
-  return request({
-    url: salesPropValueApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropValueGet (params) {
-  return request({
-    url: salesPropValueApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropValueUpdate (params) {
-  return request({
-    url: salesPropValueApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropValueDelete (params) {
-  return request({
-    url: salesPropValueApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropValuePage (params) {
-  return request({
-    url: salesPropValueApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function salesPropValueList (params) {
-  return request({
-    url: salesPropValueApi.list,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/gms/sku.js b/src/api/gms/sku.js
deleted file mode 100644
index 30b07bb..0000000
--- a/src/api/gms/sku.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import request from '@/utils/request'
-const skuApi = {
-  add: '/gms/sku/save',
-  get: '/gms/sku/get',
-  update: '/gms/sku/update',
-  del: '/gms/sku/delete',
-  page: '/gms/sku/page',
-  list: '/gms/sku/list',
-  getJsonSkuList: '/gms/sku/getJsonSkuListByParams',
-  getSalesPropForAdm: '/gms/sku/getSalesPropForAdm',
-  getSkuBySalesProp: '/gms/sku/getSkuBySalesProp',
-  getPropForAdm: '/gms/sku/getPropForAdm'
-}
-
-export function skuAdd (params) {
-  return request({
-    url: skuApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function skuGet (params) {
-  return request({
-    url: skuApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function skuUpdate (params) {
-  return request({
-    url: skuApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function skuDelete (params) {
-  return request({
-    url: skuApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function skuPage (params) {
-  return request({
-    url: skuApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function skuList (params) {
-  return request({
-    url: skuApi.list,
-    method: 'post',
-    data: params
-  })
-}
-export function skuGetJsonSkuList (params) {
-  return request({
-    url: skuApi.getJsonSkuList,
-    method: 'post',
-    data: params
-  })
-}
-export function getSalesPropForAdm (params) {
-  return request({
-    url: skuApi.getSalesPropForAdm,
-    method: 'post',
-    data: params
-  })
-}
-export function getSkuBySalesProp (params) {
-  return request({
-    url: skuApi.getSkuBySalesProp,
-    method: 'post',
-    data: params
-  })
-}
-export function getPropForAdm (params) {
-  return request({
-    url: skuApi.getPropForAdm,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/gms/skuStockChangeRecord.js b/src/api/gms/skuStockChangeRecord.js
deleted file mode 100644
index 0232239..0000000
--- a/src/api/gms/skuStockChangeRecord.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import request from '@/utils/request'
-const skuStockChangeRecordApi = {
-  page: '/gms/skuStockChangeRecord/page',
-  get: '/gms/skuStockChangeRecord/get',
-  change: '/gms/skuStockChangeRecord/outOrInSkuStockChangeRecord',
-  cancel: '/gms/skuStockChangeRecord/cancelStockChangeRecord'
-}
-
-export function skuStockChangeRecordPage (params) {
-  return request({
-    url: skuStockChangeRecordApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function skuStockChangeRecordGet (params) {
-  return request({
-    url: skuStockChangeRecordApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function skuStockChangeRecordChange (params) {
-  return request({
-    url: skuStockChangeRecordApi.change,
-    method: 'post',
-    data: params
-  })
-}
-export function skuStockChangeRecordCancel (params) {
-  return request({
-    url: skuStockChangeRecordApi.cancel,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/gms/warehouse.js b/src/api/gms/warehouse.js
deleted file mode 100644
index 332bb89..0000000
--- a/src/api/gms/warehouse.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import request from '@/utils/request'
-const skuApi = {
-  listWarehouse: '/gms/warehouse/listByParams',
-  findWarehouseListByStoreId: '/gms/warehouse/findWarehouseListByStoreId'
-}
-export function listWarehouse (params) {
-  return request({
-    url: skuApi.listWarehouse,
-    method: 'post',
-    data: params
-  })
-}
-export function listWarehouseByStoreId (params) {
-  return request({
-    url: skuApi.findWarehouseListByStoreId,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/login.js b/src/api/login.js
index 01285ec..ea04781 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 const userApi = {
-  Login: '/login',
+  Login: '/auth/login',
   Logout: '/auth/logout',
   ForgePassword: '/auth/forge-password',
   Register: '/auth/register',
diff --git a/src/api/oms/salesOrder.js b/src/api/oms/salesOrder.js
deleted file mode 100644
index 0b31773..0000000
--- a/src/api/oms/salesOrder.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '@/utils/request'
-const salesOrderApi = {
-  page: '/oms/order/page',
-  get: '/oms/order/get',
-  salesOrderLinePage: '/oms/order/findSalesOrderLinePageBySalesOrderId',
-  exportSalesOrder: '/oms/order/exportSalesOrder',
-  createOrder: '/oms/order/createOrder'
-}
-
-export function salesOrderPage (params) {
-  return request({
-    url: salesOrderApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function salesOrderGet (params) {
-  return request({
-    url: salesOrderApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function salesOrderLinePage (params) {
-  return request({
-    url: salesOrderApi.salesOrderLinePage,
-    method: 'post',
-    data: params
-  })
-}
-export function exportSalesOrder (params) {
-  var result = request({
-    url: salesOrderApi.exportSalesOrder,
-    method: 'post',
-    data: params
-  })
-  return result
-}
-export function createOrder (params) {
-  var result = request({
-    url: salesOrderApi.createOrder,
-    method: 'post',
-    data: params
-  })
-  return result
-}
diff --git a/src/api/purchase/purchase.js b/src/api/purchase/purchase.js
deleted file mode 100644
index 736ba92..0000000
--- a/src/api/purchase/purchase.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import request from '@/utils/request'
-const purchaseApi = {
-  page: '/purchase/purchaseOrder/pageByParams',
-  get: '/purchase/purchaseOrder/get',
-  purchaseOrderLinePage: '/purchase/purchaseOrder/findPurchaseOrderLineParamsByOrderId'
-}
-
-export function purchaseOrderPage (params) {
-  return request({
-    url: purchaseApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function purchaseOrderGet (params) {
-  return request({
-    url: purchaseApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function purchaseOrderLinePage (params) {
-  return request({
-    url: purchaseApi.purchaseOrderLinePage,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/accessToken.js b/src/api/security/accessToken.js
deleted file mode 100644
index 6db44d0..0000000
--- a/src/api/security/accessToken.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import request from '@/utils/request'
-const accessTokenApi = {
-  get: '/security/accessToken/get'
-}
-
-export function get (params) {
-  return request({
-    url: accessTokenApi.get,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/app.js b/src/api/security/app.js
deleted file mode 100644
index ce4d13a..0000000
--- a/src/api/security/app.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import request from '@/utils/request'
-const appApi = {
-  add: '/security/app/save',
-  get: '/security/app/get',
-  update: '/security/app/update',
-  del: '/security/app/delete',
-  page: '/security/app/page',
-  updateStatus: '/security/app/updateStatus',
-  refresh: '/security/app/refreshAccessSecret'
-}
-
-export function appAdd (params) {
-  return request({
-    url: appApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function appGet (params) {
-  return request({
-    url: appApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function appUpdate (params) {
-  return request({
-    url: appApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function appDelete (params) {
-  return request({
-    url: appApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function appPage (params) {
-  return request({
-    url: appApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function appUpdateStatus (params) {
-  return request({
-    url: appApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
-export function refreshAccessSecret (params) {
-  return request({
-    url: appApi.refresh,
-    method: 'post',
-    data: params
-  })
-}
-export const appTypeMap = {
-  'ANDROID_APP': 'Android APP',
-  'A8_POS': 'POS A8版',
-  'IOS_APP': 'iPhone APP',
-  'OPENAPI': '开放接口',
-  'ADMIN': '管理后台'
-}
diff --git a/src/api/security/appVersion.js b/src/api/security/appVersion.js
deleted file mode 100644
index 9220752..0000000
--- a/src/api/security/appVersion.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-const appVersionApi = {
-  add: '/security/appVersion/save',
-  update: '/security/appVersion/update',
-  del: '/security/appVersion/delete',
-  page: '/security/appVersion/page',
-  updateMustUpgrade: '/security/appVersion/updateMustUpgrade',
-  get: '/security/appVersion/getAppVersionById'
-}
-
-export function appVersionAdd (params) {
-  return request({
-    url: appVersionApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function appVersionUpdate (params) {
-  return request({
-    url: appVersionApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function appVersionDelete (params) {
-  return request({
-    url: appVersionApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function appVersionPage (params) {
-  return request({
-    url: appVersionApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function updateMustUpgrade (params) {
-  return request({
-    url: appVersionApi.updateMustUpgrade,
-    method: 'post',
-    data: params
-  })
-}
-export function appVersionGet (params) {
-  return request({
-    url: appVersionApi.get,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/cmsArticle.js b/src/api/security/cmsArticle.js
deleted file mode 100644
index 62d0f8d..0000000
--- a/src/api/security/cmsArticle.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import request from '@/utils/request'
-const cmsArticleApi = {
-  add: '/security/cmsArticle/add',
-  get: '/security/cmsArticle/get',
-  update: '/security/cmsArticle/update',
-  del: '/security/cmsArticle/delete',
-  page: '/security/cmsArticle/page',
-  updateStatus: '/security/cmsArticle/updateStatus',
-  listByCode: '/security/cmsArticle/listByCode'
-}
-
-export function cmsArticleAdd (params) {
-  return request({
-    url: cmsArticleApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function cmsArticleGet (params) {
-  return request({
-    url: cmsArticleApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function cmsArticleUpdate (params) {
-  return request({
-    url: cmsArticleApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function cmsArticleDelete (params) {
-  return request({
-    url: cmsArticleApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function cmsArticlePage (params) {
-  return request({
-    url: cmsArticleApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function cmsArticleUpdateStatus (params) {
-  return request({
-    url: cmsArticleApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
-export function listByCode (params) {
-  return request({
-    url: cmsArticleApi.listByCode,
-    method: 'post',
-    data: params
-  })
-}
-export const articleTypeMap = {
-  0: '固化',
-  1: '自定义'
-}
diff --git a/src/api/security/deviceInfo.js b/src/api/security/deviceInfo.js
deleted file mode 100644
index 4fbbd52..0000000
--- a/src/api/security/deviceInfo.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import request from '@/utils/request'
-const deviceInfoApi = {
-  page: '/security/deviceInfo/page'
-}
-
-export function page (params) {
-  return request({
-    url: deviceInfoApi.page,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/function.js b/src/api/security/function.js
deleted file mode 100644
index b9248b3..0000000
--- a/src/api/security/function.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-const api = {
-  add: '/security/function/add',
-  update: '/security/function/update',
-  del: '/security/function/delete',
-  page: '/security/function/page',
-  get: '/security/function/get',
-  functionCodeMap: '/security/function/getFunctionCodeMap'
-}
-export function functionAdd (params) {
-  return request({
-    url: api.add,
-    method: 'post',
-    data: params
-  })
-}
-export function functionUpdate (params) {
-  return request({
-    url: api.update,
-    method: 'post',
-    data: params
-  })
-}
-export function functionDel (params) {
-  return request({
-    url: api.del,
-    method: 'post',
-    data: params
-  })
-}
-export function functionPage (params) {
-  return request({
-    url: api.page,
-    method: 'post',
-    data: params
-  })
-}
-export function functionGet (params) {
-  return request({
-    url: api.get,
-    method: 'post',
-    data: params
-  })
-}
-export function functionCodeMap (params) {
-  return request({
-    url: api.functionCodeMap,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/functionCategory.js b/src/api/security/functionCategory.js
deleted file mode 100644
index e73318b..0000000
--- a/src/api/security/functionCategory.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-const functionCategoryApi = {
-  add: '/security/functionCategory/add',
-  update: '/security/functionCategory/update',
-  del: '/security/functionCategory/delete',
-  page: '/security/functionCategory/page',
-  get: '/security/functionCategory/get'
-}
-
-export function functionCategoryAdd (params) {
-  return request({
-    url: functionCategoryApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function functionCategoryUpdate (params) {
-  return request({
-    url: functionCategoryApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function functionCategoryDel (params) {
-  return request({
-    url: functionCategoryApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function functionCategoryPage (params) {
-  return request({
-    url: functionCategoryApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function functionCategoryGet (params) {
-  return request({
-    url: functionCategoryApi.get,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/functionResource.js b/src/api/security/functionResource.js
deleted file mode 100644
index 685c698..0000000
--- a/src/api/security/functionResource.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import request from '@/utils/request'
-
-const functionResourceApi = {
-  add: '/security/functionResource/add',
-  del: '/security/functionResource/delete'
-}
-
-export function functionResourceAdd (params) {
-  return request({
-    url: functionResourceApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function functionResourceDelete (params) {
-  return request({
-    url: functionResourceApi.del,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/menu.js b/src/api/security/menu.js
new file mode 100644
index 0000000..709bf2a
--- /dev/null
+++ b/src/api/security/menu.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+const menuApi = {
+  add: 'sys/menu/add',
+  get: 'sys/menu/get',
+  update: 'sys/menu/update',
+  del: 'sys/menu/delete',
+  updateStatus: 'sys/menu/updateStatus',
+  list: 'sys/menu/listByParentId'
+}
+
+export function menuAdd (params) {
+  return request({
+    url: menuApi.add,
+    method: 'post',
+    data: params
+  })
+}
+export function menuGet (params) {
+  return request({
+    url: menuApi.get,
+    method: 'post',
+    data: params
+  })
+}
+export function menuUpdate (params) {
+  return request({
+    url: menuApi.update,
+    method: 'post',
+    data: params
+  })
+}
+export function menuDelete (params) {
+  return request({
+    url: menuApi.del,
+    method: 'post',
+    data: params
+  })
+}
+export function menuList (params) {
+  return request({
+    url: menuApi.list,
+    method: 'post',
+    data: params
+  })
+}
+export function menuUpdateStatus (params) {
+  return request({
+    url: menuApi.updateStatus,
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/security/message.js b/src/api/security/message.js
deleted file mode 100644
index 4ba8c55..0000000
--- a/src/api/security/message.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-const messageApi = {
-  add: '/security/message/save',
-  get: '/security/message/get',
-  update: '/security/message/update',
-  del: '/security/message/delete',
-  page: '/security/message/page'
-}
-
-export function messageAdd (params) {
-  return request({
-    url: messageApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function messageGet (params) {
-  return request({
-    url: messageApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function messageUpdate (params) {
-  return request({
-    url: messageApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function messageDelete (params) {
-  return request({
-    url: messageApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function messagePage (params) {
-  return request({
-    url: messageApi.page,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/redis.js b/src/api/security/redis.js
deleted file mode 100644
index 22efbc5..0000000
--- a/src/api/security/redis.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import request from '@/utils/request'
-const redisManageApi = {
-  page: '/security/redisManage/page',
-  deleteByParams: '/security/redisManage/delete'
-}
-
-export function page (params) {
-  return request({
-    url: redisManageApi.page,
-    method: 'post',
-    data: params
-  })
-}
-
-export function deleteByParams (params) {
-  return request({
-    url: redisManageApi.deleteByParams,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/resource.js b/src/api/security/resource.js
deleted file mode 100644
index 7d40bcd..0000000
--- a/src/api/security/resource.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import request from '@/utils/request'
-
-const resourceApi = {
-  add: '/security/resource/add',
-  get: '/security/resource/get',
-  update: '/security/resource/update',
-  del: '/security/resource/delete',
-  updateStatus: '/security/resource/updateStatus',
-  list: '/security/resource/listByParentId',
-  listByUser: '/security/url/listByUser',
-  listAllResource: '/security/resource/listAllResource',
-  resourceByRoleId: '/security/resource/listAllResourceByRoleId',
-  listResourceByUser: '/security/resource/listResourceByLoginUser',
-  resourceByFunctionId: '/security/resource/listAllResourceByFunctionId'
-}
-
-export function resourceAdd (params) {
-  return request({
-    url: resourceApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function resourceGet (params) {
-  return request({
-    url: resourceApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function resourceUpdate (params) {
-  return request({
-    url: resourceApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function resourceDelete (params) {
-  return request({
-    url: resourceApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function resourceList (params) {
-  return request({
-    url: resourceApi.list,
-    method: 'post',
-    data: params
-  })
-}
-export function resourceListByUser (params) {
-  return request({
-    url: resourceApi.listByUser,
-    method: 'post',
-    data: params
-  })
-}
-export function resourceAll () {
-  return request({
-    url: resourceApi.listAllResource,
-    method: 'post'
-  })
-}
-export function resourceUpdateStatus (params) {
-  return request({
-    url: resourceApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
-export function resourceByRoleId (params) {
-  return request({
-    url: resourceApi.resourceByRoleId,
-    method: 'post',
-    data: params
-  })
-}
-export function listResourceByUser (params) {
-  return request({
-    url: resourceApi.listResourceByUser,
-    method: 'post',
-    data: params
-  })
-}
-export function resourceByFunctionId (params) {
-  return request({
-    url: resourceApi.resourceByFunctionId,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/role.js b/src/api/security/role.js
index a54673d..037d981 100644
--- a/src/api/security/role.js
+++ b/src/api/security/role.js
@@ -1,13 +1,12 @@
 import request from '@/utils/request'
 
 const roleApi = {
-  add: '/security/role/add',
-  get: '/security/role/get',
-  update: '/security/role/update',
-  del: '/security/role/delete',
-  page: '/security/role/page',
-  updateStatus: '/security/role/updateStatus',
-  rolesByUserId: '/security/role/listAllRoleByUserId'
+  add: '/sys/role/add',
+  get: '/sys/role/getById',
+  update: '/sys/role/update',
+  del: '/sys/role/delete',
+  page: '/sys/role/page',
+  updateStatus: '/sys/role/updateStatus'
 }
 
 export function roleAdd (params) {
@@ -52,10 +51,3 @@ export function roleUpdateStatus (params) {
     data: params
   })
 }
-export function rolesByUserId (params) {
-  return request({
-    url: roleApi.rolesByUserId,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/roleResource.js b/src/api/security/roleResource.js
deleted file mode 100644
index 4efc967..0000000
--- a/src/api/security/roleResource.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import request from '@/utils/request'
-
-const roleResourceApi = {
-  add: '/security/roleResource/add',
-  del: '/security/roleResource/delete'
-}
-
-export function roleResourceAdd (params) {
-  return request({
-    url: roleResourceApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function roleResourceDelete (params) {
-  return request({
-    url: roleResourceApi.del,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/user.js b/src/api/security/user.js
index 21c2f8e..7ef02bc 100644
--- a/src/api/security/user.js
+++ b/src/api/security/user.js
@@ -2,22 +2,18 @@ import request from '@/utils/request'
 
 const userApi = {
   login: '/login',
-  logout: '/security/user/logout',
-  add: '/security/user/add',
-  get: '/security/user/getById',
-  update: '/security/user/update',
-  del: '/security/user/delete',
-  page: '/security/user/page',
-  updateEnabled: '/security/user/updateEnabled',
-  getListByOrgId: '/security/user/getListByOrgId',
-  getUserInfo: '/security/user/get'
+  logout: '/logout',
+  add: '/sys/user/add',
+  get: '/sys/user/get',
+  update: '/sys/user/update',
+  del: '/sys/user/delete',
+  page: '/sys/user/page',
+  updateEnabled: '/sys/user/updateEnabled',
+  getInfo: '/sys/user/getInfo'
 }
 
 const userPasswordApi = {
-  set: '/security/user/password/set',
-  update: '/security/user/password/update',
-  send: '/security/user/sendSecuritycode',
-  setById: '/security/user/password/setByUserId'
+  update: '/sys/user/passwordUpdate',
 }
 
 export function userLogin (params) {
@@ -63,6 +59,20 @@ export function userPage (params) {
     data: params
   })
 }
+export function userLogout (params) {
+  // return request({
+  //   url: userApi.logout,
+  //   method: 'post',
+  //   data: params
+  // })
+}
+export function getInfo (params) {
+  return request({
+    url: userApi.getInfo,
+    method: 'post',
+    data: params
+  })
+}
 export function userUpdateEnabled (params) {
   return request({
     url: userApi.updateEnabled,
@@ -70,30 +80,9 @@ export function userUpdateEnabled (params) {
     data: params
   })
 }
-export function userPasswordSet (params) {
+export function passwordUpdate (params) {
   return request({
-    url: userPasswordApi.set,
-    method: 'post',
-    data: params
-  })
-}
-export function userPasswordSetById (params) {
-  return request({
-    url: userPasswordApi.setById,
-    method: 'post',
-    data: params
-  })
-}
-export function getListByOrgId (params) {
-  return request({
-    url: userApi.getListByOrgId,
-    method: 'post',
-    data: params
-  })
-}
-export function getUserInfo (params) {
-  return request({
-    url: userApi.getUserInfo,
+    url: userPasswordApi.update,
     method: 'post',
     data: params
   })
diff --git a/src/api/security/userFeedBack.js b/src/api/security/userFeedBack.js
deleted file mode 100644
index 6234795..0000000
--- a/src/api/security/userFeedBack.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import request from '@/utils/request'
-const userFeedBackApi = {
-  page: '/security/user/feedback/pageUserFeedBack',
-  handleFeedBack: '/security/user/feedback/handleFeedBack'
-}
-
-export function UserFeedBackPage (params) {
-  return request({
-    url: userFeedBackApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function handleFeedBack (params) {
-  return request({
-    url: userFeedBackApi.handleFeedBack,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/security/userRole.js b/src/api/security/userRole.js
deleted file mode 100644
index 75bae92..0000000
--- a/src/api/security/userRole.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import request from '@/utils/request'
-
-const userRoleApi = {
-  add: '/security/userRole/add',
-  del: '/security/userRole/delete'
-}
-
-export function userRoleAdd (params) {
-  return request({
-    url: userRoleApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function userRoleDelete (params) {
-  return request({
-    url: userRoleApi.del,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js
deleted file mode 100644
index bc4c294..0000000
--- a/src/api/supplier/supplier.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-const supplierApi = {
-  add: '/supplier/supplier/add',
-  get: '/supplier/supplier/getById',
-  update: '/supplier/supplier/update',
-  del: '/supplier/supplier/delete',
-  page: '/supplier/supplier/pageByParams',
-  updateStatus: '/supplier/supplier/updateStatus',
-  list: '/supplier/supplier/listSupplierByParams'
-}
-
-export function supplierAdd (params) {
-  return request({
-    url: supplierApi.add,
-    method: 'post',
-    data: params
-  })
-}
-export function supplierGet (params) {
-  return request({
-    url: supplierApi.get,
-    method: 'post',
-    data: params
-  })
-}
-export function supplierUpdate (params) {
-  return request({
-    url: supplierApi.update,
-    method: 'post',
-    data: params
-  })
-}
-export function supplierDelete (params) {
-  return request({
-    url: supplierApi.del,
-    method: 'post',
-    data: params
-  })
-}
-export function supplierPage (params) {
-  return request({
-    url: supplierApi.page,
-    method: 'post',
-    data: params
-  })
-}
-export function supplierUpdateStatus (params) {
-  return request({
-    url: supplierApi.updateStatus,
-    method: 'post',
-    data: params
-  })
-}
-export function supplierList (params) {
-  return request({
-    url: supplierApi.list,
-    method: 'post',
-    data: params
-  })
-}
diff --git a/src/components/AvatarList/Item.vue b/src/components/AvatarList/Item.vue
deleted file mode 100644
index 26e149e..0000000
--- a/src/components/AvatarList/Item.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <tooltip v-if="tips !== ''">
-    <template slot="title">{{ tips }}</template>
-    <avatar :size="avatarSize" :src="src" />
-  </tooltip>
-  <avatar v-else :size="avatarSize" :src="src" />
-</template>
-
-<script>
-import Avatar from 'ant-design-vue/es/avatar'
-import Tooltip from 'ant-design-vue/es/tooltip'
-
-export default {
-  name: 'AvatarItem',
-  components: {
-    Avatar,
-    Tooltip
-  },
-  props: {
-    tips: {
-      type: String,
-      default: '',
-      required: false
-    },
-    src: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      size: this.$parent.size
-    }
-  },
-  computed: {
-    avatarSize () {
-      return this.size !== 'mini' && this.size || 20
-    }
-  },
-  watch: {
-    '$parent.size' (val) {
-      this.size = val
-    }
-  }
-}
-</script>
diff --git a/src/components/AvatarList/List.vue b/src/components/AvatarList/List.vue
deleted file mode 100644
index 446ceeb..0000000
--- a/src/components/AvatarList/List.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
-<template>
-  <div :class="[prefixCls]">
-    <ul>
-      <slot></slot>
-      <template v-for="item in filterEmpty($slots.default).slice(0, 3)"></template>
-
-      <template v-if="maxLength > 0 && filterEmpty($slots.default).length > maxLength">
-        <avatar-item :size="size">
-          <avatar :size="size !== 'mini' && size || 20" :style="excessItemsStyle">{{ `+${maxLength}` }}</avatar>
-        </avatar-item>
-      </template>
-    </ul>
-  </div>
-</template>
--->
-
-<script>
-import Avatar from 'ant-design-vue/es/avatar'
-import AvatarItem from './Item'
-import { filterEmpty } from '@/components/_util/util'
-
-export default {
-  AvatarItem,
-  name: 'AvatarList',
-  components: {
-    Avatar,
-    AvatarItem
-  },
-  props: {
-    prefixCls: {
-      type: String,
-      default: 'ant-pro-avatar-list'
-    },
-    /**
-       * 头像大小 类型: large、small 、mini, default
-       * 默认值: default
-       */
-    size: {
-      type: [String, Number],
-      default: 'default'
-    },
-    /**
-       * 要显示的最大项目
-       */
-    maxLength: {
-      type: Number,
-      default: 0
-    },
-    /**
-       * 多余的项目风格
-       */
-    excessItemsStyle: {
-      type: Object,
-      default: () => {
-        return {
-          color: '#f56a00',
-          backgroundColor: '#fde3cf'
-        }
-      }
-    }
-  },
-  data () {
-    return {}
-  },
-  methods: {
-    getItems (items) {
-      const classString = {
-        [`${this.prefixCls}-item`]: true,
-        [`${this.size}`]: true
-      }
-
-      if (this.maxLength > 0) {
-        items = items.slice(0, this.maxLength)
-        items.push((<Avatar size={ this.size } style={ this.excessItemsStyle }>{`+${this.maxLength}`}</Avatar>))
-      }
-      const itemList = items.map((item) => (
-        <li class={ classString }>{ item }</li>
-      ))
-      return itemList
-    }
-  },
-  render () {
-    const { prefixCls, size } = this.$props
-    const classString = {
-      [`${prefixCls}`]: true,
-      [`${size}`]: true
-    }
-    const items = filterEmpty(this.$slots.default)
-    const itemsDom = items && items.length ? <ul class={`${prefixCls}-items`}>{ this.getItems(items) }</ul> : null
-
-    return (
-      <div class={ classString }>
-        { itemsDom }
-      </div>
-    )
-  }
-}
-</script>
diff --git a/src/components/Charts/MiniBar.vue b/src/components/Charts/MiniBar.vue
index b5292f4..beac404 100644
--- a/src/components/Charts/MiniBar.vue
+++ b/src/components/Charts/MiniBar.vue
@@ -10,20 +10,43 @@
 </template>
 
 <script>
+import moment from 'moment'
+const data = []
+const beginDay = new Date().getTime()
+
+for (let i = 0; i < 10; i++) {
+  data.push({
+    x: moment(new Date(beginDay + 1000 * 60 * 60 * 24 * i)).format('YYYY-MM-DD'),
+    y: Math.round(Math.random() * 10)
+  })
+}
+
+const tooltip = [
+  'x*y',
+  (x, y) => ({
+    name: x,
+    value: y
+  })
+]
+
+const scale = [{
+  dataKey: 'x',
+  min: 2
+}, {
+  dataKey: 'y',
+  title: '时间',
+  min: 1,
+  max: 30
+}]
+
 export default {
   name: 'MiniBar',
-  props: {
-    data: {
-      type: Array,
-      required: true
-    },
-    height: {
-      type: Number,
-      default: 100
-    }
-  },
   data () {
     return {
+      data,
+      tooltip,
+      scale,
+      height: 100
     }
   }
 }
diff --git a/src/components/Charts/RankList.vue b/src/components/Charts/RankList.vue
index abd23db..afb56a1 100644
--- a/src/components/Charts/RankList.vue
+++ b/src/components/Charts/RankList.vue
@@ -14,6 +14,7 @@
 <script>
 export default {
   name: 'RankList',
+  // ['title', 'list']
   props: {
     title: {
       type: String,
@@ -28,22 +29,23 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
   .rank {
-    .title{
-      padding: 10px 24px;
-      border-bottom: 1px solid #e8e8e8;
-      margin: 0;
-    }
+    padding: 0 32px 32px 72px;
+
     .list {
-      padding: 20px 30px 30px 40px;
+      margin: 25px 0 0;
+      padding: 0;
       list-style: none;
-      margin: 0;
+
       li {
         margin-top: 16px;
+
         span {
           color: rgba(0, 0, 0, .65);
           font-size: 14px;
           line-height: 22px;
+
           &:first-child {
             background-color: #f5f5f5;
             border-radius: 20px;
diff --git a/src/components/Charts/chart.less b/src/components/Charts/chart.less
index 4ac1798..e04fa09 100644
--- a/src/components/Charts/chart.less
+++ b/src/components/Charts/chart.less
@@ -6,5 +6,8 @@
     position: absolute;
     bottom: -28px;
     width: 100%;
+
+/*    margin: 0 -5px;
+    overflow: hidden;*/
   }
 }
\ No newline at end of file
diff --git a/src/components/CountDown/CountDown.vue b/src/components/CountDown/CountDown.vue
deleted file mode 100644
index 575dd4a..0000000
--- a/src/components/CountDown/CountDown.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <span>
-    {{ lastTime | format }}
-  </span>
-</template>
-
-<script>
-
-function fixedZero (val) {
-  return val * 1 < 10 ? `0${val}` : val
-}
-
-export default {
-  name: 'CountDown',
-  props: {
-    format: {
-      type: Function,
-      default: undefined
-    },
-    target: {
-      type: [Date, Number],
-      required: true
-    },
-    onEnd: {
-      type: Function,
-      default: () => ({})
-    }
-  },
-  data () {
-    return {
-      dateTime: '0',
-      originTargetTime: 0,
-      lastTime: 0,
-      timer: 0,
-      interval: 1000
-    }
-  },
-  filters: {
-    format (time) {
-      const hours = 60 * 60 * 1000
-      const minutes = 60 * 1000
-
-      const h = Math.floor(time / hours)
-      const m = Math.floor((time - h * hours) / minutes)
-      const s = Math.floor((time - h * hours - m * minutes) / 1000)
-      return `${fixedZero(h)}:${fixedZero(m)}:${fixedZero(s)}`
-    }
-  },
-  created () {
-    this.initTime()
-    this.tick()
-  },
-  methods: {
-    initTime () {
-      let lastTime = 0
-      let targetTime = 0
-      this.originTargetTime = this.target
-      try {
-        if (Object.prototype.toString.call(this.target) === '[object Date]') {
-          targetTime = this.target
-        } else {
-          targetTime = new Date(this.target).getTime()
-        }
-      } catch (e) {
-        throw new Error('invalid target prop')
-      }
-
-      lastTime = targetTime - new Date().getTime()
-
-      this.lastTime = lastTime < 0 ? 0 : lastTime
-    },
-    tick () {
-      const { onEnd } = this
-
-      this.timer = setTimeout(() => {
-        if (this.lastTime < this.interval) {
-          clearTimeout(this.timer)
-          this.lastTime = 0
-          if (typeof onEnd === 'function') {
-            onEnd()
-          }
-        } else {
-          this.lastTime -= this.interval
-          this.tick()
-        }
-      }, this.interval)
-    }
-  },
-  beforeUpdate () {
-    if (this.originTargetTime !== this.target) {
-      this.initTime()
-    }
-  },
-  beforeDestroy () {
-    clearTimeout(this.timer)
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/components/CountDown/index.js b/src/components/CountDown/index.js
deleted file mode 100644
index 35e954f..0000000
--- a/src/components/CountDown/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CountDown from './CountDown'
-
-export default CountDown
diff --git a/src/components/CountDown/index.md b/src/components/CountDown/index.md
deleted file mode 100644
index fd46809..0000000
--- a/src/components/CountDown/index.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# CountDown 倒计时
-
-倒计时组件。
-
-
-
-引用方式：
-
-```javascript
-import CountDown from '@/components/CountDown/CountDown'
-
-export default {
-    components: {
-        CountDown
-    }
-}
-```
-
-
-
-## 代码演示  [demo](https://pro.loacg.com/test/home)
-
-```html
-<count-down :target="new Date().getTime() + 3000000" :on-end="onEndHandle" />
-```
-
-
-
-## API
-
-| 参数      | 说明                                      | 类型         | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| target | 目标时间 | Date | - |
-| onEnd |  倒计时结束回调 | funtion | -|
diff --git a/src/components/DescriptionList/DescriptionList.vue b/src/components/DescriptionList/DescriptionList.vue
deleted file mode 100644
index 7f98fec..0000000
--- a/src/components/DescriptionList/DescriptionList.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-  <div :class="['description-list', size, layout === 'vertical' ? 'vertical': 'horizontal']">
-    <div v-if="title" class="title">{{ title }}</div>
-    <a-row>
-      <slot></slot>
-    </a-row>
-  </div>
-</template>
-
-<script>
-import { Col } from 'ant-design-vue/es/grid/'
-
-const Item = {
-  name: 'DetailListItem',
-  props: {
-    term: {
-      type: String,
-      default: '',
-      required: false
-    }
-  },
-  inject: {
-    col: {
-      type: Number
-    }
-  },
-  render () {
-    return (
-      <Col {...{ props: responsive[this.col] }}>
-        <div class="term">{this.$props.term}</div>
-        <div class="content">{this.$slots.default}</div>
-      </Col>
-    )
-  }
-}
-
-const responsive = {
-  1: { xs: 24 },
-  2: { xs: 24, sm: 12 },
-  3: { xs: 24, sm: 12, md: 8 },
-  4: { xs: 24, sm: 12, md: 6 }
-}
-
-export default {
-  name: 'DetailList',
-  Item: Item,
-  components: {
-    Col
-  },
-  props: {
-    title: {
-      type: String,
-      default: '',
-      required: false
-    },
-    col: {
-      type: Number,
-      required: false,
-      default: 3
-    },
-    size: {
-      type: String,
-      required: false,
-      default: 'large'
-    },
-    layout: {
-      type: String,
-      required: false,
-      default: 'horizontal'
-    }
-  },
-  provide () {
-    return {
-      col: this.col > 4 ? 4 : this.col
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-
-  .description-list {
-
-    .title {
-      color: rgba(0,0,0,.85);
-      font-size: 14px;
-      font-weight: 500;
-      margin-bottom: 16px;
-    }
-
-    /deep/ .term {
-      color: rgba(0,0,0,.85);
-      display: table-cell;
-      line-height: 20px;
-      margin-right: 8px;
-      padding-bottom: 16px;
-      white-space: nowrap;
-
-      &:not(:empty):after {
-        content: ":";
-        margin: 0 8px 0 2px;
-        position: relative;
-        top: -.5px;
-      }
-    }
-
-    /deep/ .content {
-      color: rgba(0,0,0,.65);
-      display: table-cell;
-      min-height: 22px;
-      line-height: 22px;
-      padding-bottom: 16px;
-      width: 100%;
-      &:empty {
-        content: ' ';
-        height: 38px;
-        padding-bottom: 16px;
-      }
-    }
-
-    &.small {
-
-      .title {
-        font-size: 14px;
-        color: rgba(0, 0, 0, .65);
-        font-weight: normal;
-        margin-bottom: 12px;
-      }
-      /deep/ .term, .content {
-        padding-bottom: 8px;
-      }
-    }
-
-    &.large {
-      /deep/ .term, .content {
-        padding-bottom: 16px;
-      }
-
-      .title {
-        font-size: 16px;
-      }
-    }
-
-    &.vertical {
-      .term {
-        padding-bottom: 8px;
-      }
-      /deep/ .term, .content {
-        display: block;
-      }
-    }
-  }
-</style>
diff --git a/src/components/DescriptionList/index.js b/src/components/DescriptionList/index.js
deleted file mode 100644
index 7aed83d..0000000
--- a/src/components/DescriptionList/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import DescriptionList from './DescriptionList'
-export default DescriptionList
diff --git a/src/components/Editor/QuillEditor.vue b/src/components/Editor/QuillEditor.vue
index 9e43a91..9a041e5 100644
--- a/src/components/Editor/QuillEditor.vue
+++ b/src/components/Editor/QuillEditor.vue
@@ -9,6 +9,7 @@
       @ready="onEditorReady($event)"
       @change="onEditorChange($event)">
     </quill-editor>
+
   </div>
 </template>
 
diff --git a/src/components/Editor/WangEditor.vue b/src/components/Editor/WangEditor.vue
index 5f50c26..d9c71c7 100644
--- a/src/components/Editor/WangEditor.vue
+++ b/src/components/Editor/WangEditor.vue
@@ -1,10 +1,11 @@
 <template>
-  <div :class="prefixCls"><div ref="editor" class="editor-wrapper"></div></div>
+  <div :class="prefixCls">
+    <div ref="editor" class="editor-wrapper"></div>
+  </div>
 </template>
 
 <script>
 import WEditor from 'wangeditor'
-import { fileUpload } from '@/api/file/file'
 
 export default {
   name: 'WangEditor',
@@ -13,19 +14,15 @@ export default {
       type: String,
       default: 'ant-editor-wang'
     },
+    // eslint-disable-next-line
     value: {
-      type: String,
-      default: ''
-    },
-    groupName: {
-      type: String,
-      required: true
+      type: String
     }
   },
   data () {
     return {
       editor: null,
-      editorContent: ''
+      editorContent: null
     }
   },
   watch: {
@@ -38,27 +35,12 @@ export default {
     this.initEditor()
   },
   methods: {
-    content () {
-      return this.editorContent
-    },
     initEditor () {
       this.editor = new WEditor(this.$refs.editor)
-      this.editor.customConfig.uploadImgMaxLength = 10
-      this.editor.customConfig.zIndex = 100
-      this.editor.customConfig.customUploadImg = (files, insert) => {
-        const formData = new FormData()
-        files.forEach(file => {
-          formData.append('files', file)
-        })
-        formData.append('groupName', this.groupName)
-        fileUpload(formData).then((res) => {
-          res.data.forEach((url) => {
-            insert(url)
-          })
-        })
-      }
-      this.editor.customConfig.onchange = html => {
+      // this.editor.onchangeTimeout = 200
+      this.editor.customConfig.onchange = (html) => {
         this.editorContent = html
+        this.$emit('change', this.editorContent)
       }
       this.editor.create()
     }
@@ -66,16 +48,10 @@ export default {
 }
 </script>
 
-<style>
+<style lang="less" scoped>
 .ant-editor-wang {
   .editor-wrapper {
     text-align: left;
   }
 }
-.w-e-toolbar {
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0 5px;
-  flex-wrap: wrap;
-}
 </style>
diff --git a/src/components/Exception/ExceptionPage.vue b/src/components/Exception/ExceptionPage.vue
deleted file mode 100644
index 132e346..0000000
--- a/src/components/Exception/ExceptionPage.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <div class="exception">
-    <div class="imgBlock">
-      <div class="imgEle" :style="{backgroundImage: `url(${config[type].img})`}">
-      </div>
-    </div>
-    <div class="content">
-      <h1>{{ config[type].title }}</h1>
-      <div class="desc">{{ config[type].desc }}</div>
-      <div class="actions">
-        <a-button type="primary" @click="handleToHome">返回首页</a-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import types from './type'
-
-export default {
-  name: 'Exception',
-  props: {
-    type: {
-      type: String,
-      default: '404'
-    }
-  },
-  data () {
-    return {
-      config: types
-    }
-  },
-  methods: {
-    handleToHome () {
-      this.$router.push({ name: 'dashboard' })
-    }
-  }
-}
-</script>
-<style lang="less">
-@import "~ant-design-vue/lib/style/index";
-
-.exception {
-  display: flex;
-  align-items: center;
-  height: 80%;
-  min-height: 500px;
-
-  .imgBlock {
-    flex: 0 0 62.5%;
-    width: 62.5%;
-    padding-right: 152px;
-    zoom: 1;
-    &::before,
-    &::after {
-      content: ' ';
-      display: table;
-    }
-    &::after {
-      clear: both;
-      height: 0;
-      font-size: 0;
-      visibility: hidden;
-    }
-  }
-
-  .imgEle {
-    float: right;
-    width: 100%;
-    max-width: 430px;
-    height: 360px;
-    background-repeat: no-repeat;
-    background-position: 50% 50%;
-    background-size: contain;
-  }
-
-  .content {
-    flex: auto;
-
-    h1 {
-      margin-bottom: 24px;
-      color: #434e59;
-      font-weight: 600;
-      font-size: 72px;
-      line-height: 72px;
-    }
-
-    .desc {
-      margin-bottom: 16px;
-      color: @text-color-secondary;
-      font-size: 20px;
-      line-height: 28px;
-    }
-
-    .actions {
-      button:not(:last-child) {
-        margin-right: 8px;
-      }
-    }
-  }
-}
-
-@media screen and (max-width: @screen-xl) {
-  .exception {
-    .imgBlock {
-      padding-right: 88px;
-    }
-  }
-}
-
-@media screen and (max-width: @screen-sm) {
-  .exception {
-    display: block;
-    text-align: center;
-    .imgBlock {
-      margin: 0 auto 24px;
-      padding-right: 0;
-    }
-  }
-}
-
-@media screen and (max-width: @screen-xs) {
-  .exception {
-    .imgBlock {
-      margin-bottom: -24px;
-      overflow: hidden;
-    }
-  }
-}
-</style>
diff --git a/src/components/Exception/index.js b/src/components/Exception/index.js
deleted file mode 100644
index dda91be..0000000
--- a/src/components/Exception/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import ExceptionPage from './ExceptionPage.vue'
-export default ExceptionPage
diff --git a/src/components/Exception/type.js b/src/components/Exception/type.js
deleted file mode 100644
index 39bc6be..0000000
--- a/src/components/Exception/type.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const types = {
-  401: {
-    title: '401',
-    desc: '未登录或登录超时'
-  },
-  403: {
-    img: 'https://gw.alipayobjects.com/zos/rmsportal/wZcnGqRDyhPOEYFcZDnb.svg',
-    title: '403',
-    desc: '抱歉，你无权访问该页面'
-  },
-  404: {
-    img: 'https://gw.alipayobjects.com/zos/rmsportal/KpnpchXsobRgLElEozzI.svg',
-    title: '404',
-    desc: '抱歉，你访问的页面不存在或仍在开发中'
-  },
-  500: {
-    img: 'https://gw.alipayobjects.com/zos/rmsportal/RVRUAYdCGeYNBWoKiIwB.svg',
-    title: '500',
-    desc: '抱歉，服务器出错了'
-  },
-  503: {
-    img: 'https://gw.alipayobjects.com/zos/rmsportal/RVRUAYdCGeYNBWoKiIwB.svg',
-    title: '503',
-    desc: '抱歉，服务器出错了'
-  }
-}
-
-export default types
diff --git a/src/components/GlobalFooter/GlobalFooter.vue b/src/components/GlobalFooter/GlobalFooter.vue
deleted file mode 100644
index 5db47d4..0000000
--- a/src/components/GlobalFooter/GlobalFooter.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <div class="footer">
-    <div class="copyright"><a href="http://one.tcc-cloud.com/" target="_blank">TCC 西安研发中心出品</a></div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'GlobalFooter',
-  data () {
-    return {}
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.footer {
-  padding: 0 16px;
-  margin: 48px 0 24px;
-  text-align: center;
-
-  .links {
-    margin-bottom: 8px;
-
-    a {
-      color: rgba(0, 0, 0, 0.45);
-
-      &:hover {
-        color: rgba(0, 0, 0, 0.65);
-      }
-
-      &:not(:last-child) {
-        margin-right: 40px;
-      }
-    }
-  }
-  .copyright {
-    color: rgba(0, 0, 0, 0.45);
-    font-size: 14px;
-  }
-}
-</style>
diff --git a/src/components/GlobalFooter/index.js b/src/components/GlobalFooter/index.js
deleted file mode 100644
index 832e0bd..0000000
--- a/src/components/GlobalFooter/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import GlobalFooter from './GlobalFooter'
-export default GlobalFooter
diff --git a/src/components/GlobalFooter/index.vue b/src/components/GlobalFooter/index.vue
index 28f0c3f..d7e0125 100644
--- a/src/components/GlobalFooter/index.vue
+++ b/src/components/GlobalFooter/index.vue
@@ -2,7 +2,7 @@
   <global-footer class="footer custom-render">
     <template v-slot:links></template>
     <template v-slot:copyright>
-      <a href="http://one.tcc-cloud.com/" target="_blank">TCC 西安研发中心出品</a>
+      <a href="https://one.biz.com" target="_blank">tcc出品</a>
     </template>
   </global-footer>
 </template>
diff --git a/src/components/GlobalHeader/AvatarDropdown.vue b/src/components/GlobalHeader/AvatarDropdown.vue
index 36714da..73e202e 100644
--- a/src/components/GlobalHeader/AvatarDropdown.vue
+++ b/src/components/GlobalHeader/AvatarDropdown.vue
@@ -1,14 +1,18 @@
 <template>
-  <a-dropdown v-if="currentUser && currentUser.username" placement="bottomRight">
+  <a-dropdown v-if="currentUser && currentUser.name" placement="bottomRight">
     <span class="ant-pro-account-avatar">
       <a-avatar size="small" src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" class="antd-pro-global-header-index-avatar" />
-      <span>{{ currentUser.username }}</span>
+      <span>{{ currentUser.name }}</span>
     </span>
     <template v-slot:overlay>
-      <a-menu class="ant-pro-drop-down menu">
-        <a-menu-item key="setting" @click="handlePassword">
+      <a-menu class="ant-pro-drop-down menu" :selected-keys="[]">
+        <a-menu-item v-if="menu" key="center" @click="handleToCenter">
+          <a-icon type="user" />
+          个人中心
+        </a-menu-item>
+        <a-menu-item v-if="menu" key="settings" @click="handleToSettings">
           <a-icon type="setting" />
-          修改密码
+          个人设置
         </a-menu-item>
         <a-menu-divider v-if="menu" />
         <a-menu-item key="logout" @click="handleLogout">
@@ -24,11 +28,10 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue'
 
 export default {
   name: 'AvatarDropdown',
-  components: {
-  },
   props: {
     currentUser: {
       type: Object,
@@ -40,20 +43,26 @@ export default {
     }
   },
   methods: {
+    handleToCenter () {
+      this.$router.push({ path: '/account/center' })
+    },
+    handleToSettings () {
+      this.$router.push({ path: '/account/settings' })
+    },
     handleLogout (e) {
-      this.$confirm({
+      Modal.confirm({
         title: this.$t('layouts.usermenu.dialog.title'),
         content: this.$t('layouts.usermenu.dialog.content'),
         onOk: () => {
+          // return new Promise((resolve, reject) => {
+          //   setTimeout(Math.random() > 0.5 ? resolve : reject, 1500)
+          // }).catch(() => console.log('Oops errors!'))
           return this.$store.dispatch('Logout').then(() => {
             this.$router.push({ name: 'login' })
           })
         },
         onCancel () {}
       })
-    },
-    handlePassword () {
-      this.$emit('handlePassword')
     }
   }
 }
diff --git a/src/components/GlobalHeader/GlobalHeader.vue b/src/components/GlobalHeader/GlobalHeader.vue
deleted file mode 100644
index f4490ec..0000000
--- a/src/components/GlobalHeader/GlobalHeader.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <transition name="showHeader">
-    <div v-if="visible" class="header-animat">
-      <a-layout-header
-        v-if="visible"
-        :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
-        :style="{ padding: '0' }">
-        <div v-if="mode === 'sidemenu'" class="header">
-          <a-icon v-if="device==='mobile'" class="trigger" :type="collapsed ? 'menu-fold' : 'menu-unfold'" @click="toggle"/>
-          <a-icon v-else class="trigger" :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle"/>
-          <user-menu></user-menu>
-        </div>
-        <div v-else :class="['top-nav-header-index', theme]">
-          <div class="header-index-wide">
-            <div class="header-index-left">
-              <logo class="top-nav-header" :show-title="device !== 'mobile'"/>
-              <s-menu v-if="device !== 'mobile'" mode="horizontal" :menu="menus" :theme="theme" />
-              <a-icon v-else class="trigger" :type="collapsed ? 'menu-fold' : 'menu-unfold'" @click="toggle" />
-            </div>
-            <user-menu class="header-index-right"></user-menu>
-          </div>
-        </div>
-      </a-layout-header>
-    </div>
-  </transition>
-</template>
-
-<script>
-import UserMenu from '../tools/UserMenu'
-import SMenu from '../Menu/'
-import Logo from '../tools/Logo'
-import { mixin } from '@/utils/mixin'
-
-export default {
-  name: 'GlobalHeader',
-  components: {
-    UserMenu,
-    SMenu,
-    Logo
-  },
-  mixins: [mixin],
-  props: {
-    mode: {
-      type: String,
-      // sidemenu, topmenu
-      default: 'sidemenu'
-    },
-    menus: {
-      type: Array,
-      required: true
-    },
-    theme: {
-      type: String,
-      required: false,
-      default: 'dark'
-    },
-    collapsed: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    device: {
-      type: String,
-      required: false,
-      default: 'desktop'
-    }
-  },
-  data () {
-    return {
-      visible: true,
-      oldScrollTop: 0
-    }
-  },
-  mounted () {
-    document.addEventListener('scroll', this.handleScroll, { passive: true })
-  },
-  methods: {
-    handleScroll () {
-      if (!this.autoHideHeader) {
-        return
-      }
-
-      const scrollTop = document.body.scrollTop + document.documentElement.scrollTop
-      if (!this.ticking) {
-        this.ticking = true
-        requestAnimationFrame(() => {
-          if (this.oldScrollTop > scrollTop) {
-            this.visible = true
-          } else if (scrollTop > 300 && this.visible) {
-            this.visible = false
-          } else if (scrollTop < 300 && !this.visible) {
-            this.visible = true
-          }
-          this.oldScrollTop = scrollTop
-          this.ticking = false
-        })
-      }
-    },
-    toggle () {
-      this.$emit('toggle')
-    }
-  },
-  beforeDestroy () {
-    document.body.removeEventListener('scroll', this.handleScroll, true)
-  }
-}
-</script>
-
-<style lang="less">
-@import '../index.less';
-
-.header-animat{
-  position: relative;
-  z-index: @ant-global-header-zindex;
-}
-.showHeader-enter-active {
-  transition: all 0.25s ease;
-}
-.showHeader-leave-active {
-  transition: all 0.5s ease;
-}
-.showHeader-enter, .showHeader-leave-to {
-  opacity: 0;
-}
-</style>
diff --git a/src/components/GlobalHeader/RightContent.vue b/src/components/GlobalHeader/RightContent.vue
index 8354c22..5d0bb80 100644
--- a/src/components/GlobalHeader/RightContent.vue
+++ b/src/components/GlobalHeader/RightContent.vue
@@ -1,8 +1,7 @@
 <template>
   <div :class="wrpCls">
-    <avatar-dropdown :menu="showMenu" :current-user="currentUser" :class="prefixCls" @handlePassword="handlePassword"/>
+    <avatar-dropdown :menu="showMenu" :current-user="currentUser" :class="prefixCls" />
     <select-lang :class="prefixCls" />
-    <password-form ref="password"></password-form>
   </div>
 </template>
 
@@ -14,8 +13,7 @@ export default {
   name: 'RightContent',
   components: {
     AvatarDropdown,
-    SelectLang,
-    PasswordForm: () => import('@/components/PasswordForm')
+    SelectLang
   },
   props: {
     prefixCls: {
@@ -45,17 +43,16 @@ export default {
     wrpCls () {
       return {
         'ant-pro-global-header-index-right': true,
-        [`ant-pro-global-header-index-${this.isMobile || !this.topMenu ? 'light' : this.theme}`]: true
+        [`ant-pro-global-header-index-${(this.isMobile || !this.topMenu) ? 'light' : this.theme}`]: true
       }
     }
   },
-  created () {
-    this.currentUser = this.$store.getters.userInfo || { username: '***' }
-  },
-  methods: {
-    handlePassword () {
-      this.$refs.password.show(this.currentUser.userId)
-    }
+  mounted () {
+    setTimeout(() => {
+      this.currentUser = {
+        name: 'Serati Ma'
+      }
+    }, 1500)
   }
 }
 </script>
diff --git a/src/components/GlobalHeader/index.js b/src/components/GlobalHeader/index.js
deleted file mode 100644
index 0807c87..0000000
--- a/src/components/GlobalHeader/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import GlobalHeader from './GlobalHeader'
-export default GlobalHeader
diff --git a/src/components/IconSelector/IconSelector.vue b/src/components/IconSelector/IconSelector.vue
index 7fd5238..810d297 100644
--- a/src/components/IconSelector/IconSelector.vue
+++ b/src/components/IconSelector/IconSelector.vue
@@ -22,9 +22,9 @@ export default {
       type: String,
       default: 'ant-pro-icon-selector'
     },
+    // eslint-disable-next-line
     value: {
-      type: String,
-      default: ''
+      type: String
     }
   },
   data () {
@@ -59,21 +59,28 @@ export default {
   }
 }
 </script>
+
 <style lang="less" scoped>
-@import "../index.less";
-ul{
-  list-style: none;
-  padding: 0;
-  li{
-    display: inline-block;
-    padding: @padding-sm;
-    margin: 3px 0;
-    border-radius: @border-radius-base;
-    &:hover, &.active{
-      cursor: pointer;
-      color: @white;
-      background-color: @primary-color;
+  @import "../index.less";
+
+  ul{
+    list-style: none;
+    padding: 0;
+    overflow-y: scroll;
+    height: 250px;
+
+    li{
+      display: inline-block;
+      padding: @padding-sm;
+      margin: 3px 0;
+      border-radius: @border-radius-base;
+
+      &:hover, &.active{
+        // box-shadow: 0px 0px 5px 2px @primary-color;
+        cursor: pointer;
+        color: @white;
+        background-color: @primary-color;
+      }
     }
   }
-}
 </style>
diff --git a/src/components/IconSelector/IconSelectorView.vue b/src/components/IconSelector/IconSelectorView.vue
deleted file mode 100644
index fe9640e..0000000
--- a/src/components/IconSelector/IconSelectorView.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <a-drawer
-    title="图标选择"
-    width="640"
-    placement="right"
-    :visible="visible"
-    class="icon-select-view"
-    @close="onClose">
-    <icon-selector @change="handleIconChange"/>
-  </a-drawer>
-</template>
-
-<script>
-import IconSelector from './IconSelector'
-
-export default {
-	name: 'IconSelectorView',
-	components: {
-		IconSelector
-	},
-  data () {
-    return {
-      visible: false
-    }
-  },
-  methods: {
-    show () {
-      this.visible = true
-    },
-    onClose () {
-      this.visible = false
-    },
-    handleIconChange (icon) {
-      this.$emit('ok', icon)
-      this.onClose()
-    }
-  }
-}
-</script>
-<style scoped lang="less">
-.icon-select-view{
-  /deep/ .ant-drawer-body{
-    padding: 0;
-  }
-}
-
-</style>
diff --git a/src/components/IconSelector/icons.js b/src/components/IconSelector/icons.js
index ce90fcc..920f464 100644
--- a/src/components/IconSelector/icons.js
+++ b/src/components/IconSelector/icons.js
@@ -16,7 +16,7 @@ export default [
   {
     key: 'editor',
     title: '编辑类图标',
-    icons: ['edit', 'form', 'copy', 'scissor', 'delete', 'snippets', 'diff', 'highlight', 'align-center', 'align-left', 'align-right', 'bg-colors', 'bold', 'italic', 'underline', 'strikethrough', 'redo', 'undo', 'zoom-in', 'zoom-out', 'font-colors', 'font-size', 'line-height', 'column-height', 'dash', 'small-dash', 'sort-ascending', 'sort-descending', 'drag', 'ordered-list', 'radius-setting']
+    icons: ['edit', 'form', 'copy', 'scissor', 'delete', 'snippets', 'diff', 'highlight', 'align-center', 'align-left', 'align-right', 'bg-colors', 'bold', 'italic', 'underline', 'strikethrough', 'redo', 'undo', 'zoom-in', 'zoom-out', 'font-colors', 'font-size', 'line-height', 'colum-height', 'dash', 'small-dash', 'sort-ascending', 'sort-descending', 'drag', 'ordered-list', 'radius-setting']
   },
   {
     key: 'data',
@@ -26,7 +26,7 @@ export default [
   {
     key: 'brand_logo',
     title: '网站通用图标',
-    icons: ['lock', 'unlock', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download', 'ellipsis', 'file', 'file-text', 'file-unknown', 'file-pdf', 'file-word', 'file-excel', 'file-jpg', 'file-ppt', 'file-markdown', 'file-add', 'folder', 'folder-open', 'folder-add', 'hdd', 'frown', 'meh', 'smile', 'inbox', 'laptop', 'appstore', 'link', 'mail', 'mobile', 'notification', 'paper-clip', 'picture', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'home', 'loading', 'loading-3-quarters', 'cloud-upload', 'star', 'heart', 'environment', 'eye', 'camera', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customer-service', 'qrcode', 'scan', 'like', 'dislike', 'message', 'pay-circle', 'calculator', 'pushpin', 'bulb', 'select', 'switcher', 'rocket', 'bell', 'disconnect', 'database', 'compass', 'barcode', 'hourglass', 'key', 'flag', 'layout', 'printer', 'sound', 'usb', 'skin', 'tool', 'sync', 'wifi', 'car', 'schedule', 'user-add', 'user-delete', 'usergroup-add', 'usergroup-delete', 'man', 'woman', 'shop', 'gift', 'idcard', 'medicine-box', 'red-envelope', 'coffee', 'copyright', 'trademark', 'safety', 'wallet', 'bank', 'trophy', 'contacts', 'global', 'shake', 'api', 'fork', 'dashboard', 'table', 'profile', 'alert', 'audit', 'branches', 'build', 'border', 'crown', 'experiment', 'fire', 'money-collect', 'property-safety', 'read', 'reconciliation', 'rest', 'security-scan', 'insurance', 'interaction', 'safety-certificate', 'project', 'thunderbolt', 'block', 'cluster', 'deployment-unit', 'dollar', 'euro', 'pound', 'file-done', 'file-exclamation', 'file-protect', 'file-search', 'file-sync', 'gateway', 'gold', 'robot', 'shopping']
+    icons: ['lock', 'unlock', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download', 'ellipsis', 'file', 'file-text', 'file-unknown', 'file-pdf', 'file-word', 'file-excel', 'file-jpg', 'file-ppt', 'file-markdown', 'file-add', 'folder', 'folder-open', 'folder-add', 'hdd', 'frown', 'meh', 'smile', 'inbox', 'laptop', 'appstore', 'link', 'mail', 'mobile', 'notification', 'paper-clip', 'picture', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'home', 'loading', 'loading-3-quarters', 'cloud-upload', 'star', 'heart', 'environment', 'eye', 'camera', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customer-service', 'qrcode', 'scan', 'like', 'dislike', 'message', 'pay-circle', 'calculator', 'pushpin', 'bulb', 'select', 'switcher', 'rocket', 'bell', 'disconnect', 'database', 'compass', 'barcode', 'hourglass', 'key', 'flag', 'layout', 'printer', 'sound', 'usb', 'skin', 'tool', 'sync', 'wifi', 'car', 'schedule', 'user-add', 'user-delete', 'usergroup-add', 'usergroup-delete', 'man', 'woman', 'shop', 'gift', 'idcard', 'medicine-box', 'red-envelope', 'coffee', 'copyright', 'trademark', 'safety', 'wallet', 'bank', 'trophy', 'contacts', 'global', 'shake', 'api', 'fork', 'dashboard', 'table', 'profile', 'alert', 'audit', 'branches', 'build', 'border', 'crown', 'experiment', 'fire', 'money-collect', 'property-safety', 'read', 'reconciliation', 'rest', 'security-scan', 'insurance', 'interation', 'safety-certificate', 'project', 'thunderbolt', 'block', 'cluster', 'deployment-unit', 'dollar', 'euro', 'pound', 'file-done', 'file-exclamation', 'file-protect', 'file-search', 'file-sync', 'gateway', 'gold', 'robot', 'shopping']
   },
   {
     key: 'application',
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
deleted file mode 100644
index 73d404a..0000000
--- a/src/components/ImageUpload/index.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <div class="clearfix">
-    <a-upload
-      list-type="picture-card"
-      :multiple="true"
-      :file-list="fileList"
-      :before-upload="beforeUpload"
-      :preview-file="previewFile"
-      :remove="handleRemove"
-      @preview="handlePreview">
-      <div v-if="limit && fileList.length < limit">
-        <a-icon type="plus" />
-        <div class="ant-upload-text">上传文件</div>
-      </div>
-    </a-upload>
-    <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
-      <img alt="example" style="width: 100%" :src="previewImage" />
-    </a-modal>
-  </div>
-</template>
-<script>
-import Upload from 'ant-design-vue/lib/upload'
-import 'ant-design-vue/lib/upload/style'
-import { fileUpload } from '@/api/file/file'
-// function getBase64(file) {
-//   return new Promise((resolve, reject) => {
-//     const reader = new FileReader()
-//     reader.readAsDataURL(file)
-//     reader.onload = () => resolve(reader.result)
-//     reader.onerror = error => reject(error)
-//   })
-// }
-export default {
-  components: {
-    [Upload.name]: Upload
-  },
-  props: {
-    groupName: {
-      type: String,
-      default: ''
-    },
-    limit: {
-      type: Number,
-      default: 10
-    },
-    defaultList: {
-      type: Array,
-      default () {
-        return []
-      }
-    }
-  },
-  data () {
-    return {
-      uploading: false,
-      fileList: [],
-      previewVisible: false,
-      previewImage: ''
-    }
-  },
-  methods: {
-    previewFile (file) {
-      console.log(file)
-    },
-    clear () {
-      this.fileList = []
-    },
-    flush () {
-      this.clear()
-      this.defaultList.forEach((file, index) => {
-        this.fileList.push({
-            uid: index,
-            name: 'image.png',
-            status: 'done',
-            url: file
-        })
-      })
-    },
-    handleRemove (file) {
-      const index = this.fileList.indexOf(file)
-      const newFileList = this.fileList.slice()
-      newFileList.splice(index, 1)
-      this.fileList = newFileList
-    },
-    handleCancel () {
-      this.previewVisible = false
-    },
-    beforeUpload (file) {
-      this.fileList = [...this.fileList, file]
-      return false
-    },
-    async handlePreview (file) {
-      this.previewImage = file.url
-      this.previewVisible = true
-    },
-    submitUpload () {
-      return new Promise((resolve, reject) => {
-        const { fileList } = this
-        if (fileList.length === 0) {
-          resolve([])
-        } else {
-          const fileUrlArray = []
-          let count = 0
-          const formData = new FormData()
-          fileList.forEach(file => {
-            if (file instanceof File) {
-              formData.append('files', file)
-              count++
-            } else {
-              fileUrlArray.push(file.url)
-            }
-          })
-          formData.append('groupName', this.groupName)
-          if (count > 0) {
-            this.uploading = true
-            fileUpload(formData).then((res) => {
-              resolve(fileUrlArray.concat(res.data))
-              this.uploading = false
-            }, (err) => {
-              reject(err)
-              this.uploading = false
-            })
-          } else {
-            resolve(fileUrlArray)
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-<style scoped>
-/* you can make up upload button and sample style by using stylesheets */
-.ant-upload-select-picture-card i {
-  font-size: 32px;
-  color: #999;
-}
-
-.ant-upload-select-picture-card .ant-upload-text {
-  margin-top: 8px;
-  color: #666;
-}
-.ant-upload-list-picture-card .ant-upload-list-item{
-  width: 90px;
-  height: 90px;
-}
-.ant-upload.ant-upload-select-picture-card{
-  width: 90px;
-  height: 90px;
-}
-</style>
diff --git a/src/components/Menu/SideMenu.vue b/src/components/Menu/SideMenu.vue
deleted file mode 100644
index 62fb01d..0000000
--- a/src/components/Menu/SideMenu.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-  <a-layout-sider
-    :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="256px"
-    :collapsible="collapsible"
-    v-model="collapsed"
-    :trigger="null">
-    <logo />
-    <s-menu
-      :collapsed="collapsed"
-      :menu="menus"
-      :theme="theme"
-      :mode="mode"
-      @select="onSelect"
-      style="padding: 16px 0px;"></s-menu>
-  </a-layout-sider>
-
-</template>
-
-<script>
-import Logo from '@/components/tools/Logo'
-import SMenu from './index'
-import { mixin, mixinDevice } from '@/utils/mixin'
-
-export default {
-  name: 'SideMenu',
-  components: { Logo, SMenu },
-  mixins: [mixin, mixinDevice],
-  props: {
-    mode: {
-      type: String,
-      required: false,
-      default: 'inline'
-    },
-    theme: {
-      type: String,
-      required: false,
-      default: 'dark'
-    },
-    collapsible: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    collapsed: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    menus: {
-      type: Array,
-      required: true
-    }
-  },
-  methods: {
-    onSelect (obj) {
-      this.$emit('menuSelect', obj)
-    }
-  }
-}
-</script>
diff --git a/src/components/Menu/index.js b/src/components/Menu/index.js
deleted file mode 100644
index 4348509..0000000
--- a/src/components/Menu/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import SMenu from './menu'
-export default SMenu
diff --git a/src/components/Menu/menu.js b/src/components/Menu/menu.js
deleted file mode 100644
index 2b3f7a2..0000000
--- a/src/components/Menu/menu.js
+++ /dev/null
@@ -1,177 +0,0 @@
-import Menu from 'ant-design-vue/es/menu'
-import Icon from 'ant-design-vue/es/icon'
-
-export default {
-  name: 'SMenu',
-  props: {
-    menu: {
-      type: Array,
-      required: true
-    },
-    theme: {
-      type: String,
-      required: false,
-      default: 'dark'
-    },
-    mode: {
-      type: String,
-      required: false,
-      default: 'inline'
-    },
-    collapsed: {
-      type: Boolean,
-      required: false,
-      default: false
-    }
-  },
-  data () {
-    return {
-      openKeys: [],
-      selectedKeys: [],
-      cachedOpenKeys: []
-    }
-  },
-  computed: {
-    rootSubmenuKeys: vm => {
-      const keys = []
-      vm.menu.forEach(item => keys.push(item.path))
-      return keys
-    }
-  },
-  mounted () {
-    this.updateMenu()
-  },
-  watch: {
-    collapsed (val) {
-      if (val) {
-        this.cachedOpenKeys = this.openKeys.concat()
-        this.openKeys = []
-      } else {
-        this.openKeys = this.cachedOpenKeys
-      }
-    },
-    $route: function () {
-      this.updateMenu()
-    }
-  },
-  methods: {
-    // select menu item
-    onOpenChange (openKeys) {
-      // 在水平模式下时执行，并且不再执行后续
-      if (this.mode === 'horizontal') {
-        this.openKeys = openKeys
-        return
-      }
-      // 非水平模式时
-      const latestOpenKey = openKeys.find(key => !this.openKeys.includes(key))
-      if (!this.rootSubmenuKeys.includes(latestOpenKey)) {
-        this.openKeys = openKeys
-      } else {
-        this.openKeys = latestOpenKey ? [latestOpenKey] : []
-      }
-    },
-    onSelect ({ item, key, selectedKeys }) {
-      this.selectedKeys = selectedKeys
-      this.$emit('select', { item, key, selectedKeys })
-    },
-    updateMenu () {
-      const routes = this.$route.matched.concat()
-      const { hidden } = this.$route.meta
-      if (routes.length >= 3 && hidden) {
-        routes.pop()
-        this.selectedKeys = [routes[routes.length - 1].path]
-      } else {
-        this.selectedKeys = [routes.pop().path]
-      }
-      const openKeys = []
-      if (this.mode === 'inline') {
-        routes.forEach(item => {
-          openKeys.push(item.path)
-        })
-      }
-
-      this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys)
-    },
-
-    // render
-    renderItem (menu) {
-      if (!menu.hidden) {
-        return menu.children && !menu.hideChildrenInMenu ? this.renderSubMenu(menu) : this.renderMenuItem(menu)
-      }
-      return null
-    },
-    renderMenuItem (menu) {
-      const target = menu.meta.target || null
-      const CustomTag = target && 'a' || 'router-link'
-      const props = { to: { name: menu.name } }
-      const attrs = { href: menu.path, target: menu.meta.target }
-
-      if (menu.children && menu.hideChildrenInMenu) {
-        // 把有子菜单的 并且 父菜单是要隐藏子菜单的
-        // 都给子菜单增加一个 hidden 属性
-        // 用来给刷新页面时， selectedKeys 做控制用
-        menu.children.forEach(item => {
-          item.meta = Object.assign(item.meta, { hidden: true })
-        })
-      }
-
-      return (
-        <Menu.Item {...{ key: menu.path }}>
-          <CustomTag {...{ props, attrs }}>
-            {this.renderIcon(menu.meta.icon)}
-            <span>{menu.meta.title}</span>
-          </CustomTag>
-        </Menu.Item>
-      )
-    },
-    renderSubMenu (menu) {
-      const itemArr = []
-      if (!menu.hideChildrenInMenu) {
-        menu.children.forEach(item => itemArr.push(this.renderItem(item)))
-      }
-      return (
-        <Menu.SubMenu {...{ key: menu.path }}>
-          <span slot="title">
-            {this.renderIcon(menu.meta.icon)}
-            <span>{menu.meta.title}</span>
-          </span>
-          {itemArr}
-        </Menu.SubMenu>
-      )
-    },
-    renderIcon (icon) {
-      if (icon === 'none' || icon === undefined) {
-        return null
-      }
-      const props = {}
-      typeof (icon) === 'object' ? props.component = icon : props.type = icon
-      return (
-        <Icon {... { props } }/>
-      )
-    }
-  },
-
-  render () {
-    const dynamicProps = {
-      props: {
-        mode: this.mode,
-        theme: this.theme,
-        openKeys: this.openKeys,
-        selectedKeys: this.selectedKeys
-      },
-      on: {
-        openChange: this.onOpenChange,
-        select: this.onSelect
-      }
-    }
-
-    const menuTree = this.menu.map(item => {
-      if (item.hidden) {
-        return null
-      }
-      return this.renderItem(item)
-    })
-
-    return (<Menu {...dynamicProps}>{menuTree}</Menu>)
-  }
-}
diff --git a/src/components/Menu/menu.render.js b/src/components/Menu/menu.render.js
deleted file mode 100644
index 011639f..0000000
--- a/src/components/Menu/menu.render.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import Menu from 'ant-design-vue/es/menu'
-import Icon from 'ant-design-vue/es/icon'
-
-const { Item, SubMenu } = Menu
-
-export default {
-  name: 'SMenu',
-  props: {
-    menu: {
-      type: Array,
-      required: true
-    },
-    theme: {
-      type: String,
-      required: false,
-      default: 'dark'
-    },
-    mode: {
-      type: String,
-      required: false,
-      default: 'inline'
-    },
-    collapsed: {
-      type: Boolean,
-      required: false,
-      default: false
-    }
-  },
-  data () {
-    return {
-      openKeys: [],
-      selectedKeys: [],
-      cachedOpenKeys: []
-    }
-  },
-  computed: {
-    rootSubmenuKeys: vm => {
-      const keys = []
-      vm.menu.forEach(item => keys.push(item.path))
-      return keys
-    }
-  },
-  created () {
-    this.updateMenu()
-  },
-  watch: {
-    collapsed (val) {
-      if (val) {
-        this.cachedOpenKeys = this.openKeys.concat()
-        this.openKeys = []
-      } else {
-        this.openKeys = this.cachedOpenKeys
-      }
-    },
-    $route: function () {
-      this.updateMenu()
-    }
-  },
-  methods: {
-    renderIcon: function (h, icon) {
-      if (icon === 'none' || icon === undefined) {
-        return null
-      }
-      const props = {}
-      typeof (icon) === 'object' ? props.component = icon : props.type = icon
-      return h(Icon, { props: { ...props } })
-    },
-    renderMenuItem: function (h, menu, pIndex, index) {
-      const target = menu.meta.target || null
-      return h(Item, { key: menu.path ? menu.path : 'item_' + pIndex + '_' + index }, [
-        h('router-link', { attrs: { to: { name: menu.name }, target: target } }, [
-          this.renderIcon(h, menu.meta.icon),
-          h('span', [menu.meta.title])
-        ])
-      ])
-    },
-    renderSubMenu: function (h, menu, pIndex, index) {
-      const this2_ = this
-      const subItem = [h('span', { slot: 'title' }, [this.renderIcon(h, menu.meta.icon), h('span', [menu.meta.title])])]
-      const itemArr = []
-      const pIndex_ = pIndex + '_' + index
-      console.log('menu', menu)
-      if (!menu.hideChildrenInMenu) {
-        menu.children.forEach(function (item, i) {
-          itemArr.push(this2_.renderItem(h, item, pIndex_, i))
-        })
-      }
-      return h(SubMenu, { key: menu.path ? menu.path : 'submenu_' + pIndex + '_' + index }, subItem.concat(itemArr))
-    },
-    renderItem: function (h, menu, pIndex, index) {
-      if (!menu.hidden) {
-        return menu.children && !menu.hideChildrenInMenu
-          ? this.renderSubMenu(h, menu, pIndex, index)
-          : this.renderMenuItem(h, menu, pIndex, index)
-      }
-    },
-    renderMenu: function (h, menuTree) {
-      const this2_ = this
-      const menuArr = []
-      menuTree.forEach(function (menu, i) {
-        if (!menu.hidden) {
-          menuArr.push(this2_.renderItem(h, menu, '0', i))
-        }
-      })
-      return menuArr
-    },
-    onOpenChange (openKeys) {
-      const latestOpenKey = openKeys.find(key => !this.openKeys.includes(key))
-      if (!this.rootSubmenuKeys.includes(latestOpenKey)) {
-        this.openKeys = openKeys
-      } else {
-        this.openKeys = latestOpenKey ? [latestOpenKey] : []
-      }
-    },
-    updateMenu () {
-      const routes = this.$route.matched.concat()
-
-      if (routes.length >= 4 && this.$route.meta.hidden) {
-        routes.pop()
-        this.selectedKeys = [routes[2].path]
-      } else {
-        this.selectedKeys = [routes.pop().path]
-      }
-
-      const openKeys = []
-      if (this.mode === 'inline') {
-        routes.forEach(item => {
-          openKeys.push(item.path)
-        })
-      }
-
-      this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys)
-    }
-  },
-  render (h) {
-    return h(
-      Menu,
-      {
-        props: {
-          theme: this.$props.theme,
-          mode: this.$props.mode,
-          openKeys: this.openKeys,
-          selectedKeys: this.selectedKeys
-        },
-        on: {
-          openChange: this.onOpenChange,
-          select: obj => {
-            this.selectedKeys = obj.selectedKeys
-            this.$emit('select', obj)
-          }
-        }
-      },
-      this.renderMenu(h, this.menu)
-    )
-  }
-}
diff --git a/src/components/PageHeader/PageHeader.vue b/src/components/PageHeader/PageHeader.vue
deleted file mode 100644
index 80e686e..0000000
--- a/src/components/PageHeader/PageHeader.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-  <div class="page-header">
-    <div class="page-header-index-wide">
-      <s-breadcrumb />
-      <div class="detail">
-        <div class="main" v-if="!$route.meta.hiddenHeaderContent">
-          <div class="row">
-            <img v-if="logo" :src="logo" class="logo"/>
-            <h1 v-if="title" class="title">{{ title }}</h1>
-            <div class="action">
-              <slot name="action"></slot>
-            </div>
-          </div>
-          <div class="row">
-            <div v-if="avatar" class="avatar">
-              <a-avatar :src="avatar" />
-            </div>
-            <div v-if="this.$slots.content" class="headerContent">
-              <slot name="content"></slot>
-            </div>
-            <div v-if="this.$slots.extra" class="extra">
-              <slot name="extra"></slot>
-            </div>
-          </div>
-          <div>
-            <slot name="pageMenu"></slot>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Breadcrumb from '@/components/tools/Breadcrumb'
-
-export default {
-  name: 'PageHeader',
-  components: {
-    's-breadcrumb': Breadcrumb
-  },
-  props: {
-    title: {
-      type: [String, Boolean],
-      default: true,
-      required: false
-    },
-    logo: {
-      type: String,
-      default: '',
-      required: false
-    },
-    avatar: {
-      type: String,
-      default: '',
-      required: false
-    }
-  },
-  data () {
-    return {}
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.page-header {
-  background: #fff;
-  padding: 16px 32px 0;
-  border-bottom: 1px solid #e8e8e8;
-
-  .breadcrumb {
-    margin-bottom: 16px;
-  }
-
-  .detail {
-    display: flex;
-    /*margin-bottom: 16px;*/
-
-    .avatar {
-      flex: 0 1 72px;
-      margin: 0 24px 8px 0;
-
-      & > span {
-        border-radius: 72px;
-        display: block;
-        width: 72px;
-        height: 72px;
-      }
-    }
-
-    .main {
-      width: 100%;
-      flex: 0 1 auto;
-
-      .row {
-        display: flex;
-        width: 100%;
-
-        .avatar {
-          margin-bottom: 16px;
-        }
-      }
-
-      .title {
-        font-size: 20px;
-        font-weight: 500;
-
-        font-size: 20px;
-        line-height: 28px;
-        font-weight: 500;
-        color: rgba(0, 0, 0, 0.85);
-        margin-bottom: 16px;
-        flex: auto;
-      }
-      .logo {
-        width: 28px;
-        height: 28px;
-        border-radius: 4px;
-        margin-right: 16px;
-      }
-      .content,
-      .headerContent {
-        flex: auto;
-        color: rgba(0, 0, 0, 0.45);
-        line-height: 22px;
-
-        .link {
-          margin-top: 16px;
-          line-height: 24px;
-
-          a {
-            font-size: 14px;
-            margin-right: 32px;
-          }
-        }
-      }
-      .extra {
-        flex: 0 1 auto;
-        margin-left: 88px;
-        min-width: 242px;
-        text-align: right;
-      }
-      .action {
-        margin-left: 56px;
-        min-width: 266px;
-        flex: 0 1 auto;
-        text-align: right;
-        &:empty {
-          display: none;
-        }
-      }
-    }
-  }
-}
-
-.mobile .page-header {
-  .main {
-    .row {
-      flex-wrap: wrap;
-
-      .avatar {
-        flex: 0 1 25%;
-        margin: 0 2% 8px 0;
-      }
-
-      .content,
-      .headerContent {
-        flex: 0 1 70%;
-
-        .link {
-          margin-top: 16px;
-          line-height: 24px;
-
-          a {
-            font-size: 14px;
-            margin-right: 10px;
-          }
-        }
-      }
-
-      .extra {
-        flex: 1 1 auto;
-        margin-left: 0;
-        min-width: 0;
-        text-align: right;
-      }
-
-      .action {
-        margin-left: unset;
-        min-width: 266px;
-        flex: 0 1 auto;
-        text-align: left;
-        margin-bottom: 12px;
-
-        &:empty {
-          display: none;
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/PageHeader/index.js b/src/components/PageHeader/index.js
deleted file mode 100644
index ec1078c..0000000
--- a/src/components/PageHeader/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import PageHeader from './PageHeader'
-export default PageHeader
diff --git a/src/components/PasswordForm/index.vue b/src/components/PasswordForm/index.vue
deleted file mode 100644
index d82e8e2..0000000
--- a/src/components/PasswordForm/index.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <a-drawer :visible="visible" title="修改密码" :width="720" @close="onCancel">
-    <a-form-model ref="ruleForm" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-row>
-        <a-col :span="24">
-          <a-form-model-item has-feedback label="密码" prop="pass">
-            <a-input v-model="form.pass" type="password" autocomplete="off" />
-          </a-form-model-item>
-        </a-col>
-      </a-row>
-      <a-row>
-        <a-col :span="24">
-          <a-form-model-item has-feedback label="确认密码" prop="checkPass">
-            <a-input v-model="form.checkPass" type="password" autocomplete="off" />
-          </a-form-model-item>
-        </a-col>
-      </a-row>
-    </a-form-model>
-    <div class="draw-button-container align-center">
-      <a-button @click="onCancel">取消</a-button>
-      <a-button type="primary" @click="onSubmit" :loading="loading">保存</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-import { userPasswordSetById } from '@/api/security/user'
-
-export default {
-  name: 'PasswordForm',
-  data () {
-    const validatePass = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入密码'))
-      } else {
-        if (this.form.checkPass !== '') {
-          this.$refs.ruleForm.validateField('checkPass')
-        }
-        callback()
-      }
-    }
-    const validatePass2 = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请确认密码'))
-      } else if (value !== this.form.pass) {
-        callback(new Error('两次密码不匹配'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      visible: false,
-      labelCol: { span: 4 },
-      wrapperCol: { span: 16 },
-      form: {
-        pass: '',
-        checkPass: ''
-      },
-      rules: {
-        pass: [{ validator: validatePass, trigger: 'change' }],
-        checkPass: [{ validator: validatePass2, trigger: 'change' }]
-      },
-      loading: false,
-      userId: null
-    }
-  },
-  methods: {
-    show (id) {
-      this.userId = id
-      this.visible = true
-    },
-    onSubmit (e) {
-      if (this.loading) {
-        return false
-      }
-      this.loading = true
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          userPasswordSetById({
-            newPassword: this.form.pass,
-            userId: this.userId
-          }).then(data => {
-            this.onCancel()
-          }).finally(() => {
-            this.loading = false
-          })
-        } else {
-          this.loading = false
-          return false
-        }
-      })
-    },
-    onCancel () {
-      this.$refs.ruleForm.resetFields()
-      this.visible = false
-    },
-    onReset () {
-      this.$refs.ruleForm.resetFields()
-    }
-  }
-}
-</script>
diff --git a/src/components/Result/Result.vue b/src/components/Result/Result.vue
deleted file mode 100644
index 99f7f19..0000000
--- a/src/components/Result/Result.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <div class="result">
-    <div>
-      <a-icon :class="{ 'icon': true, [`${type}`]: true }" :type="localIsSuccess ? 'check-circle' : 'close-circle'"/>
-    </div>
-    <div class="title">
-      <slot name="title">
-        {{ title }}
-      </slot>
-    </div>
-    <div class="description">
-      <slot name="description">
-        {{ description }}
-      </slot>
-    </div>
-    <div class="extra" v-if="$slots.default">
-      <slot></slot>
-    </div>
-    <div class="action" v-if="$slots.action">
-      <slot name="action"></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-const resultEnum = ['success', 'error']
-
-export default {
-  name: 'Result',
-  props: {
-    /** @Deprecated */
-    isSuccess: {
-      type: Boolean,
-      default: false
-    },
-    type: {
-      type: String,
-      default: resultEnum[0],
-      validator (val) {
-        return (val) => resultEnum.includes(val)
-      }
-    },
-    title: {
-      type: String,
-      default: ''
-    },
-    description: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    localIsSuccess: function () {
-      return this.type === resultEnum[0]
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .result {
-    text-align: center;
-    width: 72%;
-    margin: 0 auto;
-    padding: 24px 0 8px;
-
-    .icon {
-      font-size: 72px;
-      line-height: 72px;
-      margin-bottom: 24px;
-    }
-    .success {
-      color: #52c41a;
-    }
-    .error {
-      color: red;
-    }
-    .title {
-      font-size: 24px;
-      color: rgba(0, 0, 0, .85);
-      font-weight: 500;
-      line-height: 32px;
-      margin-bottom: 16px;
-    }
-    .description {
-      font-size: 14px;
-      line-height: 22px;
-      color: rgba(0, 0, 0, 0.45);
-      margin-bottom: 24px;
-    }
-    .extra {
-      background: #fafafa;
-      padding: 24px 40px;
-      border-radius: 2px;
-      text-align: left;
-    }
-    .action {
-      margin-top: 32px;
-    }
-  }
-
-  .mobile {
-    .result {
-      width: 100%;
-      margin: 0 auto;
-      padding: unset;
-    }
-  }
-</style>
diff --git a/src/components/Result/index.js b/src/components/Result/index.js
deleted file mode 100644
index 51cb3b2..0000000
--- a/src/components/Result/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Result from './Result.vue'
-export default Result
diff --git a/src/components/SelectLang/index.jsx b/src/components/SelectLang/index.jsx
index 6115d8d..b587427 100644
--- a/src/components/SelectLang/index.jsx
+++ b/src/components/SelectLang/index.jsx
@@ -4,15 +4,19 @@ import { Icon, Menu, Dropdown } from 'ant-design-vue'
 import { i18nRender } from '@/locales'
 import i18nMixin from '@/store/i18n-mixin'
 
-const locales = ['zh-CN', 'en-US']
+const locales = ['zh-CN', 'zh-TW', 'en-US', 'pt-BR']
 const languageLabels = {
   'zh-CN': '简体中文',
-  'en-US': 'English'
+  'zh-TW': '繁体中文',
+  'en-US': 'English',
+  'pt-BR': 'Português'
 }
 // eslint-disable-next-line
 const languageIcons = {
   'zh-CN': '🇨🇳',
-  'en-US': '🇺🇸'
+  'zh-TW': '🇭🇰',
+  'en-US': '🇺🇸',
+  'pt-BR': '🇧🇷'
 }
 
 const SelectLang = {
diff --git a/src/components/SettingDrawer/SettingDrawer.vue b/src/components/SettingDrawer/SettingDrawer.vue
index 9b2c83f..a21e96c 100644
--- a/src/components/SettingDrawer/SettingDrawer.vue
+++ b/src/components/SettingDrawer/SettingDrawer.vue
@@ -176,7 +176,6 @@ import config from '@/config/defaultSettings'
 import { updateTheme, updateColorWeak, colorList } from './settingConfig'
 
 export default {
-  name: 'SettingDrawer',
   components: {
     SettingItem
   },
@@ -270,17 +269,22 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
   .setting-drawer-index-content {
+
     .setting-drawer-index-blockChecbox {
       display: flex;
+
       .setting-drawer-index-item {
         margin-right: 16px;
         position: relative;
         border-radius: 4px;
         cursor: pointer;
+
         img {
           width: 48px;
         }
+
         .setting-drawer-index-selectIcon {
           position: absolute;
           top: 0;
@@ -307,11 +311,13 @@ export default {
       text-align: center;
       color: #fff;
       font-weight: 700;
+
       i {
         font-size: 14px;
       }
     }
   }
+
   .setting-drawer-index-handle {
     position: absolute;
     top: 240px;
@@ -328,6 +334,7 @@ export default {
     text-align: center;
     font-size: 16px;
     border-radius: 4px 0 0 4px;
+
     i {
       color: rgb(255, 255, 255);
       font-size: 20px;
diff --git a/src/components/SettingDrawer/settingConfig.js b/src/components/SettingDrawer/settingConfig.js
index f724adb..2cfab79 100644
--- a/src/components/SettingDrawer/settingConfig.js
+++ b/src/components/SettingDrawer/settingConfig.js
@@ -31,7 +31,6 @@ const colorList = [
 ]
 
 const updateTheme = newPrimaryColor => {
-  console.log('正在切换主题！')
   const hideMessage = message.loading('正在切换主题！', 0)
   themeColor.changeColor(newPrimaryColor).finally(() => {
     setTimeout(() => {
diff --git a/src/components/SettingDrawer/themeColor.js b/src/components/SettingDrawer/themeColor.js
index 9502f0f..10dfbd4 100644
--- a/src/components/SettingDrawer/themeColor.js
+++ b/src/components/SettingDrawer/themeColor.js
@@ -16,8 +16,7 @@ export default {
     var options = {
       newColors: this.getAntdSerials(newColor), // new colors array, one-to-one corresponde with `matchColors`
       changeUrl (cssUrl) {
-        console.log('cssUrl', process.env.VUE_APP_PUBLIC_PATH + `/${cssUrl}`)
-        return process.env.VUE_APP_PUBLIC_PATH + `/${cssUrl}` // while router is not `hash` mode, it needs absolute path
+        return `/${cssUrl}` // while router is not `hash` mode, it needs absolute path
       }
     }
     return client.changer.changeColor(options, Promise)
diff --git a/src/components/Table/index.js b/src/components/Table/index.js
index b80e634..3e7f68c 100644
--- a/src/components/Table/index.js
+++ b/src/components/Table/index.js
@@ -9,10 +9,7 @@ export default {
       selectedRowKeys: [],
       localLoading: false,
       localDataSource: [],
-      localPagination: Object.assign({
-        showQuickJumper: true,
-        showTotal: total => `共 ${total} 条`
-      }, this.pagination)
+      localPagination: Object.assign({}, this.pagination)
     }
   },
   props: Object.assign({}, T.props, {
@@ -40,6 +37,12 @@ export default {
       type: String,
       default: 'default'
     },
+    /**
+     * alert: {
+     *   show: true,
+     *   clear: Function
+     * }
+     */
     alert: {
       type: [Object, Boolean],
       default: null
@@ -57,6 +60,15 @@ export default {
       type: String | Boolean,
       default: 'auto'
     },
+    /**
+     * enable page URI mode
+     *
+     * e.g:
+     * /users/1
+     * /users/2
+     * /users/3?queryParam=test
+     * ...
+     */
     pageURI: {
       type: Boolean,
       default: false
@@ -71,6 +83,7 @@ export default {
           pageNo: val
         })
       })
+      // change pagination, reset total data
       this.needTotalList = this.initTotalList(this.columns)
       this.selectedRowKeys = []
       this.selectedRows = []
@@ -143,21 +156,29 @@ export default {
       if ((typeof result === 'object' || typeof result === 'function') && typeof result.then === 'function') {
         result.then(r => {
           this.localPagination = this.showPagination && Object.assign({}, this.localPagination, {
-            current: this.pageSize, // 返回结果中的当前分页数
-            total: r.total, // 返回结果中的总记录数
+            current: r.pageNo, // 返回结果中的当前分页数
+            total: r.entityCount, // 返回结果中的总记录数
             showSizeChanger: this.showSizeChanger,
             pageSize: (pagination && pagination.pageSize) ||
               this.localPagination.pageSize
           }) || false
           // 为防止删除数据后导致页面当前页面数据长度为 0 ,自动翻页到上一页
-          if (r.rows.length === 0 && this.showPagination && this.localPagination.current > 1) {
+          if (r.entities.length === 0 && this.showPagination && this.localPagination.current > 1) {
             this.localPagination.current--
             this.loadData()
             return
           }
-          this.localDataSource = r.rows // 返回结果中的数组数据
-          this.localLoading = false
-        }, () => {
+
+          // 这里用于判断接口是否有返回 r.totalCount 且 this.showPagination = true 且 pageNo 和 pageSize 存在 且 totalCount 小于等于 pageNo * pageSize 的大小
+          // 当情况满足时，表示数据不满足分页大小，关闭 table 分页功能
+          // try {
+          //   if ((['auto', true].includes(this.showPagination) && r.entityCount <= (r.pageNo * this.localPagination.pageSize))) {
+          //     this.localPagination.hideOnSinglePage = true
+          //   }
+          // } catch (e) {
+          //   this.localPagination = false
+          // }
+          this.localDataSource = r.entities // 返回结果中的数组数据
           this.localLoading = false
         })
       }
diff --git a/src/components/global.less b/src/components/global.less
deleted file mode 100644
index 56a3a5b..0000000
--- a/src/components/global.less
+++ /dev/null
@@ -1,515 +0,0 @@
-@import './index.less';
-
-body {
-
-
-}
-
-#app {
-  height: 100%;
-
-  &.colorWeak {
-    filter: invert(80%);
-  }
-  &.userLayout {
-    overflow: auto;
-  }
-}
-
-.layout.ant-layout {
-  height: auto;
-  overflow-x: hidden;
-
-  &.mobile,
-  &.tablet {
-    .ant-layout-content {
-      .content {
-        margin: 24px 0 0;
-      }
-    }
-
-    /**
-     * ant-table-wrapper
-     * 覆盖的表格手机模式样式，如果想修改在手机上表格最低宽度，可以在这里改动
-     */
-    .ant-table-wrapper {
-      .ant-table-content {
-        overflow-y: auto;
-      }
-      .ant-table-body {
-        min-width: 800px;
-      }
-    }
-    .topmenu {
-      /* 必须为 topmenu  才能启用流式布局 */
-      &.content-width-Fluid {
-        .header-index-wide {
-          margin-left: 0;
-        }
-      }
-    }
-  }
-
-  &.mobile {
-    .sidemenu {
-      .ant-header-fixedHeader {
-        &.ant-header-side-opened,
-        &.ant-header-side-closed {
-          width: 100%;
-        }
-      }
-    }
-  }
-
-  &.ant-layout-has-sider {
-    flex-direction: row;
-  }
-
-  .trigger {
-    font-size: 20px;
-    line-height: 64px;
-    padding: 0 24px;
-    cursor: pointer;
-    transition: color 0.3s;
-    &:hover {
-      background: rgba(0, 0, 0, 0.025);
-    }
-  }
-
-  .topmenu {
-    .ant-header-fixedHeader {
-      position: fixed;
-      top: 0;
-      right: 0;
-      z-index: 9;
-      width: 100%;
-      transition: width 0.2s;
-
-      &.ant-header-side-opened {
-        width: 100%;
-      }
-
-      &.ant-header-side-closed {
-        width: 100%;
-      }
-    }
-    /* 必须为 topmenu  才能启用流式布局 */
-    &.content-width-Fluid {
-      .header-index-wide {
-        max-width: unset;
-        .header-index-left {
-          flex: 1 1 1000px;
-          .logo{
-            margin-left: 25px;
-          }
-          .ant-menu.ant-menu-horizontal{
-            max-width: calc(100vw - 190px - 238px - 25px);
-            flex: 1 1 calc(100vw - 190px - 238px - 25px);
-          }
-        }
-        .header-index-right{
-          margin-right:25px;
-        }
-      }
-
-      .page-header-index-wide {
-        max-width: unset;
-      }
-    }
-  }
-
-  .sidemenu {
-    .ant-header-fixedHeader {
-      position: fixed;
-      top: 0;
-      right: 0;
-      z-index: 9;
-      width: 100%;
-      transition: width 0.2s;
-
-      &.ant-header-side-opened {
-        width: calc(100% - 256px);
-      }
-
-      &.ant-header-side-closed {
-        width: calc(100% - 80px);
-      }
-    }
-  }
-
-  .header {
-    height: 64px;
-    padding: 0 12px 0 0;
-    background: #fff;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
-    position: relative;
-  }
-
-  .header,
-  .top-nav-header-index {
-    .user-wrapper {
-      float: right;
-      height: 100%;
-
-      .action {
-        cursor: pointer;
-        padding: 0 12px;
-        display: inline-block;
-        transition: all 0.3s;
-        height: 100%;
-        color: rgba(0, 0, 0, 0.65);
-
-        &:hover {
-          background: rgba(0, 0, 0, 0.025);
-        }
-
-        .avatar {
-          margin: 20px 8px 20px 0;
-          color: #1890ff;
-          background: hsla(0, 0%, 100%, 0.85);
-          vertical-align: middle;
-        }
-
-        .icon {
-          font-size: 16px;
-          padding: 4px;
-        }
-      }
-    }
-
-    &.dark {
-      .user-wrapper {
-        .action {
-          color: rgba(255, 255, 255, 0.85);
-          a {
-            color: rgba(255, 255, 255, 0.85);
-          }
-
-          &:hover {
-            background: rgba(255, 255, 255, 0.16);
-          }
-        }
-      }
-    }
-  }
-
-  &.mobile,
-  &.tablet {
-    .top-nav-header-index {
-      .header-index-wide {
-        .header-index-left {
-          .trigger {
-            color: rgba(255, 255, 255, 0.85);
-            padding: 0 12px;
-          }
-
-          .logo.top-nav-header {
-            flex: 0 0 56px;
-            text-align: center;
-            line-height: 58px;
-            h1 {
-              display: none;
-            }
-          }
-        }
-      }
-
-      &.light {
-        .header-index-wide {
-          .header-index-left {
-            .trigger {
-              color: rgba(0, 0, 0, 0.65);
-            }
-          }
-        }
-        //
-      }
-    }
-  }
-
-  &.tablet {
-    // overflow: hidden; text-overflow:ellipsis; white-space: nowrap;
-    .top-nav-header-index {
-      .header-index-wide {
-        .header-index-left {
-          .logo > a {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
-        }
-        .ant-menu.ant-menu-horizontal {
-          flex: 1 1 auto;
-          white-space: normal;
-        }
-      }
-    }
-  }
-
-  .top-nav-header-index {
-    box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
-    position: relative;
-    transition: background 0.3s, width 0.2s;
-
-    .header-index-wide {
-      max-width: 1200px;
-      margin: auto;
-      padding-left: 0;
-      display: flex;
-      height: 64px;
-
-      .ant-menu.ant-menu-horizontal {
-        max-width: 835px;
-        flex: 0 1 835px;
-        border: none;
-        height: 64px;
-        line-height: 64px;
-      }
-
-      .header-index-left {
-        flex: 0 1 1000px;
-        display: flex;
-
-        .logo.top-nav-header {
-          flex: 0 0 165px;
-          width: 165px;
-          height: 64px;
-          position: relative;
-          line-height: 64px;
-          transition: all 0.3s;
-          overflow: hidden;
-
-          img,
-          svg {
-            display: inline-block;
-            vertical-align: middle;
-            height: 32px;
-            width: 32px;
-          }
-
-          h1 {
-            color: #fff;
-            display: inline-block;
-            vertical-align: top;
-            font-size: 16px;
-            margin: 0 0 0 12px;
-            font-weight: 400;
-          }
-        }
-      }
-
-      .header-index-right {
-        flex: 0 0 238px;
-        align-self: flex-end;
-        height: 64px;
-        overflow: hidden;
-
-        .content-box {
-          float: right;
-          .action {
-            max-width: 140px;
-            overflow: hidden;
-            text-overflow:ellipsis;
-            white-space:nowrap;
-          }
-        }
-      }
-    }
-
-    &.light {
-      background-color: #fff;
-
-      .header-index-wide {
-        .header-index-left {
-          .logo {
-            h1 {
-              color: #002140;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // 内容区
-  .layout-content {
-    margin: 24px 24px 0px;
-    height: 100%;
-    height: 64px;
-    padding: 0 12px 0 0;
-  }
-
-  // footer
-  .ant-layout-footer {
-    padding: 0;
-  }
-}
-
-.topmenu {
-  .page-header-index-wide {
-    max-width: 1200px;
-    margin: 0 auto;
-  }
-}
-
-// drawer-sider 自定义
-.ant-drawer.drawer-sider {
-  .sider {
-    box-shadow: none;
-  }
-
-  &.dark {
-    .ant-drawer-content {
-      background-color: rgb(0, 21, 41);
-    }
-  }
-  &.light {
-    box-shadow: none;
-    .ant-drawer-content {
-      background-color: #fff;
-    }
-  }
-
-  .ant-drawer-body {
-    padding: 0;
-  }
-}
-
-// 菜单样式
-.sider {
-  box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
-  position: relative;
-  z-index: @ant-global-sider-zindex;
-  min-height: 100vh;
-
-  .ant-layout-sider-children {
-    overflow-y: hidden;
-
-    &:hover {
-      overflow-y: auto;
-    }
-  }
-
-  &.ant-fixed-sidemenu {
-    position: fixed;
-    height: 100%;
-  }
-
-  .logo {
-    position: relative;
-    height: 64px;
-    padding-left: 24px;
-    overflow: hidden;
-    line-height: 64px;
-    background: #002140;
-    transition: all .3s;
-
-    img,
-    svg,
-    h1 {
-      display: inline-block;
-      vertical-align: middle;
-    }
-
-    img,
-    svg {
-      height: 32px;
-      width: 32px;
-    }
-
-    h1 {
-      color: #fff;
-      font-size: 20px;
-      margin: 0 0 0 12px;
-      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-      font-weight: 600;
-      vertical-align: middle;
-    }
-  }
-
-  &.light {
-    background-color: #fff;
-    box-shadow: 2px 0px 8px 0px rgba(29, 35, 41, 0.05);
-
-    .logo {
-      background: #fff;
-      box-shadow: 1px 1px 0px 0px #e8e8e8;
-
-      h1 {
-        color: unset;
-      }
-    }
-
-    .ant-menu-light {
-      border-right-color: transparent;
-    }
-  }
-}
-
-// 外置的样式控制
-.user-dropdown-menu {
-  span {
-    user-select: none;
-  }
-}
-.user-dropdown-menu-wrapper.ant-dropdown-menu {
-  padding: 4px 0;
-
-  .ant-dropdown-menu-item {
-    width: 160px;
-  }
-
-  .ant-dropdown-menu-item > .anticon:first-child,
-  .ant-dropdown-menu-item > a > .anticon:first-child,
-  .ant-dropdown-menu-submenu-title > .anticon:first-child .ant-dropdown-menu-submenu-title > a > .anticon:first-child {
-    min-width: 12px;
-    margin-right: 8px;
-  }
-}
-
-// 数据列表 样式
-.table-alert {
-  margin-bottom: 16px;
-}
-
-.table-page-search-wrapper {
-  .ant-form-inline {
-    .ant-form-item {
-      display: flex;
-      margin-bottom: 24px;
-      margin-right: 0;
-
-      .ant-form-item-control-wrapper {
-        flex: 1 1;
-        display: inline-block;
-        vertical-align: middle;
-      }
-
-      > .ant-form-item-label {
-        line-height: 32px;
-        padding-right: 8px;
-        width: auto;
-      }
-      .ant-form-item-control {
-        height: 32px;
-        line-height: 32px;
-      }
-    }
-  }
-
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-  }
-}
-
-.content {
-  .table-operator {
-    margin-bottom: 18px;
-
-    button {
-      margin-right: 8px;
-    }
-  }
-}
diff --git a/src/components/index.js b/src/components/index.js
index 5d4d9d4..401ae0d 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -16,6 +16,7 @@ import AvatarList from '@/components/AvatarList'
 import Ellipsis from '@/components/Ellipsis'
 import FooterToolbar from '@/components/FooterToolbar'
 import NumberInfo from '@/components/NumberInfo'
+import Tree from '@/components/Tree/Tree'
 import Trend from '@/components/Trend'
 import STable from '@/components/Table'
 import MultiTab from '@/components/MultiTab'
@@ -23,8 +24,8 @@ import IconSelector from '@/components/IconSelector'
 import TagSelect from '@/components/TagSelect'
 import StandardFormRow from '@/components/StandardFormRow'
 import ArticleListContent from '@/components/ArticleListContent'
+
 import Dialog from '@/components/Dialog'
-import ImageUpload from '@/components/ImageUpload'
 
 export {
   AvatarList,
@@ -43,12 +44,13 @@ export {
   Ellipsis,
   FooterToolbar,
   NumberInfo,
+  Tree,
   STable,
   MultiTab,
   IconSelector,
   TagSelect,
   StandardFormRow,
   ArticleListContent,
-  Dialog,
-  ImageUpload
+
+  Dialog
 }
diff --git a/src/components/tools/Breadcrumb.vue b/src/components/tools/Breadcrumb.vue
deleted file mode 100644
index 5093112..0000000
--- a/src/components/tools/Breadcrumb.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <a-breadcrumb class="breadcrumb">
-    <a-breadcrumb-item v-for="(item, index) in breadList" :key="item.name">
-      <router-link
-        v-if="item.name != name && index != 1"
-        :to="{ path: item.path === '' ? '/' : item.path }"
-      >{{ item.meta.title }}</router-link>
-      <span v-else>{{ item.meta.title }}</span>
-    </a-breadcrumb-item>
-  </a-breadcrumb>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      name: '',
-      breadList: []
-    }
-  },
-  created () {
-    this.getBreadcrumb()
-  },
-  methods: {
-    getBreadcrumb () {
-      this.breadList = []
-      this.name = this.$route.name
-      this.$route.matched.forEach(item => {
-        this.breadList.push(item)
-      })
-    }
-  },
-  watch: {
-    $route () {
-      this.getBreadcrumb()
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/components/tools/DetailList.vue b/src/components/tools/DetailList.vue
deleted file mode 100644
index 6745a08..0000000
--- a/src/components/tools/DetailList.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-/* WARNING: 兼容老引入，请勿继续使用 */
-import DescriptionList from '@/components/DescriptionList'
-export default DescriptionList
-</script>
diff --git a/src/components/tools/LangSelect.vue b/src/components/tools/LangSelect.vue
deleted file mode 100644
index 283f356..0000000
--- a/src/components/tools/LangSelect.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <a-dropdown>
-    <span class="action global-lang">
-      <a-icon type="global" style="font-size: 16px"/>
-    </span>
-    <a-menu slot="overlay" style="width: 150px;" @click="SwitchLang">
-      <a-menu-item key="zh-CN">
-        <a rel="noopener noreferrer">
-          <span role="img" aria-label="简体中文">🇨🇳</span> 简体中文
-        </a>
-      </a-menu-item>
-      <a-menu-item key="zh-TW">
-        <a rel="noopener noreferrer">
-          <span role="img" aria-label="繁体中文">🇭🇰</span> 繁体中文
-        </a>
-      </a-menu-item>
-      <a-menu-item key="en-US">
-        <a rel="noopener noreferrer">
-          <span role="img" aria-label="English">🇬🇧</span> English
-        </a>
-      </a-menu-item>
-      <a-menu-item key="pt-BR">
-        <a rel="noopener noreferrer">
-          <span role="img" aria-label="Português">🇧🇷</span> Português
-        </a>
-      </a-menu-item>
-    </a-menu>
-  </a-dropdown>
-</template>
-
-<script>
-// import { mixin as langMixin } from '@/store/i18n-mixin'
-
-export default {
-  name: 'LangSelect',
-  // mixins: [langMixin],
-  data () {
-    return {}
-  },
-  methods: {
-    // SwitchLang (row) {
-    //   this.setLang(row.key)
-    // }
-  }
-}
-</script>
diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue
deleted file mode 100644
index 16d2090..0000000
--- a/src/components/tools/Logo.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <div class="logo">
-    <router-link :to="{name:'dashboard'}">
-      <LogoSvg alt="logo" />
-      <h1 v-if="showTitle">{{ title }}</h1>
-    </router-link>
-  </div>
-</template>
-
-<script>
-import LogoSvg from '@/assets/logo.svg?inline'
-
-export default {
-  name: 'Logo',
-  components: {
-    LogoSvg
-  },
-  props: {
-    title: {
-      type: String,
-      default: 'AntD',
-      required: false
-    },
-    showTitle: {
-      type: Boolean,
-      default: true,
-      required: false
-    }
-  }
-}
-</script>
diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
deleted file mode 100644
index ac867cd..0000000
--- a/src/components/tools/UserMenu.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <div class="user-wrapper">
-    <div class="content-box">
-      <a href="https://pro.loacg.com/docs/getting-started" target="_blank">
-        <span class="action">
-          <a-icon type="question-circle-o"></a-icon>
-        </span>
-      </a>
-      <notice-icon class="action"/>
-      <a-dropdown>
-        <span class="action ant-dropdown-link user-dropdown-menu">
-          <a-avatar class="avatar" size="small" :src="avatar"/>
-          <span>{{ nickname }}</span>
-        </span>
-        <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-          <a-menu-item key="0">
-            <router-link :to="{ name: 'center' }">
-              <a-icon type="user"/>
-              <span>个人中心</span>
-            </router-link>
-          </a-menu-item>
-          <a-menu-item key="1">
-            <router-link :to="{ name: 'settings' }">
-              <a-icon type="setting"/>
-              <span>账户设置</span>
-            </router-link>
-          </a-menu-item>
-          <a-menu-item key="2" disabled>
-            <a-icon type="setting"/>
-            <span>测试</span>
-          </a-menu-item>
-          <a-menu-divider/>
-          <a-menu-item key="3">
-            <a href="javascript:;" @click="handleLogout">
-              <a-icon type="logout"/>
-              <span>退出登录</span>
-            </a>
-          </a-menu-item>
-        </a-menu>
-      </a-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import NoticeIcon from '@/components/NoticeIcon'
-import { mapActions, mapGetters } from 'vuex'
-
-export default {
-  name: 'UserMenu',
-  components: {
-    NoticeIcon
-  },
-  computed: {
-    ...mapGetters(['nickname', 'avatar'])
-  },
-  methods: {
-    ...mapActions(['Logout']),
-    handleLogout () {
-      this.$confirm({
-        title: '提示',
-        content: '真的要注销登录吗 ?',
-        onOk: () => {
-          return this.Logout({}).then(() => {
-            setTimeout(() => {
-              window.location.reload()
-            }, 16)
-          }).catch(err => {
-            this.$message.error({
-              title: '错误',
-              description: err.message
-            })
-          })
-        },
-        onCancel () {
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/components/tools/index.js b/src/components/tools/index.js
deleted file mode 100644
index e69de29..0000000
diff --git a/src/config/router.config.js b/src/config/router.config.js
index a59010a..6e96a91 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -31,56 +31,34 @@ export const asyncRouterMap = [
           }
         ]
       },
-      // brand
+      // 权限管理
       {
-        path: '/brand',
-        name: 'brand',
-        redirect: '/brand/list',
+        path: '/security',
+        name: 'security',
+        redirect: '/security/user',
         component: RouteView,
-        meta: { title: '基础配置', keepAlive: true, icon: bxAnaalyse, permission: [ 'brand' ] },
+        meta: { title: '系统设置', keepAlive: true, icon: bxAnaalyse, permission: [ 'security' ] },
         children: [
           {
-            path: '/brand/list',
-            name: 'BrandList',
-            component: () => import('@/views/brand/BrandList'),
-            meta: { title: '品牌管理', keepAlive: true, permission: [ 'brand' ] }
+            path: '/security/user',
+            name: 'SecurityUser',
+            component: () => import('@/views/security/user/UserList'),
+            meta: { title: '用户管理', keepAlive: true, permission: [ 'security' ] }
+          },
+          {
+            path: '/security/role',
+            name: 'SecurityRole',
+            component: () => import('@/views/security/role/RoleList'),
+            meta: { title: '角色管理', keepAlive: true }
+          },
+          {
+            path: '/security/resource',
+            name: 'SecurityResource',
+            component: () => import('@/views/security/resource/ResourceTree'),
+            meta: { title: '菜单管理', keepAlive: true }
           }
         ]
       },
-      // 权限管理
-      // {
-      //   path: '/security',
-      //   name: 'security',
-      //   redirect: '/security/user',
-      //   component: RouteView,
-      //   meta: { title: '系统设置', keepAlive: true, icon: bxAnaalyse, permission: [ 'security' ] },
-      //   children: [
-      //     {
-      //       path: '/security/user',
-      //       name: 'SecurityUser',
-      //       component: () => import('@/views/security/UserList'),
-      //       meta: { title: '用户管理', keepAlive: true, permission: [ 'security' ] }
-      //     },
-      //     {
-      //       path: '/security/role',
-      //       name: 'SecurityRole',
-      //       component: () => import('@/views/security/Role'),
-      //       meta: { title: '角色管理', keepAlive: true }
-      //     },
-      //     {
-      //       path: '/security/system',
-      //       name: 'SecuritySystem',
-      //       component: () => import('@/views/security/System'),
-      //       meta: { title: '系统角色管理', keepAlive: true }
-      //     },
-      //     {
-      //       path: '/security/list/permission',
-      //       name: 'SecurityPermission',
-      //       component: () => import('@/views/security/Permission'),
-      //       meta: { title: '权限列表', keepAlive: true }
-      //     }
-      //   ]
-      // },
       // forms
       {
         path: '/form',
@@ -88,12 +66,12 @@ export const asyncRouterMap = [
         component: RouteView,
         meta: { title: '表单页', icon: 'form', permission: [ 'form' ] },
         children: [
-          // {
-          //   path: '/form/base-form',
-          //   name: 'BaseForm',
-          //   component: () => import('@/views/form/basicForm/index'),
-          //   meta: { title: '基础表单', keepAlive: true, permission: [ 'form' ] }
-          // },
+          {
+            path: '/form/base-form',
+            name: 'BaseForm',
+            component: () => import('@/views/form/basicForm/Index'),
+            meta: { title: '基础表单', keepAlive: true, permission: [ 'form' ] }
+          },
           {
             path: '/form/step-form',
             name: 'StepForm',
@@ -173,12 +151,12 @@ export const asyncRouterMap = [
         redirect: '/profile/basic',
         meta: { title: '详情页', icon: 'profile', permission: [ 'profile' ] },
         children: [
-          // {
-          //   path: '/profile/basic',
-          //   name: 'ProfileBasic',
-          //   component: () => import('@/views/profile/basic/index'),
-          //   meta: { title: '基础详情页', permission: [ 'profile' ] }
-          // },
+          {
+            path: '/profile/basic',
+            name: 'ProfileBasic',
+            component: () => import('@/views/profile/basic/Index'),
+            meta: { title: '基础详情页', permission: [ 'profile' ] }
+          },
           {
             path: '/profile/advanced',
             name: 'ProfileAdvanced',
@@ -245,12 +223,12 @@ export const asyncRouterMap = [
         name: 'account',
         meta: { title: '个人页', icon: 'user', keepAlive: true, permission: [ 'user' ] },
         children: [
-          // {
-          //   path: '/account/center',
-          //   name: 'center',
-          //   component: () => import('@/views/account/center/Index'),
-          //   meta: { title: '个人中心', keepAlive: true, permission: [ 'user' ] }
-          // },
+          {
+            path: '/account/center',
+            name: 'center',
+            component: () => import('@/views/account/center/Index'),
+            meta: { title: '个人中心', keepAlive: true, permission: [ 'user' ] }
+          },
           {
             path: '/account/settings',
             name: 'settings',
@@ -373,7 +351,17 @@ export const constantRouterMap = [
       {
         path: 'login',
         name: 'login',
-        component: () => import('@/views/security/user/UserLogin')
+        component: () => import(/* webpackChunkName: "user" */ '@/views/user/Login')
+      },
+      {
+        path: 'register',
+        name: 'register',
+        component: () => import(/* webpackChunkName: "user" */ '@/views/user/Register')
+      },
+      {
+        path: 'register-result',
+        name: 'registerResult',
+        component: () => import(/* webpackChunkName: "user" */ '@/views/user/RegisterResult')
       },
       {
         path: 'recover',
@@ -382,20 +370,6 @@ export const constantRouterMap = [
       }
     ]
   },
-  {
-    path: '/brand',
-    component: BasicLayout,
-    redirect: '/brand/list',
-    meta: { title: '品牌管理' },
-    children: [
-      {
-        path: 'detail/:id',
-        name: 'BrandDetail',
-        component: () => import('@/views/brand/BrandDetail'),
-        meta: { title: '品牌详情', keepAlive: true, permission: [ 'brand' ] }
-      }
-    ]
-  },
   {
     path: '/404',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
diff --git a/src/core/bootstrap.js b/src/core/bootstrap.js
index d0a572a..6588bde 100644
--- a/src/core/bootstrap.js
+++ b/src/core/bootstrap.js
@@ -1,22 +1,20 @@
 import store from '@/store'
 import storage from 'store'
 import {
-  LOGIN_TOKEN,
-  USER_INFO,
+  ACCESS_TOKEN,
   APP_LANGUAGE,
   TOGGLE_CONTENT_WIDTH,
   TOGGLE_FIXED_HEADER,
-  TOGGLE_FIXED_SIDEBAR,
-  TOGGLE_HIDE_HEADER,
-  TOGGLE_LAYOUT,
-  TOGGLE_NAV_THEME,
-  TOGGLE_WEAK,
-  TOGGLE_COLOR,
-  TOGGLE_MULTI_TAB
+  TOGGLE_FIXED_SIDEBAR, TOGGLE_HIDE_HEADER,
+  TOGGLE_LAYOUT, TOGGLE_NAV_THEME, TOGGLE_WEAK,
+  TOGGLE_COLOR, TOGGLE_MULTI_TAB
 } from '@/store/mutation-types'
+// import { printANSI } from '@/utils/screenLog'
 import defaultSettings from '@/config/defaultSettings'
 
 export default function Initializer () {
+  // printANSI() // 请自行移除该行.  please remove this line
+
   store.commit(TOGGLE_LAYOUT, storage.get(TOGGLE_LAYOUT, defaultSettings.layout))
   store.commit(TOGGLE_FIXED_HEADER, storage.get(TOGGLE_FIXED_HEADER, defaultSettings.fixedHeader))
   store.commit(TOGGLE_FIXED_SIDEBAR, storage.get(TOGGLE_FIXED_SIDEBAR, defaultSettings.fixSiderbar))
@@ -26,7 +24,8 @@ export default function Initializer () {
   store.commit(TOGGLE_WEAK, storage.get(TOGGLE_WEAK, defaultSettings.colorWeak))
   store.commit(TOGGLE_COLOR, storage.get(TOGGLE_COLOR, defaultSettings.primaryColor))
   store.commit(TOGGLE_MULTI_TAB, storage.get(TOGGLE_MULTI_TAB, defaultSettings.multiTab))
-  store.commit('SET_LOGIN_TOKEN', storage.get(LOGIN_TOKEN))
-  store.commit('SET_USER_INFO', storage.get(USER_INFO))
+  store.commit('SET_TOKEN', storage.get(ACCESS_TOKEN))
+
   store.dispatch('setLang', storage.get(APP_LANGUAGE, 'en-US'))
+  // last step
 }
diff --git a/src/core/lazy_use.js b/src/core/lazy_use.js
index 6ef5725..c06e94a 100644
--- a/src/core/lazy_use.js
+++ b/src/core/lazy_use.js
@@ -19,6 +19,7 @@ import {
   Table,
   Tabs,
   Icon,
+  Badge,
   Popover,
   Dropdown,
   List,
@@ -34,17 +35,16 @@ import {
   Divider,
   DatePicker,
   TimePicker,
+  Upload,
   Progress,
+  Skeleton,
   Popconfirm,
   PageHeader,
   Result,
+  Statistic,
   Descriptions,
   message,
-  notification,
-  FormModel,
-  Tree,
-  TreeSelect,
-  Collapse
+  notification
 } from 'ant-design-vue'
 import Viser from 'viser-vue'
 
@@ -73,6 +73,7 @@ Vue.use(Modal)
 Vue.use(Table)
 Vue.use(Tabs)
 Vue.use(Icon)
+Vue.use(Badge)
 Vue.use(Popover)
 Vue.use(Dropdown)
 Vue.use(List)
@@ -88,15 +89,14 @@ Vue.use(Tag)
 Vue.use(Divider)
 Vue.use(DatePicker)
 Vue.use(TimePicker)
+Vue.use(Upload)
 Vue.use(Progress)
+Vue.use(Skeleton)
 Vue.use(Popconfirm)
 Vue.use(PageHeader)
 Vue.use(Result)
+Vue.use(Statistic)
 Vue.use(Descriptions)
-Vue.use(FormModel)
-Vue.use(Tree)
-Vue.use(TreeSelect)
-Vue.use(Collapse)
 
 Vue.prototype.$confirm = Modal.confirm
 Vue.prototype.$message = message
diff --git a/src/core/use.js b/src/core/use.js
index e5dc657..ba2eca2 100644
--- a/src/core/use.js
+++ b/src/core/use.js
@@ -7,21 +7,21 @@ import VueCropper from 'vue-cropper'
 import 'ant-design-vue/dist/antd.less'
 
 // ext library
-// import VueClipboard from 'vue-clipboard2'
-// import MultiTab from '@/components/MultiTab'
+import VueClipboard from 'vue-clipboard2'
+import MultiTab from '@/components/MultiTab'
 import PageLoading from '@/components/PageLoading'
-// import PermissionHelper from '@/utils/helper/permission'
+import PermissionHelper from '@/utils/helper/permission'
 // import '@/components/use'
-// import './directives/action'
+import './directives/action'
 
 VueClipboard.config.autoSetContainer = true
 
 Vue.use(Antd)
 Vue.use(Viser)
-// Vue.use(MultiTab)
+Vue.use(MultiTab)
 Vue.use(PageLoading)
-// Vue.use(VueClipboard)
-// Vue.use(PermissionHelper)
+Vue.use(VueClipboard)
+Vue.use(PermissionHelper)
 Vue.use(VueCropper)
 
 process.env.NODE_ENV !== 'production' && console.warn('[antd-pro] WARNING: Antd now use fulled imported.')
diff --git a/src/global.less b/src/global.less
index 8613467..8d3699f 100644
--- a/src/global.less
+++ b/src/global.less
@@ -33,9 +33,6 @@ ol {
 .ant-btn + .ant-btn {
   margin-left: 8px;
 }
-.ant-btn-right{
-  float: right;
-}
 // 数据列表 样式
 .table-alert {
   margin-bottom: 16px;
@@ -93,9 +90,6 @@ ol {
     }
   }
 }
-.ant-drawer-body{
-  padding-bottom: 53px;
-}
 .draw-button-container {
   position: absolute;
   right: 0;
@@ -104,7 +98,7 @@ ol {
   border-top: 1px solid #e9e9e9;
   padding: 10px 16px;
   background: #fff;
-  z-index: 1000;
+  z-index: 1;
   text-align: right;
   &.align-center {
     text-align: center;
diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index 67679aa..99d09f6 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -11,9 +11,11 @@
     :i18nRender="i18nRender"
     v-bind="settings"
   >
+    <!-- <setting-drawer :settings="settings" @change="handleSettingChange" /> -->
     <template v-slot:rightContentRender>
       <right-content :top-menu="settings.layout === 'topmenu'" :is-mobile="isMobile" :theme="settings.theme" />
     </template>
+    <!-- <multi-tab></multi-tab> -->
     <template v-slot:footerRender>
       <global-footer />
     </template>
@@ -22,20 +24,25 @@
 </template>
 
 <script>
+import { updateTheme } from '@ant-design-vue/pro-layout'
 import { i18nRender } from '@/locales'
 import { mapState } from 'vuex'
 import { SIDEBAR_TYPE, TOGGLE_MOBILE_TYPE } from '@/store/mutation-types'
+import { asyncRouterMap } from '@/config/router.config.js'
 
 import defaultSettings from '@/config/defaultSettings'
 import RightContent from '@/components/GlobalHeader/RightContent'
 import GlobalFooter from '@/components/GlobalFooter'
+import MultiTab from '@/components/MultiTab'
 import LogoSvg from '../assets/logo.svg?inline'
 
 export default {
   name: 'BasicLayout',
   components: {
+    // SettingDrawer,
     RightContent,
-    GlobalFooter
+    GlobalFooter,
+    MultiTab
   },
   data () {
     return {
@@ -56,11 +63,13 @@ export default {
         fixedHeader: defaultSettings.fixedHeader,
         fixSiderbar: defaultSettings.fixSiderbar,
         colorWeak: defaultSettings.colorWeak,
+
         hideHintAlert: false,
         hideCopyButton: false
       },
       // 媒体查询
       query: {},
+
       // 是否手机模式
       isMobile: false
     }
@@ -72,15 +81,16 @@ export default {
     })
   },
   created () {
-   const routes = this.mainMenu.find(item => item.path === '/')
-   this.menus = (routes && routes.children) || []
-   // 处理侧栏收起状态
-   this.$watch('collapsed', () => {
-     this.$store.commit(SIDEBAR_TYPE, this.collapsed)
-   })
-   this.$watch('isMobile', () => {
-     this.$store.commit(TOGGLE_MOBILE_TYPE, this.isMobile)
-   })
+    // const routes = this.mainMenu.find(item => item.path === '/')
+    // this.menus = (routes && routes.children) || []
+    this.menus = asyncRouterMap.find((item) => item.path === '/').children
+    // 处理侧栏收起状态
+    this.$watch('collapsed', () => {
+      this.$store.commit(SIDEBAR_TYPE, this.collapsed)
+    })
+    this.$watch('isMobile', () => {
+      this.$store.commit(TOGGLE_MOBILE_TYPE, this.isMobile)
+    })
   },
   mounted () {
     const userAgent = navigator.userAgent
@@ -92,6 +102,12 @@ export default {
         }, 16)
       })
     }
+
+    // first update color
+    // TIPS: THEME COLOR HANDLER!! PLEASE CHECK THAT!!
+    if (process.env.NODE_ENV !== 'production' || process.env.VUE_APP_PREVIEW === 'true') {
+      updateTheme(this.settings.primaryColor)
+    }
   },
   methods: {
     i18nRender,
@@ -111,6 +127,23 @@ export default {
     handleCollapse (val) {
       this.collapsed = val
     },
+    handleSettingChange ({ type, value }) {
+      console.log('type', type, value)
+      type && (this.settings[type] = value)
+      switch (type) {
+        case 'contentWidth':
+          this.settings[type] = value === 'Fixed'
+          break
+        case 'layout':
+          if (value === 'sidemenu') {
+            this.settings.contentWidth = false
+          } else {
+            this.settings.fixSiderbar = false
+            this.settings.contentWidth = true
+          }
+          break
+      }
+    },
     logoRender () {
       return <LogoSvg />
     }
diff --git a/src/layouts/UserLayout.vue b/src/layouts/UserLayout.vue
index 3f14791..99c836b 100644
--- a/src/layouts/UserLayout.vue
+++ b/src/layouts/UserLayout.vue
@@ -17,7 +17,7 @@
           <a href="_self">条款</a>
         </div>
         <div class="copyright">
-          Copyright &copy; 2021 DaoBang
+          Copyright &copy; 2021 YinMei
         </div>
       </div>
     </div>
diff --git a/src/main.js b/src/main.js
index d4b1854..326b0e6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,13 +9,17 @@ import store from './store/'
 import i18n from './locales'
 import { VueAxios } from './utils/request'
 import ProLayout, { PageHeaderWrapper } from '@ant-design-vue/pro-layout'
-// import themePluginConfig from '../config/themePluginConfig'
+import themePluginConfig from '../config/themePluginConfig'
 
 import bootstrap from './core/bootstrap'
 import './core/lazy_use'
-import './permission'
+// import './permission' // permission control
 import './utils/filter' // global filter
 import './global.less'
+import moment from 'moment'
+import { FormModel } from 'ant-design-vue'
+// import './mock'
+Vue.use(FormModel)
 
 Vue.config.productionTip = false
 
@@ -23,7 +27,7 @@ Vue.use(VueAxios)
 Vue.component('pro-layout', ProLayout)
 Vue.component('page-header-wrapper', PageHeaderWrapper)
 
-// window.umi_plugin_ant_themeVar = themePluginConfig.theme
+window.umi_plugin_ant_themeVar = themePluginConfig.theme
 
 new Vue({
   router,
@@ -32,3 +36,8 @@ new Vue({
   created: bootstrap,
   render: h => h(App)
 }).$mount('#app')
+
+Vue.filter('moment', (dataStr, pattern = 'YYYY-MM-DD HH:mm:ss') => {
+  if (!dataStr) return ''
+  return moment(dataStr).format(pattern)
+})
diff --git a/src/mock/services/manage.js b/src/mock/services/manage.js
index 10181ec..f570c21 100644
--- a/src/mock/services/manage.js
+++ b/src/mock/services/manage.js
@@ -7,11 +7,11 @@ const serverList = (options) => {
   const parameters = getQueryParameters(options)
 
   const result = []
-  const pageNo = parseInt(parameters.pageNo)
+  const pageIndex = parseInt(parameters.pageIndex)
   const pageSize = parseInt(parameters.pageSize)
   const totalPage = Math.ceil(totalCount / pageSize)
-  const key = (pageNo - 1) * pageSize
-  const next = (pageNo >= totalPage ? (totalCount % pageSize) : pageSize) + 1
+  const key = (pageIndex - 1) * pageSize
+  const next = (pageIndex >= totalPage ? (totalCount % pageSize) : pageSize) + 1
 
   for (let i = 1; i < next; i++) {
     const tmpKey = key + i
@@ -29,7 +29,7 @@ const serverList = (options) => {
 
   return builder({
     pageSize: pageSize,
-    pageNo: pageNo,
+    pageIndex: pageIndex,
     totalCount: totalCount,
     totalPage: totalPage,
     data: result
@@ -88,7 +88,7 @@ const projects = () => {
     }
     ],
     'pageSize': 10,
-    'pageNo': 0,
+    'pageIndex': 0,
     'totalPage': 6,
     'totalCount': 57
   })
diff --git a/src/mock/services/user.js b/src/mock/services/user.js
index 3c3ad1a..b0228ea 100644
--- a/src/mock/services/user.js
+++ b/src/mock/services/user.js
@@ -2,7 +2,6 @@ import Mock from 'mockjs2'
 import { builder } from '../util'
 
 const info = (options) => {
-  console.log('options', options)
   const userInfo = {
     'id': '4291d7da9005377ec9aec4a71ea837f',
     'name': '天野远子',
@@ -395,39 +394,6 @@ const userNav = (options) => {
       },
       'component': 'Workplace'
     },
-    {
-      'name': 'monitor',
-      'path': 'https://www.baidu.com/',
-      'parentId': 1,
-      'id': 3,
-      'meta': {
-        'title': '监控页（外部）',
-        'target': '_blank',
-        'show': true
-      }
-    },
-    {
-      'name': 'Analysis',
-      'parentId': 1,
-      'id': 2,
-      'meta': {
-        'title': '分析页',
-        'show': true
-      },
-      'component': 'Analysis',
-      'path': '/dashboard/analysis'
-    },
-    {
-      'name': 'tests',
-      'parentId': 1,
-      'id': 8,
-      'meta': {
-        'title': '测试功能',
-        'show': true
-      },
-      'component': 'TestWork'
-    },
-
     // form
     {
       'name': 'form',
diff --git a/src/permission.js b/src/permission.js
index eb2a0a7..04b8470 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,42 +3,67 @@ import store from './store'
 import storage from 'store'
 import NProgress from 'nprogress' // progress bar
 import '@/components/NProgress/nprogress.less' // progress bar custom style
+import notification from 'ant-design-vue/es/notification'
 import { setDocumentTitle, domTitle } from '@/utils/domUtil'
-import { LOGIN_TOKEN } from '@/store/mutation-types'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { i18nRender } from '@/locales'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['login'] // no redirect whitelist
+const whiteList = ['login', 'register', 'registerResult'] // no redirect whitelist
 const loginRoutePath = '/user/login'
 const defaultRoutePath = '/dashboard/workplace'
 
 router.beforeEach((to, from, next) => {
+  console.log("判断路由")
   NProgress.start() // start progress bar
   to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${i18nRender(to.meta.title)} - ${domTitle}`))
-  if (storage.get(LOGIN_TOKEN)) {
+  /* has token */
+  if (storage.get(ACCESS_TOKEN)) {
     if (to.path === loginRoutePath) {
       next({ path: defaultRoutePath })
       NProgress.done()
     } else {
-      if (store.getters.addRouters.length === 0) {
-        store.dispatch('GenerateRoutes').then(() => {
-          router.addRoutes(store.getters.addRouters)
-          const redirect = decodeURIComponent(from.query.redirect || to.path)
-          if (to.path === redirect) {
-            next({ ...to, replace: true })
-          } else {
-            next({ path: redirect })
-          }
-        }, () => {
-          NProgress.done()
-        })
+      // check login user.roles is null
+      if (store.getters.roles.length === 0) {
+        // request login userInfo
+        store
+          .dispatch('GetInfo')
+          .then(res => {
+            const roles = res.result && res.result.role
+            // generate dynamic router
+            store.dispatch('GenerateRoutes', { roles }).then(() => {
+              // 根据roles权限生成可访问的路由表
+              // 动态添加可访问路由表
+              router.addRoutes(store.getters.addRouters)
+              // 请求带有 redirect 重定向时，登录自动重定向到该地址
+              const redirect = decodeURIComponent(from.query.redirect || to.path)
+              if (to.path === redirect) {
+                // set the replace: true so the navigation will not leave a history record
+                next({ ...to, replace: true })
+              } else {
+                // 跳转到目的路由
+                next({ path: redirect })
+              }
+            })
+          })
+          .catch(() => {
+            notification.error({
+              message: '错误',
+              description: '请求用户信息失败，请重试'
+            })
+            // 失败时，获取用户信息失败时，调用登出，来清空历史保留信息
+            store.dispatch('Logout').then(() => {
+              next({ path: loginRoutePath, query: { redirect: to.fullPath } })
+            })
+          })
       } else {
         next()
       }
     }
   } else {
     if (whiteList.includes(to.name)) {
+      // 在免登录白名单，直接进入
       next()
     } else {
       next({ path: loginRoutePath, query: { redirect: to.fullPath } })
diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js
index 61d4987..4556aed 100644
--- a/src/router/generator-routers.js
+++ b/src/router/generator-routers.js
@@ -17,7 +17,7 @@ const constantRouterComponents = {
   // 你需要动态引入的页面组件
   'Workplace': () => import('@/views/dashboard/Workplace'),
   // form
-  // 'BasicForm': () => import('@/views/form/basicForm/Index'),
+  'BasicForm': () => import('@/views/form/basicForm/Index'),
   'StepForm': () => import('@/views/form/stepForm/StepForm'),
   'AdvanceForm': () => import('@/views/form/advancedForm/AdvancedForm'),
 
@@ -29,7 +29,7 @@ const constantRouterComponents = {
   'SearchArticles': () => import('@/views/list/search/Article'),
   'SearchProjects': () => import('@/views/list/search/Projects'),
   'SearchApplications': () => import('@/views/list/search/Applications'),
-  // 'ProfileBasic': () => import('@/views/profile/basic/Index'),
+  'ProfileBasic': () => import('@/views/profile/basic/Index'),
   'ProfileAdvanced': () => import('@/views/profile/advanced/Advanced'),
 
   // result
@@ -42,7 +42,7 @@ const constantRouterComponents = {
   'Exception500': () => import(/* webpackChunkName: "fail" */ '@/views/exception/500'),
 
   // account
-  // 'AccountCenter': () => import('@/views/account/center/Index'),
+  'AccountCenter': () => import('@/views/account/center/Index'),
   'AccountSettings': () => import('@/views/account/settings/Index'),
   'BaseSettings': () => import('@/views/account/settings/BaseSetting'),
   'SecuritySettings': () => import('@/views/account/settings/Security'),
diff --git a/src/store/app-mixin.js b/src/store/app-mixin.js
index 0a7dd1b..c910ae9 100644
--- a/src/store/app-mixin.js
+++ b/src/store/app-mixin.js
@@ -11,6 +11,7 @@ const baseMixin = {
       fixedSidebar: state => state.app.fixedSidebar,
       contentWidth: state => state.app.contentWidth,
       autoHideHeader: state => state.app.autoHideHeader,
+
       isMobile: state => state.app.isMobile,
       sideCollapsed: state => state.app.sideCollapsed,
       multiTab: state => state.app.multiTab
diff --git a/src/store/getters.js b/src/store/getters.js
index 28d18f2..5a5ad70 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -3,13 +3,12 @@ const getters = {
   lang: state => state.app.lang,
   theme: state => state.app.theme,
   color: state => state.app.color,
-  accessToken: state => state.accessToken.accessToken,
-  loginToken: state => state.user.loginToken,
+  token: state => state.user.token,
   avatar: state => state.user.avatar,
   nickname: state => state.user.name,
   welcome: state => state.user.welcome,
   roles: state => state.user.roles,
-  userInfo: state => state.user.userInfo,
+  userInfo: state => state.user.info,
   addRouters: state => state.permission.addRouters,
   multiTab: state => state.app.multiTab
 }
diff --git a/src/store/index.js b/src/store/index.js
index ff66385..687d21b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3,7 +3,11 @@ import Vuex from 'vuex'
 
 import app from './modules/app'
 import user from './modules/user'
-import accessToken from './modules/access-token'
+
+// default router permission control
+// import permission from './modules/permission'
+
+// dynamic router permission control (Experimental)
 import permission from './modules/async-router'
 import getters from './getters'
 
@@ -13,7 +17,6 @@ export default new Vuex.Store({
   modules: {
     app,
     user,
-    accessToken,
     permission
   },
   state: {
diff --git a/src/store/modules/access-token.js b/src/store/modules/access-token.js
deleted file mode 100644
index 05beb63..0000000
--- a/src/store/modules/access-token.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import storage from 'store'
-import { get } from '@/api/security/accessToken'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
-
-const accessToken = {
-  state: {
-    accessToken: ''
-  },
-  mutations: {
-    SET_ACCESS_TOKEN: (state, accessToken) => {
-      state.accessToken = accessToken
-    }
-  },
-  actions: {
-    GetAccessToken ({ commit }) {
-      return new Promise((resolve, reject) => {
-        get({
-          apiKey: process.env.VUE_APP_API_KEY,
-          apiSecret: process.env.VUE_APP_API_SECRET
-        }).then(response => {
-          const result = response.data
-          storage.set(ACCESS_TOKEN, result, 24 * 60 * 60 * 1000)
-          commit('SET_ACCESS_TOKEN', result)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-    InitAccessToken ({ commit }) {
-      const token = storage.get(ACCESS_TOKEN)
-      if (token) {
-        commit('SET_ACCESS_TOKEN', token)
-        return
-      }
-      return new Promise((resolve, reject) => {
-        get({
-          apiKey: process.env.VUE_APP_API_KEY,
-          apiSecret: process.env.VUE_APP_API_SECRET
-        }).then(response => {
-          const result = response.data
-          storage.set(ACCESS_TOKEN, result, 24 * 60 * 60 * 1000)
-          commit('SET_ACCESS_TOKEN', result)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    }
-  }
-}
-
-export default accessToken
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index a3ec761..6a0c6ef 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -29,7 +29,7 @@ const app = {
     color: '',
     weak: false,
     multiTab: true,
-    lang: 'zh-CN',
+    lang: 'en-US',
     _antLocale: {}
   },
   mutations: {
diff --git a/src/store/modules/async-router.js b/src/store/modules/async-router.js
index 61bfd61..014b323 100644
--- a/src/store/modules/async-router.js
+++ b/src/store/modules/async-router.js
@@ -6,8 +6,8 @@ import { generatorDynamicRouter } from '@/router/generator-routers'
 
 const permission = {
   state: {
-    addRouters: [],
-    routers: constantRouterMap
+    routers: constantRouterMap,
+    addRouters: []
   },
   mutations: {
     SET_ROUTERS: (state, routers) => {
@@ -16,13 +16,12 @@ const permission = {
     }
   },
   actions: {
-    GenerateRoutes ({ commit }) {
-      return new Promise((resolve, reject) => {
-        generatorDynamicRouter().then(routers => {
+    GenerateRoutes ({ commit }, data) {
+      return new Promise(resolve => {
+        const { token } = data
+        generatorDynamicRouter(token).then(routers => {
           commit('SET_ROUTERS', routers)
-          resolve(routers)
-        }, (error) => {
-          reject(error)
+          resolve()
         })
       })
     }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ff8d1a3..a3f5f0a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,49 +1,89 @@
 import storage from 'store'
-import { userLogin } from '@/api/security/user'
-import { LOGIN_TOKEN, USER_INFO } from '@/store/mutation-types'
+import { userLogin, getInfo } from '@/api/security/user'
+import { ACCESS_TOKEN, LOGIN_TOKEN } from '@/store/mutation-types'
+import { welcome } from '@/utils/util'
 
 const user = {
   state: {
     loginToken: '',
-    userInfo: {}
+    name: '',
+    welcome: '',
+    avatar: '',
+    roles: [],
+    info: {}
   },
+
   mutations: {
-    SET_LOGIN_TOKEN: (state, loginToken) => {
-      state.loginToken = loginToken
+    SET_TOKEN: (state, token) => {
+      state.loginToken = token
     },
-    SET_USER_INFO: (state, userInfo) => {
-      state.userInfo = userInfo
+    SET_NAME: (state, { name, welcome }) => {
+      state.name = name
+      state.welcome = welcome
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ROLES: (state, roles) => {
+      state.roles = roles
+    },
+    SET_INFO: (state, info) => {
+      state.info = info
     }
   },
+
   actions: {
     // 登录
     Login ({ commit }, userInfo) {
       return new Promise((resolve, reject) => {
-				storage.set(LOGIN_TOKEN, '111111', 24 * 60 * 60 * 1000)
-				// storage.set(USER_INFO, result, 24 * 60 * 60 * 1000)
-				commit('SET_LOGIN_TOKEN', '111111')
-				// commit('SET_USER_INFO', result)
-				resolve()
-        // userLogin(userInfo).then(response => {
-        //   const result = response.data
-        //   storage.set(LOGIN_TOKEN, result.loginToken, 24 * 60 * 60 * 1000)
-        //   // storage.set(USER_INFO, result, 24 * 60 * 60 * 1000)
-        //   commit('SET_LOGIN_TOKEN', result.loginToken)
-        //   // commit('SET_USER_INFO', result)
-        //   resolve()
-        // }).catch(error => {
-        //   reject(error)
-        // })
+        userLogin(userInfo).then(response => {
+          const result = response.data
+          storage.set(LOGIN_TOKEN, result.loginToken, 24 * 60 * 60 * 1000)
+          commit('SET_TOKEN', result.loginToken)
+          commit('SET_INFO', result)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
       })
     },
+
+    // 获取用户信息
+    GetInfo ({ commit }) {
+      return new Promise((resolve, reject) => {
+        getInfo().then(response => {
+          const result = response.result
+          if (result.role && result.role.permissions.length > 0) {
+            const role = result.role
+            role.permissions = result.role.permissions
+            role.permissions.map(per => {
+              if (per.actionEntitySet != null && per.actionEntitySet.length > 0) {
+                const action = per.actionEntitySet.map(action => { return action.action })
+                per.actionList = action
+              }
+            })
+            role.permissionList = role.permissions.map(permission => { return permission.permissionId })
+            commit('SET_ROLES', result.role)
+            commit('SET_INFO', result)
+          } else {
+            reject(new Error('getInfo: roles must be a non-null array !'))
+          }
+          commit('SET_NAME', { name: result.name, welcome: welcome() })
+          commit('SET_AVATAR', result.avatar)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
     // 登出
     Logout ({ commit, state }) {
       return new Promise((resolve) => {
-				commit('SET_LOGIN_TOKEN', '')
-        commit('SET_USER_INFO', {})
-        commit('SET_ROUTERS', [])
+				commit('SET_TOKEN', '')
+				commit('SET_ROLES', [])
 				storage.remove(LOGIN_TOKEN)
-        storage.remove(USER_INFO)
+        storage.remove(ACCESS_TOKEN)
 				resolve()
       })
     }
diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js
index 9ad0ef7..580e48f 100644
--- a/src/store/mutation-types.js
+++ b/src/store/mutation-types.js
@@ -1,5 +1,5 @@
+export const ACCESS_TOKEN = 'ACCESS-TOKEN'
 export const LOGIN_TOKEN = 'LOGIN-TOKEN'
-export const USER_INFO = 'USER_INFO'
 
 export const SIDEBAR_TYPE = 'sidebar_type'
 export const TOGGLE_MOBILE_TYPE = 'is_mobile'
diff --git a/src/store/user-mixin.js b/src/store/user-mixin.js
deleted file mode 100644
index 390c54f..0000000
--- a/src/store/user-mixin.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const userMixin = {
-  computed: {
-    isCorporation () {
-      const userInfo = this.$store.getters.userInfo
-      return userInfo && userInfo.type === 'CORPORATION'
-    },
-    isMall () {
-      const userInfo = this.$store.getters.userInfo
-      return userInfo && userInfo.type === 'MALL'
-    },
-    isStore () {
-      const userInfo = this.$store.getters.userInfo
-      return userInfo && userInfo.type === 'STORE'
-    }
-  }
-}
-
-export { userMixin }
diff --git a/src/utils/device.js b/src/utils/device.js
deleted file mode 100644
index 0f350f3..0000000
--- a/src/utils/device.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import enquireJs from 'enquire.js'
-
-export const DEVICE_TYPE = {
-  DESKTOP: 'desktop',
-  TABLET: 'tablet',
-  MOBILE: 'mobile'
-}
-
-export const deviceEnquire = function (callback) {
-  const matchDesktop = {
-    match: () => {
-      callback && callback(DEVICE_TYPE.DESKTOP)
-    }
-  }
-
-  const matchLablet = {
-    match: () => {
-      callback && callback(DEVICE_TYPE.TABLET)
-    }
-  }
-
-  const matchMobile = {
-    match: () => {
-      callback && callback(DEVICE_TYPE.MOBILE)
-    }
-  }
-
-  // screen and (max-width: 1087.99px)
-  enquireJs
-    .register('screen and (max-width: 576px)', matchMobile)
-    .register('screen and (min-width: 576px) and (max-width: 1199px)', matchLablet)
-    .register('screen and (min-width: 1200px)', matchDesktop)
-}
diff --git a/src/utils/file.js b/src/utils/file.js
deleted file mode 100644
index ff1eb5d..0000000
--- a/src/utils/file.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import moment from 'moment'
-import ExportJsonExcel from 'js-export-excel'
-import JSZip from 'jszip'
-import { saveAs } from 'file-saver'
-
-export function exportExcel (name, exportData) {
-  var option = {}
-  var toExcel = {}
-  option.fileName = name + moment().format('YYYYMMDDHHmmss')
-  option.datas = [{
-    sheetData: exportData.sheetData,
-    sheetName: name,
-    sheetFilter: exportData.sheetFilter,
-    sheetHeader: exportData.sheetHeader,
-    columnWidths: [20, 20]
-  }]
-  toExcel = new ExportJsonExcel(option)
-  toExcel.saveExcel()
-}
-export function exportExcelZip (name, exportPageData) {
-    var zip = new JSZip()
-    exportPageData.forEach((item) => {
-      var option = {}
-      var toExcel = {}
-      option.fileName = name + item.pageNo
-      option.saveAsBlob = true
-      option.datas = [{
-        sheetData: item.sheetData,
-        sheetName: name + item.pageNo,
-        sheetFilter: item.sheetFilter,
-        sheetHeader: item.sheetHeader,
-        columnWidths: item.columnWidths
-      }]
-      toExcel = new ExportJsonExcel(option)
-      var file = toExcel.saveExcel()
-      zip.file(file.name, file)
-    })
-    zip.generateAsync({
-      type: 'blob'
-    }).then(function (content) {
-      // see FileSaver.js
-      saveAs(content, name + moment().format('YYYYMMDDHHmmss') + '.zip')
-    })
-}
diff --git a/src/utils/mixin.js b/src/utils/mixin.js
deleted file mode 100644
index 217732d..0000000
--- a/src/utils/mixin.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// import Vue from 'vue'
-import { deviceEnquire, DEVICE_TYPE } from '@/utils/device'
-import { mapState } from 'vuex'
-
-// const mixinsComputed = Vue.config.optionMergeStrategies.computed
-// const mixinsMethods = Vue.config.optionMergeStrategies.methods
-
-const mixin = {
-  computed: {
-    ...mapState({
-      layoutMode: state => state.app.layout,
-      navTheme: state => state.app.theme,
-      primaryColor: state => state.app.color,
-      colorWeak: state => state.app.weak,
-      fixedHeader: state => state.app.fixedHeader,
-      fixSiderbar: state => state.app.fixSiderbar,
-      fixSidebar: state => state.app.fixSiderbar,
-      contentWidth: state => state.app.contentWidth,
-      autoHideHeader: state => state.app.autoHideHeader,
-      sidebarOpened: state => state.app.sidebar,
-      multiTab: state => state.app.multiTab
-    })
-  },
-  methods: {
-    isTopMenu () {
-      return this.layoutMode === 'topmenu'
-    },
-    isSideMenu () {
-      return !this.isTopMenu()
-    }
-  }
-}
-
-const mixinDevice = {
-  computed: {
-    ...mapState({
-      device: state => state.app.device
-    })
-  },
-  methods: {
-    isMobile () {
-      return this.device === DEVICE_TYPE.MOBILE
-    },
-    isDesktop () {
-      return this.device === DEVICE_TYPE.DESKTOP
-    },
-    isTablet () {
-      return this.device === DEVICE_TYPE.TABLET
-    }
-  }
-}
-
-const AppDeviceEnquire = {
-  mounted () {
-    const { $store } = this
-    deviceEnquire(deviceType => {
-      switch (deviceType) {
-        case DEVICE_TYPE.DESKTOP:
-          $store.commit('TOGGLE_DEVICE', 'desktop')
-          $store.dispatch('setSidebar', true)
-          break
-        case DEVICE_TYPE.TABLET:
-          $store.commit('TOGGLE_DEVICE', 'tablet')
-          $store.dispatch('setSidebar', false)
-          break
-        case DEVICE_TYPE.MOBILE:
-        default:
-          $store.commit('TOGGLE_DEVICE', 'mobile')
-          $store.dispatch('setSidebar', true)
-          break
-      }
-    })
-  }
-}
-
-export { mixin, AppDeviceEnquire, mixinDevice }
diff --git a/src/utils/request.js b/src/utils/request.js
index 20d5837..d3a5815 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,16 +1,13 @@
 import axios from 'axios'
-import router from '../router'
 import store from '@/store'
 import storage from 'store'
 import notification from 'ant-design-vue/es/notification'
 import { VueAxios } from './axios'
-import { LOGIN_TOKEN } from '@/store/mutation-types'
-import Exception from '@/components/Exception/type'
+import { ACCESS_TOKEN, LOGIN_TOKEN } from '@/store/mutation-types'
 
-const SUCCESS_CODE = '200'
-const INVALID_LOGIN_TOKEN_CODE = '0004'
-// const whiteList = ['/security/accessToken/get']
-const loginPath = '/user/login'
+const DATA_OWNER = 1
+const SUCCESS_CODE = 'ok'
+const INVALID_TOKEN_CODE = '0000'
 
 const toast = (msg, description) => {
   notification.error({
@@ -18,7 +15,7 @@ const toast = (msg, description) => {
     description: description
   })
 }
-console.log(process.env.VUE_APP_API_BASE_URL)
+
 // 创建 axios 实例
 const request = axios.create({
   // API 请求的默认前缀
@@ -26,18 +23,24 @@ const request = axios.create({
   timeout: 6000 // 请求超时时间
 })
 
-// 处理网络异常
+// 异常拦截处理器
 const errorHandler = (error) => {
-  if (error.response && error.response.status) {
-    const status = error.response.status
-    if (status === 401) {
-      store.dispatch('Logout').then(() => {
-        router.push({
-          path: loginPath
+  if (error.response) {
+    const data = error.response.data
+    // 从 localstorage 获取 token
+    const token = storage.get(ACCESS_TOKEN)
+    if (error.response.status === 403) {
+      toast('Forbidden:', data.message)
+    }
+    if (error.response.status === 401 && !(data.result && data.result.isLogin)) {
+      toast('Unauthorized:', 'Authorization verification failed')
+      if (token) {
+        store.dispatch('Logout').then(() => {
+          setTimeout(() => {
+            window.location.reload()
+          }, 1500)
         })
-      })
-    } else {
-      toast(status, Exception[status] ? Exception[status].desc : '访问接口服务异常')
+      }
     }
   }
   return Promise.reject(error)
@@ -45,31 +48,33 @@ const errorHandler = (error) => {
 
 // request interceptor
 request.interceptors.request.use(config => {
+  const token = storage.get(ACCESS_TOKEN)
   const loginToken = storage.get(LOGIN_TOKEN)
-  if (loginToken) {
-    config.headers[LOGIN_TOKEN] = loginToken
+  // 如果 token 存在
+  // 让每个请求携带自定义 token 请根据实际情况自行修改
+  if (token) {
+    config.headers[ACCESS_TOKEN] = token
   }
-  if (config.method === 'post' && config.headers['Content-Type'] !== 'application/x-www-form-urlencoded') {
+  if (config.method === 'post') {
     if (!config.data) {
       config.data = {}
     }
+    config.data.dataOwner = DATA_OWNER
+    config.data.loginToken = loginToken
   }
   return config
 }, errorHandler)
 
 // response interceptor
 request.interceptors.response.use((response) => {
-  console.log(response)
   if (response.status === 200 && response.data.code === SUCCESS_CODE) {
     return Promise.resolve(response.data)
-  } else if (response.data && response.data.code === INVALID_LOGIN_TOKEN_CODE) {
-    toast('认证失败:', '登录超时，请重新登录')
+  } else if (response.data && response.data.code === INVALID_TOKEN_CODE) {
+    toast(response.data.msg)
     store.dispatch('Logout').then(() => {
-      router.push({
-        path: loginPath
-      })
+      this.$router.push({ name: 'login' })
     })
-    return Promise.reject(new Error(INVALID_LOGIN_TOKEN_CODE))
+    return Promise.reject(response)
   } else {
     if (response.data && response.data.msg) toast(response.data.msg)
     return Promise.reject(response)
diff --git a/src/utils/util.js b/src/utils/util.js
index 2ba7c4e..274ff18 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -65,27 +65,3 @@ export function removeLoadingAnimate (id = '', timeout = 1500) {
     document.body.removeChild(document.getElementById(id))
   }, timeout)
 }
-
-export function diffArray (arr1, arr2) {
-	return arr1.filter(function (val) { return arr2.indexOf(val) === -1 })
-}
-
-export function listToTree (list, tree, parentId) {
-  list.forEach(item => {
-    if (item.parentId === parentId) {
-      const child = {
-        ...item,
-        scopedSlots: {
-          icon: 'icon'
-        },
-        children: []
-      }
-      listToTree(list, child.children, item.id)
-      if (child.children.length <= 0) {
-        delete child.children
-      }
-      tree.push(child)
-    }
-  })
-  return tree
-}
diff --git a/src/views/brand/BrandDetail.vue b/src/views/brand/BrandDetail.vue
deleted file mode 100644
index becb559..0000000
--- a/src/views/brand/BrandDetail.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <page-header-wrapper :title="false" content="界面详情介绍,不需要可删除.">
-    <a-card :bordered="false">
-      <a-descriptions title="品牌详情">
-        <a-descriptions-item label="名称">{{model.name}}</a-descriptions-item>
-        <a-descriptions-item label="编码">{{model.code}}</a-descriptions-item>
-        <a-descriptions-item label="状态">{{model.status | statusFilter}}</a-descriptions-item>
-        <a-descriptions-item label="创建时间">{{model.createdAt | moment}}</a-descriptions-item>
-        <a-descriptions-item label="排序">{{model.sortOrder}}</a-descriptions-item>
-      </a-descriptions>
-    </a-card>
-  </page-header-wrapper>
-</template>
-<script>
-import { brandGet } from '@/api/bms/brand'
-import { statusMap } from '@/views/status/statusMap'
-
-export default {
-  data () {
-    return {
-      id: null,
-      model: {}
-    }
-  },
-  filters: {
-    statusFilter (status) {
-      return statusMap[status]
-    }
-  },
-  methods: {
-    loadData () {
-      brandGet({ id: this.id }).then(data => {
-        this.model = data.data
-      })
-    }
-  },
-  created () {
-    const id = this.$route.params.id
-    this.id = id
-    this.loadData()
-  }
-}
-</script>
diff --git a/src/views/brand/BrandList.vue b/src/views/brand/BrandList.vue
deleted file mode 100644
index 7bd553b..0000000
--- a/src/views/brand/BrandList.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-  <page-header-wrapper :title="false" content="界面详情介绍,不需要可删除.">
-    <a-card :bordered="false">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="名称">
-                <a-input v-model="queryParam.name" placeholder="请输入名称" @pressEnter="handleFefresh"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="状态">
-                <a-select v-model="queryParam.status" placeholder="请选择" default-value="0" @pressEnter="handleFefresh">
-                  <a-select-option value="">全部</a-select-option>
-                  <a-select-option v-for="(item, index) in statusMap" :key="index" :value="index">{{item}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="handleFefresh">查询</a-button>
-              <a-button @click="() => {queryParam = {}, handleFefresh()}">重置</a-button>
-            </a-col>
-            <a-col :md="6" :sm="24" align="right">
-              <a-button type="primary" @click="handleCreate">新增</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :rowSelection="rowSelection"
-      >
-        <template slot="time" slot-scope="text, record">{{record.createdAt | moment}}</template>
-        <template slot="tbStatus" slot-scope="text, record">
-          <a-switch checked-children="启用" un-checked-children="停用" v-model="record.status" @change="updateStatus(record.id, record.status)"/>
-        </template>
-        <template slot="action" slot-scope="text, record">
-          <a href="javascript:;" @click="handleEdit(record)">修改</a>
-          <a-divider type="vertical" />
-          <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
-            <a href="javascript:;">删除</a>
-          </a-popconfirm>
-          <a-divider type="vertical" />
-          <router-link :to="'/brand/detail/' + record.id">跳转详情</router-link>
-          <a-divider type="vertical" />
-          <a href="javascript:;" @click="handleDetail(record.id)">弹框详情</a>
-        </template>
-      </s-table>
-      <create-form ref="modal" @ok="handleOk" />
-      <brand-detail ref="detail"></brand-detail>
-    </a-card>
-  </page-header-wrapper>
-</template>
-
-<script>
-import notification from 'ant-design-vue/es/notification'
-import { brandPage, brandUpdateStatus, brandDelete } from '@/api/bms/brand'
-import { STable } from '@/components'
-import CreateForm from './modules/CreateForm'
-import BrandDetail from './modules/BrandDetail'
-import { statusMap } from '@/views/status/statusMap'
-
-export default {
-  name: 'BrandList',
-  components: {
-    STable,
-    CreateForm,
-    BrandDetail
-  },
-  data () {
-    return {
-      statusMap: statusMap,
-      queryParam: { name: '', status: '' },
-      selectedRowKeys: [], // 选中行的key 出选择框时需要配置
-      selectedRows: [], // 选中行的数据
-      columns: [
-        { title: '名称', width: 30, dataIndex: 'name', key: 'name' },
-        { title: '编码', width: 30, dataIndex: 'code', key: 'code' },
-        {
-          title: '创建时间',
-          width: 10,
-          key: 'createdAt',
-          align: 'center',
-          scopedSlots: { customRender: 'time' }
-        },
-        {
-          title: '状态',
-          width: 10,
-          key: 'tbStatus',
-          align: 'center',
-          scopedSlots: { customRender: 'tbStatus' }
-        },
-        {
-          title: '操作',
-          key: 'operation',
-          width: 10,
-          align: 'right',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      loadData: parameter => {
-        return brandPage(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            const data = res.data
-            data.entities.forEach((item) => {
-              item.status = item.status === 1
-            })
-            return data
-          })
-      }
-    }
-  },
-  computed: {
-    rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: this.onSelectChange
-      }
-    }
-  },
-  methods: {
-    // 修改状态
-    updateStatus (id, status) {
-      brandUpdateStatus({
-        id: id,
-        status: status ? 1 : 0
-      }).then(res => {
-        notification.success({
-          message: '操作成功',
-          duration: 1,
-          description: status ? '品牌已启用' : '品牌已停用'
-        })
-        this.$refs.table.refresh()
-      })
-    },
-    // 增
-    handleCreate () {
-      this.$refs.modal.add()
-    },
-    // 改
-    handleEdit (record) {
-      this.$refs.modal.edit(record)
-    },
-    // 删
-    handleDelete (record) {
-      brandDelete({ id: record.id }).then(() => {
-        this.loadData()
-      })
-    },
-    // 编辑后回调
-    handleOk () {
-      this.$refs.table.refresh()
-    },
-    // 详情
-    handleDetail (id) {
-      this.$refs.detail.show(id)
-    },
-    handleFefresh () {
-      this.$refs.table.refresh(true)
-    },
-    // 选择行
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    }
-  }
-}
-</script>
diff --git a/src/views/brand/modules/BrandDetail.vue b/src/views/brand/modules/BrandDetail.vue
deleted file mode 100644
index 1b7081c..0000000
--- a/src/views/brand/modules/BrandDetail.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-  <a-drawer
-    title="品牌详情"
-    width="640"
-    placement="right"
-    :visible="visible"
-    @close="onClose">
-    <a-descriptions :column="{ sm: 2, xs: 1 }">
-      <a-descriptions-item label="名称">{{ model.name }}</a-descriptions-item>
-      <a-descriptions-item label="编码">{{ model.code }}</a-descriptions-item>
-      <a-descriptions-item label="创建时间">{{ model.createdAt | moment('YYYY-MM-DD') }}</a-descriptions-item>
-      <a-descriptions-item label="上次修改时间">{{ model.updatedAt }}</a-descriptions-item>
-      <a-descriptions-item label="状态">{{ model.status | statusFilter }}</a-descriptions-item>
-      <a-descriptions-item label="排序">{{ model.sortOrder }}</a-descriptions-item>
-    </a-descriptions>
-  </a-drawer>
-</template>
-
-<script>
-import { brandGet } from '@/api/bms/brand'
-import { statusMap } from '@/views/status/statusMap'
-
-export default {
-  data () {
-    return {
-      visible: false,
-      model: {}
-    }
-  },
-  filters: {
-    statusFilter (status) {
-      return statusMap[status]
-    }
-  },
-  methods: {
-    show (id) {
-      this.visible = true
-      brandGet({ id: id }).then(data => {
-        this.model = data.data
-      })
-    },
-    onClose () {
-      this.model = {}
-      this.visible = false
-    }
-  }
-}
-</script>
diff --git a/src/views/brand/modules/CreateForm.vue b/src/views/brand/modules/CreateForm.vue
deleted file mode 100644
index 55903b2..0000000
--- a/src/views/brand/modules/CreateForm.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <a-modal centered v-model="visible" :title="modalTitle" @ok="onSubmit" @cancel="onCancel">
-    <template slot="footer">
-      <a-button key="cancel" @click="onCancel">取消</a-button>
-      <a-button key="submit" type="primary" @click="onSubmit">保存</a-button>
-    </template>
-    <a-form-model ref="ruleForm" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-model-item ref="name" label="名称" prop="name">
-        <a-input v-model="form.name"/>
-      </a-form-model-item>
-    </a-form-model>
-  </a-modal>
-</template>
-
-<script>
-import { brandGet, brandAdd, brandUpdate } from '@/api/bms/brand'
-
-export default {
-  props: {
-    id: {
-      type: String,
-      default: undefined
-    }
-  },
-  data () {
-    return {
-      modalTitle: '新增',
-      visible: false,
-      labelCol: { span: 4 },
-      wrapperCol: { span: 16 },
-      form: {
-        name: ''
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' },
-          { min: 2, message: '长度不能小于2', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    add () {
-      this.modalTitle = '新增'
-      this.visible = true
-    },
-    edit (obj) {
-      this.modalTitle = '修改'
-      this.visible = true
-      brandGet({ id: obj.id }).then(data => {
-        const form = data.data
-        this.form = form
-      })
-    },
-    onSubmit (e) {
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-            brandUpdate(this.form).then(data => {
-              this.$emit('ok')
-              this.onCancel()
-            })
-          } else {
-            brandAdd(this.form).then(data => {
-              this.$emit('ok')
-              this.onCancel()
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    onCancel () {
-      this.$refs.ruleForm.resetFields()
-      this.visible = false
-    },
-    onReset () {
-      this.$refs.ruleForm.resetFields()
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
deleted file mode 100644
index cd20183..0000000
--- a/src/views/dashboard/Analysis.vue
+++ /dev/null
@@ -1,417 +0,0 @@
-<template>
-  <div>
-    <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="总销售额" total="￥126,560">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <trend flag="up" style="margin-right: 16px;">
-              <span slot="term">周同比</span>
-              12%
-            </trend>
-            <trend flag="down">
-              <span slot="term">日同比</span>
-              11%
-            </trend>
-          </div>
-          <template slot="footer">日均销售额<span>￥ 234.56</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="访问量" :total="8846 | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-area />
-          </div>
-          <template slot="footer">日访问量<span> {{ '1234' | NumberFormat }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="支付笔数" :total="6560 | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-bar />
-          </div>
-          <template slot="footer">转化率 <span>60%</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="运营活动效果" total="78%">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-progress color="rgb(19, 194, 194)" :target="80" :percentage="78" height="8px" />
-          </div>
-          <template slot="footer">
-            <trend flag="down" style="margin-right: 16px;">
-              <span slot="term">同周比</span>
-              12%
-            </trend>
-            <trend flag="up">
-              <span slot="term">日环比</span>
-              80%
-            </trend>
-          </template>
-        </chart-card>
-      </a-col>
-    </a-row>
-
-    <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
-      <div class="salesCard">
-        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <div class="extra-wrapper" slot="tabBarExtraContent">
-            <div class="extra-item">
-              <a>今日</a>
-              <a>本周</a>
-              <a>本月</a>
-              <a>本年</a>
-            </div>
-            <a-range-picker :style="{width: '256px'}" />
-          </div>
-          <a-tab-pane loading="true" tab="销售额" key="1">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar :data="barData" title="销售额排行" />
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-                <rank-list title="门店销售排行榜" :list="rankList"/>
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-          <a-tab-pane tab="访问量" key="2">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar :data="barData2" title="销售额趋势" />
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-                <rank-list title="门店销售排行榜" :list="rankList"/>
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-        </a-tabs>
-      </div>
-    </a-card>
-
-    <div class="antd-pro-pages-dashboard-analysis-twoColLayout" :class="!isMobile && 'desktop'">
-      <a-row :gutter="24" type="flex" :style="{ marginTop: '24px' }">
-        <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card :loading="loading" :bordered="false" title="线上热门搜索" :style="{ height: '100%' }">
-            <a-dropdown :trigger="['click']" placement="bottomLeft" slot="extra">
-              <a class="ant-dropdown-link" href="#">
-                <a-icon type="ellipsis" />
-              </a>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a href="javascript:;">操作一</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a href="javascript:;">操作二</a>
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
-            <a-row :gutter="68">
-              <a-col :xs="24" :sm="12" :style="{ marginBottom: ' 24px'}">
-                <number-info :total="12321" :sub-total="17.1">
-                  <span slot="subtitle">
-                    <span>搜索用户数</span>
-                    <a-tooltip title="指标说明" slot="action">
-                      <a-icon type="info-circle-o" :style="{ marginLeft: '8px' }" />
-                    </a-tooltip>
-                  </span>
-                </number-info>
-                <!-- miniChart -->
-                <div>
-                  <mini-smooth-area :style="{ height: '45px' }" :dataSource="searchUserData" :scale="searchUserScale" />
-                </div>
-              </a-col>
-              <a-col :xs="24" :sm="12" :style="{ marginBottom: ' 24px'}">
-                <number-info :total="2.7" :sub-total="26.2" status="down">
-                  <span slot="subtitle">
-                    <span>人均搜索次数</span>
-                    <a-tooltip title="指标说明" slot="action">
-                      <a-icon type="info-circle-o" :style="{ marginLeft: '8px' }" />
-                    </a-tooltip>
-                  </span>
-                </number-info>
-                <!-- miniChart -->
-                <div>
-                  <mini-smooth-area :style="{ height: '45px' }" :dataSource="searchUserData" :scale="searchUserScale" />
-                </div>
-              </a-col>
-            </a-row>
-            <div class="ant-table-wrapper">
-              <a-table
-                row-key="index"
-                size="small"
-                :columns="searchTableColumns"
-                :dataSource="searchData"
-                :pagination="{ pageSize: 5 }"
-              >
-                <span slot="range" slot-scope="text, record">
-                  <trend :flag="record.status === 0 ? 'up' : 'down'">
-                    {{ text }}%
-                  </trend>
-                </span>
-              </a-table>
-            </div>
-          </a-card>
-        </a-col>
-        <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card class="antd-pro-pages-dashboard-analysis-salesCard" :loading="loading" :bordered="false" title="销售额类别占比" :style="{ height: '100%' }">
-            <div slot="extra" style="height: inherit;">
-              <!-- style="bottom: 12px;display: inline-block;" -->
-              <span class="dashboard-analysis-iconGroup">
-                <a-dropdown :trigger="['click']" placement="bottomLeft">
-                  <a-icon type="ellipsis" class="ant-dropdown-link" />
-                  <a-menu slot="overlay">
-                    <a-menu-item>
-                      <a href="javascript:;">操作一</a>
-                    </a-menu-item>
-                    <a-menu-item>
-                      <a href="javascript:;">操作二</a>
-                    </a-menu-item>
-                  </a-menu>
-                </a-dropdown>
-              </span>
-              <div class="analysis-salesTypeRadio">
-                <a-radio-group defaultValue="a">
-                  <a-radio-button value="a">全部渠道</a-radio-button>
-                  <a-radio-button value="b">线上</a-radio-button>
-                  <a-radio-button value="c">门店</a-radio-button>
-                </a-radio-group>
-              </div>
-
-            </div>
-            <h4>销售额</h4>
-            <div>
-              <!-- style="width: calc(100% - 240px);" -->
-              <div>
-                <v-chart :force-fit="true" :height="405" :data="pieData" :scale="pieScale">
-                  <v-tooltip :showTitle="false" dataKey="item*percent" />
-                  <v-axis />
-                  <!-- position="right" :offsetX="-140" -->
-                  <v-legend dataKey="item"/>
-                  <v-pie position="percent" color="item" :vStyle="pieStyle" />
-                  <v-coord type="theta" :radius="0.75" :innerRadius="0.6" />
-                </v-chart>
-              </div>
-
-            </div>
-          </a-card>
-        </a-col>
-      </a-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import moment from 'moment'
-import {
-  ChartCard,
-  MiniArea,
-  MiniBar,
-  MiniProgress,
-  RankList,
-  Bar,
-  Trend,
-  NumberInfo,
-  MiniSmoothArea
-} from '@/components'
-import { baseMixin } from '@/store/app-mixin'
-
-const barData = []
-const barData2 = []
-for (let i = 0; i < 12; i += 1) {
-  barData.push({
-    x: `${i + 1}月`,
-    y: Math.floor(Math.random() * 1000) + 200
-  })
-  barData2.push({
-    x: `${i + 1}月`,
-    y: Math.floor(Math.random() * 1000) + 200
-  })
-}
-
-const rankList = []
-for (let i = 0; i < 7; i++) {
-  rankList.push({
-    name: '白鹭岛 ' + (i + 1) + ' 号店',
-    total: 1234.56 - i * 100
-  })
-}
-
-const searchUserData = []
-for (let i = 0; i < 7; i++) {
-  searchUserData.push({
-    x: moment().add(i, 'days').format('YYYY-MM-DD'),
-    y: Math.ceil(Math.random() * 10)
-  })
-}
-const searchUserScale = [
-  {
-    dataKey: 'x',
-    alias: '时间'
-  },
-  {
-    dataKey: 'y',
-    alias: '用户数',
-    min: 0,
-    max: 10
-  }]
-
-const searchTableColumns = [
-  {
-    dataIndex: 'index',
-    title: '排名',
-    width: 90
-  },
-  {
-    dataIndex: 'keyword',
-    title: '搜索关键词'
-  },
-  {
-    dataIndex: 'count',
-    title: '用户数'
-  },
-  {
-    dataIndex: 'range',
-    title: '周涨幅',
-    align: 'right',
-    sorter: (a, b) => a.range - b.range,
-    scopedSlots: { customRender: 'range' }
-  }
-]
-const searchData = []
-for (let i = 0; i < 50; i += 1) {
-  searchData.push({
-    index: i + 1,
-    keyword: `搜索关键词-${i}`,
-    count: Math.floor(Math.random() * 1000),
-    range: Math.floor(Math.random() * 100),
-    status: Math.floor((Math.random() * 10) % 2)
-  })
-}
-
-const DataSet = require('@antv/data-set')
-
-const sourceData = [
-  { item: '家用电器', count: 32.2 },
-  { item: '食用酒水', count: 21 },
-  { item: '个护健康', count: 17 },
-  { item: '服饰箱包', count: 13 },
-  { item: '母婴产品', count: 9 },
-  { item: '其他', count: 7.8 }
-]
-
-const pieScale = [{
-  dataKey: 'percent',
-  min: 0,
-  formatter: '.0%'
-}]
-
-const dv = new DataSet.View().source(sourceData)
-dv.transform({
-  type: 'percent',
-  field: 'count',
-  dimension: 'item',
-  as: 'percent'
-})
-const pieData = dv.rows
-
-export default {
-  name: 'Analysis',
-  mixins: [baseMixin],
-  components: {
-    ChartCard,
-    MiniArea,
-    MiniBar,
-    MiniProgress,
-    RankList,
-    Bar,
-    Trend,
-    NumberInfo,
-    MiniSmoothArea
-  },
-  data () {
-    return {
-      loading: true,
-      rankList,
-
-      // 搜索用户数
-      searchUserData,
-      searchUserScale,
-      searchTableColumns,
-      searchData,
-
-      barData,
-      barData2,
-
-      //
-      pieScale,
-      pieData,
-      sourceData,
-      pieStyle: {
-        stroke: '#fff',
-        lineWidth: 1
-      }
-    }
-  },
-  created () {
-    setTimeout(() => {
-      this.loading = !this.loading
-    }, 1000)
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .extra-wrapper {
-    line-height: 55px;
-    padding-right: 24px;
-
-    .extra-item {
-      display: inline-block;
-      margin-right: 24px;
-
-      a {
-        margin-left: 24px;
-      }
-    }
-  }
-
-  .antd-pro-pages-dashboard-analysis-twoColLayout {
-    position: relative;
-    display: flex;
-    display: block;
-    flex-flow: row wrap;
-  }
-
-  .antd-pro-pages-dashboard-analysis-salesCard {
-    height: calc(100% - 24px);
-    /deep/ .ant-card-head {
-      position: relative;
-    }
-  }
-
-  .dashboard-analysis-iconGroup {
-    i {
-      margin-left: 16px;
-      color: rgba(0,0,0,.45);
-      cursor: pointer;
-      transition: color .32s;
-      color: black;
-    }
-  }
-  .analysis-salesTypeRadio {
-    position: absolute;
-    right: 54px;
-    bottom: 12px;
-  }
-</style>
diff --git a/src/views/dashboard/Monitor.vue b/src/views/dashboard/Monitor.vue
deleted file mode 100644
index 2b9c6c1..0000000
--- a/src/views/dashboard/Monitor.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  <div>
-    Monitor
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Monitor'
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/dashboard/TestWork.vue b/src/views/dashboard/TestWork.vue
deleted file mode 100644
index ae80f93..0000000
--- a/src/views/dashboard/TestWork.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-  <div>
-    <h2>本页面内容均为测试功能，暂不提供稳定性保证</h2>
-    <a-divider />
-    <div class="multi-tab-test">
-      <h4>多标签组件测试功能</h4>
-      <a-button @click="handleCloseCurrentTab" style="margin-right: 16px;">关闭当前页</a-button>
-      <a-button @click="handleOpenTab" style="margin-right: 16px;">打开 任务列表</a-button>
-      <a-popconfirm :visible="visible" @confirm="confirm" @cancel="cancel" okText="确定" cancelText="取消">
-        <template v-slot:title>
-          <div>
-            <a-form :form="form" layout="inline">
-              <a-form-item label="自定义名称">
-                <a-input v-decorator="['tabName', {rules: [{required: true, message: '请输入新的 Tab 名称'}]}]"/>
-              </a-form-item>
-            </a-form>
-          </div>
-        </template>
-        <a-button @click="() => visible = !visible" style="margin-right: 16px;">修改当前 Tab 名称</a-button>
-      </a-popconfirm>
-
-      <a-popconfirm :visible="visible2" @confirm="confirm2" @cancel="() => visible2 = false" okText="确定" cancelText="取消">
-        <template v-slot:title>
-          <div>
-            <p>页面 KEY 是由页面的路由 <code>path</code> 决定的</p>
-            <p>如果要修改某一个页面标题，该页面必须已经被打开在 Tab 栏</p>
-            <p>后期可以考虑优化到编程式 Tab 栏，就可以没有这种限制</p>
-            <a-form :form="form2" layout="inline">
-              <a-form-item label="页面KEY">
-                <a-input v-decorator="['tabKey', { initialValue: '/dashboard/workplace' }]" />
-              </a-form-item>
-              <a-form-item label="自定义名称">
-                <a-input v-decorator="['tabName', {rules: [{required: true, message: '请输入新的 Tab 名称'}]}]"/>
-              </a-form-item>
-            </a-form>
-          </div>
-        </template>
-        <a-button @click="() => visible2 = !visible2">修改某一个 Tab 名称</a-button>
-      </a-popconfirm>
-    </div>
-    <a-divider />
-    <div class="page-loading-test">
-      <h4>全局遮罩测试</h4>
-      <a-button @click="handleOpenLoading" style="margin-right: 16px;">打开遮罩(5s 自动关闭)</a-button>
-      <a-button @click="handleOpenLoadingCustomTip">打开遮罩(自定义提示语)</a-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'TestWork',
-  data () {
-    return {
-      visible: false,
-      visible2: false
-    }
-  },
-  created () {
-    this.form = this.$form.createForm(this)
-    this.form2 = this.$form.createForm(this)
-  },
-  methods: {
-    handleCloseCurrentTab () {
-      this.$multiTab.closeCurrentPage() // or this.$multiTab.close()
-    },
-    handleOpenTab () {
-      this.$multiTab.open('/features/task')
-    },
-
-    handleOpenLoading () {
-      this.$nextTick(function () {
-        console.log('this', this)
-        console.log('this.$refs.tInput', this.$refs.tInput)
-      })
-      this.$loading.show()
-      setTimeout(() => {
-        this.$loading.hide()
-      }, 5000)
-    },
-    handleOpenLoadingCustomTip () {
-      this.$loading.show({ tip: '自定义提示语' })
-      setTimeout(() => {
-        this.$loading.hide()
-      }, 5000)
-    },
-
-    // confirm
-    confirm (e) {
-      e.stopPropagation()
-      const { path } = this.$route
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          this.$multiTab.rename(path, values.tabName)
-          this.visible = false
-        }
-      })
-    },
-    cancel () {
-      this.visible = false
-    },
-    confirm2 (e) {
-      e.stopPropagation()
-      this.form2.validateFields((err, values) => {
-        if (!err) {
-          this.$multiTab.rename(values.tabKey, values.tabName)
-          this.visible2 = false
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
deleted file mode 100644
index 3127309..0000000
--- a/src/views/login/index.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <div class="login_main">
-    <div class="login">
-      <div class="login_title">安全培训系统登录</div>
-      <div class="login_form">
-        <el-input placeholder="用户名" v-model="loginForm.username">
-          <template slot="prepend">
-            <icon class="el-icon-user" style="font-size: 20px;" />
-          </template>
-        </el-input>
-        <el-input placeholder="密码" show-password v-model="loginForm.password">
-          <template slot="prepend">
-            <icon class="el-icon-goods" style="font-size: 20px;" />
-          </template>
-        </el-input>
-        <el-link href="javascript:void(0)" :underline="false" icon="el-icon-edit">忘记密码</el-link>
-        <el-button type="primary">登 录</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      loginForm: {
-        username: "",
-        password: ""
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.login_main {
-  width: 100%;
-  height: 100%;
-  background-color: #f2f6fc;
-  position: absolute;
-}
-.login {
-  width: 500px;
-  height: auto;
-  margin: 100px auto;
-  border-radius: 4px;
-  background-color: #fff;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
-}
-.login_title {
-  width: 100%;
-  height: 60px;
-  font-size: 24px;
-  font-weight: bold;
-  text-align: center;
-  line-height: 60px;
-  margin-bottom: 10px;
-}
-/* border-bottom: 1px solid #ccc; */
-.login_form {
-  width: 90%;
-  margin: 0 auto;
-}
-.el-input {
-  margin-top: 20px;
-}
-.el-link {
-  margin-top: 20px;
-  float: right;
-}
-.el-button {
-  width: 100%;
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/security/maps/icons.js b/src/views/security/maps/icons.js
deleted file mode 100644
index 6699a56..0000000
--- a/src/views/security/maps/icons.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const filledIcons = [{
-  type: 'home'
-}, {
-  type: 'account-book'
-}, {
-  type: 'alert'
-}, {
-  type: 'api'
-}, {
-  type: 'appstore'
-}, {
-  type: 'bell'
-}, {
-  type: 'cloud'
-}, {
-  type: 'edit'
-}]
diff --git a/src/views/security/maps/map.js b/src/views/security/maps/map.js
index 5c06b43..d270ca6 100644
--- a/src/views/security/maps/map.js
+++ b/src/views/security/maps/map.js
@@ -1,6 +1,5 @@
 export const typeMap = {
   'CORPORATION': '公司',
   'MALL': '门店',
-  'STORE': '店长',
-  'STAFF': '店员'
+  'STORE': '店铺'
 }
diff --git a/src/views/security/resource/FunctionResource.vue b/src/views/security/resource/FunctionResource.vue
deleted file mode 100644
index ecbfc52..0000000
--- a/src/views/security/resource/FunctionResource.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <page-header-wrapper :title="false">
-    <a-row :gutter="24">
-      <a-col :span="9">
-        <a-card :bordered="false" title="功能">
-          <ul class="ant-tree ant-tree-show-line">
-            <li v-for="item in functionTreeData" :key="item.id" @click="handleSelect(item.id)" >
-              <span class="ant-tree-switcher ant-tree-switcher-noop">
-                <a-icon type="file" />
-              </span>
-              <span class="ant-tree-node-content-wrapper" :class="{ 'ant-tree-node-selected' : item.id == functionId }">
-                <span class="ant-tree-title">{{ item.name }}</span>
-              </span>
-            </li>
-          </ul>
-        </a-card>
-      </a-col>
-      <a-col :span="15">
-        <a-card :bordered="false" title="资源">
-          <a-tree
-            show-line
-            checkable
-            v-model="checkedKeys"
-            :tree-data="resourceTreeData"
-            :replace-fields="replaceFields"
-            :disabled="disabled"
-            @check="onCheck" >
-          </a-tree>
-        </a-card>
-      </a-col>
-    </a-row>
-  </page-header-wrapper>
-</template>
-
-<script>
-import { functionPage } from '@/api/security/function'
-import { resourceByFunctionId } from '@/api/security/resource'
-import { functionResourceAdd, functionResourceDelete } from '@/api/security/functionResource'
-
-export default {
-  data () {
-    return {
-      replaceFields: {
-        title: 'name',
-        key: 'id'
-      },
-      functionTreeData: [],
-      resourceTreeData: [],
-      checkedKeys: [],
-      functionId: '',
-      disabled: false
-    }
-  },
-  created () {
-    this.loadFunctions()
-  },
-  methods: {
-    loadFunctions () {
-      functionPage({
-        pageSize: 50,
-        status: 1
-      }).then(res => {
-        this.functionTreeData = res.data.entities
-      })
-    },
-    loadResource (functionId) {
-      resourceByFunctionId({
-        functionId
-      }).then(res => {
-        this.resourceTreeData = res.data
-        const result = this.initCheckedKeys(res.data, [])
-        this.checkedKeys = result
-      })
-    },
-    initCheckedKeys (data, result) {
-      for (let i = 0, length = data.length; i < length; i++) {
-        const item = data[i]
-        // 只获取checked为true的子节点,父节点自动会根据子节点勾选状态判定是全选还是半选
-        if (item.checked && item.children.length === 0) {
-          result.push(item.id)
-          continue
-        } else if (item.children.length > 0) {
-          this.initCheckedKeys(item.children, result)
-        }
-      }
-      return result
-    },
-    handleSelect (functionId) {
-      if (this.functionId === functionId || this.disabled) {
-        return false
-      }
-      this.functionId = functionId
-      this.loadResource(functionId)
-    },
-    onCheck (checkedKeys, info) {
-      if (this.disabled) {
-        return false
-      }
-      this.checkedKeys = checkedKeys
-      const id = info.node.dataRef.id
-      const checked = info.checked
-      if (checked) {
-        this.addResource(id)
-      } else {
-        this.deleteResource(id)
-      }
-    },
-    addResource (id) {
-      const { functionId } = this
-      functionResourceAdd({
-        functionId,
-        resourceId: id
-      }).then(res => {
-      }).finally(() => {
-        this.disabled = false
-      })
-    },
-    deleteResource (id) {
-      const { functionId } = this
-      functionResourceDelete({
-        functionId,
-        resourceId: id
-      }).then(res => {
-      }).finally(() => {
-        this.disabled = false
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-  .ant-tree{
-    li {
-      cursor: pointer;
-    }
-  }
-</style>
diff --git a/src/views/security/resource/ResourceTree.vue b/src/views/security/resource/ResourceTree.vue
index 8087737..46fb64a 100644
--- a/src/views/security/resource/ResourceTree.vue
+++ b/src/views/security/resource/ResourceTree.vue
@@ -1,129 +1,186 @@
 <template>
-  <page-header-wrapper :title="false">
-    <a-row :gutter="16">
-      <a-col :span="6">
-        <a-card :bordered="false">
-          <a-tree :default-expand-all="true" :tree-data="treeData" :replace-fields="replaceFields" @select="handleSelect" show-icon>
-            <template slot-scope="text" slot="icon">
-              <a-icon :type="text.icon"/>
-            </template>
-          </a-tree>
-        </a-card>
+  <a-card :bordered="false">
+    <a-row :gutter="8">
+      <a-col :span="5">
+        <s-tree
+          :dataSource="orgTree"
+          :openKeys.sync="openKeys"
+          :search="true"
+          @click="handleClick"
+          @add="handleAdd"
+          @titleClick="handleTitleClick"></s-tree>
       </a-col>
-      <a-col :span="18">
-        <a-card :bordered="false">
-          <a-row :gutter="8">
-            <a-col :span="14" :offset="4">
-              <a-button-group>
-                <a-button @click="handleRootCreate" type="primary"><a-icon type="plus" />新增根菜单</a-button>
-                <a-button @click="handleCreate" :disabled="!checkedNode"><a-icon type="plus" />新增下级菜单</a-button>
-                <a-button @click="handleDelete" :disabled="!checkedNode"><a-icon type="close" />删除当前菜单</a-button>
-                <a-button><a-icon type="redo" />刷新缓存</a-button>
-              </a-button-group>
-            </a-col>
-          </a-row>
-          <create-form ref="modal" @ok="handleOk"></create-form>
-        </a-card>
+      <a-col :span="19">
+        <s-table
+          ref="table"
+          size="default"
+          :columns="columns"
+          :data="loadData"
+          :alert="false"
+          :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        >
+          <span slot="action" slot-scope="text, record">
+            <template v-if="$auth('table.update')">
+              <a @click="handleEdit(record)">编辑</a>
+              <a-divider type="vertical" />
+            </template>
+            <a-dropdown>
+              <a class="ant-dropdown-link">
+                更多 <a-icon type="down" />
+              </a>
+              <a-menu slot="overlay">
+                <a-menu-item>
+                  <a href="javascript:;">详情</a>
+                </a-menu-item>
+                <a-menu-item v-if="$auth('table.disable')">
+                  <a href="javascript:;">禁用</a>
+                </a-menu-item>
+                <a-menu-item v-if="$auth('table.delete')">
+                  <a href="javascript:;">删除</a>
+                </a-menu-item>
+              </a-menu>
+            </a-dropdown>
+          </span>
+        </s-table>
       </a-col>
     </a-row>
-  </page-header-wrapper>
+    <org-modal ref="modal" @ok="handleSaveOk" @close="handleSaveClose" />
+  </a-card>
 </template>
 
 <script>
-import CreateForm from './modules/CreateForm'
-import { resourceDelete, resourceAll } from '@/api/security/resource'
-import { Tree } from 'ant-design-vue'
-import { listToTree } from '@/utils/util'
-const rootParentId = '-1'
+import STree from '@/components/Tree/Tree'
+import { STable } from '@/components'
+import OrgModal from './modules/OrgModal'
+import { menuList } from '@/api/security/menu'
 
 export default {
-  name: 'ResourceTree',
+  name: 'MenuTree',
   components: {
-    [Tree.name]: Tree,
-    CreateForm
+    STable,
+    STree,
+    OrgModal
   },
   data () {
     return {
-      replaceFields: {
-        title: 'name',
-        key: 'id',
-        icon: 'icon'
+      queryParam: {
+        parentId: '-1'
       },
-      treeData: [],
-      checkedNode: undefined
+      openKeys: ['key-01'],
+      orgTree: [],
+      selectedRowKeys: [],
+      selectedRows: [],
+      columns: [
+        {
+          title: '#',
+          dataIndex: 'no'
+        },
+        {
+          title: '成员名称',
+          dataIndex: 'description'
+        },
+        {
+          title: '登录次数',
+          dataIndex: 'callNo',
+          sorter: true,
+          needTotal: true,
+          customRender: (text) => text + ' 次'
+        },
+        {
+          title: '状态',
+          dataIndex: 'status',
+          needTotal: true
+        },
+        {
+          title: '更新时间',
+          dataIndex: 'updatedAt',
+          sorter: true
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          width: '150px',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return menuList(Object.assign(parameter, this.queryParam))
+          .then(res => {
+            return res.result
+          })
+      }
     }
   },
   created () {
-    this.onLoadTree()
+    menuList({
+      parentId: '-1'
+    }).then(res => {
+      this.orgTree = res.data
+    })
   },
   methods: {
-    // 加载树节点
-    onLoadTree () {
-      this.checkedNode = undefined
-      resourceAll().then(res => {
-        this.treeData = listToTree(res.data, [], rootParentId)
-      })
-    },
-    // 选择
-    handleSelect (selectedKeys, info) {
-      const node = info.node
-      this.checkedNode = node
-      this.$refs.modal.edit(node.dataRef)
-    },
-    // 增根节点
-    handleRootCreate () {
-      this.checkedNode = undefined
-      this.$refs.modal.add(rootParentId)
-    },
-    // 增子节点
-    handleCreate () {
-      const { checkedNode } = this
-      if (!checkedNode) {
-        this.$message.warning('请选择节点')
-        return
+    handleClick (e) {
+      this.queryParam = {
+        key: e.key
       }
-      this.$refs.modal.add(checkedNode.dataRef.id)
+      this.$refs.table.refresh(true)
     },
-    // 删
-    handleDelete () {
-      const { checkedNode } = this
-      if (!checkedNode) {
-        this.$message.warning('请选择节点')
-        return false
-      }
-      if (checkedNode.dataRef.children && checkedNode.dataRef.children.length > 0) {
-        this.$message.warning('该节点有子节点，请先删除子节点')
-        return false
-      }
-      // 删除节点判断是删除新增的子节点还是在编辑态的节点
-      const parentId = this.$refs.modal.getParentId()
-      const id = checkedNode.dataRef.id
-      if (parentId === id) {
-       this.$refs.modal.onReset(true)
-      } else {
-        const _this = this
-        this.$confirm({
-          title: '提示',
-          content: '确认删除该节点？',
-          onOk () {
-            resourceDelete({ id: id })
-              .then(res => {
-                _this.$message.success('删除成功！')
-                _this.onLoadTree()
-              })
-          }
-        })
-      }
+    handleAdd (item) {
+      this.$message.info(`提示：你点了 ${item.key} - ${item.title} `)
+      this.$refs.modal.add(item.key)
     },
-    handleOk () {
-      this.onLoadTree()
+    handleTitleClick (item) {
+      console.log('handleTitleClick', item)
+    },
+    titleClick (e) {
+      console.log('titleClick', e)
+    },
+    handleSaveOk () {
+    },
+    handleSaveClose () {
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
     }
   }
 }
 </script>
 
 <style lang="less">
-.resource-form{
-  margin-top: 20px;
-}
+  .custom-tree {
+    /deep/ .ant-menu-item-group-title {
+      position: relative;
+      &:hover {
+        .btn {
+          display: block;
+        }
+      }
+    }
+
+    /deep/ .ant-menu-item {
+      &:hover {
+        .btn {
+          display: block;
+        }
+      }
+    }
+
+    /deep/ .btn {
+      display: none;
+      position: absolute;
+      top: 0;
+      right: 10px;
+      width: 20px;
+      height: 40px;
+      line-height: 40px;
+      z-index: 1050;
+
+      &:hover {
+        transform: scale(1.2);
+        transition: 0.5s all;
+      }
+    }
+  }
 </style>
diff --git a/src/views/security/resource/modules/CreateForm.vue b/src/views/security/resource/modules/CreateForm.vue
deleted file mode 100644
index 63d52fe..0000000
--- a/src/views/security/resource/modules/CreateForm.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <a-form-model
-    ref="ruleForm"
-    :model="form"
-    :rules="rules"
-    :label-col="labelCol"
-    :wrapper-col="wrapperCol"
-    class="resource-form">
-    <a-form-model-item ref="name" label="名称" prop="name">
-      <a-input v-model="form.name" />
-    </a-form-model-item>
-    <a-form-model-item ref="code" label="编码" prop="code">
-      <a-input v-model="form.code" />
-    </a-form-model-item>
-    <a-form-model-item ref="description" label="组件名称" prop="description">
-      <a-input v-model="form.description" />
-    </a-form-model-item>
-    <a-form-model-item ref="url" label="URL" prop="url">
-      <a-input v-model="form.url" />
-    </a-form-model-item>
-    <a-form-model-item ref="actions" label="权限" prop="actions">
-      <a-select v-model="form.actions" mode="multiple">
-        <a-select-option v-for="i in permissions" :key="i.key">{{ i.label }}</a-select-option>
-      </a-select>
-    </a-form-model-item>
-    <a-form-model-item ref="icon" label="图标" prop="icon">
-      <icon-selector-view ref="iconModel" @ok="handleIcon"></icon-selector-view>
-      <a-input v-model="form.icon" @click="$refs.iconModel.show()">
-        <a-icon v-if="form.icon" slot="prefix" :type="form.icon" />
-      </a-input>
-    </a-form-model-item>
-    <a-form-model-item ref="enabled" label="状态" prop="enabled">
-      <a-radio-group v-model="form.enabled">
-        <a-radio :value="true">启用</a-radio>
-        <a-radio :value="false">停用</a-radio>
-      </a-radio-group>
-    </a-form-model-item>
-    <a-form-model-item ref="sortOrder" label="排序" prop="sortOrder">
-      <a-input v-model="form.sortOrder" />
-    </a-form-model-item>
-    <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
-      <a-button type="primary" @click="onSubmit" :loading="loading">保存</a-button>
-      <a-button @click="onCancel">取消</a-button>
-    </a-form-model-item>
-  </a-form-model>
-</template>
-
-<script>
-import { resourceAdd, resourceUpdate } from '@/api/security/resource'
-import IconSelectorView from '@/components/IconSelector/IconSelectorView'
-import { PERMISSION_ENUM } from '@/utils/helper/permission'
-
-export default {
-  props: {
-    id: {
-      type: String,
-      default: undefined
-    }
-  },
-  components: {
-    IconSelectorView
-  },
-  data () {
-    return {
-      loading: false,
-      labelCol: { span: 4 },
-      wrapperCol: { span: 14 },
-      permissions: PERMISSION_ENUM,
-      form: {
-        parentId: '',
-        name: '',
-        code: '',
-        url: '',
-        actions: [],
-        icon: '',
-        enabled: true,
-        sortOrder: 0,
-        description: ''
-      },
-      rules: {
-        parentId: [{ required: true, message: '请输入父级' }],
-        name: [{ required: true, message: '请输入名称', trigger: 'blur' }, { min: 2, message: '长度不能小于2', trigger: 'blur' }],
-        code: [{ required: true, message: '请输入编码', trigger: 'blur' }, { min: 2, message: '长度不能小于2', trigger: 'blur' }],
-        url: [{ required: true, message: '请输入正确的URL', trigger: 'blur' }],
-        sortOrder: [{ required: true, message: '请输入排序', trigger: 'blur' }],
-        description: [{ required: true, message: '请输入组件名称', trigger: 'blur' }]
-      }
-    }
-  },
-  methods: {
-    add (id) {
-      if (!this.loading && id) {
-        this.$refs.ruleForm.resetFields()
-        this.form.parentId = id
-        this.form.id = undefined
-      }
-    },
-    edit (obj) {
-      this.form = Object.assign({}, obj)
-    },
-    onSubmit (e) {
-      if (this.loading) {
-        return false
-      }
-      this.loading = false
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          if (this.form.id) {
-            resourceUpdate(this.form).then(data => {
-              this.$emit('ok')
-              this.onCancel()
-            }, () => {
-              this.loading = false
-            })
-          } else {
-            resourceAdd(this.form).then(data => {
-              this.$emit('ok')
-              this.onCancel()
-            }, () => {
-              this.loading = false
-            })
-          }
-        } else {
-          this.loading = false
-          return false
-        }
-      })
-    },
-    onCancel () {
-      this.$refs.ruleForm.resetFields()
-      delete this.form.id
-      this.loading = false
-    },
-    onReset (all) {
-      if (all) {
-        this.form.parentId = undefined
-      }
-      this.$refs.ruleForm.resetFields()
-    },
-    handleIcon (item) {
-      this.form.icon = item
-    },
-		getParentId () {
-			return this.form.parentId
-		}
-  }
-}
-</script>
-
-<style>
-</style>
diff --git a/src/views/security/resource/modules/OrgModal.vue b/src/views/security/resource/modules/OrgModal.vue
new file mode 100644
index 0000000..d83955c
--- /dev/null
+++ b/src/views/security/resource/modules/OrgModal.vue
@@ -0,0 +1,100 @@
+<template>
+  <a-modal
+    title="操作"
+    :width="600"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          label="父级ID"
+        >
+          <a-input v-decorator="['parentId', {}]" disabled />
+        </a-form-item>
+
+        <a-form-item
+          label="机构名称"
+        >
+          <a-input v-decorator="['orgName', {}]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+export default {
+  name: 'OrgModal',
+  data () {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      visible: false,
+      confirmLoading: false,
+      mdl: {}
+    }
+  },
+  beforeCreate () {
+    this.form = this.$form.createForm(this)
+    console.log('form::', this.form)
+  },
+  created () {
+
+  },
+  methods: {
+    add (id) {
+      this.edit({ parentId: id })
+    },
+    edit (record) {
+      this.mdl = Object.assign({}, record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue({ ...record })
+      })
+    },
+    close () {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk () {
+      const _this = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        // 验证表单没错误
+        if (!err) {
+          console.log('form values', values)
+
+          _this.confirmLoading = true
+          // 模拟后端请求 2000 毫秒延迟
+          new Promise((resolve) => {
+            setTimeout(() => resolve(), 2000)
+          }).then(() => {
+            // Do something
+            _this.$message.success('保存成功')
+            _this.$emit('ok')
+          }).catch(() => {
+            // Do something
+          }).finally(() => {
+            _this.confirmLoading = false
+            _this.close()
+          })
+        }
+      })
+    },
+    handleCancel () {
+      this.close()
+    }
+
+  }
+}
+</script>
diff --git a/src/views/security/resource/modules/RoleModal.vue b/src/views/security/resource/modules/RoleModal.vue
new file mode 100644
index 0000000..37bcd2a
--- /dev/null
+++ b/src/views/security/resource/modules/RoleModal.vue
@@ -0,0 +1,147 @@
+<template>
+  <a-modal
+    title="操作"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-steps :current="1">
+      <a-step>
+        <!-- <span slot="title">Finished</span> -->
+        <template slot="title">
+          Finished
+        </template>
+        <span slot="description">This is a description.</span>
+      </a-step>
+      <a-step title="In Progress" description="This is a description." />
+      <a-step title="Waiting" description="This is a description." />
+    </a-steps>
+  </a-modal>
+</template>
+
+<script>
+import { getPermissions } from '@/api/manage'
+import { actionToObject } from '@/utils/permissions'
+import pick from 'lodash.pick'
+
+export default {
+  name: 'RoleModal',
+  data () {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      visible: false,
+      confirmLoading: false,
+      mdl: {},
+
+      form: this.$form.createForm(this),
+      permissions: []
+    }
+  },
+  created () {
+    this.loadPermissions()
+  },
+  methods: {
+    add () {
+      this.edit({ id: 0 })
+    },
+    edit (record) {
+      this.mdl = Object.assign({}, record)
+      this.visible = true
+
+      // 有权限表，处理勾选
+      if (this.mdl.permissions && this.permissions) {
+        // 先处理要勾选的权限结构
+        const permissionsAction = {}
+        this.mdl.permissions.forEach(permission => {
+          permissionsAction[permission.permissionId] = permission.actionEntitySet.map(entity => entity.action)
+        })
+        // 把权限表遍历一遍，设定要勾选的权限 action
+        this.permissions.forEach(permission => {
+          permission.selected = permissionsAction[permission.id] || []
+        })
+      }
+
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'status', 'describe'))
+      })
+      console.log('this.mdl', this.mdl)
+    },
+    close () {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk () {
+      const _this = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        // 验证表单没错误
+        if (!err) {
+          console.log('form values', values)
+
+          _this.confirmLoading = true
+          // 模拟后端请求 2000 毫秒延迟
+          new Promise((resolve) => {
+            setTimeout(() => resolve(), 2000)
+          }).then(() => {
+            // Do something
+            _this.$message.success('保存成功')
+            _this.$emit('ok')
+          }).catch(() => {
+            // Do something
+          }).finally(() => {
+            _this.confirmLoading = false
+            _this.close()
+          })
+        }
+      })
+    },
+    handleCancel () {
+      this.close()
+    },
+    onChangeCheck (permission) {
+      permission.indeterminate = !!permission.selected.length && (permission.selected.length < permission.actionsOptions.length)
+      permission.checkedAll = permission.selected.length === permission.actionsOptions.length
+    },
+    onChangeCheckAll (e, permission) {
+      Object.assign(permission, {
+        selected: e.target.checked ? permission.actionsOptions.map(obj => obj.value) : [],
+        indeterminate: false,
+        checkedAll: e.target.checked
+      })
+    },
+    loadPermissions () {
+      const that = this
+      getPermissions().then(res => {
+        const result = res.result
+        that.permissions = result.map(permission => {
+          const options = actionToObject(permission.actionData)
+          permission.checkedAll = false
+          permission.selected = []
+          permission.indeterminate = false
+          permission.actionsOptions = options.map(option => {
+            return {
+              label: option.describe,
+              value: option.action
+            }
+          })
+          return permission
+        })
+      })
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/security/role/RoleList.vue b/src/views/security/role/RoleList.vue
index f239caf..5901776 100644
--- a/src/views/security/role/RoleList.vue
+++ b/src/views/security/role/RoleList.vue
@@ -1,75 +1,56 @@
 <template>
-  <page-header-wrapper :title="false">
-    <a-card :bordered="false">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="名称">
-                <a-input v-model="queryParam.name" placeholder="请输入名称" @pressEnter="handleRefresh"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="机构">
-                <a-tree-select
-                  v-model="queryParam.orgId"
-                  style="width: 100%"
-                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                  :tree-data="orgData"
-                  placeholder="请选择机构"
-                  tree-default-expand-all
-                  :replaceFields="{
-                    children:'children',
-                    title:'name',
-                    key:'id',
-                    value:'id'
-                  }"
-                >
-                </a-tree-select></a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="状态">
-                <a-select v-model="queryParam.status" placeholder="请选择" default-value="0" @pressEnter="handleRefresh">
-                  <a-select-option value="">全部</a-select-option>
-                  <a-select-option v-for="(item, index) in statusMap" :key="index" :value="index">{{ item }}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="handleRefresh">查询</a-button>
-              <a-button @click="() => {queryParam = {}, handleRefresh()}">重置</a-button>
-            </a-col>
-            <a-col :md="6" :sm="24" align="right">
-              <a-button type="primary" @click="handleCreate">新增</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-      >
-        <template slot="time" slot-scope="text, record">{{ record.createdAt | moment }}</template>
-        <template slot="tbStatus" slot-scope="text, record">
-          <a-switch checked-children="启用" un-checked-children="停用" v-model="record.status" @change="updateStatus(record.id, record.status)"/>
-        </template>
-        <template slot="action" slot-scope="text, record">
-          <a href="javascript:;" @click="handleEdit(record)">修改</a>
-          <a-divider type="vertical" />
-          <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
-            <a href="javascript:;">删除</a>
-          </a-popconfirm>
-          <a-divider type="vertical" />
-          <a href="javascript:;" @click="handleDetail(record.id)">详情</a>
-        </template>
-      </s-table>
-      <create-form ref="modal" @ok="handleOk" />
-      <role-detail ref="detail"></role-detail>
-    </a-card>
-  </page-header-wrapper>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="名称">
+              <a-input v-model="queryParam.name" placeholder="请输入名称" @pressEnter="handleFefresh"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="状态">
+              <a-select v-model="queryParam.status" placeholder="请选择" default-value="0" @pressEnter="handleFefresh">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option v-for="(item, index) in statusMap" :key="index" :value="index">{{ item }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="handleFefresh">查询</a-button>
+            <a-button @click="() => {queryParam = {}, handleFefresh()}">重置</a-button>
+          </a-col>
+          <a-col :md="6" :sm="24" align="right">
+            <a-button type="primary" @click="handleCreate">新增</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <s-table
+      ref="table"
+      size="default"
+      rowKey="id"
+      :columns="columns"
+      :data="loadData"
+      :rowSelection="rowSelection"
+    >
+      <template slot="time" slot-scope="text, record">{{record.createdAt | moment}}</template>
+      <template slot="tbStatus" slot-scope="text, record">
+        <a-switch checked-children="启用" un-checked-children="停用" v-model="record.status" @change="updateStatus(record.id, record.status)"/>
+      </template>
+      <template slot="action" slot-scope="text, record">
+        <a href="javascript:;" @click="handleEdit(record)">修改</a>
+        <a-divider type="vertical" />
+        <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
+          <a href="javascript:;">删除</a>
+        </a-popconfirm>
+        <a-divider type="vertical" />
+        <a href="javascript:;" @click="handleDetail(record.id)">详情</a>
+      </template>
+    </s-table>
+    <create-form ref="modal" @ok="handleOk" />
+    <role-detail ref="detail"></role-detail>
+  </a-card>
 </template>
 
 <script>
@@ -78,10 +59,9 @@ import { STable } from '@/components'
 import CreateForm from './modules/CreateForm'
 import RoleDetail from './modules/RoleDetail'
 import { statusMap } from '@/views/status/statusMap'
-import { orgTreeGet } from '@/api/bms/org'
 
 export default {
-  name: 'RoleList',
+  name: 'roleList',
   components: {
     STable,
     CreateForm,
@@ -90,12 +70,10 @@ export default {
   data () {
     return {
       statusMap: statusMap,
-      orgData: [],
-      queryParam: { name: '', status: '', orgId: '' },
+      queryParam: { name: '', status: '' },
       selectedRowKeys: [], // 选中行的key 出选择框时需要配置
       selectedRows: [], // 选中行的数据
       columns: [
-        { title: '机构', width: 30, dataIndex: 'orgName', key: 'orgName' },
         { title: '名称', width: 30, dataIndex: 'name', key: 'name' },
         { title: '编码', width: 30, dataIndex: 'code', key: 'code' },
         {
@@ -166,7 +144,7 @@ export default {
     // 删
     handleDelete (record) {
       roleDelete({ id: record.id }).then(() => {
-        this.$refs.table.refresh()
+        this.loadData()
       })
     },
     // 编辑后回调
@@ -177,22 +155,14 @@ export default {
     handleDetail (id) {
       this.$refs.detail.show(id)
     },
-    handleRefresh () {
+    handleFefresh () {
       this.$refs.table.refresh(true)
     },
     // 选择行
     onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
-    },
-    loadOrg () {
-      orgTreeGet({ treeLevel: 'MALL' }).then(data => {
-        this.orgData = data.data
-      })
     }
-  },
-  mounted () {
-    this.loadOrg()
   }
 }
 </script>
diff --git a/src/views/security/role/RoleResource.vue b/src/views/security/role/RoleResource.vue
deleted file mode 100644
index 5056d46..0000000
--- a/src/views/security/role/RoleResource.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <page-header-wrapper :title="false">
-    <a-row :gutter="24">
-      <a-col :span="9">
-        <a-card :bordered="false" title="角色">
-          <ul class="ant-tree ant-tree-show-line">
-            <li v-for="item in roleTreeData" :key="item.id" @click="handleSelect(item.id)" >
-              <span class="ant-tree-switcher ant-tree-switcher-noop">
-                <a-icon type="file" />
-              </span>
-              <span class="ant-tree-node-content-wrapper" :class="{ 'ant-tree-node-selected' : item.id == roleId }">
-                <span class="ant-tree-title">{{ item.name }}</span>
-              </span>
-            </li>
-          </ul>
-        </a-card>
-      </a-col>
-      <a-col :span="15">
-        <a-card :bordered="false" title="资源">
-          <a-tree
-            show-line
-            checkable
-            v-model="checkedKeys"
-            :tree-data="resourceTreeData"
-            :replace-fields="replaceFields"
-            :disabled="disabled"
-            @check="onCheck" >
-          </a-tree>
-        </a-card>
-      </a-col>
-    </a-row>
-  </page-header-wrapper>
-</template>
-
-<script>
-import { rolePage } from '@/api/security/role'
-import { resourceByRoleId } from '@/api/security/resource'
-import { roleResourceAdd, roleResourceDelete } from '@/api/security/roleResource'
-
-export default {
-  data () {
-    return {
-      replaceFields: {
-        title: 'name',
-        key: 'id'
-      },
-      roleTreeData: [],
-      resourceTreeData: [],
-      checkedKeys: [],
-      roleId: '',
-      disabled: false
-    }
-  },
-  created () {
-    this.loadRoles()
-  },
-  methods: {
-    loadRoles () {
-      rolePage({
-        pageSize: 50,
-        status: 1
-      }).then(res => {
-        this.roleTreeData = res.data.entities
-      })
-    },
-    loadResource (roleId) {
-      resourceByRoleId({
-        roleId
-      }).then(res => {
-        this.resourceTreeData = res.data
-        const result = this.initCheckedKeys(res.data, [])
-        this.checkedKeys = result
-      })
-    },
-    initCheckedKeys (data, result) {
-      for (let i = 0, length = data.length; i < length; i++) {
-        const item = data[i]
-        // 只获取checked为true的子节点,父节点自动会根据子节点勾选状态判定是全选还是半选
-        if (item.checked && item.children.length === 0) {
-          result.push(item.id)
-          continue
-        } else if (item.children.length > 0) {
-          this.initCheckedKeys(item.children, result)
-        }
-      }
-      return result
-    },
-    handleSelect (roleId) {
-      if (this.roleId === roleId || this.disabled) {
-        return false
-      }
-      this.roleId = roleId
-      this.loadResource(roleId)
-    },
-    onCheck (checkedKeys, info) {
-      if (this.disabled) {
-        return false
-      }
-      this.checkedKeys = checkedKeys
-      const id = info.node.dataRef.id
-      const checked = info.checked
-      if (checked) {
-        this.addResource(id)
-      } else {
-        this.deleteResource(id)
-      }
-    },
-    addResource (id) {
-      const { roleId } = this
-      roleResourceAdd({
-        roleId,
-        resourceId: id
-      }).then(res => {
-      }).finally(() => {
-        this.disabled = false
-      })
-    },
-    deleteResource (id) {
-      const { roleId } = this
-      roleResourceDelete({
-        roleId,
-        resourceId: id
-      }).then(res => {
-      }).finally(() => {
-        this.disabled = false
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-  .ant-tree{
-    li {
-      cursor: pointer;
-    }
-  }
-</style>
diff --git a/src/views/security/role/modules/CreateForm.vue b/src/views/security/role/modules/CreateForm.vue
index 89aed8f..e6ce643 100644
--- a/src/views/security/role/modules/CreateForm.vue
+++ b/src/views/security/role/modules/CreateForm.vue
@@ -1,27 +1,6 @@
 <template>
-  <a-drawer :visible="visible" :title="modalTitle" :width="720" @close="onCancel">
+  <a-modal centered :visible="visible" :title="modalTitle" :width="720" @close="onCancel">
     <a-form-model ref="ruleForm" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-item label="机构" ref="orgId" prop="orgId">
-            <a-tree-select
-              v-model="form.orgId"
-              style="width: 100%"
-              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-              :tree-data="orgData"
-              placeholder="请选择机构"
-              tree-default-expand-all
-              @select="onSelectOrg"
-              :replaceFields="{
-                children:'children',
-                title:'name',
-                key:'id',
-                value:'id'
-              }"
-            >
-            </a-tree-select></a-form-item>
-        </a-col>
-      </a-row>
       <a-row :gutter="16">
         <a-col :span="12">
           <a-form-model-item ref="name" label="名称" prop="name"><a-input v-model="form.name" /></a-form-model-item>
@@ -31,8 +10,8 @@
         </a-col>
       </a-row>
       <a-row :gutter="16">
-        <a-col>
-          <a-form-model-item ref="description" label="描述" prop="description" :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }"><a-input v-model="form.description" /></a-form-model-item>
+        <a-col :span="12">
+          <a-form-model-item ref="description" label="描述" prop="description"><a-input v-model="form.description" /></a-form-model-item>
         </a-col>
       </a-row>
     </a-form-model>
@@ -40,13 +19,12 @@
       <a-button @click="onCancel">取消</a-button>
       <a-button type="primary" @click="onSubmit">保存</a-button>
     </div>
-
-  </a-drawer>
+  </a-modal>
 </template>
 
 <script>
 import { roleGet, roleAdd, roleUpdate } from '@/api/security/role'
-import { orgTreeGet } from '@/api/bms/org'
+import { typeMap } from '../../maps/map.js'
 
 export default {
   props: {
@@ -57,27 +35,39 @@ export default {
   },
   data () {
     return {
+      typeMap: typeMap,
+      orgList: [],
       modalTitle: '新增',
       visible: false,
-      labelCol: { span: 6 },
-      wrapperCol: { span: 18 },
+      labelCol: { span: 4 },
+      wrapperCol: { span: 16 },
       form: {
-        name: '',
-        code: '',
-        description: '',
+        rolename: '',
+        realName: '',
+        mobile: '',
+        password: '',
+        type: undefined,
         orgId: undefined,
-        orgName: ''
+        orgName: '',
+        address: '',
+        email: ''
       },
       rules: {
-        name: [{ required: true, message: '请输入名称' }],
-        orgId: [{ required: true, message: '请选择机构' }]
-      },
-      orgData: []
+        rolename: [{ required: true, message: '请输入用户名', trigger: 'blur' }, { min: 5, message: '长度不能小于5', trigger: 'blur' }],
+        realName: [{ required: true, message: '请输入姓名', trigger: 'blur' }, { min: 2, message: '长度不能小于5', trigger: 'blur' }],
+        mobile: [{ required: true, message: '请输入正确的手机号', pattern: /^1[3456789]\d{9}$/, trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }, { min: 6, message: '长度不能小于6', trigger: 'blur' }],
+        orgId: [{ required: true, message: '请选择机构', trigger: 'blur' }]
+      }
+    }
+  },
+  filters: {
+    typeFilter (type) {
+      return typeMap[type]
     }
   },
   methods: {
     add () {
-      this.form.id = undefined
       this.modalTitle = '新增'
       this.visible = true
     },
@@ -110,23 +100,17 @@ export default {
     },
     onCancel () {
       this.$refs.ruleForm.resetFields()
-      delete this.form.id
       this.visible = false
     },
     onReset () {
       this.$refs.ruleForm.resetFields()
     },
-    loadOrg () {
-      orgTreeGet({ treeLevel: 'MALL' }).then(data => {
-        this.orgData = data.data
-      })
-    },
-    onSelectOrg(value, node, extra) {
-      this.form.orgName = node.dataRef.name
+    onChange (index) {
+      const org = this.orgList[index]
+      this.form.orgName = org.name
+      this.form.orgId = org.id
+      this.form.type = 'MALL'
     }
-  },
-  mounted () {
-    this.loadOrg()
   }
 }
 </script>
diff --git a/src/views/security/role/modules/RoleDetail.vue b/src/views/security/role/modules/RoleDetail.vue
index 4ea1c36..28a7e89 100644
--- a/src/views/security/role/modules/RoleDetail.vue
+++ b/src/views/security/role/modules/RoleDetail.vue
@@ -9,7 +9,7 @@
       <a-descriptions-item label="名称">{{ model.name }}</a-descriptions-item>
       <a-descriptions-item label="描述">{{ model.description }}</a-descriptions-item>
       <a-descriptions-item label="创建时间">{{ model.createdAt | moment }}</a-descriptions-item>
-      <a-descriptions-item label="最近修改">{{ model.updatedAt | moment }}</a-descriptions-item>
+      <a-descriptions-item label="修改时间">{{ model.updatedAt | moment }}</a-descriptions-item>
     </a-descriptions>
   </a-drawer>
 </template>
diff --git a/src/views/security/user/UserList.vue b/src/views/security/user/UserList.vue
index 9c13366..1d7379a 100644
--- a/src/views/security/user/UserList.vue
+++ b/src/views/security/user/UserList.vue
@@ -6,48 +6,34 @@
           <a-row :gutter="48">
             <a-col :md="6" :sm="24">
               <a-form-item label="名称">
-                <a-input v-model="queryParam.realName" placeholder="请输入名称" @pressEnter="handleRefresh"/>
+                <a-input v-model="queryParam.realName" placeholder="请输入名称" @pressEnter="handleFefresh"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="机构">
-                <a-tree-select
-                  v-model="queryParam.orgId"
-                  style="width: 100%"
-                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                  :tree-data="orgData"
-                  placeholder="请选择机构"
-                  tree-default-expand-all
-                  :replaceFields="{
-                    children:'children',
-                    title:'name',
-                    key:'id',
-                    value:'id'
-                  }"
-                >
-                </a-tree-select></a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="状态">
-                <a-select v-model="queryParam.enabled" placeholder="请选择" default-value="0" @pressEnter="handleRefresh">
+                <a-select v-model="queryParam.enabled" placeholder="请选择" default-value="0" @pressEnter="handleFefresh">
                   <a-select-option value="">全部</a-select-option>
                   <a-select-option v-for="(item, index) in statusMap" :key="index" :value="index">{{ item }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="handleRefresh">查询</a-button>
-              <a-button @click="() => {queryParam = {}, handleRefresh()}">重置</a-button>
-              <a-button type="primary" class="ant-btn-right" @click="handleCreate">新增</a-button>
+              <a-button type="primary" @click="handleFefresh">查询</a-button>
+              <a-button @click="() => {queryParam = {}, handleFefresh()}">重置</a-button>
+            </a-col>
+            <a-col :md="6" :sm="24" align="right">
+              <a-button type="primary" @click="handleCreate">新增</a-button>
             </a-col>
           </a-row>
         </a-form>
       </div>
       <s-table
         ref="table"
+        size="default"
         rowKey="id"
         :columns="columns"
         :data="loadData"
+        :rowSelection="rowSelection"
       >
         <template slot="tbStatus" slot-scope="text, record">
           <a-switch checked-children="启用" un-checked-children="停用" v-model="record.enabled" @change="updateStatus(record.id, record.enabled)"/>
@@ -57,15 +43,11 @@
           <a-divider type="vertical" />
           <a href="javascript:;" @click="handleDetail(record.id)">详情</a>
           <a-divider type="vertical" />
-          <a href="javascript:;" @click="handlePassword(record.id)">修改密码</a>
-          <a-divider type="vertical" />
-          <a href="javascript:;" @click="handleRole(record.id)">分配角色</a>
+          <a href="javascript:;" @click="handleDetail(record.id)">修改密码</a>
         </template>
       </s-table>
       <create-form ref="modal" @ok="handleOk" />
       <user-detail ref="detail"></user-detail>
-      <user-role ref="role"></user-role>
-      <password-form ref="password"></password-form>
     </a-card>
   </page-header-wrapper>
 </template>
@@ -75,28 +57,21 @@ import { userPage, userUpdateEnabled } from '@/api/security/user'
 import { STable } from '@/components'
 import CreateForm from './modules/CreateForm'
 import UserDetail from './modules/UserDetail'
-import UserRole from './modules/UserRole'
-import OrgTree from './modules/OrgTree'
-import PasswordForm from '@/components/PasswordForm'
 import { statusMap } from '@/views/status/statusMap'
-import { orgTreeGet } from '@/api/bms/org'
 
 export default {
   name: 'UserList',
   components: {
     STable,
     CreateForm,
-    UserDetail,
-    UserRole,
-    PasswordForm,
-    OrgTree
+    UserDetail
   },
   data () {
     return {
-      isShowOrg: false,
       statusMap: statusMap,
-      orgData: [],
-      queryParam: { realName: '', enabled: '', orgId: '' },
+      queryParam: { realName: '', enabled: '' },
+      selectedRowKeys: [], // 选中行的key 出选择框时需要配置
+      selectedRows: [], // 选中行的数据
       columns: [
         { title: '名称', width: 40, dataIndex: 'realName', key: 'realName' },
         { title: '手机号', width: 40, dataIndex: 'mobile', key: 'mobile' },
@@ -117,17 +92,26 @@ export default {
         }
       ],
       loadData: parameter => {
-        return userPage(Object.assign(parameter, this.queryParam))
+        const enabled = this.queryParam.enabled
+        const queryParam = {
+          realName: this.queryParam.realName,
+          enabled: enabled === '1' ? true : enabled === '0' ? false : ''
+        }
+        return userPage(Object.assign(parameter, queryParam))
           .then(res => {
-           const data = res.data
-           data.entities.forEach((item) => {
-             item.status = item.status === 1
-           })
-           return data
+            return res.data
           })
       }
     }
   },
+  computed: {
+    rowSelection () {
+      return {
+        selectedRowKeys: this.selectedRowKeys,
+        onChange: this.onSelectChange
+      }
+    }
+  },
   methods: {
     // 修改状态
     updateStatus (id, status) {
@@ -143,10 +127,6 @@ export default {
         this.$refs.table.refresh()
       })
     },
-    // 分配角色
-    handleRole (userId) {
-      this.$refs.role.show(userId)
-    },
     // 增
     handleCreate () {
       this.$refs.modal.add()
@@ -163,20 +143,14 @@ export default {
     handleDetail (id) {
       this.$refs.detail.show(id)
     },
-    handlePassword (id) {
-      this.$refs.password.show(id)
-    },
-    handleRefresh () {
+    handleFefresh () {
       this.$refs.table.refresh(true)
     },
-    loadOrg () {
-      orgTreeGet({ treeLevel: 'MALL' }).then(data => {
-        this.orgData = data.data
-      })
+    // 选择行
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
     }
-  },
-  mounted () {
-    this.loadOrg()
   }
 }
 </script>
diff --git a/src/views/security/user/UserLogin.vue b/src/views/security/user/UserLogin.vue
deleted file mode 100644
index 62ae41e..0000000
--- a/src/views/security/user/UserLogin.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <div class="main">
-    <a-form-model ref="ruleForm" class="user-layout-login" :model="form" :rules="rules" @submit.prevent="handleSubmit">
-      <a-form-model-item>
-        <a-input size="large" v-model="form.username" placeholder="请输入用户名">
-          <a-icon slot="prefix" type="user" style="color:rgba(0,0,0,.25)" />
-        </a-input>
-      </a-form-model-item>
-      <a-form-model-item>
-        <a-input-password size="large" v-model="form.password" placeholder="请输入密码">
-          <a-icon slot="prefix" type="lock" style="color:rgba(0,0,0,.25)" />
-        </a-input-password>
-      </a-form-model-item>
-      <a-form-model-item>
-        <a-button block type="primary" size="large" html-type="submit" :loading="loading">登录</a-button>
-      </a-form-model-item>
-    </a-form-model>
-  </div>
-</template>
-
-<script>
-import { mapActions } from 'vuex'
-import { timeFix } from '@/utils/util'
-
-export default {
-  data () {
-    return {
-      form: {
-        username: '',
-        password: ''
-      },
-      rules: {
-        username: [{ required: true, message: '请输入账号' }],
-        password: [{ required: true, message: '请输入密码', trigger: 'blur' }]
-      },
-      loading: false
-    }
-  },
-  methods: {
-    ...mapActions(['Login', 'Logout']),
-    handleSubmit () {
-      if (this.loading) {
-        return false
-      }
-      this.loading = false
-      this.$refs.ruleForm.validate(valid => {
-        const { form } = this
-				console.log(form)
-        if (valid) {
-          this.Login(form).then(() => {
-            this.loginSuccess()
-          }, (res) => {
-            this.requestFailed(res)
-          })
-        } else {
-          this.loading = false
-          return false
-        }
-      })
-    },
-    loginSuccess (res) {
-      this.loading = false
-      this.$router.push({ path: '/' })
-      // 延迟 1 秒显示欢迎信息
-      setTimeout(() => {
-        this.$notification.success({
-          message: '欢迎',
-          description: `${timeFix()}，欢迎回来`
-        })
-      }, 1000)
-    },
-    requestFailed (err) {
-      this.loading = false
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-</style>
diff --git a/src/views/security/user/modules/CreateForm.vue b/src/views/security/user/modules/CreateForm.vue
index df6ba08..3de5390 100644
--- a/src/views/security/user/modules/CreateForm.vue
+++ b/src/views/security/user/modules/CreateForm.vue
@@ -17,33 +17,6 @@
           <a-form-model-item ref="password" label="密码" prop="password"><a-input-password v-model="form.password" /></a-form-model-item>
         </a-col>
       </a-row>
-      <a-row>
-        <a-col>
-          <a-form-model-item ref="type" label="类型" prop="type" :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }">
-            <a-radio-group name="type" v-model="form.type" :disabled="orgDisable" >
-              <a-radio v-if="isCorporation" value="CORPORATION">
-                公司管理员
-              </a-radio>
-              <a-radio v-if="isCorporation || isMall" value="MALL">
-                门店管理员
-              </a-radio>
-              <a-radio value="STORE">
-                店长
-              </a-radio>
-              <a-radio value="STAFF">
-                店员
-              </a-radio>
-            </a-radio-group>
-          </a-form-model-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-model-item ref="orgName" label="机构" prop="orgName">
-            <a-input v-model="form.orgName" readOnly @click="openOrgTree" :disabled="orgDisable"/>
-          </a-form-model-item>
-        </a-col>
-      </a-row>
       <a-row :gutter="16">
         <a-col :span="12">
           <a-form-model-item ref="address" label="地址" prop="address"><a-input v-model="form.address" /></a-form-model-item>
@@ -57,35 +30,28 @@
       <a-button @click="onCancel">取消</a-button>
       <a-button type="primary" @click="onSubmit">保存</a-button>
     </div>
-
-    <org-tree @selectOrg="selectOrg($event)" ref="orgModal"/>
-
   </a-drawer>
 </template>
 
 <script>
 import { userGet, userAdd, userUpdate } from '@/api/security/user'
-import OrgTree from './OrgTree'
-import { userMixin } from '@/store/user-mixin'
+import { typeMap } from '../../maps/map.js'
 
 export default {
-  mixins: [userMixin],
   props: {
     id: {
       type: String,
       default: undefined
     }
   },
-  components: {
-    OrgTree
-  },
   data () {
     return {
-      isShowOrg: false,
+      typeMap: typeMap,
+      orgList: [],
       modalTitle: '新增',
       visible: false,
-      labelCol: { span: 6 },
-      wrapperCol: { span: 18 },
+      labelCol: { span: 4 },
+      wrapperCol: { span: 16 },
       form: {
         username: '',
         realName: '',
@@ -102,23 +68,13 @@ export default {
         realName: [{ required: true, message: '请输入姓名', trigger: 'blur' }, { min: 2, message: '长度不能小于5', trigger: 'blur' }],
         mobile: [{ required: true, message: '请输入正确的手机号', pattern: /^1[3456789]\d{9}$/, trigger: 'blur' }],
         password: [{ required: true, message: '请输入密码', trigger: 'blur' }, { min: 6, message: '长度不能小于6', trigger: 'blur' }],
-        type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
-        orgName: [{ required: true, message: '请选择机构', trigger: 'blur' }]
+        orgId: [{ required: true, message: '请选择机构', trigger: 'blur' }]
       }
     }
   },
-  computed: {
-    orgDisable () {
-      return this.modalTitle === '修改'
-    }
-  },
-  created () {
-    if (this.isCorporation) {
-      this.form.type = 'CORPORATION'
-    } else if (this.isMall) {
-      this.form.type = 'MALL'
-    } else {
-      this.form.type = 'STORE'
+  filters: {
+    typeFilter (type) {
+      return typeMap[type]
     }
   },
   methods: {
@@ -155,18 +111,16 @@ export default {
     },
     onCancel () {
       this.$refs.ruleForm.resetFields()
-      delete this.form.id
       this.visible = false
     },
     onReset () {
       this.$refs.ruleForm.resetFields()
     },
-    openOrgTree () {
-      this.$refs.orgModal.loadOrg(this.form.type)
-    },
-    selectOrg (orgData) {
-      this.form.orgId = orgData.id
-      this.form.orgName = orgData.name
+    onChange (index) {
+      const org = this.orgList[index]
+      this.form.orgName = org.name
+      this.form.orgId = org.id
+      this.form.type = 'MALL'
     }
   }
 }
diff --git a/src/views/security/user/modules/OrgTree.vue b/src/views/security/user/modules/OrgTree.vue
deleted file mode 100644
index 7207282..0000000
--- a/src/views/security/user/modules/OrgTree.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <a-modal v-model="isShowOrg" title="选择机构" :footer="null" >
-    <div>
-      <a-input-search style="margin-bottom: 8px" placeholder="搜索名称" @change="onChange" />
-      <a-tree
-        :disable-branch-nodes="true"
-        :expanded-keys="expandedKeys"
-        :auto-expand-parent="autoExpandParent"
-        :tree-data="orgList"
-        @expand="onExpand"
-        @select="onSelect"
-        :replaceFields="{
-          children:'children',
-          title:'name',
-          key:'id'
-        }"
-      >
-        <template slot="name" slot-scope="{ name }">
-          <span v-if="name.indexOf(searchValue) > -1">
-            {{ name.substr(0, name.indexOf(searchValue)) }}
-            <span style="color: #f50">{{ searchValue }}</span>
-            {{ name.substr(name.indexOf(searchValue) + searchValue.length) }}
-          </span>
-          <span v-else>{{ name }}</span>
-        </template>
-      </a-tree>
-    </div>
-  </a-modal>
-</template>
-
-<script>
-import { orgByUserType } from '@/api/bms/org'
-
-// 所有节点放进dataList,便于搜索
-const dataList = []
-const generateList = data => {
-  for (let i = 0; i < data.length; i++) {
-    const node = data[i]
-    // 设置插槽,搜索结果样式变化
-    node.scopedSlots = { title: 'name' }
-    const id = node.id
-    const name = node.name
-    dataList.push({ id, name })
-    if (node.children) {
-      generateList(node.children)
-    }
-  }
-}
-
-// 获取传入id所在节点的父节点
-const getParentKey = (id, tree) => {
-  let parentKey
-  for (let i = 0; i < tree.length; i++) {
-    const node = tree[i]
-    if (node.children) {
-      if (node.children.some(item => item.id === id)) {
-        parentKey = node.id
-      } else if (getParentKey(id, node.children)) {
-        parentKey = getParentKey(id, node.children)
-      }
-    }
-  }
-  return parentKey
-}
-export default {
-  data () {
-    return {
-      expandedKeys: [],
-      searchValue: '',
-      autoExpandParent: true,
-      orgList: [],
-      isShowOrg: false
-    }
-  },
-  methods: {
-    onExpand (expandedKeys) {
-      this.expandedKeys = expandedKeys
-      this.autoExpandParent = false
-    },
-    onSelect (selectedKeys, info) {
-      var orgInfo = info.node.dataRef
-      const org = { id: orgInfo.id, name: orgInfo.name, type: orgInfo.type }
-      this.$emit('selectOrg', org)
-      this.isShowOrg = false
-    },
-    onChange (e) {
-      const value = e.target.value
-      // 获取搜索结果所在节点的父节点集合
-      const expandedKeys = dataList
-        .map(item => {
-          if (item.name.indexOf(value) > -1) {
-            return getParentKey(item.id, this.orgList)
-          }
-          return null
-        })
-        .filter((item, i, self) => item && self.indexOf(item) === i)
-      // 拷贝,根据搜索结果设置展开节点
-      Object.assign(this, {
-        expandedKeys,
-        searchValue: value,
-        autoExpandParent: true
-      })
-    },
-    loadOrg (userType) {
-      orgByUserType({ userType: userType }).then(data => {
-        const orgData = data.data
-        // 默认展开树节点
-        for (let i = 0; i < orgData.length; i++) {
-          this.expandedKeys.push(orgData[i].id)
-          for (let j = 0; j < orgData[i].children.length; j++) {
-            this.expandedKeys.push(orgData[i].children[j].id)
-          }
-        }
-        generateList(orgData)
-        this.orgList = orgData
-      })
-      this.isShowOrg = true
-    }
-  }
-}
-</script>
diff --git a/src/views/security/user/modules/UserDetail.vue b/src/views/security/user/modules/UserDetail.vue
index 1a7c87e..851792f 100644
--- a/src/views/security/user/modules/UserDetail.vue
+++ b/src/views/security/user/modules/UserDetail.vue
@@ -9,11 +9,11 @@
       <a-descriptions-item label="用户名">{{ model.username }}</a-descriptions-item>
       <a-descriptions-item label="姓名">{{ model.realName }}</a-descriptions-item>
       <a-descriptions-item label="创建时间">{{ model.createdAt | moment }}</a-descriptions-item>
-      <a-descriptions-item label="最近修改">{{ model.updatedAt | moment }}</a-descriptions-item>
+      <a-descriptions-item label="修改时间">{{ model.updatedAt | moment }}</a-descriptions-item>
       <a-descriptions-item label="状态">{{ model.enabled | statusFilter }}</a-descriptions-item>
       <a-descriptions-item label="手机号">{{ model.mobile }}</a-descriptions-item>
       <a-descriptions-item label="机构">{{ model.orgName }}</a-descriptions-item>
-      <a-descriptions-item label="类型">{{ model.type | typeFilter }}</a-descriptions-item>
+      <a-descriptions-item label="类型">{{ model.type | typeFilter}}</a-descriptions-item>
       <a-descriptions-item label="地址">{{ model.address }}</a-descriptions-item>
       <a-descriptions-item label="邮箱">{{ model.email }}</a-descriptions-item>
     </a-descriptions>
@@ -23,7 +23,7 @@
 <script>
 import { userGet } from '@/api/security/user'
 import { enabledMap } from '@/views/status/enabledMap'
-// import { typeMap } from '../../maps/map.js'
+import { typeMap } from '../../maps/map.js'
 
 export default {
   data () {
@@ -37,7 +37,7 @@ export default {
       return enabledMap[status + '']
     },
     typeFilter (type) {
-      return ''
+      return typeMap[type]
     }
   },
   methods: {
diff --git a/src/views/security/user/modules/UserRole.vue b/src/views/security/user/modules/UserRole.vue
deleted file mode 100644
index 697b5d6..0000000
--- a/src/views/security/user/modules/UserRole.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <a-drawer class="role-drawer" :visible="visible" title="分配角色" :width="720" @close="onCancel">
-    <a-transfer
-      class="role-transfer"
-      :data-source="dataSource"
-      :titles="['未选中', '已选择']"
-      :operations="['添加', '移除']"
-      :target-keys="targetKeys"
-      :show-search="true"
-      :filter-option="(inputValue, item) => item.title.indexOf(inputValue) !== -1"
-      :show-select-all="false"
-      :render="item => item.title"
-      @change="onChange"
-    >
-    </a-transfer>
-    <div class="draw-button-container align-center">
-      <a-button @click="onCancel">取消</a-button>
-      <a-button type="primary" @click="onSubmit">保存</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-import { rolePage, rolesByUserId } from '@/api/security/role'
-import { userRoleAdd, userRoleDelete } from '@/api/security/userRole'
-import { Transfer } from 'ant-design-vue'
-import { diffArray } from '@/utils/util'
-
-export default {
-  components: {
-    [Transfer.name]: Transfer
-  },
-  data () {
-    return {
-      visible: false,
-      dataSource: [],
-      targetKeys: [],
-      originalKeys: [],
-      userId: '',
-      isLoading: false
-    }
-  },
-  methods: {
-    show (userId) {
-      if (!userId) {
-        return false
-      }
-      this.userId = userId
-      this.visible = true
-      this.loadRoles()
-      this.loadUserRoles(userId)
-    },
-    loadRoles () {
-      rolePage({
-        pageSize: 30,
-        status: 1
-      }).then(res => {
-        const data = []
-        res.data.entities.forEach((item) => {
-          data.push({
-            key: item.id,
-            title: item.name
-          })
-        })
-        this.dataSource = data
-      })
-    },
-    loadUserRoles (userId) {
-      rolesByUserId({
-        userId,
-        checked: true
-      }).then(res => {
-        const data = []
-        res.data.forEach((item) => {
-          data.push(item.id)
-        })
-        this.targetKeys = data
-        this.originalKeys = data
-      })
-    },
-    onSubmit () {
-      if (this.isLoading) {
-        return false
-      }
-      this.isLoading = true
-      const { targetKeys, originalKeys, userId } = this
-      const addArray = diffArray(targetKeys, originalKeys)
-      const deleteArray = diffArray(originalKeys, targetKeys)
-      if (addArray.length > 0) {
-        userRoleAdd({ roleId: addArray.join(','), userId }).then(res => {
-        })
-      }
-      if (deleteArray.length > 0) {
-        userRoleDelete({ roleId: deleteArray.join(','), userId }).then(res => {
-        })
-      }
-      this.isLoading = false
-      this.onCancel()
-    },
-    onCancel () {
-      this.visible = false
-      this.dataSource = []
-      this.targetKeys = []
-      this.originalKeys = []
-    },
-    onChange (nextTargetKeys) {
-      if (this.isLoading) {
-        return false
-      }
-      this.targetKeys = nextTargetKeys
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.role-drawer {
-  /deep/ .ant-drawer-wrapper-body {
-    position: relative;
-    .ant-drawer-body {
-      position: absolute;
-      top: 55px;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      padding: 0;
-    }
-  }
-}
-.role-transfer {
-  display: flex;
-  align-items: center;
-  height: 100%;
-  padding: 24px 24px 75px;
-  /deep/ .ant-transfer-list {
-    flex: 1;
-    height: 100%;
-  }
-  /deep/ .ant-transfer-list-body{
-    overflow-y: auto;
-  }
-  /deep/ .ant-transfer-operation .ant-btn {
-    margin-left: 0;
-  }
-}
-</style>
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index d31d98a..fdf88b0 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -7,68 +7,33 @@
       :form="form"
       @submit="handleSubmit"
     >
-      <a-tabs
-        :activeKey="customActiveKey"
-        :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"
-        @change="handleTabClick"
-      >
-        <a-tab-pane key="tab1" tab="账号密码登录">
-          <a-alert v-if="isLoginError" type="error" showIcon style="margin-bottom: 24px;" message="账户或密码错误（admin/ant.design )" />
-          <a-form-item>
-            <a-input
-              size="large"
-              type="text"
-              placeholder="账户: admin"
-              v-decorator="[
-                'username',
-                {rules: [{ required: true, message: '请输入帐户名或邮箱地址' }, { validator: handleUsernameOrEmail }], validateTrigger: 'change'}
-              ]"
-            >
-              <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-            </a-input>
-          </a-form-item>
-
-          <a-form-item>
-            <a-input-password
-              size="large"
-              placeholder="密码: admin or ant.design"
-              v-decorator="[
-                'password',
-                {rules: [{ required: true, message: '请输入密码' }], validateTrigger: 'blur'}
-              ]"
-            >
-              <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-            </a-input-password>
-          </a-form-item>
-        </a-tab-pane>
-        <a-tab-pane key="tab2" tab="手机号登录">
-          <a-form-item>
-            <a-input size="large" type="text" placeholder="手机号" v-decorator="['mobile', {rules: [{ required: true, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号' }], validateTrigger: 'change'}]">
-              <a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-            </a-input>
-          </a-form-item>
-
-          <a-row :gutter="16">
-            <a-col class="gutter-row" :span="16">
-              <a-form-item>
-                <a-input size="large" type="text" placeholder="验证码" v-decorator="['captcha', {rules: [{ required: true, message: '请输入验证码' }], validateTrigger: 'blur'}]">
-                  <a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-                </a-input>
-              </a-form-item>
-            </a-col>
-            <a-col class="gutter-row" :span="8">
-              <a-button
-                class="getCaptcha"
-                tabindex="-1"
-                :disabled="state.smsSendBtn"
-                @click.stop.prevent="getCaptcha"
-                v-text="!state.smsSendBtn && '获取验证码' || (state.time+' s')"
-              ></a-button>
-            </a-col>
-          </a-row>
-        </a-tab-pane>
-      </a-tabs>
+      <a-alert v-if="isLoginError" type="error" showIcon style="margin-bottom: 24px;" message="账户或密码错误（18729260811/a123456789 )" />
+      <a-form-item>
+        <a-input
+          size="large"
+          type="text"
+          placeholder="账户: 18729260811"
+          v-decorator="[
+            'mobile',
+            {rules: [{ required: true, message: '请输入帐户名或邮箱地址' }], validateTrigger: 'change'}
+          ]"
+        >
+          <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
+        </a-input>
+      </a-form-item>
 
+      <a-form-item>
+        <a-input-password
+          size="large"
+          placeholder="密码: a123456789"
+          v-decorator="[
+            'password',
+            {rules: [{ required: true, message: '请输入密码' }], validateTrigger: 'blur'}
+          ]"
+        >
+          <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
+        </a-input-password>
+      </a-form-item>
       <a-form-item>
         <a-checkbox v-decorator="['rememberMe', { valuePropName: 'checked' }]">自动登录</a-checkbox>
         <router-link
@@ -88,108 +53,48 @@
           :disabled="state.loginBtn"
         >确定</a-button>
       </a-form-item>
-
-      <div class="user-login-other">
-        <span>其他登录方式</span>
-        <a>
-          <a-icon class="item-icon" type="alipay-circle"></a-icon>
-        </a>
-        <a>
-          <a-icon class="item-icon" type="taobao-circle"></a-icon>
-        </a>
-        <a>
-          <a-icon class="item-icon" type="weibo-circle"></a-icon>
-        </a>
-        <router-link class="register" :to="{ name: 'register' }">注册账户</router-link>
-      </div>
     </a-form>
-
-    <two-step-captcha
-      v-if="requiredTwoStepCaptcha"
-      :visible="stepCaptchaVisible"
-      @success="stepCaptchaSuccess"
-      @cancel="stepCaptchaCancel"
-    ></two-step-captcha>
   </div>
 </template>
 
 <script>
-import md5 from 'md5'
-import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
 import { mapActions } from 'vuex'
 import { timeFix } from '@/utils/util'
-import { getSmsCaptcha, get2step } from '@/api/login'
 
 export default {
-  components: {
-    TwoStepCaptcha
-  },
   data () {
     return {
-      customActiveKey: 'tab1',
       loginBtn: false,
-      // login type: 0 email, 1 username, 2 telephone
       loginType: 0,
       isLoginError: false,
-      requiredTwoStepCaptcha: false,
-      stepCaptchaVisible: false,
       form: this.$form.createForm(this),
       state: {
         time: 60,
         loginBtn: false,
-        // login type: 0 email, 1 username, 2 telephone
-        loginType: 0,
-        smsSendBtn: false
+        loginType: 0
       }
     }
   },
-  created () {
-    get2step({ })
-      .then(res => {
-        this.requiredTwoStepCaptcha = res.result.stepCode
-      })
-      .catch(() => {
-        this.requiredTwoStepCaptcha = false
-      })
-    // this.requiredTwoStepCaptcha = true
-  },
   methods: {
     ...mapActions(['Login', 'Logout']),
-    // handler
-    handleUsernameOrEmail (rule, value, callback) {
-      const { state } = this
-      const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/
-      if (regex.test(value)) {
-        state.loginType = 0
-      } else {
-        state.loginType = 1
-      }
-      callback()
-    },
-    handleTabClick (key) {
-      this.customActiveKey = key
-      // this.form.resetFields()
-    },
     handleSubmit (e) {
       e.preventDefault()
       const {
         form: { validateFields },
         state,
-        customActiveKey,
         Login
       } = this
 
       state.loginBtn = true
 
-      const validateFieldsKey = customActiveKey === 'tab1' ? ['username', 'password'] : ['mobile', 'captcha']
+      const validateFieldsKey = ['mobile', 'password']
 
       validateFields(validateFieldsKey, { force: true }, (err, values) => {
         if (!err) {
-          console.log('login form', values)
           const loginParams = { ...values }
           delete loginParams.username
           loginParams[!state.loginType ? 'email' : 'username'] = values.username
-          loginParams.password = md5(values.password)
+          loginParams.password = values.password
           Login(loginParams)
             .then((res) => this.loginSuccess(res))
             .catch(err => this.requestFailed(err))
@@ -203,62 +108,7 @@ export default {
         }
       })
     },
-    getCaptcha (e) {
-      e.preventDefault()
-      const { form: { validateFields }, state } = this
-
-      validateFields(['mobile'], { force: true }, (err, values) => {
-        if (!err) {
-          state.smsSendBtn = true
-
-          const interval = window.setInterval(() => {
-            if (state.time-- <= 0) {
-              state.time = 60
-              state.smsSendBtn = false
-              window.clearInterval(interval)
-            }
-          }, 1000)
-
-          const hide = this.$message.loading('验证码发送中..', 0)
-          getSmsCaptcha({ mobile: values.mobile }).then(res => {
-            setTimeout(hide, 2500)
-            this.$notification['success']({
-              message: '提示',
-              description: '验证码获取成功，您的验证码为：' + res.result.captcha,
-              duration: 8
-            })
-          }).catch(err => {
-            setTimeout(hide, 1)
-            clearInterval(interval)
-            state.time = 60
-            state.smsSendBtn = false
-            this.requestFailed(err)
-          })
-        }
-      })
-    },
-    stepCaptchaSuccess () {
-      this.loginSuccess()
-    },
-    stepCaptchaCancel () {
-      this.Logout().then(() => {
-        this.loginBtn = false
-        this.stepCaptchaVisible = false
-      })
-    },
     loginSuccess (res) {
-      console.log(res)
-      // check res.homePage define, set $router.push name res.homePage
-      // Why not enter onComplete
-      /*
-      this.$router.push({ name: 'analysis' }, () => {
-        console.log('onComplete')
-        this.$notification.success({
-          message: '欢迎',
-          description: `${timeFix()}，欢迎回来`
-        })
-      })
-      */
       this.$router.push({ path: '/' })
       // 延迟 1 秒显示欢迎信息
       setTimeout(() => {
@@ -269,13 +119,8 @@ export default {
       }, 1000)
       this.isLoginError = false
     },
-    requestFailed (err) {
+    requestFailed () {
       this.isLoginError = true
-      this.$notification['error']({
-        message: '错误',
-        description: ((err.response || {}).data || {}).message || '请求出现错误，请稍后再试',
-        duration: 4
-      })
     }
   }
 }
@@ -286,45 +131,19 @@ export default {
   label {
     font-size: 14px;
   }
-
   .getCaptcha {
     display: block;
     width: 100%;
     height: 40px;
   }
-
   .forge-password {
     font-size: 14px;
   }
-
   button.login-button {
     padding: 0 15px;
     font-size: 16px;
     height: 40px;
     width: 100%;
   }
-
-  .user-login-other {
-    text-align: left;
-    margin-top: 24px;
-    line-height: 22px;
-
-    .item-icon {
-      font-size: 24px;
-      color: rgba(0, 0, 0, 0.2);
-      margin-left: 16px;
-      vertical-align: middle;
-      cursor: pointer;
-      transition: color 0.3s;
-
-      &:hover {
-        color: #1890ff;
-      }
-    }
-
-    .register {
-      float: right;
-    }
-  }
 }
 </style>
diff --git a/vue.config.js b/vue.config.js
index a687f1e..9b515b5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -94,11 +94,11 @@ const vueConfig = {
 
   devServer: {
     disableHostCheck: true, // ���vue��Ŀ�еġ�Invalid Host header������
-    port: 8000, // development server port Ĭ��8000������ÿ������Ŀ����Ķ˿ں��Ƕ��ٶ���
+    port: 8001, // development server port Ĭ��8001������ÿ������Ŀ����Ķ˿ں��Ƕ��ٶ���
     // �����Ҫ�������������Ƴ�mockjs /src/main.jsL11
     proxy: {
       '/dawa': { // ����API�ı�־�����API��������ַ�������ô�Ϳ�ʼƥ�����
-        target: 'http://a.3a6.cn', // ��ַ������������Ҳ������IP��ַ������API����/api/getList, �ᱻ����������http://www.baidu.com/api/getList ��
+        target: 'http://a.3a6.cn/', // ��ַ������������Ҳ������IP��ַ������API����/api/getList, �ᱻ����������http://www.baidu.com/api/getList ��
         ws: false,
         changeOrigin: true // ���target��������Ҫ��������һ������changeOrigin: true����������ʧ�ܡ�
       }