huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

河海添加logo

Browse Source
UI_2022-02-10
yujialong 4 years ago
parent ce0f24ebb9
commit 5834fb69da
4 changed files with 81 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/img/logo-hh.png
  2. BIN
      src/assets/img/logo-hh1.png
  3. 22
      src/components/common/Header.vue
  4. 125
      src/components/page/Login.vue

BIN
src/assets/img/logo-hh.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
src/assets/img/logo-hh1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

22
src/components/common/Header.vue
Unescape View File

@ -1,10 +1,11 @@
<template> <template>
<div class="header flex-between"> <div class="header">
<div v-if="this.$route.path=='/personalcenter'" <div v-if="this.$route.path=='/personalcenter'"
class="goBack" v-preventReClick @click="back"><i class="el-icon-arrow-left"></i>返回</div> class="goBack" v-preventReClick @click="back"><i class="el-icon-arrow-left"></i>返回</div>
<div v-else class="logo"> <template v-else>
<img v-if="!$config.isHh" src="../../assets/img/logo.png"> <img class="logo hh" v-if="$config.isHh" src="../../assets/img/logo-hh.png" />
</div> <img class="logo" v-else src="../../assets/img/logo.png">
</template>
<div class="header-right"> <div class="header-right">
<div class="header-user-con"> <div class="header-user-con">
<div class="user" @click="toPersonalCenter"> <div class="user" @click="toPersonalCenter">
@ -68,6 +69,9 @@ export default {
} }
.header { .header {
position: relative; position: relative;
display: flex;
justify-content: space-between;
align-items: center;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: 60px; height: 60px;
@ -75,21 +79,17 @@ export default {
color: #333; color: #333;
} }
.header .logo { .header .logo {
float: left;
width: 150px; width: 150px;
margin-left: 20px; margin-left: 20px;
} &.hh{
.header .logo img{ width: 500px;
width: 100%; }
height: 100%;
} }
.header-right { .header-right {
float: right;
padding-right: 50px; padding-right: 50px;
} }
.header-user-con { .header-user-con {
display: flex; display: flex;
height: 70px;
align-items: center; align-items: center;
.user{ .user{

125
src/components/page/Login.vue
Unescape View File

@ -11,7 +11,12 @@
<div class="bg"> <div class="bg">
<div class="left"> <div class="left">
<div class="text" v-if="!$config.isHh"> <div class="text" v-if="$config.isHh">
<p>欢迎使用</p>
<p style="margin-bottom: 15px">商学院金融工程</p>
<p>与大数据实验平台</p>
</div>
<div class="text" v-else>
<p>欢迎使用</p> <p>欢迎使用</p>
<p>Occupation Lab</p> <p>Occupation Lab</p>
</div> </div>
@ -19,55 +24,59 @@
<div class="right"></div> <div class="right"></div>
</div> </div>
<div class="form"> <div class="right-form">
<div class="back" v-show="isReg" @click="toReg(false)"> <img v-if="$config.isHh" class="logo" src="../../assets/img/logo-hh1.png" />
<i class="el-icon-back"></i>
</div> <div class="form">
<div v-if="!isReg" class="ms-login"> <div class="back" v-show="isReg" @click="toReg(false)">
<el-tabs v-model="activeName"> <i class="el-icon-back"></i>
<el-tab-pane label="账号登录" name="0"> </div>
<el-form :model="loginForm" :rules="loginRules" ref="loginForm" style="margin-top: 20px"> <div v-if="!isReg" class="ms-login">
<el-form-item label="用户名" prop="username"> <el-tabs v-model="activeName">
<el-input v-model="loginForm.username" placeholder="请输入账号"></el-input> <el-tab-pane label="账号登录" name="0">
</el-form-item> <el-form :model="loginForm" :rules="loginRules" ref="loginForm" style="margin-top: 20px">
<el-form-item label="密码" prop="password"> <el-form-item label="用户名" prop="username">
<el-input <el-input v-model="loginForm.username" placeholder="请输入账号"></el-input>
type="password" </el-form-item>
placeholder="请输入密码" <el-form-item label="密码" prop="password">
v-model="loginForm.password" <el-input
@keyup.enter.native="getSchool('loginForm')" type="password"
> placeholder="请输入密码"
</el-input> v-model="loginForm.password"
</el-form-item> @keyup.enter.native="getSchool('loginForm')"
<el-button class="submit" type="primary" @click="getSchool('loginForm')">登录</el-button> >
</el-form> </el-input>
</el-tab-pane> </el-form-item>
<el-button class="submit" type="primary" @click="getSchool('loginForm')">登录</el-button>
</el-form>
</el-tab-pane>
<el-tab-pane label="手机号/邮箱登录" name="1"> <el-tab-pane label="手机号/邮箱登录" name="1">
<el-form :model="phoneParam" :rules="phoneRules" ref="phoneParam" style="margin-top: 20px"> <el-form :model="phoneParam" :rules="phoneRules" ref="phoneParam" style="margin-top: 20px">
<el-form-item label="手机号/邮箱" prop="userphone"> <el-form-item label="手机号/邮箱" prop="userphone">
<el-input v-model="phoneParam.userphone" placeholder="请输入手机号/邮箱"></el-input> <el-input v-model="phoneParam.userphone" placeholder="请输入手机号/邮箱"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="密码" prop="phonePassword"> <el-form-item label="密码" prop="phonePassword">
<el-input <el-input
type="password" type="password"
placeholder="请输入密码" placeholder="请输入密码"
v-model="phoneParam.phonePassword" v-model="phoneParam.phonePassword"
@keyup.enter.native="getSchool('phoneParam')" @keyup.enter.native="getSchool('phoneParam')"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-button class="submit" type="primary" @click="getSchool('phoneParam')">登录</el-button> <el-button class="submit" type="primary" @click="getSchool('phoneParam')">登录</el-button>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div class="links flex-between"> <div class="links flex-between">
<!-- <el-button type="text" class="ques" @click="toReg(true)">前往注册</el-button> --> <!-- <el-button type="text" class="ques" @click="toReg(true)">前往注册</el-button> -->
<div></div> <div></div>
<el-button type="text" class="forget" @click="forget">忘记密码？</el-button> <el-button type="text" class="forget" @click="forget">忘记密码？</el-button>
</div>
</div> </div>
<register v-else :isReg.sync="isReg" @updateInfo="updateInfo"></register>
</div> </div>
<register v-else :isReg.sync="isReg" @updateInfo="updateInfo"></register>
</div> </div>
<!-- 选择角色 --> <!-- 选择角色 -->
@ -473,7 +482,7 @@ export default {
font-size: 46px; font-size: 46px;
font-weight: bold; font-weight: bold;
p:first-child{ p:first-child{
margin-bottom: 10px; margin-bottom: 20px;
} }
} }
} }
@ -485,18 +494,24 @@ export default {
} }
/deep/.form{ /deep/.right-form{
position: absolute; position: absolute;
top: 50%; top: 47%;
right: 12%; right: 12%;
transform: translateY(-50%); transform: translateY(-50%);
width: 28%; width: 28%;
padding: 50px 20px 20px;
background-color: #fff;
border-radius: 16px;
box-sizing: border-box;
box-shadow: 0 1px 20px rgba(146,120,255,0.3);
.logo{
width: 100%;
margin-bottom: 40px;
}
.form{
padding: 50px 20px 20px;
background-color: #fff;
border-radius: 16px;
box-sizing: border-box;
box-shadow: 0 1px 20px rgba(146,120,255,0.3);
}
.back{ .back{
position: absolute; position: absolute;
top: 20px; top: 20px;

Write Preview
Loading…
Cancel
Save