feat: 平台管理端增加多站点逻辑

xinkeaboard-admin/config/router.config.js

@@ -64,6 +64,13 @@ export default [
         icon: 'home',
         name: 'home',
         routes: [
+          // 大屏管理
+          { 
+            path: '/sysset_home/bigscreen',
+            icon: 'home',
+            name: 'bigscreen',
+            component: './sysset/bigscreen/index',
+          },
           //概况页
           {
             path: '/sysset_home/basic',

xinkeaboard-admin/src/components/SldModal/SldModal.less

@@ -15,6 +15,7 @@
 
   .ant-form-item-label {
     line-height: 32px;
+    white-space: initial;
   }
 
   .ant-modal-close-x .anticon svg {

xinkeaboard-admin/src/components/SldTableEdit/SldTableEdit.js

@@ -315,10 +315,10 @@ export default class SldTableEdit extends Component {
                     onCancel={this.props.tip!=undefined&&this.props.tip.cancle!=undefined?this.props.tip.cancle:null}
                     okText={'确定'}
                     cancelText={'取消'}>
-                     <a className={index.save_btn} href="javascript:void(0)">保&nbsp;存</a>
+                     <a className={index.save_btn} onClick={(e) => e.preventDefault()}>{sldComLanguage('保存并更新')}</a>
 
                   </Popconfirm>
-                  :<span className={'display-none'}><a className={index.save_btn} href="javascript:void(0)" onClick={this.sldConfirm}>保&nbsp;存</a></span>
+                  :<span className={'display-none'}><a className={index.save_btn} href="javascript:void(0)" onClick={this.sldConfirm}>{sldComLanguage('保存并更新')}</a></span>
                 }
                 {this.props.showOtherBtn != undefined &&
                 <Button style={{ marginLeft: 8,}} loading={this.props.submiting_sec}
@@ -584,11 +584,11 @@ export default class SldTableEdit extends Component {
         <div className={global.m_diy_bottom_wrap}
              style={{ position: 'fixed', left: this.props.global.collapsed ? 90 : 160 }}>
           <Button className={global.btn_fixed_bottom} key="submit" style={{
-            width: 80, height: 32, borderRadius: 3,
+            width: 100, height: 32, borderRadius: 3,
           }}
                   type="primary" loading={this.props.submiting}
                   onClick={this.sldConfirm}>
-            {sldComLanguage('保存')}
+            {sldComLanguage('保存并更新')}
           </Button>
         </div>
 

xinkeaboard-admin/src/locales/en-US/content.js

@@ -421,9 +421,9 @@
  '企业注册地址':'Registered address',
  '企业曾用名':'Enterprise formerly known as',
  '所在地域':'The geographical location',
- '修改配置成功后，需点击右上角更新配置按钮更新配置才可生效':'Modify the configuration is successful, need to click the top right button to update the configuration update configuration to become effective',
+ '修改配置成功后，需点击下方保存并更新按钮更新配置才可生效':'After successfully modifying the configuration, you need to click the Save and Update button below to update the configuration for it to take effect',
  '域名更改一定要确保正确，否则将影响该系统的使用':'Be sure to change the domain name correctly, otherwise it will affect the use of the system',
- '选中的字段将在订单导出的时候导出该数据，修改配置成功后，需点击右上角更新配置按钮更新配置才可生效':'Select the fields to export the data at the time of export orders, the modified configuration, and you need to update the upper right corner click the Configure button to update the configuration to become effective',
+ '选中的字段将在订单导出的时候导出该数据，修改配置成功后，需点击下方保存并更新按钮更新配置才可生效':'Select the fields to export the data at the time of export orders, the modified configuration, and you need to update the upper right corner click the Configure button to update the configuration to become effective',
  '周日':'Sunday',
  '周一':'on Monday',
  '周二':'on Tuesday',
@@ -559,7 +559,8 @@
   //src/pages/sysset/home/basic.js
  '金额(元)':'Amount (yuan)',
  '待办事项':'To do',
- '全部站点待办事项': 'All site procedures',
+ '全部站点待办事项': 'All site to-do list',
+ '当前站点待办事项': 'Current site to-do list',
 
   //src/pages/sysset/notice_set/email.js
  '请输入测试邮件':'Please enter a test message',
@@ -873,6 +874,7 @@
 
   //src/pages/pcdecorate/home/edit_diy_page.js
  '保 存':'Save',
+ '保存并更新': 'Save and update',
 
   //src/pages/pcdecorate/home/edit_diy_page_head.js
  '您好，欢迎来到':'Hello, welcome to',

xinkeaboard-admin/src/locales/zh-CN/content.js

@@ -430,9 +430,9 @@ export default {
   '企业注册地址': '企业注册地址',
   '企业曾用名': '企业曾用名',
   '所在地域': '所在地域',
-  '修改配置成功后，需点击右上角更新配置按钮更新配置才可生效': '修改配置成功后，需点击右上角更新配置按钮更新配置才可生效',
+  '修改配置成功后，需点击下方保存并更新按钮更新配置才可生效': '修改配置成功后，需点击下方保存并更新按钮更新配置才可生效',
   '域名更改一定要确保正确，否则将影响该系统的使用': '域名更改一定要确保正确，否则将影响该系统的使用',
-  '选中的字段将在订单导出的时候导出该数据，修改配置成功后，需点击右上角更新配置按钮更新配置才可生效': '选中的字段将在订单导出的时候导出该数据，修改配置成功后，需点击右上角更新配置按钮更新配置才可生效',
+  '选中的字段将在订单导出的时候导出该数据，修改配置成功后，需点击下方保存并更新按钮更新配置才可生效': '选中的字段将在订单导出的时候导出该数据，修改配置成功后，需点击下方保存并更新按钮更新配置才可生效',
   '周日': '周日',
   '周一': '周一',
   '周二': '周二',
@@ -937,6 +937,7 @@ export default {
 
   // src/pages/pcdecorate/home/edit_diy_page.js
   '保 存': '保 存',
+  '保存并更新': '保存并更新',
 
   // src/pages/pcdecorate/home/edit_diy_page_head.js
   '您好，欢迎来到': '您好，欢迎来到',
@@ -2259,6 +2260,7 @@ export default {
   '待处理结算单':'待处理结算单',
   '待办事项':'待办事项',
   '全部站点待办事项': '全部站点办事项',
+  '当前站点待办事项': '当前站点待办事项',
   '待分配询盘':'待分配询盘',
   '支付/下单金额趋势':'支付/下单金额趋势',
   '流量趋势':'流量趋势',

xinkeaboard-admin/src/models/bigscreen.js

@@ -0,0 +1,30 @@
+import { sldCommonService } from '@/utils/utils';
+export default {
+  namespace: 'bigscreen',
+
+  state: {
+    
+  },
+
+  effects: {
+    // *change_manager_pwd({ payload, callback }, { call }) {
+    //   const response = yield call(sldCommonService, payload,'post','v3/system/admin/adminUser/updatePwd');
+    //   if (callback) callback(response);
+    // },
+  },
+
+  reducers: {
+    
+  },
+
+  subscriptions: {
+    setup({ history }) {
+      // Subscribe history(url) change, trigger `load` action if pathname is `/`
+      return history.listen(({ pathname, search }) => {
+        if (typeof window.ga !== 'undefined') {
+          window.ga('send', 'pageview', pathname + search);
+        }
+      });
+    },
+  },
+};

xinkeaboard-admin/src/pages/manage/store/own_list.js

@@ -26,8 +26,8 @@ import areaData from '@/assets/area.json';
 import defaultSettings from '@/defaultSettings';
 
 let pageSize = list_com_page_size_10;
-@connect(({ store }) => ({
-  store,
+@connect(({ store, global }) => ({
+  store, global
 }))
 @Form.create()
 export default class OwnList extends Component {
@@ -61,7 +61,7 @@ export default class OwnList extends Component {
       operateData: [],//操作数据
       addData: [{
         type: 'input',
-        label: `${sldComLanguage('店铺名称')}`,
+        label: `${props.global.currentSiteName}${sldComLanguage('店铺名称')}`,
         name: 'storeName',
         extra: `${sldComLanguage('最多输入50个字')}`,
         placeholder: `${sldComLanguage('请输入店铺名称')}`,
@@ -299,6 +299,7 @@ export default class OwnList extends Component {
             } else {
               if(item.name == 'storeName'){
                 item.disable = true;
+                item.extra = '';
               }
               item.initialValue = res.data[item.name];
             }

xinkeaboard-admin/src/pages/member/recharge_setting.js

@@ -90,7 +90,7 @@ export default class RechargeSetting extends Component {
     return (
       <Spin spinning={initLoading}>
         <div className={global.common_page} style={{padding:'10px 0 0 0'}}>
-          {showMoreHelpTip(``, ['修改配置成功后，需点击右上角更新配置按钮更新配置才可生效'], 0)}{/*操作提示*/}
+          {showMoreHelpTip(``, ['修改配置成功后，需点击下方保存并更新按钮更新配置才可生效'], 0)}{/*操作提示*/}
           {getSldEmptyH(10)}
           {flag == 1 &&
           <SldTableEdit

xinkeaboard-admin/src/pages/statistics/realtime.js

@@ -7,6 +7,7 @@ import {
   formatNum,
 } from '@/utils/utils';
 import global from '@/global.less';
+import styles from './realtime.less';
 import RealtimeOther from './realtime_other';
 import stat from '@/assets/css/stat.less';
 import SldScrollbars from '@/components/SldScrollbars';
@@ -29,6 +30,7 @@ export default class StatisticsRealtime extends Component {
       refreshTime: '',//更新时间
       initLoading: false,
       detailData: {},//页面数据
+      currentSiteName: props.global.currentSiteName,
       realTimeData1: {
         icon: require('@/assets/real_icon_1.png'),
         title: `${sldComLanguage('平台汇总')}`,
@@ -267,8 +269,74 @@ export default class StatisticsRealtime extends Component {
     });
   };
 
+  realtimeAnalysis = () => {
+    const { refreshTime } = this.state;
+    return (
+      <>
+        <div className={`${stat.label_panel} ${global.flex_row_start_center}`}>
+            {sldLlineRtextAddGoodsAddMargin(defaultSettings.primaryColor, `${sldComLanguage('实时分析')}`, 10, 0, 0)}
+            <Tooltip placement="right" title={`${sldComLanguage('今日实时数据的统计时间均为今日零时至当前更新时间。点击刷新按钮可强制更新。')}`}>
+              <img style={{ display: 'inline-block', marginLeft: '10px' }}
+                    src={require('@/assets/home_basic/help_icon.png')}></img>
+            </Tooltip>
+            <div className={`${stat.update_time_panel} ${global.flex_row_start_center}`}>
+              <span>{`${sldComLanguage('更新时间：')}`}{refreshTime}</span>
+              <i onClick={() => this.initData(true)} className={`${stat.reload_icon}`}></i>
+            </div>
+        </div>
+      </>
+    )
+  }
+
+  platformSummary = (type) => {
+    const { currentSiteName, realTimeData2, realTimeData1, initLoading, refreshTime, screenW, loadedFlag, detailData } = this.state;
+    const leftW = this.props.global != undefined && this.props.global.collapsed != undefined && this.props.global.collapsed ? 90 : 150;
+    let itemW = (screenW * 1 - leftW - 20 - 100 - 30 - 80) / 5;
+    return (
+      <>
+        {this.realtimeAnalysis()}
+        <div className={`${stat.num_stat_item} ${global.flex_row_start_center} ${global.no_border}`}>
+          <div className={`${stat.left_slide} ${global.flex_column_center_center}`}>
+            <img src={realTimeData1.icon} className={`${stat.slide_icon}`}></img>
+            <span className={`${stat.slide_title}`}>{realTimeData1.title}</span>
+          </div>
+          <div className={`${stat.right_main}`}>
+            <ul className={`${global.flex_row_start_center}`}>
+              {realTimeData1.list.map((item, index) => (
+                <li key={index} className={`${global.flex_column_center_start}`} style={{ width: itemW }}>
+                  <div className={`${stat.up_desc}`}>
+                    <span>{item.name}</span>
+
+                    {item.isHelpIcon ? <Tooltip placement="right" title={item.tip}>
+                      <img src={require('@/assets/home_basic/help_icon.png')}></img>
+                    </Tooltip> : ''}
+                  </div>
+                  <div className={`${stat.down_num}`} title={item.value}>
+                    <span>
+                    {loadedFlag && (
+                      item.value > 10000
+                        ? formatNum(item.value, item.isMoney ? 2 : 0)
+                        : <TweenOne animation={{
+                          Children: {
+                            value: item.value, floatLength: item.isMoney ? 2 : 0,
+                            formatMoney: true,
+                          },
+                          duration: 1000,
+                        }}/>
+                    )}
+                  </span>
+                  </div>
+                </li>
+              ))}
+            </ul>
+          </div>
+        </div>
+      </>
+    )
+  }
+
   render() {
-    const { realTimeData2, realTimeData1, initLoading, refreshTime, screenW, loadedFlag, detailData } = this.state;
+    const { currentSiteName, realTimeData2, realTimeData1, initLoading, refreshTime, screenW, loadedFlag, detailData } = this.state;
     const leftW = this.props.global != undefined && this.props.global.collapsed != undefined && this.props.global.collapsed ? 90 : 150;
     let itemW = (screenW * 1 - leftW - 20 - 100 - 30 - 80) / 5;
     return (
@@ -281,19 +349,11 @@ export default class StatisticsRealtime extends Component {
         >
           <Spin spinning={initLoading}>
             <div className={`${stat.module_item}`}>
-              <div className={`${stat.label_panel} ${global.flex_row_start_center}`}>
-                {sldLlineRtextAddGoodsAddMargin(defaultSettings.primaryColor, `${sldComLanguage('实时分析')}`, 10, 0, 0)}
-                <Tooltip placement="right" title={`${sldComLanguage('今日实时数据的统计时间均为今日零时至当前更新时间。点击刷新按钮可强制更新。')}`}>
-                  <img style={{ display: 'inline-block', marginLeft: '10px' }}
-                       src={require('@/assets/home_basic/help_icon.png')}></img>
-                </Tooltip>
-                <div className={`${stat.update_time_panel} ${global.flex_row_start_center}`}>
-                  <span>{`${sldComLanguage('更新时间：')}`}{refreshTime}</span>
-                  <i onClick={() => this.initData(true)} className={`${stat.reload_icon}`}></i>
-                </div>
-              </div>
-              <div className={`${stat.real_num_panel}`}>
-                <div className={`${stat.num_stat_item} ${global.flex_row_start_center}`}>
+              {currentSiteName && this.platformSummary()}
+              {currentSiteName && <div className={ styles.current_site }>{ currentSiteName }</div> }
+              <div className={`${stat.real_num_panel} ${styles.current_site_stat}`}>
+                {this.realtimeAnalysis()}
+                <div className={`${stat.num_stat_item} ${global.flex_row_start_center} ${styles.no_border}`}>
                   <div className={`${stat.left_slide} ${global.flex_column_center_center}`}>
                     <img src={realTimeData1.icon} className={`${stat.slide_icon}`}></img>
                     <span className={`${stat.slide_title}`}>{realTimeData1.title}</span>
@@ -331,7 +391,7 @@ export default class StatisticsRealtime extends Component {
                   </div>
                 </div>
                 <div>
-                  <div className={`${stat.num_stat_item} ${global.flex_row_start_start}`}>
+                  <div className={`${stat.num_stat_item} ${global.flex_row_start_start} ${styles.no_border}`}>
                     <div
                       className={`${stat.left_slide} ${global.flex_column_center_center}`}>
                       <img src={realTimeData2.icon} className={`${stat.slide_icon}`}></img>

xinkeaboard-admin/src/pages/statistics/realtime.less

@@ -0,0 +1,22 @@
+.current_site {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 50px;
+  font-size: 25px;
+  font-weight: bold;
+  margin: 10px 0;
+  background-color: #fff;
+}
+
+.current_site_stat {
+    padding: 0 20px;
+}
+
+.no_pointer {
+  cursor: initial !important;
+}
+
+.no_border {
+  border: none !important;
+}

xinkeaboard-admin/src/pages/sysset/base/about_us.js

@@ -163,7 +163,7 @@ export default class SiteInfo extends Component {
                 flag:false
               }}
               showAboutUsUeditor={{
-                text:`${sldComLanguage('保存')}`,
+                text:`${sldComLanguage('保存并更新')}`,
               }}
             />
             }

xinkeaboard-admin/src/pages/sysset/bigscreen/index.js

@@ -0,0 +1,15 @@
+import React, { Component } from "react";
+import { connect } from "dva/index";
+
+@connect(({ bigscreen }) => ({
+  bigscreen,
+}))
+export default class BigScreen extends Component {
+  constructor(props) {
+    super(props);
+  }
+
+  render() {
+    return "sdsdd";
+  }
+}

xinkeaboard-admin/src/pages/sysset/home/basic.js

@@ -32,6 +32,35 @@ export default class Basic extends Component {
     this.state = {
       loadedFlag: false,//顶部数据是否加载完成
       waitDealLoading: false,//顶部待办事项数据是否加载完成
+      currentWaitDealLoading: false, // 当前站点待办事项数据是否加载完成
+      // 当前站点
+      current_site_goods_data: [
+        {
+          icon: require('@/assets/stat_item_icon_2.png'),
+          label: `${sldComLanguage('待审核商品')}`,
+          tip: ``,
+          mapKey: 'auditGoodsNum',
+          num: '',
+          path: '/manage_product/goods_list?tab=check',
+        },
+        {
+          icon: require('@/assets/stat_item_icon_3.png'),
+          label: `${sldComLanguage('待审核品牌')}`,
+          tip: ``,
+          mapKey: 'auditBrandNum',
+          num: '',
+          path: '/manage_product/brand?tab=check',
+        },
+        {
+          icon: require('@/assets/stat_item_icon_1.png'),
+          label: `${sldComLanguage('待分配询盘')}`,
+          tip: ``,
+          mapKey: 'enquiryToBeAssignNum',
+          num: '',
+          path: '/manage_order/enquiry',
+        }
+      ],
+      // 所有站点
       goods_data_one: [{
         icon: require('@/assets/stat_item_icon_1.png'),
         label: `${sldComLanguage('待审核店铺')}`,
@@ -80,6 +109,7 @@ export default class Basic extends Component {
       todayGoodsLoadedFlag: false,
       todayMemberLoadedFlag: false,
       todayEnquiryLoadedFlag: false,
+      currentWaitLoadedFlag: false,
       todayTradeLoading: false,
       todayFlowLoading: false,
       todayGoodsLoading: false,
@@ -256,6 +286,7 @@ export default class Basic extends Component {
 
   componentDidMount() {
     this.getWaitEventData();
+    this.getCurrentWaitEventData();
     this.getTodayTradeInfo();
     this.getTodayMemberInfo();
     this.getTodayFlowInfo();
@@ -263,6 +294,28 @@ export default class Basic extends Component {
     this.getTodayEnquiryInfo();
   }
 
+  // 获取当前站点待办栏目数据
+  getCurrentWaitEventData = () => {
+    const { dispatch } = this.props;
+    //loading开始
+    this.setState({
+      currentWaitDealLoading: true,
+    });
+    dispatch({
+      type: 'sldsetting/get_home_basic_wait_deal_stat_info',
+      callback: (res) => {
+        if (res.state === 200) {
+          let { current_site_goods_data } = this.state;
+          current_site_goods_data.map(item => {
+            item.num = res.data[item.mapKey];
+          });
+          this.setState({ current_site_goods_data });
+        }
+        this.setState({ currentWaitDealLoading: false, currentWaitLoadedFlag: true });
+      },
+    });
+  }
+
   //获取待办栏目数据
   getWaitEventData = () => {
     const { dispatch } = this.props;
@@ -272,6 +325,7 @@ export default class Basic extends Component {
     });
     dispatch({
       type: 'sldsetting/get_home_basic_wait_deal_stat_info',
+      payload: { isAll: true },
       callback: (res) => {
         if (res.state === 200) {
           let { goods_data_one } = this.state;
@@ -396,7 +450,7 @@ export default class Basic extends Component {
   };
 
   render() {
-    const { currentSiteName, goods_data_one, loadedFlag, waitDealLoading, /*todayTradeData,*/ todayFlowData, todayGoodsData, todayMemberData, todayTradeLoadedFlag, todayFlowLoadedFlag, todayGoodsLoadedFlag, todayMemberLoadedFlag, todayTradeLoading, todayFlowLoading, todayGoodsLoading, todayMemberLoading,todayEnquiryData,todayEnquiryLoadedFlag,todayEnquiryLoading } = this.state;
+    const { currentSiteName, current_site_goods_data, goods_data_one, currentWaitLoadedFlag, loadedFlag, currentWaitDealLoading, waitDealLoading, /*todayTradeData,*/ todayFlowData, todayGoodsData, todayMemberData, todayTradeLoadedFlag, todayFlowLoadedFlag, todayGoodsLoadedFlag, todayMemberLoadedFlag, todayTradeLoading, todayFlowLoading, todayGoodsLoading, todayMemberLoading,todayEnquiryData,todayEnquiryLoadedFlag,todayEnquiryLoading } = this.state;
     const todayData = [
       /*{ ...todayTradeData },*/
       { ...todayFlowData },
@@ -419,9 +473,9 @@ export default class Basic extends Component {
             </div>
             <Spin spinning={waitDealLoading}>
               <div className={`${styles.stat_amount_new} ${global.flex_com_row_space_around_center}`}>
-                {goods_data_one.map((item, index) => (
-                  <div key={index} onClick={() => (this.menuItemGoPage(item.path))} key={item.bg}
-                       className={`${styles.item} ${styles.goods} ${global.flex_com_row_start_start}`}
+                {goods_data_one.map((item) => (
+                  <div key={item.bg}
+                       className={`${styles.item} ${styles.goods} ${global.flex_com_row_start_start} ${global.no_pointer}`}
                   >
                     <div className={`${styles.left_pending_icon}`}>
                       <img src={item.icon} alt=""/>
@@ -448,6 +502,43 @@ export default class Basic extends Component {
             </Spin>
           </div>
           <div className={styles.current_site}>{ currentSiteName }</div>
+          {/* 当前站点的待办事项--start*/}
+          <div className={`${styles.module_item}`}>
+            <div className={`${stat.label_panel} ${styles.label_panel}`}>
+              {sldLlineRtextAddGoodsAddMargin(defaultSettings.primaryColor, `${sldComLanguage('待办事项')}`, 10, 0, 0)}
+              <span className={ styles.site_tip }>{ `( ${sldComLanguage('当前站点待办事项')} )` }</span>
+            </div>
+            <Spin spinning={currentWaitDealLoading}>
+              <div className={`${styles.stat_amount_new} ${global.flex_com_row_space_around_center}`}>
+                {current_site_goods_data.map((item) => (
+                  <div onClick={() => (this.menuItemGoPage(item.path))} key={item.bg}
+                       className={`${styles.item} ${styles.goods} ${global.flex_com_row_start_start}`}
+                  >
+                    <div className={`${styles.left_pending_icon}`}>
+                      <img src={item.icon} alt=""/>
+                    </div>
+                    <div className={`${styles.item_desc}`}>
+                      <div className={`${styles.item_title}`}>{item.label}</div>
+                      <div title={item.num} className={`${styles.item_num}`}>
+                        {currentWaitLoadedFlag && (
+                          item.num > 10000
+                            ? formatNum(item.num)
+                            : <TweenOne animation={{
+                              Children: {
+                                value: item.num, floatLength: 0,
+                                formatMoney: true,
+                              },
+                              duration: 1000,
+                            }}/>
+                        )}
+                      </div>
+                    </div>
+                  </div>
+                ))}
+              </div>
+            </Spin>
+          </div>
+          {/* 当前站点的待办事项--end*/}
           <div className={`${styles.today_info_panel} ${global.flex_com_space_between}`}>
             {todayData.map((item, index) => (
               <div key={index} className={`${styles.today_info_item}`}>

xinkeaboard-admin/src/pages/sysset/home/basic.less

@@ -447,7 +447,7 @@
   height: 80px;
   font-size: 25px;
   font-weight: bold;
-  margin-top: 10px;
+  margin: 10px 0;
   background-color: #fff;
 }
 

xinkeaboard-admin/src/utils/util_data.js

@@ -880,10 +880,10 @@ export const sld_m_diy_tpzh_style = [{
 }];
 
 /*
-* 修改配置成功后，需点击右上角更新配置按钮更新配置才可生效
+* 修改配置成功后，需点击下方保存并更新按钮更新配置才可生效
 * */
 export function sld_need_update_setting() {
-  return [`${sldComLanguage('修改配置成功后，需点击右上角更新配置按钮更新配置才可生效')}`];
+  return [`${sldComLanguage('修改配置成功后，需点击下方保存并更新按钮更新配置才可生效')}`];
 }
 
 /*
@@ -898,7 +898,7 @@ export function sld_domain_manage_tip() {
 * */
 
 export function sld_order_export_tip() {
-  return [`${sldComLanguage('选中的字段将在订单导出的时候导出该数据，修改配置成功后，需点击右上角更新配置按钮更新配置才可生效')}`];
+  return [`${sldComLanguage('选中的字段将在订单导出的时候导出该数据，修改配置成功后，需点击下方保存并更新按钮更新配置才可生效')}`];
 }
 
 /*
@@ -919,7 +919,7 @@ export function week_day() {
 * */
 
 export function sld_sys_amount_tip() {
-  return [`${sldComLanguage('填写平台收款账号的信息，相关信息会出现在需要向平台汇款的页面')}`, `${sldComLanguage('修改配置成功后，需点击右上角更新配置按钮更新配置才可生效')}`];
+  return [`${sldComLanguage('填写平台收款账号的信息，相关信息会出现在需要向平台汇款的页面')}`, `${sldComLanguage('修改配置成功后，需点击下方保存并更新按钮更新配置才可生效')}`];
 }
 
 //TAB切换购物车图标

xinkeaboard-admin/src/utils/utils.js

@@ -14,6 +14,7 @@ import request from './request';
 import fetch from 'dva/fetch';
 import { getLocale } from 'umi/locale';
 import defaultSettings from '@/defaultSettings';
+import isEmpty from "lodash/isEmpty"
 
 const Search = Input.Search;
 
@@ -1333,9 +1334,15 @@ export function sldComRequest(method, url, params, data_type = '') {
   if (!currentPath.includes('/user/login')) {
     params = Object.assign({}, params ?? {}, { webSite: currentSite })
   }
+
+  if (params && params.isAll) {
+    delete params.isAll;
+    delete params.webSite;
+  }
+
   if (method == 'get') {
     let tmp_url = apiUrl + `${url}`;
-    if (params != undefined) {
+    if (params != undefined && !isEmpty(params)) {
       tmp_url += `?${stringify(params)}`;
     }
     return request(tmp_url);