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

src/pages/carouselFigure/editAdvertising.jsx

@@ -85,8 +85,8 @@ import SelectH5 from './SelectH5';
       // 查询列表
       const getDetail = (contentId) => {
         request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
-          setData(data)
           setExtraData1(data)
+          setData(data)
         })
       }
     }else{
@@ -262,6 +262,9 @@ import SelectH5 from './SelectH5';
 
     const handleSubmit = val => {
       val.showType = 'screen'
+      if(!val.isHaveActive&&val.targetId) {
+        val.contentType='h5'
+      }
       if(contentId){
         request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
@@ -269,9 +272,6 @@ import SelectH5 from './SelectH5';
           message.info(err.msg || err.message)
         })
       }else{
-        if(!val.isHaveActive&&val.targetId) {
-          val.contentType='h5'
-        }
         request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {

src/pages/carouselFigure/editCarousel.jsx

@@ -290,8 +290,10 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       ]
 
       const handleSubmit = val => {
-        debugger
         val.showType = 'banner'
+        if(!val.isHaveActive&&val.targetId) {
+          val.contentType='h5'
+        }
         if (contentId) {
           request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
             cancelPage()
@@ -299,9 +301,6 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             message.info(err.msg || err.message)
           })
         } else {
-          if(!val.isHaveActive&&val.targetId) {
-            val.contentType='h5'
-          }
           request({ ...apis.carsuseFigure.addExtendContent, data: val }).then(data => {
             cancelPage()
           }).catch(err => {

src/pages/customer/report/index.jsx

@@ -174,7 +174,7 @@ function body(props) {
               {getFieldDecorator('sex')(
                 <Select style={{ width: '180px' }} placeholder="性别" onChange={handleSelectChange}>
                   <Option value="1">男</Option>
-                  <Option value="0">女</Option>
+                  <Option value="2">女</Option>
                 </Select>,
               )}
             </Form.Item>