diff --git a/src/api/login.js b/src/api/login.js
deleted file mode 100644
index 6fd2f99..0000000
--- a/src/api/login.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from '@/utils/request'
-
-// 登录方法
-export function login(username, password, code, uuid) {
-	const data = {
-		username,
-		password,
-		code,
-		uuid
-	}
-	return request({
-		url: '/login',
-		method: 'POST',
-		data: data,
-	})
-}
-
-// 获取用户详细信息
-export function getInfo() {
-	return request({
-		url: '/getInfo',
-		method: 'get'
-	})
-}
-
-// 退出方法
-export function logout() {
-	return request({
-		url: '/LogOut',
-		method: 'POST'
-	})
-}
-
-// 获取验证码
-export function getCodeImg() {
-	return request({
-		url: '/captchaImage',
-		method: 'get'
-	})
-}
\ No newline at end of file
diff --git a/src/api/system/login.js b/src/api/system/login.js
index 9adfb26..b421964 100644
--- a/src/api/system/login.js
+++ b/src/api/system/login.js
@@ -9,9 +9,9 @@ export function login(username, password, code, uuid) {
     uuid
   }
   return request({
-      url: '/login',
-      method: 'POST',
-      data: data,
+    url: '/login',
+    method: 'POST',
+    data: data,
   })
 }
 
@@ -26,8 +26,8 @@ export function getInfo() {
 // 退出方法
 export function logout() {
   return request({
-      url: '/LogOut',
-      method: 'POST'
+    url: '/LogOut',
+    method: 'POST'
   })
 }
 
@@ -38,3 +38,14 @@ export function getCodeImg() {
     method: 'get'
   })
 }
+/**
+ * 注册
+ * @returns 
+ */
+export function register(data) {
+  return request({
+    url: '/register',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 6921961..4ff7cc0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -38,11 +38,11 @@ export const constantRoutes = [
     component: () => import('@/views/login'),
     hidden: true
   },
-  // {
-  //   path: '/register',
-  //   component: () => import('@/views/register'),
-  //   hidden: true
-  // },
+  {
+    path: '/register',
+    component: () => import('@/views/register'),
+    hidden: true
+  },
   {
     path: "/:pathMatch(.*)*",
     component: () => import('@/views/error/404'),
diff --git a/src/views/login.vue b/src/views/login.vue
index bdcd2bd..e3ebfa2 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -49,9 +49,9 @@
           <span v-if="!loading">{{ $t('login.btnLogin') }}</span>
           <span v-else>登 录 中...</span>
         </el-button>
-        <!-- <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div> -->
+        <div style="float: right">
+          <router-link class="link-type" :to="'/register'">还没有账号？立即注册</router-link>
+        </div>
       </el-form-item>
     </el-form>
 
@@ -63,7 +63,7 @@
 </template>
 
 <script setup name="login">
-import { getCodeImg } from '@/api/login'
+import { getCodeImg } from '@/api/system/login'
 import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 import defaultSettings from '@/settings'
diff --git a/src/views/register.vue b/src/views/register.vue
new file mode 100644
index 0000000..4ef52a1
--- /dev/null
+++ b/src/views/register.vue
@@ -0,0 +1,215 @@
+<template>
+  <starBackground></starBackground>
+  <div class="register">
+    <el-form ref="registerFormRef" :model="registerForm" :rules="registerRules" class="register-form">
+      <h3 class="title">{{ title }}</h3>
+      <el-form-item prop="username">
+        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
+          <template #prefix>
+            <svg-icon name="user" />
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password">
+        <el-input v-model="registerForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleRegister">
+          <template #prefix>
+            <svg-icon name="password" />
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="confirmPassword">
+        <el-input
+          v-model="registerForm.confirmPassword"
+          type="password"
+          auto-complete="off"
+          placeholder="确认密码"
+          @keyup.enter.native="handleRegister">
+          <template #prefix>
+            <svg-icon name="password" />
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="code" v-if="captchaOnOff">
+        <el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleRegister">
+          <template #prefix>
+            <svg-icon name="validCode" />
+          </template>
+        </el-input>
+        <div class="register-code ml10">
+          <img :src="codeUrl" @click="getCode" class="register-code-img" />
+        </div>
+      </el-form-item>
+      <el-form-item style="width: 100%">
+        <el-button :loading="loading" type="primary" size="large" style="width: 100%" @click.native.prevent="handleRegister">
+          <span v-if="!loading">注 册</span>
+          <span v-else>注 册 中...</span>
+        </el-button>
+        <div style="float: right">
+          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
+        </div>
+      </el-form-item>
+    </el-form>
+    <!--  底部  -->
+    <div class="el-register-footer">
+      <div v-html="defaultSettings.copyright"></div>
+    </div>
+  </div>
+</template>
+
+<script setup name="register">
+import starBackground from '@/views/components/starBackground.vue'
+import { getCodeImg, register } from '@/api/system/login'
+import defaultSettings from '@/settings'
+import { ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance()
+const router = useRouter()
+const codeUrl = ref('')
+const registerForm = reactive({
+  username: '',
+  password: '',
+  confirmPassword: '',
+  code: '',
+  uuid: '',
+})
+
+const registerFormRef = ref(null)
+const loading = ref(false)
+const captchaOnOff = ref(true)
+const equalToPassword = (rule, value, callback) => {
+  if (registerForm.password !== value) {
+    callback(new Error('两次输入的密码不一致'))
+  } else {
+    callback()
+  }
+}
+const registerRules = reactive({
+  username: [
+    { required: true, trigger: 'blur', message: '请输入您的账号' },
+    {
+      min: 2,
+      max: 20,
+      message: '用户账号长度必须介于 2 和 20 之间',
+      trigger: 'blur',
+    },
+  ],
+  password: [
+    { required: true, trigger: 'blur', message: '请输入您的密码' },
+    {
+      min: 5,
+      max: 20,
+      message: '用户密码长度必须介于 6 和 20 之间',
+      trigger: 'blur',
+    },
+  ],
+  confirmPassword: [
+    { required: true, trigger: 'blur', message: '请再次输入您的密码' },
+    { required: true, validator: equalToPassword, trigger: 'blur' },
+  ],
+  code: [{ required: true, trigger: 'change', message: '请输入验证码' }],
+})
+const copyRight = computed(() => {
+  return defaultSettings.copyright
+})
+const title = computed(() => {
+  return defaultSettings.title
+})
+
+function getCode() {
+  getCodeImg().then((res) => {
+    codeUrl.value = 'data:image/gif;base64,' + res.data.img
+    registerForm.uuid = res.data.uuid
+    // this.$forceUpdate()
+  })
+}
+function handleRegister() {
+  proxy.$refs['registerFormRef'].validate((valid) => {
+    if (valid) {
+      loading.value = true
+      register(registerForm)
+        .then((res) => {
+          if (res.code == 200) {
+            const username = registerForm.username
+            ElMessageBox.alert("<font color='red'>恭喜你，您的账号 " + username + ' 注册成功！</font>', '系统提示', {
+              dangerouslyUseHTMLString: true,
+              type: 'success',
+            })
+              .then(() => {
+                router.push('/login')
+              })
+              .catch(() => {})
+          }
+        })
+        .catch(() => {
+          loading.value = false
+          if (captchaOnOff.value) {
+            getCode()
+          }
+        })
+    }
+  })
+}
+getCode()
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.register {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  background: radial-gradient(200% 100% at bottom center, #f7f7b6, #e96f92, #1b2947);
+  background: radial-gradient(220% 105% at top center, #1b2947 10%, #75517d 40%, #e96f92 65%, #f7f7b6);
+}
+.title {
+  margin: 0px auto 30px auto;
+  text-align: center;
+  color: #fff;
+}
+
+.register-form {
+  border-radius: 6px;
+  background: rgba(255, 255, 255, 0.3);
+  width: 310px;
+  padding: 25px 15px 5px 15px;
+  .el-input {
+    height: 38px;
+    input {
+      height: 38px;
+    }
+  }
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+  }
+}
+.register-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+.register-code {
+  width: 33%;
+  height: 38px;
+  float: right;
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+.el-register-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+.register-code-img {
+  height: 38px;
+}
+</style>