update:新增角色管理页面

server/router.js

@@ -11,6 +11,5 @@ router.post(`${API_VERSION}/merchant/authority/get_role_list`, system.getAll_rol
 router.post(`${API_VERSION}/merchant/authority/get_role_info`, system.get_role_info)
 router.post(`${API_VERSION}/merchant/lifeinner/life_info`, system.getUser_detail)
 router.get(`${API_VERSION}/merchant/lifeinner/life_list`, system.get_life_list)
-getUser_detail
 
 module.exports = router;

src/pages/Role/add-role.vue

@@ -116,7 +116,7 @@ export default {
         user_email: "jianghaiming@126.com",
       },
       roleDataList: [],
-      totalNum: 20,
+      totalNum: null,
       edit: false,
       dialogFormVisible: false,
       roleName: '',
@@ -170,9 +170,8 @@ export default {
     getGetRole_list () {
       let { page, page_size } = this.parmas
       reqGetRole_list(page, page_size).then(res => {
-        this.roleDataList = res
-        // console.log(res, '00')
-        // this.totalNum = res.count
+        this.roleDataList = res.result
+        this.totalNum = res.count
       })
     },
     //列表分页
@@ -246,7 +245,6 @@ export default {
         selectedArr.push(childArr[i]);
       }
       this.selectedOptions = selectedArr
-      console.log(this.selectedOptions, ' this.selectedOptions this.selectedOptions this.selectedOptions')
     },
     //编辑角色
     getUpdate_role () {

src/pages/Role/manage-role.vue

+<template>
+  <div class="maageRole">
+    <el-table
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 10px"
+      :header-cell-style="{ background: '#e1e4e5', color: '#80878f' }"
+    >
+      <el-table-column prop="date" label="ID" width="180"> </el-table-column>
+      <el-table-column prop="name" label="角色名称" width="180">
+      </el-table-column>
+      <el-table-column prop="date" label="状态" width="180"> </el-table-column>
+      <el-table-column prop="date" label="最后修改日期" width="180">
+      </el-table-column>
+      <el-table-column prop="address" label="最后修改人账号"> </el-table-column>
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            @click="handleModify(scope.$index, scope.row)"
+            >数据权限</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleModify(scope.$index, scope.row)"
+            >删除</el-button
+          >
+          <el-button
+            size="mini"
+            type="success"
+            @click="handleModify(scope.$index, scope.row)"
+          >
+            启用</el-button
+          >
+          <el-button
+            size="mini"
+            type="primary"
+            @click="handleModify(scope.$index, scope.row)"
+          >
+            禁用</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1517 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1519 弄'
+      }, {
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1516 弄'
+      }]
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.maageRole {
+  margin: 50px;
+}
+</style>
\ No newline at end of file

src/pages/User/user-detail.vue

@@ -50,7 +50,7 @@
   </div>
 </template>
 <script>
-import { getUser_detail as reqGetUser_detail } from '../../service/user'
+// import { getUser_detail as reqGetUser_detail } from '../../service/user'
 export default {
   data () {
     return {
@@ -60,9 +60,9 @@ export default {
     }
   },
   created () {
-    reqGetUser_detail(this.user_id).then((res) => {
-      console.log(res, '000')
-    })
+    // reqGetUser_detail(this.user_id).then((res) => {
+    //   console.log(res, '000')
+    // })
   }
 }
 </script>

src/router/index.js

@@ -5,6 +5,7 @@ import LifeNo from '../pages/Life-no/index.vue'
 import LifeNoDetail from '../pages/Life-no/life-no-detail.vue'
 import UserDetail from '../pages/User/user-detail.vue'
 import AddRole from '../pages/Role/add-role.vue'
+import ManageRole from '../pages/Role/manage-role.vue'
 
 const routes = [
   {
@@ -60,6 +61,11 @@ const routes = [
     name: 'AddRole',
     component: AddRole
   },
+  {
+    path: '/roleManageRole',
+    name: 'ManageRole',
+    component: ManageRole
+  },
 ];
 
 const router = createRouter({

src/service/role.js

@@ -5,11 +5,10 @@ export async function getRole_list (page, page_size) {
   const res = await axios.post("/api/v1/merchant/authority/role_list", {
     page, page_size
   })
-  return res.result;
+  return res;
 }
 //添加角色
 export async function getAdd_role (role_name, permissions) {
-  // qs.stringify(permissions)
   const res = await axios.post("/api/v1/merchant/authority/add_role", {
     role_name, permissions
   })