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

src/pages/carouselFigure/editAdvertising.jsx

@@ -177,10 +177,6 @@ import SelectH5 from './SelectH5';
           label: '资讯',
           value: 'news'
         },
-        {
-          label: '其他',
-          value: 'other'
-        },
         {
           label: '拼团',
           value: 'group'
@@ -263,7 +259,11 @@ import SelectH5 from './SelectH5';
     const handleSubmit = val => {
       val.showType = 'screen'
       if(!val.isHaveActive&&val.targetId) {
-        val.contentType='h5'
+        if(val.contentType){
+            console.log(1)
+        }else{
+          val.contentType='h5'
+        }
       }
       if(contentId){
         request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {

src/pages/carouselFigure/editCarousel.jsx

@@ -292,7 +292,11 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       const handleSubmit = val => {
         val.showType = 'banner'
         if(!val.isHaveActive&&val.targetId) {
-          val.contentType='h5'
+          if(val.contentType){
+              console.log(1)
+          }else{
+            val.contentType='h5'
+          }
         }
         if (contentId) {
           request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {