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

src/pages/activity/editActivity.jsx

@@ -245,7 +245,7 @@ const Edit = (props) => {
               textOverflow: 'ellipsis'
             }}>{inputValue ? inputValue : '海报标题'}</p>
 
-            <img src={yinhao} style={{ width: '30px', marginLeft: '10px' }} alt="" />
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
             <p style={{
               margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
               display: '-webkit-box', lineClamp: '3', height: '76px',

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

@@ -10,10 +10,9 @@ import request from '../../../../../utils/request'
 import PosterBottom from '../../../../../assets/bottom.png'
 import yinhao from '../../../../../assets/yinhao.png'
 import ImageUploader from '../../../../../components/XForm/ImageUpload';
-import logo from '../../../../../assets/logo.png';
-import touxiang from '../../../../../assets/touxiang.jpg';
 import poster1 from '../../../../../assets/poster1.png';
 import poster2 from '../../../../../assets/poster2.png';
+import Styles from '../style.less';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
@@ -48,7 +47,7 @@ const Poster = props => {
   }
 
   const submitPoster = () => {
-     if (buildingId) {
+    if (buildingId) {
       if (posterId) {
         request({
           url: `/api/admin/poster/${posterId}`,
@@ -59,7 +58,7 @@ const Poster = props => {
         }).catch(err => {
           message.info(err.msg || err.message)
         })
-       } else {
+      } else {
         request({
           url: '/api/admin/poster',
           method: 'POST',
@@ -70,10 +69,10 @@ const Poster = props => {
         }).catch(err => {
           message.info(err.msg || err.message)
         })
-       }
-     } else {
+      }
+    } else {
       message.warn('请先保存基本信息数据')
-     }
+    }
   }
 
   return <div>
@@ -81,22 +80,19 @@ const Poster = props => {
       <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
         <div style={{ width: '375px', height: '785px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
           <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
-          <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', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
-          </div>
+
+          <p className={Styles.tagLabel}><span>全朝南</span><span>品牌开发商</span><span>轨交房</span></p>
           <p style={{
             margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
-            display: '-webkit-box', lineClamp: '3', height: '60px',
-            WebkitLineClamp: '2',
+            display: '-webkit-box', lineClamp: '3', height: '36px',lineHeight:'36px',
+            WebkitLineClamp: '1',
             WebkitBoxOrient: 'vertical',
             overflow: 'hidden',
             textOverflow: 'ellipsis',
           }}>{inputValue || '海报标题'}</p>
+          <p style={{ color: '#999',padding:' 0 20px' }}>约<span style={{ color: '#fd0d0c', fontSize: '24px',marginLeft:'6px' }}>41505</span><span style={{ color: '#fd0d0c', fontSize: '20px' }}>元/m²</span></p>
 
-          <img src={yinhao} style={{ width: '30px', marginLeft: '10px' }} alt="" />
+          <img src={yinhao} style={{ width: '30px', marginLeft: '22px' }} alt="" />
           <p style={{
             margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
             display: '-webkit-box', lineClamp: '3', height: '76px',
@@ -109,7 +105,6 @@ const Poster = props => {
         </div>
         <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
       </div>
-
       <div >
         <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>

src/pages/building/list/add/style.less

@@ -0,0 +1,20 @@
+.tagLabel{
+  padding: 14px 20px 0 20px;
+  margin: 0 0 5px 0;
+  span{
+    padding: 2px 8px;
+    font-size: 10px;
+    background-color: #e1f7eb;
+    color: #3de180;
+    border-radius: 2px;
+    margin-right: 10px;
+  }
+  span:nth-child(3n+2){
+    color: #72a0d1;
+    background-color: #eaeff5;
+  }
+  span:nth-child(3n+3){
+    color: #ff5858;
+    background-color: #fff0f1;
+  }
+}