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

src/pages/Welcome.jsx

@@ -54,7 +54,7 @@ const welcome = (props) => {
             borderRadius: '12px', width: '32%', marginRight: '2%'
           }}>
             <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
-            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{(data.selectRegisteredCount && data.selectRegisteredCount + 95) || '0'}</span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
           </div>
         }
         {checkData.includes('number_of_new_users') &&

src/pages/activity/ActivityList.jsx

@@ -129,12 +129,11 @@ const header = props => {
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
             {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
-          <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>下载二维码<Icon type="qrcode" className={styles.shoppingCart} /></span>
+          <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist == '1' ? '下载二维码' : ''}<Icon type="qrcode" className={styles.shoppingCart} /></span>
         </>
       ),
     },
   ];
-
   const getSignList = dynamicId => {
     router.push({
       pathname: '/activity/SignList',

src/pages/activity/drainage/DrainageList.jsx

@@ -57,7 +57,7 @@ const header = (props) => {
           gettaDrainage({ pageNum: 1, pageSize: 10 })
         }).catch((err) => {
           console.log('111111', err)
-          message.info(err.msg || err.message)
+          // message.info(err.msg || err.message)
         })
       }
     });

src/pages/activity/helpActivity/helpRecord.jsx

@@ -32,7 +32,6 @@ class InviteTable extends React.Component {
 
   componentDidUpdate (preProps, preState) {
     const { helpId } = this.state.visibleData
-
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -42,15 +41,20 @@ class InviteTable extends React.Component {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
     this.props.onCancel()
   }
 
   // 弹框取消按钮
   handleCancel () {
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
     this.props.onCancel()
   }
 
   getList (params) {
+    if (params.helpRecordInitiateId === '') {
+      return
+    }
     request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {

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

@@ -4,12 +4,15 @@ import { Map, Marker } from 'react-amap';
 import styles from '../amap.less'
 
 class Amap extends React.Component {
+
   constructor(props) {
     super(props);
+    
     // 高德地图 Marker 实例
     this.markerInstance = undefined
     // 高德地图 Map 实例
     this.mapInstance = undefined
+
     this.amapEvents = {
       created: mapInstance => {
         console.log('高德地图 Map 实例创建成功；如果你要亲自对实例进行操作，可以从这里开始。比如：');
@@ -20,7 +23,7 @@ class Amap extends React.Component {
           // 实例化Autocomplete
           const autoOptions = {
             // city 限定城市，默认全国
-            city: '全国',
+            // city: '025',
             // input 为绑定输入提示功能的input的DOM ID
             input: 'amapInput',
           }
@@ -76,14 +79,34 @@ class Amap extends React.Component {
       },
     }
     this.markerPosition = { longitude: 120, latitude: 30 };
+    const { value } = this.props
+    console.log('项目地图 value', value)
+
+
+
+    this.setMapPosition.bind(this)
   }
 
-  render() {
+  componentDidUpdate(prevProps) {
     const { value } = this.props
-    if (value) {
-     // this.markerInstance.setPosition(value.split(','))
+    // console.log('项目地图 value', value)
+    console.log('this.markerInstance: ', this.markerInstance, this.props)
+    if (this.props.value !== prevProps.value) {
+      if (value) {
+        console.log('项目地图 value', value)
+        this.setMapPosition(value)
+      }
+    }
+  }
+
+  setMapPosition(value) {
+    console.log('获取this：', this.markerInstance)
+    if (this.markerInstance) {
+      // this.markerInstance.setPosition(value)
     }
+  }
 
+  render() {
     return (
       <>
         <div style={{ width: '100%', height: '400px', position: 'relative' }}>

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

@@ -111,9 +111,9 @@ function AddBuilding(props) {
               rules: [{ required: true, message: '请输入楼盘名' }],
             })(<Input />)}
           </Form.Item>
-          <Form.Item label="别名" >
+          {/* <Form.Item label="别名" >
             {getFieldDecorator('name')(<Input />)}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="项目类型">
             {getFieldDecorator('buildingProjectType')(<BudildingProjectType />)}
           </Form.Item>

src/pages/building/list/index.jsx

@@ -118,7 +118,7 @@ function CartBody(props) {
       </p>
       <p className={Styles.cardText}>
         <span className={Styles.title}>楼盘名称</span>
-        <span >：{data.name}</span>
+        <span >：{data.buildingName || data.name}</span>
       </p>
       <p className={Styles.cardItem}>
         <span className={Styles.title}>均价</span>

src/pages/carouselFigure/SelectNews.jsx

@@ -27,7 +27,7 @@ export default (props) => {
         pageSize: 999,
       }
     }).then((data) => {
-      setList(data.list || [])
+      setList(data.records || [])
 
       updateNews(buildingId ? undefined : value);
     })

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -272,7 +272,7 @@ const UserBehavior = props => {
           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
         </p>
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
-          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} checkFirst></BuildSelect>}
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>}
         </div>
         <EChart options={options} style={style} />
         {props.tableShow &&

src/pages/integralMall/writeOff.jsx

@@ -108,7 +108,7 @@ function header(props) {
   return (
     <>
       <Tabs onChange={callback} type="card">
-        <TabPane tab="扫码核销" key="1">
+        {/* <TabPane tab="扫码核销" key="1">
           <Row>
             <Col span={8} style={{ textAlign: 'center' }}>
               <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
@@ -129,7 +129,7 @@ function header(props) {
             </Col>
           </Row>
           <Dialog onEnter={handleEnter} onChange={changeCode} />
-        </TabPane>
+        </TabPane> */}
         <TabPane tab="手机号核销" key="2">
           <Row>
             <Col span={12} style={{ textAlign: 'center' }}>