liting2017 6 anni fa
parent
commit
ed17958e95

+ 8 - 0
js/component/account/order/achievementOrderX.jsx

@@ -212,6 +212,14 @@ const Order = Form.create()(
 		//评价
 		evaluateSubmit(e){
 			e.preventDefault();
+			if(!this.state.remark){
+				message.warning('请填写评价内容');
+				return;
+			}
+			if(!this.state.star){
+				message.warning('请选择评星等级');
+				return;
+			}
 			this.setState({
 				loading:true
 			})

+ 8 - 0
js/component/account/order/demandOrderX.jsx

@@ -201,6 +201,14 @@ const Order = Form.create()(
 		//评价
 		evaluateSubmit(e){
 			e.preventDefault();
+			if(!this.state.remark){
+				message.warning('请填写评价内容');
+				return;
+			}
+			if(!this.state.star){
+				message.warning('请选择评星等级');
+				return;
+			}
 			this.setState({
 				loading:true
 			})

+ 1 - 2
js/component/account/setAccount/unit.jsx

@@ -262,8 +262,7 @@ const Unit = React.createClass({
 		// 		}
 		// 	});
 		// 	thecompanyLogoUrl = picArr.join(',');
-		// }
-		let thequaliUrl = [];
+		// }		let thequaliUrl = [];
 		if (this.state.qualiUrl.length) {
 			let picArr = [];
 			this.state.qualiUrl.map(function(item) {

+ 0 - 4
js/component/administration/business/userLibrary.jsx

@@ -24,11 +24,7 @@ class UserLibrary extends Component {
 			},
 			columns: [
 				{
-<<<<<<< HEAD
 					title: '用户名',
-=======
-					title: '客户名称',
->>>>>>> 27804543ec9e998d961332721678873174a185dd
 					dataIndex: 'nickname',
 					key: 'nickname'
 				},