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 @@
未绑定子区域数
10
+
+
+
+
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 @@
登陆
登陆13800451500管理员登陆13800451500清洁工
登陆18174010562清洁工登陆18174010562管理员
@@ -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`,
});