From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
platform/src/views/login.vue | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/platform/src/views/login.vue b/platform/src/views/login.vue
index 05b0ed4..90ed866 100644
--- a/platform/src/views/login.vue
+++ b/platform/src/views/login.vue
@@ -1,8 +1,7 @@
<template>
-<<<<<<< HEAD
<div class="wrap">
<div class="introduce">
- <h2>棰勯�夋竻鍗曟煡璇㈢郴缁�</h2>
+ <h2>浜戞槗淇�</h2>
</div>
<div class="login">
<h1>绯荤粺鐧诲綍 / LOGIN IN</h1>
@@ -30,21 +29,6 @@
</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