提交

src/pages/building/list/add/components/imageSet.jsx

@@ -85,9 +85,9 @@ function imageSet(props) {
     // 网路请求
     request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
       getList()
-      openNotificationWithIcon('error', '操作成功')
+      openNotificationWithIcon('success', '操作成功')
     }).catch(err => {
-      openNotificationWithIcon('error', err.message)
+      // openNotificationWithIcon('error', err.message)
     })
   }
 

src/pages/building/list/add/components/modalImage.jsx

@@ -163,10 +163,14 @@ class ModalImage extends React.Component {
                   {getFieldDecorator('apartmentId')(<Input />)}
               </Form.Item>
               <Form.Item label="名称">
-                {getFieldDecorator('apartmentName')(<Input />)}
+                {getFieldDecorator('apartmentName', {
+                  rules: [{ required: true, message: '请输入名称' }],
+                })(<Input />)}
               </Form.Item>
               <Form.Item label="类型">
-                {getFieldDecorator('apartmentType')(
+                {getFieldDecorator('apartmentType', {
+                  rules: [{ required: true, message: '请选择类型' }],
+                })(
                   <Select placeholder="类型">
                     <Option value="apart">户型</Option>
                     <Option value="photo">相册</Option>
@@ -183,7 +187,9 @@ class ModalImage extends React.Component {
                 )}
               </Form.Item>
               <Form.Item label="图片">
-              {getFieldDecorator('img')(
+              {getFieldDecorator('img', {
+                  rules: [{ required: true, message: '请选择图片' }],
+              })(
                 <ImageListUpload />,
               )}
               </Form.Item>

src/pages/building/type/edi.jsx

@@ -59,8 +59,7 @@ function body(props) {
       openNotificationWithIcon('success', '操作成功')
       router.go(-1)
     }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      openNotificationWithIcon('error', err)
+      
     })
   }
 
@@ -76,6 +75,8 @@ function body(props) {
         // eslint-disable-next-line no-unused-expressions
         openNotificationWithIcon('success', '操作成功')
         router.go(-1)
+      }).catch(err => {
+        
       })
     }
 

src/pages/building/type/index.jsx

@@ -42,6 +42,12 @@ function body() {
             删除
             <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </Button>
+          <Button type="link" style={{
+            color: '#FF4A4A', right: '0',
+          }} onClick={() => toEdi(record.buildingTypeId)}>
+            编辑
+            <Icon type="copy" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+          </Button>
         </span>
       ),
     },
@@ -65,7 +71,7 @@ function body() {
       setData(res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      openNotificationWithIcon('error', err)
+      // openNotificationWithIcon('error', err)
     })
   }
 
@@ -84,7 +90,7 @@ function body() {
     }).then(() => {
       openNotificationWithIcon('success', '操作成功')
     }).catch(err => {
-      //openNotificationWithIcon('error', err.message)
+      // openNotificationWithIcon('error', err.message)
     })
   }
 

src/pages/integralMall/GoodsList.jsx

@@ -43,6 +43,7 @@ function header(props) {
 
   function handleReset() {
     props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 });
   }
 
   // 跳转到编辑商品
@@ -64,7 +65,7 @@ function header(props) {
       onOk() {
         request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
           message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
         })
       }
     });

src/utils/request.js

@@ -86,14 +86,14 @@ request.interceptors.response.use(async (response, options) => {
       if (code != 1000) {
         if (code === 1001) {
           notification.error({
-            message: `请求错误`,
-            description: '请登录系统',
+            message: `请登录系统`,
+            // description: '请登录系统',
           });
           throw new Error('请登录系统');
         } else {
           notification.error({
-            message: `请求错误`,
-            description: message,
+            message,
+            // description: message,
           });
           throw new Error(message);
         }