feat: 优化获取站点信息

src/layouts/Site.js

@@ -337,13 +337,13 @@ class Site {
     self.props.updateCurrentIndex && self.props.updateCurrentIndex(-1);
     const login = new Login(this.props, () => {
       self.setLoading(false);
-      
+      self.getCityStationsForUser().then(res => {
+        window.share.event.emit('updateSite', res);
+      });
       // eslint-disable-next-line no-unused-expressions
       self.props.updateCurrentIndex && self.props.updateCurrentIndex(0);
       // debugger
       // initMicroApps();
-      
-
       // 切换站点后，重置掉三级菜单
       const homeType = self.globalConfig.homeType || 'civweb4';
       const homePath = self.globalConfig.homepage ? self.globalConfig.homepage.startsWith(homeType) ? self.globalConfig.homepage: `/${homeType}/${self.globalConfig.homepage}`: `/${homeType}`;
@@ -355,20 +355,12 @@ class Site {
 
       // 重新加载订阅消息铃铛
       window.share && window.share.event && window.share.event.emit('reloadNotice');
-
       const config = self.globalConfig;
       let url = !config.home ? ((config.homepage === '' || _.isNull(config.homepage)) ? `/civweb4`: `/civweb4/${config.homepage.replace(/^\//, '').replace(/^civweb4\//, '')}`) :  `/${config.homepage.replace(/^\//, '')}`;
-        self.props.history && self.props.history.push(url)
-
-      self.getCityStationsForUser().then(res => {
-        debugger
-        window.share.event.emit('updateSite', res);
-      });
-      self.props &&
-        self.props.updateCollapsed &&
-        self.props.updateCollapsed(false);
+      self.props.history && self.props.history.push(url);
+      self.props && self.props.updateCollapsed && self.props.updateCollapsed(false);
       window.share.event.emit('triggerMicro', this.props.global);
-      // onChangeVisible && onChangeVisible(false);
+      onChangeVisible && onChangeVisible(false);
     });
     login.init();
   }