From 7644b2e86abb859573a29a9c204840b9c0c63d9e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 31 十月 2024 19:18:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/staffLogin/login.vue |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index d3fc3bf..510a544 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -71,8 +71,10 @@
   data() {
     return {
       form: {
-        account: '',
+        // username: '18056814089',
+        username: '',
         password: '',
+				code: ''
       },
       isShowProtocol: false,
       ProtocolFlag: false,
@@ -84,7 +86,12 @@
   onLoad() {
     this.initCaptcha()
   },
-
+  onBackPress(options) {
+    uni.redirectTo({
+      url: '/pages/login/login'
+    })
+    return true
+  },
   methods: {
     ...mapMutations(["setToken", "setUserInfo"]),
     changeFalg() {
@@ -151,7 +158,7 @@
   width: 100%;
   height: 100vh;
   display: flex;
-  padding-top: 160rpx;
+  padding-top: 130rpx;
   box-sizing: border-box;
   align-items: center;
   flex-direction: column;
@@ -218,7 +225,6 @@
     margin-top: 60rpx;
     .for_psd {
       color: $uni-color-primary;
-      margin-top: 40rpx;
       width: 140rpx;
       text-align: center;
       margin: 40rpx auto;
@@ -242,7 +248,7 @@
     width: 100%;
     left: 0;
     text-align: center;
-    bottom: 108rpx;
+    bottom: 88rpx;
     display: flex;
     justify-content: center;
     align-items: center;

--
Gitblit v1.9.3