Merge refs/heads/master into refs/heads/branch-novideo

riku

2024-11-14 2a04ae9a602c88c1c8a16da154c3a51075e88d86

Merge refs/heads/master into refs/heads/branch-novideo

 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',
                  });

 common/common.rar

Binary files differ

 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,