liting2017 6 år sedan
förälder
incheckning
a0d68fcbd8

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

@@ -56,6 +56,7 @@ const DemandList = React.createClass({
 					this.state.pagination.total=0
 				};
                 this.setState({
+                    total:data.data.totalCount,
                     dataSource: theArr,
                     pagination: this.state.pagination
                 });
@@ -243,7 +244,11 @@ const DemandList = React.createClass({
                 this.setState({
                     loading: false
                 });
-                this.loadData(this.state.page);
+                if((this.state.total)%10==1){
+                    this.loadData((this.state.page)-1);
+                }else{
+                    this.loadData(this.state.page);
+                }
             } else {
                 message.warning(data.error[0].message);
             };

+ 6 - 1
js/component/account/demand/techDemand.jsx

@@ -55,6 +55,7 @@ const DemandList = React.createClass({
 					this.state.pagination.total=0
 				};
                 this.setState({
+                    total:data.data.totalCount,
                     dataSource: theArr,
                     pagination: this.state.pagination
                 });
@@ -261,7 +262,11 @@ const DemandList = React.createClass({
                 this.setState({
                     loading: false
                 });
-                this.loadData(this.state.page);
+                if((this.state.total)%10==1){
+                    this.loadData((this.state.page)-1);
+                }else{
+                    this.loadData(this.state.page);
+                }
             } else {
                 message.warning(data.error[0].message);
             };

+ 1 - 1
js/component/account/index/follow.jsx

@@ -90,7 +90,7 @@ class Collection extends Component {
                 <Spin spinning={this.state.loading}>
                     {dataList.length?<Row>
                         {dataList.map((item,index)=>{
-                            return<Col span={6} key={index} onClick={(e)=>{this.jump(item)}}>
+                            return<Col span={5} key={index} onClick={(e)=>{this.jump(item)}}>
                                     <div className="img">
                                         <div className="imgHeader">
                                             <div className="popImgBj">

+ 8 - 8
js/component/account/order/memberOrderX.jsx

@@ -171,14 +171,14 @@ const Order = Form.create()(
 						dataIndex: 'sellerMobile',
 						key: 'sellerMobile'
 					},
-					{
-						title: '评价',
-						dataIndex: 'pingjia',
-						key: 'pingjia',
-						render:(text,recard)=>{
-							return <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>评价</Button>
-						}
-					}
+					// {
+					// 	title: '评价',
+					// 	dataIndex: 'pingjia',
+					// 	key: 'pingjia',
+					// 	render:(text,recard)=>{
+					// 		return <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>评价</Button>
+					// 	}
+					// }
 				],
 				dataSource: []
 			};

+ 3 - 1
js/component/account/order/projectOrderX.jsx

@@ -137,7 +137,9 @@ const Order = Form.create()(
 						title: '服务商',
 						dataIndex: 'sellerName',
 						key: 'sellerName',
-						
+						render:(text)=>{
+							return text && text.length >12 ? text.substr(0,12) + '...' : text
+						}
 					},
 					{
 						title: '联系方式',