From ebd0ec4f51288042b6fc5bf714b1febbb63cfacc Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 09 Jan 2026 18:03:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-app/src/pages/login/index.vue | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/uniapps/work-app/src/pages/login/index.vue b/uniapps/work-app/src/pages/login/index.vue
index 8e97a3e..327209c 100644
--- a/uniapps/work-app/src/pages/login/index.vue
+++ b/uniapps/work-app/src/pages/login/index.vue
@@ -1,6 +1,7 @@
<!-- 登录页 -->
<template>
<view class="login-form-wrap">
+ <div class="imageLogo"> <image src="@/static/images/login/loginLogo.svg" /></div>
<image class="logo" :src="logoSvg" />
<div class="title">低空经济服务一体化平台系统</div>
<div class="user-name">
@@ -27,6 +28,7 @@
</checkbox-group>
记住密码
</label>
+ <div>忘记密码？</div>
</div>
<button class="login-btn" :style="[inputStyle]" @tap="submit">登录</button>
@@ -133,9 +135,11 @@
});
} catch (error) {
const errorMsg =
- error.data?.error_description !== "Bad credentials"
- ? error.data?.error_description
- : "登录失败，请重试";
+ error.data?.msg
+ ? error.data.msg
+ : (error.data?.error_description && error.data.error_description !== "Bad credentials")
+ ? error.data.error_description
+ : "登录失败，请重试";
uni.showToast({
title: errorMsg,
icon: "none",
@@ -167,12 +171,21 @@
text-align: center;
height: 100%;
width: 100%;
-
+.imageLogo {
+ width: 425rpx;
+ height: 316rpx;
+ position: absolute;
+ right: 0;
+ image{
+ width: 100%;
+ height: 100%;
+ }
+}
.logo {
width: 127px;
height: 51px;
margin: 0 auto;
- margin-top: 104px;
+ margin-top: 286rpx;
margin-bottom: 16px;
}
@@ -198,7 +211,9 @@
text-align: center;
margin-bottom: 168rpx;
}
-
+.user-name{
+ margin-bottom: 40rpx;
+}
.user-name,
.pass-word {
display: flex;
@@ -206,8 +221,10 @@
align-items: center;
margin-left: 62rpx;
margin-right: 58rpx;
- height: 118rpx;
- border-bottom: 2rpx solid #e3e3e3;
+ height: 100rpx;
+ background: #F1F4F9;
+ border-radius: 8rpx 8rpx 8rpx 8rpx;
+ padding: 0 22rpx;
image {
width: 40rpx;
@@ -241,7 +258,7 @@
.remember-password {
display: flex;
- justify-content: flex-end;
+ justify-content:space-between;
align-items: center;
margin-left: 62rpx;
margin-right: 58rpx;
@@ -318,4 +335,14 @@
color: $u-warning;
}
}
+.agreement {
+ position: absolute;
+ bottom: 40rpx;
+ left: 0;
+ right: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+}
</style>
--
Gitblit v1.9.3