From b7e2ab9df65e13c6b9f24a6e57f4501967568edc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 23 十月 2025 17:45:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
manager/src/libs/util.js | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/manager/src/libs/util.js b/manager/src/libs/util.js
index 142e9f1..a5090a9 100644
--- a/manager/src/libs/util.js
+++ b/manager/src/libs/util.js
@@ -106,13 +106,13 @@
let userInfo = Cookies.get("userInfoManager");
if (!userInfo) {
// 鏈櫥褰�
- return;
+ return Promise.resolve(false);
}
if (!vm.$store.state.app.added) {
// 绗竴娆″姞杞� 璇诲彇鏁版嵁
// 鍔犺浇鑿滃崟
- getCurrentPermissionList().then(res => {
- if (!res.success) return false;
+ return getCurrentPermissionList().then(res => {
+ if (!res.success) return Promise.reject(false);
let menuData = res.result;
// 鏍煎紡鍖栨暟鎹紝璁剧疆 绌篶hildren 涓� null
@@ -129,7 +129,7 @@
}
if (!menuData) {
- return;
+ return Promise.reject(false);
}
util.initAllMenuData(constRoutes, menuData);
util.initRouterNode(otherRoutes, otherRouter);
@@ -145,17 +145,22 @@
// 缂撳瓨鏁版嵁 淇敼鍔犺浇鏍囪瘑
window.localStorage.setItem("menuData", JSON.stringify(menuData));
vm.$store.commit("setAdded", true);
+ return Promise.resolve(true);
+ }).catch(err => {
+ console.error("璺敱鍒濆鍖栧け璐�:", err);
+ return Promise.reject(false);
});
} else {
// 璇诲彇缂撳瓨鏁版嵁
let data = window.localStorage.getItem("menuData");
if (!data) {
vm.$store.commit("setAdded", false);
- return;
+ return Promise.resolve(false);
}
let menuData = JSON.parse(data);
// 娣诲姞鑿滃崟璺敱
util.initMenuData(vm, menuData);
+ return Promise.resolve(true);
}
};
--
Gitblit v1.8.0