diff --git a/public/images/login-bg.jpeg b/public/images/login-bg.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..ce4d4dd5347af854dce9968a785a394670fbf46b
Binary files /dev/null and b/public/images/login-bg.jpeg differ
diff --git a/src/layout/components/AiniSidebar/index.vue b/src/layout/components/AiniSidebar/index.vue
index 6e1d9caf32589f295fd1815b44a6c2d4296b67ac..21fc2bc5d523ce49123e0b54061ceeb0dc72808e 100644
--- a/src/layout/components/AiniSidebar/index.vue
+++ b/src/layout/components/AiniSidebar/index.vue
@@ -1,15 +1,42 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
-import { useAppStore } from '../../../store/modules/app'
+import { useAppStore } from '@/store/modules/app'
+import { useTabStore } from '@/store/modules/tab'
+import { Tab } from '@/types/tab'
+import { Menubar } from '@/types/menu'
 import AiniMenu from '@/layout/components/AiniMenu/index.vue'
 
+const tabStore = useTabStore()
 const appStore = useAppStore()
 const isCollapse = computed(() => appStore.getCollapse)
+const goHome = () => {
+  const menu: Menubar = {
+    id: 'home',
+    menuId: 'home',
+    menuName: '首页',
+    menuType: '0',
+    icon: '',
+    sort: 0,
+    pid: '0',
+    link: 0,
+    enabled: 0,
+    status: 0,
+    path: '/home',
+    children: [],
+  }
+  const { id, menuName, path } = menu
+  const tab: Tab = {
+    id,
+    name: menuName,
+    path,
+  }
+  tabStore.setActiveTab(tab)
+}
 </script>
 
 <template>
   <div class="aini-sidebar">
-    <div class="aini-title">
+    <div class="aini-title" @click="goHome">
       <img src="@/assets/logo.png" />
       <h5 v-if="!isCollapse">quick框架</h5>
     </div>
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 8fb8e03e52807d8c13403f98f0c867a08f0f9499..56124f81957f28c94da1767c84310e7d05ea554a 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -1,52 +1,32 @@
 <script lang="ts" setup>
-import { reactive } from 'vue'
+import { UserFilled, Lock } from '@element-plus/icons-vue'
+import { reactive, ref } from 'vue'
 import { router } from '@/router'
-import { FormItem } from '@/types/form'
 import { LoginParams } from '@/types/login'
 import { useLoginStore } from '@/store/modules/login'
 import { useUserStore } from '@/store/modules/user'
 
-import QuickForm from '@/components/QuickForm/index.vue'
 /**
  * 属性
  */
 const loginStore = useLoginStore()
 const userStore = useUserStore()
+const loading = ref(false)
 const form = reactive<LoginParams>({
   tenant: '',
   userName: '',
   userPassword: '',
 })
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '租户',
-    labelWidth: '80px',
-    vModel: 'tenant',
-    type: 'text',
-    placeholder: '租户',
-  },
-  {
-    label: '用户名',
-    labelWidth: '80px',
-    vModel: 'userName',
-    type: 'text',
-    placeholder: '用户名',
-  },
-  {
-    label: '密码',
-    labelWidth: '80px',
-    vModel: 'userPassword',
-    type: 'password',
-    placeholder: '密码',
-  },
-])
 /**
  * 函数
  */
 const handleLogin = async (): Promise<void> => {
   const { userName } = form
   await loginStore.login(form)
+  loading.value = true
+  debugger
   const user = await userStore.getUserInfo(userName)
+  loading.value = false
   if (user) {
     const { id } = user
     userStore.getPermission(id.toString())
@@ -54,20 +34,81 @@ const handleLogin = async (): Promise<void> => {
   }
 }
 </script>
-
 <template>
-  <div class="login">
-    <quick-form
-      :model="form"
-      :form-items="formItems"
-      :show-action="true"
-      :action-slot="true"
-    >
-      <template #action>
-        <el-button type="primary" @click="handleLogin">登录</el-button>
-      </template>
-    </quick-form>
+  <div class="login-box">
+    <div class="form">
+      <el-card shadow="always">
+        <div class="item">
+          <div class="tilte"><span>quick后台管理系统</span></div>
+        </div>
+        <div class="item">
+          <el-input
+            v-model="form.userName"
+            placeholder="用户名"
+            :prefix-icon="UserFilled"
+            size="large"
+          />
+        </div>
+        <div class="item">
+          <el-input
+            v-model="form.userPassword"
+            type="password"
+            placeholder="密码"
+            show-password
+            :prefix-icon="Lock"
+            size="large"
+          />
+        </div>
+        <div class="item">
+          <el-button
+            type="primary"
+            size="large"
+            :loading="loading"
+            @click="handleLogin"
+            >登录</el-button
+          >
+        </div>
+        <div class="test">测试账号密码：admin/123456</div>
+      </el-card>
+    </div>
   </div>
 </template>
-
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.login-box {
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+  // background-color: green;
+  background: url('public/images/login-bg.jpeg') no-repeat center center;
+  background-size: 100% 100%;
+  border-radius: 5px;
+  .form {
+    width: 550px;
+    height: 400px;
+    align-items: center;
+    align-content: center;
+    text-align: center;
+    .el-card {
+      height: 100%;
+      border-radius: 20px;
+    }
+    .item {
+      margin: 20px 0;
+    }
+    .el-button {
+      width: 100%;
+    }
+    .tilte {
+      font-size: 30px;
+      margin-bottom: 60px;
+    }
+    .test {
+      color: gray;
+      text-align: left;
+    }
+  }
+}
+</style>
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 1677cbef97cd5e70dac221fb9a5aa014a407a2fc..ce93057c90ec44fbd54266a21d2c7fa0da4b279b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -117,6 +117,9 @@ export const menuFormat = (data: any) => {
 
 // json的key下划线转驼峰
 export const toTuofeng = (str: string) => {
+  if (!str) {
+    return str
+  }
   return str.replace(/"(\w)+":/g, (all) => {
     if (all.indexOf('_') === -1) {
       return all
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 20f2990870fbb8a65fa9786b8e8f0d8b02fde9a6..d4bbc6f0ed088bef7427ee58becc3a996001cad0 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -39,6 +39,9 @@ quickRequest.interceptors.response.use(
     const { data } = res
     const { status, data: payload, page, msg } = data as QuickResponseData<any>
     if (status === 0) {
+      if (!payload) {
+        return Promise.reject(msg)
+      }
       const jsonStr = toTuofeng(JSON.stringify(payload))
       const result = JSON.parse(jsonStr)
       return Promise.resolve({
diff --git a/src/views/assignUser/index.vue b/src/views/assignUser/index.vue
index 0c9a0295ec61a9235882c1f94e241db29418835a..ad3d944d0380237626064c0c76c8990049284ba4 100644
--- a/src/views/assignUser/index.vue
+++ b/src/views/assignUser/index.vue
@@ -12,6 +12,7 @@ import { getUserList } from '@/api/user'
 /**
  * 常规属性
  */
+const checkDataList = ref<Array<User>>([])
 const currentTreeData = ref<Tree>({
   id: '',
   label: '',
@@ -80,7 +81,6 @@ const tableToolbar = reactive<Toolbar>({
  */
 const dataList = reactive<Array<User>>([])
 const userList = reactive<Array<User>>([])
-const checkDataList = ref<Array<User>>([])
 const handleSelectionChange = (selectDataList: Array<User>) => {
   checkDataList.value = selectDataList
 }
diff --git a/vite.config.ts b/vite.config.ts
index 3d09b3db365ed066f281ff8dcbebc65443893992..366c87b713cd5df50f35e6362447a46b424df44c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -47,7 +47,8 @@ export default ({ command, mode }) => {
       port: VITE_PORT,
       proxy: {
         [VITE_APP_BASE_URL]: {
-          target: 'http://localhost:3002/', // 代理的目标地址
+          // target: 'http://localhost:3002/', // 代理的目标地址
+          target: 'http://110.42.130.88:3102/', // 代理的目标地址
           changeOrigin: false, // 开发模式，默认的origin是真实的 origin:localhost:3000 代理服务会把origin修改为目标地址
           secure: false, // 是否https接口
           ws: false, // 是否代理websockets