Skip to content

Commit

Permalink
Update style
Browse files Browse the repository at this point in the history
  • Loading branch information
wen-templari committed Nov 12, 2023
1 parent 215b9a3 commit 96fd33b
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 42 deletions.
81 changes: 43 additions & 38 deletions src/views/CallbackView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,46 +107,51 @@ onMounted(() => {
</script>

<template>
<div class="p-6 h-full w-full bg-systemBackground-lightSecondary">
<p v-if="isLoading">页面跳转中。。。</p>
<p v-if="authenticateFailed">认证失败,跳转至登入页面。</p>
<div v-if="needBindMember" class="flex flex-col items-center justify-center h-full">
<div class="pb-10 text-lg flex flex-col items-center">
<div class="pb-8 text-2xl font-bold">在第一次登入时,我们需要您绑定你的账户信息</div>
<div class="">如果你原先已经使用过此维修平台,请输入原先用于登入的帐号和密码来绑定信息</div>
<div class="mt-2">
如果这是你第一次使用,请点击下方的
<span class="italic font-bold"> 登记信息 </span>
来获取你的账号
<div class="h-screen w-full bg-systemBackground-lightSecondary">
<div class="p-6 flex items-center justify-center h-screen">
<p v-if="isLoading">页面跳转中。。。</p>
<p v-if="authenticateFailed">认证失败,跳转至登入页面。</p>
<div v-if="needBindMember" class="flex flex-col items-center justify-center h-full">
<div class="pb-10 text-lg flex flex-col items-center">
<div class="pb-8 text-2xl font-bold">在第一次登入时,我们需要您绑定你的账户信息</div>
<div class="">如果你原先已经使用过此维修平台,请输入原先用于登入的帐号和密码来绑定信息</div>
<div class="mt-2">
如果这是你第一次使用,请点击下方的
<span class="italic font-bold"> 登记信息 </span>
来获取你的账号
</div>
</div>
</div>
<div style="width: 20vw; min-width: 300px">
<form @submit.prevent="login" class="grid gap-4 place-items-center">
<InputBase
placeholder=""
hint="学号"
maxLength="10"
required
:passWarning="isIDValid"
class="w-full"
v-model:content="accountInput.id"
:rules="[{ rule: /^\d{10}$/, warning: '格式错误' }]"
/>
<InputBase
placeholder="初始密码为空"
hint="密码"
:passWarning="isPasswordValid"
type="password"
class="w-full"
v-model:content="accountInput.password"
/>
<button class="w-full btn bg-gradient-to-b from-primary/80 to-primary text-primaryContent shadow-md" type="submit">
绑定账号
<div style="width: 20vw; min-width: 300px">
<form @submit.prevent="login" class="grid gap-4 place-items-center">
<InputBase
placeholder=""
hint="学号"
maxLength="10"
required
:passWarning="isIDValid"
class="w-full"
v-model:content="accountInput.id"
:rules="[{ rule: /^\d{10}$/, warning: '格式错误' }]"
/>
<InputBase
placeholder="初始密码为空"
hint="密码"
:passWarning="isPasswordValid"
type="password"
class="w-full"
v-model:content="accountInput.password"
/>
<button class="w-full btn bg-gradient-to-b from-primary/80 to-primary text-primaryContent shadow-md" type="submit">
绑定账号
</button>
</form>
<button
class="w-full btn bg-gradient-to-b from-primary/80 to-primary text-primaryContent shadow-md mt-8"
@click="onRegisterMember"
>
登记信息
</button>
</form>
<button class="w-full btn bg-gradient-to-b from-primary/80 to-primary text-primaryContent shadow-md mt-8" @click="onRegisterMember">
登记信息
</button>
</div>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/views/Login/LoginRegister.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ onMounted(() => {
})
</script>
<template>
<div class="flex flex-col items-center justify-center h-full w-full p-4 bg-systemBackground-lightSecondary">
<div class="pb-10 text-lg flex flex-col items-center">
<div class="flex flex-col items-center justify-center h-full w-full p-6 bg-systemBackground-lightSecondary">
<div class="pb-6 lg:pb-10 text-lg flex flex-col items-center">
<div class="text-2xl font-bold">在你可以使用维修平台之前,我们需要收集你的一些信息</div>
<div class="mt-4">这些信息会被用来验证你的身份,请认真填写</div>
<div class="mt-2 lg:mt-4 text-base">这些信息会被用来验证你的身份,请认真填写</div>
</div>
<div style="width: 20vw; min-width: 300px" class="flex flex-col items-center">
<form @submit.prevent="activate" class="flex flex-col gap-3 lg:gap-0" style="width: 17vw; min-width: 300px">
Expand Down Expand Up @@ -116,7 +116,7 @@ onMounted(() => {
class="w-full"
v-model:content="account.name"
/>
<InputBase subject="昵称" placeholder="别人会看到的名字" required class="w-full" v-model:content="account.alias" />
<InputBase subject="昵称" required class="w-full" v-model:content="account.alias" />
<InputBase
subject="电话"
placeholder="你的手机号"
Expand Down

0 comments on commit 96fd33b

Please sign in to comment.