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

src/components/SelectButton/NewTypeSelect.jsx

@@ -49,7 +49,7 @@ const NewsTypeSelect = (props) => {
   }
 
   return (
-      <Select value={'' === value ? undefined : value} style={{ width: '180px' }} placeholder="请选择资讯类型" onChange={handleChange}>
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择资讯类型" onChange={handleChange}>
           {data.map(type => (
             <Option key={type.newsTypeId} value={type.newsTypeId}>{type.newsTypeName}</Option>
           ))}

src/layouts/BasicLayout.jsx

@@ -103,7 +103,7 @@ const BasicLayout = props => {
       }}
       breadcrumbRender={(routers = []) => [
         {
-          path: '/welcome',
+          path: '/',
           breadcrumbName: formatMessage({
             id: 'menu.home',
             defaultMessage: 'Home',

src/pages/activity/detailActivity.jsx

@@ -114,6 +114,7 @@ const BasicForm = props => {
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
         {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
           rules: [
             {
               required: true,

src/pages/activity/drainage/DrainageList.jsx

@@ -306,14 +306,12 @@ const header = (props) => {
         )}
       </Form.Item>
       <Form.Item label="下架时间">
-        {getFieldDecorator('endDate',{initialValue : formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null,
+        {getFieldDecorator('endDate',{initialValue : formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
           rules: [
             { required: true, message: '请输入下架时间' },
           ]})(
           <DatePicker
-          // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-          // placeholder={formsdate.endDate}
-          // value= formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
+          showTime={{ format: 'HH:mm:ss' }}
           />,
         )}
       </Form.Item>
@@ -436,7 +434,7 @@ const header = (props) => {
   //打开新页面
   const openIndexImg = () => {
     const newWin=window.open('about:blank');
-    newWin.location.href="https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3632677651,3179755979&fm=26&gp=0.jpg"
+    newWin.location.href="https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1575876908239-1.jpg"
   }
   
   const { getFieldDecorator } = props.form;
@@ -491,7 +489,7 @@ const header = (props) => {
         <AuthButton name="admin.taDrainage.add.post" noRight={null}>
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
         </AuthButton>
-          <span style={{ color: '#66B3FF', cursor: 'pointer', marginLeft: 20 }} onClick={openIndexImg}>什么是H5活动？</span>
+          <span style={{ color: '#66B3FF', cursor: 'pointer', marginLeft: 20 }} onClick={openIndexImg}>优质案例</span>
         <Modal
           title={title}
 

src/pages/activity/drainage/DrainageVisitRecordList.jsx

@@ -38,6 +38,12 @@ const header = props => {
    */
 
   const columns = [
+    {
+      title: '活动编号',
+      dataIndex: 'targetId',
+      key: 'targetId',
+      align: 'center',
+    },
     {
       title: '活动名称',
       dataIndex: 'activityName',

src/pages/activity/groupActivity/detailActivity.jsx

@@ -41,22 +41,6 @@ const getSignList = groupActivityId => {
       });
 }
 
-const newQrcode = row => {
-  const x = new XMLHttpRequest();
-  const resourceUrl = row.qrCode
-  x.open('GET', resourceUrl, true);
-  x.responseType = 'blob';
-  x.onload = function (e) {
-    const url = window.URL.createObjectURL(x.response)
-    const a = document.createElement('a');
-    a.href = url;
-    a.style.display = 'none'
-    a.download = '活动二维码.png';
-    a.click();
-  }
-  x.send();
-}
-
 const BasicForm = props => {
   // const [activityStatus, setActivityStatus] = useState(1)
   // const [disable, setDisable] = useState(false)
@@ -114,6 +98,7 @@ const BasicForm = props => {
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
         {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
           rules: [
             {
               required: true,

src/pages/activity/helpActivity/detailActivity.jsx

@@ -41,26 +41,10 @@ const getSignList = helpActivityId => {
       });
 }
 
-const newQrcode = row => {
-  const x = new XMLHttpRequest();
-  const resourceUrl = row.qrCode
-  x.open('GET', resourceUrl, true);
-  x.responseType = 'blob';
-  x.onload = function (e) {
-    const url = window.URL.createObjectURL(x.response)
-    const a = document.createElement('a');
-    a.href = url;
-    a.style.display = 'none'
-    a.download = '活动二维码.png';
-    a.click();
-  }
-  x.send();
-}
-
 const BasicForm = props => {
 
   const detailData = props.detailData || {}
-
+  
   const { helpActivityId } = props
 
   const handleSubmit = e => {
@@ -111,6 +95,7 @@ const BasicForm = props => {
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
         {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
           rules: [
             {
               required: true,

src/pages/carouselFigure/SelectActivity.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import{ Select, Modal } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
-const getActivities = fetch(apis.activity.list)
+const getActivities = fetch(apis.activity.listSelected)
 
 export default (props) => {
   const {

src/pages/carouselFigure/SelectH5.jsx

@@ -24,6 +24,8 @@ export default props => {
       params: {
         pageNum: 1,
         pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
       },
     }).then(data => {
       setList(data.records || [])

src/pages/carouselFigure/SelectHelp.jsx

@@ -28,6 +28,7 @@ export default props => {
         buildingId,
         pageNum: 1,
         pageSize: 999,
+        status: 1,
       },
     }).then(data => {
       setList(data.records || [])

src/pages/carouselFigure/SelectNews.jsx

@@ -25,6 +25,7 @@ export default props => {
         buildingId,
         pageNum: 1,
         pageSize: 999,
+        newsStatus: 0,
       },
     }).then(data => {
       setList(data.records || [])

src/pages/carouselFigure/carouselFigureList.jsx

@@ -158,6 +158,7 @@ const deleteCarouse = (contentId) => () =>{
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {
                   console.log(err)
+                  row.status = 0
                   message.info(err.msg || err.message)
               })
           },
@@ -175,6 +176,7 @@ const deleteCarouse = (contentId) => () =>{
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {
                   console.log(err)
+                  row.status = 1
                   message.info(err.msg || err.message)
               })
           },
@@ -183,13 +185,8 @@ const deleteCarouse = (contentId) => () =>{
 
   }
   
-  const changePageNum = (pageNumber, props) => {
-      props.form.validateFields((err, values) => {
-        if (!err) {
-          console.log('提交数据: ', values)
-          getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'banner' })
-        }
-      });
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner' })
   }
 
   // 提交事件
@@ -267,7 +264,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={e => changePageNum(e,props)} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/editAdvertising.jsx

@@ -177,10 +177,6 @@ import SelectH5 from './SelectH5';
           label: '资讯',
           value: 'news'
         },
-        {
-          label: '其他',
-          value: 'other'
-        },
         {
           label: '拼团',
           value: 'group'

src/pages/customer/customerlist/components/integralRecord.jsx

@@ -113,7 +113,8 @@ class ModalIntegralRecord extends React.Component {
         title: '序号',
         dataIndex: 'index',
         key: 'index',
-        render: (text, record, index) => <span>{(this.state.dataSource.result.total - this.state.dataSource.result.records.length) * 1 + index + 1}</span>,
+        render: (text, record, index) => <span>{index + 1}</span>,
+        // render: (text, record, index) => <span>{(this.state.dataSource.result.total - this.state.dataSource.result.records.length) * 1 + index + 1}</span>,
       },
       {
         title: '积分类型',

src/pages/customer/customerlist/customerDetail.jsx

@@ -78,6 +78,12 @@ function onChange(number) {
       key: 'activity',
       align: 'center',
     },
+    {
+      title: '访问内容',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+    },
     {
       title: '访问时间',
       dataIndex: 'visitTime',

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -79,6 +79,12 @@ function onChange(number) {
       key: 'activity',
       align: 'center',
     },
+    {
+      title: '访问内容',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+    },
     {
       title: '访问时间',
       dataIndex: 'visitTime',

src/services/apis.js

@@ -393,6 +393,11 @@ export default {
         url: `${prefix}/iBuildingDynamicList`,
         action: 'admin.iBuildingDynamicList.get',
       },
+      listSelected: {
+        method: 'GET',
+        url: `${prefix}/iBuildingDynamicSelected`,
+        action: 'admin.iBuildingDynamicList.get',
+      },
       weight: {
         method: 'PUT',
         url: `${prefix}/buildingDynamic/weight`,