Merge branch 'master' of http://192.168.1.41:3000/caipin/cld2_react

src/common/axios_auth.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import cookie from 'react-cookies'
 
 //取消请求
 let CancelToken = axios.CancelToken
@@ -15,9 +16,13 @@ axios.interceptors.request.use(config => {
     //post和get请求方式的不同，使用三木运算处理
     
     
-
+    // console.log(config.method);
     if(config.method === 'post'){
-        config.headers['Content-Type']='application/x-www-form-urlencoded';
+        // console.log('ddd');
+        let csrftoken = cookie.load('csrfToken');
+        // console.log(csrftoken);
+        // config.headers['Content-Type']='application/x-www-form-urlencoded';
+        config.headers['x-csrf-token']=csrftoken;
     }
     //console.log(config);
     //let requestName = config.method === 'post'?config.data.requestName :config.params.requestName
@@ -33,9 +38,10 @@ axios.interceptors.request.use(config => {
     //         axios[requestName].cancel = c
     //     })
     // }
+    // console.log(config);
     return config
 }, error => {
-    return Promise.reject(error)
+    return Promise.reject(error+'auth')
 })
 // respone拦截器
 axios.interceptors.response.use(

src/common/popups/company.js

@@ -1,10 +1,16 @@
 import React, { PureComponent, Fragment } from 'react';
 import { connect } from 'react-redux';
-import { Input, Cascader } from 'antd';
+import { Input, Cascader,message } from 'antd';
 import { actionCreators } from './store';
 
 import options from './districtOptions.json';
 
+const error = (msg) => {
+    message.error({
+      content: msg,
+    });
+  };
+
 class company extends PureComponent {
 
     render() {
@@ -170,7 +176,7 @@ const mapDispathToProps = (dispatch) => {
                 clearTimeout(delaySwitch);
               }
               delaySwitch = setTimeout(() => {
-                dispatch(actionCreators.modifyCompany(name, value));
+                dispatch(actionCreators.modifyCompany(name, value,error));
               }, 350);
           },
     }

src/common/popups/index.js

@@ -312,5 +312,3 @@ const mapDispathToProps = (dispatch) => {
 }
 
 export default connect(mapStateToProps, mapDispathToProps)(popups);
-
-// export default popups;

src/common/popups/store/actionCreators.js

@@ -2,6 +2,7 @@ import * as constants from './constants';
 import { fromJS } from 'immutable';
 import * as config from '../../../common/config.js';
 import axios from '../../../common/axios_auth.js';
+import qs from 'qs';
 
 //获得公司详情
 export const getCompanyDetail = (key,error) => {
@@ -31,26 +32,26 @@ export const changeLoading = () => {
     }
 }
 //
-export const modifyCompany = (name,value) => {
+export const modifyCompany = (name,value,error) => {
     return (dispatch) => {
 
         let data = {
             'username': name,
             'password': value,
         };
-        console.log(name+value);
-        axios.post(config.CLD2API + '/contact/modifyCompany/', qs.stringify(data)).then((res) => {
+        
+        axios.post(config.CLD2API + '/contact/modifyCompany', qs.stringify(data)).then((res) => {
             const data = res.data;
-            if (data.code === 200) {
+            if (dat0a.code === 200) {
                 // dispatch({
                 //     type: constants.CHANGE_COMPANY_DETAIL,
                 //     data: data.data,
                 // });
             } else {
-                error('公司详情更新失败');
+                error('公司详情更新失败2');
             }
         }).catch((e) => {
-            error('公司详情更新失败');
+            error('公司详情更新失败3');
         })
     }
 }

src/common/popupsCompany/company.js

@@ -0,0 +1,185 @@
+import React, { PureComponent, Fragment } from 'react';
+import { connect } from 'react-redux';
+import { Input, Cascader,message } from 'antd';
+import { actionCreators } from './store';
+
+import options from '../popups/districtOptions.json';
+
+const error = (msg) => {
+    message.error({
+      content: msg,
+    });
+  };
+
+class company extends PureComponent {
+
+    render() {
+        const { companyDetail,natureOptions,handleModifyCompany } = this.props;
+        let companyDetail2 = companyDetail.toJS();
+        let natureOptions2 = natureOptions.toJS();
+      
+        return (
+            <Fragment>
+
+
+                {/* <div className="save-tips">
+                    <div className="alert bg-warning-700 text-white p-2 m-1" role="alert">
+                        <div className="d-flex align-items-center">
+                            <div className="alert-icon">
+                                <i className="fal fa-info-circle"></i>
+                            </div>
+                            <div className="flex-1">
+                                <span className="h5">内容已经修改</span>
+                            </div>
+                            <a href="#" className="btn btn-sm text-white width-8">取消</a>
+                            <a href="#" className="btn btn-light btn-sm width-8">保存</a>
+                        </div>
+                    </div>
+                </div> */}
+                <div className="sheet-panel-header d-flex justify-content-between mx-4">
+                    <div>
+                        <a href="#" data-toggle="tooltip" data-placement="top" title="" data-original-title="新页面打开"><i className="fal fa-external-link"></i></a>
+                    </div>
+                    <div>
+                    </div>
+                </div>
+                <div className="sheet-panel-content">
+                    <div className="sheet-panel-form slimScroll1 mx-4">
+                        <div className="form-header mt-3">
+                            <div className="d-flex justify-content-between">
+                                <span className="text-muted">公司</span>
+                                <span className="text-muted">{companyDetail2.staffDetial.username} 创建于 {companyDetail2.create_time}</span>
+                            </div>
+                            <legend>{companyDetail2.companyname}</legend>
+                        </div>
+                        <div className="cldform clearfix">
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item">
+                                <div className="cldform-label">公司全称</div>
+                                <div className="cldform-control">
+
+                                {/* {false ?(<Input id="2"
+                                        value={companyDetail2.companyname}
+                                        onClick={() => console.log('false')}
+                                        onChange={() => console.log('sdf')}
+                                    />):(<div onClick={() => console.log('false')} className="cldform-contarl-box cldform-contarl-textareabox"><span>张三</span></div>)} */}
+
+                                
+
+                                    <Input id="2"
+                                        value={companyDetail2.companyname}
+                                        onChange={(e) => handleModifyCompany('companyname',e,'公司全称')}
+                                    />
+                                </div>
+                            </div>
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item cldform-item-wauto">
+                                <div className="cldform-label">公司地区</div>
+                                <div className="cldform-control">
+                                {/* {["19","292","3066"]} */}
+                                    <Cascader options={options} value={companyDetail2.district} style={{ width: '100%' }} placeholder="公司地区" />
+
+                                </div>
+                            </div>
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item cldform-item-wauto">
+                                <div className="cldform-label">公司性质</div>
+                                <div className="cldform-control">
+                                    <Cascader options={natureOptions2} value={[companyDetail2.nature]} placeholder="公司性质" style={{ width: '100%' }} />
+                                </div>
+                            </div>
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item">
+                                <div className="cldform-label">公司地址</div>
+                                <div className="cldform-control">
+                                    <Input id="2"
+                                        value={companyDetail2.address}
+                                    />
+                                </div>
+                            </div>
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item cldform-item-half pr-3">
+                                <div className="cldform-label">公司传真</div>
+                                <div className="cldform-control">
+                                    <Input id="2"
+                                        value={companyDetail2.fax}
+                                    />
+                                </div>
+                            </div>
+                            <div className="cldform-item cldform-item-half pl-3">
+                                <div className="cldform-label">网址</div>
+                                <div className="cldform-control">
+                                    <Input id="2"
+                                        value={companyDetail2.webservice}
+                                    />
+                                </div>
+                            </div>
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item">
+                                <div className="cldform-label">乘车路线</div>
+                                <div className="cldform-control">
+                                    <Input id="2"
+                                        value={companyDetail2.ride}
+                                    />
+                                </div>
+                            </div>
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item">
+                                <div className="cldform-label">地标建筑</div>
+                                <div className="cldform-control">
+                                    <Input id="2"
+                                        value={companyDetail2.landmarks}
+                                    />
+                                </div>
+                            </div>
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item">
+                                <div className="cldform-label">参考住宿</div>
+                                <div className="cldform-control">
+                                    <Input id="2"
+                                        value={companyDetail2.stay}
+                                    />
+                                </div>
+                            </div>
+                            <div className="cldform-line"></div>
+                            <div className="cldform-item">
+                                <div className="cldform-label">备注</div>
+                                <div className="cldform-control">
+                                    <Input id="2"
+                                        value={companyDetail2.remarks}
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </Fragment>
+
+        );
+    }
+}
+
+let delaySwitch = null;//延迟检索开关
+
+const mapStateToProps = (state) => {
+    return {
+        companyDetail: state.getIn(['popups', 'companyDetail']),
+        natureOptions: state.getIn(['popups', 'natureOptions']),
+    }
+}
+
+const mapDispathToProps = (dispatch) => {
+    return {
+        handleModifyCompany(name, e,title) {
+            let value=e.target.value;
+            if (delaySwitch != null) {
+                clearTimeout(delaySwitch);
+              }
+              delaySwitch = setTimeout(() => {
+                dispatch(actionCreators.modifyCompany(name, value,title,error));
+              }, 350);
+          },
+    }
+}
+
+export default connect(mapStateToProps, mapDispathToProps)(company);

src/common/popupsCompany/index.js

@@ -0,0 +1,311 @@
+import React, { PureComponent } from 'react';
+import { connect } from 'react-redux';
+import { Spin,message  } from 'antd';
+import 'antd/dist/antd.css';
+import { actionCreators } from './store';
+
+import Company from './company';
+
+const error = (msg) => {
+  message.error({
+    content: msg,
+  });
+};
+
+class popups extends PureComponent {
+
+  
+  render() {
+    const { companyDetail,loading } = this.props;
+    
+    return (
+
+      <div className="modal fade" id="detail" role="dialog" aria-hidden="true" data-backdrop="static">
+
+
+        <div className="modal-dialog modal-xl">
+          <div className="modal-content">
+            
+              <div className="dialog-sheet">
+                <button type="button" className="close" data-dismiss="modal" aria-label="Close">
+                  <span aria-hidden="true"><i className="fal fa-times"></i></span>
+                </button>
+
+
+
+                <Spin size="large" spinning={loading} >
+                <div className="sheet-box row m-0">
+                  <div className="sheet-left-panel">
+
+                  <Company />
+
+                    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                  </div>
+                  {/* <div class="sheet-right-panel col p-0">
+                  <div class="sheet-panel-tabs mx-4 mt-4">
+                    <ul class="nav nav-tabs sheet-nav-tabs" role="tablist">
+                      <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#tab-yun" role="tab" aria-selected="true">养护云造价</a></li>
+                      <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-yun2" role="tab" aria-selected="true">大司空云计价</a></li>
+                      <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-lock" role="tab" aria-selected="false">软件锁</a></li>
+                      <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-sso" role="tab" aria-selected="false">通行账号</a></li>
+                      <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-server" role="tab" aria-selected="false">服务记录</a></li>
+                    </ul>
+                    <div class="tab-content">
+                      <div class="tab-pane fade active show sheet-panel-righttop" id="tab-yun" role="tabpanel" aria-labelledby="tab-yun">
+                        <div class="slimScrol3">
+                          <table class="table">
+                            <thead>
+                              <tr>
+                                <th class="border-0"></th>
+                                <th class="border-0">产品</th>
+                                <th class="border-0">专业版</th>
+                              </tr>
+                            </thead>
+                            <tr>
+                              <td>1</td>
+                              <td>重庆养护(2018)</td>
+                              <td>已升级（<a href="#">@刘飞</a> 6月5日 13:32）<a href="#degrade-confirm" class="btn btn-xs btn-outline-danger waves-effect waves-themed" data-toggle="modal" data-target="#degrade-confirm">降级</a></td>
+                            </tr>
+                            <tr>
+                              <td>2</td>
+                              <td>广东养护(2018)</td>
+                              <td><a href="#update-confirm" class="btn btn-xs btn-outline-primary waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">升级</a></td>
+                            </tr>
+                          </table>
+                        </div>
+                      </div>
+                      <div class="tab-pane fade sheet-panel-righttop" id="tab-yun2" role="tabpanel" aria-labelledby="tab-yun">
+                        <div class="slimScrol3">
+                          <table class="table">
+                            <thead>
+                              <tr>
+                                <th class="border-0"></th>
+                                <th class="border-0">产品</th>
+                                <th class="border-0">专业版</th>
+                              </tr>
+                            </thead>
+                            <tr>
+                              <td>1</td>
+                              <td>重庆</td>
+                              <td><a href="#update-confirm" class="btn btn-xs btn-outline-primary waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">升级</a></td>
+                            </tr>
+                            <tr>
+                              <td>2</td>
+                              <td>江西</td>
+                              <td><a href="#update-confirm" class="btn btn-xs btn-outline-primary waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">升级</a></td>
+                            </tr>
+                            <tr>
+                              <td>3</td>
+                              <td>内蒙</td>
+                              <td><a href="#update-confirm" class="btn btn-xs btn-outline-primary waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">升级</a></td>
+                            </tr>
+                          </table>
+                        </div>
+                      </div>
+                      <div class="tab-pane fade sheet-panel-righttop" id="tab-lock" role="tabpanel" aria-labelledby="tab-lock">
+                        <div class="slimScrol3">
+                          <table class="table">
+                            <thead>
+                              <tr>
+                                <th class="border-0"></th>
+                                <th class="border-0">锁号</th>
+                                <th class="border-0">产品</th>
+                                <th class="border-0">状态</th>
+                                <th class="border-0">责任人</th>
+                              </tr>
+                            </thead>
+                            <tr>
+                              <td>1</td>
+                              <td><a href="#lock-detail" data-toggle="modal" data-target="#lock-detail">HNYH-0654</a></td>
+                              <td>固化清单全功能+全国专业+全国专业（新定额）</td>
+                              <td>借出</td>
+                              <td><a href="#">@刘飞</a></td>
+                            </tr>
+                            <tr>
+                              <td>2</td>
+                              <td><a href="#lock-detail" data-toggle="modal" data-target="#lock-detail">HNYH-0655</a></td>
+                              <td>+全国专业（新定额）</td>
+                              <td>借出</td>
+                              <td><a href="#">@刘飞</a></td>
+                            </tr>
+                          </table>
+                        </div>
+                      </div>
+                      <div class="tab-pane fade sheet-panel-righttop" id="tab-sso" role="tabpanel" aria-labelledby="tab-yun">
+                        <div class="slimScrol3">
+                          <table class="table">
+                            <thead>
+                              <tr>
+                                <th class="border-0"></th>
+                                <th class="border-0">手机</th>
+                                <th class="border-0">邮箱</th>
+                                <th class="border-0">QQ</th>
+                                <th class="border-0">称呼</th>
+                              </tr>
+                            </thead>
+                            <tr>
+                              <td>1</td>
+                              <td><a href="">15812345678</a></td>
+                              <td></td>
+                              <td>123456</td>
+                              <td>张三</td>
+                            </tr>
+                            <tr>
+                              <td>1</td>
+                              <td><a href="">13900623512</a></td>
+                              <td>123456@qq.com</td>
+                              <td>123456</td>
+                              <td>张三</td>
+                            </tr>
+                          </table>
+                        </div>
+                      </div>
+                      <div class="tab-pane fade sheet-panel-righttop" id="tab-server" role="tabpanel" aria-labelledby="tab-server">
+                        <div class="slimScrol3">
+                          <table class="table">
+                            <thead>
+                              <tr>
+                                <th class="border-0"></th>
+                                <th class="border-0">类型/时间</th>
+                                <th class="border-0">服务内容</th></tr>
+                            </thead>
+                            <tr>
+                              <td width="20">1</td>
+                              <td width="140"><a href="#">@陈特</a> 上门服务
+                            <br /><span class="text-muted">5月5日 14:55</span></td>
+                              <td>1-给彭工更新了软件程序，安装演示了软。2-单位彭工要考甲乙级考试，给他带了资料过去。3-表示论文发表评职称也可以随时联系我。</td>
+                            </tr>
+                            <tr>
+                              <td>2</td>
+                              <td><a href="#">@陈特</a> 上门服务
+                            <br /><span class="text-muted">5月5日 14:55</span></td>
+                              <td>1-给彭工更新了软件程序，安装演示了软。2-单位彭工要考甲乙级考试，给他带了资料过去。3-表示论文发表评职称也可以随时联系我。</td>
+                            </tr>
+                            <tr>
+                              <td>3</td>
+                              <td><a href="#">@陈特</a> 上门服务
+                            <br /><span class="text-muted">5月5日 14:55</span></td>
+                              <td>1-给彭工更新了软件程序，安装演示了软。2-单位彭工要考甲乙级考试，给他带了资料过去。3-表示论文发表评职称也可以随时联系我。</td>
+                            </tr>
+                            <tr>
+                              <td>4</td>
+                              <td><a href="#">@陈特</a> 上门服务
+                            <br /><span class="text-muted">5月5日 14:55</span></td>
+                              <td>1-给彭工更新了软件程序，安装演示了软。2-单位彭工要考甲乙级考试，给他带了资料过去。3-表示论文发表评职称也可以随时联系我。</td>
+                            </tr>
+                            <tr>
+                              <td>5</td>
+                              <td><a href="#">@陈特</a> 上门服务
+                            <br /><span class="text-muted">5月5日 14:55</span></td>
+                              <td>1-给彭工更新了软件程序，安装演示了软。2-单位彭工要考甲乙级考试，给他带了资料过去。3-表示论文发表评职称也可以随时联系我。</td>
+                            </tr>
+                            <tr>
+                              <td>6</td>
+                              <td><a href="#">@陈特</a> 上门服务
+                            <br /><span class="text-muted">5月5日 14:55</span></td>
+                              <td>1-给彭工更新了软件程序，安装演示了软。2-单位彭工要考甲乙级考试，给他带了资料过去。3-表示论文发表评职称也可以随时联系我。</td>
+                            </tr>
+                          </table>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="sheet-btns mt-3"><a href="#add-server" class="btn btn-xs btn-outline-primary" data-toggle="modal" data-target="#add-server"><i class="far fa-plus"></i> 添加服务记录</a><a href="#add-lock" class="btn btn-xs btn-outline-primary" data-toggle="modal" data-target="#add-lock"><i class="far fa-link"></i> 绑定加密锁</a></div>
+                  </div>
+                  <div class="sheet-panel-record">
+                    <ul class="nav nav-tabs nav-tabs-clean sheet-nav-tabs" role="tablist">
+                      <li class="nav-item ml-4"><a class="nav-link text-center active" data-toggle="tab" href="#tab-log" role="tab" aria-selected="true">日志</a></li>
+                    </ul>
+                    <div class="tab-content p-3">
+                      <div class="tab-pane fade active show sheet-panel-log" id="tab-log" role="tabpanel" aria-labelledby="tab-log">
+                        <div class="slimScrol4">
+                          <p><a href="#">@陈特</a> 移除 通行账号 15812345678<br /><span class="text-muted">5月5日 14:55</span></p>
+
+                          <p><a href="#">@陈特</a> 关联 通行账号 15812345678<br /><span class="text-muted">5月5日 14:55</span></p>
+
+                          <p><a href="#">@陈特</a> 将手机 15800000000 改为 15812345678；将客户 珠海纵横创新软件有限公司 改为 北京旺圣干科技有限公司<br /><span class="text-muted">5月5日 14:55</span></p>
+
+                          <p><a href="#">@陈特</a> 将客户 改为 珠海纵横创新软件有限公司<br /><span class="text-muted">5月5日 14:55</span></p>
+
+                          <p><a href="#">@陈特</a> 创建<br /><span class="text-muted">5月5日 14:55</span></p>
+
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div> */}
+
+
+
+
+
+
+
+
+                </div>
+                </Spin>
+
+
+
+
+              </div>
+
+           
+          </div>
+        </div>
+
+      </div>
+
+    );
+  }
+
+  componentDidMount() {
+    this.props.onRef(this);
+  }
+
+  handleCompanyPopups(key) {
+    const { handleCompanyPopups } = this.props;
+    handleCompanyPopups(key);
+  }
+
+}
+
+const mapStateToProps = (state) => {
+  return {
+    popupsClientId: state.getIn(['popups', 'popupsClientId']),
+    companyDetail: state.getIn(['popups', 'companyDetail']),
+    loading: state.getIn(['popups', 'loading']),
+  }
+}
+
+const mapDispathToProps = (dispatch) => {
+  return {
+    handleCompanyPopups(key) {
+      dispatch(actionCreators.changeLoading());
+      dispatch(actionCreators.getCompanyDetail(key,error));
+    },
+  }
+}
+
+export default connect(mapStateToProps, mapDispathToProps)(popups);

src/common/popupsCompany/store/actionCreators.js

@@ -0,0 +1,60 @@
+import * as constants from './constants';
+import { fromJS } from 'immutable';
+import * as config from '../../../common/config.js';
+import axios from '../../../common/axios_auth.js';
+import qs from 'qs';
+
+//获得公司详情
+export const getCompanyDetail = (key,error) => {
+    return (dispatch) => {
+        axios.get(config.CLD2API + '/contact/companyDetail/'+key).then((res) => {
+            const data = res.data;
+            if (data.code === 200) {
+                dispatch({
+                    type: constants.CHANGE_COMPANY_DETAIL,
+                    data: data.data,
+                });
+            } else {
+                error('公司详情请求失败');
+            }
+        }).catch((e) => {
+            error('公司详情请求失败');
+        })
+    }
+};
+//loading
+export const changeLoading = () => {
+    return (dispatch) => {
+        dispatch({
+            type: constants.CHANGE_COMPANYDETAIL_LOADING,
+            data: true,
+        });
+    }
+}
+//
+export const modifyCompany = (name,value,title,error) => {
+    return (dispatch) => {
+
+        let data = {
+            'field':name,
+            'value': value,
+        };
+        
+        axios.post(config.CLD2API + '/contact/modifyCompany', qs.stringify(data)).then((res) => {
+            const data = res.data;
+            if (data.code === 200) {
+                // dispatch({
+                //     type: constants.CHANGE_COMPANY_DETAIL,
+                //     data: data.data,
+                // });
+            } else {
+                error(`更新${title}失败`);
+            }
+        }).catch((e) => {
+            error(`更新${title}失败`);
+        })
+    }
+}
+
+
+

src/common/popupsCompany/store/constants.js

@@ -0,0 +1,5 @@
+export const CHANGE_COMPANY_DETAIL = 'popups/change_company_detail';
+export const CHANGE_COMPANYDETAIL_LOADING = 'popups/change_companydetail_loading';
+
+
+

src/common/popupsCompany/store/index.js

@@ -0,0 +1,5 @@
+import reducer from './reducer';
+import * as actionCreators from './actionCreators';
+import * as constants from './constants';
+
+export { reducer,actionCreators,constants }

src/common/popupsCompany/store/reducer.js

@@ -0,0 +1,56 @@
+import * as constants from './constants';
+import { fromJS } from 'immutable';
+
+
+const defaultState = fromJS({
+	popupsClientId: '',
+	companyDetail: { staffDetial: {} },
+	loading: true,
+	districtOptions: [],
+	natureOptions: [
+		{ "value": '设计', "label": "设计" }, 
+		{ "value": '造价管理', "label": "造价管理" }, 
+		{ "value": '业主', "label": "业主" }, 
+		{ "value": '交通局', "label": "交通局" }, 
+		{ "value": '公路局', "label": "公路局" }, 
+		{ "value": '审计', "label": "审计" }, 
+		{ "value": '财政', "label": "财政" }, 
+		{ "value": '审核', "label": "审核" }, 
+		{ "value": '施工', "label": "施工" }, 
+		{ "value": '咨询', "label": "咨询" }, 
+		{ "value": '招标代理', "label": "招标代理" }, 
+		{ "value": '监理', "label": "监理" }, 
+		{ "value": '学校', "label": "学校" }, 
+		{ "value": '个人', "label": "个人" }, 
+		{ "value": '合作伙伴', "label": "合作伙伴" }, 
+	],
+});
+
+export default (state = defaultState, action) => {
+
+	switch (action.type) {
+		case constants.CHANGE_COMPANY_DETAIL:
+			return state.merge({
+				loading: false,
+				companyDetail: fromJS(action.data)
+			});
+		case constants.CHANGE_COMPANYDETAIL_LOADING:
+			return state.set('loading', action.data);
+		// 	case constants.SEARCH_BLUR:
+		// 		return state.set('focused', false);
+		// 	case constants.CHANGE_LIST:
+		// 		return state.merge({
+		// 			list: action.data,
+		// 			totalPage: action.totalPage
+		// 		});
+		// 	case constants.MOUSE_ENTER:
+		// 		return state.set('mouseIn', true);
+		// 	case constants.MOUSE_LEAVE:
+		// 		return state.set('mouseIn', false);
+		// 	case constants.CHANGE_PAGE:
+		// 		return state.set('page', action.page);
+		default:
+			return state;
+	}
+
+}

src/contact/company/index.js

@@ -9,7 +9,7 @@ import 'antd/dist/antd.css';
 
 
 
-import Popups from '../../common/popups';
+import Popups from '../../common/popupsCompany';
 
 const radioStyle = {
   display: 'block',
@@ -159,7 +159,7 @@ class company extends PureComponent {
 
         </main>
 
-        <Popups mainView={'company'} onRef={(ref) => popupsObj = ref} />
+        <Popups  onRef={(ref) => popupsObj = ref} />
 
 
       </Fragment>
@@ -233,7 +233,6 @@ const mapDispathToProps = (dispatch) => {
     },
     //弹出详情页点击触发
     handleCompanyPopups(key) {
-
       popupsObj.handleCompanyPopups(key);
       // console.log(popupsObj);
       // console.log(key);

src/login/store/actionCreators.js

@@ -26,11 +26,11 @@ export const login = (parameter) => {
             'password': mdpw,
         };
         
-        let csrftoken = cookie.load('csrfToken');
+        //let csrftoken = cookie.load('csrfToken');
         axios.post(config.CLD2API + '/login', qs.stringify(data), {
             headers: {
                 //'Content-Type': 'application/x-www-form-urlencoded',
-                'x-csrf-token': csrftoken,
+                //'x-csrf-token': csrftoken,
             },
         }).then((res) => {
             const data = res.data;
@@ -40,7 +40,7 @@ export const login = (parameter) => {
                 alert('登录不正确');
             }
         }).catch((e) => {
-            console.log('error');
+            console.log(e);
         })
     }
 }