lf

src/components/SelectButton/CitySelect2.jsx

@@ -0,0 +1,63 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const CitySelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[props.value])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/tdCityList/tdCity',
+        method: 'GET',
+        params: {leveltype: 2, pageNum: 1,pageSize: 999},
+        action: 'select',
+    }).then((data) => {
+        setData(data)
+        getValue(data);
+        console.log('---123---')
+    })
+  }
+
+  /**
+   * 因为 有个需求是，如果这个城市被删除了，那么就直接展示为空，不能展示 cityId
+   */
+  const getValue = (data) => {
+    console.log(props.value)
+    if (props.value) {
+      const tempData = data.filter(f => f.id == props.value)
+      const va = (tempData.length > 0) ? props.value : undefined
+      props.onChange(va)
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '180px' }}
+      placeholder="请选择城市"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }
+      >
+          {data.map(city => (
+            <Option key={city.id} value={city.id}>{city.name}</Option>
+          ))}
+      </Select>
+  )
+}
+export default CitySelect

src/pages/carouselFigure/SelectH5.jsx

@@ -24,11 +24,10 @@ export default props => {
       params: {
         pageNum: 1,
         pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
       },
     }).then(data => {
       setList(data.records || [])
+
       updateGroup(value ? undefined : value);
     })
   }, []);

src/pages/carouselFigure/SelectHelp.jsx

@@ -21,7 +21,7 @@ export default props => {
   const updateHelp = val => setHelp({ helpId: val, helpName: getHelpTitle(val) })
 
   const buildingId = props.buildingId()
-
+  
   useEffect(() => {
     getHelpList({
       params: {

src/pages/carouselFigure/editAdvertising.jsx

@@ -5,7 +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 CitySelect from '../../components/SelectButton/CitySelect2'
 import { FieldTypes, createForm } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit';
 import SelectActivity from './SelectActivity';
@@ -27,21 +27,43 @@ import SelectH5 from './SelectH5';
   let newsVisible = false
   let helpVisible = false
   let groupVisible = false
-  let h5Visible = false
   let buildingId = ''
   let cityId = ''
+  let isHaveActive=false
+  let isCanChoose=true
 
   const setExtraData = (data) => {
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        data.contentType=null
+        data.buildingId=null
+      }
+    }
+
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
     helpVisible = data.contentType === 'help';
     groupVisible = data.contentType === 'group';
-    h5Visible = data.contentType === 'h5';
     cityId=data.cityId
     buildingId = data.buildingId
   }
 
+  const setExtraData1 = (data) => {
+     if(data.title){
+         isHaveActive=true
+     }else{
+        isHaveActive=false
+     }
+      debugger
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    buildingId = data.buildingId
+  }
 
   const handleFormValueChange = (props, changedValues, allValues) => {
       setExtraData(allValues)
@@ -55,6 +77,7 @@ import SelectH5 from './SelectH5';
     const [ data, setData ] = useState({})
 
     if(contentId){
+      isCanChoose=false
       useEffect(() => {
         getDetail(contentId);
       },[])
@@ -62,10 +85,12 @@ import SelectH5 from './SelectH5';
       // 查询列表
       const getDetail = (contentId) => {
         request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
-          setExtraData(data)
           setData(data)
+          setExtraData1(data)
         })
       }
+    }else{
+      isCanChoose=true
     }
 
     const cancelPage = () =>{
@@ -75,11 +100,22 @@ import SelectH5 from './SelectH5';
     }
 
     const fields = [
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value:isHaveActive,
+        hidden: () => !isCanChoose,
+        rules: [
+          { required: true,message: '是否城市活动' },
+        ],
+      },
       {
         label: '所属项目',
         name: 'buildingId',
         render: <BuildSelect />,
         value: data.buildingId,
+        hidden: () => !isHaveActive,
         rules: [
           { required: true, message: '请选择所属项目' },
         ],
@@ -88,6 +124,7 @@ import SelectH5 from './SelectH5';
         label: '展示城市',
         name: 'cityId',
         render: <CitySelect />,
+        hidden: () => isHaveActive,
         value: data.cityId,
         rules: [
           { required: true, message: '请选择展示城市' },
@@ -103,11 +140,21 @@ import SelectH5 from './SelectH5';
           { 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: true,
+        hidden: () => !isHaveActive,
         value: data.title,
         rules: [
           { required: true, message: '请输入标题' },
@@ -116,6 +163,7 @@ import SelectH5 from './SelectH5';
       {
         label: '类型',
         name: 'contentType',
+        hidden: () => !isHaveActive,
         type: FieldTypes.Select,
         dict: [{
           label: '常规活动',
@@ -140,14 +188,10 @@ import SelectH5 from './SelectH5';
         {
           label: '助力',
           value: 'help'
-        },
-        {
-          label: 'H5',
-          value: 'h5'
         }],
         value: data.contentType,
         rules: [
-          { required: false, message: '请选择类型' },
+          { required: true, message: '请选择类型' },
         ],
       },
       {
@@ -200,16 +244,6 @@ import SelectH5 from './SelectH5';
           { required: true, message: '请选择发布拼团' },
         ],
       },
-      {
-        label: '发布H5',
-        name: 'targetId',
-        render: <SelectH5/>,
-        hidden: () => !h5Visible,
-        value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布H5' },
-        ],
-      },
       {
         label: '状态',
         name: 'status',
@@ -235,6 +269,9 @@ import SelectH5 from './SelectH5';
           message.info(err.msg || err.message)
         })
       }else{
+        if(!val.isHaveActive&&val.targetId) {
+          val.contentType='h5'
+        }
         request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {

src/pages/carouselFigure/editCarousel.jsx

@@ -5,7 +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 CitySelect from '../../components/SelectButton/CitySelect2'
 import { createForm, FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import apis from '../../services/apis';
@@ -29,20 +29,27 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   let newsVisible = false
   let helpVisible = false
   let groupVisible = false
-  let h5Visible=false
   let buildingId = ''
   let cityId=''
   let locationType = false
+  let isHaveActive=false
+  let isCanChoose=true
 
   const setExtraData = (data) => {
     console.log(data, 'data');
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        data.contentType=null
+        data.buildingId=null
+      }
+    }
 
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
     helpVisible = data.contentType === 'help';
     groupVisible = data.contentType === 'group';
-    h5Visible = data.contentType === 'h5';
 
     cityId=data.cityId
     buildingId = data.buildingId
@@ -50,6 +57,24 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     console.log(locationType, 'locationType');
   }
 
+  const setExtraData1 = (data) => {
+     if(data.title){
+        isHaveActive=true
+     }else{
+        isHaveActive=false
+     }
+     debugger
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    buildingId = data.buildingId
+    locationType = data.showPosition === 'mall';
+    console.log(locationType, 'locationType');
+  }
+
+
   const handleFormValueChange = (props, changedValues, allValues) => {
       setExtraData(allValues)
   }
@@ -62,6 +87,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     const [data, setData] = useState({})
 
     if (contentId) {
+      isCanChoose=false
       // eslint-disable-next-line react-hooks/rules-of-hooks
       useEffect(() => {
         getDetail(contentId);
@@ -71,10 +97,12 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       const getDetail = contentId => {
         request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
             console.log(data)
-            setExtraData(data)
+            setExtraData1(data)
             setData(data)
         })
       }
+    }else{
+      isCanChoose=true
     }
 
     const cancelPage = () => {
@@ -84,10 +112,21 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     }
 
       const fields = [
+        {
+          label: '是否关联项目',
+          name: 'isHaveActive',
+          type: FieldTypes.Switch,
+          value:isHaveActive,
+          hidden: () => !isCanChoose,
+          rules: [
+            { required: true,message: '是否城市活动' },
+          ],
+        },
         {
           label: '所属项目',
           name: 'buildingId',
-          render: <BuildSelect/>,
+          render: <BuildSelect />,
+          hidden: () => !isHaveActive,
           value: data.buildingId,
           rules: [
             { required: true, message: '请选择所属项目' },
@@ -96,7 +135,8 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         {
           label: '展示城市',
           name: 'cityId',
-          render: <CitySelect/>,
+          render: <CitySelect />,
+          hidden: () => isHaveActive,
           value: data.cityId,
           rules: [
             { required: true, message: '请选择展示城市' },
@@ -129,12 +169,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: true,
+          hidden: () => !isHaveActive,
           rules: [
             { required: true, message: '请输入标题' },
           ],
@@ -143,6 +193,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           label: '类型',
           name: 'contentType',
           type: FieldTypes.Select,
+          hidden: () => !isHaveActive,
           dict: [{
             label: '常规活动',
             value: 'activity',
@@ -166,14 +217,10 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           {
             label: '助力',
             value: 'help',
-          },
-          {
-            label: 'H5',
-            value: 'h5',
           }],
           value: data.contentType,
           rules: [
-            { required: false, message: '请选择类型' },
+            { required: true, message: '请选择类型' },
           ],
         },
         {
@@ -226,16 +273,6 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             { required: true, message: '请选择发布拼团' },
           ],
         },
-        {
-          label: '发布H5',
-          name: 'targetId',
-          render: <SelectH5/>,
-          hidden: () => !h5Visible,
-          value: data.targetId,
-          rules: [
-            { required: true, message: '请选择发布H5' },
-          ],
-        },
         {
           label: '状态',
           name: 'status',
@@ -253,6 +290,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       ]
 
       const handleSubmit = val => {
+        debugger
         val.showType = 'banner'
         if (contentId) {
           request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
@@ -261,6 +299,9 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             message.info(err.msg || err.message)
           })
         } else {
+          if(!val.isHaveActive&&val.targetId) {
+            val.contentType='h5'
+          }
           request({ ...apis.carsuseFigure.addExtendContent, data: val }).then(data => {
             cancelPage()
           }).catch(err => {