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

src/pages/UserManage/CitySelect.jsx

@@ -20,7 +20,7 @@ const CitySelect = (props) => {
 
   const getCityList = (e) => {
     request({
-        url: '/api/admin/tdCity',
+        url: '/api/center/tdCity',
         method: 'GET',
         params: {leveltype: 2, pageNum: 1,pageSize: 999},
         action: 'select',

src/pages/UserManage/Editor/User.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Button, notification, Tree } from 'antd';
+import { Button, notification, Tree, message } from 'antd';
 import md5 from 'md5';
 import moment from 'moment';
 import router from 'umi/router';
@@ -112,9 +112,8 @@ export default props => {
       label: '维护城市',
       name: 'cityId',
       rules: [
-        { required: true, message: '维护城市' },
+        { required: false, message: '维护城市' },
       ],
-      value: user.orgNum,
       render: row=> <Tree
         checkable
         // 展开指定节点
@@ -130,7 +129,7 @@ export default props => {
         <TreeNode title={item.name} key={item.id}>
            {item.children.map(itemCity => (
             <TreeNode
-                title={<span style={{ color: '#1890ff' }}>{itemCity.shortname}</span>}
+                title={<span style={{ color: '#1890ff' }}>{itemCity.name}</span>}
                 key={itemCity.id}
               />
           ))}
@@ -153,7 +152,7 @@ export default props => {
     {
       label: '维护项目数量',
       name: 'orgNum',
-      type: FieldTypes.Text,
+      type: FieldTypes.Number,
       rules: [
         { required: true, message: '请输入维护项目数量' },
       ],
@@ -167,9 +166,16 @@ export default props => {
       loginName: val.loginName || val.phone,
       loginPassword: md5(defaultPass),
     }
+    if (selectCityTree.length <= 0) {
+      message.error('维护城市必须存在一个')
+      return
+    }
 
     const data = { ...user, ...dt, selectCityTree }
-    console.log('datadatadatadata', data)
+    if (data.orgNum <= 0) {
+      message.error('维护项目数量必须大于0')
+      return
+    }
     setSubmitting(true)
     if (user && user.userId) {
       updateUser({ urlData: { id: user.userId }, data }).then((user) => {

src/pages/UserManage/index.jsx

@@ -96,11 +96,17 @@ export default (props) => {
   }
 
   const handleSizeChange = e => {
-
   }
 
   const handlePageChange = e => {
-
+    getMembers({ params: { pageNum: e, pageSize: pageNavi.pageSize } }).then((dt) => {
+      const { records, ...pagenavi } = dt || {};
+      setMembers(records);
+      setPageNavi({
+        ...pageNavi,
+        ...pagenavi
+      })
+    }).catch()
   }
 
   const gotoDetail = (member, tab) => () => {