lf

src/pages/carouselFigure/SelectH5.jsx

@@ -53,12 +53,13 @@ export default props => {
       <Modal
         title="请选择H5"
         visible={visible}
+         onCancel={() => setVisible(false)}
          footer={[
             <Button key="back" onClick={() => setVisible(false)}>
               取消
             </Button>,
             <Button key="cancel" onClick={() => setData(value)}>
-              重置
+              清空
             </Button>,
             <Button key="submit" type="primary" onClick={() => {
               updateGroup(value)

src/pages/carouselFigure/editAdvertising.jsx

@@ -51,7 +51,7 @@ import SelectH5 from './SelectH5';
   }
 
   const setExtraData1 = (data) => {
-    if(data.contentType=='h5'||data.contentType==undefined||data.contentType==null){
+    if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing'){
        isHaveActive=false
     }else{
        isHaveActive=true
@@ -259,11 +259,12 @@ import SelectH5 from './SelectH5';
     const handleSubmit = val => {
       val.showType = 'screen'
       if(!val.isHaveActive&&val.targetId) {
-        if(val.contentType){
-            console.log(1)
-        }else{
-          val.contentType='h5'
-        }
+          if(!val.contentType){
+            val.contentType='h5'
+          }
+      }
+      if(!val.isHaveActive&&!val.targetId){
+        val.contentType=''
       }
       if(contentId){
         request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {

src/pages/carouselFigure/editCarousel.jsx

@@ -58,7 +58,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   }
 
   const setExtraData1 = (data) => {
-     if(data.contentType=='h5'||data.contentType==undefined||data.contentType==null){
+     if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing'){
         isHaveActive=false
      }else{
         isHaveActive=true
@@ -292,12 +292,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       const handleSubmit = val => {
         val.showType = 'banner'
         if(!val.isHaveActive&&val.targetId) {
-          if(val.contentType){
-              console.log(1)
-          }else{
+          if(!val.contentType){
             val.contentType='h5'
           }
         }
+        if(!val.isHaveActive&&!val.targetId){
+          val.contentType=''
+        }
         if (contentId) {
           request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
             cancelPage()