Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

config/routes.js

@@ -27,23 +27,7 @@ export default [
             path: '/welcome',
             name: 'welcome',
             icon: 'smile',
-            component: './Welcome',
-          },
-          {
-            path: '/admin',
-            name: 'admin',
-            icon: 'crown',
-            component: './Admin',
-            authority: ['admin'],
-            routes: [
-              {
-                path: '/admin/sub-page',
-                name: 'sub-page',
-                icon: 'smile',
-                component: './Welcome',
-                authority: ['admin'],
-              },
-            ],
+            component: './welcome',
           },
           {
             path: '/building',

src/pages/Welcome.jsx

@@ -1,73 +0,0 @@
-import React, { useEffect } from 'react';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import { Card, Typography, Alert } from 'antd';
-import styles from './Welcome.less';
-
-const CodePreview = ({ children }) => (
-  <pre className={styles.pre}>
-    <code>
-      <Typography.Text copyable>{children}</Typography.Text>
-    </code>
-  </pre>
-);
-
-export default (props) => {
-  // console.log('--------welcome-----', JSON.stringify(props))
-  // useEffect(() => {
-  //   console.log('------useEffect-------')
-  // }, [])
-  
-  return (
-    <PageHeaderWrapper>
-      <Card>
-        <Alert
-          message="umi ui 现已发布，点击右下角 umi 图标即可使用"
-          type="success"
-          showIcon
-          banner
-          style={{
-            margin: -12,
-            marginBottom: 24,
-          }}
-        />
-        <Typography.Text strong>
-          <a target="_blank" rel="noopener noreferrer" href="https://pro.ant.design/docs/block">
-            <FormattedMessage
-              id="app.welcome.link.block-list"
-              defaultMessage="基于 block 开发，快速构建标准页面"
-            />
-          </a>
-        </Typography.Text>
-        <CodePreview> npm run ui</CodePreview>
-        <Typography.Text
-          strong
-          style={{
-            marginBottom: 12,
-          }}
-        >
-          <a
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://pro.ant.design/docs/available-script#npm-run-fetchblocks"
-          >
-            <FormattedMessage id="app.welcome.link.fetch-blocks" defaultMessage="获取全部区块" />
-          </a>
-        </Typography.Text>
-        <CodePreview> npm run fetch:blocks</CodePreview>
-      </Card>
-      <p
-        style={{
-          textAlign: 'center',
-          marginTop: 24,
-        }}
-      >
-        Want to add more pages? Please refer to{' '}
-        <a href="https://pro.ant.design/docs/block-cn" target="_blank" rel="noopener noreferrer">
-          use block
-        </a>
-        。
-      </p>
-    </PageHeaderWrapper>
-  )
-};

src/pages/Welcome.less

@@ -1,8 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.pre {
-  margin: 12px 0;
-  padding: 12px 20px;
-  background: @input-bg;
-  box-shadow: @card-shadow;
-}

src/pages/staff/Organization/form.jsx

@@ -180,9 +180,9 @@ const TreedataFrom = React.forwardRef((props, ref) => {
         <Button type="primary" htmlType="submit" style={{ marginLeft: '80px', marginTop: '30px' }}>
           修改
         </Button>
-        <Button type="danger">
+        {/* <Button type="danger">
           删除
-        </Button>
+        </Button> */}
       </FormItem>
     </Form>
   )

src/pages/staff/Organization/index.jsx

@@ -1,61 +1,23 @@
 
 import { Row, Col, Card, Tree, Form, TreeSelect, Input, InputNumber, Modal, Button, message } from 'antd'
+import React, { useState, useEffect } from 'react';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 import moment from 'moment';
-// import React, { useEffect, useState, useCallback,useRef } from 'react';
 import TreedataFrom from './form';
-
 const { TreeNode, DirectoryTree } = Tree;
 const FormItem = Form.Item;
-
-//-----------------------------------
-const onAdd = (key) => {
-  if (expandedKeys.indexOf(key) === -1) {
-    expandedKeyArr.push(key);
-  }
-  expandedKeys(expandedKeyArr.slice());
-  addNode(key, treeData);//添加节点 树形
-  setData(treeData.slice());//添加子项
-};
-//-----------------------------------
-const confirm = data => {
-  // {...data,isPublish}
-  if (data.key !== 0) {
-    Modal.confirm({
-      title: '确认删除吗？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        message.error('失败');
-
-      },
-    });
-  } else {
-    message.error('error')
-  }
-}
-
-
-// function uuid() {
-//   var s = [];
-//   var hexDigits = "0123456789";
-//   for (var i = 0; i < 18; i++) {
-//       s[i] = hexDigits.substr(Math.floor(Math.random() * 1*10), 1);
-//   }
-
-//   var uuid = s.join("");
-//   return uuid;
-// }
-// import moment from 'moment';
-
+const { Search } = Input;
 
 const treeData =
   [
     {
-      title: '分厂厂长管理',
-      key: '0',
+      title: 'institutionId',
+      name: 'institutionName',
+      key: '0-0-0',
       selectable: false,
       children: [
-        { title: '郎岩', phone: '15920583224', remark: "", day: "1992-11-13", cardId: '511502199103223189', sex: 1, id: '0212', belon: 1, homeaddres: 1, key: '0-0-0-1' },//这个不行么 你写错了 你那是v4的写法在哪？刚刚那个啊。对
+        { name: 'institutionName', phone: '13184013427', remark: "", day: "1991-11-22", cardId: '210203197503102721', sex: 2, id: '4242', belon: 2, homeaddres: 2, key: '0-0-0-1', },
         { title: '柯琼彦', phone: '13184013427', remark: "", day: "1991-11-22", cardId: '210203197503102721', sex: 2, id: '4242', belon: 2, homeaddres: 2, key: '0-0-0-2', },
       ],
     },
@@ -74,22 +36,23 @@ const treeData =
 
 
 
-// const item = this.info.node.key 不是！！！！
+// const item = this.info.node.key 
 
 class TreeDemo extends React.Component {
   formRef = React.createRef();
 
-
   constructor(props) {
     super(props)
     this.state = {
       expandedKeys: ['0-0-0', '0-0-1'],
       autoExpandParent: false,
       checkedKeys: ['0-0-0'],
+      searchValue: '',
       selectedKeys: [],
       // treeTitle: [info.node.props],
       checked: true,
-      treeData: treeData
+      treeData: [],
+      testarr: []
     };
   }
 
@@ -112,14 +75,12 @@ class TreeDemo extends React.Component {
     console.log(valeu);
   };
 
-
+  //修改
   onChangethis = (value) => {
 
     const treeData = this.state.treeData
-
     let Data1 = this.state.treeData
     for (var i = 0; i < treeData.length; i++) {
-
       for (var j = 0; j < treeData[i].children.length; j++) {
         // console.log(Data1[i].children[j].key);
         // console.log("---------")
@@ -133,8 +94,13 @@ class TreeDemo extends React.Component {
           break
         }
       }
-
     }
+    this.setState({
+      treeData1: Data1
+    }, () => {
+      message.success('修改成功！')
+    })
+
   }
   //删除
   onDelect = (value) => {
@@ -173,8 +139,7 @@ class TreeDemo extends React.Component {
         key: info.node.props.eventKey,//event
         day: moment(info.node.props.day)
       })
-
-      console.log(values, info)
+      console.log(this.getTreeData)
 
       // moment(info.node.props.day).format('YYYY-MM-DD')
     })
@@ -182,6 +147,77 @@ class TreeDemo extends React.Component {
 
 
 
+  // getTreeData = (e) => {
+  //   request({
+  //     url: "http://localhost:8000/api/admin/institution/list",
+  //     method: 'GET',
+
+  //     // params: {leveltype: 3, cityId},
+  //     action: "admin.institution.get",
+  //   }).then((treeData) => {
+  //     setData(treeData)
+  //     console.log(this.getTreeData)
+  //   })
+  // }
+
+
+
+
+
+
+  async institutionTree(params) {
+    let arr = []
+
+    return request('/api/admin/institution/list', {
+      method: 'GET',
+      data: params,
+    }).then((testarr2) => {
+      this.setState({ testarr: testarr2 }, () => {
+        console.log("testarr2")
+        console.log(this.state.testarr)
+        // title: 'institutionId',
+        // name: 'institutionName',
+        // key: '0-0-0',
+        const arr2 = this.state.testarr
+        for (var i = 0; i < this.state.testarr.length; i++) {
+          let list = {
+            title: 'institutionId',
+            name: 'institutionName',
+            key: '0-0-0'
+          }
+          list.title = arr2[i].institutionName
+          list.key = '0' + i.toString
+          arr.push(list)
+
+        }
+
+        this.setState({
+          treeData: arr
+        })
+
+      })
+      // console.log(this.getTreeData)
+    })
+  }
+
+  componentDidMount() {
+    // fetch(`http://localhost:8000/api/admin/institution/list`, {
+    //   headers: {
+    //     Authorization: "Bearer eyJhbGciOiJIUzI1NiJ9.eyJ1c2VySWQiOiIxIiwib3JnSWQiOiIxIiwiZXhwIjoxNjI3MDQ1MjQxfQ.7FhVDoI0dEECZinRUzMzcLl-kcobkamZSqoUzTxBTRo"
+    //   }
+    // }).then((res) => {
+    //   console.log(res)
+    // }),
+    // this.institutionTree()
+    this.institutionTree([])
+
+  }
+
+
+
+
+
+
 
   renderTreeNodes = data =>
     data.map(item => {
@@ -194,11 +230,29 @@ class TreeDemo extends React.Component {
       }
       return <TreeNode key={item.key} {...item} />;
     });
+  //搜索框 
+  // onChange = e => {
+  //   const { value } = e.target;
+  //   const expandedKeys = treeData
+  //     .map(item => {
+  //       if (item.title.indexOf(value) > -1) {
+  //         return getParentKey(item.key, gData);
+  //       }
+  //       return null;
+  //     })
+  //     .filter((item, i, self) => item && self.indexOf(item) === i);
+  //   this.setState({
+  //     expandedKeys,
+  //     searchValue: value,
+  //     autoExpandParent: true,
+  //   });
+  // };
 
 
 
-  render() {
 
+  render() {
+    const { searchValue } = this.state;
     return (
       <Card>
         <Row >
@@ -207,22 +261,18 @@ class TreeDemo extends React.Component {
               <FormItem
                 label="管辖部门"
               >
-                <Button type="primary" onClick={onAdd} >
-                  增加
-                </Button>
-
+                {/* <Search style={{ marginBottom: 8 }} placeholder="Search" onChange={this.onChange} /> */}
                 <Tree
-
+                  // api={apis.Institution.instIist}
                   showLine
-                  // switcherIcon={<DownOutlined />}
-                  defaultExpandedKeys={['0-0-0']}
+                  defaultExpandedKeys={['0-0']}
                   onSelect={this.onSelect}
                   treeData={this.state.treeData}
+                // api={apis.Institution.instIist} 
                 >
                   {this.renderTreeNodes(this.state.treeData)}
                   {/* 动态渲染 */}
                 </Tree >
-                {/* 不加入生命周期不会有更改a */}
               </FormItem>
             </Card>
           </Col>
@@ -233,6 +283,8 @@ class TreeDemo extends React.Component {
                 triggerRef={this.bindRef}
                 onChangethis={this.onChangethis}
                 onSubmit={this.onChangethis}
+
+
               />
             </Card>
           </Col>

src/pages/user/login/index.jsx

@@ -40,27 +40,32 @@ const LoginForm = React.forwardRef((props, ref) => {
   }
 
   return (
-    <div className={styles.main}>
-      <div></div>
-      <div>
-        <Form onSubmit={handleSubmit}>
-          <Form.Item label="用户名" {...formItemLayout} colon={false}>
-            {getFieldDecorator('loginName', {
-              rules: [{ required: true, message: '请输入用户名' }]
-            })(<Input />)}          
-          </Form.Item>
-          <Form.Item label="密 码" {...formItemLayout} colon={false}>
-            {getFieldDecorator('loginPassword', {
-              rules: [{ required: true, message: '请输入密码' }]
-            })(<Input.Password visibilityToggle={false}/>)}          
-          </Form.Item>
+    <div className={styles['login-form-wapper']}>
+      <div className={styles.main}>
+        <div className={styles['login-wedget']}>
+          <h3>欢迎来到新联宝</h3>
+          <img src="http://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/login-wedget.png" alt="" />
+        </div>
+        <div className={styles['login-form']}>
+          <Form onSubmit={handleSubmit}>
+            <Form.Item label="用户名" {...formItemLayout} colon={false}>
+              {getFieldDecorator('loginName', {
+                rules: [{ required: true, message: '请输入用户名' }]
+              })(<Input />)}          
+            </Form.Item>
+            <Form.Item label="密 码" {...formItemLayout} colon={false}>
+              {getFieldDecorator('loginPassword', {
+                rules: [{ required: true, message: '请输入密码' }]
+              })(<Input.Password visibilityToggle={false}/>)}          
+            </Form.Item>
 
-          <Button
-            loading={loading}
-            htmlType="submit"
-            className={styles['login-form-button']}
-          >登录</Button>
-        </Form>
+            <Button
+              loading={loading}
+              htmlType="submit"
+              className={styles['login-form-button']}
+            >登录</Button>
+          </Form>
+        </div>
       </div>
     </div>
   )

src/pages/user/login/style.less

@@ -1,85 +1,118 @@
 @import '~antd/es/style/themes/default.less';
 
-.main {
-  width: 840px;
-  margin: 20vh auto 0;
-  background: rgba(17, 40, 81, 0.41);
-  box-shadow: 0px 8px 38px 0px rgba(4, 0, 0, 0.12);
-  border-radius: 24px;
-  box-sizing: border-box;
-  padding: 87px 0 120px;
-  display: flex;
-  @media screen and (max-width: @screen-sm) {
-    width: 95%;
-  }
-
-  & > div {
-    flex: none;
-    width: 50%;
-  }
-
-  .icon {
-    margin-left: 16px;
-    color: rgba(0, 0, 0, 0.2);
-    font-size: 24px;
-    vertical-align: middle;
-    cursor: pointer;
-    transition: color 0.3s;
+.login-form-wapper {
+  position: absolute;
+  width: 100vw;
+  height: 100vh;
+  top: -32px;
+  background: url(http://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/login-background.png) no-repeat;
+  background-size: 100% 100%;
 
-    &:hover {
-      color: @primary-color;
+  .main {
+    width: 840px;
+    margin: 20vh auto 0;
+    background: rgba(17, 40, 81, 0.41);
+    box-shadow: 0px 8px 38px 0px rgba(4, 0, 0, 0.12);
+    border-radius: 24px;
+    box-sizing: border-box;
+    padding: 87px 0 80px;
+    display: flex;
+    @media screen and (max-width: @screen-sm) {
+      width: 95%;
     }
-  }
-
-  .other {
-    margin-top: 24px;
-    line-height: 22px;
-    text-align: left;
 
-    .register {
-      float: right;
+    & > div {
+      flex: none;
+      width: 50%;
+      box-sizing: border-box;
     }
-  }
 
-  .login-form-button {
-    width: 100%;
-    font-size: 18px;
-    line-height: 48px;
-    height: 48px !important;
-    color: #fff !important;
-    background: #1548B6 !important;
-    border-radius: 48px;
-    border: none !important;
-  }
+    .login-wedget {
+      text-align: center;
+
+      h3 {
+        color: #f8f8f8;
+        font-size: 24px;
+        line-height: 52px;
+      }
 
-  :global {
-    .ant-form {
-      width: 260px;
-      margin-left: 60px;
+      img {
+        width: 300px;
+        display: block;
+        margin: 0 auto;
+      }
     }
 
-    .ant-form-item {
-      border-bottom: 2px solid #fff;
+    .login-form {
+      background: url('@/assets/login/light.png') no-repeat;
+      background-size: auto 100%;
+      padding-top: 30px;
     }
 
-    .ant-form-item-label > label {
-      color: #fff;
+    .icon {
+      margin-left: 16px;
+      color: rgba(0, 0, 0, 0.2);
+      font-size: 24px;
+      vertical-align: middle;
+      cursor: pointer;
+      transition: color 0.3s;
+
+      &:hover {
+        color: @primary-color;
+      }
     }
 
-    .ant-input {
-      color: #fff;
-      border: none;
-      background: transparent;
-      outline: none;
+    .other {
+      margin-top: 24px;
+      line-height: 22px;
+      text-align: left;
 
-      &:focus {
-        box-shadow: none;
+      .register {
+        float: right;
       }
     }
 
-    .antd-pro-login-submit {
+    .login-form-button {
       width: 100%;
-      margin-top: 24px;
+      font-size: 18px;
+      line-height: 48px;
+      height: 48px !important;
+      color: #fff !important;
+      background: #1548B6 !important;
+      border-radius: 48px;
+      border: none !important;
+      margin-top: 50px;
+    }
+
+    :global {
+      .ant-form {
+        width: 260px;
+        margin-left: 60px;
+      }
+
+      .ant-form-item {
+        border-bottom: 2px solid #fff;
+      }
+
+      .ant-form-item-label > label {
+        color: #fff;
+      }
+
+      .ant-input {
+        color: #fff;
+        border: none;
+        background: transparent;
+        outline: none;
+
+        &:focus {
+          box-shadow: none;
+        }
+      }
+
+      .antd-pro-login-submit {
+        width: 100%;
+        margin-top: 24px;
+      }
     }
   }
 }

src/pages/welcome/components/IconText/index.jsx

@@ -0,0 +1,18 @@
+import React from 'react'
+import styles from './style.less'
+
+const noop = x => x
+
+export default (props) => {
+  const { name, onClick = noop } = props
+  const file = require(`@/assets/welcome/icon-${name}.png`)
+
+  return (
+    <div className={styles['icon-text']} onClick={onClick}>
+      <img src={file} alt="" className={styles['icon-img']} />
+      <div>
+        {props.children}
+      </div>
+    </div>
+  )
+}

src/pages/welcome/components/IconText/style.less

@@ -0,0 +1,16 @@
+.icon-text {
+  color: #fff;
+  font-size: 25px;
+  line-height: 35px;
+  letter-spacing: 3px;
+  font-weight: bold;
+  display: inline-block;
+  box-sizing: border-box;
+
+  .icon-img {
+    width: 88px;
+    height: 88px;
+    display: block;
+    border: none;
+  }
+}

src/pages/welcome/index.jsx

@@ -0,0 +1,70 @@
+import React, { useCallback, useEffect, useState } from 'react';
+// import { Row, Col } from 'antd'
+import Link from 'umi/link'
+import IconText from './components/IconText'
+import styles from './style.less';
+
+export default (props) => {
+  const [containerStyle, setContainerStyle] = useState({})
+
+  const computeStyle = useCallback(() => {
+    const body = document.body
+    const header = document.getElementsByClassName('ant-pro-global-header')[0]
+
+    const style = {
+      width: header.offsetWidth,
+      height: body.offsetHeight - header.offsetHeight,
+    }
+
+    setContainerStyle(style)
+  }, [setContainerStyle])
+
+  useEffect(() => {
+    computeStyle()
+
+    window.addEventListener('resize', computeStyle)
+    return () => window.removeEventListener('resize', computeStyle)
+  }, [computeStyle])
+  
+  return (
+    <div className={styles.welcome} style={containerStyle}>
+      <div className={styles['action-list']}>
+        <div>
+          <Link to="/building/list">
+            <IconText name='building'>项目列表</IconText>
+          </Link>
+        </div>
+
+        <div>
+          <Link to="/statistical/consultant">
+            <IconText name='kpi'>置业顾问KPI</IconText>
+          </Link>
+        </div>
+        
+        <div>
+          <Link to="/statistical/activity">
+            <IconText name='activity'>活动统计</IconText>
+          </Link>
+        </div>
+        
+        <div>
+          <Link to="/customer/customer/list">
+            <IconText name='customer'>客户列表</IconText>
+          </Link>
+        </div>
+        
+        <div>
+          {/* <Link to="/customer/customer/list"> */}
+            <IconText name='report'>数据报表</IconText>
+          {/* </Link> */}
+        </div>
+        
+        <div>
+          {/* <Link to="/customer/customer/list"> */}
+            <IconText name='channel'>渠道统计</IconText>
+          {/* </Link> */}
+        </div>
+      </div>
+    </div>
+  )
+};

src/pages/welcome/style.less

@@ -0,0 +1,22 @@
+@import '~antd/lib/style/themes/default.less';
+
+.welcome {
+  background: url(https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/background.png) no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  left: -24px;
+  top: -24px;
+
+  .action-list {
+    display: flex;
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 200px;
+
+    & > div {
+      flex: auto;
+      text-align: center;
+    }
+  }
+}

src/services/apis.js

@@ -1079,6 +1079,34 @@ export default {
       action: 'admin.channel.introductionList.personNumListExport.get',
     },
   },
+  //组织架构
+  Institution: {
+    instIist: {
+      url: `${prefix}/institution/list`,
+      method: 'GET',
+      action: 'admin.institution.get'
+    },
+    instSave: {
+      url: `${prefix}/institution/save`,
+      method: 'POST',
+      action: 'admin.institution.post'
+    },
+    instiDelete: {
+      url: `${prefix}/institution/:id`,
+      method: 'DELETE',
+      action: 'admin.institution.id.delete',
+    },
+    instiSearch: {
+      url: `${prefix}/institution/:id`,
+      method: 'GET',
+      action: 'admin.institution.id.get',
+    },
+    instiAlert: {
+      url: `${prefix}/institution/:id`,
+      method: 'PUT',
+      action: 'admin.institution.id.put',
+    }
+  },
   role: {
     getRoleList: {
       url: `${prefix}/taRole`,

src/utils/request.js

@@ -46,8 +46,8 @@ request.interceptors.request.use((url, options) => {
 
   return (
     {
-      url: 'https://xlk.njyz.tech' + apiURL,
-      // url: apiURL,
+      // url: 'https://xlk.njyz.tech' + apiURL,
+      url: apiURL,
       options: {
         ...opts,
         headers: {