Browse Source

fix: 调整新开装修页面获取当前站点机制

周玉环 2 days ago
parent
commit
10e94278de

+ 3 - 3
xinkeaboard-admin/src/pages/decorate/pc/home/diy_page_lists.js

@@ -25,8 +25,8 @@ import Search from '@/components/Search/Search';
 import defaultSettings from '@/defaultSettings';
 
 let pageSize = list_com_page_size_10;
-@connect(({ product }) => ({
-  product,
+@connect(({ product, global }) => ({
+  product,global
 }))
 @Form.create()
 export default class Diy_page_lists extends Component {
@@ -138,7 +138,7 @@ export default class Diy_page_lists extends Component {
           width: 100,
           render: (text, record) => (
             <Fragment>
-              <Link to={{ pathname: `/decorate_pc/diy_page_lists_to_edit`, search: `?id=${record.decoId}&type=index` }}
+              <Link to={{ pathname: `/decorate_pc/diy_page_lists_to_edit`, search: `?id=${record.decoId}&type=index&webSite=${props.global.currentSite}` }}
                     target="_blank">
                 {
                   sldtbaleOpeBtnText(`${sldComLanguage('装修')}`, null)

+ 2 - 1
xinkeaboard-admin/src/utils/utils.js

@@ -1329,7 +1329,8 @@ export function getSldStatYTitle() {
  * */
 export function sldComRequest(method, url, params, data_type = '') {
   const state = window.g_app._store.getState();
-  const currentSite = state.global.currentSite || localStorage.getItem('currentSite');
+  const { webSite = '' } = state.routing.location.query;
+  const currentSite = webSite || state.global.currentSite || localStorage.getItem('currentSite');
   const currentPath = state.routing.location.pathname;
   if (!currentPath.includes('/user/login')) {
     params = Object.assign({}, { webSite: currentSite }, params ?? {})