浏览代码

Merge branch 'dev' into dev_YWQ

dev_YWQ
HolyKnightIX 2 年前
父节点
当前提交
1c67ce8c90
共有 4 个文件被更改,包括 18 次插入7 次删除
  1. +1
    -1
      src/lang/package/zh-cn.ts
  2. +2
    -0
      src/types/auto-imports.d.ts
  3. +1
    -1
      src/utils/request.js
  4. +14
    -5
      src/views/login/index.vue

+ 1
- 1
src/lang/package/zh-cn.ts 查看文件

@@ -88,7 +88,7 @@ export default {
signSucceed: {
title: "确认邮箱",
succeed: "注册成功",
welcome: "欢迎加入Metavatar!",
welcome: "欢迎加入Metavatar !",
createSuccess: "您的账户已成功创建",
expired:
"您的通行密钥已过期。稍后,您可以点击下面的按钮重新发送一封新的邮件。",


+ 2
- 0
src/types/auto-imports.d.ts 查看文件

@@ -4,6 +4,7 @@ declare global {
const EffectScope: typeof import('vue')['EffectScope']
const ElForm: typeof import('element-plus/es')['ElForm']
const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
const computed: typeof import('vue')['computed']
@@ -272,6 +273,7 @@ declare module 'vue' {
readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
readonly computed: UnwrapRef<typeof import('vue')['computed']>


+ 1
- 1
src/utils/request.js 查看文件

@@ -5,7 +5,7 @@ ElMessage

// 开发环境需以 "/api" 拼接,其他环境需以 "/C" 拼接
const env = process.env.NODE_ENV == 'development' ? "/api" : "/C"
console.log(env, 'env')
console.log(process.env.NODE_ENV, 'env')

/**
* @description:发送Axios请求


+ 14
- 5
src/views/login/index.vue 查看文件

@@ -492,8 +492,8 @@ function getCode() {
async function doRegister(data: object) {
const msg =
currentLan.value == "zh-cn"
? "确认信息已发送至您的邮箱,请注意查收"
: "An email has been send to you, Please pay attention to confirm !";
? "确认信息已发送至您的邮箱,请注意查收"
: "An email has been send to you, Please pay attention to confirm";
await register(data)
.then((res) => {
console.log(res, "res");
@@ -591,7 +591,7 @@ onMounted(() => {
max-width: 100%;
padding: 20px;
overflow: hidden;
backdrop-filter: blur(5px);
backdrop-filter: blur(3px);
background: linear-gradient(
123.64deg,
rgba(188, 193, 196, 0.1) -22.71%,
@@ -600,6 +600,7 @@ onMounted(() => {
border-radius: 20px;
transform: translateY(-50%);
border: 1px solid #cacaca;
transition: all 0.15s;

.captcha {
position: absolute;
@@ -612,6 +613,9 @@ onMounted(() => {
cursor: pointer;
}
}
&:hover {
backdrop-filter: blur(7px);
}
}
}

@@ -666,10 +670,15 @@ onMounted(() => {
.videoBox {
position: absolute;
top: 0;
z-index: -1;
left: 0;
width: 100%;
height: 100%;
opacity: 0.8;
z-index: -1;
video {
width: 100%;
height: 100%;
object-fit: fill;
}
}

.el-form-item {


正在加载...
取消
保存