diff --git a/.env.development b/.env.development
index 8f5856d..6e7b816 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,7 @@ ENV = 'development'
 
 # base api
 VUE_APP_BASE_API = '/dev-api'
-
+# VUE_APP_BASE_API = 'http://localhost/sys-glass/api/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().
diff --git a/mock/table.js b/mock/table.js
index ba95f76..b36449b 100644
--- a/mock/table.js
+++ b/mock/table.js
@@ -1,11 +1,11 @@
 import Mock from 'mockjs'
 
 const data = Mock.mock({
-  'items|30': [{
+  'items|10': [{
     id: '@id',
-    title: '@sentence(10, 20)',
+    title: '@sentence(3, 10)',
     'status|1': ['published', 'draft', 'deleted'],
-    author: 'name',
+    author: 'name@integer(300, 5000)',
     display_time: '@datetime',
     pageviews: '@integer(300, 5000)'
   }]
@@ -13,7 +13,7 @@ const data = Mock.mock({
 
 export default [
   {
-    url: '/vue-admin-template/table/list',
+    url: '/yp/table/list',
     type: 'get',
     response: config => {
       const items = data.items
diff --git a/mock/user.js b/mock/user.js
index f007cd9..4893ae1 100644
--- a/mock/user.js
+++ b/mock/user.js
@@ -3,35 +3,52 @@ const tokens = {
   admin: {
     token: 'admin-token'
   },
+  assistant: {
+    token: 'assistant-token'
+  },
   editor: {
     token: 'editor-token'
+  },
+  shoper: {
+    token: 'shoper-token'
   }
 }
 
 const users = {
-  'admin-token': {
+  'admin-token': {//管理员
     roles: ['admin'],
     introduction: 'I am a super administrator',
     avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
     name: 'Super Admin'
   },
-  'editor-token': {
+  'assistant-token': {//管理员助理
+    roles: ['assistant'],
+    introduction: 'I am a assistant of administrator',
+    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
+    name: 'Super Admin'
+  },
+  'editor-token': {//运营人员
     roles: ['editor'],
     introduction: 'I am an editor',
     avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
     name: 'Normal Editor'
+  },
+  'shoper-token': {//供应商
+    roles: ['shoper'],
+    introduction: 'I am an shoper',
+    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
+    name: 'Normal Editor'
   }
 }
 
 export default [
   // user login
   {
-    url: '/vue-admin-template/user/login',
+    url: '/yp/user/login',
     type: 'post',
     response: config => {
       const { username } = config.body
       const token = tokens[username]
-
       // mock error
       if (!token) {
         return {
@@ -49,7 +66,7 @@ export default [
 
   // get user info
   {
-    url: '/vue-admin-template/user/info\.*',
+    url: '/yp/user/info\.*',
     type: 'get',
     response: config => {
       const { token } = config.query
@@ -72,7 +89,7 @@ export default [
 
   // user logout
   {
-    url: '/vue-admin-template/user/logout',
+    url: '/yp/user/logout',
     type: 'post',
     response: _ => {
       return {
diff --git a/src/App.vue b/src/App.vue
index c38fbaa..ac9c633 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
   <div id="app">
     <router-view />
   </div>
-  
+
 </template>
 
 <script>
diff --git a/src/api/admin.js b/src/api/admin.js
new file mode 100644
index 0000000..52ff840
--- /dev/null
+++ b/src/api/admin.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function login(data) {
+  console.log('login....', data)
+  return request({
+    url: '/yp/user/login',
+    method: 'post',
+    data
+  })
+}
+
+export function getInfo(token) {
+  console.log('getInfo....', token)
+  return request({
+    url: '/yp/user/info',
+    method: 'get',
+    params: { token }
+  })
+}
+
+export function logout() {
+  console.log('logout....')
+  return request({
+    url: '/yp/user/logout',
+    method: 'post'
+  })
+}
diff --git a/src/api/meta.js b/src/api/meta.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/order.js b/src/api/order.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/prod.js b/src/api/prod.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/shop.js b/src/api/shop.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/site.js b/src/api/site.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/table.js b/src/api/table.js
index 2752f52..22eb044 100644
--- a/src/api/table.js
+++ b/src/api/table.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getList(params) {
   return request({
-    url: '/vue-admin-template/table/list',
+    url: '/yp/table/list',
     method: 'get',
     params
   })
diff --git a/src/api/user.js b/src/api/user.js
index 66868be..4894188 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 export function login(data) {
   console.log('login....', data)
   return request({
-    url: '/vue-admin-template/user/login',
+    url: '/yp/user/login',
     method: 'post',
     data
   })
@@ -12,7 +12,16 @@ export function login(data) {
 export function getInfo(token) {
   console.log('getInfo....', token)
   return request({
-    url: '/vue-admin-template/user/info',
+    url: '/yp/user/info',
+    method: 'get',
+    params: { token }
+  })
+}
+
+export function list(token) {
+  console.log('listUser....', token)
+  return request({
+    url: '/yp/user/list',
     method: 'get',
     params: { token }
   })
@@ -21,7 +30,7 @@ export function getInfo(token) {
 export function logout() {
   console.log('logout....')
   return request({
-    url: '/vue-admin-template/user/logout',
+    url: '/yp/user/logout',
     method: 'post'
   })
 }
diff --git a/src/router/index.js b/src/router/index.js
index 1fb0c30..166c736 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -51,16 +51,36 @@ export const constantRoutes = [
       path: 'dashboard',
       name: 'Dashboard',
       component: () => import('@/views/dashboard/index'),
-      meta: { title: '标题-------dashboard', icon: 'dashboard' }
+      meta: { title: '中控台', icon: 'dashboard' }
     }]
   },
-
+  {
+    path: '/user',
+    component: Layout,
+    redirect: '/user/list',
+    name: 'user',
+    meta: { title: '用户管理', icon: 'example' },
+    children: [
+      {
+        path: 'user',
+        name: 'User',
+        component: () => import('@/views/table/index'),
+        meta: { title: '用户列表', icon: 'table' }
+      },
+      {
+        path: 'tree',
+        name: 'Table',
+        component: () => import('@/views/tree/index'),
+        meta: { title: 'Tree', icon: 'tree' }
+      }
+    ]
+  },
   {
     path: '/example',
     component: Layout,
     redirect: '/example/table',
     name: 'Example',
-    meta: { title: 'Example', icon: 'example' },
+    meta: { title: 'E1111xample', icon: 'example' },
     children: [
       {
         path: 'table',
diff --git a/src/settings.js b/src/settings.js
index 1f54b34..2716116 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -12,5 +12,5 @@ module.exports = {
    * @type {boolean} true | false
    * @description Whether show the logo in sidebar
    */
-  sidebarLogo:true
+  sidebarLogo: true
 }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 068e003..b7ceba6 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -5,11 +5,18 @@
   </div>
 </template>
 
-
-
 <script>
 import { mapGetters } from 'vuex'
-import ElementUI from 'element-ui'
+// import ElementUI from 'element-ui'
+// 按需引入 引入 ECharts 主模块
+// var echarts = require('echarts/lib/echarts')
+// 引入柱状图
+// require('echarts/lib/chart/bar')
+// 引入提示框和标题组件
+// require('echarts/lib/component/tooltip')
+// require('echarts/lib/component/title')
+// 全部引入
+// var echarts = require('echarts')
 
 export default {
   name: 'Dashboard',
diff --git a/src/views/table/index.vue b/src/views/table/index.vue
index a1ed847..c7a341e 100644
--- a/src/views/table/index.vue
+++ b/src/views/table/index.vue
@@ -70,6 +70,7 @@ export default {
     fetchData() {
       this.listLoading = true
       getList().then(response => {
+        console.log('----getList---', response)
         this.list = response.data.items
         this.listLoading = false
       })