liting2017 7 gadi atpakaļ
vecāks
revīzija
27db191f39

+ 2 - 2
js/component/manageCenter/idea/content.less

@@ -62,7 +62,7 @@
 
 .news-modal {
     .quill {
-        margin-top: 40px;
+        margin-top:40px;
         margin-bottom: 40px;
         .ql-editor {
             min-height: 400px;
@@ -114,7 +114,7 @@
     color: #999;
 }
 .jmrhFlag{margin-right: 15px;}
-.provin{width: 100px;height: 28px;line-height: 28px;border-radius: 4px;border-color: #d9d9d9;padding:4px 3px;transition: all .5s;}
+.provin{width: 100px;height: 28px;line-height: 28px;border-radius: 4px;border-color: #d9d9d9;padding:4px 0px;transition: all .5s;}
 .provin:focus{outline: none;box-shadow: 0px 0px 6px #80b9ff;border-color: #80b9ff;}
 
 .manage-content .content-right{background-color:#fff;}

+ 40 - 5
js/component/manageCenter/idea/policy/manage.jsx

@@ -142,7 +142,9 @@ const Manage=React.createClass({
                 };
                 this.setState({
                     RowData: theObj,
-                    callnubs:theObj.type.toString(),
+                    topNumber:data.data.topNumber,
+                    hotspot:data.data.hotspot,
+                    callnubs:theObj.type.toString()
                 });
             }.bind(this),
         }).always(function () {
@@ -280,6 +282,14 @@ const Manage=React.createClass({
             message.warning('必须填写一个作者!');
             return;
         };
+//      if(this.state.topNumber){
+//      	let topStr = this.state.topNumber.toString();
+//      	let stateReg = topStr.match(/^[0-9]*$/g);
+//      	if(!stateReg){
+//	        	message.warning('置顶请输入数字!')
+//	        	return false
+//     	    };
+//      }
         this.setState({
             loading: true
         });
@@ -303,6 +313,8 @@ const Manage=React.createClass({
                 content: this.state.RowData.content,
                 createTimeFormattedDate: this.state.RowData.createTimeFormattedDate,                   
                 provinceId: this.state.RowData.provinceId, 
+                topNumber:this.state.topNumber,
+                hotspot :this.state.hotspot 
             },                      
             success: function (data) {
                 if (data.error && data.error.length) {
@@ -461,7 +473,7 @@ const Manage=React.createClass({
 			 <div className="admin-content" >
 				 <div className="admin-content-search">
 				 	<Button type="primary" style={{ float: 'right' }}
-                        onClick={() => { this.setState({ RowData: {}, visible: true }) }}>
+                        onClick={() => { this.setState({ RowData: {}, visible: true ,topNumber :'',hotspot :1}) }}>
                         添加<Icon type="plus" />
                     </Button>
 	                <Input placeholder="标题" style={{ width: 200 ,marginBottom:'10px',marginRight:'10px'}}
@@ -631,9 +643,9 @@ const Manage=React.createClass({
                         </div>
                         <div className="modal-box">
                             <span className="modal-box-title">选择省份</span> 
-                            <select  value={this.state.RowData.provinceId}  onChange={(e) => {
+                            <Select  value={this.state.RowData.provinceId}  onChange={(e) => {
 	                                this.state.RowData.provinceId = e.target.value;
-	                                this.setState({RowData: this.state.RowData});
+	                                this.setState({RowData: this.state.RowData}); 
 	                            }} className="provin">
 						        {
 						          this.state.list.map(function(name){
@@ -643,8 +655,31 @@ const Manage=React.createClass({
 						          })
 						        }
 						        
-				        </select>
+				       		</Select>
                         </div>
+                       {/* <div className="clearfix">
+                            <div className="modal-box news-box">
+                                <span className="modal-box-title">置顶序号:</span>
+                                <div className="modal-box-detail">
+                                    <Input value={this.state.topNumber } placeholder="请输入数字"
+                                        onChange={(e) => {
+                                            this.setState({ topNumber:e.target.value});
+                                        }} />
+                                </div>
+                            </div>
+                            <div className="modal-box news-box">
+                                <span className="modal-box-title">热门:</span>
+                                <div className="modal-box-detail">
+                                   	<Radio.Group value={this.state.hotspot} onChange={(e) => {
+                                        this.setState({ hotspot : e.target.value });
+                                  		  }} >
+                                        <Radio value={1}>否</Radio>
+                                        <Radio value={0}>是</Radio>
+                                    </Radio.Group>
+                                </div>
+                            </div>   	                           
+                        </div>
+                        */}
                         <Editors textContent={this.state.RowData.content}
                             uploadUrl={'/api/admin/news/upload'}
                             uploadSign={'news_content_picture'}

+ 1 - 1
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -1513,7 +1513,7 @@ const NewService = Form.create()(React.createClass({
 													            {...formItemLayout}
 													            label="变更操作" >                             
 													               <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
-													               <Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>
+													               {/*<Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>*/}
 													   		</FormItem>
 													    </div>
 													    <div className='clearfix changeRemark'>

+ 3 - 3
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -1786,7 +1786,7 @@ const NewService = Form.create()(React.createClass({
 									    <div className="clearfix">
 									    	<Button type="primary" onClick={this.subChangeState} style={{margin:"10px 50px 10px 128px"}}>保存</Button>
 									    	<Button onClick={this.addChangeCancel}>取消</Button>
-									    </div>
+									   </div>
 				                    </div>:
 				                    <div>
 				                    	{
@@ -1811,8 +1811,8 @@ const NewService = Form.create()(React.createClass({
 													   		<FormItem className="half-item"
 													            {...formItemLayout}
 													            label="变更操作" >                             
-													               <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
-													               <Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>
+													            <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
+													   			{/*<Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>*/}
 													   		</FormItem>
 													    </div>
 													    <div className='clearfix changeRemark'>

+ 1 - 1
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -788,7 +788,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 													            {...formItemLayout}
 													            label="变更操作" >                             
 													               <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
-													               <Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>
+													   			   {/*<Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>*/}
 													   		</FormItem>
 													    </div>
 													    <div className='clearfix changeRemark'>

+ 1 - 1
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -1646,7 +1646,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 													            {...formItemLayout}
 													            label="变更操作" >                             
 													               <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
-													               <Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>
+													   				{/*<Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>*/}
 													   		</FormItem>
 													    </div>
 													    <div className='clearfix changeRemark'>