fix: 修改首页问题

src/components/GlobalHeader/ExtendRightContent.js

@@ -125,7 +125,7 @@ const GlobalHeaderRight = props => {
     const url = _.isString(props.global.get('homepage'))
       ? props.global.get('homepage')
       : props.global.get('homepage.url');
-    window.share.event.emit('goHome', `/civbase/civweb4/${url}`);
+    window.share.event.emit('goHome', `/${url}`);
     url ? (
       window.share.event.emit('listenerMointer', {
         label: '首页',

src/layouts/BasicLayout.js

@@ -839,7 +839,7 @@ const BasicLayout = props => {
       if (lastIndex >= 0) {
         history.push(newTabList[lastIndex].path);
       } else {
-        history.replace(`/civweb4/${props.global.homepage}`);
+        history.replace(`/${props.global.homepage}`);
       }
       props.updateSelectedKeys(newActiveKey);
       props.updatePathname(newActiveKey);

src/layouts/Site.js

@@ -345,7 +345,7 @@ class Site {
       window.history.replaceState(
         '',
         '',
-        `/civbase/civweb4/${self.globalConfig.homepage}`,
+        `/${self.globalConfig.homepage}`,
       );
       self.getCityStationsForUser().then(res => {
         window.share.event.emit('updateSite', res);

src/micro.js

@@ -211,23 +211,18 @@ export const defaultApp = () => {
     const config = createStoreage.get('globalConfig');
     if (config && config.token) {
         
-        const basePath =config.homepage !== '' && FILTER_FOLER_REG.test(config.homepage) ?'civweb4' :'civweb4';
-        if(config && config.home) {
-            setDefaultMountApp(`/civbase/${config.home.path.replace(/^\//, '')}`);
-        } else {
-            
-            const homepage = _.isNull(config.homepage) ? '/index': '/' + config.homepage;
-            setDefaultMountApp(`/${pkg.name.toLocaleLowerCase()}/${basePath}${homepage}`);
-            createStoreage.set('init_web4', true)
-        }
-        // if(config.productType && config.productType !== 'civweb4') {
-        //     setDefaultMountApp(`/civbase/${config.productType}/${config.homepage.replace(/^\//, '')}`);
+        // const basePath =config.homepage !== '' && FILTER_FOLER_REG.test(config.homepage) ?'civweb4' :'civweb4';
+        // if(config && config.home) {
+        //     setDefaultMountApp(`/civbase/${config.home.path.replace(/^\//, '')}`);
         // } else {
+            
         //     const homepage = _.isNull(config.homepage) ? '/index': '/' + config.homepage;
-        //     setDefaultMountApp(`/${pkg.name.toLocaleLowerCase()}/civweb4${homepage}`);
+        //     setDefaultMountApp(`/${pkg.name.toLocaleLowerCase()}/${basePath}${homepage}`);
         //     createStoreage.set('init_web4', true)
         // }
 
+        setDefaultMountApp(`/civbase/${config.homepage.replace(/^\//, '')}`);
+        if(config.homepage.indexOf('civweb4') > -1) createStoreage.set('init_web4', true);
     }
 };
 

src/pages/user/login/login.js

@@ -218,12 +218,12 @@ class Login {
             : response;
         if (result && result.length > 0) {
           const config = result.shift();
+          const homeType = config.productType || 'civweb4';
           self.globalConfig = Object.assign(self.globalConfig, config, {
             theme: self.globalConfig.theme,
             menu: self.globalConfig.menu,
             style: self.globalConfig.style,
-            homepage: params.getParams('redirect') || self.globalConfig.homepage || config.homepage,
-            // productType: config.productType || self.globalConfig.productType || 'civweb4'
+            homepage: homeType + '/' + (params.getParams('redirect') || self.globalConfig.homepage || config.homepage),
           });
 
           if(self.globalConfig.hasOwnProperty('webConfig')) {
@@ -235,8 +235,6 @@ class Login {
           }
 
           self.updateConfig && self.updateConfig(self.globalConfig);
-          // createStoreage.set('globalConfig', self.globalConfig);
-          // window.globalConfig.productType = self.globalConfig.productType;
           self.getProjectItems().then(() => {
             window.subSysCfg = {};
             result.forEach(item => {
@@ -278,8 +276,9 @@ class Login {
                       : response;
                   if (resultData && resultData.length > 0) {
                     const mainConf = resultData.shift();
+                    const mainType = mainConf.productType || 'civweb4';
                     if (mainConf.homepage)
-                      self.globalConfig.homepage = mainConf.homepage;
+                      self.globalConfig.homepage = `${mainType}/${mainConf.homepage}`;
                     if (mainConf.bannerLogo)
                       self.globalConfig.bannerLogo = mainConf.bannerLogo;
                     if (mainConf.logo) self.globalConfig.logo = mainConf.logo;
@@ -301,8 +300,6 @@ class Login {
             } else {
               // loginSuccess
               self.updateConfig && self.updateConfig(self.globalConfig);
-              // createStoreage.set('globalConfig', self.globalConfig);
-              // window.globalConfig.productType = self.globalConfig.productType;
               // console.log("===loginSuccess===")
               getIndustry
                 ? self.events.emit('toggleIndustry')