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

src/pages/activity/ActivityList.jsx

@@ -71,9 +71,11 @@ const header = props => {
       key: 'title',
       align: 'center',
       // width: '15%',
-      render:  (x, row) => <><div style={{wordWrap: 'break-word',  width: '201px'}}>{row.title}</div></>,
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>{row.title}</div></>,
       // width: '300px',
-      // ellipsis:'true'
+      // ellipsis:'true'overflow: hidden; /*溢出隐藏*/
+// text-overflow: ellipsis; /*以省略号...显示*/
+// white-space: nowrap;
     },
     {
       title: '活动时间',
@@ -135,11 +137,11 @@ const header = props => {
             {row.activityStatus != 0 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            {row.isEnlist == 1 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
+            {row.activityStatus != 2 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             <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',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
+            {row.activityStatus != 2 && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
       {row.status === 1 &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist === 1 && '下载二维码'} {row.isEnlist === 1 && <Icon type="qrcode" className={styles.shoppingCart} />}</span>}
         </>

src/pages/activity/groupActivity/helpRecord.jsx

@@ -109,6 +109,7 @@ class InviteTable extends React.Component {
         dataIndex: 'createTime',
         key: 'createTime',
         align: 'center',
+        render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
       },
     ]
     return (

src/pages/customer/customerlist/customerDetail.jsx

@@ -32,7 +32,7 @@ function header(props) {
 
     request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
       setData(res)
-      setDataonsultant(res.consultant)
+      setDataonsultant(res.geoInfo)
     })
   }
 
@@ -91,9 +91,9 @@ function header(props) {
           <p className={styles.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
           <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p>
           <div className={styles.rightInfo}>
-            <p className={styles.rightItem}>国家：{ dataConsultant && dataConsultant.country }</p>
-            <p className={styles.rightItem}>省份：{ dataConsultant && dataConsultant.province }</p>
-            <p className={styles.rightItem}>城市：{ dataConsultant && dataConsultant.city }</p>
+            <p className={styles.rightItem}>国家：{ dataConsultant&&dataConsultant.country }</p>
+            <p className={styles.rightItem}>省份：{ dataConsultant&&dataConsultant.provience }</p>
+            <p className={styles.rightItem}>城市：{dataConsultant&&dataConsultant.city }</p>
             <p className={styles.rightItem}>详细信息：</p>
             <p className={styles.rightItem}>意向项目：{data.intention }</p>
             <p className={styles.rightItem}>价格区间：{data.priceRange }</p>