Commit 30948504 authored by chenwei's avatar chenwei

Merge branch 'feature' into 'release'

注册跳转

See merge request !20
parents c8e5d5f8 65127951
<template> <template>
<div style="width: 100%; height: 100%; position: relative"> <div style="width: 100%; height: 100%; position: relative">
<div style="height: 100%; width: 55%; position: relative"> <div style="height: 100%; width: 55%; position: relative">
<img src="@/assets/login/login.png" style="width: 100%; height: 100%" /> 5
<div style="position: absolute; left: 56px; top: 56px; display: flex"> <div style="position: absolute; left: 56px; top: 56px; display: flex">
<img src="@/assets/login/logo.png" style="width: 84px; height: 84px" /> <img src="@/assets/login/logo.png" style="width: 84px; height: 84px">
<span <span
style=" style="
font-size: 48px; font-size: 48px;
...@@ -12,11 +12,10 @@ ...@@ -12,11 +12,10 @@
line-height: 84px; line-height: 84px;
margin-left: 20px; margin-left: 20px;
" "
>{{ $t("login.bgTitle1") }}{{ env }}</span >{{ $t("login.bgTitle1") }}{{ env }}</span>
>
</div> </div>
<div style="position: absolute; left: 160px; top: 170px; display: flex"> <div style="position: absolute; left: 160px; top: 170px; display: flex">
<img src="@/assets/login/1.png" style="width: 36px; height: 36px" /> <img src="@/assets/login/1.png" style="width: 36px; height: 36px">
<span <span
style=" style="
font-size: 32px; font-size: 32px;
...@@ -25,14 +24,13 @@ ...@@ -25,14 +24,13 @@
line-height: 36px; line-height: 36px;
margin-left: 8px; margin-left: 8px;
" "
>{{ $t("login.bgTitle2") }}</span >{{ $t("login.bgTitle2") }}</span>
>
</div> </div>
<div style="position: absolute; left: 130px; top: 250px; display: flex"> <div style="position: absolute; left: 130px; top: 250px; display: flex">
<img src="@/assets/login/8.png" style="width: 320px; height: 322px" /> <img src="@/assets/login/8.png" style="width: 320px; height: 322px">
<div style="position: absolute; top: 20px; left: 30px; width: 500px"> <div style="position: absolute; top: 20px; left: 30px; width: 500px">
<div style="display: flex; margin-top: 20px"> <div style="display: flex; margin-top: 20px">
<img src="@/assets/login/2.png" style="width: 24px; height: 24px" /> <img src="@/assets/login/2.png" style="width: 24px; height: 24px">
<span <span
style=" style="
font-size: 14px; font-size: 14px;
...@@ -41,11 +39,10 @@ ...@@ -41,11 +39,10 @@
line-height: 24px; line-height: 24px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t("login.bgTitle3") }}</span >{{ $t("login.bgTitle3") }}</span>
>
</div> </div>
<div style="display: flex; margin-top: 20px"> <div style="display: flex; margin-top: 20px">
<img src="@/assets/login/3.png" style="width: 24px; height: 24px" /> <img src="@/assets/login/3.png" style="width: 24px; height: 24px">
<span <span
style=" style="
font-size: 14px; font-size: 14px;
...@@ -54,11 +51,10 @@ ...@@ -54,11 +51,10 @@
line-height: 24px; line-height: 24px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t("login.bgTitle4") }}</span >{{ $t("login.bgTitle4") }}</span>
>
</div> </div>
<div style="display: flex; margin-top: 20px"> <div style="display: flex; margin-top: 20px">
<img src="@/assets/login/4.png" style="width: 24px; height: 24px" /> <img src="@/assets/login/4.png" style="width: 24px; height: 24px">
<span <span
style=" style="
font-size: 14px; font-size: 14px;
...@@ -67,11 +63,10 @@ ...@@ -67,11 +63,10 @@
line-height: 24px; line-height: 24px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t("login.bgTitle5") }}</span >{{ $t("login.bgTitle5") }}</span>
>
</div> </div>
<div style="display: flex; margin-top: 20px"> <div style="display: flex; margin-top: 20px">
<img src="@/assets/login/5.png" style="width: 24px; height: 24px" /> <img src="@/assets/login/5.png" style="width: 24px; height: 24px">
<span <span
style=" style="
font-size: 14px; font-size: 14px;
...@@ -80,11 +75,10 @@ ...@@ -80,11 +75,10 @@
line-height: 24px; line-height: 24px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t("login.bgTitle6") }}</span >{{ $t("login.bgTitle6") }}</span>
>
</div> </div>
<div style="display: flex; margin-top: 20px"> <div style="display: flex; margin-top: 20px">
<img src="@/assets/login/6.png" style="width: 24px; height: 24px" /> <img src="@/assets/login/6.png" style="width: 24px; height: 24px">
<span <span
style=" style="
font-size: 14px; font-size: 14px;
...@@ -93,11 +87,10 @@ ...@@ -93,11 +87,10 @@
line-height: 24px; line-height: 24px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t("login.bgTitle7") }}</span >{{ $t("login.bgTitle7") }}</span>
>
</div> </div>
<div style="display: flex; margin-top: 20px"> <div style="display: flex; margin-top: 20px">
<img src="@/assets/login/7.png" style="width: 24px; height: 24px" /> <img src="@/assets/login/7.png" style="width: 24px; height: 24px">
<span <span
style=" style="
font-size: 14px; font-size: 14px;
...@@ -106,8 +99,7 @@ ...@@ -106,8 +99,7 @@
line-height: 24px; line-height: 24px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t("login.bgTitle8") }}</span >{{ $t("login.bgTitle8") }}</span>
>
</div> </div>
</div> </div>
</div> </div>
...@@ -118,7 +110,7 @@ ...@@ -118,7 +110,7 @@
<img <img
src="@/assets/setting/user.png" src="@/assets/setting/user.png"
style="width: 30px; height: 30px" style="width: 30px; height: 30px"
/> >
<span <span
style=" style="
font-size: 24px; font-size: 24px;
...@@ -127,8 +119,7 @@ ...@@ -127,8 +119,7 @@
line-height: 34px; line-height: 34px;
margin-left: 10px; margin-left: 10px;
" "
>{{ $t("login.title") }}</span >{{ $t("login.title") }}</span>
>
</div> </div>
<div> <div>
<el-select <el-select
...@@ -139,7 +130,7 @@ ...@@ -139,7 +130,7 @@
@change="handleSetLanguage" @change="handleSetLanguage"
> >
<div slot="prefix" style="padding: 4px"> <div slot="prefix" style="padding: 4px">
<img src="@/assets/lang.png" style="width: 20px; height: 20px" /> <img src="@/assets/lang.png" style="width: 20px; height: 20px">
</div> </div>
<el-option <el-option
v-for="item in locale" v-for="item in locale"
...@@ -176,8 +167,7 @@ ...@@ -176,8 +167,7 @@
round round
style="width: 70%" style="width: 70%"
@click="toHome" @click="toHome"
>{{ $t("common.returnIndex") }}</el-button >{{ $t("common.returnIndex") }}</el-button>
>
</div> </div>
<div style="width: 100%; text-align: center; margin-top: 20px"> <div style="width: 100%; text-align: center; margin-top: 20px">
<el-link href="/ucenter/#/registered" style="color: #5ba8dc">{{ <el-link href="/ucenter/#/registered" style="color: #5ba8dc">{{
...@@ -190,49 +180,49 @@ ...@@ -190,49 +180,49 @@
</template> </template>
<script> <script>
import UserLogin from "./components/userLogin"; import UserLogin from './components/userLogin'
import MobileLogin from "./components/mobileLogin"; import MobileLogin from './components/mobileLogin'
import { locale } from "@/api/country"; import { locale } from '@/api/country'
export default { export default {
name: "Login", name: 'Login',
components: { UserLogin, MobileLogin }, components: { UserLogin, MobileLogin },
data() { data() {
return { return {
showDialog: false, showDialog: false,
loading: false, loading: false,
loginType: "1", loginType: '1',
locale: [], locale: [],
env: "", env: ''
}; }
}, },
computed: { computed: {
homeUrl() { homeUrl() {
return process.env.VUE_APP_HOME_API; return process.env.VUE_APP_HOME_API
}, },
language: { language: {
get() { get() {
return this.$store.getters.language; return this.$store.getters.language
}, },
set(val) { set(val) {
this.handleSetLanguage(val); this.handleSetLanguage(val)
}, }
}, }
}, },
watch: { watch: {
loginType: { loginType: {
handler: function () {}, handler: function() {},
deep: true, deep: true
}, }
}, },
created() { created() {
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === 'development') {
this.env = "-测试版"; this.env = '-测试版'
} }
// window.addEventListener('storage', this.afterQRScan) // window.addEventListener('storage', this.afterQRScan)
locale().then((r) => { locale().then((r) => {
this.locale = r.data; this.locale = r.data
}); })
}, },
mounted() {}, mounted() {},
destroyed() { destroyed() {
...@@ -240,14 +230,14 @@ export default { ...@@ -240,14 +230,14 @@ export default {
}, },
methods: { methods: {
handleSetLanguage(lang) { handleSetLanguage(lang) {
this.$i18n.locale = lang; this.$i18n.locale = lang
this.$store.dispatch("app/setLanguage", lang); this.$store.dispatch('app/setLanguage', lang)
}, },
toHome() { toHome() {
window.location.href = this.homeUrl; window.location.href = this.homeUrl
}, }
}, }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment