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

src/components/SelectButton/BuildSelect.jsx

@@ -32,7 +32,7 @@ const BuildingSelect = props => {
   }, [])
 
   const getCityList = e => {
-    request({ ...apis.building.getList, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
         setData(data.records)
         // 默认选中第一个
         if (props.checkFirst) {

src/pages/carouselFigure/advertisingList.jsx

@@ -183,8 +183,12 @@ const deleteCarouse = (contentId) => () =>{
 
   }
   
-  const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, showType: 'screen' })
+  const changePageNum = (pageNumber, props) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'screen' })
+      }
+    });
   }
 
   // 提交事件
@@ -262,7 +266,7 @@ const handleSubmit = (e, props) => {
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e,props)} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/carouselFigureList.jsx

@@ -183,8 +183,13 @@ const deleteCarouse = (contentId) => () =>{
 
   }
   
-  const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner' })
+  const changePageNum = (pageNumber, props) => {
+      props.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('提交数据: ', values)
+          getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'banner' })
+        }
+      });
   }
 
   // 提交事件
@@ -262,7 +267,7 @@ const handleSubmit = (e, props) => {
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e,props)} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/editAdvertising.jsx

@@ -259,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 => {