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

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -24,10 +24,16 @@ const UserBehavior = (props) => {
   //柱图
 
   useEffect(() => {
-    getUserBehaviorSummary(formatDate(props.startDate, props.endDate))
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType
+    })
     getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
 
-  }, [props.startDate, props.endDate])
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType])
 
   function getUserBehaviorSummary(params) {
 

src/pages/indexEcharts/userBehavior.jsx

@@ -32,13 +32,13 @@ const header = props => {
     getProperties()
 
   }, [])
-  const [eventypes, setEventType] = useState([])
+  const [eventypes, setEventTypes] = useState([])
   function getBizEventType(row) {
 
     request({
       ...apis.indexEcharts.bizEvent.dict,
     }).then((data) => {
-      setEventType(data.records)
+      setEventTypes(data.records)
 
     })
   }
@@ -77,10 +77,8 @@ const header = props => {
 
     setEndDate(new Date())
     setStartDate(moment().subtract(days, 'day').toDate())
-
   }
 
-
   function datalist() {
 
     setEndDate(daterange[1])
@@ -93,8 +91,20 @@ const header = props => {
 
     console.log('行为回调数据：', e)
   }
-  function handleChange(value) {
-    console.log(`selected ${value}`);
+  const [eventType, setEventType] = useState('')
+  function handleChangeType(value) {
+    console.log(value,"1111111111111");
+    setEventType(value)
+  }
+  const [event, setEvent] = useState('')
+  function handleChangeEvent(value) {
+    console.log(value,"222222222222");
+    setEvent(value)
+  }
+  const [activity, setActivity] = useState('')
+  function handleChangeProperty(value) {
+    console.log(value,"33333333333333");
+    setActivity(value)
   }
 
   const columns = [
@@ -162,17 +172,17 @@ const header = props => {
       <div style={{ display: 'flex', margin: '24px 0' }}>
         <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
        
-        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChange}>
+        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
           {eventypes.map(type => (
             <Option key={type.typeId}>{type.typeName}</Option>
           ))}
       </Select>
-        <Select  style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChange}>
+        <Select  style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
           {eventList.map(event => (
             <Option key={event.eventId}>{event.eventName}</Option>
           ))}
       </Select>
-        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChange}>
+        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
           {properties.map(property => (
             <Option key={property.propertyId}>{property.propertyName}</Option>
           ))}
@@ -182,7 +192,7 @@ const header = props => {
 
 
       <div style={{ margin: '24px 0' }}>
-        <UserBehavior BuildSelectHide={true} endDate={endDate} startDate={startDate} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
+        <UserBehavior BuildSelectHide={true} endDate={endDate} startDate={startDate}  eventType={eventType} activity={activity}  event={event} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
       </div>
 
       <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} />

src/pages/news/list/editNewsList.jsx

@@ -37,15 +37,22 @@ const { TextArea } = Input;
 
   // 查询列表
   const getDynamicData = (newsId) => {
-    request({
-        url: '/api/admin/taNews/' + newsId,
-        method: 'GET',
-        params: { newsId },
-    }).then((data) => {
-        console.log(data)
+    request({ ...apis.news.get, urlData: { id: newsId },}).then((data) => {
         setDynamicData(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
     })
-  }
+
+    // request({
+    //     url: '/api/admin/taNews/' + newsId,
+    //     method: 'GET',
+    //     params: { newsId },
+    // }).then((data) => {
+    //     console.log(data)
+    //     setDynamicData(data)
+    // })
+    }
   }
 
   const cancelPage = () =>{
@@ -101,25 +108,38 @@ const { TextArea } = Input;
       let {...submitValue} = val
       if(newsId){
         submitValue.newsId = newsId
-        request({
-          url: '/api/admin/taNews/' + newsId,
-          method: 'PUT',
-          data: submitValue,
-        }).then((data) => {
-          cancelPage()
+        request({ ...apis.news.cancel, urlData: { id: newsId },}).then((data) => {
+          cancelPage();
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
+
+      
+        // request({
+        //   url: '/api/admin/taNews/' + newsId,
+        //   method: 'PUT',
+        //   data: submitValue,
+        // }).then((data) => {
+        //   cancelPage()
+        // }).catch((err) => {
+        //   message.info(err.msg || err.message)
+        // })
       }else{
-        request({
-          url: '/api/admin/taNews',
-          method: 'POST',
-          data: submitValue,
-        }).then((data) => {
-          cancelPage()
+        request({ ...apis.news.post, data: { submitValue },}).then((data) => {
+          cancelPage();
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
+
+        // request({
+        //   url: '/api/admin/taNews',
+        //   method: 'POST',
+        //   data: submitValue,
+        // }).then((data) => {
+        //   cancelPage()
+        // }).catch((err) => {
+        //   message.info(err.msg || err.message)
+        // })
       }
     }
     

src/pages/news/type/editNews.jsx

@@ -5,6 +5,7 @@ import channels from '../../channel/channelList.less';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../../components/XForm';
 import router from 'umi/router';
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
 const { TextArea } = Input;
@@ -21,6 +22,12 @@ const header = props => {
 
   // 查询列表
   const getNewsData = (newsId) => {
+    request({ ...apis.newsType.get, urlData: { id: newsId },}).then((data) => {
+      cancelPage();
+    }).catch((err) => {
+      message.info(err.msg || err.message)
+    })
+
     request({
         url: '/api/admin/taNewsType/' + newsId,
         method: 'GET',
@@ -61,26 +68,28 @@ const header = props => {
    
   const handleSubmit = (values) => {
     if(newsId){
-      values.newsTypeId = newsId
-      request({
-        url: '/api/admin/taNewsType/' + newsId,
-        method: 'PUT',
-        data: values,
-      }).then((data) => {
-        cancelPage()
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
+        values.newsTypeId = newsId
+        request({ ...apis.newsType.put, urlData: { id: newsId },}).then((data) => {
+          cancelPage();
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
       }else{
-      request({
-        url: '/api/admin/taNewsType',
-        method: 'POST',
-        data: values,
-      }).then((data) => {
-        cancelPage()
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
+        request({ ...apis.newsType.post, data: { values },}).then((data) => {
+          cancelPage();
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+
+      // request({
+      //   url: '/api/admin/taNewsType',
+      //   method: 'POST',
+      //   data: values,
+      // }).then((data) => {
+      //   cancelPage()
+      // }).catch((err) => {
+      //   message.info(err.msg || err.message)
+      // })
       }
   }
 

src/services/apis.js

@@ -137,6 +137,16 @@ export default {
         url: `${prefix}/taNews/:id`,
         action: 'admin.taNews.id.put',
     },
+    get: {
+        method: 'GET',
+        url: `${prefix}/taNews/:id`,
+        action: 'admin.taNews.id.get',
+    },
+    post: {
+      method: 'GET',
+      url: `${prefix}/taNews`,
+      action: 'admin.taNews.id.post',
+    },
   },
   newsType: {
     list: {
@@ -149,6 +159,21 @@ export default {
         url: `${prefix}/taNewsType/:id`,
         action: 'admin.taNewsType.id.delete',
     },
+    put: {
+      method: 'PUT',
+      url: `${prefix}/taNewsType/:id`,
+      action: 'admin.taNewsType.id.delete',
+    },
+    post: {
+      method: 'POST',
+      url: `${prefix}/taNewsType`,
+      action: 'admin.taNewsType.post',
+    },
+    get: {
+      method: 'GET',
+      url: `${prefix}/taNewsType/:id`,
+      action: 'admin.taNewsType.get',
+    }
   },
   customer: {
     drift: {