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

src/pages/activity/editActivity.jsx

@@ -277,17 +277,17 @@ const Edit = props => {
             <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
               <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
               <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
-              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
               <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
             </div>
             <p style={{
               margin: '10px 20px',
-fontSize: '20px',
-color: '#222',
-fontWeight: '600',
+              fontSize: '20px',
+              color: '#222',
+              fontWeight: '600',
               display: '-webkit-box',
-lineClamp: '3',
-height: '60px',
+              lineClamp: '3',
+              height: '60px',
               WebkitLineClamp: '2',
               WebkitBoxOrient: 'vertical',
               overflow: 'hidden',
@@ -297,11 +297,11 @@ height: '60px',
             <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
             <p style={{
               margin: '16px 20px 28px 20px',
-fontSize: '17px',
-color: '#999',
+              fontSize: '17px',
+              color: '#999',
               display: '-webkit-box',
-lineClamp: '3',
-height: '72px',
+              lineClamp: '3',
+              height: '72px',
               WebkitLineClamp: '3',
               WebkitBoxOrient: 'vertical',
               overflow: 'hidden',

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -222,7 +222,7 @@ const Edit = props => {
             <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
               <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
               <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
-              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
               <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
             </div>
             <p style={{
@@ -254,15 +254,15 @@ const Edit = props => {
 
         <div >
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片1</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题1</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
           </div>
           <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述1</p>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
             <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
@@ -319,7 +319,7 @@ const Edit = props => {
 
     return <div style={{ padding: '20px' }}>
       <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板1</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
         <div>
           <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />知与行互动</p>
           <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
@@ -327,11 +327,11 @@ const Edit = props => {
         </div>
       </div>
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题1</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
         <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片1</p>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
         <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
       <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -341,7 +341,7 @@ const Edit = props => {
             <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
               <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
               <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
-              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您参与</span>
               <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
             </div>
             <p style={{

src/pages/activity/helpActivity/list.jsx

@@ -72,7 +72,7 @@ const toEditGoods = (helpActivityId) => () => {
       dataIndex: 'succeedCount',
       key: 'succeedCount',
       align: 'center',
-    },  
+    },
     {
       title: '状态',
       dataIndex: 'isEnlist',