From 2a992b12056e37c3dd29ce8c5b552f6988fea08a Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 29 Oct 2025 17:24:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/login/index.vue | 55 ++++++++++++++++++++++++---
src/static/images/login/username.svg | 11 +++++
src/static/images/login/password.svg | 11 +++++
src/static/images/user/bg.png | 0
src/subPackages/droneConsole/index.vue | 8 ++++
src/subPackages/taskDetail/addTask/index.vue | 5 ++
src/App.vue | 5 ++
7 files changed, 86 insertions(+), 9 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index aa89cf2..bb5c52a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,7 +30,7 @@
@import "uview-plus/index.scss";
@import "@/static/styles/common.scss";
page {
- background-image: url('~@/static/images/user/allBg.svg');
+ background-image: url('~@/static/images/user/bg.png');
background-size: cover;
background-position: center;
background-repeat: no-repeat;
@@ -46,6 +46,9 @@
}
}
}
+.uni-tabbar-border{
+ background-color: #f6f6f6 !important;
+}
.uni-page-head__title {
font-family: Source Han Sans CN, Source Han Sans CN !important;
font-weight: 400 !important;
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 7a6b748..1756d32 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -1,18 +1,20 @@
<!-- 登录页 -->
<template>
<view class="login-form-wrap">
- <img style="margin-top: 180rpx" src="@/static/images/login/logo.svg" alt=""/>
+ <img class="logo" src="@/static/images/login/logo.svg" alt=""/>
<div class="title">掌控智飞</div>
- <div style="padding: 0 60rpx">
+ <div class="user-name">
+ <img :src="usernameSvg" alt="">
<input
v-model="loginForm.username"
- class="u-border-bottom"
placeholder="请输入用户名"
/>
+
+ </div>
+ <div class="pass-word">
+ <img :src="passwordSvg" alt="">
<input
- style="margin-top: 10rpx"
v-model="loginForm.password"
- class="u-border-bottom"
type="password"
placeholder="请输入密码"
/>
@@ -31,6 +33,8 @@
import {loginByUsername} from "@/api/user/index.js";
import {useUserStore} from "@/store/index.js";
import droneSvg from '@/static/images/login/droneSvg.svg'
+import usernameSvg from '@/static/images/login/username.svg'
+import passwordSvg from '@/static/images/login/password.svg'
import {HOME_PATH, LOGIN_PATH, removeQueryString} from "@/router";
const userStore = useUserStore();
@@ -90,6 +94,14 @@
height: 100%;
width: 100%;
+ .logo {
+ width: 127px;
+ height: 51px;
+ margin: 0 auto;
+ margin-top: 104px;
+ margin-bottom: 16px;
+ }
+
.lowerRightCorner {
position: absolute;
right: 0;
@@ -110,8 +122,37 @@
text-transform: none;
color: #1452D3;
text-align: center;
- margin-top: 32rpx;
- margin-bottom: 100rpx;
+ margin-bottom: 168rpx;
+ }
+ .user-name,.pass-word {
+ display: flex;
+ //justify-content: center;
+ align-items: center;
+ margin-left: 62rpx;
+ margin-right: 58rpx;
+ height: 118rpx;
+ border-bottom: 2rpx solid #E3E3E3;
+ img {
+ width: 40rpx;
+ height: 40rpx;
+ margin-right: 12rpx;
+ }
+ :deep(uni-input) {
+ height: 40rpx;
+ line-height: 40rpx;
+ width: 80%;
+ margin-top: 20rpx;
+ }
+ :deep(.uni-input-placeholder) {
+ font-size: 32rpx;
+ color: #E3E3E3;
+ font-weight: 500;
+ }
+ //:deep(.uni-input-input) {
+ // top: 10px !important;
+ //}
+ }
+ .pass-word {
}
input {
diff --git a/src/static/images/login/password.svg b/src/static/images/login/password.svg
new file mode 100644
index 0000000..15ebdbe
--- /dev/null
+++ b/src/static/images/login/password.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame" clip-path="url(#clip0_2401_3680)">
+<path id="Vector" d="M16.5625 9.21875C16.7348 9.21875 16.875 9.35898 16.875 9.53125V16.582C16.875 16.7543 16.7348 16.8945 16.5625 16.8945H3.47656C3.3043 16.8945 3.16406 16.7543 3.16406 16.582V9.53125C3.16406 9.35898 3.3043 9.21875 3.47656 9.21875H16.5625ZM16.5625 7.96875H3.47656C2.61367 7.96875 1.91406 8.66836 1.91406 9.53125V16.582C1.91406 17.4449 2.61367 18.1445 3.47656 18.1445H16.5625C17.4254 18.1445 18.125 17.4449 18.125 16.582V9.53125C18.125 8.66836 17.4254 7.96875 16.5625 7.96875Z" fill="#1D6FE9"/>
+<path id="Vector_2" d="M10.0195 2.5C11.0107 2.5 11.9426 2.88594 12.6436 3.58691C13.3445 4.28789 13.7305 5.21973 13.7305 6.21094V7.96875H6.30859V6.21094C6.30859 5.21973 6.69453 4.28789 7.39551 3.58691C8.09648 2.88594 9.02832 2.5 10.0195 2.5ZM10.0195 1.25C7.27969 1.25 5.05859 3.47109 5.05859 6.21094V9.21875H14.9805V6.21094C14.9805 3.47109 12.7594 1.25 10.0195 1.25ZM10.0195 11.2012C9.67441 11.2012 9.39453 11.4811 9.39453 11.8262V14.2871C9.39453 14.6322 9.67441 14.9121 10.0195 14.9121C10.3646 14.9121 10.6445 14.6322 10.6445 14.2871V11.8262C10.6445 11.4811 10.3646 11.2012 10.0195 11.2012Z" fill="#1D6FE9"/>
+</g>
+<defs>
+<clipPath id="clip0_2401_3680">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/static/images/login/username.svg b/src/static/images/login/username.svg
new file mode 100644
index 0000000..e9577ff
--- /dev/null
+++ b/src/static/images/login/username.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame" clip-path="url(#clip0_2401_3676)">
+<path id="Vector" d="M9.9704 11.7941C8.56176 11.7941 7.23741 11.2455 6.24139 10.2495C5.24531 9.25346 4.69678 7.92912 4.69678 6.52049C4.69678 5.11183 5.24535 3.7875 6.24139 2.79146C7.23743 1.79539 8.56176 1.24683 9.9704 1.24683C11.379 1.24683 12.7033 1.79539 13.6994 2.79148C14.6955 3.78756 15.244 5.11187 15.244 6.52051C15.244 7.92916 14.6955 9.25348 13.6994 10.2495C12.7034 11.2456 11.379 11.7941 9.9704 11.7941ZM9.9704 2.34842C7.66994 2.34842 5.79835 4.21999 5.79835 6.52047C5.79835 8.82093 7.66988 10.6925 9.9704 10.6925C12.2709 10.6925 14.1424 8.82095 14.1424 6.52047C14.1424 4.21999 12.2709 2.34842 9.9704 2.34842Z" fill="#1D6FE9"/>
+<path id="Vector_2" d="M18.0172 18.7531H16.9156C16.9156 16.9058 16.1962 15.1692 14.89 13.8629C13.5838 12.5568 11.8471 11.8374 9.99977 11.8374C8.15254 11.8374 6.41584 12.5567 5.10958 13.8629C3.80341 15.1692 3.08402 16.9058 3.08402 18.7531H1.98242C1.98242 17.671 2.19448 16.621 2.61265 15.6323C3.01648 14.6775 3.59447 13.8201 4.33061 13.0841C5.06671 12.3479 5.92407 11.7699 6.87884 11.3661C7.86765 10.9479 8.91762 10.7358 9.99973 10.7358C11.0818 10.7358 12.1319 10.9479 13.1206 11.3661C14.0753 11.7699 14.9327 12.3479 15.6688 13.0841C16.4049 13.8202 16.9829 14.6775 17.3868 15.6323C17.805 16.621 18.0171 17.671 18.0171 18.7531H18.0172Z" fill="#1D6FE9"/>
+</g>
+<defs>
+<clipPath id="clip0_2401_3676">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/static/images/user/bg.png b/src/static/images/user/bg.png
new file mode 100644
index 0000000..3a02e9b
--- /dev/null
+++ b/src/static/images/user/bg.png
Binary files differ
diff --git a/src/subPackages/droneConsole/index.vue b/src/subPackages/droneConsole/index.vue
index c122814..c357ebc 100644
--- a/src/subPackages/droneConsole/index.vue
+++ b/src/subPackages/droneConsole/index.vue
@@ -18,6 +18,14 @@
})
})
+function onPostMessage(data) {
+ if (data.type === 'back'){
+ uni.navigateBack({
+ delta: 1 // 返回的页面数，默认1（返回上一页）
+ });
+ }
+}
+
// 文件上传demo
const {VITE_API_BASE_URL} = getEnvObj()
diff --git a/src/subPackages/taskDetail/addTask/index.vue b/src/subPackages/taskDetail/addTask/index.vue
index 3a66bf5..cb67d87 100644
--- a/src/subPackages/taskDetail/addTask/index.vue
+++ b/src/subPackages/taskDetail/addTask/index.vue
@@ -33,8 +33,11 @@
let params = {}
const encodedData = uni.getStorageSync('webview_params')
params = JSON.parse(decodeURIComponent(encodedData))
- console.log(params, '6666')
viewUrl.value = getWebViewUrl('/addTask', params)
+ uni.setTabBarItem({
+ index: 3, // Tab
+ visible: false,
+ });
});
onHide(() => {
--
Gitblit v1.9.3