From e10f112fa075441b1799fb6c0b61f95ece70d9c7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 15 八月 2023 13:53:34 +0800
Subject: [PATCH] fix 修复 使用 localStorage 返回值为null问题
---
src/views/register.vue | 142 +++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/src/views/register.vue b/src/views/register.vue
index ce7a901..c2dd6a3 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,7 +1,63 @@
+<template>
+ <div class="register">
+ <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
+ <h3 class="title">RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</h3>
+ <el-form-item prop="tenantId" v-if="tenantEnabled">
+ <el-select v-model="registerForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
+ <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
+ <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="username">
+ <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="璐﹀彿">
+ <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="password">
+ <el-input v-model="registerForm.password" type="password" size="large" auto-complete="off" placeholder="瀵嗙爜" @keyup.enter="handleRegister">
+ <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="confirmPassword">
+ <el-input
+ v-model="registerForm.confirmPassword"
+ type="password"
+ size="large"
+ auto-complete="off"
+ placeholder="纭瀵嗙爜"
+ @keyup.enter="handleRegister"
+ >
+ <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="code" v-if="captchaEnabled">
+ <el-input size="large" v-model="registerForm.code" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%" @keyup.enter="handleRegister">
+ <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
+ </el-input>
+ <div class="register-code">
+ <img :src="codeUrl" @click="getCode" class="register-code-img" />
+ </div>
+ </el-form-item>
+ <el-form-item style="width:100%;">
+ <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.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">
+ <span>Copyright 漏 2018-2023 鐤媯鐨勭嫯瀛怢i All Rights Reserved.</span>
+ </div>
+ </div>
+</template>
+
<script setup lang="ts">
import { getCodeImg, register, getTenantList } from '@/api/login';
import { RegisterForm, TenantVO } from '@/api/types';
-import { FormRules } from 'element-plus';
import { to } from 'await-to-js';
const router = useRouter();
@@ -28,7 +84,7 @@
}
};
-const registerRules: FormRules = {
+const registerRules: ElFormRules = {
tenantId: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }
],
@@ -76,23 +132,24 @@
}
const getCode = async () => {
- const { data } = await getCodeImg();
+ const res = await getCodeImg();
+ const { data } = res;
captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
- if (captchaEnabled.value) {
- codeUrl.value = "data:image/gif;base64," + data.img;
- registerForm.value.uuid = data.uuid;
- }
-}
+ if (captchaEnabled.value) {
+ codeUrl.value = 'data:image/gif;base64,' + data.img;
+ registerForm.value.uuid = data.uuid;
+ }
+};
const initTenantList = async () => {
const { data } = await getTenantList();
- tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
- if (tenantEnabled.value) {
- tenantList.value = data.voList;
- if (tenantList.value != null && tenantList.value.length !== 0) {
- registerForm.value.tenantId = tenantList.value[0].tenantId;
- }
+ tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
+ if (tenantEnabled.value) {
+ tenantList.value = data.voList;
+ if (tenantList.value != null && tenantList.value.length !== 0) {
+ registerForm.value.tenantId = tenantList.value[0].tenantId;
}
+ }
}
onMounted(() => {
@@ -100,63 +157,6 @@
initTenantList();
})
</script>
-
-<template>
- <div class="register">
- <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
- <h3 class="title">RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</h3>
- <el-form-item prop="tenantId" v-if="tenantEnabled">
- <el-select v-model="registerForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
- <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
- <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
- </el-select>
- </el-form-item>
- <el-form-item prop="username">
- <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="璐﹀彿">
- <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
- </el-input>
- </el-form-item>
- <el-form-item prop="password">
- <el-input v-model="registerForm.password" type="password" size="large" auto-complete="off" placeholder="瀵嗙爜" @keyup.enter="handleRegister">
- <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
- </el-input>
- </el-form-item>
- <el-form-item prop="confirmPassword">
- <el-input
- v-model="registerForm.confirmPassword"
- type="password"
- size="large"
- auto-complete="off"
- placeholder="纭瀵嗙爜"
- @keyup.enter="handleRegister"
- >
- <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
- </el-input>
- </el-form-item>
- <el-form-item prop="code" v-if="captchaEnabled">
- <el-input size="large" v-model="registerForm.code" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%" @keyup.enter="handleRegister">
- <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
- </el-input>
- <div class="register-code">
- <img :src="codeUrl" @click="getCode" class="register-code-img" />
- </div>
- </el-form-item>
- <el-form-item style="width:100%;">
- <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.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">
- <span>Copyright 漏 2018-2023 ruoyi.vip All Rights Reserved.</span>
- </div>
- </div>
-</template>
<style lang="scss" scoped>
.register {
--
Gitblit v1.9.3