yee 7 gadi atpakaļ
vecāks
revīzija
668fed7fa4

+ 0 - 4
js/component/NewDicProvinceList.js

@@ -13482,10 +13482,6 @@ module.exports = {
                 if (area == item.id) {
                     provinceKey = provinceKey + "/" + item.name;
                 };
-            } else if (!province && city) {
-                if (city == item.id) {
-                    provinceKey = item.name;
-                };
             };
         });
         return provinceKey;

+ 2 - 7
js/component/login/adminLogin.jsx

@@ -34,9 +34,9 @@ var Login = React.createClass({
                 }
             }).done(function (data) {
                 if (!data.error.length) {
-                    window.location.href =  globalConfig.context + "/admin/userManage.html";
+                    window.location.href = globalConfig.context + "/admin/index.html";
                 } else {
-                    this.tips(data.error[0].message);
+                    message.warning(data.error[0].message);
                 }
             }.bind(this)).always(function () {
                 this.setState({
@@ -51,11 +51,6 @@ var Login = React.createClass({
             this.handleSubmit()
         }
     },
-
-    tips: function (text) {
-        message.warning(text);
-    },
-
     getUser(event) {
         this.setState({ user: event.target.value });
     },

+ 71 - 66
js/component/manageCenter/index/content.jsx

@@ -4,81 +4,86 @@ import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 
 import '../content.less';
-import './content.less';
 import LeftTab from './leftTab.jsx';
 
 
 const TabPane = Tabs.TabPane;
 
 const Content = React.createClass({
+    getInitialState() {
+        return {
+            loading: false
+        };
+    },
     render() {
         return (
-            <div></div>
+            <div className="manage-content">
+                <LeftTab handlekey={this.handlekey} />
+                <div className="content-right">
+                    <Spin spinning={this.state.loading} className='spin-box'>
+                        <div className="index-content">
+
+                        </div>
+                    </Spin>
+                </div>
+            </div>
         )
-        // return (
-        //     <div className="acc-content">
-        //         <LeftTab handlekey={this.handlekey} />
-        //         <div className="content-right">
-        //             <Spin spinning={this.state.loading} className='spin-box'>
-        //                 <div className="index-content">
-        //                     <div className="index-userdata clearfix">
-        //                         <p className="acc-title">{this.state.number}</p>
-        //                         <div className="userdata-img">
-        //                             <img src={globalConfig.staticHost + "/upload" + this.state.personPortraitUrl} alt="" />
-        //                         </div>
-        //                         <div className="userdata-content">
-        //                             {(() => {
-        //                                 switch ( userData.lvl || this.state.userlvl) {
-        //                                     case '0':
-        //                                         return <p className="userdata-lvl">等级:<span>LV1</span> 普通用户</p>;
-        //                                     case '1':
-        //                                         return <p className="userdata-lvl">等级:<span>LV2</span> 已认证用户</p>;
-        //                                 };
-        //                             })()}
-        //                             <p>完善资料 {this.state.per}% ,<a href="./set.html">继续完善</a>,有助于提高您的资信</p>
-        //                             <p className="userdata-relate" style={{ 'display': 'none' }}>
-        //                                 <Button className="relateqq"><img src={qq} alt="" /> QQ账号登录</Button>
-        //                                 <Button className="relateweibo"><img src={weibo} alt="" />微博账号登录</Button>
-        //                                 <Button className="relateweixin"><img src={weixin} alt="" />微信账号登录</Button>
-        //                             </p>
-        //                             <div className="userdata-follow">已有<a href="">{this.state.follow}</a>人关注你</div>
-        //                         </div>
-        //                     </div>
-        //                     <div className="index-record">
-        //                         <p className="acc-title">我的轨迹</p>
-        //                         <ul className="record-list clearfix">
-        //                             <li>技术成果:<a href="">{this.state.chengguo}</a>项</li>
-        //                             <li>技术开发:<a href="">{this.state.kaifa}</a>项</li>
-        //                             <li>科技服务:<a href="">{this.state.fuwu}</a>项</li>
-        //                             <li>发布需求:<a href="">{this.state.xuqiu}</a>项</li>
-        //                         </ul>
-        //                     </div>
-        //                     <div className="index-activity">
-        //                         <Tabs defaultActiveKey="1" onChange={this.tabChange}>
-        //                             <TabPane tab="活动" key="1">
-        //                                 <p className="acc-title">即将举办的活动</p>
-        //                                 <ul className="activity-list">
-        //                                     {
-        //                                         this.state.activityArr.map(function (item, i) {
-        //                                             return <li key={i}>
-        //                                                 <span className="list-type">[{item.type}]</span>
-        //                                                 <span className="list-title">{item.title}</span>
-        //                                                 <a href={item.link}>报名</a>
-        //                                                 <span className="list-time">{item.time}</span>
-        //                                             </li>;
-        //                                         })
-        //                                     }
-        //                                 </ul>
-        //                             </TabPane>
-        //                             <TabPane tab="其他" key="2">Content of Tab Pane 2</TabPane>
-        //                         </Tabs>
-        //                     </div>
-        //                 </div>
-        //             </Spin>
-        //         </div>
-        //     </div>
-        // )
     }
 });
 
-export default Content;
+export default Content;
+
+// <div className="index-content">
+//                             <div className="index-userdata clearfix">
+//                                 <p className="acc-title">{this.state.number}</p>
+//                                 <div className="userdata-img">
+//                                     <img src={globalConfig.staticHost + "/upload" + this.state.personPortraitUrl} alt="" />
+//                                 </div>
+//                                 <div className="userdata-content">
+//                                     {(() => {
+//                                         switch (userData.lvl || this.state.userlvl) {
+//                                             case '0':
+//                                                 return <p className="userdata-lvl">等级:<span>LV1</span> 普通用户</p>;
+//                                             case '1':
+//                                                 return <p className="userdata-lvl">等级:<span>LV2</span> 已认证用户</p>;
+//                                         };
+//                                     })()}
+//                                     <p>完善资料 {this.state.per}% ,<a href="./set.html">继续完善</a>,有助于提高您的资信</p>
+//                                     <p className="userdata-relate" style={{ 'display': 'none' }}>
+//                                         <Button className="relateqq"><img src={qq} alt="" /> QQ账号登录</Button>
+//                                         <Button className="relateweibo"><img src={weibo} alt="" />微博账号登录</Button>
+//                                         <Button className="relateweixin"><img src={weixin} alt="" />微信账号登录</Button>
+//                                     </p>
+//                                     <div className="userdata-follow">已有<a href="">{this.state.follow}</a>人关注你</div>
+//                                 </div>
+//                             </div>
+//                             <div className="index-record">
+//                                 <p className="acc-title">我的轨迹</p>
+//                                 <ul className="record-list clearfix">
+//                                     <li>技术成果:<a href="">{this.state.chengguo}</a>项</li>
+//                                     <li>技术开发:<a href="">{this.state.kaifa}</a>项</li>
+//                                     <li>科技服务:<a href="">{this.state.fuwu}</a>项</li>
+//                                     <li>发布需求:<a href="">{this.state.xuqiu}</a>项</li>
+//                                 </ul>
+//                             </div>
+//                             <div className="index-activity">
+//                                 <Tabs defaultActiveKey="1" onChange={this.tabChange}>
+//                                     <TabPane tab="活动" key="1">
+//                                         <p className="acc-title">即将举办的活动</p>
+//                                         <ul className="activity-list">
+//                                             {
+//                                                 this.state.activityArr.map(function (item, i) {
+//                                                     return <li key={i}>
+//                                                         <span className="list-type">[{item.type}]</span>
+//                                                         <span className="list-title">{item.title}</span>
+//                                                         <a href={item.link}>报名</a>
+//                                                         <span className="list-time">{item.time}</span>
+//                                                     </li>;
+//                                                 })
+//                                             }
+//                                         </ul>
+//                                     </TabPane>
+//                                     <TabPane tab="其他" key="2">Content of Tab Pane 2</TabPane>
+//                                 </Tabs>
+//                             </div>
+//                         </div>

+ 8 - 13
js/component/manageCenter/index/leftTab.jsx

@@ -8,7 +8,7 @@ const MenuItemGroup = Menu.ItemGroup;
 const LeftTab = React.createClass({
     getInitialState() {
         return {
-            current: 'tongchang',
+            current: 'normal'
         };
     },
     handleClick(e) {
@@ -17,25 +17,20 @@ const LeftTab = React.createClass({
             current: e.key,
         });
     },
+    componentWillMount() {
+        if (window.location.hash) {
+            this.state.current = window.location.hash.substr(1);
+        };
+    },
     render() {
         return (
             <Menu onClick={this.handleClick}
                 selectedKeys={[this.state.current]}
                 mode="vertical"
-                className="account-left"
-                >
-                <Menu.Item key="tongchang">
+                className="account-left" >
+                <Menu.Item key="normal">
                     常用功能
                 </Menu.Item>
-                <Menu.Item key="in">
-                    供应发布
-                </Menu.Item>
-                <Menu.Item key="want">
-                    需求发布
-                </Menu.Item>
-                <Menu.Item key="my">
-                    我的收藏
-                </Menu.Item>
             </Menu>
         );
     },

+ 1 - 2
js/component/manageCenter/servicesManage/leftTab.jsx

@@ -65,8 +65,7 @@ const LeftTab = React.createClass({
                 defaultOpenKeys={[this.state.subKey]}
                 mode="vertical"
                 className="account-left"
-                mode="inline"
-            >
+                mode="inline" >
                 <SubMenu key="sub1" title={<span>合同申请管理</span>}>
                     <Menu.Item key="contract">
                         合同申请管理

+ 2 - 2
js/component/manageCenter/set/modal.jsx

@@ -463,8 +463,8 @@ const TheModal = React.createClass({
                                 </Button>
                             </div> : <div style={{ display: 'inline-block', width: '88%' }}>
                                     {this.state.locations.map((item, i) => {
-                                        return <Tag key={i}>{getProvince(item.province) + ' ' + (item.city ? item.city.map((item) => {
-                                            return getProvince(item) + ' '
+                                        return <Tag key={i}>{getProvince(item.province) + ' ' + (item.city ? item.city.map((c) => {
+                                            return getProvince(c) + ' '
                                         }) : '')}</Tag>
                                     })}
                                 </div>}

+ 39 - 5
js/component/manageCenter/topTab.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Row, Col, Icon, Modal, Button, Spin, Select, Input, message, Badge, Table, Tabs } from 'antd';
+import { Row, Col, Icon, Modal, Button, Spin, Select, Input, message, Badge, Table, Tabs, Tag } from 'antd';
 import { getProvince } from '../NewDicProvinceList.js';
 import { companySearch } from '../tools.js';
 import './topTab.less';
@@ -249,6 +249,7 @@ const UserModal = React.createClass({
         return {
             visible: false,
             loading: false,
+            locations: []
         };
     },
     loadData() {
@@ -275,9 +276,9 @@ const UserModal = React.createClass({
                     email: data.data.email,
                     createTime: data.data.createTime,
                     number: data.data.number,
-                    province: data.data.province,
                     createTimeFormattedDate: data.data.createTimeFormattedDate
                 });
+                this.loadLocations(data.data.id);
             }.bind(this),
         }).always(function (data) {
             this.setState({
@@ -285,6 +286,34 @@ const UserModal = React.createClass({
             });
         }.bind(this));
     },
+    loadLocations(id) {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            url: globalConfig.context + '/api/admin/supervise/adminDetailLocation',
+            cache: false,
+            data: {
+                "id": id
+            }
+        }).done((data) => {
+            if (!data.data) {
+                if (data.error && data.error.length) {
+                    message.warning(data.error[0].message);
+                    return;
+                };
+            };
+            data.data.map((item) => {
+                if (item.city) {
+                    item.city = item.city.split(',');
+                }
+            });
+            this.setState({
+                locations: data.data,
+                loading: false
+            });
+        })
+    },
     componentWillReceiveProps(nextProps) {
         if (!this.state.visible && nextProps.showDesc) {
             this.loadData();
@@ -333,8 +362,7 @@ const UserModal = React.createClass({
                 <Spin spinning={this.state.loading} className='spin-box'>
                     <Modal maskClosable={false} title="用户设置" visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='380px'
-                    >
+                        width='380px' >
                         <ul className="modal-content">
                             <li>
                                 <span className='modal-text'>名字</span>
@@ -350,7 +378,13 @@ const UserModal = React.createClass({
                             </li>
                             <li>
                                 <span className='modal-text'>省份</span>
-                                <span>{getProvince(this.state.province)}</span>
+                                <div style={{ display: "inline-block", width: '78%' }}>
+                                    {this.state.locations.map((item, i) => {
+                                        return <Tag key={i}>{getProvince(item.province) + ' ' + (item.city ? item.city.map((c) => {
+                                            return getProvince(c) + ' '
+                                        }) : '')}</Tag>
+                                    })}
+                                </div>
                             </li>
                             <li>
                                 <span className='modal-text'>邮箱</span>

+ 20 - 18
js/component/manageCenter/userManage/userList.jsx

@@ -100,24 +100,26 @@ const UserList = React.createClass({
                 auditStatus: this.state.searchAuditStatus
             },
             success: function (data) {
-                if (data.error.length || !data.data || !data.data.list) {
-                    message.warning(data.error[0].message);
-                    return;
-                }
-                for (let i = 0; i < data.data.list.length; i++) {
-                    let thisdata = data.data.list[i];
-                    this.state.data.push({
-                        key: i,
-                        id: thisdata.id,
-                        mobile: thisdata.mobile,
-                        email: thisdata.email,
-                        createTime: thisdata.createTime,
-                        aftUsername: thisdata.aftUsername,
-                        number: thisdata.number,
-                        auditStatus: thisdata.auditStatus,
-                        createTimeFormattedDate: thisdata.createTimeFormattedDate,
-                        adminName: thisdata.adminName
-                    });
+                if ( !data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        this.state.data.push({
+                            key: i,
+                            id: thisdata.id,
+                            mobile: thisdata.mobile,
+                            email: thisdata.email,
+                            createTime: thisdata.createTime,
+                            aftUsername: thisdata.aftUsername,
+                            number: thisdata.number,
+                            auditStatus: thisdata.auditStatus,
+                            createTimeFormattedDate: thisdata.createTimeFormattedDate,
+                            adminName: thisdata.adminName
+                        });
+                    };
                 };
                 this.state.pagination.current = data.data.pageNo;
                 this.state.pagination.total = data.data.totalCount;

+ 36 - 4
js/component/subscriberDetail/content.jsx

@@ -1,7 +1,9 @@
 import React from 'react';
-import { Icon, message, Row, Col, Spin } from 'antd';
+import { Icon, message, Row, Col, Spin, Tag } from 'antd';
 import './detail.less';
 import { getSearchUrl } from '../tools';
+import { getProvince } from '../NewDicProvinceList';
+import { getTechField } from '../DicTechFieldList';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 
@@ -35,6 +37,7 @@ const Content = React.createClass({
     getInitialState() {
         return {
             loading: false,
+            data: {},
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -132,9 +135,38 @@ const Content = React.createClass({
                                     : avatarImg} alt="头像" />
                             </div>
                         </Col>
-                        <Col span={18}>
-                            <div className="column-title">
-                                
+                        <Col span={18} className="avatar-right">
+                            <div>
+                                <div className="column-title">用户名称</div>
+                                <div className="column-text">{this.state.type == 0 ? theData.username : theData.unitName}</div>
+                            </div>
+                            <div>
+                                <div className="column-title">用户类型</div>
+                                <div className="column-text">{this.state.type == 0 ? '个人' : '组织'}</div>
+                            </div>
+                            <div>
+                                <div className="column-title">用户等级</div>
+                                <div className="column-text">Lv.{theData.level}</div>
+                            </div>
+                            <div>
+                                <div className="column-title">所在地</div>
+                                <div className="column-text">{getProvince(theData.province, theData.city, theData.area)}</div>
+                            </div>
+                        </Col>
+                    </Row>
+                    <Row>
+                        <Col span={12}>
+                            <div className="column-title">专业领域</div>
+                            <div className="column-text">{getTechField(this.state.type == 0 ? theData.engagedField.split(',') : theData.field.split(','))}</div>
+                        </Col>
+                    </Row>
+                    <Row>
+                        <Col span={12}>
+                            <div className="column-title">能力标签</div>
+                            <div className="column-text">
+                                {theData.abilityLabel ? theData.abilityLabel.join(',').map((item) => {
+                                    return <Tag key={item}>{item}</Tag>
+                                }) : ''}
                             </div>
                         </Col>
                     </Row>

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "",
   "main": "index.js",
   "scripts": {