From 82153c42ce5e20670774d5b7745b56578d8fd741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BD=AA?= <libiao199803@163.com>
Date: Tue, 15 Apr 2025 11:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=A8=A1=E6=8B=9F=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/adminNfc/index.vue |  4 ++++
 pages/login/login.vue    | 20 ++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pages/adminNfc/index.vue b/pages/adminNfc/index.vue
index a7af4be..18734a0 100644
--- a/pages/adminNfc/index.vue
+++ b/pages/adminNfc/index.vue
@@ -10,6 +10,10 @@
         <view class="card-title">未绑定子区域数</view>
         <view class="card-totel">10</view>
       </view>
+    </view>
+    <!-- 搜索 -->
+    <view>
+    
     </view>
     <u-tabbar :list="vuex_tabbar"></u-tabbar>
   </view>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b459635..6fd8f9b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -14,10 +14,10 @@
     </view>
     <u-button type="primary" @click="loginFn" style="margin-top: 50rpx">登陆</u-button>
     <u-button type="primary" @click="login1Fn" style="margin-top: 50rpx"
-      >登陆13800451500管理员</u-button
+      >登陆13800451500清洁工</u-button
     >
     <u-button type="primary" @click="login2Fn" style="margin-top: 50rpx"
-      >登陆18174010562清洁工</u-button
+      >登陆18174010562管理员</u-button
     >
   </view>
 </template>
@@ -62,7 +62,7 @@ export default {
         },
       ];
       this.$u.vuex("vuex_tabbar", normalTabBar);
-      this.loginFn(false);
+      this.loginFn("user");
     },
     login2Fn() {
       this.phone = "18174010562";
@@ -89,13 +89,8 @@ export default {
         },
       ];
       this.$u.vuex("vuex_tabbar", adminTabBar);
-      this.loginFn(true);
+      this.loginFn("admin");
     },
-    // 路径格式化方法
-    normalizePath(path) {
-      return path.startsWith("/") ? path : `/${path}`;
-    },
-
     async loginFn(type) {
       let salt = bcrypt.genSaltSync(12);
       let req = {
@@ -112,12 +107,13 @@ export default {
       }
       let token = res.data;
       uni.setStorageSync("token", "Bearer " + token);
-      let userRole = "admin";
-      if (type) {
+      console.log(type, "type--");
+      if (type === "user") {
         uni.switchTab({
           url: `/pages/index/planList`,
         });
-      } else {
+      }
+      if (type === "admin") {
         uni.switchTab({
           url: `/pages/adminHome/index`,
         });