From 3ac695aaee5aab01d8cb39a56388c2740913dbec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 17:18:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/login.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/h5/pages/driver/login.vue b/h5/pages/driver/login.vue
index ef753f1..26b8fed 100644
--- a/h5/pages/driver/login.vue
+++ b/h5/pages/driver/login.vue
@@ -1,18 +1,19 @@
<template>
<view class="login">
- <image class="login_bg" src="@/static/login_bg@2x.png" />
+ <image class="login_bg" src="@/static/login_bg@2x.png" mode="widthFix" />
<image class="login_logo" src="@/static/logo@2x.png" mode="widthFix" />
<view class="login_title">瀹夋嘲鐗╂祦鏅烘収鍥尯</view>
<view class="login_title">鐗╂祦杞﹀徃鏈虹櫥褰�</view>
<view class="login_list">
<view class="login_list_item">
<image src="@/static/login_ic_phone@2x.png" mode="widthFix" />
- <input v-model="form.username" maxlength="18" placeholder="鎵嬫満鍙�" />
+ <input v-model="form.username" @focus="showKeyboard = true" @blur="showKeyboard = false" maxlength="18" placeholder="鎵嬫満鍙�" />
</view>
<view class="login_list_item">
<image src="@/static/login_ic_password@2x.png" mode="widthFix" />
<input
v-model="form.password"
+ @focus="showKeyboard = true" @blur="showKeyboard = false"
type="password"
placeholder="瀵嗙爜"
/>
@@ -22,7 +23,7 @@
<view class="login_btn_n" @click="onLogin">绔嬪嵆鐧诲綍</view>
</view>
<!-- -->
- <view class="btns">
+ <view class="btns" v-if="!showKeyboard">
<view class="btn" @click="handleRegister">绔嬪嵆娉ㄥ唽</view>
<view class="btn separate"> | </view>
<view class="btn" @click="handleSetPsd">蹇樿瀵嗙爜</view>
@@ -37,10 +38,11 @@
data() {
return {
form: {
- username: '18056814089',
- password: '123456'
+ username: '',
+ password: ''
},
isShowProtocol: false,
+ showKeyboard: false,
countDown: 0
}
},
@@ -82,6 +84,7 @@
driverLogin({
...form,
uuid: this.captcha.uuid,
+ openid: this.$store.state.openId,
code: '1'
}).then(res => {
if (res.code === 200) {
@@ -121,9 +124,11 @@
margin-bottom: 40rpx;
}
.login_bg {
- position: absolute;
- top: 0;
- width: 750rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: -1;
}
.login_title {
font-size: 44rpx;
--
Gitblit v1.9.3