Browse Source

修复Spin加载闪屏

HW 4 years ago
parent
commit
57bf9bc252
33 changed files with 255 additions and 202 deletions
  1. 4 4
      js/admin/topTab.jsx
  2. 31 0
      js/component/SpinContainer.jsx
  3. 9 8
      js/component/account/achievement/achievementDetails.jsx
  4. 13 12
      js/component/account/achievement/achievementForm.jsx
  5. 6 5
      js/component/account/achievement/techAchievement.jsx
  6. 6 5
      js/component/account/business/businessDetails.jsx
  7. 8 8
      js/component/account/business/businessForm.jsx
  8. 13 13
      js/component/account/business/businessProject.jsx
  9. 6 6
      js/component/account/demand/demandForm.jsx
  10. 6 5
      js/component/account/evaluate/create.jsx
  11. 5 4
      js/component/account/evaluate/index.jsx
  12. 6 5
      js/component/account/evaluate/info.jsx
  13. 3 2
      js/component/account/evaluate/steps.jsx
  14. 4 3
      js/component/account/evaluate/steps/step3.jsx
  15. 8 7
      js/component/account/index/collection.jsx
  16. 4 3
      js/component/account/index/techList.jsx
  17. 8 7
      js/component/account/order/demandOrderS.jsx
  18. 12 11
      js/component/account/order/demandOrderX.jsx
  19. 8 7
      js/component/account/order/expertS.jsx
  20. 8 7
      js/component/account/order/memberOrderS.jsx
  21. 11 10
      js/component/account/order/memberOrderX.jsx
  22. 6 5
      js/component/account/order/projectOrderS.jsx
  23. 12 11
      js/component/account/order/projectOrderX.jsx
  24. 7 6
      js/component/account/services/activity.jsx
  25. 10 9
      js/component/account/setAccount/account.jsx
  26. 4 3
      js/component/administration/business/activity/index.jsx
  27. 5 5
      js/component/administration/business/advertisementList.jsx
  28. 5 5
      js/component/administration/business/buyList.jsx
  29. 6 6
      js/component/administration/business/customers.jsx
  30. 6 6
      js/component/administration/business/firmList.jsx
  31. 5 5
      js/component/administration/business/proservlist.jsx
  32. 5 5
      js/component/administration/business/talentsList.jsx
  33. 5 4
      js/component/administration/demand/demandExamine.jsx

+ 4 - 4
js/admin/topTab.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { Row, Col, Modal, Form, Input, Spin, message } from "antd";
+import { Row, Col, Modal, Form, Input, message } from "antd";
 import './topTab.less';
-import ajax from 'jquery/src/ajax/xhr.js'
+import SpinContainer from '../component/SpinContainer';
 import $ from 'jquery/src/ajax';
 
 const TopTab = React.createClass({
@@ -121,7 +121,7 @@ const TopTab = React.createClass({
                         onSubmit={this.edithandleSubmit}
                         id="demand-form"
                     >
-                        <Spin spinning={this.state.loading}>
+                        <SpinContainer spinning={this.state.loading}>
                             <div className="clearfix">
                                 <FormItem
                                     className="half-item"
@@ -171,7 +171,7 @@ const TopTab = React.createClass({
                                     />
                                 </FormItem>
                             </div>
-                        </Spin>
+                        </SpinContainer>
                     </Form>
                 </Modal>
             </div>

+ 31 - 0
js/component/SpinContainer.jsx

@@ -0,0 +1,31 @@
+import React,{Component} from 'react';
+import {Spin} from "antd";
+
+class SpinContainer extends Component{
+    constructor(props) {
+        super(props);
+    }
+
+    render() {
+        return (
+            <div style={{position:'relative'}}>
+                {this.props.children}
+                {this.props.spinning ? <div style={{
+                    position: 'absolute',
+                    top: '0px',
+                    bottom: '0px',
+                    left: '0px',
+                    right: '0px',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    background: 'rgb(255, 255, 255,.3)',
+                }}>
+                    <Spin className={this.props.className} spinning={this.props.spinning}/>
+                </div> : null}
+            </div>
+        )
+    }
+}
+
+export default SpinContainer;

+ 9 - 8
js/component/account/achievement/achievementDetails.jsx

@@ -7,10 +7,11 @@ import {
 	Upload,
 	Button,
 	Form,
-	
+
 } from 'antd';
 import {  getIndustryCategory } from '@/industryList.js';
 import {  splitUrl ,getMaturity,getAchievementType,getTransaction,getAchievementPosition,getAchievementCategory,getReleaseStateList,getInnovation} from '@/tools.js';
+import SpinContainer from "../../SpinContainer";
 
 const DemandDetail = Form.create()(React.createClass({
     getInitialState() {
@@ -155,7 +156,7 @@ const DemandDetail = Form.create()(React.createClass({
         return (
 			<div className='login'>
 			<Form layout="horizontal" id="demand-form">
-				<Spin spinning={this.state.loading}>
+                <SpinContainer spinning={this.state.loading}>
                     <div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="标题">
 							<span>{theData.name}</span>
@@ -204,7 +205,7 @@ const DemandDetail = Form.create()(React.createClass({
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
-                                    fileList={this.state.pictureUrl}                               
+                                    fileList={this.state.pictureUrl}
                                     onPreview={(file) => {
                                         this.setState({
                                             previewImage: file.url || file.thumbUrl,
@@ -217,13 +218,13 @@ const DemandDetail = Form.create()(React.createClass({
                                     onCancel={() => { this.setState({ previewVisible: false }) }}>
                                     <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
                                 </Modal>
-                            </div> 
+                            </div>
 					</FormItem>
                     <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(小图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
-                                    fileList={this.state.pictureUrlMin}                               
+                                    fileList={this.state.pictureUrlMin}
                                     onPreview={(file) => {
                                         this.setState({
                                             previewImage: file.url || file.thumbUrl,
@@ -236,7 +237,7 @@ const DemandDetail = Form.create()(React.createClass({
                                     onCancel={() => { this.setState({ previewVisible: false }) }}>
                                     <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
                                 </Modal>
-                            </div> 
+                            </div>
 					</FormItem>
                     <div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="精品成果">
@@ -275,8 +276,8 @@ const DemandDetail = Form.create()(React.createClass({
 							</Button>
 						</FormItem>}
 					</div>
-				</Spin>
-			</Form>    
+				</SpinContainer>
+			</Form>
 		</div>
         )
     }

+ 13 - 12
js/component/account/achievement/achievementForm.jsx

@@ -21,6 +21,7 @@ import {
 import {industry} from '@/industryList';
 import {achievementType,achievementCategoryList,maturityList,innovationList,transaction} from '@/dataDic';
 import {  splitUrl} from '@/tools.js';
+import SpinContainer from "../../SpinContainer";
 
 
 const KeyWordTagGroup = React.createClass({
@@ -147,7 +148,7 @@ const PicturesWall = React.createClass({
 		);
 	}
 });
- 
+
 const DemandDetailForm = Form.create()(React.createClass({
     getInitialState() {
         return {
@@ -189,7 +190,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 					auditStatus:thisData.auditStatus,
 					pictureUrl: thisData.technicalPictureUrl ? splitUrl(thisData.technicalPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
 					pictureUrlMin: thisData.pictureUrlMin ? splitUrl(thisData.pictureUrlMin, ',', globalConfig.avatarHost + '/upload') : []
-					
+
 				});
             }.bind(this),
         }).always(function () {
@@ -346,7 +347,7 @@ const DemandDetailForm = Form.create()(React.createClass({
         return (
 			<div className='login'>
 			<Form layout="horizontal" onSubmit={(e)=>{this.handleSubmit(e,0)}} id="demand-form">
-				<Spin spinning={this.state.loading}>
+				<SpinContainer spinning={this.state.loading}>
 				<div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="标题">
 							{getFieldDecorator('name', {
@@ -403,7 +404,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 							})(
 								<Select style={{ width: 160 }} placeholder="请选择成果类型"
 									>
-									{ 
+									{
 										achievementType.map(function (item) {
 											return	<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
 										})
@@ -418,7 +419,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 							})(
 								<Select style={{ width: 160 }} placeholder="请选择知识产权类型"
 									>
-									{ 
+									{
 										achievementCategoryList.map(function (item) {
 											return	<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
 										})
@@ -432,7 +433,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 							})(
 								<Select style={{ width: 160 }} placeholder="请选择创新度"
 									>
-									{ 
+									{
 										innovationList.map(function (item) {
 											return	<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
 										})
@@ -446,7 +447,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 							})(
 								<Select style={{ width: 160 }} placeholder="请选择成熟度"
 									>
-									{ 
+									{
 										maturityList.map(function (item) {
 											return	<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
 										})
@@ -460,7 +461,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 							})(
 								<Select style={{ width: 160 }} placeholder="请选择交易形式"
 									>
-									{ 
+									{
 										transaction.map(function (item) {
 											return	<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
 										})
@@ -490,7 +491,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 					<div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="精品成果">
 							{getFieldDecorator('boutique', {
-								initialValue: theData.boutique 
+								initialValue: theData.boutique
 							})(
 								<Radio.Group>
 									<Radio value={0}>非精品</Radio>
@@ -512,7 +513,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 						</FormItem>
 					</div>
 					<div className="clearfix">
-						<FormItem className="full-item" 
+						<FormItem className="full-item"
 							labelCol={{ span: 3 }}
 							wrapperCol={{ span: 18 }} label="发布位置">
 							{getFieldDecorator('publishPages', {
@@ -562,8 +563,8 @@ const DemandDetailForm = Form.create()(React.createClass({
 							</Button>
 						</FormItem>
 					</div>
-				</Spin>
-			</Form>    
+				</SpinContainer>
+			</Form>
 		</div>
         )
     }

+ 6 - 5
js/component/account/achievement/techAchievement.jsx

@@ -7,6 +7,7 @@ import '@/account/demand/techDemand.less';
 import TechDemandDesc from '@/account/achievement/achievementDesc';
 import { demandTypeList,achievementCategoryList,achievementType } from '@/dataDic.js';
 import { getDemandType,getReleaseStateList,getAchievementType } from '@/tools.js';
+import SpinContainer from "../../SpinContainer";
 
 const DemandList = React.createClass({
     loadData(pageNo) {
@@ -321,12 +322,12 @@ const DemandList = React.createClass({
                     <Select placeholder="成果类型" style={{ width: 120 }}
                         value={this.state.dataCategorySearch}
                         onChange={(e) => { this.setState({ dataCategorySearch: e }) }}>
-                        { 
+                        {
                             achievementType.map(function (item) {
                                 return	<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
                             })
                         }
-                    </Select>    
+                    </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button
@@ -346,13 +347,13 @@ const DemandList = React.createClass({
                     </div>
                 </div>
                 <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
+                    <SpinContainer spinning={this.state.loading}>
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick} />
-                    </Spin>
+                    </SpinContainer>
                 </div>
                 <TechDemandDesc
                     data={this.state.RowData}
@@ -364,4 +365,4 @@ const DemandList = React.createClass({
     }
 });
 
-export default DemandList;
+export default DemandList;

+ 6 - 5
js/component/account/business/businessDetails.jsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import $ from 'jquery/src/ajax';
-import { Modal, message, Spin, Upload, Button, Form } from 'antd';
+import { Modal, message, Upload, Button, Form } from 'antd';
 import { getprovince, splitUrl } from '@/tools.js';
+import SpinContainer from '../../SpinContainer';
 import './business.less';
 import 'react-quill/dist/quill.bubble.css';
 
@@ -162,7 +163,7 @@ const DemandDetail = Form.create()(
 		render() {
 			const theData = this.state.data || {};
             const FormItem = Form.Item;
-            
+
 			return (
 				<div className="patent-desc">
 					<Form
@@ -172,7 +173,7 @@ const DemandDetail = Form.create()(
 						}}
 						id="demand-form"
 					>
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<div className="clearfix">
 								<FormItem
 									className="half-item"
@@ -266,7 +267,7 @@ const DemandDetail = Form.create()(
 								>
 									<span>{theData.keyword}</span>
 								</FormItem>
-								
+
 							</div>
 							<div className="clearfix">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="标签">
@@ -386,7 +387,7 @@ const DemandDetail = Form.create()(
 									</FormItem>
 								)}
 							</div>
-						</Spin>
+						</SpinContainer>
 					</Form>
 				</div>
 			);

+ 8 - 8
js/component/account/business/businessForm.jsx

@@ -5,7 +5,6 @@ import {
 	Tooltip,
 	Modal,
 	message,
-	Spin,
 	Upload,
 	Input,
 	Select,
@@ -22,6 +21,7 @@ import { citySelect } from '@/NewDicProvinceListAll';
 import { splitUrl ,getReleaseStateList} from '@/tools.js';
 import Editors from '@/richTextEditors';
 import './business.less';
+import SpinContainer from "../../SpinContainer";
 
 //图片组件
 const PicturesWall = React.createClass({
@@ -125,7 +125,7 @@ const DemandDetailForm = Form.create()(
 				message.warning('请输入正确的市场价');
 				return;
 			}
-			
+
 			if(this.state.summary&&(this.state.summary).length>40){
 				message.warning('项目简介字数不得超过40个字。');
 				return;
@@ -457,7 +457,7 @@ const DemandDetailForm = Form.create()(
 						this.loadData(nextProps.data.id);
 					}
 				}
-			
+
 			},
 		render() {
 			const FormItem = Form.Item;
@@ -470,7 +470,7 @@ const DemandDetailForm = Form.create()(
 			return (
 				<div className="patent-desc">
 					<Form layout="horizontal" onSubmit={(e)=>{this.handleSubmit(e,0)}} id="demand-form">
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<div className="clearfix" style={{ paddingLeft: '86px' }}>
 								<FormItem
 									className="half-item"
@@ -673,7 +673,7 @@ const DemandDetailForm = Form.create()(
 								>
 									<span style={{ width: '94%' }}>{this.state.createTime}</span>
 								</FormItem>
-							</div>	
+							</div>
 							<div className="clearfix">
 								<FormItem
 									labelCol={{ span: 4 }}
@@ -684,7 +684,7 @@ const DemandDetailForm = Form.create()(
 											<Button onClick={this.selTag}>选择</Button>
 										</div>
 								</FormItem>
-							</div>	
+							</div>
 							<div>
 								<FormItem
 									labelCol={{ span: 4 }}
@@ -815,7 +815,7 @@ const DemandDetailForm = Form.create()(
 							>
 								取消
 							</Button>
-						</Spin>
+						</SpinContainer>
 					</Form>
 					<Modal
 						maskClosable={false}
@@ -828,7 +828,7 @@ const DemandDetailForm = Form.create()(
 					>
 						<Form layout="horizontal" onSubmit={(e)=>{this.tagSubmit(e)}} id="demand-form">
 							<Form.Item  {...formItemLayout} label={<span><strong style={{color:'#f00'}}> * </strong>标签</span>}>
-								<Checkbox.Group 
+								<Checkbox.Group
 									value={this.state.tagArr}
 									onChange={this.onChange}>
 									<Row>

+ 13 - 13
js/component/account/business/businessProject.jsx

@@ -6,7 +6,6 @@ import {
 	Icon,
 	Button,
 	Input,
-	Spin,
 	Table,
 	message,
 	DatePicker,
@@ -16,6 +15,7 @@ import {
 } from 'antd';
 import { getGameState, getprovince, getReleaseStateList } from '@/tools.js';
 import TechDemandDesc from '@/account/business/businessDesc';
+import SpinContainer from "../../SpinContainer";
 //主体
 const BusinessProject = Form.create()(
 	React.createClass({
@@ -271,7 +271,7 @@ const BusinessProject = Form.create()(
 				crossDomain: false,
 				url: globalConfig.context + '/portal/service/jtBusiness/getCategoryList',
 				data: {
-					
+
 				},
 				success: function(data) {
 					let theArr = [],thisdata=data.data;
@@ -397,7 +397,7 @@ const BusinessProject = Form.create()(
 			this.loadTag();
 			this.topLevel();
 		},
-		
+
 		//项目列表整行点击
 		tableRowClick(record, index) {
 			this.state.RowData = record;
@@ -566,9 +566,9 @@ const BusinessProject = Form.create()(
 									this.setState({ nameSearch: e.target.value });
 								}}
 							/>
-							<Cascader placeholder='业务项目品类' 
-								options={this.state.categoryList} 
-								style={{width:200,marginRight:10}} 
+							<Cascader placeholder='业务项目品类'
+								options={this.state.categoryList}
+								style={{width:200,marginRight:10}}
 								value={this.state.typeSearch} onChange={(e)=>{this.setState({typeSearch:e})}}/>
 							<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
 								搜索
@@ -585,7 +585,7 @@ const BusinessProject = Form.create()(
 							</Button>
 						</div>
 						<div className="patent-table">
-							<Spin spinning={this.state.loading}>
+							<SpinContainer spinning={this.state.loading}>
 								<Table
 									columns={this.state.columns}
 									dataSource={this.state.dataSource}
@@ -594,7 +594,7 @@ const BusinessProject = Form.create()(
 									onRowClick={this.tableRowClick}
 									current={this.state.aa}
 								/>
-							</Spin>
+							</SpinContainer>
 						</div>
 						<TechDemandDesc
 							data={this.state.RowData}
@@ -615,7 +615,7 @@ const BusinessProject = Form.create()(
 								className="admin-desc-content"
 							>
 								<Form layout="horizontal" onSubmit={this.addhandleSubmit} id="demand-form">
-									<Spin spinning={this.state.loading}>
+									<SpinContainer spinning={this.state.loading}>
 										<div className="clearfix">
 											<FormItem labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} label="业务项目名称">
 												<Input
@@ -634,9 +634,9 @@ const BusinessProject = Form.create()(
 										</div>
 										<div className="clearfix">
 											<FormItem labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} label="业务品类">
-												<Cascader placeholder='业务项目品类' 
-													options={this.state.categoryList} 
-													value={this.state.addCid} 
+												<Cascader placeholder='业务项目品类'
+													options={this.state.categoryList}
+													value={this.state.addCid}
 													style={{ width: '94%' }}
 													onChange={(e)=>{this.setState({addCid:e})}}/>
 												<span className="mandatory" style={{ color: 'red', marginLeft: '5px' }}>
@@ -684,7 +684,7 @@ const BusinessProject = Form.create()(
 												取消
 											</Button>
 										</FormItem>
-									</Spin>
+									</SpinContainer>
 								</Form>
 							</Modal>
 						</div>

+ 6 - 6
js/component/account/demand/demandForm.jsx

@@ -8,7 +8,6 @@ import {
 	Modal,
 	Popover,
 	message,
-	Spin,
 	Upload,
 	Input,
 	InputNumber,
@@ -26,6 +25,7 @@ import {
 
 import {  splitUrl } from '@/tools.js';
 import {industry} from '@/industryList';
+import SpinContainer from "../../SpinContainer";
 
 const KeyWordTagGroup = React.createClass({
     getInitialState() {
@@ -152,7 +152,7 @@ const PicturesWall = React.createClass({
 		);
 	}
 });
- 
+
 const DemandDetailForm = Form.create()(React.createClass({
     getInitialState() {
         return {
@@ -363,7 +363,7 @@ const DemandDetailForm = Form.create()(React.createClass({
         return (
 			<div className='login'>
 			<Form layout="horizontal" onSubmit={(e)=>{this.handleSubmit(e,0)}} id="demand-form">
-				<Spin spinning={this.state.loading}>
+				<SpinContainer spinning={this.state.loading}>
 					<div className="clearfix">
 						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="发个需求吧">
 							{getFieldDecorator('problemDes', {
@@ -489,7 +489,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 						/>
 					</FormItem>
 					<div className="clearfix">
-						<FormItem className="full-item" 
+						<FormItem className="full-item"
 							labelCol={{ span: 3 }}
 							wrapperCol={{ span: 18 }} label="发布位置">
 							{getFieldDecorator('publishPages', {
@@ -539,8 +539,8 @@ const DemandDetailForm = Form.create()(React.createClass({
 							</Button>
 						</FormItem>
 					</div>
-				</Spin>
-			</Form>    
+				</SpinContainer>
+			</Form>
 		</div>
         )
     }

+ 6 - 5
js/component/account/evaluate/create.jsx

@@ -1,9 +1,10 @@
 import React from 'react';
-import { Icon, message, Button, Spin, Checkbox } from 'antd';
+import { Icon, message, Button, Checkbox } from 'antd';
 import './create.less';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import Steps from './steps';
+import SpinContainer from "../../SpinContainer";
 
 const CreateEvaluate = React.createClass({
   getInitialState() {
@@ -34,7 +35,7 @@ const CreateEvaluate = React.createClass({
       })
     }.bind(this));
   },
-  
+
   returnList() {
     if (this.props.handlekey) {
       this.props.handlekey('evaluate');
@@ -109,7 +110,7 @@ const CreateEvaluate = React.createClass({
   },
   render() {
     return (
-      <Spin spinning={this.state.loading}>
+       <SpinContainer spinning={this.state.loading}>
         <div className="content-container">
           <div className="content-title">
             科技评估 {this.state.title ? '- ' + this.state.title : ''}
@@ -118,9 +119,9 @@ const CreateEvaluate = React.createClass({
             {this.renderBody()}
           </div>
         </div>
-      </Spin>
+      </SpinContainer>
     )
   },
 });
 
-export default CreateEvaluate;
+export default CreateEvaluate;

+ 5 - 4
js/component/account/evaluate/index.jsx

@@ -1,11 +1,12 @@
 import React from 'react';
-import { Icon, message, Button, Spin, Table } from 'antd';
+import { Icon, message, Button, Table } from 'antd';
 import Moment from 'moment';
 import './index.less';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import money from '@/money.js';
 import CreateDes from './createDes'
+import SpinContainer from "../../SpinContainer";
 
 const Evaluate = React.createClass({
   getInitialState() {
@@ -161,7 +162,7 @@ const Evaluate = React.createClass({
     ];
     const hasSelected = this.state.selectedRowKeys.length > 0;
     return (
-      <Spin spinning={this.state.loading}>
+       <SpinContainer spinning={this.state.loading}>
         <div className="content-container">
           <div className="content-title">
             科技评估管理列表
@@ -182,9 +183,9 @@ const Evaluate = React.createClass({
               showDesc={this.state.showDesc}
               closeDesc={this.closeDesc} />
         </div>
-      </Spin>
+      </SpinContainer>
     )
   },
 });
 
-export default Evaluate;
+export default Evaluate;

+ 6 - 5
js/component/account/evaluate/info.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Spin, message, Table, Row, Col, Icon } from 'antd';
+import { Button, message, Table, Row, Col, Icon } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import money from '@/money.js';
@@ -15,6 +15,7 @@ import jspdf from 'jspdf';
 import html2canvas from 'html2canvas';
 
 import './info.less';
+import SpinContainer from "../../SpinContainer";
 
 const getDateValue = (val) => {
   return val < 10 ? '0' + val : val + '';
@@ -484,11 +485,11 @@ const evaluateInfo = React.createClass({
     </div>
   },
   render() {
-    
+
     let { loading, data } = this.state;
     this.state.data=[];
     return (
-      <Spin spinning={loading}>
+      <SpinContainer spinning={loading}>
         <div className="report-container">
           {data ? <Button icon="file-pdf" className="export" onClick={this.export} loading={this.state.exporting}>导出PDF</Button> : ''}
           {
@@ -500,9 +501,9 @@ const evaluateInfo = React.createClass({
               </div>
           }
         </div>
-      </Spin>
+      </SpinContainer>
     );
   }
 });
 
-export default evaluateInfo;
+export default evaluateInfo;

+ 3 - 2
js/component/account/evaluate/steps.jsx

@@ -11,6 +11,7 @@ import Step5 from './steps/step5';
 import Step6 from './steps/step6';
 import Step7 from './steps/step7';
 import Step8 from './steps/step8';
+import SpinContainer from "../../SpinContainer";
 
 const Step = Steps.Step;
 const steps = [
@@ -153,7 +154,7 @@ const EvaluateSteps = React.createClass({
 		let loadContent = !!this.state.steps;
 		let dottList =this.state.dottList;
 		return (
-			<Spin spinning={this.state.loading}>
+			<SpinContainer spinning={this.state.loading}>
 				<div style={{ marginTop: 10 }}>
 					<Steps current={this.state.current} progressDot={this.progressDot} value={this.state.value}>
 						{steps.map((item) => <Step key={item.title} title={item.title} />)}
@@ -174,7 +175,7 @@ const EvaluateSteps = React.createClass({
 						)}
 					</div>
 				</div>
-			</Spin>
+			</SpinContainer>
 		);
 	}
 });

+ 4 - 3
js/component/account/evaluate/steps/step3.jsx

@@ -3,6 +3,7 @@ import { Spin, Form, Button, Select, message } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import { progressiveness, innovativeness, ripeness, alternatives, defensive, prospect, supplyAndDemand, rangeOfApplication, imitable, profitability } from './dict.js';
+import SpinContainer from "../../../SpinContainer";
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -64,7 +65,7 @@ const EvaluateStep3 = Form.create({})(React.createClass({
     let { loading, initialData } = this.state;
     const { getFieldDecorator } = this.props.form;
     return (
-      <Spin spinning={loading}>
+      <SpinContainer spinning={loading}>
         <Form className="steps-form">
           <FormItem label="先进性" {...formItemLayout}>
             {getFieldDecorator('progressiveness', {
@@ -191,9 +192,9 @@ const EvaluateStep3 = Form.create({})(React.createClass({
           <Button type="primary" onClick={() => this.next()}>保存,下一步</Button>
           <Button style={{ marginLeft: 8 }} onClick={() => this.prev()}>上一步</Button>
         </div>
-      </Spin>
+      </SpinContainer>
     )
   },
 }));
 
-export default EvaluateStep3;
+export default EvaluateStep3;

+ 8 - 7
js/component/account/index/collection.jsx

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Button,Radio ,message,Row,Col, Spin,Pagination} from 'antd';
 import axios from 'axios';
 import './collection.less';
+import SpinContainer from "../../SpinContainer";
 
 class Collection extends Component {
 	constructor(props) {
@@ -17,7 +18,7 @@ class Collection extends Component {
         this.setState({
             loading:true,
         })
-        let url = globalConfig.context +  '/api/user/portal/listProjectIInterestedIn' 
+        let url = globalConfig.context +  '/api/user/portal/listProjectIInterestedIn'
         axios.get(url,{
             params:{
                 pageNo:page||1,
@@ -61,7 +62,7 @@ class Collection extends Component {
         this.setState({
             loading:true,
         })
-        let url = globalConfig.context +  '/api/user/portal/listAchievementIInterestedIn' 
+        let url = globalConfig.context +  '/api/user/portal/listAchievementIInterestedIn'
         axios.get(url,{
             params:{
                 pageNo:page||1,
@@ -104,7 +105,7 @@ class Collection extends Component {
         this.setState({
             loading:true,
         })
-        let url = globalConfig.context +  '/api/user/portal/listDemandIInterestedIn' 
+        let url = globalConfig.context +  '/api/user/portal/listDemandIInterestedIn'
         axios.get(url,{
             params:{
                 pageNo:page||1,
@@ -206,7 +207,7 @@ class Collection extends Component {
                 </Radio.Group>
             </div>
             <div className="imgList">
-                <Spin spinning={this.state.loading}>
+                <SpinContainer spinning={this.state.loading}>
                     {dataList.length?<Row>
                         {dataList.map((item,index)=>{
                             return<Col span={5} key={index} onClick={(e)=>{this.jump(item)}}>
@@ -217,15 +218,15 @@ class Collection extends Component {
                                             </div>
                                             {item.newState&&<span className="new"></span>}
                                             <div className="divP"><p>{item.introduce?item.introduce:'暂无'}</p></div>
-                                        </div>  
+                                        </div>
                                         <p className="txt">{item.name}</p>
                                     </div>
                                 </Col>
                         })
-                        }   
+                        }
                     </Row>:
                     <Row style={{color:'#333'}}>暂无数据</Row>}
-                </Spin>
+                </SpinContainer>
                 {this.state.total?<Pagination className="page" pageSize={this.props.nub?4:8} current={this.state.current} total={this.state.total} onChange={(e,pageSize)=>{this.onShowSizeChange(e,pageSize)}}/>:''}
             </div>
         </div>

+ 4 - 3
js/component/account/index/techList.jsx

@@ -7,6 +7,7 @@ import AchievementDesc from '@/portal/search/achievementDesc';
 import { getOrderStatus } from '@/tools';
 
 import './content.less';
+import SpinContainer from "../../SpinContainer";
 
 const TabPane = Tabs.TabPane;
 
@@ -288,7 +289,7 @@ const Content = React.createClass({
     render () {
         return (
             <div className="collection">
-                <Spin spinning={this.state.loading} >
+                <SpinContainer spinning={this.state.loading}>
                     <Tabs defaultActiveKey="1" onChange={this.tabChange}>
                         <TabPane tab="我的成果订单" key="1">
                             <Table columns={this.state.achievementColumns}
@@ -303,7 +304,7 @@ const Content = React.createClass({
                                 onRowClick={this.demandRowClick} />
                         </TabPane>
                     </Tabs>
-                </Spin>
+                </SpinContainer>
                 <DemandDesc data={this.state.demandRowData}
                     showDesc={this.state.demandShowDesc}
                     closeDesc={this.demandCloseDesc} />
@@ -315,4 +316,4 @@ const Content = React.createClass({
     }
 });
 
-export default Content;
+export default Content;

+ 8 - 7
js/component/account/order/demandOrderS.jsx

@@ -1,4 +1,4 @@
-/* 
+/*
 	update:2018/07/16
 	author:liting
 */
@@ -9,6 +9,7 @@ import { Form, Button, Input, Select, Spin, Table, message, Modal, Tooltip, Swit
 import { orderType } from '@/dataDic';
 import { getOrderType } from '@/tools.js';
 import moment  from 'moment';
+import SpinContainer from "../../SpinContainer";
 //主体
 const Order = Form.create()(
 	React.createClass({
@@ -137,14 +138,14 @@ const Order = Form.create()(
 						title: '消费者',
 						dataIndex: 'buyerName',
 						key: 'buyerName',
-						
+
 					},
 					{
 						title: '联系方式',
 						dataIndex: 'buyerMobile',
 						key: 'buyerMobile'
 					},
-					
+
 				],
 				dataSource: []
 			};
@@ -248,7 +249,7 @@ const Order = Form.create()(
 						</div>
 					</div>
 					<div className="patent-table">
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<Table
 								columns={this.state.columns}
 								dataSource={this.state.dataSource}
@@ -256,7 +257,7 @@ const Order = Form.create()(
 								pagination={this.state.pagination}
 								onRowClick={this.tableRowClick}
 							/>
-						</Spin>
+						</SpinContainer>
 					</div>
 					<div className="patent-desc">
 						<Modal
@@ -269,7 +270,7 @@ const Order = Form.create()(
 							footer=""
 						>
 							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
-								<Spin spinning={this.state.loading}>
+								<SpinContainer spinning={this.state.loading}>
 									<div className="clearfix">
 										<FormItem
 											className="half-item"
@@ -334,7 +335,7 @@ const Order = Form.create()(
 											<span>{theData.buyerMobile}</span>
 										</FormItem>
 									</div>
-								</Spin>
+								</SpinContainer>
 							</Form>
 						</Modal>
 					</div>

+ 12 - 11
js/component/account/order/demandOrderX.jsx

@@ -1,4 +1,4 @@
-/* 
+/*
 	update:2018/07/16
 	author:liting
 */
@@ -8,6 +8,7 @@ import $ from 'jquery/src/ajax';
 import { Form, Button, Input, Select,Rate, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
 import { getOrderType } from '@/tools.js';
 import moment  from 'moment';
+import SpinContainer from "../../SpinContainer";
 //主体
 const Order = Form.create()(
 	React.createClass({
@@ -137,7 +138,7 @@ const Order = Form.create()(
 						title: '服务商',
 						dataIndex: 'sellerName',
 						key: 'sellerName',
-						
+
 					},
 					{
 						title: '联系方式',
@@ -155,7 +156,7 @@ const Order = Form.create()(
 							return <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>评价</Button>
 						}
 					}
-					
+
 				],
 				dataSource: []
 			};
@@ -319,7 +320,7 @@ const Order = Form.create()(
 						</div>
 					</div>
 					<div className="patent-table">
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<Table
 								columns={this.state.columns}
 								dataSource={this.state.dataSource}
@@ -327,7 +328,7 @@ const Order = Form.create()(
 								pagination={this.state.pagination}
 								onRowClick={this.tableRowClick}
 							/>
-						</Spin>
+						</SpinContainer>
 					</div>
 					<div className="patent-desc">
 						<Modal
@@ -340,7 +341,7 @@ const Order = Form.create()(
 							footer=""
 						>
 							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
-								<Spin spinning={this.state.loading}>
+								<SpinContainer spinning={this.state.loading}>
 									<div className="clearfix">
 										<FormItem
 											className="half-item"
@@ -405,7 +406,7 @@ const Order = Form.create()(
 											<span>{theData.sellerMobile}</span>
 										</FormItem>
 									</div>
-								</Spin>
+								</SpinContainer>
 							</Form>
 						</Modal>
 					</div>
@@ -417,9 +418,9 @@ const Order = Form.create()(
 							okText="提交"
 							onCancel={this.evaluateCancel}
 							footer=''
-						>	
+						>
 						<Form layout="horizontal" onSubmit={this.evaluateSubmit} >
-							<Spin spinning={this.state.loading}>
+							<SpinContainer spinning={this.state.loading}>
 								<p style={{marginLeft:40,fontSize:20,marginBottom:15}}>其他买家需要您的建议哦!</p>
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="评价内容">
 									<Input
@@ -433,7 +434,7 @@ const Order = Form.create()(
 									/>
 								</FormItem>
 								<FormItem
-									labelCol={{ span: 4 }} 
+									labelCol={{ span: 4 }}
 									wrapperCol={{ span: 8 }}
 									label="评星"
 								>
@@ -449,7 +450,7 @@ const Order = Form.create()(
 										</Button>
 									</FormItem>
 								</div>
-							</Spin>
+							</SpinContainer>
 						</Form>
 					</Modal>
 				</div>

+ 8 - 7
js/component/account/order/expertS.jsx

@@ -1,4 +1,4 @@
-/* 
+/*
 	update:2018/08/01
 	author:liting
 */
@@ -9,6 +9,7 @@ import { Form, Button, Input, Select, Spin, Table, message, Modal, Tooltip, Swit
 import { orderType } from '@/dataDic';
 import { getOrderType } from '@/tools.js';
 import moment  from 'moment';
+import SpinContainer from "../../SpinContainer";
 //主体
 const Order = Form.create()(
 	React.createClass({
@@ -125,14 +126,14 @@ const Order = Form.create()(
 						title: '购买者',
 						dataIndex: 'buyerName',
 						key: 'buyerName',
-						
+
 					},
 					{
 						title: '联系方式',
 						dataIndex: 'buyerMobile',
 						key: 'buyerMobile'
 					},
-					
+
 				],
 				dataSource: []
 			};
@@ -236,7 +237,7 @@ const Order = Form.create()(
 						</div>
 					</div>
 					<div className="patent-table">
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<Table
 								columns={this.state.columns}
 								dataSource={this.state.dataSource}
@@ -244,7 +245,7 @@ const Order = Form.create()(
 								pagination={this.state.pagination}
 								onRowClick={this.tableRowClick}
 							/>
-						</Spin>
+						</SpinContainer>
 					</div>
 					<div className="patent-desc">
 						<Modal
@@ -257,7 +258,7 @@ const Order = Form.create()(
 							footer=""
 						>
 							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
-								<Spin spinning={this.state.loading}>
+								<SpinContainer spinning={this.state.loading}>
 									<div className="clearfix">
 										<FormItem
 											className="half-item"
@@ -322,7 +323,7 @@ const Order = Form.create()(
 											<span>{theData.buyerMobile}</span>
 										</FormItem>
 									</div>
-								</Spin>
+								</SpinContainer>
 							</Form>
 						</Modal>
 					</div>

+ 8 - 7
js/component/account/order/memberOrderS.jsx

@@ -1,4 +1,4 @@
-/* 
+/*
 	update:2018/07/16
 	author:liting
 */
@@ -8,6 +8,7 @@ import $ from 'jquery/src/ajax';
 import { Form, Button, Input, Select, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
 import { orderType } from '@/dataDic';
 import { getOrderType } from '@/tools.js';
+import SpinContainer from '../../SpinContainer';
 import moment  from 'moment';
 //主体
 const Order = Form.create()(
@@ -136,14 +137,14 @@ const Order = Form.create()(
 						title: '消费者',
 						dataIndex: 'buyerName',
 						key: 'buyerName',
-						
+
 					},
 					{
 						title: '联系方式',
 						dataIndex: 'buyerMobile',
 						key: 'buyerMobile'
 					},
-					
+
 				],
 				dataSource: []
 			};
@@ -247,7 +248,7 @@ const Order = Form.create()(
 						</div>
 					</div>
 					<div className="patent-table">
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<Table
 								columns={this.state.columns}
 								dataSource={this.state.dataSource}
@@ -255,7 +256,7 @@ const Order = Form.create()(
 								pagination={this.state.pagination}
 								onRowClick={this.tableRowClick}
 							/>
-						</Spin>
+						</SpinContainer>
 					</div>
 					<div className="patent-desc">
 						<Modal
@@ -268,7 +269,7 @@ const Order = Form.create()(
 							footer=""
 						>
 							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
-								<Spin spinning={this.state.loading}>
+								<SpinContainer spinning={this.state.loading}>
 									<div className="clearfix">
 										<FormItem
 											className="half-item"
@@ -333,7 +334,7 @@ const Order = Form.create()(
 											<span>{theData.buyerMobile}</span>
 										</FormItem>
 									</div>
-								</Spin>
+								</SpinContainer>
 							</Form>
 						</Modal>
 					</div>

+ 11 - 10
js/component/account/order/memberOrderX.jsx

@@ -1,4 +1,4 @@
-/* 
+/*
 	update:2018/07/16
 	author:liting
 */
@@ -8,6 +8,7 @@ import $ from 'jquery/src/ajax';
 import { Form, Button, Input, Select,Rate, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
 import { getOrderType } from '@/tools.js';
 import moment  from 'moment';
+import SpinContainer from "../../SpinContainer";
 //主体
 const Order = Form.create()(
 	React.createClass({
@@ -164,7 +165,7 @@ const Order = Form.create()(
 						title: '服务商',
 						dataIndex: 'sellerName',
 						key: 'sellerName',
-						
+
 					},
 					{
 						title: '联系方式',
@@ -334,7 +335,7 @@ const Order = Form.create()(
 						</div>
 					</div>
 					<div className="patent-table">
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<Table
 								columns={this.state.columns}
 								dataSource={this.state.dataSource}
@@ -342,7 +343,7 @@ const Order = Form.create()(
 								pagination={this.state.pagination}
 								onRowClick={this.tableRowClick}
 							/>
-						</Spin>
+						</SpinContainer>
 					</div>
 					<div className="patent-desc">
 						<Modal
@@ -355,7 +356,7 @@ const Order = Form.create()(
 							footer=""
 						>
 							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
-								<Spin spinning={this.state.loading}>
+								<SpinContainer spinning={this.state.loading}>
 									<div className="clearfix">
 										<FormItem
 											className="half-item"
@@ -420,7 +421,7 @@ const Order = Form.create()(
 											<span>{theData.sellerMobile}</span>
 										</FormItem>
 									</div>
-								</Spin>
+								</SpinContainer>
 							</Form>
 						</Modal>
 					</div>
@@ -432,9 +433,9 @@ const Order = Form.create()(
 							okText="提交"
 							onCancel={this.evaluateCancel}
 							footer=''
-						>	
+						>
 						<Form layout="horizontal" onSubmit={this.evaluateSubmit} >
-							<Spin spinning={this.state.loading}>
+							<SpinContainer spinning={this.state.loading}>
 								<p style={{marginLeft:40,fontSize:20,marginBottom:15}}>其他买家需要您的建议哦!</p>
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="评价内容">
 									<Input
@@ -448,7 +449,7 @@ const Order = Form.create()(
 									/>
 								</FormItem>
 								<FormItem
-									labelCol={{ span: 4 }} 
+									labelCol={{ span: 4 }}
 									wrapperCol={{ span: 8 }}
 									label="评星"
 								>
@@ -464,7 +465,7 @@ const Order = Form.create()(
 										</Button>
 									</FormItem>
 								</div>
-							</Spin>
+							</SpinContainer>
 						</Form>
 					</Modal>
 				</div>

+ 6 - 5
js/component/account/order/projectOrderS.jsx

@@ -1,4 +1,4 @@
-/* 
+/*
 	update:2018/07/16
 	author:liting
 */
@@ -9,6 +9,7 @@ import { Form, Button, Input, Select, Spin, Table, message, Modal, Tooltip, Swit
 import { orderType } from '@/dataDic';
 import { getOrderType } from '@/tools.js';
 import moment  from 'moment';
+import SpinContainer from "../../SpinContainer";
 //主体
 const Order = Form.create()(
 	React.createClass({
@@ -137,14 +138,14 @@ const Order = Form.create()(
 						title: '消费者',
 						dataIndex: 'buyerName',
 						key: 'buyerName',
-						
+
 					},
 					{
 						title: '联系方式',
 						dataIndex: 'buyerMobile',
 						key: 'buyerMobile'
 					},
-					
+
 				],
 				dataSource: []
 			};
@@ -248,7 +249,7 @@ const Order = Form.create()(
 						</div>
 					</div>
 					<div className="patent-table">
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<Table
 								columns={this.state.columns}
 								dataSource={this.state.dataSource}
@@ -256,7 +257,7 @@ const Order = Form.create()(
 								pagination={this.state.pagination}
 								onRowClick={this.tableRowClick}
 							/>
-						</Spin>
+						</SpinContainer>
 					</div>
 					<div className="patent-desc">
 						<Modal

+ 12 - 11
js/component/account/order/projectOrderX.jsx

@@ -1,13 +1,14 @@
-/* 
+/*
 	update:2018/07/16
 	author:liting
 */
 
 import React from 'react';
 import $ from 'jquery/src/ajax';
-import { Form, Button, Input, Select,Rate, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { Form, Button, Input, Select,Rate, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
 import { getOrderType } from '@/tools.js';
 import moment  from 'moment';
+import SpinContainer from "../../SpinContainer";
 //主体
 const Order = Form.create()(
 	React.createClass({
@@ -318,7 +319,7 @@ const Order = Form.create()(
 						</div>
 					</div>
 					<div className="patent-table">
-						<Spin spinning={this.state.loading}>
+						<SpinContainer spinning={this.state.loading}>
 							<Table
 								columns={this.state.columns}
 								dataSource={this.state.dataSource}
@@ -326,7 +327,7 @@ const Order = Form.create()(
 								pagination={this.state.pagination}
 								onRowClick={this.tableRowClick}
 							/>
-						</Spin>
+						</SpinContainer>
 					</div>
 					<div className="patent-desc">
 						<Modal
@@ -339,7 +340,7 @@ const Order = Form.create()(
 							footer=""
 						>
 							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
-								<Spin spinning={this.state.loading}>
+								<SpinContainer spinning={this.state.loading}>
 									<div className="clearfix">
 										<FormItem
 											className="half-item"
@@ -404,7 +405,7 @@ const Order = Form.create()(
 											<span>{theData.sellerMobile}</span>
 										</FormItem>
 									</div>
-								</Spin>
+								</SpinContainer>
 							</Form>
 						</Modal>
 					</div>
@@ -416,11 +417,11 @@ const Order = Form.create()(
 							okText="提交"
 							onCancel={this.evaluateCancel}
 							footer=''
-						>	
+						>
 						<Form layout="horizontal" onSubmit={this.evaluateSubmit} >
-							<Spin spinning={this.state.loading}>
+							<SpinContainer spinning={this.state.loading}>
 								<p style={{marginLeft:40,fontSize:20,marginBottom:15}}>其他买家需要您的建议哦!</p>
-								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} 
+								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }}
 									label={<span><i style={{color:'#f00'}}> * </i>评价内容</span>}>
 									<Input
 										type="textarea"
@@ -433,7 +434,7 @@ const Order = Form.create()(
 									/>
 								</FormItem>
 								<FormItem
-									labelCol={{ span: 4 }} 
+									labelCol={{ span: 4 }}
 									wrapperCol={{ span: 8 }}
 									label={<span><i style={{color:'#f00'}}> * </i>评星</span>}
 								>
@@ -449,7 +450,7 @@ const Order = Form.create()(
 										</Button>
 									</FormItem>
 								</div>
-							</Spin>
+							</SpinContainer>
 						</Form>
 					</Modal>
 				</div>

+ 7 - 6
js/component/account/services/activity.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Icon, Button, Upload, Input, Spin, Table, message, Select, Modal, DatePicker, Cascader, Transfer, InputNumber, Switch, Form } from 'antd';
+import { Icon, Button, Upload, Input, Table, message, Select, Modal, DatePicker, Cascader, Transfer, InputNumber, Switch, Form } from 'antd';
 import { technicalSourceList } from '../../dataDic.js';
 import { techFieldList, getTechField } from '../../DicTechFieldList.js';
 import { getTechnicalSource, beforeUploadFile, newDownloadFile } from '../../tools.js';
@@ -7,6 +7,7 @@ import './activity.less';
 import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
+import SpinContainer from "../../SpinContainer";
 
 
 if (!Array.prototype.includes) {
@@ -173,7 +174,7 @@ const ActivityForm = Form.create()(React.createClass({
         };
         if (theData) {
             return (
-                <Spin spinning={this.state.loading} className='spin-box'>
+                <SpinContainer spinning={this.state.loading} className='spin-box'>
                     <Form onSubmit={this.handleSubmit} id="admin-desc-content">
                         <div className="clearfix">
                             <FormItem className="half-item"
@@ -392,7 +393,7 @@ const ActivityForm = Form.create()(React.createClass({
                             <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>
                         </FormItem>
                     </Form >
-                </Spin >
+                </SpinContainer >
             )
         } else {
             return (<div></div>)
@@ -698,13 +699,13 @@ const Activity = React.createClass({
                     </p>
                 </div>
                 <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
+                    <SpinContainer spinning={this.state.loading}>
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}
                             onRowClick={this.tableRowClick} />
-                    </Spin>
+                    </SpinContainer>
                 </div>
                 <ActivityDesc data={this.state.RowData}
                     mockData={this.state.mockData}
@@ -714,4 +715,4 @@ const Activity = React.createClass({
     }
 });
 
-export default Activity;
+export default Activity;

+ 10 - 9
js/component/account/setAccount/account.jsx

@@ -1,4 +1,4 @@
-/* 
+/*
 	@author:李霆
 	@update:2018/05/29
 	@descript:复制粘贴,拿起来就是干!!
@@ -10,6 +10,7 @@ import $ from 'jquery/src/ajax';
 import { Row, Col, Form, Button, Spin, message, Modal, Input } from 'antd';
 import {getStatuslist} from '@/tools.js';
 import './account.less';
+import SpinContainer from "../../SpinContainer";
 const FormItem = Form.Item;
 
 
@@ -37,7 +38,7 @@ class Account extends React.Component {
 						message.warning(data.error[0].message);
 					}
 				} else {
-					
+
 					this.setState({
 						uid:data.data.uid,
 						username: data.data.username, //用户注册名
@@ -50,7 +51,7 @@ class Account extends React.Component {
 						accountData: data.data,
 						status:data.data.status,//用户状态 0-正常,1-注销 ,2-锁定
 						authentication:data.data.authentication, //实名认证状态 0-未认证,1-个人实名认
-						createTime:data.data.createTime?new Date(data.data.createTime).toLocaleString():''  
+						createTime:data.data.createTime?new Date(data.data.createTime).toLocaleString():''
 					});
 				}
 			}.bind(this)
@@ -190,7 +191,7 @@ class Account extends React.Component {
     //按下键盘回车键时保存
 	enterFun(item) {
         if(item){
-            document.onkeydown=function(e){    //对整个页面文档监听回车键 
+            document.onkeydown=function(e){    //对整个页面文档监听回车键
                 var keyNum=window.event ? e.keyCode :e.which;
                 if(keyNum==13){
                    this.saveFun(item);
@@ -215,7 +216,7 @@ class Account extends React.Component {
 			<div className="account-wrap">
 				<span style={{'fontSize':20,marginLeft:30,marginBottom:20,display:'inline-block'}}>账号管理</span>
 				<div className="clearfix">
-					<Spin spinning={this.state.loading}>
+					<SpinContainer spinning={this.state.loading}>
 						{/* <Row>
 							<Col span={8}>
 								<FormItem className="half-mid" {...formItemLayout} label="注册账号">
@@ -227,7 +228,7 @@ class Account extends React.Component {
 										className="Authentication"
 									>
 										修改密码
-									</Button> 
+									</Button>
 								</FormItem>
 							</Col>
 								</Row>*/}
@@ -433,7 +434,7 @@ class Account extends React.Component {
 							</Col>
 						</Row>
 						 */}
-					</Spin>
+					</SpinContainer>
 				</div>
 				<Modal
 					title="修改密码"
@@ -444,7 +445,7 @@ class Account extends React.Component {
 				>
 					<div>
 						<Form layout="horizontal" id="demand-form" onSubmit={this.passSubmit}>
-							<Spin spinning={this.state.loading}>
+							<SpinContainer spinning={this.state.loading}>
 								<div className="clearfix">
 									<FormItem
 										labelCol={{ span: 8 }}
@@ -499,7 +500,7 @@ class Account extends React.Component {
 										/>
 									</FormItem>
 								</div>
-							</Spin>
+							</SpinContainer>
 						</Form>
 					</div>
 				</Modal>

+ 4 - 3
js/component/administration/business/activity/index.jsx

@@ -1,10 +1,11 @@
 import React,{Component} from 'react';
-import {Button, Input, Spin, Table, Select, message, Popconfirm, Modal, Tag} from "antd";
+import {Button, Input, Table, Select, message, Popconfirm, Modal, Tag} from "antd";
 import $ from "jquery/src/ajax";
 import {
     getPicPath
 } from "@/tools.js";
 import ActivityOperation from './components/activityOperation';
+import SpinContainer from "../../../SpinContainer";
 
 class Activity extends Component{
     constructor(props) {
@@ -327,7 +328,7 @@ class Activity extends Component{
                 </div>
                 {/* 新闻表单 */}
                 <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
+                    <SpinContainer spinning={this.state.loading}>
                         <Table
                             columns={this.state.columns}
                             dataSource={this.state.dataSource}
@@ -342,7 +343,7 @@ class Activity extends Component{
                             size="small"
                             ellipsis="true"
                         />
-                    </Spin>
+                    </SpinContainer>
                 </div>
                 <Modal
                     visible={this.state.imgeditvisible}

+ 5 - 5
js/component/administration/business/advertisementList.jsx

@@ -8,7 +8,6 @@ import {
   Button,
   Input,
   Select,
-  Spin,
   Table,
   message,
   DatePicker,
@@ -32,6 +31,7 @@ import {
   beforeUploadFile,
   getPicPath
 } from "@/tools.js";
+import SpinContainer from "../../SpinContainer";
 const { Option } = Select;
 
 
@@ -610,7 +610,7 @@ const AdvertisementList = Form.create()(
               </Button>
             </div>
             <div className="patent-table">
-              <Spin spinning={this.state.loading}>
+              <SpinContainer spinning={this.state.loading}>
                 <Table
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}
@@ -619,7 +619,7 @@ const AdvertisementList = Form.create()(
                   bordered
                   size="small"
                 />
-              </Spin>
+              </SpinContainer>
             </div>
           </div>
           <div className="patent-desc">
@@ -639,7 +639,7 @@ const AdvertisementList = Form.create()(
                 onSubmit={this.edithandleSubmit}
                 id="demand-form"
               >
-                <Spin spinning={this.state.loading}>
+                <SpinContainer spinning={this.state.loading}>
                   <div className="clearfix">
                     <FormItem
                       className="half-item"
@@ -748,7 +748,7 @@ const AdvertisementList = Form.create()(
                       保存
                     </Button>
                   </div>
-                </Spin>
+                </SpinContainer>
               </Form>
             </Modal>
           </div>

+ 5 - 5
js/component/administration/business/buyList.jsx

@@ -8,7 +8,6 @@ import {
   Button,
   Input,
   Select,
-  Spin,
   Table,
   message,
   DatePicker,
@@ -42,6 +41,7 @@ import Img01 from "./image/cgg.jpg";
 import Img02 from "./image/ttt.jpg";
 import Img03 from "./image/xxxd.jpg";
 import Img04 from "./image/bbb.jpg";
+import SpinContainer from "../../SpinContainer";
 
 //上传图片组件
 const PicturesWall = React.createClass({
@@ -713,7 +713,7 @@ const BuyList = Form.create()(
               </Button>
             </div>
             <div className="patent-table">
-              <Spin spinning={this.state.loading}>
+              <SpinContainer spinning={this.state.loading}>
                 <Table
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}
@@ -722,7 +722,7 @@ const BuyList = Form.create()(
                   bordered
                   size="small"
                 />
-              </Spin>
+              </SpinContainer>
             </div>
           </div>
           <div className="patent-desc">
@@ -737,7 +737,7 @@ const BuyList = Form.create()(
               }
               footer=""
             >
-              <Spin spinning={this.state.loading}>
+              <SpinContainer spinning={this.state.loading}>
                 <div className="clearfix">
                   <FormItem
                     labelCol={{ span: 7 }}
@@ -870,7 +870,7 @@ const BuyList = Form.create()(
                     保存并发布
                   </Button>
                 </div>
-              </Spin>
+              </SpinContainer>
             </Modal>
             <Modal
               visible={this.state.imgeditvisible}

+ 6 - 6
js/component/administration/business/customers.jsx

@@ -7,7 +7,6 @@ import {
   Icon,
   Button,
   Input,
-  Spin,
   Table,
   message,
   Modal,
@@ -15,6 +14,7 @@ import {
   DatePicker,
   Popconfirm,
 } from "antd";
+import SpinContainer from '../../SpinContainer';
 const { Option } = Select;
 const { TextArea } = Input;
 const { RangePicker } = DatePicker;
@@ -303,7 +303,7 @@ const Customers = Form.create()(
               />
               <Button
                 type="primary"
-                onClick={this.loadData}
+                onClick={()=>{this.loadData()}}
                 style={{ marginRight: "10px",marginLeft: 10 }}
               >
                 搜索
@@ -313,7 +313,7 @@ const Customers = Form.create()(
               </Button>
             </div>
             <div className="patent-table">
-              <Spin spinning={this.state.loading}>
+              <SpinContainer spinning={this.state.loading}>
                 <Table
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}
@@ -322,7 +322,7 @@ const Customers = Form.create()(
                   size="small"
                   bordered
                 />
-              </Spin>
+              </SpinContainer>
             </div>
           </div>
           <div className="patent-desc">
@@ -335,7 +335,7 @@ const Customers = Form.create()(
               okText={"保存"}
               onCancel={this.cancel}
             >
-              <Spin spinning={this.state.loading}>
+              <SpinContainer spinning={this.state.loading}>
                 <div className="clearfix">
                   <FormItem
                     labelCol={{ span: 6 }}
@@ -373,7 +373,7 @@ const Customers = Form.create()(
                     </Select>
                   </FormItem>
                 </div>
-              </Spin>
+              </SpinContainer>
             </Modal>
           </div>
         </div>

+ 6 - 6
js/component/administration/business/firmList.jsx

@@ -9,7 +9,6 @@ import {
   Button,
   Input,
   Select,
-  Spin,
   Table,
   message,
   DatePicker,
@@ -33,7 +32,8 @@ import {
   beforeUploadFile,
   getPicPath
 } from "@/tools.js";
-import Editors from "@/richTextEditors"; //富文本编辑器
+import Editors from "@/richTextEditors";
+import SpinContainer from "../../SpinContainer"; //富文本编辑器
 
 // 上传文件
 const PicturesWall = React.createClass({
@@ -658,7 +658,7 @@ const FirmList = Form.create()(
             </div>
             {/* 新闻表单 */}
             <div className="patent-table">
-              <Spin spinning={this.state.loading}>
+              <SpinContainer spinning={this.state.loading}>
                 <Table
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}
@@ -668,7 +668,7 @@ const FirmList = Form.create()(
                   size="small"
                   ellipsis="true"
                 />
-              </Spin>
+              </SpinContainer>
             </div>
           </div>
           {/* 模块框 */}
@@ -686,7 +686,7 @@ const FirmList = Form.create()(
                 onSubmit={this.edithandleSubmit}
                 id="demand-form"
               >
-                <Spin spinning={this.state.loading}>
+                <SpinContainer spinning={this.state.loading}>
                   <div className="clearfix">
                     <FormItem
                       className="half-item"
@@ -845,7 +845,7 @@ const FirmList = Form.create()(
                       保存并发布
                     </Button>
                   </div>
-                </Spin>
+                </SpinContainer>
               </Form>
             </Modal>
             <Modal

+ 5 - 5
js/component/administration/business/proservlist.jsx

@@ -8,7 +8,6 @@ import {
   Button,
   Input,
   Select,
-  Spin,
   Table,
   message,
   DatePicker,
@@ -39,6 +38,7 @@ import Img01 from "./image/cgg.jpg";
 import Img02 from "./image/ttt.jpg";
 import Img03 from "./image/xxxd.jpg";
 import Img04 from "./image/bbb.jpg";
+import SpinContainer from "../../SpinContainer";
 
 //上传图片组件
 const PicturesWall = React.createClass({
@@ -664,7 +664,7 @@ const Proservlist = Form.create()(
               </Button>
             </div>
             <div className="patent-table">
-              <Spin spinning={this.state.loading}>
+              <SpinContainer spinning={this.state.loading}>
                 <Table
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}
@@ -673,7 +673,7 @@ const Proservlist = Form.create()(
                   size="small"
                   bordered
                 />
-              </Spin>
+              </SpinContainer>
             </div>
           </div>
           <div className="patent-desc">
@@ -693,7 +693,7 @@ const Proservlist = Form.create()(
                 onSubmit={this.edithandleSubmit}
                 id="demand-form"
               >
-                <Spin spinning={this.state.loading}>
+                <SpinContainer spinning={this.state.loading}>
                   <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 4 }}
@@ -773,7 +773,7 @@ const Proservlist = Form.create()(
                       保存并发布
                     </Button>
                   </div>
-                </Spin>
+                </SpinContainer>
               </Form>
             </Modal>
             <Modal

+ 5 - 5
js/component/administration/business/talentsList.jsx

@@ -8,7 +8,6 @@ import {
   Button,
   Input,
   Select,
-  Spin,
   Table,
   message,
   DatePicker,
@@ -42,6 +41,7 @@ import ad01 from "./image/ad01.jpg";
 import ad02 from "./image/ad02.jpg";
 import ad03 from "./image/ad03.jpg";
 import ad04 from "./image/ad04.jpg";
+import SpinContainer from "../../SpinContainer";
 
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -630,7 +630,7 @@ const TalentsList = Form.create()(
               </Button>
             </div>
             <div className="patent-table">
-              <Spin spinning={this.state.loading}>
+              <SpinContainer spinning={this.state.loading}>
                 <Table
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}
@@ -639,7 +639,7 @@ const TalentsList = Form.create()(
                   bordered
                   size="small"
                 />
-              </Spin>
+              </SpinContainer>
             </div>
           </div>
           <div className="patent-desc">
@@ -659,7 +659,7 @@ const TalentsList = Form.create()(
                 onSubmit={this.edithandleSubmit}
                 id="demand-form"
               >
-                <Spin spinning={this.state.loading}>
+                <SpinContainer spinning={this.state.loading}>
                   <div className="clearfix">
                     <FormItem
                       className="half-item"
@@ -807,7 +807,7 @@ const TalentsList = Form.create()(
                       保存并发布
                     </Button>
                   </div>
-                </Spin>
+                </SpinContainer>
               </Form>
             </Modal>
           </div>

+ 5 - 4
js/component/administration/demand/demandExamine.jsx

@@ -1,11 +1,12 @@
 import React from 'react';
-import {  Button, Input, Select, Spin, Table, Switch, message, DatePicker } from 'antd';
+import {  Button, Input, Select, Table, Switch, message, DatePicker } from 'antd';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './techDemand.less';
 import TechDemandDesc from './demandDesc.jsx';
 import { demandTypeList } from '@/dataDic.js';
 import { getDemandType,getReleaseStateList } from '@/tools.js';
+import SpinContainer from "../../SpinContainer";
 
 const DemandList = React.createClass({
     loadData(pageNo) {
@@ -288,13 +289,13 @@ const DemandList = React.createClass({
                     </div>
                 </div>
                 <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
+                    <SpinContainer spinning={this.state.loading}>
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}
                              />
-                    </Spin>
+                    </SpinContainer>
                 </div>
                 <TechDemandDesc
                     data={this.state.RowData}
@@ -307,4 +308,4 @@ const DemandList = React.createClass({
     }
 });
 
-export default DemandList;
+export default DemandList;