zls

src/pages/activity/groupActivity/helpRecord.jsx

@@ -171,6 +171,7 @@ class Verifier extends React.Component {
    getVerCodeList (params) {
     request({ ...apis.groupActivity.verification, params: { ...params } }).then(res => {
       message.info('核销成功')
+      this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
     }).catch(err => {
       <Alert
         style={{
@@ -191,7 +192,6 @@ class Verifier extends React.Component {
   verification(e) {
     console.log("asdasdasdasd",this.state.visibleData);
     this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode, recordId: this.state.visibleData.recordId})
-    this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
   }
 
   render () {
@@ -207,7 +207,7 @@ class Verifier extends React.Component {
           onCancel={(e) => this.handleCancel(e)}
         >
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button name="admin.taShareRecord.verificate.put" noRight={null} onClick={() => this.verification()}>立即核销</Button>
+           <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px' }} onClick={() => this.verification()}>立即核销</Button>
           </div>
         </Modal>
       </>

src/pages/activity/helpActivity/helpRecord.jsx

@@ -181,6 +181,7 @@ class Verifier extends React.Component {
     request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
       // eslint-disable-next-line no-undef
       message.info('核销成功')
+      this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
@@ -202,7 +203,6 @@ class Verifier extends React.Component {
   // eslint-disable-next-line class-methods-use-this
   verification(e) {
     this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
-    this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
   }
 
   render () {

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/list/index.jsx

@@ -122,7 +122,7 @@ function CartBody(props) {
       <p className={Styles.cardItem}>
         <span className={Styles.title}>均价</span>
         <span >
-          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m
+          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m²
         </span>
       </p>
       <p className={Styles.cardItem}>

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/pages/staff/list/StaffList.jsx

@@ -104,9 +104,7 @@ const CartBody = (props) => {
 }
 
 const header = (props) => {
-  const [tempData, setTempData] = useState([])
-  const [pageTotal, setPageTotal] = useState('')
-  const [data,setData] = useState({})
+  const [tempData, setTempData] = useState({ records: [] })
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 8 });
   }, [])
@@ -114,9 +112,7 @@ const header = (props) => {
   const getList = (params) => {
     request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
       console.log(data, "listData")
-      setData(data)
-      setTempData(data.records)
-      setPageTotal(data.total)
+      setTempData(data)
     })
   }
 
@@ -196,21 +192,21 @@ const header = (props) => {
       <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
       <Row style={{ padding: ' 0 10px' }}>
         {
-          tempData.map((item, index) => (
+          tempData.records.map((item, index) => (
             <Col span={6}>
-              <CartBody data={item} onFresh={() => getList({ pageNum: 1, pageSize: 8 })} />
+              <CartBody data={item} onFresh={() => getList({ pageNum: 1, pageSize: 8 })} key={item.userId} />
             </Col>
           ))
         }
       </Row>
 
       {/* 分页  */}
-      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-        <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={pageTotal} onChange={onChange} current={data.current}/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>     
+        <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={tempData.total} onChange={onChange} current={tempData.current}/>
       </div>
     </>
   )
 }
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader

src/pages/system/document/audit.jsx

@@ -28,10 +28,8 @@ function body (props) {
   }
 
   function onVerify (params) {
-
-    // alert(params)
     // 网路请求
-    request({ ...apis.system.updateTaPolicy, urlData: { id: documentVerifyId }, data: { verifyStatus: params } }).then(data => {
+    request({ ...apis.system.updateVerify, urlData: { id: documentVerifyId }, data: { verifyStatus: params } }).then(data => {
 
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions

src/services/apis.js

@@ -622,7 +622,7 @@ export default {
       method: 'GET',
       action: 'admin.documentVerify.id.get',
     },
-    updateTaPolicy: {
+    updateVerify: {
       url: `${prefix}/documentVerify/:id`,
       method: 'PUT',
       action: 'admin.documentVerify.id.put',

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);
         }