bug

src/common/api/login.js

 import axios from './axios'
 
-export function getLoginState({ userName, password }) {
-  return axios.post('platform/user/login', { userName, password })
+export function getLoginState({ account, password }) {
+  return axios.post('platform/user/login', { account, password })
 }
 
 export function logout() {

src/views/LoginPage.vue

@@ -5,14 +5,14 @@
       <h2>登录</h2>
       <el-form ref="loginForm" :model="loginForm" class="login-form">
         <el-form-item
-          prop="userName"
+          prop="account"
           :rules="[
             { required: true, message: '请输入用户名' },
           ]"
         >
           <el-input
             prefix-icon="el-icon-user"
-            v-model="loginForm.userName"
+            v-model="loginForm.account"
             placeholder="User Name"
             clearable
           ></el-input>
@@ -61,7 +61,7 @@ export default {
   data() {
     return {
       loginForm: {
-        userName: '',
+        account: '',
         password: '',
       },
       showPwd: false,

src/views/home/HomeView.vue

@@ -43,6 +43,7 @@ export default {
 }
 
 .right {
+  height: calc(100% - 60px);
   flex: 1;
   display: flex;
   flex-direction: column;
@@ -58,7 +59,7 @@ export default {
 
 .content {
   flex: 1;
-  padding: 10px 10px 0px 10px;
+  padding: 10px;
   background-color: #f1f1f1;
 }
 </style>

src/views/home/navMenu.vue

@@ -9,6 +9,7 @@
       mode="horizontal"
       :default-active="this.$route.path"
       text-color="#fff"
+      style="flex: 1"
       background-color="#1565C0"
       @click.native="onClickMenus"
       active-text-color="#ffd04b"
@@ -48,7 +49,10 @@
       <span class="user-name">{{
         userInfo && userInfo.userName
       }}</span>
-      <el-button type="text" style="color:#fff" @click="logout"
+      <el-button
+        type="text"
+        style="color: #fff"
+        @click="logout"
         >退出登录</el-button
       >
     </div>
@@ -100,6 +104,14 @@ export default {
               index: 'user',
               children: [],
             },
+            {
+              id: 4,
+              path: '',
+              label: '角色管理',
+              icon: 'el-icon-s-order',
+              index: 'user',
+              children: [],
+            },
           ],
         },
       ],
@@ -134,7 +146,11 @@ export default {
   height: 60px;
   overflow: hidden;
   background-color: #1565c0;
+
   &::v-deep {
+    .el-menu {
+      border-bottom: none;
+    }
     .el-submenu__title i {
       color: #fff;
     }
@@ -149,7 +165,6 @@ export default {
   color: #fff;
   font-weight: bold;
   padding: 14px 20px;
-  border-right: 1px solid #e6e6e6;
   background-color: #1565c0;
 }
 
@@ -157,6 +172,7 @@ export default {
   font-size: 16px;
 }
 .user-area {
+  float: right;
   display: flex;
   align-items: center;
   flex-shrink: 0;

src/views/menu.vue

@@ -416,8 +416,7 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-  padding: 0 20px;
-  padding-top: 10px;
+  padding: 10px 20px 0;
 }
 
 .table-wrap {

src/views/system/users.vue

@@ -397,7 +397,7 @@ export default {
     axios.get('sysRole/all_list').then((res) => {
       this.roleList = res.data
     })
-    axios.get('saasUserLogin/employeePlatformList')
+    axios.get('platform/user/employeePlatformList')
       .then((res) => {
         this.platforms = res.data
       })
@@ -619,7 +619,7 @@ export default {
   },
   methods: {
     spentChange(v, item) {
-      axios.post('saasUserLogin/update', {
+      axios.post('platform/user/update', {
         ...item,
         cost: v,
       }).then(() => {
@@ -679,7 +679,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          axios.post('saasUserLogin/resetPassword/' + row.id).then(
+          axios.post('platform/user/resetPassword/' + row.id).then(
             (res) => {
               this.$alert(
                 '重置成功\n\r 新密码为：' +
@@ -691,7 +691,7 @@ export default {
         .catch(() => {})
     },
     enableChange(val, row) {
-      axios.post('saasUserLogin/setEnableStatus', {
+      axios.post('platform/user/setEnableStatus', {
         enable: val,
         userId: row.id,
       }).then((res) => {
@@ -705,7 +705,7 @@ export default {
         return
       }
 
-      axios.post('saasUserLogin/setBindingStatus', {
+      axios.post('platform/user/setBindingStatus', {
         bindStatus: !row.bindStatus,
         userId: row.id,
       }).then((res) => {
@@ -743,7 +743,7 @@ export default {
         if (!this.formId) {
           return this.$message('请勾选至少一条记录')
         }
-        axios.get('saasUserLogin/axios.get', {
+        axios.get('platform/user/axios.get', {
           id: v.id,
         }).then((res) => {
           const funcRoleIds = []
@@ -801,7 +801,7 @@ export default {
     getList() {
       const { pageSize, currentPage } =
         this.paginationOptions
-      axios.post('saasUserLogin/list_page', {
+      axios.post('platform/user/list_page', {
         pageSize,
         currentPage,
         ...this.searchForm,
@@ -832,7 +832,7 @@ export default {
 
     // 修改
     upSection() {
-      const url = 'saasUserLogin/update'
+      const url = 'platform/user/update'
       this.$refs.addcurrencyform.validate((valid) => {
         if (valid) {
           const data = JSON.parse(
@@ -863,7 +863,7 @@ export default {
     },
     // 新增
     addSection() {
-      const url = 'saasUserLogin/add'
+      const url = 'platform/user/add'
       this.$refs.addcurrencyform.validate((valid) => {
         if (valid) {
           const data = JSON.parse(
@@ -916,7 +916,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          axios.get('saasUserLogin/delete', {
+          axios.get('platform/user/delete', {
             ids: ids,
           }).then((res) => {
             if (res.code === 200) {