lf

src/components/SelectButton/CitySelect.jsx

@@ -42,12 +42,12 @@ const CitySelect = (props) => {
   }
 
   return (
-      <Select 
-      showSearch 
+      <Select
+      showSearch
       value={props.value}
       style={{ width: '180px' }}
-      placeholder="请选择城市" 
-      onChange={props.onChange} 
+      placeholder="请选择城市"
+      onChange={props.onChange}
       filterOption={(input, option) =>
         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }
@@ -59,4 +59,3 @@ const CitySelect = (props) => {
   )
 }
 export default CitySelect
-

src/pages/carouselFigure/SelectH5.jsx

@@ -27,6 +27,8 @@ export default props => {
       },
     }).then(data => {
       setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
     })
   }, []);
 

src/pages/carouselFigure/editAdvertising.jsx

@@ -28,24 +28,40 @@ import SelectH5 from './SelectH5';
   let helpVisible = false
   let groupVisible = false
   let buildingId = ''
+  let cityId = ''
   let isHaveActive=true
 
   const setExtraData = (data) => {
     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';
-
+    cityId=data.cityId
     buildingId = data.buildingId
   }
 
+  const setExtraData1 = (data) => {
+     if(data.title){
+         isHaveActive=true
+     }else{
+        isHaveActive=false
+     }
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+
+  }
+
   const handleFormValueChange = (props, changedValues, allValues) => {
-    setExtraData(allValues)
+      setExtraData(allValues)
   }
 
   const XForm = createForm({ onValuesChange: handleFormValueChange })
@@ -63,7 +79,7 @@ import SelectH5 from './SelectH5';
       // 查询列表
       const getDetail = (contentId) => {
         request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
-          setExtraData(data)
+          setExtraData1(data)
           setData(data)
         })
       }
@@ -77,7 +93,7 @@ import SelectH5 from './SelectH5';
 
     const fields = [
       {
-        label: '项目活动',
+        label: '是否关联活动',
         name: 'isHaveActive',
         type: FieldTypes.Switch,
         value:isHaveActive,

src/pages/carouselFigure/editCarousel.jsx

@@ -30,6 +30,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   let helpVisible = false
   let groupVisible = false
   let buildingId = ''
+  let cityId=''
   let locationType = false
   let isHaveActive=true
 
@@ -38,6 +39,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     isHaveActive=data.isHaveActive
     if(!isHaveActive) {
       data.contentType=null
+      data.buildingId=null
     }
 
     contentVisible = data.contentType === 'other';
@@ -46,14 +48,31 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     helpVisible = data.contentType === 'help';
     groupVisible = data.contentType === 'group';
 
+    cityId=data.cityId
     buildingId = data.buildingId
     locationType = data.showPosition === 'mall';
     console.log(locationType, 'locationType');
   }
 
+  const setExtraData1 = (data) => {
+     if(data.title){
+        isHaveActive=true
+     }else{
+        isHaveActive=false
+     }
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+
+    locationType = data.showPosition === 'mall';
+    console.log(locationType, 'locationType');
+  }
+
 
   const handleFormValueChange = (props, changedValues, allValues) => {
-    setExtraData(allValues)
+      setExtraData(allValues)
   }
 
   const XForm = createForm({ onValuesChange: handleFormValueChange })
@@ -73,7 +92,7 @@ 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)
       })
     }
@@ -87,7 +106,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
       const fields = [
         {
-          label: '项目活动',
+          label: '是否关联活动',
           name: 'isHaveActive',
           type: FieldTypes.Switch,
           value:isHaveActive,