From 85428f0bf3bbf08d65200cffc38dd1e96af34da6 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 07 七月 2025 22:25:17 +0800
Subject: [PATCH] '-'
---
vite.config.ts | 4
src/views/home/index.vue | 4
src/views/register/registernav.vue | 308 ++++++++++++++++++++++++++++++++++++++++++++++++---
src/style/index.scss | 6 +
src/style/reset.scss | 2
src/views/login/index.vue | 27 ++-
index.html | 1
src/api/util.ts | 3
8 files changed, 323 insertions(+), 32 deletions(-)
diff --git a/index.html b/index.html
index cbafa6c..694415e 100644
--- a/index.html
+++ b/index.html
@@ -25,6 +25,7 @@
width: 100%;
height: 100%;
overflow: hidden;
+ /* background: #f8f8f8; */
}
.loader,
diff --git a/src/api/util.ts b/src/api/util.ts
index c6316ec..55febd1 100644
--- a/src/api/util.ts
+++ b/src/api/util.ts
@@ -1,4 +1,5 @@
+// http://192.168.0.31:5005 http://114.132.78.38:8096
export const baseUrlApi = (url: string) =>
process.env.NODE_ENV === "development"
? `/api${url}`
- : `http://192.168.0.31:5005${url}`;
+ : `http://114.132.78.38:8096${url}`;
diff --git a/src/style/index.scss b/src/style/index.scss
index 56aeb00..27f192b 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -36,4 +36,10 @@
/* 鑹插急妯″紡 */
.html-weakness {
filter: invert(80%);
+}
+.baseclass{
+ color: rgba(15, 95, 210, 1);
+ font-size: 16px;
+ font-weight: 400;
+ line-height: 18px;
}
\ No newline at end of file
diff --git a/src/style/reset.scss b/src/style/reset.scss
index 07fdfb8..cbe6d40 100644
--- a/src/style/reset.scss
+++ b/src/style/reset.scss
@@ -1,6 +1,8 @@
#app {
width: 100%;
height: 100%;
+ background: #f8f8f8;
+ overflow: auto;
}
html {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1b9e2ba..b59bcc4 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -773,4 +773,8 @@
a:active {
color: #fff;
}
+.el-link.is-disabled {
+ color: #a8abb2;
+ cursor: not-allowed;
+}
</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d8954bc..6b94ec6 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -178,13 +178,18 @@
if (res.code == 200) {
// 鑾峰彇鍚庣璺敱
return initRouter().then(() => {
- disabled.value = true;
- router
- .replace("index")
- .then(() => {
- message("鐧诲綍鎴愬姛", { type: "success" });
- })
- .finally(() => (disabled.value = false));
+ console.log(res, "=-=-=-=");
+ if (!res.result.exRoles.hasFlsh) {
+ disabled.value = true;
+ router
+ .replace("registernav")
+ .then(() => {
+ message("鐧诲綍鎴愬姛", { type: "success" });
+ })
+ .finally(() => (disabled.value = false));
+ } else {
+ router.replace("welcome");
+ }
});
} else {
message(res?.message || "鐧诲綍澶辫触", { type: "error" });
@@ -232,16 +237,16 @@
<img width="400px" :src="logo1" class="logo1" />
</div>
<!-- <img :src="bg" class="wave" /> -->
- <div class="flex-c absolute right-5 top-3">
- <!-- 涓婚 -->
- <el-switch
+ <!-- <div class="flex-c absolute right-5 top-3"> -->
+ <!-- 涓婚 -->
+ <!-- <el-switch
v-model="dataTheme"
inline-prompt
:active-icon="dayIcon"
:inactive-icon="darkIcon"
@change="dataThemeChange"
/>
- </div>
+ </div> -->
<div class="login-container">
<div class="img">
<!-- <component :is="toRaw(illustration)" /> -->
diff --git a/src/views/register/registernav.vue b/src/views/register/registernav.vue
index bdf632e..7a2967d 100644
--- a/src/views/register/registernav.vue
+++ b/src/views/register/registernav.vue
@@ -1,11 +1,11 @@
<template>
- <div class="content">
+ <div class="content pb-6">
<div class="header">
<div class="headimg">
<img width="167px" height="44px" src="@/assets/home/logo.png" alt="" />
</div>
</div>
- <div class="center w-[70%] h-[584px] bg-white mx-auto m-12">
+ <div class="center w-[70%] bg-white mx-auto m-12">
<div class="flex items-center p-5 pl-6">
<img src="@/assets/home/xian.png" alt="" />
<span style="margin-left: 5px">娉ㄥ唽鍚戝</span>
@@ -17,7 +17,7 @@
<el-step title="淇℃伅鐧昏瀹屾垚" />
</el-steps>
</div>
- <div v-if="active == 0" class="h-[60%]">
+ <div v-if="active == 1" class="h-[50%]">
<div class="text-center pt-5 pb-1.5">娉ㄥ唽鏉℃</div>
<div
class="w-[95%] h-[82%] border-1 border-[#E5E5E5] mx-auto p-2 overflow-y-auto"
@@ -25,39 +25,311 @@
<h3>娉ㄥ唽閲囪喘渚涘簲鍟嗗簲鍏峰浠ヤ笅鏉′欢</h3>
</div>
</div>
- <div v-else-if="active == 1" class="h-[60%]">
- <div class="text-center pt-5 pb-1.5">娉ㄥ唽鏉℃</div>
- <div
- class="w-[95%] h-[82%] border-1 border-[#E5E5E5] mx-auto p-2 overflow-y-auto"
+ <div v-else-if="active == 2" class="flex justify-center mt-5">
+ <el-form
+ ref="ruleFormRef"
+ style="width: 95%"
+ :model="state.ruleForm"
+ :rules="state.rules"
+ label-width="auto"
>
- <h3>娉ㄥ唽閲囪喘渚涘簲鍟嗗簲鍏峰浠ヤ笅鏉′欢</h3>
- </div>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+ <el-form-item label="浼佷笟绫诲瀷">
+ <el-select v-model="state.type" placeholder="璇烽�夋嫨" clearable>
+ <el-option label="鎴愮珛" value="Valid" />
+ <el-option label="椹冲洖" value="Rejected" />
+ <el-option label="鍏跺畠" value="Other" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row><div class="baseclass">鍩烘湰璧勬枡</div></el-row>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+ <el-form-item label="浜ゆ槗涓讳綋">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+ <el-form-item label="钀ヤ笟鎵х収">
+ <el-upload>
+ <el-button type="primary">涓婁紶</el-button>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+ <el-form-item label="浼佷笟鍚嶇О">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="缁熶竴绀句細淇＄敤浠ｇ爜">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="娉ㄥ唽璧勯噾">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ >
+ <template #append>涓囧厓</template></el-input
+ >
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="8">
+ <el-form-item label="娉曞畾浠ｈ〃浜�">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+
+ <el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
+ <el-form-item label="浣忔墍鍦�">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="鑱旂郴鐢佃瘽">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="鎴愮珛鏃堕棿">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="涓昏惀涓氬姟">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="閭">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+ <el-form-item label="娉曞畾浠ｈ〃浜�">
+ <el-upload>
+ <el-button type="primary">涓婁紶韬唤璇�</el-button>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="濮撳悕">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="韬唤璇�">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="鑱旂郴鐢佃瘽">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+ <el-form-item label="涓氬姟缁忓姙浜�">
+ <el-upload>
+ <el-button type="primary">涓婁紶韬唤璇�</el-button>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="濮撳悕">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="韬唤璇�">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="鑱旂郴鐢佃瘽">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <el-form-item label="寮�鎴疯">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
+ <el-form-item label="閾惰璐﹀彿">
+ <el-input
+ v-model="state.ruleForm.nickName"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
</div>
- <div class="mx-auto pt-1 flex justify-center">
- <el-button :disabled="active == 0" @click="backStep">涓婁竴姝�</el-button>
- <el-button type="primary" @click="nextStep">鍚屾剰涓嬩竴姝�</el-button>
+ <div class="mx-auto pt-2 pb-5 flex justify-center">
+ <el-button :disabled="active == 1" @click="backStep">涓婁竴姝�</el-button>
+ <el-button type="primary" @click="nextStep"
+ ><span v-if="active == 1">鍚屾剰</span>涓嬩竴姝�</el-button
+ >
</div>
</div>
</div>
+ <ReDialog />
</template>
-<script setup>
-import { h, ref } from "vue";
+<script setup lang="ts">
+import { h, ref, reactive } from "vue";
+import type { FormInstance, FormRules } from "element-plus";
+import { ReDialog } from "@/components/ReDialog";
+
defineOptions({
name: "RegisterNav"
});
-let active = ref(0);
+const ruleFormRef = ref<FormInstance>();
+const state = reactive({
+ isShowPassword: false,
+ ruleForm: {
+ account: "",
+ nickName: "",
+ phone: "",
+ phoneVCode: "",
+ // tenantId: props.tenantInfo.id,
+ code: "",
+ codeId: 0,
+ email: "",
+ exRoleCode: ""
+ },
+ type: "",
+ rules: {
+ phoneVCode: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユ墜鏈洪獙璇佺爜",
+ trigger: "blur"
+ }
+ ],
+ nickName: [
+ {
+ required: true,
+ message: "璇疯緭鍏ュ鍚�",
+ trigger: "blur"
+ }
+ ],
+ phone: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユ偍鐨勬墜鏈哄彿鐮�",
+ trigger: "blur"
+ }
+ ],
+ exRoleCode: [
+ {
+ required: true,
+ message: "璇烽�夋嫨瑙掕壊",
+ trigger: "blur"
+ }
+ ]
+ // code: [{ required: true, message: t('message.account.placeholder4'), trigger: 'blur' }],
+ },
+ loading: {
+ signIn: false
+ },
+ captchaImage: "",
+ rotateVerifyVisible: false,
+ // rotateVerifyImg: verifyImg,
+ // rotateVerifyImg: themeConfig.value.logoUrl,
+ secondVerEnabled: false,
+ // captchaEnabled: false,
+ isPassRotate: false,
+ capsLockVisible: false,
+ hideTenantForLogin: false,
+ expirySeconds: 60, // 楠岃瘉鐮佽繃鏈熸椂闂�
+ phoneSeconds: 0, // 鎵嬫満楠岃瘉鐮佸�掕鏃�
+ roleList: []
+});
+
+let active = ref(1);
const nextStep = () => {
- active.value++;
+ active.value += 1;
+ console.log(active.value + 1);
};
const backStep = () => {
- active.value--;
+ active.value -= 1;
};
</script>
<style lang="scss" scoped>
.content {
background-color: #f8f8f8;
width: 100%;
- height: 100%;
+ // height: 100%;
.header {
display: flex;
align-items: center;
diff --git a/vite.config.ts b/vite.config.ts
index 440e272..348cf88 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -26,8 +26,8 @@
// 鏈湴璺ㄥ煙浠ｇ悊 https://cn.vitejs.dev/config/server-options.html#server-proxy
proxy: {
"/api": {
- // 杩欓噷濉啓鍚庣鍦板潃
- target: "http://192.168.0.36:5005",
+ // 杩欓噷濉啓鍚庣鍦板潃http://114.132.78.38:8096 http://192.168.0.36:5005
+ target: "http://114.132.78.38:8096",
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, "")
}
--
Gitblit v1.9.1