Merge pull request #12 from shiwei-Ren/develop

fix:适配后端的改动

Author: duktig666

src/api/login.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function login(username, password, code, uuid) {
   return request({
-    url: 'api/login',
+    url: 'api/auth/login',
     method: 'post',
     data: {
       username,
@@ -15,21 +15,21 @@ export function login(username, password, code, uuid) {
 
 export function getInfo() {
   return request({
-    url: 'api/info',
+    url: 'api/auth/info',
     method: 'get'
   })
 }
 
 export function getCodeImg() {
   return request({
-    url: 'api/code',
+    url: 'api/auth/code',
     method: 'get'
   })
 }
 
 export function logout() {
   return request({
-    url: 'api/logout',
+    url: 'api/auth/logout',
     method: 'delete'
   })
 }

src/utils/request.js

@@ -38,19 +38,11 @@ service.interceptors.response.use(
       })
       return Promise.reject('error')
     } else {
-      if (response.data.code !== 0 && response.data.code !== 401 && response.data.code !== 403) {
+      if (response.data.code !== 0) {
         Notification.error({
           title: response.data.message
         })
         return Promise.reject('error')
-      } else if (response.data.code === 401) {
-        store.dispatch('LogOut').then(() => {
-          // 用户登录界面提示
-          Cookies.set('point', 401)
-          location.reload()
-        })
-      } else if (response.data.code === 403) {
-        router.push({ path: '/401' })
       }
       return response.data
     }
@@ -88,7 +80,7 @@ service.interceptors.response.use(
       }
     } else {
       Notification.error({
-        title: '接口请求失败',
+        title: '服务器异常,请重试!',
         duration: 5000
       })
     }

src/views/system/dept/index.vue

@@ -97,7 +97,7 @@ export default {
   name: 'Dept',
   components: { Treeselect, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '部门', url: 'api/dept', sort: [{ 'column': 'dept_sort', 'asc': 'true' }], params: { pid: 0 }, crudMethod: { ...crudDept }})
+    return CRUD({ title: '部门', url: 'api/dept', sort: [{ 'column': 'dept_sort', 'asc': 'true' }], crudMethod: { ...crudDept }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
@@ -162,7 +162,7 @@ export default {
       })
     },
     getDepts() {
-      crudDept.getDepts({ enabled: true, pid: 0 }).then(res => {
+      crudDept.getDepts({ enabled: true }).then(res => {
         this.depts = res.data.records.map(function(obj) {
           if (obj.hasChildren) {
             obj.children = null

src/views/system/menu/index.vue

@@ -67,8 +67,8 @@
         <el-form-item label="菜单排序" prop="menuSort">
           <el-input-number v-model.number="form.menuSort" :min="0" :max="999" controls-position="right" style="width: 178px;" />
         </el-form-item>
-        <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件名称" prop="componentName">
-          <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段" />
+        <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件名称" prop="name">
+          <el-input v-model="form.name" style="width: 178px;" placeholder="匹配组件内Name字段" />
         </el-form-item>
         <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件路径" prop="component">
           <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径" />
@@ -164,7 +164,7 @@ import udOperation from '@crud/UD.operation'
 import DateRangePicker from '@/components/DateRangePicker'
 
 // crud交由presenter持有
-const defaultForm = { id: null, title: null, menuSort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null }
+const defaultForm = { id: null, title: null, menuSort: 999, path: null, component: null, name: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null }
 export default {
   name: 'Menu',
   components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker },