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

src/pages/activity/drainage/Detail.jsx

@@ -171,6 +171,7 @@ const header = (props) => {
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>
+            <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>  
         </Form.Item>
       </Form>
       <div>

src/pages/building/list/add/components/modalImage.jsx

@@ -198,7 +198,7 @@ class ModalImage extends React.Component {
                 {getFieldDecorator('buildingArea', {
                   rules: [{ message: '请填写面积' },
                           {
-                            pattern: new RegExp('^[0-9]*$'),
+                            pattern: new RegExp('^[0-9]+\.[0-9]{2}$'),
                             message: '只允许输入数字',
                           },
                   ],
@@ -209,7 +209,7 @@ class ModalImage extends React.Component {
                   rules: [
                     // { required: true, message: '请填写套内面积' },
                           {
-                            pattern: new RegExp('^[0-9]*$'),
+                            pattern: new RegExp('^[0-9]+\.[0-9]{2}$'),
                             message: '只允许输入数字',
                           },
                   ],

src/pages/building/list/index.jsx

@@ -142,7 +142,7 @@ function CartBody(props) {
           <span className={Styles.title}>录入时间</span>
           <span >：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </p>
-        <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.106rem' }}>
+        <p style={{ margin: '20px 0', position: 'relative', fontSize: '0.106rem' }}>
           <AuthButton name="admin.building.public" noRight={null}>
             <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
               {/* 已发布的时候，需要显示取消发布的字样 */}
@@ -152,7 +152,7 @@ function CartBody(props) {
           </AuthButton>
           <AuthButton name="admin.building.delete" noRight={null}>
             <span style={{
-              color: '#FF4A4A', position: 'absolute', right: '0',
+              color: '#FF4A4A', position: 'absolute', right: '0',bottom:'0'
             }} onClick={() => deleteBuilding(data)}>
               删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />

src/pages/carouselFigure/customImg/edit.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from '../../channel/channelList.less';
+import { connect } from 'dva';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import { createForm, FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
@@ -26,9 +27,16 @@ const handleFormValueChange = (props, changedValues, allValues) => {
 const XForm = createForm({ onValuesChange: handleFormValueChange })
 
 const header = props => {
-  
+  const {
+    currentUser = {
+      avatar: '',
+      userName: '',
+    },
+    menu,
+  } = props;
+
   const imgId = props.location.query.imgId
-  const [ data, setData ] = useState({'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图','imgDocument': '小程序名字 精准获客平台'})
+  const [ data, setData ] = useState({'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图','imgDocument': currentUser.orgName+' 精准获客平台'})
   if(imgId){
     useEffect(() => {
       getData(imgId);
@@ -114,4 +122,7 @@ const header = props => {
 }
 
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
-export default WrappedNormalLoginForm
+
+export default connect(({ user }) => ({
+  currentUser: user.currentUser,
+}))(WrappedNormalLoginForm);

src/pages/customer/customerlist/customerDetail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table, Pagination } from 'antd';
+import { Form, Table, Pagination, Button } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from './style.less';
 import apis from '../../../services/apis';
@@ -115,6 +115,7 @@ function header(props) {
   ];
   return (
     <>
+      <Button type="danger" style={{ marginBottom: '18px' }} onClick={() => router.go(-1)}>返回</Button>
       <div className={styles.cardBox}>
         <div className={styles.rightBox}>
           <p className={styles.tit}>客户信息</p>
@@ -127,7 +128,7 @@ function header(props) {
             </div>
             <div className={styles.Centered}>
               <p>访问时长：{data.duration}秒</p>
-              <p>访问次数：{data.visitTimes}</p>
+              <p>访问次数：{data.visitTimes}次</p>
               <p className={styles.rightItem}>客户描述：{data.describe}</p>
               {/* <p>预约人数：{ data.visiteNum }</p> */}
             </div>
@@ -158,7 +159,7 @@ function header(props) {
             <img className={styles.touxiangphoto} src={data.consultant && data.consultant.photo} />
             <p >{data.consultant && data.consultant.userName}</p>
           </div>
-          <div className={styles.right}>
+          <div className={styles.rightphone}>
             {/* <p className={styles.infoItem}>姓名：{ data.consultant && data.consultant.name }</p>
           <p className={styles.infoItem}>部门：{ data.consultant && data.consultant.department }</p> */}
             <p className={styles.infoItem}>号码：{data.consultant && data.consultant.phone} </p>

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table, Pagination } from 'antd';
+import { Form, Table, Pagination,Button } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import publicStyle from './publicStyle.less';
 import apis from '../../../services/apis';
@@ -117,6 +117,7 @@ function onChange(number) {
 
   return (
     <>
+    <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px' }}>返回</Button>
       <div className={publicStyle.cardBox}>
      {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
         <div className={publicStyle.rightBox}>
@@ -129,7 +130,7 @@ function onChange(number) {
           </div>
           <div className={publicStyle.Centered}>
           <p>访问时长：{ data.duration }秒</p>
-          <p>访问次数：{ data.visitTimes }</p>
+          <p>访问次数：{ data.visitTimes }次</p>
           <p className={publicStyle.rightItem}>来访渠道：{data.personFrom}</p>
           {/* <p>预约人数：{ data.visiteNum }</p> */}
           </div>

src/pages/customer/customerlist/style.less

@@ -176,6 +176,12 @@
     // top:108px;
     // left:170px;
   }
+  .rightphone{
+  
+    position: absolute;
+    top:108px;
+    left:170px;
+  }
   .left{
     position: absolute;
     top:108px;

src/pages/indexEcharts/newUsers.jsx

@@ -4,7 +4,7 @@ import { Row, Col, Menu, Dropdown } from 'antd';
 import NewUsers from './components/NewUsers'
 // import XForm, { FieldTypes } from '../../components/XForm';
 import moment from 'moment';
-
+import router from 'umi/router';
 import EChart from '../../components/EchartsTest/EChart';
 import request from '../../utils/request';
 import apis from '../../services/apis';
@@ -101,6 +101,7 @@ const header = props => {
       <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={datalist}>
         搜索
           </Button>
+          <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>  
       <div>
         <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
         {/* */}

src/pages/indexEcharts/userSource.jsx

@@ -7,7 +7,7 @@ import moment from 'moment';
 import EChart from '../../components/EchartsTest/EChart';
 import request from '../../utils/request';
 import apis from '../../services/apis';
-
+import router from 'umi/router';
 
 
 const { RangePicker } = DatePicker;
@@ -159,6 +159,7 @@ class Header extends React.Component {
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
           查询
         </Button>
+        <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>
         <div>
   
           <div style={{ display: 'flex' }}>

src/pages/news/list/NewsList.jsx

@@ -226,7 +226,7 @@ function body(props) {
           </p>
 
           <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
-            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span>
+            {/* <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span> */}
             <span>收藏数量：{data.saveNum}</span>
           </p>
 

src/pages/style/GoodsList.less

@@ -25,8 +25,8 @@
 }
 
 .propaganda {
-  width: 150px;
-  height: 37.6px;
+  width: 240px;
+  height: 60px;
 }
 
 .ant-table-column-title {