|
|
|
@ -68,6 +68,19 @@ |
|
|
|
</view> |
|
|
|
</template> |
|
|
|
</view> |
|
|
|
|
|
|
|
<view class="form-item border-b m-b-md p-b-xs"> |
|
|
|
<view> |
|
|
|
<view class="label m-b-xs">{{$t('reg.a2')}}</view> |
|
|
|
<v-input v-model="form.phone" class="color-light" :placeholder="$t('reg.a3')"> |
|
|
|
<template #left> |
|
|
|
<v-country ref="country" style="width: 80rpx;height: 40rpx;border: 1px solid #ccc;text-align: center;line-height: 40rpx;" |
|
|
|
@country_code="country_code=$event" class="m-r-xs" v-model="form.country_id" /> |
|
|
|
</template> |
|
|
|
</v-input> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
<!--图形验证码--> |
|
|
|
<view class="form-item border-b m-b-md p-b-xs" > |
|
|
|
<view class="label m-b-xs">{{$t('homeNewText.ee6')}}</view> |
|
|
|
@ -83,27 +96,11 @@ |
|
|
|
<v-input class="color-light" v-model="form.code" :placeholder="$t('reg.a7')"> |
|
|
|
<template #right> |
|
|
|
<!-- 手机 --> |
|
|
|
<v-code |
|
|
|
v-show="form.type==1" |
|
|
|
url="/register/sendSmsCode" |
|
|
|
:data="{ |
|
|
|
phone:form.account, |
|
|
|
country_code:country_code || 86, |
|
|
|
type:1 |
|
|
|
}" |
|
|
|
></v-code> |
|
|
|
<v-code v-show="form.type==1" url="/register/sendSmsCode" :data="{phone:form.account,country_code:country_code || 86,type:1}"></v-code> |
|
|
|
<!-- 邮箱 --> |
|
|
|
<v-code |
|
|
|
url="/register/sendEmailCode" |
|
|
|
:data="{ |
|
|
|
email:form.account, |
|
|
|
type:1, |
|
|
|
gc_code: form.gr_code, |
|
|
|
gc_key: gc_key, |
|
|
|
}" |
|
|
|
v-show="form.type==2" |
|
|
|
@reGetGraphChe="reGetGraphChe" |
|
|
|
></v-code> |
|
|
|
<v-code url="/register/sendEmailCode" |
|
|
|
:data="{email:form.account,type:1,gc_code: form.gr_code,gc_key: gc_key,}" |
|
|
|
v-show="form.type==2" @reGetGraphChe="reGetGraphChe"></v-code> |
|
|
|
<!-- <v-code |
|
|
|
url="/register/sendEmailCode" |
|
|
|
:data="{ |
|
|
|
@ -140,11 +137,11 @@ |
|
|
|
<view class="label m-b-xs color-light">{{$t('common.c13')}}</view> |
|
|
|
<v-input class="color-light" v-model="form.withdrawal_psw" type="password" :placeholder="$t('common.c14')"></v-input> |
|
|
|
</view> |
|
|
|
<view class="form-item border-b m-b-md p-b-xs"> |
|
|
|
<!-- <view class="form-item border-b m-b-md p-b-xs"> |
|
|
|
<view class="label m-b-xs">{{$t('reg.c6')}}</view> |
|
|
|
<!-- <v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}(${$t('reg.b4')})`"></v-input> --> |
|
|
|
<v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}(${$t('reg.b4')})`"></v-input> |
|
|
|
<v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}`"></v-input> |
|
|
|
</view> |
|
|
|
</view> --> |
|
|
|
<view class="tips d-flex m-b-md fn-sm"> |
|
|
|
<van-checkbox |
|
|
|
:value="check" |
|
|
|
@ -193,7 +190,8 @@ export default { |
|
|
|
password_confirmation: "", |
|
|
|
invite_code: "", |
|
|
|
gr_code: "", |
|
|
|
withdrawal_psw:"" |
|
|
|
withdrawal_psw:"", |
|
|
|
phone:"" |
|
|
|
}, |
|
|
|
captcha: '', |
|
|
|
Graph_che:'', |
|
|
|
@ -237,10 +235,10 @@ export default { |
|
|
|
} |
|
|
|
return; |
|
|
|
} |
|
|
|
if (!this.form.invite_code) { |
|
|
|
this.$toast(this.$t('reg.c7')); |
|
|
|
return; |
|
|
|
} |
|
|
|
// if (!this.form.invite_code) { |
|
|
|
// this.$toast(this.$t('reg.c7')); |
|
|
|
// return; |
|
|
|
// } |
|
|
|
if (!this.form.withdrawal_psw) { |
|
|
|
this.$toast(this.$t('common.c14')); |
|
|
|
return; |
|
|
|
@ -320,7 +318,7 @@ export default { |
|
|
|
|
|
|
|
//注册完成后登录 |
|
|
|
login(){ |
|
|
|
let data={type: 2,account:this.form.account,password: this.form.password} |
|
|
|
let data={type: 2,account:this.form.account,password: this.form.password,phone: this.form.phone,country_id:this.form.country_id} |
|
|
|
Member.login(this.form) |
|
|
|
.then((res) => { |
|
|
|
this.loginSuccess(res.data); |
|
|
|
|