Skip to content

J
jiedao-web-master
Commit 30948504 authored by chenwei's avatar chenwei
Browse files
Options

Merge branch 'feature' into 'release' 

注册跳转

See merge request !20
parents c8e5d5f8 65127951
Show whitespace changes
Inline Side-by-side
Showing with 187 additions and 171 deletions
src/views/login/index.vue
View file @ 30948504
<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>
......
src/views/registered/index.vue
View file @ 30948504
<template> <template>
<div style="width: 100%; height: 100%; position: relative"> <div style="width: 100%; height: 100%; position: relative">
<div class="registered-container"> <div class="registered-container">
<img src="@/assets/login/login.png" style="width: 100%; height: 100%" /> <img src="@/assets/login/login.png" style="width: 100%; height: 100%">
<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") }}</span >{{ $t("login.bgTitle1") }}</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/login/register.png" src="@/assets/login/register.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("registered.title") }}</span >{{ $t("registered.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"
...@@ -217,8 +208,7 @@ ...@@ -217,8 +208,7 @@
style="width: 100%; margin-bottom: 30px" style="width: 100%; margin-bottom: 30px"
:disabled="disabled" :disabled="disabled"
@click.native.prevent="getValidaCode" @click.native.prevent="getValidaCode"
>{{ getCode }}</el-button >{{ getCode }}</el-button>
>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item prop="password" :label="$t('registered.password')"> <el-form-item prop="password" :label="$t('registered.password')">
...@@ -248,7 +238,7 @@ ...@@ -248,7 +238,7 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<br /> <br>
<el-form-item prop="confirmPwd" :label="$t('registered.confirmPwd')"> <el-form-item prop="confirmPwd" :label="$t('registered.confirmPwd')">
<el-input <el-input
ref="confirmPwd" ref="confirmPwd"
...@@ -276,15 +266,13 @@ ...@@ -276,15 +266,13 @@
style="width: 70%" style="width: 70%"
round round
@click.native.prevent="handleregistered" @click.native.prevent="handleregistered"
>{{ $t("registered.registered") }}</el-button >{{ $t("registered.registered") }}</el-button>
>
</div> </div>
<div style="width: 100%; text-align: center"> <div style="width: 100%; text-align: center">
<el-link <el-link
href="/ucenter/#/login" href="/ucenter/#/login"
style="color: #27417c; margin-top: 20px" style="color: #27417c; margin-top: 20px"
>{{ $t("registered.login") }}</el-link >{{ $t("registered.login") }}</el-link>
>
</div> </div>
</el-form> </el-form>
</div> </div>
...@@ -292,174 +280,212 @@ ...@@ -292,174 +280,212 @@
</template> </template>
<script> <script>
import { getCode, reg, getCountryList } from "@/api/user"; import { getCode, reg, getCountryList, getInfo } from '@/api/user'
import { locale } from "@/api/country"; import { setToken } from '@/utils/auth'
import { langData } from "@/data/lang"; import { locale } from '@/api/country'
import { langData } from '@/data/lang'
export default { export default {
name: "Registered", name: 'Registered',
components: {}, components: {},
data() { data() {
return { return {
countryList: [], countryList: [],
registeredForm: { registeredForm: {
registerPlatform: 3, registerPlatform: 3,
areaCode: "86" areaCode: '86'
}, },
registeredRules: { registeredRules: {
mobile: [ mobile: [
{ {
required: true, required: true,
message: this.$t("login.mobileRules"), message: this.$t('login.mobileRules'),
trigger: "blur", trigger: 'blur'
}, },
{ max: 11, message: "电话长度在11个数字以内", trigger: "blur" }, { max: 11, message: '电话长度在11个数字以内', trigger: 'blur' }
], ],
englishName: [ englishName: [
{ {
required: true, required: true,
message: this.$t("login.nameEnRules"), message: this.$t('login.nameEnRules'),
trigger: "blur", trigger: 'blur'
}, }
], ],
code: [ code: [
{ {
required: true, required: true,
message: this.$t("login.codeRules"), message: this.$t('login.codeRules'),
trigger: "blur", trigger: 'blur'
}, }
], ],
password: [ password: [
{ {
required: true, required: true,
message: this.$t("login.passwordRules"), message: this.$t('login.passwordRules'),
trigger: "blur", trigger: 'blur'
}, }
], ],
confirmPwd: [ confirmPwd: [
{ {
required: true, required: true,
message: this.$t("login.confirmPwdRules"), message: this.$t('login.confirmPwdRules'),
trigger: "blur", trigger: 'blur'
}, }
], ]
}, },
loading: false, loading: false,
disabled: false, disabled: false,
count: 60, count: 60,
getCode: "", getCode: '',
level: 0, level: 0,
locale: [], locale: [],
apiLang: "", apiLang: '',
langData: langData, langData: langData
}; }
}, },
computed: { computed: {
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: {
language() { language() {
this.getCode = this.$t("login.getCode"); this.getCode = this.$t('login.getCode')
this.apiLang = this.langData[this.language]; this.apiLang = this.langData[this.language]
},
$route: {
handler: function(route) {
const query = route.query
if (query) {
this.redirect = query.redirect
this.otherQuery = this.getOtherQuery(query)
}
}, },
immediate: true
}
}, },
created() { created() {
this.apiLang = this.langData[this.language]; this.apiLang = this.langData[this.language]
this.getCode = this.$t("registered.getCode"); this.getCode = this.$t('registered.getCode')
getCountryList().then((r) => { getCountryList().then((r) => {
this.countryList = r.data; this.countryList = r.data
}); })
locale().then((r) => { locale().then((r) => {
this.locale = r.data; this.locale = r.data
}); })
}, },
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)
}, },
getValidaCode() { getValidaCode() {
var data = { var data = {
mobile: this.registeredForm.mobile, mobile: this.registeredForm.mobile,
scene: 0, scene: 0,
areaCode: this.registeredForm.areaCode, areaCode: this.registeredForm.areaCode
}; }
getCode(data).then(() => { getCode(data).then(() => {
var countDown = window.setInterval(() => { var countDown = window.setInterval(() => {
if (this.count < 1) { if (this.count < 1) {
this.disabled = false; this.disabled = false
this.count = 60; this.count = 60
this.getCode = this.$t("registered.getCode"); this.getCode = this.$t('registered.getCode')
window.clearInterval(countDown); window.clearInterval(countDown)
} else { } else {
this.count--; this.count--
this.disabled = true; this.disabled = true
this.getCode = this.count + "s"; this.getCode = this.count + 's'
} }
}, 1000); }, 1000)
}); })
}, },
pwdChange(val) { pwdChange(val) {
// 弱密码：全是数字或全是字母，6-16个字符 // 弱密码：全是数字或全是字母，6-16个字符
const weakReg = /^[0-9]{6,16}$|^[a-zA-Z]{6,16}$/; const weakReg = /^[0-9]{6,16}$|^[a-zA-Z]{6,16}$/
// 中密码：数字和26个英文字母，6-16个字符 // 中密码：数字和26个英文字母，6-16个字符
const mediumReg = /^[A-Za-z0-9]{6,16}$/; const mediumReg = /^[A-Za-z0-9]{6,16}$/
// 强密码：由数字、26个英文字母或者下划线组成的字符串，6-16个字符 // 强密码：由数字、26个英文字母或者下划线组成的字符串，6-16个字符
const strongReg = /^\w{6,16}$/; const strongReg = /^\w{6,16}$/
var password = this.registeredForm.password; var password = this.registeredForm.password
if (password !== null) { if (password !== null) {
if (password.length >= 6 && password.length <= 16) { if (password.length >= 6 && password.length <= 16) {
if (password.match(weakReg)) { if (password.match(weakReg)) {
this.level = 1; this.level = 1
} else if (password.match(mediumReg)) { } else if (password.match(mediumReg)) {
this.level = 2; this.level = 2
} else if (password.match(strongReg)) { } else if (password.match(strongReg)) {
this.level = 3; this.level = 3
} }
} }
if (password.length > 16) { if (password.length > 16) {
this.level = 3; this.level = 3
} }
} }
}, },
getInfos() {
getInfo().then((r) => {
this.loading = false
if (r.data.city) {
this.$router.push({
path: this.redirect || '/jiedao/jd-profile',
query: this.otherQuery
})
} else {
this.$router.push({
path: '/myInfo',
query: this.otherQuery
})
}
})
},
getOtherQuery(query) {
return Object.keys(query).reduce((acc, cur) => {
if (cur !== 'redirect') {
acc[cur] = query[cur]
}
return acc
}, {})
},
handleregistered() { handleregistered() {
this.$refs.registeredForm.validate((valid) => { this.$refs.registeredForm.validate((valid) => {
if (valid) { if (valid) {
if (this.registeredForm.password !== this.registeredForm.confirmPwd) { if (this.registeredForm.password !== this.registeredForm.confirmPwd) {
this.$message.error("两次密码输入不一致"); this.$message.error('两次密码输入不一致')
return; return
} }
this.loading = true; this.loading = true
reg(this.registeredForm) reg(this.registeredForm)
.then(() => { .then((res) => {
this.$message({ this.$message({
message: message:
this.$t("registered.title") + this.$t("common.success"), this.$t('registered.title') + this.$t('common.success'),
type: "success", type: 'success'
}); })
this.$router.push({ // this.$router.push({
path: "/login", // path: '/login'
}); // })
this.loading = false; this.$store.commit('user/SET_TOKEN', res.data.token)
setToken(res.data.token)
this.getInfos()
this.loading = false
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false
}); })
} else { } else {
console.log("error submit!!"); console.log('error submit!!')
return false; return false
} }
}); })
}, }
}, }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
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