Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/carouselFigure/editAdvertising.jsx

@@ -258,12 +258,12 @@ import SelectH5 from './SelectH5';
 
     const handleSubmit = val => {
       val.showType = 'screen'
-      if(!val.isHaveActive&&val.targetId) {
+      if(!isHaveActive&&val.targetId) {
           if(!val.contentType){
             val.contentType='h5'
           }
       }
-      if(!val.isHaveActive&&!val.targetId){
+      if(!isHaveActive&&!val.targetId){
         val.contentType=''
       }
       if(contentId){

src/pages/carouselFigure/editCarousel.jsx

@@ -290,13 +290,14 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       ]
 
       const handleSubmit = val => {
+        console.log(val,"232323")
         val.showType = 'banner'
-        if(!val.isHaveActive&&val.targetId) {
+        if(!isHaveActive&&val.targetId) {
           if(!val.contentType){
             val.contentType='h5'
           }
         }
-        if(!val.isHaveActive&&!val.targetId){
+        if(!isHaveActive&&!val.targetId){
           val.contentType=''
         }
         if (contentId) {

src/pages/carouselFigure/propaganda.jsx

@@ -51,6 +51,7 @@ import SelectH5 from './SelectH5';
   }
 
   const setExtraData1 = (data) => {
+    console.log(data,"datadatadata")
     if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing'){
        isHaveActive=false
     }else{
@@ -257,13 +258,14 @@ import SelectH5 from './SelectH5';
     ]
 
     const handleSubmit = val => {
+      console.log(val,"valvalval")
       val.showType = 'propaganda'
-      if(!val.isHaveActive&&val.targetId) {
+      if(!isHaveActive&&val.targetId) {
           if(!val.contentType){
             val.contentType='h5'
           }
       }
-      if(!val.isHaveActive&&!val.targetId){
+      if(!isHaveActive&&!val.targetId){
         val.contentType=''
       }
       if(contentId){