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

src/models/CommunityManagement/User.ts

@@ -102,7 +102,9 @@ export default {
       }
 
       if (resp.error_code != '0000') {
-        message.error(`${resp.error_code}:${resp.error_msg}`);
+        if (playload.index !== 53) {
+          message.error(`${resp.error_code}:${resp.error_msg}`);
+        }
         var Data3Error = null;
         var Result = null;
         let Data4Error = null;

src/pages/UserManagement/LIFEUserManagement/Users.tsx

 import React, { useState, useEffect } from 'react';
 
 import styles from './index.less';
-import { Spin, message, Upload, Button, Table, Space } from 'antd';
+import { message, Upload, Button, Table, Space } from 'antd';
 import { UploadOutlined, LoadingOutlined } from '@ant-design/icons';
 
 import { useIntl, connect, history } from 'umi';
@@ -9,7 +9,7 @@ import { useIntl, connect, history } from 'umi';
 import TitleSearch from '../../../components/TitleSearch/TitleSearch';
 
 import { timestampToTime } from '../../../utils/time';
-import { RA, getCookie, URL, filterObjbyTg, urlEncode, filterObj } from '@/utils/method';
+import { RA, URL, filterObjbyTg, urlEncode, filterObj } from '@/utils/method';
 
 const module = 'User';
 const module2 = 'History';
@@ -129,6 +129,7 @@ const Users = (props: any) => {
       }
     },
     showUploadList: false,
+    disabled: permissionArr.indexOf('4') < 0 ? true : false,
   };
 
   // 监听路由变化更新数据

src/pages/UserManagement/ServiceProviderManagement/Detail.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import styles from './Detail.less';
 import { Button, Table, Space, message, Modal, Spin } from 'antd';
 
-import { Link, useIntl, connect, Dispatch, history } from 'umi';
+import { connect, history } from 'umi';
 
 import ShowOptions from '../../../components/ShowOptions/index';
 import TitleBack from '../../../components/TitleBack/TitleBack';
@@ -11,7 +11,7 @@ import { PoweroffOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 const { confirm } = Modal;
 
 const Detail = (props: any) => {
-  const { dispatch, Data, CurDataFollow, location, SaveChooseData, Result } = props;
+  const { dispatch, CurDataFollow, location, SaveChooseData, Result } = props;
 
   const status = ['Normal', 'Cancelled'];
 
@@ -130,8 +130,8 @@ const Detail = (props: any) => {
                 </Button>
               </div>
             ) : (
-                <div />
-              )}
+              <div />
+            )}
             <div className={styles.bigbox}>
               <div className={styles.box0}>
                 {/* <div className={styles.box0item1}></div> */}
@@ -171,8 +171,8 @@ const Detail = (props: any) => {
               {SaveChooseData.serviceCommunityList != null ? (
                 <ShowOptions list={SaveChooseData.serviceCommunityList} defaultValue={'Close'} />
               ) : (
-                  <></>
-                )}
+                <></>
+              )}
             </div>
 
             <div className={styles.box7}>