feat: 系统配置页面多站点逻辑完善

xinkeaboard-admin/src/components/MDiyItemEdit/index.js

@@ -1595,7 +1595,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker', true)}>
                 <span style={{ backgroundColor: data.color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('#e3e5e9', 'color')}>重置</a>
+              <a onClick={(e) => { e.preventDefault(); this.onChange('#e3e5e9', 'color') }}>重置</a>
             </div>
 
             {showColorPicker && (
@@ -1657,7 +1657,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker', true)}>
                 <span style={{ backgroundColor: data.color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('#fff', 'color')}>重置</a>
+              <a onClick={(e) => { e.preventDefault(); this.onChange('#fff', 'color') }}>重置</a>
             </div>
 
             {showColorPicker && (
@@ -1841,8 +1841,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>商品添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreGoods(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => { e.preventDefault(); this.selMoreGoods(data) }}>+ 添加</a>
                 <span className={`${styles.tip}`}>最少添加3个，最多添加9个</span>
               </div>
 
@@ -1989,8 +1989,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>商品添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreGoods(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreGoods(data)}}>+ 添加</a>
                 <span className={`${styles.tip}`}>最少添加1个</span>
               </div>
 
@@ -2082,8 +2082,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>视频添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreSvideo(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => { e.preventDefault(); this.selMoreSvideo(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最多添加{this.sele_more_svideo.min_num}个</span>*/}
               </div>
 
@@ -2181,8 +2181,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>直播添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreLive(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreLive(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最多添加30个</span>*/}
               </div>
 
@@ -2311,8 +2311,8 @@ export default class MDiyItem extends Component {
                  style={{ height: 70 }}>
               <span className={`${styles.required}`}>*</span>
               <span className={`${styles.title}`}>数据添加:</span>
-              <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                 onClick={() => this.selMoreTabData(data, more_tab_index)}>+ 添加</a>
+              <a className={`${styles.add_svideo_btn}`}
+                 onClick={(e) => {e.preventDefault(); this.selMoreTabData(data, more_tab_index) }}>+ 添加</a>
               <span className={`${styles.tip}`}>需要选择偶数个,最少2个</span>
             </div>
             {more_tab_item.info.length > 0 && this.renderMoreTabSeleData(more_tab_item.info, more_tab_item.data_type, more_tab_index)}
@@ -2367,7 +2367,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker2', true)}>
                 <span style={{ backgroundColor: data.tag_bg_color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('', 'tag_bg_color')}>默认</a>
+              <a onClick={(e) => {e.preventDefault(); this.onChange('', 'tag_bg_color') }}>默认</a>
             </div>
 
             {showColorPicker2 && (
@@ -2413,8 +2413,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>商品添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreGoods(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreGoods(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最少添加3个，最多添加9个</span>*/}
               </div>
 

xinkeaboard-admin/src/components/PageLoading/index.js

@@ -1,9 +1,10 @@
-import React from 'react';
-import { Spin } from 'antd';
+import React from "react";
+import { Spin } from "antd";
 
 // loading components from code split
 // https://umijs.org/plugin/umi-plugin-react.html#dynamicimport
 export default () => (
-  <div style={{ paddingTop: 100, textAlign: 'center' }}>
-  </div>
+  <Spin>
+    <div style={{ paddingTop: 100, textAlign: "center" }} />
+  </Spin>
 );

xinkeaboard-admin/src/components/SldComHeader/index.js

@@ -44,7 +44,7 @@ export default class SldComHeader extends Component {
 					<span style={{ backgroundColor: defaultSettings.primaryColor }} className={styles.left_border}/>
 					<span className={styles.title}>{title}</span>
           {commonSetting.operateTipSwitch&&
-          <a title={sld_show_tip?`${sldComLanguage("隐藏提示")}`:`${sldComLanguage("显示提示")}`} href={'javascript:void(0)'} className={styles.tip} onClick={() => this.toggleTip()}>
+          <a title={sld_show_tip?`${sldComLanguage("隐藏提示")}`:`${sldComLanguage("显示提示")}`} className={styles.tip} onClick={(e) => {e.preventDefault(); this.toggleTip() }}>
             <ALibbSvg fill={'#ff9864'} width={16} height={16} type={'ziyuan18'}/>
           </a>
           }
@@ -58,7 +58,7 @@ export default class SldComHeader extends Component {
               <span style={{ backgroundColor: defaultSettings.primaryColor }} className={styles.left_border}/>
               <span className={styles.title}>{title}</span>
               {commonSetting.operateTipSwitch&&
-              <a title={sld_show_tip?`${sldComLanguage("隐藏提示")}`:`${sldComLanguage("显示提示")}`} href={'javascript:void(0)'} className={styles.tip} onClick={() => this.toggleTip()}>
+              <a title={sld_show_tip?`${sldComLanguage("隐藏提示")}`:`${sldComLanguage("显示提示")}`} className={styles.tip} onClick={(e) => {e.preventDefault(); this.toggleTip() }}>
                 <ALibbSvg fill={'#ff9864'} width={16} height={16} type={'ziyuan18'}/>
               </a>
               }

xinkeaboard-admin/src/components/SldSelMoreLeftRightActivityGoods/index.js

@@ -244,9 +244,9 @@ export default class SldSelMoreLeftRightActivityGoods extends Component {
                 <div className={`${styles.left} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {data.list != undefined && data.list.length > 0 &&
                   data.list.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleLeftItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleLeftItem(item) }}
                               style={{ marginBottom: index == data.list.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.goods_image}/>
@@ -280,9 +280,9 @@ export default class SldSelMoreLeftRightActivityGoods extends Component {
                 <div className={`${styles.right} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {selectedRows.length > 0 ?
                   selectedRows.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleRightItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleRightItem(item) }}
                               style={{ marginBottom: index == selectedRows.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.goods_image}/>

xinkeaboard-admin/src/components/SldSelMoreLeftRightCategoryAndGoods/index.js

@@ -275,9 +275,9 @@ export default class SldSelMoreLeftRightCategoryAndGoods extends Component {
                 <div className={`${styles.left} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {data.list != undefined && data.list.length > 0 &&
                   data.list.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleLeftItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleLeftItem(item) }}
                               style={{ marginBottom: index == data.list.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.mainImage}/>
@@ -312,9 +312,9 @@ export default class SldSelMoreLeftRightCategoryAndGoods extends Component {
                 <div className={`${styles.right} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {selectedRows.length > 0 ?
                   selectedRows.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleRightItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleRightItem(item) }}
                               style={{ marginBottom: index == selectedRows.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.mainImage}/>

xinkeaboard-admin/src/components/SldSelMoreLeftRightGoods/index.js

@@ -252,9 +252,9 @@ export default class SldSelMoreLeftRightGoods extends Component {
                 <div className={`${styles.left} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {data.list != undefined && data.list.length > 0 &&
                   data.list.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleLeftItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleLeftItem(item) }}
                               style={{ marginBottom: index == data.list.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.mainImage}/>
@@ -289,9 +289,9 @@ export default class SldSelMoreLeftRightGoods extends Component {
                 <div className={`${styles.right} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {selectedRows.length > 0 ?
                   selectedRows.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleRightItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleRightItem(item) }}
                               style={{ marginBottom: index == selectedRows.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.mainImage}/>

xinkeaboard-admin/src/components/SldSelMoreLeftRightLive/index.js

@@ -269,9 +269,9 @@ export default class SldSelMoreLeftRightLive extends Component {
                 <div className={`${styles.left} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {data.list != undefined && data.list.length > 0 &&
                   data.list.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleLeftItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleLeftItem(item) }}
                               style={{ marginBottom: index == data.list.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.left_play_icon}
@@ -313,9 +313,9 @@ export default class SldSelMoreLeftRightLive extends Component {
                 <div className={`${styles.right} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {selectedRows.length > 0
                     ?selectedRows.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleRightItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleRightItem(item) }}
                               style={{ marginBottom: index == selectedRows.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.left_play_icon}

xinkeaboard-admin/src/components/SldSelMoreLeftRightStore/index.js

@@ -252,9 +252,9 @@ export default class SldSelMoreLeftRightStore extends Component {
                 <div className={`${styles.left} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {data.list != undefined && data.list.length > 0 &&
                   data.list.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleLeftItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleLeftItem(item) }}
                               style={{ marginBottom: index == data.list.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.storeLogo}/>
@@ -287,9 +287,9 @@ export default class SldSelMoreLeftRightStore extends Component {
                 <div className={`${styles.right} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {selectedRows.length > 0 ?
                   selectedRows.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleRightItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleRightItem(item) }}
                               style={{ marginBottom: index == selectedRows.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.storeLogo}/>

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

@@ -247,8 +247,7 @@ export default class SldSeleTpl extends Component {
             {tpl_type_list.length > 0 && tpl_type_list.map((item, index) => {
               return <a key={index}
                         style={{ borderBottomColor: sel_top_cat == item.type ? '#fff' : 'transparent' }}
-                        href='javascript:void(0)'
-                        onClick={() => this.sel_tpl(item.type)}>{item.typeName}</a>;
+                        onClick={(e) => {e.preventDefault(); this.sel_tpl(item.type) }}>{item.typeName}</a>;
             })
             }
           </div>
@@ -263,8 +262,8 @@ export default class SldSeleTpl extends Component {
                   return <a style={sel_left_tpl_id == item.tplPcId ? {
                     backgroundColor: defaultSettings.primaryColor,
                     color: '#fff',
-                  } : { backgroundColor: '#fff', color: '#333' }} key={index} href='javascript:void(0)'
-                            onClick={() => this.get_tpl_instance_data(item.tplPcId)}>{item.name.length > 6 ? item.name.substring(0, 6) : item.name}</a>;
+                  } : { backgroundColor: '#fff', color: '#333' }} key={index}
+                            onClick={(e) => {e.preventDefault(); this.get_tpl_instance_data(item.tplPcId) }}>{item.name.length > 6 ? item.name.substring(0, 6) : item.name}</a>;
                 })
                 }
               </Scrollbars>

xinkeaboard-admin/src/components/point/MDiyItemEdit/index.js

@@ -1257,7 +1257,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker', true)}>
                 <span style={{ backgroundColor: data.color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('#e3e5e9', 'color')}>重置</a>
+              <a onClick={(e) => {e.preventDefault(); this.onChange('#e3e5e9', 'color') }}>重置</a>
             </div>
 
             {showColorPicker && (
@@ -1319,7 +1319,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker', true)}>
                 <span style={{ backgroundColor: data.color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('#fff', 'color')}>重置</a>
+              <a onClick={(e) => {e.preventDefault(); this.onChange('#fff', 'color') }}>重置</a>
             </div>
 
             {showColorPicker && (
@@ -1525,8 +1525,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>商品添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreGoods(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreGoods(data) }}>+ 添加</a>
                 <span className={`${styles.tip}`}>最少添加1个</span>
               </div>
 
@@ -1618,8 +1618,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>视频添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreSvideo(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreSvideo(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最多添加{this.sele_more_svideo.min_num}个</span>*/}
               </div>
 
@@ -1717,8 +1717,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>直播添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreLive(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreLive(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最多添加30个</span>*/}
               </div>
 
@@ -1814,8 +1814,8 @@ export default class MDiyItem extends Component {
                  style={{ height: 70 }}>
               <span className={`${styles.required}`}>*</span>
               <span className={`${styles.title}`}>数据添加:</span>
-              <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                 onClick={() => this.selMoreTabData(data, more_tab_index)}>+ 添加</a>
+              <a className={`${styles.add_svideo_btn}`}
+                 onClick={(e) => {e.preventDefault(); this.selMoreTabData(data, more_tab_index) }}>+ 添加</a>
               <span className={`${styles.tip}`}>需要选择偶数个,最少2个</span>
             </div>
             {more_tab_item.info.length > 0 && this.renderMoreTabSeleData(more_tab_item.info, more_tab_item.data_type, more_tab_index)}
@@ -1870,7 +1870,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker2', true)}>
                 <span style={{ backgroundColor: data.tag_bg_color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('', 'tag_bg_color')}>默认</a>
+              <a onClick={(e) => {e.preventDefault(); this.onChange('', 'tag_bg_color') }}>默认</a>
             </div>
 
             {showColorPicker2 && (
@@ -1916,8 +1916,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>商品添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreGoods(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreGoods(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最少添加3个，最多添加9个</span>*/}
               </div>
 

xinkeaboard-admin/src/components/point/SldSelMoreLeftRightGoods/index.js

@@ -251,9 +251,9 @@ export default class SldSelMoreLeftRightGoods extends Component {
                 <div className={`${styles.left} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {data.list != undefined && data.list.length > 0 &&
                   data.list.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleLeftItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleLeftItem(item) }}
                               style={{ marginBottom: index == data.list.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.mainImage}/>
@@ -283,9 +283,9 @@ export default class SldSelMoreLeftRightGoods extends Component {
                 <div className={`${styles.right} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {selectedRows.length > 0 &&
                   selectedRows.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleRightItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleRightItem(item) }}
                               style={{ marginBottom: index == selectedRows.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.mainImage}/>

xinkeaboard-admin/src/components/spreader/MDiyItemEdit/index.js

@@ -1435,7 +1435,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker', true)}>
                 <span style={{ backgroundColor: data.color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('#e3e5e9', 'color')}>重置</a>
+              <a onClick={(e) => {e.preventDefault(); this.onChange('#e3e5e9', 'color') }}>重置</a>
             </div>
 
             {showColorPicker && (
@@ -1497,7 +1497,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker', true)}>
                 <span style={{ backgroundColor: data.color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('#fff', 'color')}>重置</a>
+              <a onClick={(e) => {e.preventDefault(); this.onChange('#fff', 'color') }}>重置</a>
             </div>
 
             {showColorPicker && (
@@ -1681,8 +1681,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>商品添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreGoods(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreGoods(data) }}>+ 添加</a>
                 <span className={`${styles.tip}`}>最少添加3个，最多添加9个</span>
               </div>
 
@@ -1813,8 +1813,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>商品添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreGoods(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreGoods(data) }}>+ 添加</a>
                 <span className={`${styles.tip}`}>最少添加1个</span>
               </div>
 
@@ -1906,8 +1906,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>视频添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreSvideo(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreSvideo(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最多添加{this.sele_more_svideo.min_num}个</span>*/}
               </div>
 
@@ -2005,8 +2005,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>直播添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreLive(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreLive(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最多添加30个</span>*/}
               </div>
 
@@ -2102,8 +2102,8 @@ export default class MDiyItem extends Component {
                  style={{ height: 70 }}>
               <span className={`${styles.required}`}>*</span>
               <span className={`${styles.title}`}>数据添加:</span>
-              <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                 onClick={() => this.selMoreTabData(data, more_tab_index)}>+ 添加</a>
+              <a className={`${styles.add_svideo_btn}`}
+                 onClick={(e) => {e.preventDefault(); this.selMoreTabData(data, more_tab_index) }}>+ 添加</a>
               <span className={`${styles.tip}`}>需要选择偶数个,最少2个</span>
             </div>
             {more_tab_item.info.length > 0 && this.renderMoreTabSeleData(more_tab_item.info, more_tab_item.data_type, more_tab_index)}
@@ -2158,7 +2158,7 @@ export default class MDiyItem extends Component {
               <div className={styles.show_color} onClick={() => this.showColorPicker('showColorPicker2', true)}>
                 <span style={{ backgroundColor: data.tag_bg_color }}></span>
               </div>
-              <a href={'javascript:void(0)'} onClick={() => this.onChange('', 'tag_bg_color')}>默认</a>
+              <a onClick={(e) => {e.preventDefault(); this.onChange('', 'tag_bg_color') }}>默认</a>
             </div>
 
             {showColorPicker2 && (
@@ -2204,8 +2204,8 @@ export default class MDiyItem extends Component {
               <div className={`${styles.add_svideo_wrap} ${global.flex_row_start_center}`}>
                 <span className={`${styles.required}`}>*</span>
                 <span className={`${styles.title}`}>商品添加:</span>
-                <a href={'javascript:void(0)'} className={`${styles.add_svideo_btn}`}
-                   onClick={() => this.selMoreGoods(data)}>+ 添加</a>
+                <a className={`${styles.add_svideo_btn}`}
+                   onClick={(e) => {e.preventDefault(); this.selMoreGoods(data) }}>+ 添加</a>
                 {/*<span className={`${styles.tip}`}>最少添加3个，最多添加9个</span>*/}
               </div>
 

xinkeaboard-admin/src/components/spreader/SldSelMoreLeftRightGoods/index.js

@@ -252,9 +252,9 @@ export default class SldSelMoreLeftRightGoods extends Component {
                 <div className={`${styles.left} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {data.list != undefined && data.list.length > 0 &&
                   data.list.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleLeftItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleLeftItem(item) }}
                               style={{ marginBottom: index == data.list.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.goodsImage}/>
@@ -288,9 +288,9 @@ export default class SldSelMoreLeftRightGoods extends Component {
                 <div className={`${styles.right} ${global.flex_row_start_start}`} style={{ height: height }}>
                   {selectedRows.length > 0 ?
                   selectedRows.map((item, index) => {
-                    return <a key={index} href={'javascript:void(0)'}
+                    return <a key={index}
                               className={`${styles.item} ${global.flex_row_start_start}`}
-                              onClick={() => this.handleRightItem(item)}
+                              onClick={(e) => {e.preventDefault(); this.handleRightItem(item) }}
                               style={{ marginBottom: index == selectedRows.length - 1 ? 10 : 0 }}>
                       <div className={`${styles.item_left} ${global.flex_row_center_center}`}>
                         <img className={styles.live_img} src={item.goodsImage}/>

xinkeaboard-admin/src/layouts/index.js

@@ -7,7 +7,7 @@ import BasicLayout from './BasicLayout';
 class LayoutWrapper extends React.PureComponent {
   componentDidMount() {
     const { dispatch, currentSite } = this.props;
-    dispatch({ type: 'global/get_site_list_data' });
+    dispatch({ type: 'global/get_site_list_data', payload: { isAll: true } });
   }
 
   render() {

xinkeaboard-admin/src/pages/decorate/pc/home/adv_05.js

@@ -371,8 +371,7 @@ export default class Adv_05 extends Component {
                         className={styles.sub_title}>{data.title_info.sub_title.initialValue != '' ? data.title_info.sub_title.initialValue : `${sldComLanguage('添加子标题')}`}</span>
                     </h2>
                     <div className={styles.right_action}>
-                      <a
-                        href="javascript:void(0)">{sldComLanguage('查看更多')}<i>&gt;&gt;</i></a>
+                      <a onClick={(e) => e.preventDefault()} >{sldComLanguage('查看更多')}<i>&gt;&gt;</i></a>
                     </div>
                   </div>
                   <div className={styles.floor_content}>

xinkeaboard-admin/src/pages/decorate/pc/home/adv_06.js

@@ -137,10 +137,10 @@ export default class Adv_06 extends Component {
 							{data.data.map((item,index)=>{
 							  return <div key={index} className={styles.item}>
                     {item.imgUrl
-                      ?<a className={`${item.imgUrl?null:styles.show_tip}`} href="javascript:void(0);">
+                      ?<a className={`${item.imgUrl?null:styles.show_tip}`} onClick={(e) => e.preventDefault()}>
                         <img src={item.imgUrl}/>
                       </a>
-                      :<a className={`${item.imgUrl?null:styles.show_tip}`} href="javascript:void(0);" style={{height:350}}>
+                      :<a className={`${item.imgUrl?null:styles.show_tip}`} onClick={(e) => e.preventDefault()} style={{height:350}}>
                         <span>{sldComLanguage('此处添加【302*高度不限】图片')}</span>
                       </a>
                     }

xinkeaboard-admin/src/pages/decorate/pc/home/adv_07.js

@@ -128,10 +128,10 @@ export default class Adv_07 extends Component {
               {data.data.map((item, index) => (
                 <div key={index} className={styles.item}>
                   {item.imgUrl
-                    ?<a className={`${item.imgUrl ? null : styles.show_tip}`} href="javascript:void(0);">
+                    ?<a className={`${item.imgUrl ? null : styles.show_tip}`} onClick={(e) => e.preventDefault()}>
                       <img src={item.imgUrl}/>
                     </a>
-                    :<a className={`${item.imgUrl ? null : styles.show_tip}`} href="javascript:void(0);" style={{height:100}}>
+                    :<a className={`${item.imgUrl ? null : styles.show_tip}`} onClick={(e) => e.preventDefault()} style={{height:100}}>
                       <span>{sldComLanguage('此处添加【403*高度不限】图片')}</span>
                     </a>
                   }

xinkeaboard-admin/src/pages/decorate/pc/home/adv_08.js

@@ -143,10 +143,10 @@ export default class Adv_08 extends Component {
               {data.data.map((item, index) => (
                 <div key={index} className={styles.item}>
                   {item.imgUrl
-                    ?<a className={`${item.imgUrl ? null : styles.show_tip}`} href="javascript:void(0);">
+                    ?<a className={`${item.imgUrl ? null : styles.show_tip}`} onClick={(e) => e.preventDefault()}>
                       <img src={item.imgUrl}/>
                     </a>
-                    :<a className={`${item.imgUrl ? null : styles.show_tip}`} href="javascript:void(0);" style={{height:350}}>
+                    :<a className={`${item.imgUrl ? null : styles.show_tip}`} onClick={(e) => e.preventDefault()} style={{height:350}}>
                       <span>{sldComLanguage('此处添加【242*高度不限】图片')}</span>
                     </a>
                   }

xinkeaboard-admin/src/pages/decorate/pc/home/adv_09.js

@@ -337,7 +337,7 @@ export default class Adv_09 extends Component {
                   {data.left.data.map((item, index) => (
                     <a key={index}
                        className={`${index % 2 == 0 ? styles.first : null} ${styles.show_tip} ${index > data.left.data.length - 3 ? styles.sld_no_border_bottom : null}`}
-                       href="javascript:void(0);">
+                       onClick={(e) => e.preventDefault()}>
                       {item.imgUrl
                         ? <img src={item.imgUrl}/>
                         : <span>{sldComLanguage('此处添加【187*123】图片')}</span>
@@ -368,7 +368,7 @@ export default class Adv_09 extends Component {
                   {data.center.data.map((item, index) => (
                     <a key={index}
                        className={`${styles.show_tip} ${index == data.center.data.length - 1 ? styles.sld_no_border_bottom : null}`}
-                       href="javascript:void(0);">
+                       onClick={(e) => e.preventDefault()}>
                       {item.imgUrl
                         ? <img src={item.imgUrl}/>
                         : <span>{sldComLanguage('此处添加【376*123】图片')}</span>
@@ -399,7 +399,7 @@ export default class Adv_09 extends Component {
                   {data.right.data.map((item, index) => (
                     <a key={index}
                        className={`${index % 3 == 0 ? styles.first : null} ${styles.show_tip}  ${index > data.right.data.length - 4 ? styles.sld_no_border_bottom : null}`}
-                       href="javascript:void(0);">
+                       onClick={(e) => e.preventDefault()}>
                       {item.imgUrl
                         ? <img src={item.imgUrl}/>
                         : <span>{sldComLanguage('此处添加【124*185】图片')}</span>

xinkeaboard-admin/src/pages/decorate/pc/home/adv_10.js

@@ -187,7 +187,7 @@ export default class Adv_10 extends Component {
                   <span>{sldComLanguage('编辑')}</span>
                 </div>
                 {data.row_one.data.map((item, index) => (
-                  <a key={index} href="javascript:void(0);">
+                  <a key={index} onClick={(e) => e.preventDefault()}>
                     {item.imgUrl
                       ? <img src={item.imgUrl}/>
                       : <span>{sldComLanguage('此处添加【1210*30】图片')}</span>
@@ -202,7 +202,7 @@ export default class Adv_10 extends Component {
                   <span>{sldComLanguage('编辑')}</span>
                 </div>
                 {data.row_four.data.map((item, index) => (
-                  <a key={index} href="javascript:void(0);">
+                  <a key={index} onClick={(e) => e.preventDefault()}>
                     {item.imgUrl
                       ? <img src={item.imgUrl}/>
                       : <span>{sldComLanguage('此处添加【295*220】图片')}</span>
@@ -217,7 +217,7 @@ export default class Adv_10 extends Component {
                   <span>{sldComLanguage('编辑')}</span>
                 </div>
                 {data.row_five.data.map((item, index) => (
-                  <a key={index} href="javascript:void(0);">
+                  <a key={index} onClick={(e) => e.preventDefault()}>
                     {item.imgUrl
                       ? <img src={item.imgUrl}/>
                       : <span>{sldComLanguage('此处添加【234*130】图片')}</span>

xinkeaboard-admin/src/pages/decorate/pc/home/adv_11.js

@@ -186,7 +186,7 @@ export default class Adv_11 extends Component {
                 </div>
                 {data.row_left.data.map((item, index) => (
                   <a className={`${index % 2 == 1 ? styles.lb_margin : null}`} key={index}
-                     href="javascript:void(0);">
+                     onClick={(e) => e.preventDefault()}>
                     {item.imgUrl
                       ? <img src={item.imgUrl}/>
                       : <span>{sldComLanguage('此处添加【400*170】图片')}</span>
@@ -202,7 +202,7 @@ export default class Adv_11 extends Component {
                   </div>
                   {data.row_right.top.data.map((item, index) => (
                     <a className={`${index % 2 == 1 ? styles.lb_margin : null}`} key={index}
-                       href="javascript:void(0);">
+                       onClick={(e) => e.preventDefault()}>
                       {item.imgUrl
                         ? <img src={item.imgUrl}/>
                         : <span>{sldComLanguage('此处添加【400*350】图片')}</span>
@@ -217,7 +217,7 @@ export default class Adv_11 extends Component {
                   </div>
                   {data.row_right.bottom.data.map((item, index) => (
                     <a className={`${index % 2 == 1 ? styles.lb_margin : null}`} key={index}
-                       href="javascript:void(0);">
+                       onClick={(e) => e.preventDefault()}>
                       {item.imgUrl
                         ? <img src={item.imgUrl}/>
                         : <span>{sldComLanguage('此处添加【400*170】图片')}</span>

xinkeaboard-admin/src/pages/decorate/pc/home/adv_12.js

@@ -232,7 +232,7 @@ export default class Adv_12 extends Component {
 									</div>
 									{data.left.data.map((item,index) => (
 										<a key={index} className={`${styles.l_img}`}
-										   href="javascript:void(0);">
+										   onClick={(e) => e.preventDefault()}>
 											{item.imgUrl
 												? <img src={item.imgUrl}/>
 												: <span>{sldComLanguage('此处添加【396*450】图片')}</span>
@@ -248,7 +248,7 @@ export default class Adv_12 extends Component {
 									{data.center.data.map((item, index) => (
 										<a key={index}
 										   className={`${index % 2 == 1 ? styles.l_b_margin : null}`}
-										   href="javascript:void(0);">
+										   onClick={(e) => e.preventDefault()}>
 											{item.imgUrl
 												? <img src={item.imgUrl}/>
 												: <span>{sldComLanguage('此处添加【183*210】图片')}</span>
@@ -265,7 +265,7 @@ export default class Adv_12 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										<a className={`${styles.title}`}
-										   href="javascript:void(0);">{data.right.title_info.title.initialValue ? data.right.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
+										   onClick={(e) => e.preventDefault()}>{data.right.title_info.title.initialValue ? data.right.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
 										<span>》</span>
 										<a className={`${styles.subtitle}`}>{data.right.title_info.title.initialValue ? data.right.title_info.sub_title.initialValue : `${sldComLanguage('添加子标题')}`}</a>
 									</div>
@@ -275,7 +275,7 @@ export default class Adv_12 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										{data.right.top.data.map((item, index) => (
-											<a key={index} href="javascript:void(0);">
+											<a key={index} onClick={(e) => e.preventDefault()}>
 												{item.imgUrl
 													? <img src={item.imgUrl}/>
 													: <span>{sldComLanguage('此处添加【376*180】图片')}</span>
@@ -289,7 +289,7 @@ export default class Adv_12 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										{data.right.bottom.data.map((item, index) => (
-											<a key={index} href="javascript:void(0);">
+											<a key={index} onClick={(e) => e.preventDefault()}>
 												{item.imgUrl
 													? <img src={item.imgUrl}/>
 													: <span>{sldComLanguage('此处添加【183*180】图片')}</span>

xinkeaboard-admin/src/pages/decorate/pc/home/adv_13.js

@@ -251,7 +251,7 @@ export default class Adv_13 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										<a className={`${styles.title}`}
-										   href="javascript:void(0);">{data.left.title_info.title.initialValue ? data.left.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
+										   onClick={(e) => e.preventDefault()}>{data.left.title_info.title.initialValue ? data.left.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
 										<span>》</span>
 										<a className={`${styles.subtitle}`}>{data.left.title_info.title.initialValue ? data.left.title_info.sub_title.initialValue : `${sldComLanguage('添加子标题')}`}</a>
 									</div>
@@ -261,7 +261,7 @@ export default class Adv_13 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										{data.left.top.data.map((item, index) => (
-											<a key={index} href="javascript:void(0);">
+											<a key={index} onClick={(e) => e.preventDefault()}>
 												{item.imgUrl
 													? <img src={item.imgUrl}/>
 													: <span>{sldComLanguage('此处添加【376*180】图片')}</span>
@@ -275,7 +275,7 @@ export default class Adv_13 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										{data.left.bottom.data.map((item, index) => (
-											<a key={index} href="javascript:void(0);">
+											<a key={index} onClick={(e) => e.preventDefault()}>
 												{item.imgUrl
 													? <img src={item.imgUrl}/>
 													: <span>{sldComLanguage('此处添加【183*180】图片')}</span>
@@ -291,7 +291,7 @@ export default class Adv_13 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										<a className={`${styles.title}`}
-										   href="javascript:void(0);">{data.center.title_info.title.initialValue ? data.center.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
+										   onClick={(e) => e.preventDefault()}>{data.center.title_info.title.initialValue ? data.center.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
 										<span>》</span>
 										<a className={`${styles.subtitle}`}>{data.center.title_info.title.initialValue ? data.center.title_info.sub_title.initialValue : `${sldComLanguage('添加子标题')}`}</a>
 									</div>
@@ -301,7 +301,7 @@ export default class Adv_13 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										{data.center.top.data.map((item, index) => (
-											<a key={index} href="javascript:void(0);">
+											<a key={index} onClick={(e) => e.preventDefault()}>
 												{item.imgUrl
 													? <img src={item.imgUrl}/>
 													: <span>{sldComLanguage('此处添加【376*180】图片')}</span>
@@ -315,7 +315,7 @@ export default class Adv_13 extends Component {
 											<span>{sldComLanguage('编辑')}</span>
 										</div>
 										{data.center.bottom.data.map((item, index) => (
-											<a key={index} href="javascript:void(0);">
+											<a key={index} onClick={(e) => e.preventDefault()}>
 												{item.imgUrl
 													? <img src={item.imgUrl}/>
 													: <span>{sldComLanguage('此处添加【183*180】图片')}</span>
@@ -331,7 +331,7 @@ export default class Adv_13 extends Component {
 									</div>
 									{data.right.data.map((item,index) => (
 										<a key={index} className={`${styles.l_img}`}
-										   href="javascript:void(0);">
+										   onClick={(e) => e.preventDefault()}>
 											{item.imgUrl
 												? <img src={item.imgUrl}/>
 												: <span>{sldComLanguage('此处添加【396*450】图片')}</span>

xinkeaboard-admin/src/pages/decorate/pc/home/adv_14.js

@@ -251,7 +251,7 @@ export default class Adv_14 extends Component {
 										<span>{sldComLanguage('编辑')}</span>
 									</div>
 									<a className={`${styles.title}`}
-									   href="javascript:void(0);">{data.left.title_info.title.initialValue ? data.left.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
+									   onClick={(e) => e.preventDefault()}>{data.left.title_info.title.initialValue ? data.left.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
 									<span>》</span>
 									<a className={`${styles.subtitle}`}>{data.left.title_info.title.initialValue ? data.left.title_info.sub_title.initialValue : `${sldComLanguage('添加子标题')}`}</a>
 								</div>
@@ -261,7 +261,7 @@ export default class Adv_14 extends Component {
 										<span>{sldComLanguage('编辑')}</span>
 									</div>
 									{data.left.top.data.map((item, index) => (
-										<a key={index} href="javascript:void(0);">
+										<a key={index} onClick={(e) => e.preventDefault()}>
 											{item.imgUrl
 												? <img src={item.imgUrl}/>
 												: <span>{sldComLanguage('此处添加【376*180】图片')}</span>
@@ -275,7 +275,7 @@ export default class Adv_14 extends Component {
 										<span>{sldComLanguage('编辑')}</span>
 									</div>
 									{data.left.bottom.data.map((item, index) => (
-										<a key={index} href="javascript:void(0);">
+										<a key={index} onClick={(e) => e.preventDefault()}>
 											{item.imgUrl
 												? <img src={item.imgUrl}/>
 												: <span>{sldComLanguage('此处添加【183*180】图片')}</span>
@@ -291,7 +291,7 @@ export default class Adv_14 extends Component {
 										<span>{sldComLanguage('编辑')}</span>
 									</div>
 									<a className={`${styles.title}`}
-									   href="javascript:void(0);">{data.center.title_info.title.initialValue ? data.center.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
+									   onClick={(e) => e.preventDefault()}>{data.center.title_info.title.initialValue ? data.center.title_info.title.initialValue : `${sldComLanguage('添加标题')}`}</a>
 									<span>》</span>
 									<a className={`${styles.subtitle}`}>{data.center.title_info.title.initialValue ? data.center.title_info.sub_title.initialValue : `${sldComLanguage('添加子标题')}`}</a>
 								</div>
@@ -301,7 +301,7 @@ export default class Adv_14 extends Component {
 										<span>{sldComLanguage('编辑')}</span>
 									</div>
 									{data.center.top.data.map((item, index) => (
-										<a key={index} href="javascript:void(0);">
+										<a key={index} onClick={(e) => e.preventDefault()}>
 											{item.imgUrl
 												? <img src={item.imgUrl}/>
 												: <span>{sldComLanguage('此处添加【376*180】图片')}</span>
@@ -315,7 +315,7 @@ export default class Adv_14 extends Component {
 										<span>{sldComLanguage('编辑')}</span>
 									</div>
 									{data.center.bottom.data.map((item, index) => (
-										<a key={index} href="javascript:void(0);">
+										<a key={index} onClick={(e) => e.preventDefault()}>
 											{item.imgUrl
 												? <img src={item.imgUrl}/>
 												: <span>{sldComLanguage('此处添加【183*180】图片')}</span>
@@ -331,7 +331,7 @@ export default class Adv_14 extends Component {
 								</div>
 								{data.right.data.map((item,index) => (
 									<a key={index} className={`${styles.l_img}`}
-									   href="javascript:void(0);">
+									   onClick={(e) => e.preventDefault()}>
 										{item.imgUrl
 											? <img src={item.imgUrl}/>
 											: <span>{sldComLanguage('此处添加【396*450】图片')}</span>

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

@@ -99,12 +99,12 @@ export default class Diy_page_lists extends Component {
                   : <span>{text}</span>
                 }
                 {record.is_edit_name != undefined && record.is_edit_name
-                  ? <a className={global.flex_com_column} href={'javascript:void(0)'}
+                  ? <a className={global.flex_com_column}
                        style={{ marginLeft: 7 }}
-                       onClick={() => this.save_edit_filed(record, 'decoName', text)}>{sldSvgIcon(defaultSettings.primaryColor, 16, 16, 'xuanzhong')}</a>
-                  : <a className={global.flex_com_column} href={'javascript:void(0)'}
+                       onClick={(e) => {e.preventDefault(); this.save_edit_filed(record, 'decoName', text) }}>{sldSvgIcon(defaultSettings.primaryColor, 16, 16, 'xuanzhong')}</a>
+                  : <a className={global.flex_com_column}
                        style={{ marginLeft: 7 }}
-                       onClick={() => this.edit_filed(record.decoId, 'is_edit_name', 'true')}>{sldSvgIcon(defaultSettings.primaryColor, 16, 16, 'edit')}</a>
+                       onClick={(e) => {e.preventDefault(); this.edit_filed(record.decoId, 'is_edit_name', 'true') }}>{sldSvgIcon(defaultSettings.primaryColor, 16, 16, 'edit')}</a>
                 }
               </div>
             </Fragment>

xinkeaboard-admin/src/pages/decorate/pc/home/edit_diy_page_head.js

@@ -96,9 +96,9 @@ export default class EditDdiyPageHead extends Component {
                   <div className={`${styles.has_more} ${styles.li_item}`}>
                     {sldComLanguage('我的订单')}
                     <div className={styles.li_item_more}>
-                      <a href="javascript:void(0)" className={styles.li_item_more_item}>{sldComLanguage('待支付订单')}</a>
-                      <a href="javascript:void(0)" className={styles.li_item_more_item}>{sldComLanguage('待收货订单')}</a>
-                      <a href="javascript:void(0)" className={styles.li_item_more_item}>{sldComLanguage('待评价订单')}</a>
+                      <a onClick={(e) => e.preventDefault()} className={styles.li_item_more_item}>{sldComLanguage('待支付订单')}</a>
+                      <a onClick={(e) => e.preventDefault()} className={styles.li_item_more_item}>{sldComLanguage('待收货订单')}</a>
+                      <a onClick={(e) => e.preventDefault()} className={styles.li_item_more_item}>{sldComLanguage('待评价订单')}</a>
                     </div>
                   </div>
                 </li>
@@ -109,9 +109,9 @@ export default class EditDdiyPageHead extends Component {
                   <div className={`${styles.has_more} ${styles.li_item}`}>
                     {sldComLanguage('我的收藏')}
                     <div className={styles.li_item_more}>
-                      <a href="javascript:void(0)" className={styles.li_item_more_item}>{sldComLanguage('商品收藏')}</a>
-                      <a href="javascript:void(0)" className={styles.li_item_more_item}>{sldComLanguage('店铺收藏')}</a>
-                      <a href="javascript:void(0)" className={styles.li_item_more_item}>{sldComLanguage('我的足迹')}</a>
+                      <a onClick={(e) => e.preventDefault()} className={styles.li_item_more_item}>{sldComLanguage('商品收藏')}</a>
+                      <a onClick={(e) => e.preventDefault()} className={styles.li_item_more_item}>{sldComLanguage('店铺收藏')}</a>
+                      <a onClick={(e) => e.preventDefault()} className={styles.li_item_more_item}>{sldComLanguage('我的足迹')}</a>
                     </div>
                   </div>
                 </li>
@@ -119,8 +119,8 @@ export default class EditDdiyPageHead extends Component {
                   <div className={`${styles.has_more} ${styles.li_item}`}>
                     {sldComLanguage('我的账户')}
                     <div className={styles.li_item_more}>
-                      <a href="javascript:void(0)" className={styles.li_item_more_item}>{sldComLanguage('我的优惠券')}</a>
-                      <a href="javascript:void(0)" className={styles.li_item_more_item}>{sldComLanguage('我的余额')}</a>
+                      <a onClick={(e) => e.preventDefault()} className={styles.li_item_more_item}>{sldComLanguage('我的优惠券')}</a>
+                      <a onClick={(e) => e.preventDefault()} className={styles.li_item_more_item}>{sldComLanguage('我的余额')}</a>
                     </div>
                   </div>
                 </li>
@@ -150,7 +150,7 @@ export default class EditDdiyPageHead extends Component {
               <div className={styles.hot_search_wrap}>
                 <div>
                   {hot_search_words.length && hot_search_words.map((item, index) => {
-                    return <a key={index} href="javascript:void(0)">{item}</a>;
+                    return <a key={index} onClick={(e) => e.preventDefault()}>{item}</a>;
                   })
                   }
                 </div>
@@ -162,7 +162,7 @@ export default class EditDdiyPageHead extends Component {
               <dt className={`${styles.ld} ${styles.cart_icon_text_wrap}`}
                   style={{ borderBottom: '1px solid rgb(239, 239, 239)' }}>
                 <span className={styles.iconfont}>{sldSvgIcon('#e2231a',16,16,'youxiang')}</span>
-                <a href="javascript:void(0)">{sldComLanguage('发布需求')}</a>
+                <a onClick={(e) => e.preventDefault()}>{sldComLanguage('发布需求')}</a>
                 {/*<div className={styles.cart_goods_num}>0</div>*/}
               </dt>
             </dl>
@@ -178,9 +178,9 @@ export default class EditDdiyPageHead extends Component {
               <span className={styles.sort}>{sldComLanguage('产品分类')}</span>
             </div>
             <nav>
-              <li><a href="javascript:void(0)">{sldComLanguage('首页')}</a></li>
+              <li><a onClick={(e) => e.preventDefault()}>{sldComLanguage('首页')}</a></li>
               {nav_list.length && nav_list.map((item, index) => {
-                return <li key={index}><a href="javascript:void(0)">{item.navName}</a></li>;
+                return <li key={index}><a onClick={(e) => e.preventDefault()}>{item.navName}</a></li>;
               })}
             </nav>
           </div>

xinkeaboard-admin/src/pages/decorate/pc/home/main_banner_pc.js

@@ -319,7 +319,7 @@ export default class MainBannerPc extends Component {
                     <ul className={`${styles.menu_wrap}`}>
                       {cat_nav.map((item, index) => (
                         <li className={`${styles.menu_item}`}>
-                          <a key={index} className={`${styles.first_cat}`} href="javascript:void(0);">
+                          <a key={index} className={`${styles.first_cat}`} onClick={(e) => e.preventDefault()}>
                             {item.categoryName}
                           </a>
                         </li>
@@ -372,11 +372,11 @@ export default class MainBannerPc extends Component {
                     </p>
                   </div>
 
-                  <p className={`${styles.link}`}><a href={'javascript:void(0)'}><span>Sign in</span></a></p>
+                  <p className={`${styles.link}`}><a onClick={(e) => e.preventDefault()}><span>Sign in</span></a></p>
 
-                  <p className={`${styles.link}`}><a href={'javascript:void(0)'}><span>Join Free</span></a></p>
+                  <p className={`${styles.link}`}><a onClick={(e) => e.preventDefault()}><span>Join Free</span></a></p>
 
-                  <p className={`${styles.link}`}><a href={'javascript:void(0)'}><span>For Supplier</span></a>
+                  <p className={`${styles.link}`}><a onClick={(e) => e.preventDefault()}><span>For Supplier</span></a>
                   </p>
 
                   <div className={`${styles.cr_user_card}`} style={{ marginTop: '15px' }}>

xinkeaboard-admin/src/pages/decorate/pc/topic/topic_diy_page_lists.js

@@ -99,12 +99,12 @@ export default class TopicDiyPageLists extends Component {
                   : <span>{text}</span>
                 }
                 {record.is_edit_name != undefined && record.is_edit_name
-                  ? <a className={global.flex_com_column} href={'javascript:void(0)'}
+                  ? <a className={global.flex_com_column}
                        style={{ marginLeft: 7 }}
-                       onClick={() => this.save_edit_filed(record, 'decoName', text)}>{sldSvgIcon(defaultSettings.primaryColor, 16, 16, 'xuanzhong')}</a>
-                  : <a className={global.flex_com_column} href={'javascript:void(0)'}
+                       onClick={(e) => {e.preventDefault(); this.save_edit_filed(record, 'decoName', text) }}>{sldSvgIcon(defaultSettings.primaryColor, 16, 16, 'xuanzhong')}</a>
+                  : <a className={global.flex_com_column}
                        style={{ marginLeft: 7 }}
-                       onClick={() => this.edit_filed(record.decoId, 'is_edit_name', 'true')}>{sldSvgIcon(defaultSettings.primaryColor, 16, 16, 'edit')}</a>
+                       onClick={(e) => {e.preventDefault(); this.edit_filed(record.decoId, 'is_edit_name', 'true') }}>{sldSvgIcon(defaultSettings.primaryColor, 16, 16, 'edit')}</a>
                 }
               </div>
             </Fragment>

xinkeaboard-admin/src/pages/sysset/agreement/edit.js

@@ -1,6 +1,6 @@
 import { connect } from 'dva/index';
 import React, { Component } from 'react';
-import { Form } from 'antd';
+import { Form, Spin, Button } from 'antd';
 import {
   sldLlineRtextAddGoods,
   failTip,
@@ -25,6 +25,8 @@ export default class Edit extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      initDataLoading: false, // 整体加载loading
+      submitLoading: false,
       initEditorFlag: false,//加载百度编辑器
       getEditorContentFlag: false,//获取百度编辑器内容标识
       initEditorContent: '',//百度编辑器内容
@@ -60,6 +62,7 @@ export default class Edit extends Component {
   get_detail = () => {
     const { dispatch } = this.props;
     let { operate_data, query } = this.state;
+    this.setState({initDataLoading: true})
     dispatch({
       type: 'agreement/get_agreement_detail',
       payload: { agreementCode: query.agreementCode },
@@ -69,7 +72,7 @@ export default class Edit extends Component {
             operate_data[i].initialValue = res.data.title;
           }
         }
-        this.setState({ operate_data, initEditorContent: quillEscapeToHtml(res.data.content), initEditorFlag: true });
+        this.setState({ initDataLoading: false, operate_data, initEditorContent: quillEscapeToHtml(res.data.content), initEditorFlag: true });
       },
     });
   };
@@ -88,6 +91,7 @@ export default class Edit extends Component {
         const { query } = this.state;
         values.agreementCode = query.agreementCode;
         let dis_type = 'agreement/update_agreement';
+        this.setState({submitLoading: true})
         dispatch({
           type: dis_type,
           payload: values,
@@ -98,6 +102,7 @@ export default class Edit extends Component {
             } else {
               failTip(res.msg);
             }
+            this.setState({submitLoading: false})
           },
         });
       }
@@ -111,53 +116,62 @@ export default class Edit extends Component {
   };
 
   render() {
-    const { operate_data, initEditorFlag, getEditorContentFlag, initEditorContent } = this.state;
+    const { submitLoading, operate_data, initDataLoading, initEditorFlag, getEditorContentFlag, initEditorContent } = this.state;
 
     return (
       <div className={global.common_page_20}
            style={{ display: 'flex', flexDirection: 'column', justifyContent: 'flex-start' }}>
+      <Spin spinning={initDataLoading}>
         <Scrollbars
-          autoHeight
-          autoHeightMin={100}
-          autoHeightMax={document.body.clientHeight - 120}
-        >
-          <div className={global.flex_row_start_start}>
-            <div className={global.flex_column_start_start} style={{ flex: 1 }}>
-              {sldLlineRtextAddGoods(defaultSettings.primaryColor, `${sldComLanguage('基本信息')}`)}
-              <div style={{ marginTop: 20 }} className={global.tableListFormAdd}>
-                <div style={{ display: 'flex', flexDirection: 'column' }}>
-                  <Form onSubmit={() => this.handleSaveAllData()} layout="inline">
-                    <SldEditFormCom form={this.props.form} search_data={operate_data}/>
-                    {getSldEmptyH(15)}
-                    {sldLlineRtextAddGoods(defaultSettings.primaryColor, `${sldComLanguage('内容编辑')}`)}
-                    <div className={`${global.goods_sku_tab} ${global.flex_column_start_start}`} style={{
-                      marginTop: 20,
-                      width: document.body.clientWidth - (this.props.global.collapsed ? 90 : 160) - 60,
-                    }}>
-                      {initEditorFlag &&
-                      <SldUEditor id={'agreement'} getContentFlag={getEditorContentFlag}
-                                  getEditorContent={this.getEditorContent} initEditorContent={initEditorContent}/>
-                      }
-                      {getSldEmptyH(30)}
-                    </div>
-
-                    <div className={global.m_diy_bottom_wrap}
-                         style={{ position: 'fixed', left: this.props.global.collapsed ? 90 : 160 }}>
-                      <div onClick={() => this.props.history.goBack()} className={global.add_goods_bottom_btn}>
-                        {sldComLanguage('返回')}
+            autoHeight
+            autoHeightMin={100}
+            autoHeightMax={document.body.clientHeight - 120}
+          >
+            <div className={global.flex_row_start_start}>
+              <div className={global.flex_column_start_start} style={{ flex: 1 }}>
+                {sldLlineRtextAddGoods(defaultSettings.primaryColor, `${sldComLanguage('基本信息')}`)}
+                <div style={{ marginTop: 20 }} className={global.tableListFormAdd}>
+                  <div style={{ display: 'flex', flexDirection: 'column' }}>
+                    <Form onSubmit={() => this.handleSaveAllData()} layout="inline">
+                      <SldEditFormCom form={this.props.form} search_data={operate_data}/>
+                      {getSldEmptyH(15)}
+                      {sldLlineRtextAddGoods(defaultSettings.primaryColor, `${sldComLanguage('内容编辑')}`)}
+                      <div className={`${global.goods_sku_tab} ${global.flex_column_start_start}`} style={{
+                        marginTop: 20,
+                        width: document.body.clientWidth - (this.props.global.collapsed ? 90 : 160) - 60,
+                      }}>
+                        {initEditorFlag &&
+                        <SldUEditor id={'agreement'} getContentFlag={getEditorContentFlag}
+                                    getEditorContent={this.getEditorContent} initEditorContent={initEditorContent}/>
+                        }
+                        {getSldEmptyH(30)}
                       </div>
-                      <div onClick={() => this.handleSaveAllData()}
-                           className={`${global.add_goods_bottom_btn} ${global.add_goods_bottom_btn_sel}`}>
-                        {sldComLanguage('保存并返回')}
+
+                      <div className={global.m_diy_bottom_wrap}
+                          style={{ position: 'fixed', left: this.props.global.collapsed ? 90 : 160 }}>
+                        <Button 
+                          onClick={() => this.props.history.goBack()}
+                          style={{ width: '100px', borderRadius: '0', marginRight: '20px' }}
+                        >
+                          {sldComLanguage('返回')}
+                        </Button>
+                        <Button 
+                          type='primary'
+                          loading={submitLoading}
+                          style={{ minWidth: '100px', borderRadius: '0' }}
+                          onClick={() => this.handleSaveAllData()}
+                        >
+                          {sldComLanguage('保存并返回')}
+                        </Button>
                       </div>
-                    </div>
-                  </Form>
+                    </Form>
+                  </div>
                 </div>
               </div>
+              <div style={{ height: 100, width: 6, flexShrink: 0 }}/>
             </div>
-            <div style={{ height: 100, width: 6, flexShrink: 0 }}/>
-          </div>
-        </Scrollbars>
+          </Scrollbars>
+        </Spin>
       </div>
     );
   }

xinkeaboard-admin/src/pages/sysset/agreement/lists.js

@@ -84,12 +84,12 @@ export default class Lists extends Component {
 
 	//获取数据列表
 	get_list = (params) => {
+		this.setState({ loading: true });
 		const { dispatch } = this.props;
 		dispatch({
 			type: 'agreement/get_agreement_lists',
 			payload: params,
 			callback: (res) => {
-				this.setState({ loading: false });
 				if (res.state == 200) {
 					if (res.data.length == 0 && this.state.params.current > 1) {
 						params.current = params.current - 1;
@@ -101,6 +101,7 @@ export default class Lists extends Component {
 						});
 					}
 				}
+			    this.setState({ loading: false });
 			},
 		});
 	};

xinkeaboard-admin/src/pages/sysset/notice_set/email.js

@@ -43,6 +43,7 @@ export default class Sms extends Component {
 	get_email_info = () => {
 		const { dispatch } = this.props;
 		let { info_data } = this.state;
+		this.setState({initLoading: true})
 		dispatch({
 			type: 'sldsetting/get_email_info',
 			callback: (res) => {
@@ -79,7 +80,7 @@ export default class Sms extends Component {
 						});
 					}
 				}
-				this.setState({ info_data, flag: 1 });
+				this.setState({ info_data, flag: 1, initLoading: false });
 			},
 		});
 	};

xinkeaboard-admin/src/pages/sysset/notice_set/sms.js

@@ -41,6 +41,7 @@ export default class Sms extends Component {
   get_sms_info = () => {
     const { dispatch } = this.props;
     let { info_data } = this.state;
+    this.setState({initLoading: true})
     dispatch({
       type: 'sldsetting/get_sms_info',
       callback: (res) => {
@@ -78,7 +79,7 @@ export default class Sms extends Component {
             });
           }
         }
-        this.setState({ info_data, flag: 1 });
+        this.setState({ info_data, flag: 1, initLoading: false});
       },
     });
   };

xinkeaboard-admin/src/utils/utils.js

@@ -666,7 +666,7 @@ export function sldPopConfirm(position, title, callback, okText, cancleText, sho
     okText={okText}
     cancelText={cancleText}>
     <a style={{ paddingLeft: paddingL, paddingRight: paddingR, color: color }}
-       href="javascript:void(0)">{showText}</a>
+       onClick={(e) => e.preventDefault()}>{showText}</a>
   </Popconfirm>;
 }
 
@@ -682,7 +682,7 @@ export function sldPopConfirm(position, title, callback, okText, cancleText, sho
 export function sldPopConfirmMenu(position, title, callback, okText, cancleText, showText, paddingL = 0, paddingR = 0, color = '#555') {
   return <Popconfirm placement={position} title={title}
                      onConfirm={callback} okText={okText} cancelText={cancleText}>
-    <a style={{ color: color, fontSize: 12 }} href="javascript:void(0)">{showText}</a>
+    <a style={{ color: color, fontSize: 12 }} onClick={(e) => e.preventDefault()}>{showText}</a>
   </Popconfirm>;
 }
 
@@ -1245,7 +1245,7 @@ export function sldtbaleOpeBtn(text, svg, callback, svgW = 14, svgH = 14) {
     ? <span title={text} style={{ marginRight: 3 }}>
 			<ALibbSvg fill={defaultSettings.primaryColor} width={svgW} height={svgH} type={svg}/>
 		</span>
-    : <a href='javascript:void(0)' onClick={callback} title={text} style={{ marginRight: 3 }}>
+    : <a onClick={(e) => {e.preventDefault(); callback(e) }} title={text} style={{ marginRight: 3 }}>
       <ALibbSvg fill={defaultSettings.primaryColor} width={svgW} height={svgH} type={svg}/>
     </a>;
 }
@@ -1300,7 +1300,7 @@ export function getSldImgSet(name) {
  * @params svgColor 图标颜色
  * */
 export function getOSvgMDiy(callback, svg, svgColor, svgW = 15, svgH = 15) {
-  return <div href={'javascript:void(0)'} onClick={callback}
+  return <div onClick={(e) => {e.preventDefault(); callback(e) }}
               className={`${styles.mdiy_operate_a} ${styles.flex_row_center_center}`} style={{ height: 30 }}>
     <ALibbSvg fill={svgColor} width={svgW} height={svgH} type={svg} extra={{ marginLeft: 15 }}/>
   </div>;
@@ -1498,7 +1498,7 @@ export function sldtbaleOpeBtnText(text, callback, svgW = 14, svgH = 14) {
     ? <span className={styles.tableOperateText} style={{ marginRight: 3 }}>
 			{text}
 		</span>
-    : <a className={styles.tableOperateText} href='javascript:void(0)' onClick={callback} title={text}
+    : <a className={styles.tableOperateText} onClick={(e) => {e.preventDefault(); callback(e) }} title={text}
          style={{ marginRight: 3 }}>
       {text}
     </a>;