Merge branch 'dev' of http://git.ycjcjy.com/estateagents/pc-center into dev

config/defaultSettings.js

@@ -10,7 +10,7 @@ export default {
   menu: {
     locale: false,
   },
-  title: '营销云服务平台',
+  title: '渠道代理后台',
   pwa: false,
   iconfontUrl: '',
 };

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -5,12 +5,20 @@ import { connect } from 'dva';
 import router from 'umi/router';
 import HeaderDropdown from '../HeaderDropdown';
 import styles from './index.less';
+import ShowPassword from './ShowPassword'
 
 class AvatarDropdown extends React.Component {
+
+  constructor(props) {
+    super()
+    this.state = { visible: false }
+  }
+
   onMenuClick = event => {
     const { key } = event;
 
     if (key === 'logout') {
+      console.log(this.props)
       const { dispatch } = this.props;
 
       if (dispatch) {
@@ -22,9 +30,30 @@ class AvatarDropdown extends React.Component {
       return;
     }
 
+    if (key === 'updatePassword') {
+      this.setState({ visible: true })
+      return;
+    }
+
     router.push(`/account/${key}`);
   };
 
+  onCancel = (e) => {
+    this.setState({ visible: false })
+  }
+
+  onReset = (e) => {
+    const { dispatch } = this.props;
+
+      if (dispatch) {
+        dispatch({
+          type: 'login/logout',
+        });
+      }
+
+      return;
+  }
+  
   render() {
     const {
       currentUser = {
@@ -48,20 +77,26 @@ class AvatarDropdown extends React.Component {
           </Menu.Item>
         )}
         {menu && <Menu.Divider />}
-
+        <Menu.Item key="updatePassword">
+          <Icon type="key" />
+          <FormattedMessage id="menu.account.updatePassword" defaultMessage="updatePassword" />
+        </Menu.Item>   
         <Menu.Item key="logout">
           <Icon type="logout" />
           <FormattedMessage id="menu.account.logout" defaultMessage="logout" />
         </Menu.Item>
       </Menu>
     );
-    return currentUser && currentUser.name ? (
-      <HeaderDropdown overlay={menuHeaderDropdown}>
-        <span className={`${styles.action} ${styles.account}`}>
-          <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" />
-          <span className={styles.name}>{currentUser.name}</span>
-        </span>
-      </HeaderDropdown>
+    return currentUser && currentUser.userName ? (
+      <>
+        <HeaderDropdown overlay={menuHeaderDropdown}>
+          <span className={`${styles.action} ${styles.account}`}>
+            <Avatar size="small" className={styles.avatar} src={currentUser.channelImg} alt="avatar" />
+            <span className={styles.name}>{currentUser.userName}</span>
+          </span>
+        </HeaderDropdown>
+        <ShowPassword visible={this.state.visible} onCancel={(e) => this.onCancel(e)} onReset={(e => this.onReset(e))} />
+      </>  
     ) : (
       <Spin
         size="small"

src/components/GlobalHeader/RightContent.jsx

@@ -17,45 +17,7 @@ const GlobalHeaderRight = props => {
 
   return (
     <div className={className}>
-      {/* <HeaderSearch
-        className={`${styles.action} ${styles.search}`}
-        placeholder={formatMessage({
-          id: 'component.globalHeader.search',
-        })}
-        dataSource={[
-          formatMessage({
-            id: 'component.globalHeader.search.example1',
-          }),
-          formatMessage({
-            id: 'component.globalHeader.search.example2',
-          }),
-          formatMessage({
-            id: 'component.globalHeader.search.example3',
-          }),
-        ]}
-        onSearch={value => {
-          console.log('input', value);
-        }}
-        onPressEnter={value => {
-          console.log('enter', value);
-        }}
-      />
-      <Tooltip
-        title={formatMessage({
-          id: 'component.globalHeader.help',
-        })}
-      >
-        <a
-          target="_blank"
-          href="https://pro.ant.design/docs/getting-started"
-          rel="noopener noreferrer"
-          className={styles.action}
-        >
-          <Icon type="question-circle-o" />
-        </a>
-      </Tooltip> */}
       <Avatar />
-      {/* <SelectLang className={styles.action} /> */}
     </div>
   );
 };

src/layouts/BasicLayout.jsx

@@ -4,15 +4,17 @@
  * https://github.com/ant-design/ant-design-pro-layout
  */
 import ProLayout from '@ant-design/pro-layout';
-import React, { useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import Link from 'umi/link';
 import { connect } from 'dva';
+import request from '../utils/request'
 import { formatMessage } from 'umi-plugin-react/locale';
 import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
 import { isAntDesignPro } from '@/utils/utils';
 // import logo from '../assets/logo.svg';
 import logo from '../assets/logo.png';
+import apis from '../services/apis'
 
 /**
  * use Authorized check all menu item
@@ -24,29 +26,6 @@ const menuDataRender = menuList =>
   });
 
 const footerRender = (_, defaultDom) => {
-  // if (!isAntDesignPro()) {
-  //   return defaultDom;
-  // }
-
-  // return (
-  //   <>
-  //     {defaultDom}
-  //     <div
-  //       style={{
-  //         padding: '0px 24px 24px',
-  //         textAlign: 'center',
-  //       }}
-  //     >
-  //       <a href="https://www.netlify.com" target="_blank" rel="noopener noreferrer">
-  //         <img
-  //           src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"
-  //           width="82px"
-  //           alt="netlify logo"
-  //         />
-  //       </a>
-  //     </div>
-  //   </>
-  // );
   return (
     <footer className="ant-pro-global-footer">
       <div className="ant-pro-global-footer-copyright">Copyright @ 营销云</div>
@@ -55,9 +34,21 @@ const footerRender = (_, defaultDom) => {
 };
 
 const menuHeaderRender = (logo, title) => {
+  const [logoInfo, setLogoInfo] = useState([]);
+
+  useEffect(() => {
+    getLogoInfo();
+  })
+  
+  const getLogoInfo = e => {
+    request({ ...apis.image.logo }).then(data => {
+      setLogoInfo(data.channelImg)
+    })
+  }
+
   return (
     <Link to="/">
-      {logo}
+      <img src={logoInfo}/>
       {title}
     </Link>
   );
@@ -83,6 +74,9 @@ const BasicLayout = props => {
    * init variables
    */
 
+  
+
+
   const handleMenuCollapse = payload => {
     if (dispatch) {
       dispatch({

src/locales/zh-CN/menu.js

@@ -44,7 +44,8 @@ export default {
   'menu.account.trigger': '触发报错',
   'menu.account.logout': '退出登录',
   'menu.editor': '图形编辑器',
+  'menu.account.updatePassword': '修改密码',
   'menu.editor.flow': '流程编辑器',
   'menu.editor.mind': '脑图编辑器',
-  'menu.editor.koni': '拓扑编辑器',
+  'menu.editor.koni': '拓扑编辑器', 
 };

src/pages/UserManage/Editor/User.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Button, notification, Tree, message } from 'antd';
+import { Button, notification, Tree, message, Spin } from 'antd';
 import md5 from 'md5';
 import moment from 'moment';
 import router from 'umi/router';
@@ -178,6 +178,7 @@ export default props => {
       message.error('维护项目数量必须大于0')
       return
     }
+    
     setSubmitting(true)
     if (user && user.userId) {
       updateUser({ urlData: { id: user.userId }, data }).then((user) => {
@@ -204,5 +205,6 @@ export default props => {
     }
   }
 
-  return (<XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} submitting={submitting}></XForm>)
+  return (
+  <><Spin spinning={ submitting } size="large"><XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} submitting={submitting}></XForm></Spin></>)
 }

src/pages/UserManage/index.jsx

@@ -7,6 +7,7 @@ import className from 'classnames';
 import Cell from '../../components/Cell';
 import Style from './style.less';
 import { fetch, apis } from '../../utils/request';
+import PasswordText from './passwordText';
 
 const { Meta } = Card;
 
@@ -51,6 +52,24 @@ export default (props) => {
     }))
   }
 
+  /**
+   *回调事件
+   *
+   */
+  function onModalChange() {
+    // getList()
+    // setVisibleData({ visible: false, userId: '', oldPassword:'', newPassword: '', confirmPassword: '' })
+  }
+
+  /**
+   *打开编辑页
+   *
+   * @param {*} record
+   */
+  const editPassword = (record) => () => {
+    setVisibleData({ visible: true, userId: record.userId, oldPasswod: '', newPassword: '', confirmPassword: '',submitting:submitting})
+  }
+
   const CardBody = (cbProps) => {
     const handleSwitch = (on) => () => {
       if (!on) {
@@ -85,7 +104,9 @@ export default (props) => {
         <div>
           <ABCol header={'联系人'}>{cbProps.userName}</ABCol>
           <ABCol header={'手机号'}>{cbProps.phone}</ABCol>
-          <ABCol header={'服务到期时间'}>{cbProps.expData ? moment(cbProps.expData).format('YYYY-MM-DD') : <Warn>未设置</Warn>}</ABCol>
+          <ABCol header={'服务到期时间'}>{cbProps.expireDate ? moment(cbProps.expireDate).format('YYYY-MM-DD') : <Warn>未设置</Warn>}</ABCol>
+          <ABCol header={'所有用户'}>{cbProps.userCount}</ABCol>
+          <ABCol header={'注册用户'}>{cbProps.registeredCount}</ABCol>
         </div>
       </>
     )
@@ -133,6 +154,7 @@ export default (props) => {
   }
 
   return (
+    <>
     <PageHeaderWrapper extra={<Button type="primary" icon="plus" onClick={createUser}>新建</Button>}>
       <div className={Style['flex-box']}>
         {
@@ -170,5 +192,7 @@ export default (props) => {
         onShowSizeChange={handleSizeChange}
       />
     </PageHeaderWrapper>
+    <PasswordText visibleData={visibleData} key="PasswordText" onSuccess={() => onModalChange()}/>
+    </>
   )
 }

src/services/apis.js

@@ -19,6 +19,11 @@ const apis = {
       action: 'center',
       logout: true
     },
+    changePassword: {
+      url: `${prefix}/changePassword`,
+      method: 'POST',
+      action: 'center'
+    }
   },
   member: {
     list: {
@@ -90,6 +95,11 @@ const apis = {
       method: 'POST',
       action: 'center',
     },
+    logo: {
+      url: `${prefix}/logo`,
+      method: 'GET',
+      action: 'center',
+    },
   },
   dict: {
     tplType: {

src/utils/request.js

@@ -35,10 +35,10 @@ const replaceURLParams = (url, params = {}) => {
 request.interceptors.request.use((url, options) => {
   const { urlData, headers = {}, logout = false, login = false, action, data, ...opts } = options
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
-  const token = mixStr(window.localStorage.getItem('test-foobar'))
+  const token = mixStr(window.localStorage.getItem('test-foobar-center'))
 
   if (login || logout) {
-    window.localStorage.removeItem('test-foobar')
+    window.localStorage.removeItem('test-foobar-center')
   }
 
   const authHeader = !login ? { Authorization: `Bearer ${token}` } : {}
@@ -71,7 +71,7 @@ request.interceptors.response.use(async (response, options) => {
       const errorText = codeMessage[response.status] || response.statusText;
       const { status, url } = response;
       notification.error({
-        message: `请求错误 ${status}: ${url}`,
+        message: `请登录系统 ${status}: ${url}`,
         description: errorText,
       });
       throw new Error(response.statusText);
@@ -85,22 +85,22 @@ request.interceptors.response.use(async (response, options) => {
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         if (code === 1001) {
-          notification.error({
-            message: `请求错误`,
-            description: '请登录系统',
-          });
-          throw new Error('请登录系统');
+          // notification.error({
+          //   message: `请登录系统`,
+          //   // description: '请登录系统',
+          // });
+          // throw new Error('请登录系统');
         } else {
           notification.error({
-            message: `请求错误`,
-            description: message,
+            message: message,
+            // description: message,
           });
           throw new Error(message);
         }
       }
 
       if (data && data.token) {
-        window.localStorage.setItem('test-foobar', mixStr(data.token))
+        window.localStorage.setItem('test-foobar-center', mixStr(data.token))
       }
 
       return data;

src/utils/upload.js

@@ -1,7 +1,7 @@
 import { fetch, apis } from './request';
 import mixStr from './mixStr';
 
-const getToken = () => mixStr(window.localStorage.getItem('test-foobar'))
+const getToken = () => mixStr(window.localStorage.getItem('test-foobar-center'))
 
 const uploadImage = fetch(apis.image.upload)