Merge branch 'master' of http://git.cc-lotus.info/live-platform/live-cms

src/router/index.js

@@ -22,13 +22,13 @@ const routes = [
   },
   {
     path: '/role/index',
-    meta: { title: '权限管理' },
+    meta: { title: '菜单管理' },
     component: () => import('../views/role/index.vue'),
   },
 
   {
     path: '/role/detail',
-    meta: { title: '权限详情' },
+    meta: { title: '菜单详情' },
     component: () => import('../views/role/detail.vue'),
   },
   {

src/store/role.js

@@ -27,7 +27,7 @@ const actions = {
     return res;
   },
   async update({ commit }, { id, ...info } = {}) {
-    const res = await this.$axios.$post(`${api.roleInfo}/${id}`, {
+    const res = await this.$axios.$post(`${api.roleInfo}/update/${id}`, {
       ...info,
     });
     return res;

src/util/role_menu.js

@@ -9,7 +9,7 @@ export const user = {
   icon: 'iconfont iconyonghu',
 };
 export const role = {
-  name: '权限管理',
+  name: '菜单管理',
   path: '/role/index',
   icon: 'iconfont iconquanxian',
 };

src/views/role/detail.vue

@@ -30,14 +30,14 @@ export default {
       drawerIsNew: true,
       form: {},
       fields: [
-        { label: '权限名称', prop: 'role_name', model: 'role_name' },
-        { label: '权限code', prop: 'code', model: 'code' },
-        { label: '权限路由', prop: 'url', model: 'url' },
+        { label: '菜单名称', prop: 'role_name', model: 'role_name' },
+        // { label: '权限code', prop: 'code', model: 'code' },
+        { label: '菜单路由', prop: 'url', model: 'url' },
       ],
       rules: {
-        role_name: [{ required: true, message: '权限名称' }],
-        code: [{ required: true, message: '权限code' }],
-        url: [{ required: true, message: '请输入权限路由' }],
+        role_name: [{ required: true, message: '菜单名称' }],
+        code: [{ required: false, message: '权限code' }],
+        url: [{ required: true, message: '请输入菜单路由' }],
       },
     };
   },
@@ -53,13 +53,13 @@ export default {
       let res;
       let msg;
       if (this.isNew) {
-        res = await this.update(data);
-        msg = `${this.keyWord}修改成功`;
-      } else {
         res = await this.create(data);
         msg = `${this.keyWord}添加成功`;
+      } else {
+        res = await this.update(data);
+        msg = `${this.keyWord}修改成功`;
       }
-      if (this.$checkRes(res, msg)) this.$router.push({ path: './index' });
+      if (this.$checkRes(res, msg)) this.$router.push({ path: '/role/index' });
     },
   },
   computed: {

src/views/role/index.vue

@@ -6,7 +6,7 @@
           <topInfo :topTitle="pageTitle"></topInfo>
         </el-col>
         <el-col :span="24" class="add" style="text-align:right">
-          <el-button size="mini" type="primary" @click="$router.push({ path: './detail' })" icon="el-icon-plus">添加权限</el-button>
+          <el-button size="mini" type="primary" @click="$router.push({ path: './detail' })" icon="el-icon-plus">添加菜单</el-button>
         </el-col>
       </el-col>
       <el-col :span="24" class="info">
@@ -19,7 +19,6 @@
 import topInfo from '@/layout/public/top.vue';
 import dataTable from '@/components/data-table.vue';
 import { mapActions, mapState, createNamespacedHelpers } from 'vuex';
-
 const { mapActions: role } = createNamespacedHelpers('role');
 export default {
   name: 'index',
@@ -43,8 +42,8 @@ export default {
       },
     ],
     fields: [
-      { label: '权限名称', prop: 'role_name' },
-      { label: '权限code', prop: 'code' },
+      { label: '菜单名称', prop: 'role_name' },
+      // { label: '权限code', prop: 'code' },
       { label: 'url', prop: 'url' },
     ],
     list: [],
@@ -55,19 +54,14 @@ export default {
   },
   methods: {
     ...role(['query', 'delete', 'update', 'fetch']),
-
     async search({ skip = 0, limit = 10, ...info } = {}) {
-      let res = await this.query();
-      console.log(res.data);
+      let res = await this.query({ skip, limit, ...info });
       this.$set(this, `list`, res.data);
       this.$set(this, `total`, res.total);
     },
     toEdit({ data }) {
-      console.log('1');
-
-      this.$router.push({ path: './detail', query: { id: data.id } });
+      this.$router.push({ path: '/role/detail', query: { id: data.id } });
     },
-
     async toDelete({ data }) {
       const res = await this.delete(data.id);
       this.$checkRes(res, '删除成功', '删除失败');