bug

src/pages/carouselFigure/editAdvertising.jsx

@@ -37,16 +37,17 @@ const createEditor = () => {
   let isHaveActive = false
   let isCanChoose = true
   let isHavePosition = false
+  let islet = true
 
   const setExtraData = (data) => {
-    if (data.isHaveActive != undefined) {
+    if (data.isHaveActive !== undefined) {
       isHaveActive = data.isHaveActive
       if (!isHaveActive) {
         // data.contentType=null
         data.buildingId = null
       }
     }
-
+    islet = isHaveActive
     if (data.showPosition == 'index') {
       isHavePosition = true;
     } else {
@@ -69,17 +70,31 @@ const createEditor = () => {
     h5Visible = data.contentType === 'h5';
 
     cityId = data.cityId
+    // console.log(data.buildingId, ' data.buildingId')
     buildingId = data.buildingId
   }
 
   const setExtraData1 = data => {
     console.log(data, "data.buildingIddata.buildingId2")
+    islet = isHaveActive
+
     if ((data.contentType === 'h5' && data.buildingId == null) || data.contentType === '' || data.contentType === 'nothing' || (data.contentType === 'live' && data.buildingId == null)) {
       isHaveActive = false
     } else {
       isHaveActive = true
     }
+    // if (!isHaveActivea && data.contentType === 'h5') {
+    //   // data.contentType=null
+    //   data.buildingId = null
+    // }
 
+    // if (data.isHaveActive !== undefined) {
+    //   isHaveActive = data.isHaveActive
+    //   if (!isHaveActive) {
+    //     // data.contentType=null
+    //     data.buildingId = null
+    //   }
+    // }
     if (data.showPosition == 'index') {
       isHavePosition = true;
     } else {
@@ -94,6 +109,8 @@ const createEditor = () => {
     salesBatchVisible = data.contentType === 'salesBatch';
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
+
+    console.log(data.buildingId, ' data.buildingId')
     buildingId = data.buildingId
   }
 
@@ -270,9 +287,9 @@ const createEditor = () => {
         ],
       },
       {
-        label: '是否发布H5活动',
+        label: '发布H5活动',
         name: 'targetId',
-        render: <SelectH5 buildingId={() => buildingId} />,
+        render: <SelectH5 buildingId={() => islet ? buildingId : ''} />,
         hidden: () => !h5Visible,
         value: data.targetId,
         rules: [