Skip to content

Commit 288a134

Browse files
xingyu4jxingyu4j
committed
fix: 样式及类型问题
1 parent 6e9733d commit 288a134

File tree

7 files changed

+70
-70
lines changed

7 files changed

+70
-70
lines changed

‎src/views/Login/Login.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ $prefix-cls: #{$namespace}-login;
118118
background-color: var(--login-bg-color);
119119
}
120120
}
121-
</style>
121+
</style>

‎src/views/Login/components/ForgetPasswordForm.vue‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
label-width="120px"
1010
size="large"
1111
>
12-
<el-row style="margin-right: -10px; margin-left: -10px">
12+
<el-row class="mx-[-10px]">
1313
<!-- 租户名 -->
14-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
14+
<el-col :span="24" class="px-10px">
1515
<el-form-item>
16-
<LoginFormTitle style="width: 100%" />
16+
<LoginFormTitle class="w-full" />
1717
</el-form-item>
1818
</el-col>
19-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
19+
<el-col :span="24" class="px-10px">
2020
<el-form-item v-if="resetPasswordData.tenantEnable === 'true'" prop="tenantName">
2121
<el-input
2222
v-model="resetPasswordData.tenantName"
@@ -28,7 +28,7 @@
2828
</el-form-item>
2929
</el-col>
3030
<!-- 手机号 -->
31-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
31+
<el-col :span="24" class="px-10px">
3232
<el-form-item prop="mobile">
3333
<el-input
3434
v-model="resetPasswordData.mobile"
@@ -45,7 +45,7 @@
4545
@success="getSmsCode"
4646
/>
4747
<!-- 验证码 -->
48-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
48+
<el-col :span="24" class="px-10px">
4949
<el-form-item prop="code">
5050
<el-row :gutter="5" justify="space-between" style="width: 100%">
5151
<el-col :span="24">
@@ -73,44 +73,44 @@
7373
</el-row>
7474
</el-form-item>
7575
</el-col>
76-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
76+
<el-col :span="24" class="px-10px">
7777
<el-form-item prop="password">
7878
<InputPassword
7979
v-model="resetPasswordData.password"
8080
:placeholder="t('login.passwordPlaceholder')"
81-
style="width: 100%"
82-
strength="true"
81+
class="w-full"
82+
:strength="true"
8383
/>
8484
</el-form-item>
8585
</el-col>
86-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
86+
<el-col :span="24" class="px-10px">
8787
<el-form-item prop="check_password">
8888
<InputPassword
8989
v-model="resetPasswordData.check_password"
9090
:placeholder="t('login.checkPassword')"
91-
style="width: 100%"
92-
strength="true"
91+
class="w-full"
92+
:strength="true"
9393
/>
9494
</el-form-item>
9595
</el-col>
9696
<!-- 登录按钮 / 返回按钮 -->
97-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
97+
<el-col :span="24" class="px-10px">
9898
<el-form-item>
9999
<XButton
100100
:loading="loginLoading"
101101
:title="t('login.resetPassword')"
102-
class="w-[100%]"
102+
class="w-full"
103103
type="primary"
104104
@click="resetPassword()"
105105
/>
106106
</el-form-item>
107107
</el-col>
108-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
108+
<el-col :span="24" class="px-10px">
109109
<el-form-item>
110110
<XButton
111111
:loading="loginLoading"
112112
:title="t('login.backLogin')"
113-
class="w-[100%]"
113+
class="w-full"
114114
@click="handleBackLogin()"
115115
/>
116116
</el-form-item>
@@ -134,7 +134,7 @@ const verify = ref()
134134
135135
const { t } = useI18n()
136136
const message = useMessage()
137-
const { currentRoute, push } = useRouter()
137+
const { currentRoute } = useRouter()
138138
const formSmsResetPassword = ref()
139139
const loginLoading = ref(false)
140140
const iconHouse = useIcon({ icon: 'ep:house' })
@@ -145,7 +145,7 @@ const { handleBackLogin, getLoginState, setLoginState } = useLoginState()
145145
const getShow = computed(() => unref(getLoginState) === LoginStateEnum.RESET_PASSWORD)
146146
const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字
147147
148-
const validatePass2 = (rule, value, callback) => {
148+
const validatePass2 = (_rule, value, callback) => {
149149
if (value === '') {
150150
callback(new Error('请再次输入密码'))
151151
} else if (value !== resetPasswordData.password) {

‎src/views/Login/components/LoginForm.vue‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
label-width="120px"
1010
size="large"
1111
>
12-
<el-row style="margin-right: -10px; margin-left: -10px">
13-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
12+
<el-row class="mx-[-10px]">
13+
<el-col :span="24" class="px-10px">
1414
<el-form-item>
15-
<LoginFormTitle style="width: 100%" />
15+
<LoginFormTitle class="w-full" />
1616
</el-form-item>
1717
</el-col>
18-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
18+
<el-col :span="24" class="px-10px">
1919
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
2020
<el-input
2121
v-model="loginData.loginForm.tenantName"
@@ -26,7 +26,7 @@
2626
/>
2727
</el-form-item>
2828
</el-col>
29-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
29+
<el-col :span="24" class="px-10px">
3030
<el-form-item prop="username">
3131
<el-input
3232
v-model="loginData.loginForm.username"
@@ -35,7 +35,7 @@
3535
/>
3636
</el-form-item>
3737
</el-col>
38-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
38+
<el-col :span="24" class="px-10px">
3939
<el-form-item prop="password">
4040
<el-input
4141
v-model="loginData.loginForm.password"
@@ -49,7 +49,7 @@
4949
</el-col>
5050
<el-col
5151
:span="24"
52-
style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
52+
class="px-10px mt-[-20px] mb-[-20px]"
5353
>
5454
<el-form-item>
5555
<el-row justify="space-between" style="width: 100%">
@@ -60,7 +60,7 @@
6060
</el-col>
6161
<el-col :offset="6" :span="12">
6262
<el-link
63-
style="float: right"
63+
class="float-right"
6464
type="primary"
6565
@click="setLoginState(LoginStateEnum.RESET_PASSWORD)"
6666
>
@@ -70,12 +70,12 @@
7070
</el-row>
7171
</el-form-item>
7272
</el-col>
73-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
73+
<el-col :span="24" class="px-10px">
7474
<el-form-item>
7575
<XButton
7676
:loading="loginLoading"
7777
:title="t('login.login')"
78-
class="w-[100%]"
78+
class="w-full"
7979
type="primary"
8080
@click="getCode()"
8181
/>
@@ -89,37 +89,37 @@
8989
mode="pop"
9090
@success="handleLogin"
9191
/>
92-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
92+
<el-col :span="24" class="px-10px">
9393
<el-form-item>
9494
<el-row :gutter="5" justify="space-between" style="width: 100%">
9595
<el-col :span="8">
9696
<XButton
9797
:title="t('login.btnMobile')"
98-
class="w-[100%]"
98+
class="w-full"
9999
@click="setLoginState(LoginStateEnum.MOBILE)"
100100
/>
101101
</el-col>
102102
<el-col :span="8">
103103
<XButton
104104
:title="t('login.btnQRCode')"
105-
class="w-[100%]"
105+
class="w-full"
106106
@click="setLoginState(LoginStateEnum.QR_CODE)"
107107
/>
108108
</el-col>
109109
<el-col :span="8">
110110
<XButton
111111
:title="t('login.btnRegister')"
112-
class="w-[100%]"
112+
class="w-full"
113113
@click="setLoginState(LoginStateEnum.REGISTER)"
114114
/>
115115
</el-col>
116116
</el-row>
117117
</el-form-item>
118118
</el-col>
119119
<el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider>
120-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
120+
<el-col :span="24" class="px-10px">
121121
<el-form-item>
122-
<div class="w-[100%] flex justify-between">
122+
<div class="w-full flex justify-between">
123123
<Icon
124124
v-for="(item, key) in socialList"
125125
:key="key"
@@ -133,9 +133,9 @@
133133
</el-form-item>
134134
</el-col>
135135
<el-divider content-position="center">萌新必读</el-divider>
136-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
136+
<el-col :span="24" class="px-10px">
137137
<el-form-item>
138-
<div class="w-[100%] flex justify-between">
138+
<div class="w-full flex justify-between">
139139
<el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>
140140
<el-link href="https://doc.iocoder.cn/video/" target="_blank">🔥视频教程</el-link>
141141
<el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank">

‎src/views/Login/components/MobileForm.vue‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
label-width="120px"
1010
size="large"
1111
>
12-
<el-row style="margin-right: -10px; margin-left: -10px">
12+
<el-row class="mx-[-10px]">
1313
<!-- 租户名 -->
14-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
14+
<el-col :span="24" class="px-10px">
1515
<el-form-item>
16-
<LoginFormTitle style="width: 100%" />
16+
<LoginFormTitle class="w-full" />
1717
</el-form-item>
1818
</el-col>
19-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
19+
<el-col :span="24" class="px-10px">
2020
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
2121
<el-input
2222
v-model="loginData.loginForm.tenantName"
@@ -28,7 +28,7 @@
2828
</el-form-item>
2929
</el-col>
3030
<!-- 手机号 -->
31-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
31+
<el-col :span="24" class="px-10px">
3232
<el-form-item prop="mobileNumber">
3333
<el-input
3434
v-model="loginData.loginForm.mobileNumber"
@@ -38,7 +38,7 @@
3838
</el-form-item>
3939
</el-col>
4040
<!-- 验证码 -->
41-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
41+
<el-col :span="24" class="px-10px">
4242
<el-form-item prop="code">
4343
<el-row :gutter="5" justify="space-between" style="width: 100%">
4444
<el-col :span="24">
@@ -68,23 +68,23 @@
6868
</el-form-item>
6969
</el-col>
7070
<!-- 登录按钮 / 返回按钮 -->
71-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
71+
<el-col :span="24" class="px-10px">
7272
<el-form-item>
7373
<XButton
7474
:loading="loginLoading"
7575
:title="t('login.login')"
76-
class="w-[100%]"
76+
class="w-full"
7777
type="primary"
7878
@click="signIn()"
7979
/>
8080
</el-form-item>
8181
</el-col>
82-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
82+
<el-col :span="24" class="px-10px">
8383
<el-form-item>
8484
<XButton
8585
:loading="loginLoading"
8686
:title="t('login.backLogin')"
87-
class="w-[100%]"
87+
class="w-full"
8888
@click="handleBackLogin()"
8989
/>
9090
</el-form-item>

‎src/views/Login/components/QrCodeForm.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<template>
2-
<el-row v-show="getShow" class="login-form" style="margin-right: -10px; margin-left: -10px">
3-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
4-
<LoginFormTitle style="width: 100%" />
2+
<el-row v-show="getShow" class="login-form mx-[-10px]">
3+
<el-col :span="24" class="px-10px">
4+
<LoginFormTitle class="w-full" />
55
</el-col>
6-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
6+
<el-col :span="24" class="px-10px">
77
<el-card class="mb-10px text-center" shadow="hover">
88
<Qrcode :logo="logoImg" />
99
</el-card>
1010
</el-col>
1111
<el-divider class="enter-x">{{ t('login.qrcode') }}</el-divider>
12-
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
13-
<div class="mt-15px w-[100%]">
14-
<XButton :title="t('login.backLogin')" class="w-[100%]" @click="handleBackLogin()" />
12+
<el-col :span="24" class="px-10px">
13+
<div class="mt-4 w-full">
14+
<XButton :title="t('login.backLogin')" class="w-full" @click="handleBackLogin()" />
1515
</div>
1616
</el-col>
1717
</el-row>

0 commit comments

Comments
 (0)