Signed-off-by: cellee <893264950@qq.com>

src/components/PictureOptions/PictureOptionsRow.tsx

@@ -23,7 +23,7 @@ const PictureOptionsRow = (props: any) => {
   const [previewImage, setPreviewImage] = useState('');
   const [limitNum, setLimitNum] = useState(5);
   const handleCancel = () => setPreviewVisible(false);
-  // const [imgLoad, setimgLoad] = useState(false); //图片上传 load状态
+  const [imgLoad, setimgLoad] = useState(false); //图片上传 load状态
 
   useEffect(() => {
     if (limitNums != null) {
@@ -80,8 +80,8 @@ const PictureOptionsRow = (props: any) => {
   // 加载logo
   const uploadButton = (
     <div>
-      {/* {loadding ? <LoadingOutlined /> : <PlusOutlined />} */}
-      <PlusOutlined />
+      {imgLoad ? <LoadingOutlined /> : <PlusOutlined />}
+      {/* <PlusOutlined /> */}
       <div className="ant-upload-text">Upload</div>
     </div>
   );
@@ -115,7 +115,8 @@ const PictureOptionsRow = (props: any) => {
       });
       setFileList(tmp);
 
-      console.log(tmp);
+      setimgLoad(false);
+
       var result = new Array();
       tmp.map((item: any, index: number) => {
         // 如果没返回就用原来的名称
@@ -126,6 +127,10 @@ const PictureOptionsRow = (props: any) => {
         result.push(name);
       });
       onChange && onChange(result);
+    } else if (file.status == 'error') {
+      setimgLoad(false);
+    } else {
+      setimgLoad(true);
     }
   };
 

src/pages/AccountManagement/Service/service.tsx

@@ -21,14 +21,14 @@ const service = (props: any) => {
       width: 240,
     },
     {
-      title: 'Rapporteur',
+      title: 'Reported By',
       dataIndex: 'reporterName',
       key: 'reporterName',
 
       width: 160,
     },
     {
-      title: 'Upload description',
+      title: 'Description',
       dataIndex: 'reportContent',
       key: 'reportContent',
       width: 400,
@@ -66,13 +66,15 @@ const service = (props: any) => {
     },
   ];
 
-  const { Data, dispatch, loading, Init } = props;
+  const { Data, dispatch, loading, Init, location } = props;
 
+  const [locationkey, setlocationkey] = useState(null as any); // 是否从其他列表刷新来的
   const [term, setTerm] = useState(null as any); // 拉取数据的条件存储
 
   // 监听是否有数据
   useEffect(() => {
-    if (Init.CommunityList !== null && Data == null) {
+    if (location.key !== locationkey && Init.CommunityList !== null) {
+      setlocationkey(location.key);
       let obj = {
         communityNameList: Init.CommunityList,
         reporterName: null,
@@ -81,7 +83,7 @@ const service = (props: any) => {
       setTerm({ ...obj });
       RA(68, obj, module, dispatch);
     }
-  }, [Init, Data]);
+  }, [location, Init]);
 
   // 清除操作之前的数据
   const emptys = (data: any, url: any) => {

src/pages/AccountManagement/Service/serviceDetail.tsx

 /*
  * @Author: your name
  * @Date: 2021-03-02 14:39:40
- * @LastEditTime: 2021-03-15 15:25:59
+ * @LastEditTime: 2021-03-16 11:08:58
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \tostumi\src\pages\AccountManagement\Service\serviceEdit.tsx
@@ -164,7 +164,7 @@ const service = (props: any) => {
               <span>{term ? `${term.communityAddress} , ${term.postCode}` : null}</span>
             </Form.Item>
             {/* 报告人 */}
-            <Form.Item label="Rapporteur">
+            <Form.Item label="Reported By">
               <span>{term ? term.reporterName : null}</span>
             </Form.Item>
             {/* 报告人联系方式 */}
@@ -195,7 +195,7 @@ const service = (props: any) => {
             {/* --------------------------------------------------------------------------------------------- */}
             {/* 回复人信息 */}
             {DataSave && DataSave.replyData.length > 0 ? (
-              <Form.Item label="Replier">
+              <Form.Item label="Amended By">
                 {DataSave.replyData[0].replyName}
                 <span style={{ display: 'inline-block', margin: '0 10px 0 50px' }}>
                   Contact Details :{' '}

src/pages/AccountManagement/Service/serviceEdit.tsx

 /*
  * @Author: your name
  * @Date: 2021-03-02 14:39:40
- * @LastEditTime: 2021-03-15 15:21:27
+ * @LastEditTime: 2021-03-16 10:59:31
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \tostumi\src\pages\AccountManagement\Service\serviceEdit.tsx
@@ -137,7 +137,7 @@ const service = (props: any) => {
               <span>{term ? `${term.communityAddress} , ${term.postCode}` : null}</span>
             </Form.Item>
             {/* 报告人 */}
-            <Form.Item label="Rapporteur">
+            <Form.Item label="Reported By">
               <span>{term ? term.reporterName : null}</span>
             </Form.Item>
             {/* 报告人联系方式 */}

src/pages/AccountManagement/SystemFeedback/SystemFeedback.tsx

@@ -9,16 +9,18 @@ import moment from 'moment';
 import './index.less';
 
 const SystemFeedback = (props: any) => {
-  const { dispatch, Data, loading } = props;
+  const { dispatch, Data, loading, location } = props;
   const module = 'Bug';
 
+  const [locationkey, setlocationkey] = useState(null as any); // 是否从其他列表刷新来的
   const [term, setTerm] = useState({ pageNum: 1 } as any); //页码
 
   useEffect(() => {
-    if (!Data) {
+    if (location.key !== locationkey) {
+      setlocationkey(location.key);
       Refresh();
     }
-  }, [Data]);
+  }, [location]);
 
   const columns = [
     { title: 'Brand', dataIndex: 'phoneBrand' },

src/pages/AccountManagement/account/Account.tsx

@@ -9,19 +9,19 @@ import './Account.less';
 import moment from 'moment';
 
 const Account = (props: any) => {
-  const { user, dispatch, Data, Result, loading } = props;
+  const { user, dispatch, Data, Result, loading, location } = props;
   const RA = (index: any, values: any) => {
     dispatch({ type: 'Account/RA', playload: { index: index, body: values } });
   };
   const [term, setTerm] = useState({} as any); // 拉取数据的条件存储
-
+  const [locationkey, setlocationkey] = useState(null as any); // 是否从其他列表刷新来的
   // 数据
   useEffect(() => {
-    console.log(Data);
-    if (Data == null) {
+    if (location.key !== locationkey) {
+      setlocationkey(location.key);
       Refresh();
     }
-  }, [Data]); //监听Data执行一次
+  }, [location]); //监听Data执行一次
 
   // 监听改变状态提交结果
   useEffect(() => {

src/pages/CommunityManagement/CellList/Details.tsx

@@ -36,6 +36,9 @@ const Detail = (props: any) => {
   // 新加坡测  http://120.77.240.215:8611/   图片名称  h51
   // 正式  http://47.74.233.180:8611/   图片名称  h52
 
+  // const usage = 'http://192.168.1.28:8611/';
+  // const codeUrl = require('@/assets/h5.png');
+
   const usage = 'http://120.77.240.215:8611/';
   const codeUrl = require('@/assets/h51.png');