fix
This commit is contained in:
@@ -138,7 +138,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent,ref,reactive,toRefs ,computed, onMounted} from "vue";
|
||||
import { defineComponent,watch,reactive,toRefs ,computed, onMounted} from "vue";
|
||||
import { Https } from "@/tool/https";
|
||||
import { isEmail } from "@/tool/util";
|
||||
import { setCookie ,WriteCookie } from "@/tool/cookie";
|
||||
@@ -162,8 +162,15 @@ export default defineComponent({
|
||||
let userDetail:any= computed(()=>{
|
||||
return store.state.UserHabit.userDetail
|
||||
})
|
||||
console.log(userDetail);
|
||||
|
||||
let userCountry = computed(()=>{
|
||||
return store.state.UserHabit.userDetail.country
|
||||
})
|
||||
let userCompanyName = computed(()=>{
|
||||
return store.state.UserHabit.userDetail.occupation
|
||||
})
|
||||
let userEmail = computed(()=>{
|
||||
return store.state.UserHabit.userDetail.email
|
||||
})
|
||||
let register = reactive({
|
||||
registerModel:computed(()=>{
|
||||
return store.state.UserHabit.bindEmail.isBindEmail
|
||||
@@ -178,13 +185,14 @@ export default defineComponent({
|
||||
countryList:country,
|
||||
email:'',
|
||||
})
|
||||
onMounted(()=>{
|
||||
let country = userDetail.value.country
|
||||
let CompanyName = userDetail.value.occupation
|
||||
let email = userDetail.value.email
|
||||
register.Country = country
|
||||
register.CompanyName = CompanyName
|
||||
register.email = email == '-------------'?'':email
|
||||
watch(userCountry,(newValue,oldValue)=>{
|
||||
register.Country = newValue
|
||||
})
|
||||
watch(userCompanyName,(newValue,oldValue)=>{
|
||||
register.CompanyName = newValue
|
||||
})
|
||||
watch(userEmail,(newValue:any,oldValue)=>{
|
||||
register.email = newValue == '-------------'?'':newValue
|
||||
})
|
||||
return{
|
||||
router,
|
||||
@@ -336,8 +344,6 @@ export default defineComponent({
|
||||
},
|
||||
//邮箱登录提交
|
||||
submitEmailLogin(emailVerifyCode: any) {
|
||||
console.log(12312312);
|
||||
|
||||
let data = {
|
||||
userEmail: this.email,
|
||||
emailVerifyCode: emailVerifyCode,
|
||||
|
||||
@@ -730,7 +730,7 @@ export default defineComponent({
|
||||
//判断账号剩余时间是否太短
|
||||
let isModalOne = JSON.parse(sessionStorage.getItem("isTimeOne") as any)
|
||||
|
||||
if(!getCookie('isBeginner'))return
|
||||
if(!getCookie('isBeginner') || this.userDetail.systemUser == 0)return
|
||||
// if(this.store.state.UserHabit.bindEmail.isBindEmail)return
|
||||
if(!isModalOne){//判断是否是试用用户
|
||||
// if(!isTest && !isModalOne){//判断是否是试用用户
|
||||
|
||||
Reference in New Issue
Block a user