feats

config/proxy.js

@@ -8,7 +8,8 @@
 export default {
   dev: {
     '/api/': {
-      target: 'https://xlk.njyz.tech/',
+      // target: 'https://xlk.njyz.tech/',
+      target: 'http://localhost:8081/',
       changeOrigin: true,
       pathRewrite: {
         '^': '',

config/routes.js

@@ -86,7 +86,6 @@ export default [
                 hideInMenu: true,
                 component: './customer/Customer/PrivateCustomer/CustomerDetail',
               },
-
               // {
               //   path: '/customer/customerlist/list',
               //   name: '客户列表old',

src/pages/building/Edit/Channel.jsx

@@ -1,35 +1,90 @@
-import React from 'react'
-import { Button, Form, Input, Select } from 'antd'
+import React, { useEffect, useState } from 'react'
+import { connect } from 'dva';
+import { Button, Form, Input, message, Select } from 'antd'
+import { fetch, apis } from '@/utils/request'
 import InputNumber from './components/InputNumber'
 import { formItemLayout, validMinNum } from './utils'
 
-const ChannelForm = (props) => {
-  const { form } = props
-  const { getFieldDecorator } = form
+const getChannel = fetch(apis.building.channel.get)
+// const saveChannel = fetch(apis.building.channel.save)
+const updateChannel = fetch(apis.building.channel.update)
+const getChannelDict = fetch(apis.channelList.getList)
+
+const ChannelForm = React.forwardRef((props, ref) => {
+  const { form, history, user } = props
+  const { getFieldDecorator, setFieldsValue, validateFields } = form
+  const { query } = history.location;
+  const { id } = query;
+
+  const [loading, setLoading] = useState(false)
+  const [dict, setDict] = useState([])
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    validateFields((err, values) => {
+      if (!err) {
+        const data = {
+          ...values,
+          buildingId: id,
+        }
+
+        setLoading(true)
+        updateChannel({ data }).then(() => {
+          setLoading(false)
+          message.success('数据保存成功')
+        }).catch(() => {
+          setLoading(false)
+        })
+      }
+    });
+  }
+
+  useEffect(() => {
+    getChannelDict({ params: { pageSize: 500, institutionId: user.institutionId }}).then((res) => {
+      const { records } = res || {}
+      if (records?.length) {
+        setDict(records)
+      }
+    })
+  }, [])
+
+  useEffect(() => {
+    if (id) {
+      getChannel({ urlData: { id } }).then((res) => {
+        if (res) {
+          setFieldsValue(res)
+        }
+      })
+    }
+  }, [id])
 
   return (
-    <Form {...formItemLayout}>
+    <Form {...formItemLayout} onSubmit={handleSubmit}>
       <Form.Item label="渠道">
-      {getFieldDecorator('shareContentTitle', {
-        rules: [{required: true, message: '请填写分享标题'}]
-      })(<Select />)}
+      {getFieldDecorator('channelIdList', {
+        rules: [{required: true, message: '请选择渠道'}]
+      })(
+        <Select mode="multiple" style={{ width: '100%' }}>
+          {
+            dict.map((item) => (<Select.Option key={item.channelId} value={`${item.channelId}`}>{item.channelName}</Select.Option>))
+          }          
+        </Select>
+      )}
       </Form.Item>
       <Form.Item label="报备有效期">
-      {getFieldDecorator('posterImg', {
+      {getFieldDecorator('expirationDate', {
           rules: [{ validator: validMinNum }],
       })(<InputNumber min={0} step={1} addonAfter="天" />)}
       </Form.Item>
-      <Form.Item label="报备有效期">
-      {getFieldDecorator('posterImg', {
-          rules: [{ validator: validMinNum }],
-      })(<Input.TextArea row={4} />)}
+      <Form.Item label="报备规则">
+      {getFieldDecorator('remark', {})(<Input.TextArea row={4} />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
-        <Button style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
-        <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button>
+        <Button style={{marginLeft: '4em'}} loading={loading} type="primary" htmlType="submit">保存</Button>
+        {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button> */}
       </Form.Item>
     </Form>
   )
-}
+})
 
-export default Form.create({})(ChannelForm)
+export default connect((s) => ({ user: s.user.currentUser }))(Form.create({})(ChannelForm))

src/services/apis.js

@@ -201,6 +201,24 @@ export default {
       method: 'DELETE',
       action: 'admin.marketing.id.delete',
     },
+    // 渠道
+    channel: {
+      get: {
+        url: `${prefix}/buildingChannel/:id`,
+        method: 'GET',
+        action: 'admin.building.channel.get',
+      },
+      save: {
+        url: `${prefix}/buildingChannel`,
+        method: 'POST',
+        action: 'admin.building.channel.post',
+      },
+      update: {
+        url: `${prefix}/buildingChannel`,
+        method: 'PUT',
+        action: 'admin.building.channel.post',
+      }
+    }
   },
   buildingType: {
     getList: {

src/utils/request.js

@@ -82,7 +82,7 @@ request.interceptors.response.use(async (response, options) => {
     } else {
       // console.log('response.headers: ', response.headers)
       // console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
-      console.log(response,'response')
+      // console.log(response,'response')
       if (response.headers.get('Content-Type') === 'application/octet-stream;charset=utf-8') {
         return await response.clone().blob();
       }
@@ -91,9 +91,9 @@ request.interceptors.response.use(async (response, options) => {
       if (response.url.indexOf('gaode_amap') !== -1) {
         return await response.clone().json();
       }
-      console.log(response,'response')
+      // console.log(response,'response')
       const { code, data, message } = await response.clone().json();
-     
+
       if (code != 1000) {
         if (code === 1001) {
           // notification.error({