From e494c92d84c4b48f19ee819bcdc8667a2561a334 Mon Sep 17 00:00:00 2001
From: xuminyui <576362016@qq.com>
Date: Wed, 9 Oct 2024 15:57:35 +0800
Subject: [PATCH] fix

---
 src/components/navBar/index.vue | 13 ++++---------
 src/pages/login/index.vue       | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/components/navBar/index.vue b/src/components/navBar/index.vue
index 32bd630..d9f11e3 100644
--- a/src/components/navBar/index.vue
+++ b/src/components/navBar/index.vue
@@ -1,16 +1,8 @@
 <template>
   <view>
-    <view class="status_bar">
-      <!-- 这里是状态栏 -->
-    </view>
     <!-- 建议放在外层 -->
     <up-sticky>
-      <up-navbar
-        fixed
-        @leftClick="backhandle"
-        safeAreaInsetTop
-        :placeholder="true"
-      >
+      <up-navbar @leftClick="backhandle" safeAreaInsetTop :placeholder="true">
         <template #left>
           <view class="uv-nav-slot">
             <uv-icon name="arrow-left" size="19" v-if="isShowLeft"></uv-icon>
@@ -51,6 +43,9 @@ root.style.setProperty(
 
 <style lang="scss" scoped>
 .status_bar {
+  height: var(--status-bar-height);
+}
+:deep(.u-status-bar) {
   margin-top: var(--statusBarHeight);
 }
 @mixin flex($direction: row) {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index ed6e6a5..44b1d7c 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -67,7 +67,7 @@
           >
         </view>
       </view>
-      
+
       <text
         style="text-align: right; color: #e3af1c; margin-top: 20rpx"
         @click="toCode"
@@ -109,7 +109,7 @@ const state = reactive({
   Password: "",
   id: "",
   pid: "",
-  code:"",
+  code: "",
 });
 const { showMessage } = useToast();
 const loading = ref(false);
@@ -158,7 +158,10 @@ const paintingDetail = async () => {
         },
       });
     } else {
-      if (res.data.boxRelBucketStatus == 3 && res.data.locateAddress == "公司内") {
+      if (
+        res.data.boxRelBucketStatus == 3 &&
+        res.data.locateAddress == "公司内"
+      ) {
         uni.navigateTo({
           url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
           success: () => {
@@ -207,12 +210,12 @@ const obtainCode = async () => {
   if (res.status === 0) {
     haveCode.value = true;
     showMessage({ type: "default", message: "验证码已发送" });
-
   } else {
-    if(res.msg == '已经发送过，验证码尚可用'){
+    if (res.msg == "已经发送过，验证码尚可用") {
       haveCode.value = true;
-    }else{showMessage({ type: "error", message: res.msg });}
-    
+    } else {
+      showMessage({ type: "error", message: res.msg });
+    }
   }
   loading.value = false;
 };
@@ -227,7 +230,7 @@ const logining = async () => {
   const res = await userLogin({
     TelNum: state.TelNum ?? "",
     Password: state.Password ?? "",
-    code:state.code ?? "",
+    code: state.code ?? "",
   });
   if (res.status === 0) {
     uni.setStorageSync("token", res.data.Token);