Browse Source

系统消息推送联调完成

liting2017 6 years ago
parent
commit
6a698b199f

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

@@ -368,6 +368,8 @@ const Personal = React.createClass({
 									<Radio value={'女'}>女</Radio>
 									<Radio value={'女'}>女</Radio>
 								</Radio.Group>
 								</Radio.Group>
 							</FormItem>
 							</FormItem>
+						</div>
+						<div className="clearfix">
 							<FormItem className="half-item" {...formItemLayout} label={<span><span className="color-red"> * </span>行业</span>}>
 							<FormItem className="half-item" {...formItemLayout} label={<span><span className="color-red"> * </span>行业</span>}>
 								<Select
 								<Select
 									placeholder="选择行业"
 									placeholder="选择行业"
@@ -423,7 +425,6 @@ const Personal = React.createClass({
 								/>
 								/>
 							</FormItem>
 							</FormItem>
                         </div>
                         </div>
-                       
                         <div className="clearfix">
                         <div className="clearfix">
                             <FormItem className="half-item" {...formItemLayout} label={<span><span className="color-red"> * </span>省-市-区</span>}>
                             <FormItem className="half-item" {...formItemLayout} label={<span><span className="color-red"> * </span>省-市-区</span>}>
                                 <Cascader
                                 <Cascader

+ 54 - 79
js/component/administration/messagePush/systemMessage.jsx

@@ -64,15 +64,14 @@ const SystemMessage=Form.create()(React.createClass({
 			loading: true
 			loading: true
 		});
 		});
 		$.ajax({
 		$.ajax({
-			method: "post",
+			method: "get",
 			dataType: "json",
 			dataType: "json",
 			crossDomain: false,
 			crossDomain: false,
-			url: globalConfig.context + '/api/admin/customer/listAllPersonalCustomer',
+			url: globalConfig.context + '/api/admin/listJpushUser',
 			data: {
 			data: {
 				pageNo: pageNo || 1,
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
 				pageSize: this.state.pagination.pageSize,
-				name: this.state.nameSearch,
-				societyTag: this.state.societyTagSearch,
+				type:0
 			},
 			},
 			success: function(data) {
 			success: function(data) {
 				let theArr = [];
 				let theArr = [];
@@ -84,26 +83,15 @@ const SystemMessage=Form.create()(React.createClass({
 					for(let i = 0; i < data.data.list.length; i++) {
 					for(let i = 0; i < data.data.list.length; i++) {
 						let thisdata = data.data.list[i];
 						let thisdata = data.data.list[i];
 						theArr.push({
 						theArr.push({
-							key: thisdata.uid,
-							id: thisdata.uid,
-							type: thisdata.type,
-							name: thisdata.name,
-							status: thisdata.status,
-							contacts: thisdata.contacts,
-							contactMobile: thisdata.contactMobile,
-							industry: thisdata.industry,
-							createTime: thisdata.createTime,
-							businessAudit: thisdata.businessAudit,
-							auditStatus: thisdata.auditStatus,
-							lvl: thisdata.lvl,
-							isMember: thisdata.isMember,
-							status: thisdata.status,
+							key: i,  
+							id: thisdata.uid, //id
+							name: thisdata.name,  //客户名称
+							contacts: thisdata.contacts,   //联系人
+							contactMobile: thisdata.contactMobile, //联系方式
+							industry: thisdata.industryS,   //行业
+							createTime: thisdata.createTime?new Date(thisdata.createTime).toLocaleString():'',  //创建时间
 							societyTag: thisdata.societyTag,
 							societyTag: thisdata.societyTag,
-							currentMemberStatus: thisdata.currentMemberStatus,
-							international: thisdata.international,
-							listed: thisdata.listed,
-							highTechZone: thisdata.highTechZone,
-							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city || '' + '-' + thisdata.area : '--'
+							locationProvince:thisdata.locationProvinceS
 						});
 						});
 					};
 					};
 
 
@@ -126,15 +114,14 @@ const SystemMessage=Form.create()(React.createClass({
 			loading: true
 			loading: true
 		});
 		});
 		$.ajax({
 		$.ajax({
-			method: "post",
+			method: "get",
 			dataType: "json",
 			dataType: "json",
 			crossDomain: false,
 			crossDomain: false,
-			url: globalConfig.context + '/api/admin/customer/listAllOrganizationCustomer',
+			url: globalConfig.context + '/api/admin/listJpushUser',
 			data: {
 			data: {
 				pageNo: pageNo || 1,
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
 				pageSize: this.state.pagination.pageSize,
-				name: this.state.nameSearch,
-				societyTag: this.state.societyTagSearch,
+				type:1
 			},
 			},
 			success: function(data) {
 			success: function(data) {
 				let theArr = [];
 				let theArr = [];
@@ -148,24 +135,13 @@ const SystemMessage=Form.create()(React.createClass({
 						theArr.push({
 						theArr.push({
 							key: thisdata.uid,
 							key: thisdata.uid,
 							id: thisdata.uid,
 							id: thisdata.uid,
-							type: thisdata.type,
-							name: thisdata.name,
-							status: thisdata.status,
-							contacts: thisdata.contacts,
-							contactMobile: thisdata.contactMobile,
-							industry: thisdata.industry,
-							createTime: thisdata.createTime,
-							businessAudit: thisdata.businessAudit,
-							auditStatus: thisdata.auditStatus,
-							lvl: thisdata.lvl,
-							isMember: thisdata.isMember,
-							status: thisdata.status,
+							name: thisdata.name,  //客户名称
+							contacts: thisdata.contacts,   //联系人
+							contactMobile: thisdata.contactMobile, //联系方式
+							industry: thisdata.industryS,   //行业
+							createTime: thisdata.createTime?new Date(thisdata.createTime).toLocaleString():'',  //创建时间
 							societyTag: thisdata.societyTag,
 							societyTag: thisdata.societyTag,
-							currentMemberStatus: thisdata.currentMemberStatus,
-							international: thisdata.international,
-							listed: thisdata.listed,
-							highTechZone: thisdata.highTechZone,
-							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city || '' + '-' + thisdata.area : '--'
+							locationProvince:thisdata.locationProvinceS
 						});
 						});
 					};
 					};
 
 
@@ -533,24 +509,24 @@ const SystemMessage=Form.create()(React.createClass({
 					dataIndex: 'createTime',
 					dataIndex: 'createTime',
 					key: 'createTime',
 					key: 'createTime',
 				},
 				},
-				{
-					title: '会员等级',
-					dataIndex: 'lvl',
-					key: 'lvl',
-					render: text => { return getLvl(text) }
-				},
-				{
-					title: '会员状态',
-					dataIndex: 'currentMemberStatus',
-					key: 'currentMemberStatus',
-					render: text => { return getCurrentMember(text) }
-				},
-				{
-					title: '账户状态',
-					dataIndex: 'status',
-					key: 'status',
-					render: text => { return getStatuslist(text) }
-				}			
+				// {
+				// 	title: '会员等级',
+				// 	dataIndex: 'lvl',
+				// 	key: 'lvl',
+				// 	render: text => { return getLvl(text) }
+				// },
+				// {
+				// 	title: '会员状态',
+				// 	dataIndex: 'currentMemberStatus',
+				// 	key: 'currentMemberStatus',
+				// 	render: text => { return getCurrentMember(text) }
+				// },
+				// {
+				// 	title: '账户状态',
+				// 	dataIndex: 'status',
+				// 	key: 'status',
+				// 	render: text => { return getStatuslist(text) }
+				// }			
 			],
 			],
 			sanhuDataSource: [],
 			sanhuDataSource: [],
 			sanhuColumns21: [{
 			sanhuColumns21: [{
@@ -588,18 +564,18 @@ const SystemMessage=Form.create()(React.createClass({
 					dataIndex: 'createTime',
 					dataIndex: 'createTime',
 					key: 'createTime',
 					key: 'createTime',
 				},
 				},
-			    {
-					title: '会员状态',
-					dataIndex: 'currentMemberStatus',
-					key: 'currentMemberStatus',
-					render: text => { return getCurrentMember(text) }
-				},
-				{
-					title: '账户状态',
-					dataIndex: 'status',
-					key: 'status',
-					render: text => { return getStatuslist(text) }
-				}			
+			    // {
+				// 	title: '会员状态',
+				// 	dataIndex: 'currentMemberStatus',
+				// 	key: 'currentMemberStatus',
+				// 	render: text => { return getCurrentMember(text) }
+				// },
+				// {
+				// 	title: '账户状态',
+				// 	dataIndex: 'status',
+				// 	key: 'status',
+				// 	render: text => { return getStatuslist(text) }
+				// }			
 			],
 			],
 			sanhuDataSource21: [],
 			sanhuDataSource21: [],
             fengongsiColumns: [
             fengongsiColumns: [
@@ -1646,8 +1622,7 @@ const SystemMessage=Form.create()(React.createClass({
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                    })
 				                                    })
 				                                }
 				                                }
-				                        </Select>
-					                    
+				                        </Select> 
 					                    <Button type="primary" onClick={this.sanhusearch} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button type="primary" onClick={this.sanhusearch} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button onClick={this.sanhuReset} style={{marginRight:'10px'}}>重置</Button>
 					                    <Button onClick={this.sanhuReset} style={{marginRight:'10px'}}>重置</Button>
 					                </div>
 					                </div>
@@ -1660,7 +1635,7 @@ const SystemMessage=Form.create()(React.createClass({
 				                                onRowClick={this.tableRowClick} />
 				                                onRowClick={this.tableRowClick} />
 				                        </Spin>
 				                        </Spin>
 				                    </div>
 				                    </div>
-				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
+				                    <FormItem wrapperCol={{ span: 12, offset: 9 }} style={{marginTop:20}}>
 				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
 				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel1} style={{marginLeft:'100px'}}>取消</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel1} style={{marginLeft:'100px'}}>取消</Button>
 				                    </FormItem> 
 				                    </FormItem> 
@@ -1690,7 +1665,7 @@ const SystemMessage=Form.create()(React.createClass({
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                    })
 				                                    })
 				                                }
 				                                }
-				                        </Select>
+				                        </Select> 
 					                    <Button type="primary" onClick={this.sanhusearch21} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button type="primary" onClick={this.sanhusearch21} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button onClick={this.sanhuReset21} style={{marginRight:'10px'}}>重置</Button>
 					                    <Button onClick={this.sanhuReset21} style={{marginRight:'10px'}}>重置</Button>
 					                </div>
 					                </div>
@@ -1703,7 +1678,7 @@ const SystemMessage=Form.create()(React.createClass({
 				                                onRowClick={this.tableRowClick} />
 				                                onRowClick={this.tableRowClick} />
 				                        </Spin>
 				                        </Spin>
 				                    </div>
 				                    </div>
-				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
+				                    <FormItem wrapperCol={{ span: 12, offset: 9 }} style={{marginTop:20}}>
 				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
 				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel21} style={{marginLeft:'100px'}}>取消</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel21} style={{marginLeft:'100px'}}>取消</Button>
 				                    </FormItem> 
 				                    </FormItem>