轮播图调整

src/pages/carouselFigure/SelectActivity.jsx

@@ -56,7 +56,14 @@ export default (props) => {
         }}
         onCancel={() => setVisible(false)}
       >
-        <Select defaultValue={chooseVal} onChange={handleChange} style={{ width: '90%' }}>
+        <Select
+        showSearch
+        filterOption={(input, option) =>
+          option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
+        defaultValue={chooseVal} 
+        onChange={handleChange} 
+        style={{ width: '90%' }}>
           {
             list.map(x => (<Select.Option key={x.dynamicId} value={x.dynamicId}>{x.title}</Select.Option>))
           }

src/pages/carouselFigure/SelectGroup.jsx

@@ -0,0 +1,74 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Modal } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+const getGroupList = fetch(apis.groupActivity.list)
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择拼团' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.groupActicityId == val)[0] || {}).activityName || '请选择拼团'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+      onChange(val)
+  }
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <Modal
+        title="请选择拼团"
+        visible={visible}
+        onOk={() => {
+          updateGroup(value)
+          onChange(value)
+          setVisible(false)
+        }}
+        onCancel={() => setVisible(false)}
+      >
+        <Select
+          showSearch
+          value={value ? parseInt(value) : undefined}
+          onChange={handleChange}
+          style={{ width: '90%' }}
+          filterOption={(input, option) =>
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }>
+          {
+            list.map(x => (<Select.Option key={x.groupActicityId} value={x.groupActicityId}>{x.activityName}</Select.Option>))
+          }
+        </Select>
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/SelectHelp.jsx

@@ -0,0 +1,76 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Modal } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+const getHelpList = fetch(apis.helpActivity.list)
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [help, setHelp] = useState({ helpId: undefined, helpName: '请选择助力' })
+  const getHelpTitle = val => {
+    return (list.filter(x => x.helpActivityId == val)[0] || {}).title || '请选择助力'
+  }
+
+  const updateHelp = val => setHelp({ helpId: val, helpName: getHelpTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getHelpList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateHelp(value ? undefined : value);
+    })
+  }, [buildingId]);
+
+  if (value !== help.helpId) {
+    updateHelp(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{help.helpName}</div>
+      <Modal
+        title="请选择助力"
+        visible={visible}
+        onOk={() => {
+          updateHelp(value)
+          onChange(value)
+          setVisible(false)
+        }}
+        onCancel={() => setVisible(false)}
+      >
+        <Select
+          placeholder="请选择助力"
+          showSearch
+          value={value ? parseInt(value) : undefined}
+          onChange={handleChange}
+          style={{ width: '90%' }}
+          filterOption={(input, option) =>
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }>
+          {
+            list.map(x => (<Select.Option key={x.helpActivityId} value={x.helpActivityId}>{x.title}</Select.Option>))
+          }
+        </Select>
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/SelectNews.jsx

@@ -37,9 +37,9 @@ export default (props) => {
     updateNews(value);
   }
 
-  let chooseVal = value
-
-  const handleChange = val => chooseVal = val
+  const handleChange = val => {
+    onChange(val)
+  }
 
   return (
     <div>
@@ -48,13 +48,21 @@ export default (props) => {
         title="请选择资讯"
         visible={visible}
         onOk={() => {
-          updateNews(chooseVal)
-          onChange(chooseVal)
+          updateNews(value)
+          onChange(value)
           setVisible(false)
         }}
         onCancel={() => setVisible(false)}
       >
-        <Select defaultValue={chooseVal} onChange={handleChange} style={{ width: '90%' }}>
+        <Select
+          showSearch
+          value={value ? parseInt(value) : undefined}
+          onChange={handleChange}
+          style={{ width: '90%' }}
+          filterOption={(input, option) =>
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }
+        >
           {
             list.map(x => (<Select.Option key={x.newsId} value={x.newsId}>{x.newsName}</Select.Option>))
           }

src/pages/carouselFigure/advertisingList.jsx

@@ -53,7 +53,7 @@ const toEdit = (contentId) => () => {
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
     },
     {
       title: '发布位置',

src/pages/carouselFigure/carouselFigureList.jsx

@@ -53,7 +53,7 @@ const toEditCarouse = (contentId) => () => {
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
     },
     {
       title: '发布位置',

src/pages/carouselFigure/editAdvertising.jsx

@@ -11,6 +11,8 @@ import SelectActivity from './SelectActivity';
 import SelectNews from './SelectNews';
 import apis from '../../services/apis';
 import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
 
 /**
  *
@@ -22,12 +24,17 @@ import request from '../../utils/request'
   let contentVisible = false
   let activityVisible = false
   let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
   let buildingId = ''
 
   const setExtraData = (data) => {
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+
     buildingId = data.buildingId
   }
   
@@ -101,6 +108,14 @@ import request from '../../utils/request'
         {
           label: '其他',
           value: 'other'
+        },
+        {
+          label: '拼团',
+          value: 'group'
+        },
+        {
+          label: '助力',
+          value: 'help'
         }],
         value: data.contentType,
       },
@@ -125,6 +140,20 @@ import request from '../../utils/request'
         value: data.content,
         hidden: () => !contentVisible,
       },
+      {
+        label: '发布助力',
+        name: 'targetId',
+        render: <SelectHelp buildingId={() => buildingId} />,
+        hidden: () => !helpVisible,
+        value: data.targetId,
+      },
+      {
+        label: '发布拼团',
+        name: 'targetId',
+        render: <SelectGroup buildingId={() => buildingId} />,
+        hidden: () => !groupVisible,
+        value: data.targetId,
+      },
       {
         label: '状态',
         name: 'status',

src/pages/carouselFigure/editCarousel.jsx

@@ -1,14 +1,18 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
 import moment from 'moment';
 import router from 'umi/router';
+import styles from '../style/GoodsList.less';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-import XForm, { FieldTypes } from '../../components/XForm';
+import { createForm, FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import apis from '../../services/apis';
 import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
+import SelectNews from './SelectNews';
+import SelectActivity from './SelectActivity';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
@@ -17,130 +21,195 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
  * @param {*} props
  * @returns
  */
- const Edit = (props) => {
-  const [ tab, changeTab ] = useState('basic')
-  const contentId = props.location.query.contentId
-  const [ data, setData ] = useState({})
-  if(contentId){
-    useEffect(() => {
-      getDetail(contentId);
-    },[])
+ const Edit = props => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let buildingId = ''
 
-  // 查询列表
-  const getDetail = (contentId) => {
-    request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
-        console.log(data)
-        setData(data)
-    })
-  }
+  const setExtraData = data => {
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+
+    buildingId = data.buildingId
   }
 
-  const cancelPage = () =>{
-    router.push({
-      pathname: '/carouselFigure/carouselFigureList',
-    });
+    
+  const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
   }
- 
-    const fields = [
-      {
-        label: '所属项目',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: data.buildingId,
-      },
-      {
-        label: '商品图片',
-        name: 'image',
-        type: FieldTypes.ImageUploader,
-        value: data.image,
-        help: '建议图片尺寸：640px*330px',
-      },
-      {
-        label: '标题',
-        name: 'title',
-        type: FieldTypes.Text,
-        value: data.title,
-      },
-      {
-        label: '发布位置',
-        name: 'showPosition',
-        type: FieldTypes.Select,
-        dict: [{
-          label: '首页',
-          value: 'index'
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return (props) => {
+
+    const [tab, changeTab] = useState('basic')
+    const { contentId } = props.location.query
+    const [data, setData] = useState({})
+    if (contentId) {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      useEffect(() => {
+        getDetail(contentId);
+      }, [])
+
+    // 查询列表
+    const getDetail = contentId => {
+      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
+          console.log(data)
+          setExtraData(data)
+          setData(data)
+      })
+    }
+    }
+
+    const cancelPage = () => {
+      router.push({
+        pathname: '/carouselFigure/carouselFigureList',
+      });
+    }
+
+      const fields = [
+        {
+          label: '所属项目',
+          name: 'buildingId',
+          render: <BuildSelect />,
+          value: data.buildingId,
         },
         {
-          label: '商城',
-          value: 'mall'
-        }],
-        value: data.showPosition,
-      },
-      {
-        label: '类型',
-        name: 'contentType',
-        type: FieldTypes.Select,
-        dict: [{
-          label: '活动',
-          value: 'activity'
+          label: '商品图片',
+          name: 'image',
+          type: FieldTypes.ImageUploader,
+          value: data.image,
+          help: '建议图片尺寸：640px*330px',
         },
         {
-          label: '项目',
-          value: 'project'
+          label: '标题',
+          name: 'title',
+          type: FieldTypes.Text,
+          value: data.title,
         },
         {
-          label: '资讯',
-          value: 'news'
+          label: '发布位置',
+          name: 'showPosition',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '首页',
+            value: 'index',
+          },
+          {
+            label: '商城',
+            value: 'mall',
+          }],
+          value: data.showPosition,
         },
         {
-          label: '其他',
-          value: 'other'
-        }],
-        value: data.contentType,
-      },
-      {
-        label: '发布内容',
-        name: 'content',
-        render: <Wangedit />,
-        value: data.content,
-      },
-      {
-        label: '状态',
-        name: 'status',
-        type: FieldTypes.Select,
-        dict: [{
-          label: "启用",
-          value: 1
+          label: '类型',
+          name: 'contentType',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '活动',
+            value: 'activity',
+          },
+          {
+            label: '项目',
+            value: 'project',
+          },
+          {
+            label: '资讯',
+            value: 'news',
+          },
+          {
+            label: '其他',
+            value: 'other',
+          },
+          {
+            label: '拼团',
+            value: 'group',
+          },
+          {
+            label: '助力',
+            value: 'help',
+          }],
+          value: data.contentType,
         },
         {
-          label: "停用",
-          value: 0
-        },],
-        value: data.status != null ? data.status : 1,
-      },
-    ]
-  
-    const handleSubmit = val => { 
-      val.showType = 'banner'
-      if(contentId){
-        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }else{
-        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
+          label: '发布活动',
+          name: 'targetId',
+          render: <SelectActivity buildingId={() => buildingId} />,
+          hidden: () => !activityVisible,
+          value: data.targetId,
+        },
+        {
+          label: '发布资讯',
+          name: 'targetId',
+          render: <SelectNews buildingId={() => buildingId} />,
+          hidden: () => !newsVisible,
+          value: data.targetId,
+        },
+        {
+          label: '发布内容',
+          name: 'content',
+          render: <Wangedit />,
+          value: data.content,
+          hidden: () => !contentVisible,
+        },
+        {
+          label: '发布助力',
+          name: 'targetId',
+          render: <SelectHelp buildingId={() => buildingId} />,
+          hidden: () => !helpVisible,
+          value: data.targetId,
+        },
+        {
+          label: '发布拼团',
+          name: 'targetId',
+          render: <SelectGroup buildingId={() => buildingId} />,
+          hidden: () => !groupVisible,
+          value: data.targetId,
+        },
+        {
+          label: '状态',
+          name: 'status',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '启用',
+            value: 1,
+          },
+          {
+            label: '停用',
+            value: 0,
+          } ],
+          value: data.status != null ? data.status : 1,
+        },
+      ]
+
+      const handleSubmit = val => {
+        val.showType = 'banner'
+        if (contentId) {
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val  }).then(data => {
+            cancelPage()
+          }).catch(err => {
+            message.info(err.msg || err.message)
+          })
+        } else{
+          request({ ...apis.carsuseFigure.addExtendContent, data: val  }).then(data => {
+            cancelPage()
+          }).catch(err => {
+            message.info(err.msg || err.message)
+          })
+        }
       }
-    }
 
-  return (
-    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-  );
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    );
+  }
  }
 
 
-
-export default Edit
+export default Edit()