Explorar el Código

Merge branch 'dev' into dev_YWQ

dev_YWQ
HolyKnightIX hace 2 años
padre
commit
1c67ce8c90
Se han modificado 4 ficheros con 18 adiciones y 7 borrados
  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 Ver fichero

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


+ 2
- 0
src/types/auto-imports.d.ts Ver fichero

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


+ 1
- 1
src/utils/request.js Ver fichero

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


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


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


+ 14
- 5
src/views/login/index.vue Ver fichero

@@ -492,8 +492,8 @@ function getCode() {
async function doRegister(data: object) { async function doRegister(data: object) {
const msg = const msg =
currentLan.value == "zh-cn" 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) await register(data)
.then((res) => { .then((res) => {
console.log(res, "res"); console.log(res, "res");
@@ -591,7 +591,7 @@ onMounted(() => {
max-width: 100%; max-width: 100%;
padding: 20px; padding: 20px;
overflow: hidden; overflow: hidden;
backdrop-filter: blur(5px);
backdrop-filter: blur(3px);
background: linear-gradient( background: linear-gradient(
123.64deg, 123.64deg,
rgba(188, 193, 196, 0.1) -22.71%, rgba(188, 193, 196, 0.1) -22.71%,
@@ -600,6 +600,7 @@ onMounted(() => {
border-radius: 20px; border-radius: 20px;
transform: translateY(-50%); transform: translateY(-50%);
border: 1px solid #cacaca; border: 1px solid #cacaca;
transition: all 0.15s;


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


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


.el-form-item { .el-form-item {


Cargando…
Cancelar
Guardar