From e622bd5e3b2638b9ab9a712ed1160a66018d6fd7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 22 二月 2024 09:21:15 +0800
Subject: [PATCH] mrshi
---
platform/src/views/login.vue | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/platform/src/views/login.vue b/platform/src/views/login.vue
index b459972..05b0ed4 100644
--- a/platform/src/views/login.vue
+++ b/platform/src/views/login.vue
@@ -1,4 +1,5 @@
<template>
+<<<<<<< HEAD
<div class="wrap">
<div class="introduce">
<h2>棰勯�夋竻鍗曟煡璇㈢郴缁�</h2>
@@ -29,6 +30,21 @@
</template>
</div>
<el-button :loading="loading" @click="login">鐧� 褰�</el-button>
+=======
+ <div class="wrap">
+ <div class="introduce">
+ <h2>棰勯�夋竻鍗曟煡璇㈢郴缁�</h2>
+ </div>
+ <div class="login">
+ <h1>绯荤粺鐧诲綍 / LOGIN IN</h1>
+ <div class="info-input">
+ <el-input v-model="username" placeholder="璇疯緭鍏ョ敤鎴峰悕" prefix-icon="el-icon-user-solid" maxlength="50" v-trim/>
+ <el-input v-model="password" placeholder="璇疯緭鍏ュ瘑鐮�" type="password" prefix-icon="eva-icon-password" maxlength="30" show-password/>
+ <div class="captcha-input">
+ <el-input v-model="captcha.value" placeholder="鍥剧墖楠岃瘉鐮�" prefix-icon="eva-icon-shield" maxlength="4" @keypress.enter.native="login"/>
+ <img v-if="!captcha.loading" :src="captcha.uri" @click="refreshCaptcha">
+ <span v-else><i class="el-icon-loading"></i></span>
+>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
</div>
</div>
</template>
--
Gitblit v1.9.3