lf

src/pages/carouselFigure/SelectH5.jsx

@@ -0,0 +1,69 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Modal } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+const getH5List = fetch(apis.h5Activity.EffectiveList)
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择H5' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择H5'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  useEffect(() => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+      },
+    }).then(data => {
+      setList(data.records || [])
+    })
+  }, []);
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+      onChange(val)
+  }
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <Modal
+        title="请选择H5"
+        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.drainageId} value={x.drainageId}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/editAdvertising.jsx

@@ -5,6 +5,7 @@ import styles from '../style/GoodsList.less';
 import moment from 'moment';
 import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
+import CitySelect from '../../components/SelectButton/CitySelect'
 import { FieldTypes, createForm } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit';
 import SelectActivity from './SelectActivity';
@@ -13,7 +14,7 @@ import apis from '../../services/apis';
 import request from '../../utils/request'
 import SelectHelp from './SelectHelp';
 import SelectGroup from './SelectGroup';
-
+import SelectH5 from './SelectH5';
 /**
  *
  *
@@ -27,8 +28,13 @@ import SelectGroup from './SelectGroup';
   let helpVisible = false
   let groupVisible = false
   let buildingId = ''
+  let isHaveActive=true
 
   const setExtraData = (data) => {
+    isHaveActive=data.isHaveActive
+    if(!isHaveActive) {
+      data.contentType=null
+    }
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
@@ -37,7 +43,7 @@ import SelectGroup from './SelectGroup';
 
     buildingId = data.buildingId
   }
-  
+
   const handleFormValueChange = (props, changedValues, allValues) => {
     setExtraData(allValues)
   }
@@ -48,12 +54,12 @@ import SelectGroup from './SelectGroup';
     const [ tab, changeTab ] = useState('basic')
     const contentId = props.location.query.contentId
     const [ data, setData ] = useState({})
-  
+
     if(contentId){
       useEffect(() => {
         getDetail(contentId);
       },[])
-  
+
       // 查询列表
       const getDetail = (contentId) => {
         request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
@@ -62,23 +68,43 @@ import SelectGroup from './SelectGroup';
         })
       }
     }
-  
+
     const cancelPage = () =>{
       router.push({
         pathname: '/carouselFigure/advertisingList',
       });
     }
-   
+
     const fields = [
+      {
+        label: '项目活动',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value:isHaveActive,
+        rules: [
+          { required: true,message: '是否城市活动' },
+        ],
+      },
       {
         label: '所属项目',
         name: 'buildingId',
         render: <BuildSelect />,
         value: data.buildingId,
+        hidden: () => !isHaveActive,
         rules: [
           { required: true, message: '请选择所属项目' },
         ],
       },
+      {
+        label: '展示城市',
+        name: 'cityId',
+        render: <CitySelect />,
+        hidden: () => isHaveActive,
+        value: data.cityId,
+        rules: [
+          { required: true, message: '请选择展示城市' },
+        ],
+      },
       {
         label: '开屏广告',
         name: 'image',
@@ -89,10 +115,21 @@ import SelectGroup from './SelectGroup';
           { required: true, message: '请上传图片' },
         ],
       },
+      {
+        label: '是否发布H5',
+        name: 'targetId',
+        render: <SelectH5/>,
+        hidden: () => isHaveActive,
+        value: data.targetId,
+        rules: [
+          { required: false, message: '请选择发布H5' },
+        ],
+      },
       {
         label: '标题',
         name: 'title',
         type: FieldTypes.Text,
+        hidden: () => !isHaveActive,
         value: data.title,
         rules: [
           { required: true, message: '请输入标题' },
@@ -101,6 +138,7 @@ import SelectGroup from './SelectGroup';
       {
         label: '类型',
         name: 'contentType',
+        hidden: () => !isHaveActive,
         type: FieldTypes.Select,
         dict: [{
           label: '常规活动',
@@ -185,6 +223,7 @@ import SelectGroup from './SelectGroup';
         label: '状态',
         name: 'status',
         type: FieldTypes.Select,
+        hidden: () => !isHaveActive,
         dict: [{
           label: "启用",
           value: 1
@@ -196,9 +235,12 @@ import SelectGroup from './SelectGroup';
         value: data.status != null ? data.status : 1,
       },
     ]
-    
-    const handleSubmit = val => { 
+
+    const handleSubmit = val => {
       val.showType = 'screen'
+      if(!val.isHaveActive&&val.targetId) {
+        val.contentType='h5'
+      }
       if(contentId){
         request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
@@ -213,12 +255,12 @@ import SelectGroup from './SelectGroup';
         })
       }
     }
-  
-  
+
+
     return (
       <XForm onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
     );
    }
  }
- 
+
 export default createEditor()

src/pages/carouselFigure/editCarousel.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import router from 'umi/router';
 import styles from '../style/GoodsList.less';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
+import CitySelect from '../../components/SelectButton/CitySelect'
 import { createForm, FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import apis from '../../services/apis';
@@ -13,6 +14,7 @@ import SelectHelp from './SelectHelp';
 import SelectGroup from './SelectGroup';
 import SelectNews from './SelectNews';
 import SelectActivity from './SelectActivity';
+import SelectH5 from './SelectH5';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
@@ -29,9 +31,15 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   let groupVisible = false
   let buildingId = ''
   let locationType = false
+  let isHaveActive=true
 
-  const setExtraData = data => {
+  const setExtraData = (data) => {
     console.log(data, 'data');
+    isHaveActive=data.isHaveActive
+    if(!isHaveActive) {
+      data.contentType=null
+    }
+
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
@@ -54,6 +62,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     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(() => {
@@ -77,15 +86,35 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     }
 
       const fields = [
+        {
+          label: '项目活动',
+          name: 'isHaveActive',
+          type: FieldTypes.Switch,
+          value:isHaveActive,
+          rules: [
+            { required: true,message: '是否城市活动' },
+          ],
+        },
         {
           label: '所属项目',
           name: 'buildingId',
           render: <BuildSelect />,
+          hidden: () => !isHaveActive,
           value: data.buildingId,
           rules: [
             { required: true, message: '请选择所属项目' },
           ],
         },
+        {
+          label: '展示城市',
+          name: 'cityId',
+          render: <CitySelect />,
+          hidden: () => isHaveActive,
+          value: data.cityId,
+          rules: [
+            { required: true, message: '请选择展示城市' },
+          ],
+        },
         {
           label: '发布位置',
           name: 'showPosition',
@@ -113,11 +142,22 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             { required: true, message: '请上传轮播图' },
           ],
         },
+        {
+          label: '是否发布H5',
+          name: 'targetId',
+          render: <SelectH5/>,
+          hidden: () => isHaveActive,
+          value: data.targetId,
+          rules: [
+            { required: false, message: '请选择发布H5' },
+          ],
+        },
         {
           label: '标题',
           name: 'title',
           type: FieldTypes.Text,
           value: data.title,
+          hidden: () => !isHaveActive,
           rules: [
             { required: true, message: '请输入标题' },
           ],
@@ -126,6 +166,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           label: '类型',
           name: 'contentType',
           type: FieldTypes.Select,
+          hidden: () => !isHaveActive,
           dict: [{
             label: '常规活动',
             value: 'activity',
@@ -209,6 +250,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           label: '状态',
           name: 'status',
           type: FieldTypes.Select,
+          hidden: () => !isHaveActive,
           dict: [{
             label: '启用',
             value: 1,
@@ -223,6 +265,9 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
       const handleSubmit = val => {
         val.showType = 'banner'
+        if(!val.isHaveActive&&val.targetId) {
+          val.contentType='h5'
+        }
         if (contentId) {
           request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
             cancelPage()

src/services/apis.js

@@ -930,6 +930,18 @@ export default {
     action: 'admin.taShareRecord.verificate.put',
   }
  },
+ h5Activity: {
+  list: {
+    url: `${prefix}/taDrainage`,
+    method: 'get',
+    action: 'admin.taDrainage.get',
+  },
+  EffectiveList: {
+    url: `${prefix}/taDrainage`,
+    method: 'get',
+    action: 'admin.taDrainage.get',
+  }
+ },
  third: {
   thirdPartyMiniapp: {
     url: `${prefix}/thirdPartyMiniapp`,