From 2a04ae9a602c88c1c8a16da154c3a51075e88d86 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 14 十一月 2024 10:55:29 +0800
Subject: [PATCH] Merge refs/heads/master into refs/heads/branch-novideo
---
pages/simple-home/index.js | 4 ++--
/dev/null | 0
behaviors/login.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/behaviors/login.js b/behaviors/login.js
index 0fc0dfb..6677a4b 100644
--- a/behaviors/login.js
+++ b/behaviors/login.js
@@ -96,7 +96,7 @@
loadConfig()
.then(res => {
// 鍒ゆ柇鐢ㄦ埛鏄惁杩涘叆绠�鍖栦富椤�
- if (app.globalData.userConfig.ucExtension1 == 'simple') {
+ if (app.globalData.userConfig && app.globalData.userConfig.ucExtension1 == 'simple') {
wx.redirectTo({
url: '/pages/simple-home/index',
});
diff --git a/common/common.rar b/common/common.rar
deleted file mode 100644
index aafc7f3..0000000
--- a/common/common.rar
+++ /dev/null
Binary files differ
diff --git a/pages/simple-home/index.js b/pages/simple-home/index.js
index e5d85d5..cf33640 100644
--- a/pages/simple-home/index.js
+++ b/pages/simple-home/index.js
@@ -2,7 +2,7 @@
import { useLoading } from '../../behaviors/loading';
import { useOptions } from '../home/options-proxy.js';
import { useInsepction } from '../home/inspection-proxy.js';
-// import { useSupervision } from '../home/supervision-proxy.js';
+import { useSupervision } from '../home/supervision-proxy.js';
// import { useNotice } from '../home/notice-proxy.js';
// import { useNews } from '../home/news-proxy.js';
import { useProblemChangeList } from '../inspection/ranking/problem-change-list.js';
@@ -16,7 +16,7 @@
useLoading,
useOptions,
useInsepction,
- // useSupervision,
+ useSupervision,
// useNotice,
// useNews,
useStatistic,
--
Gitblit v1.9.3