Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

src/components/TableShow/TableShow.tsx

@@ -38,8 +38,8 @@ const TableShow = (props: any) => {
 
   const key = objectColumns([
     ['User Name', 'owner_family_name'],
-    ['Contact Details', 'owner_family_phone'],
-    ['Email', 'owner_family_email'],
+    ['Contact Details', 'owner_family_phone', (text: string, record: any) => text || '--'],
+    ['Email', 'owner_family_email', (text: string, record: any) => text || '--'],
     [
       'User Type',
       null,
@@ -51,8 +51,8 @@ const TableShow = (props: any) => {
     ],
     [
       'status',
-      null,
-      (text: any, record: any) => <Space size="middle">{user_type_status[record.enable]}</Space>,
+      'status',
+      (text: number, record: any) => <Space size="middle">{user_type_status[text]}</Space>,
     ],
     [
       'Actions',

src/components/TagSelect/index.jsx

@@ -59,6 +59,7 @@ class TagSelect extends React.Component {
     let { value } = this.state;
     if (!inputValue.trim()) {
       message.error('Not Null!!!');
+      this.setState({ inputVisible: false });
       return;
     }
 
@@ -130,6 +131,8 @@ class TagSelect extends React.Component {
               closable={index !== 0 && index !== 1}
               onClose={(e) => this.handleClose(tag, e)}
               visible={true}
+              color={index === 0 || index === 1 ? 'blue' : ''}
+              style={index === 1 ? { marginBottom: 40 } : ''}
             >
               <span
                 onDoubleClick={(e) => {
@@ -145,7 +148,14 @@ class TagSelect extends React.Component {
               </span>
             </Tag>
           );
-          return isLongTag ? (
+          //   return
+
+          return index === 0 || index === 1 ? (
+            <div style={{ marginBottom: 20 }}>
+              {tagElem}
+              <br />
+            </div>
+          ) : isLongTag ? (
             <Tooltip title={tag} key={tag}>
               {tagElem}
             </Tooltip>

src/models/CommunityManagement/User.ts

@@ -98,7 +98,7 @@ export default {
       if (resp.code == 500 || resp.error_code != '0000') {
         // message.error("Server Error,try again,error code:500",3)
         // window.location.href = '/500';
-        console.log();
+        message.error(resp.msg);
       }
 
       if (resp.error_code != '0000') {

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -301,7 +301,7 @@ const UsersDetail = (props: any) => {
                 titleBack={titleBackCallBack}
               ></TitleBack>
               <Row>
-                <Col span={4}>User Type</Col>
+                <Col span={4}>User Type：</Col>
                 <Col span={4}>
                   {memberData.owner_relationship != null
                     ? user_status[memberData.owner_relationship - 1][1]
@@ -309,13 +309,13 @@ const UsersDetail = (props: any) => {
                 </Col>
               </Row>
               <Row gutter={16}>
-                <Col span={4}>User Name</Col>
-                <Col span={4}>{memberData.ower_name}</Col>
+                <Col span={4}>User Name：</Col>
+                <Col span={4}>{memberData.owner_family_name}</Col>
               </Row>
               <Row gutter={16}>
-                <Col span={4}>Contact Detail</Col>
-                <Col span={4}>{memberData.ower_phone}</Col>
-                <Col span={4}>{memberData.ower_email}</Col>
+                <Col span={4}>Contact Detail：</Col>
+                <Col span={4}>{memberData.owner_family_phone}</Col>
+                <Col span={4}>{memberData.owner_family_email}</Col>
               </Row>
               <Line></Line>
 

src/pages/UserManagement/ServiceProviderManagement/Guard.tsx

 import React, { useState, useEffect } from 'react';
 import styles from './Guard.less';
-import { Input, Menu, Table, Space, Pagination, Tooltip, Button } from 'antd';
-
+import { Modal, Button } from 'antd';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
+const { confirm } = Modal;
 import { Link, useIntl, connect, Dispatch } from 'umi';
 
 import Line from '../../../components/Line/Line';
@@ -16,9 +17,19 @@ const Guard = (props: any) => {
 
   // 删除保安
   const handleClickBtn = (id: string) => {
-    dispatch({
-      type: 'ServiceProvider/DelGuarder',
-      playload: { id },
+    confirm({
+      title: 'Do you Want to delete these items?',
+      icon: <ExclamationCircleOutlined />,
+      content: 'Some descriptions',
+      onOk() {
+        dispatch({
+          type: 'ServiceProvider/DelGuarder',
+          playload: { id },
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
     });
   };
 
@@ -30,7 +41,9 @@ const Guard = (props: any) => {
       <div className={styles.item0_1}>Status：Normal</div>
       <div className={styles.item0_1}>
         Registration Date：
-        {/* {timestampToTime(CurDataFollowDetail.createTime.time)} */}
+        {CurDataFollowDetail.createTime !== null
+          ? timestampToTime(CurDataFollowDetail.createTime.time)
+          : ''}
       </div>
       <div className={styles.item2}>
         <BackButton />
@@ -47,9 +60,9 @@ const Guard = (props: any) => {
 
       <div className={styles.item1}>Contact Details</div>
       <div className={styles.item1_1}>{CurDataFollowDetail.saferPhone}</div>
-      <div className={styles.item1} style={{ marginLeft: 32, width: 40 }}>
-        Email
-      </div>
+      <div className={styles.clear1}></div>
+
+      <div className={styles.item1}>Email</div>
       <div className={styles.item1_1}>{CurDataFollowDetail.saferEmail}</div>
       <div className={styles.clear1}></div>
 

src/pages/UserManagement/ServiceProviderManagement/Services.less

@@ -2,40 +2,45 @@
 
 //基石
 .base {
-    width: 100%;
-    background-color: #ffffff;
-    padding: 34px;
-    min-width: 1020px;
+  width: 100%;
+  background-color: #ffffff;
+  padding: 34px;
+  min-width: 1020px;
 }
 
-.item0{
-    float: left;
+.item0 {
+  float: left;
 }
-.item0_1{
-    float: left;
-    line-height: 32px;
-    margin-left: 38px;
+.item0_1 {
+  float: left;
+  line-height: 32px;
+  margin-left: 38px;
 }
-.item1{
-    float: left;
-    width: 120px;
+.item1 {
+  float: left;
+  width: 120px;
 }
-.item1_1{
-    float: left;
-    margin-left: 16px;
+.item1_1 {
+  float: left;
+  margin-left: 16px;
 }
-.item2{
-    float: right;
+.item2 {
+  float: right;
 }
 
-.clear{
-    clear: both;
+.clear {
+  clear: both;
 }
-.clear0{
-    .clear();
-    margin-bottom: 35px;
+.clear0 {
+  .clear();
+  margin-bottom: 35px;
+}
+.clear1 {
+  .clear();
+  margin-bottom: 16px;
+}
+.title {
+  position: absolute;
+  top: 185px;
+  left: 155px;
 }
-.clear1{
-    .clear();
-    margin-bottom: 16px;
-}
\ No newline at end of file

src/pages/UserManagement/ServiceProviderManagement/Services.tsx

@@ -84,6 +84,7 @@ const Services = (props: any) => {
 
       {DataServices !== null ? (
         <Form ref={formRef} name="basic">
+          <div className={styles.title}>General Service Provider :</div>
           <Form.Item label="Available Services" name="serviceName">
             <TagSelect onAdd={Add} onRemove={Remove} />
           </Form.Item>